Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 04/08: [CMAKE] Fixup of driver sections in GCC builds

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=812c9e5a11a2d473fda99… commit 812c9e5a11a2d473fda994ed843be914f546df38 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 24 10:20:18 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Fixup of driver sections in GCC builds Also introduce a helper variable to list KMode modules --- sdk/cmake/CMakeMacros.cmake | 2 ++ sdk/cmake/gcc.cmake | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 1429580b2ac..2d5628f02a2 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -540,6 +540,8 @@ function(add_importlibs _module) endforeach() endfunction() +# Some helper lists +list(APPEND KERNEL_MODULE_TYPES kerneldll kernelmodedriver wdmdriver) function(set_module_type MODULE TYPE) cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 9f38f811e4d..442422a74dc 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -280,13 +280,18 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) - if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) - add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000") + if (TYPE IN_LIST KERNEL_MODULE_TYPES) + target_link_options(${MODULE} PRIVATE -Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000) if(${TYPE} STREQUAL "wdmdriver") - add_target_link_flags(${MODULE} "-Wl,--wdmdriver") + target_link_options(${MODULE} PRIVATE "-Wl,--wdmdriver") endif() # Place INIT section at the tail of the module add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) + # Fixup section characteristiscs + add_custom_command(TARGET ${MODULE} POST_BUILD + COMMAND native-pefixup --driver $<TARGET_FILE:${MODULE}>) + # Believe it or not, cmake doesn't do that + set_property(TARGET ${MODULE} APPEND PROPERTY LINK_DEPENDS $<TARGET_PROPERTY:native-pefixup,IMPORTED_LOCATION>) endif() endfunction()

3 years, 6 months

[reactos] 03/08: [SDK:TOOLS] Add --driver option to pefixup

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5489efcb1abaea61f2033… commit 5489efcb1abaea61f2033909d4a8636045690d57 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 24 10:14:40 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [SDK:TOOLS] Add --driver option to pefixup For now, this adds IMAGE_SCN_MEM_DISCARDABLE to the INIT section, and IMAGE_SCN_MEM_NOT_PAGED to sections which are not named PAGE or .reloc --- sdk/cmake/gcc.cmake | 2 +- sdk/tools/pefixup.c | 85 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 9c0bce9c685..9f38f811e4d 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -308,7 +308,7 @@ endif() function(fixup_load_config _target) add_custom_command(TARGET ${_target} POST_BUILD - COMMAND native-pefixup "$<TARGET_FILE:${_target}>" + COMMAND native-pefixup --loadconfig "$<TARGET_FILE:${_target}>" COMMENT "Patching in LOAD_CONFIG" DEPENDS native-pefixup) endfunction() diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 07a1d71121d..81dfcc96c5a 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -24,6 +24,12 @@ static const char* g_ApplicationName; static const char* g_Target; +enum fixup_mode +{ + MODE_LOADCONFIG, + MODE_DRIVER +}; + void *rva_to_ptr(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header, DWORD rva) { unsigned int i; @@ -121,6 +127,47 @@ static int add_loadconfig(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) return 1; } +static int driver_fixup(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) +{ + /* GNU LD just doesn't know what a driver is, and has notably no idea of paged vs non-paged sections */ + for (unsigned i = 0; i < nt_header->FileHeader.NumberOfSections; i++) + { + PIMAGE_SECTION_HEADER Section = IMAGE_FIRST_SECTION(nt_header) + i; + + /* Known sections which can be discarded */ + if (strncasecmp((char*)Section->Name, "INIT", 4) == 0) + { + Section->Characteristics |= IMAGE_SCN_MEM_DISCARDABLE; + continue; + } + + /* Known sections which can be paged */ + if ((strncasecmp((char*)Section->Name, "PAGE", 4) == 0) + || (strncasecmp((char*)Section->Name, ".reloc", 6) == 0)) + { + continue; + } + + /* If it's discardable, don't set the flag */ + if (Section->Characteristics & IMAGE_SCN_MEM_DISCARDABLE) + continue; + + Section->Characteristics |= IMAGE_SCN_MEM_NOT_PAGED; + } + + return 0; +} + +static +void +print_usage(void) +{ + printf("Usage: %s <mode> <filename>\n", g_ApplicationName); + printf("Where <mode> is on of the following:\n"); + printf(" --loadconfig Fix the LOAD_CONFIG directory entry\n"); + printf(" --driver Fix code and data sections for driver images\n"); +} + int main(int argc, char **argv) { FILE* file; @@ -128,19 +175,34 @@ int main(int argc, char **argv) unsigned char *buffer; PIMAGE_DOS_HEADER dos_header; int result = 1; + enum fixup_mode mode; g_ApplicationName = argv[0]; - if (argc < 2) + if (argc != 3) { - printf("Usage: %s <filename>\n", g_ApplicationName); + print_usage(); return 1; } - g_Target = argv[1]; + if (strcmp(argv[1], "--loadconfig") == 0) + { + mode = MODE_LOADCONFIG; + } + else if (strcmp(argv[1], "--driver") == 0) + { + mode = MODE_DRIVER; + } + else + { + print_usage(); + return 1; + } + + g_Target = argv[2]; /* Read the whole file to memory. */ - file = fopen(argv[1], "r+b"); + file = fopen(g_Target, "r+b"); if (!file) { fprintf(stderr, "%s ERROR: Can't open '%s'.\n", g_ApplicationName, g_Target); @@ -180,20 +242,19 @@ int main(int argc, char **argv) if (nt_header->Signature == IMAGE_NT_SIGNATURE) { - if (!add_loadconfig(buffer, nt_header)) + if (mode == MODE_LOADCONFIG) + result = add_loadconfig(buffer, nt_header); + else + result = driver_fixup(buffer, nt_header); + + if (!result) { + /* Success. Fix checksum and write to file */ fix_checksum(buffer, len, nt_header); /* We could 'optimize by only writing the changed parts, but keep it simple for now */ fseek(file, 0, SEEK_SET); fwrite(buffer, 1, len, file); - - /* Success */ - result = 0; - } - else - { - /* Error already printed inside add_loadconfig */ } } else

3 years, 6 months

[reactos] 02/08: [CMAKE] Restore using LD linker script with GCC

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56b1baa3dd70b1a8e9582… commit 56b1baa3dd70b1a8e9582ad7a3b944462da57db1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 23 18:29:13 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Restore using LD linker script with GCC --- sdk/cmake/gcc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 9e94d499ea8..9c0bce9c685 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -285,8 +285,8 @@ function(set_module_type_toolchain MODULE TYPE) if(${TYPE} STREQUAL "wdmdriver") add_target_link_flags(${MODULE} "-Wl,--wdmdriver") endif() - #Disabled due to LD bug: ROSBE-154 - #add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) + # Place INIT section at the tail of the module + add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) endif() endfunction()

3 years, 6 months

[reactos] 01/08: [CMAKE] Put INIT section before .reloc and not after.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6445f33704e1f5305479c… commit 6445f33704e1f5305479cec0402ed34437f9bffc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 23 18:26:43 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Put INIT section before .reloc and not after. CORE-14683 --- sdk/cmake/init-section.lds | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/cmake/init-section.lds b/sdk/cmake/init-section.lds index ca46bd1451e..eeda07bf3ce 100644 --- a/sdk/cmake/init-section.lds +++ b/sdk/cmake/init-section.lds @@ -8,5 +8,4 @@ SECTIONS __init_end__ = . ; } } -/*INSERT AFTER .reloc;*//*This is what we actually want to do, but do not dare due to LD bug ROSBE-154*/ -INSERT AFTER .rsrc; /*This is what we do instead to at least fix CORE-14683*/ +INSERT BEFORE .reloc; /* .reloc is always at the end */

3 years, 6 months

[reactos] 01/01: [WIN32K] Rewrite DIB1BPP -> DIB1BPP copy

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c13ff2a4b3673cac8e70… commit 0c13ff2a4b3673cac8e70ca45139febc4114f568 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Mar 22 15:59:15 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Mar 22 22:40:33 2021 +0100 [WIN32K] Rewrite DIB1BPP -> DIB1BPP copy Simpler is sometimes better. Fixes some crashes & memory corruptions happening because of all those broken loops. --- win32ss/gdi/dib/dib1bpp.c | 230 ++++++---------------------------------------- win32ss/gdi/ntgdi/rect.h | 14 +++ 2 files changed, 43 insertions(+), 201 deletions(-) diff --git a/win32ss/gdi/dib/dib1bpp.c b/win32ss/gdi/dib/dib1bpp.c index 034570e9cad..6a90282808d 100644 --- a/win32ss/gdi/dib/dib1bpp.c +++ b/win32ss/gdi/dib/dib1bpp.c @@ -65,207 +65,35 @@ DIB_1BPP_BitBltSrcCopy_From1BPP ( BOOLEAN bTopToBottom, BOOLEAN bLeftToRight ) { + LONG Height = RECTL_lGetHeight(DestRect); + BOOLEAN XorBit = !!XLATEOBJ_iXlate(pxlo, 0); - DPRINT("bLeftToRight is '%d' and bTopToBottom is '%d'.\n", bLeftToRight, bTopToBottom); + /* Make sure this is as expected */ + ASSERT(DestRect->left >= 0); + ASSERT(DestRect->top >= 0); + ASSERT(Height > 0); + ASSERT(RECTL_lGetWidth(DestRect) > 0); - // The 'window' in this sense is the x-position that corresponds - // to the left-edge of the 8-pixel byte we are currently working with. - // dwx is current x-window, dwx2 is the 'last' window we need to process. - int dwx, dwx2; // Destination window x-position - int swx; // Source window x-position - - // Left and right edges of source and dest rectangles - int dl = DestRect->left; // dest left - int dr = DestRect->right-1; // dest right (inclusive) - int sl = SourcePoint->x; // source left - int sr = sl + dr - dl; // source right (inclusive) - - // Which direction are we going? - int xinc; - int yinc; - int ySrcDelta, yDstDelta; - - // The following 4 variables are used for the y-sweep - int dy; // dest y - int dy1; // dest y start - int dy2; // dest y end - int sy1; // src y start - - int shift; - BYTE srcmask, dstmask, xormask; - - // 'd' and 's' are the dest & src buffer pointers that I use on my x-sweep - // 'pd' and 'ps' are the dest & src buffer pointers used on the inner y-sweep - PBYTE d, pd; // dest ptrs - PBYTE s, ps; // src ptrs - - shift = (dl-sl)&7; - - xormask = 0xFF * (BYTE)XLATEOBJ_iXlate(pxlo, 0); - - if ( DestRect->top <= SourcePoint->y ) - { - DPRINT("Moving up (scan top -> bottom).\n"); - // Moving up (scan top -> bottom) - dy1 = DestRect->top; - dy2 = DestRect->bottom - 1; - if (bTopToBottom) - { - sy1 = SourcePoint->y + dy2 - dy1; - ySrcDelta = -SourceSurf->lDelta; - } - else - { - sy1 = SourcePoint->y; - ySrcDelta = SourceSurf->lDelta; - } - yinc = 1; - yDstDelta = DestSurf->lDelta; - } - else - { - DPRINT("Moving down (scan bottom -> top).\n"); - // Moving down (scan bottom -> top) - dy1 = DestRect->bottom - 1; - dy2 = DestRect->top; - if (bTopToBottom) - { - sy1 = SourcePoint->y; - ySrcDelta = SourceSurf->lDelta; - } - else - { - sy1 = SourcePoint->y + dy1 - dy2; - ySrcDelta = -SourceSurf->lDelta; - } - yinc = -1; - yDstDelta = -DestSurf->lDelta; - } - if ( DestRect->left <= SourcePoint->x ) - { - DPRINT("Moving left (scan left->right).\n"); - // Moving left (scan left->right) - dwx = dl&~7; - dwx2 = dr&~7; - if (bLeftToRight) - { - swx = (sr - (dr & 7)) & ~7; - xinc = -1; - } - else - { - swx = (sl-(dl&7))&~7; - xinc = 1; - } - } - else - { - DPRINT("Moving right (scan right->left).\n"); - // Moving right (scan right->left) - dwx = dr & ~7; - dwx2 = dl & ~7; - if (bLeftToRight) - { - swx = (sl-(dl&7))&~7; - xinc = 1; - } - else - { - swx = (sr - (dr & 7)) & ~7; // (sr - 7) & ~7; // We need the left edge of this block. Thus the -7 - xinc = -1; - } - } - d = &(((PBYTE)DestSurf->pvScan0)[dy1*DestSurf->lDelta + (dwx>>3)]); - s = &(((PBYTE)SourceSurf->pvScan0)[sy1*SourceSurf->lDelta + (swx>>3)]); - for ( ;; ) - { - dy = dy1; - pd = d; - ps = s; - srcmask = 0xff; - if ( dwx < dl ) - { - int diff = dl-dwx; - srcmask &= (1<<(8-diff))-1; - } - if ( dwx+7 > dr ) + while (Height--) { - int diff = dr-dwx+1; - srcmask &= ~((1<<(8-diff))-1); - } - dstmask = ~srcmask; + LONG yDst = DestRect->top + Height; + LONG ySrc = bTopToBottom ? + SourcePoint->y + RECTL_lGetHeight(DestRect) - Height + : SourcePoint->y + Height; + LONG Width = RECTL_lGetWidth(DestRect); - // We unfortunately *must* have 5 different versions of the inner - // loop to be certain we don't try to read from memory that is not - // needed and may in fact be invalid. - if ( !shift ) - { - for ( ;; ) - { - *pd = (BYTE)((*pd & dstmask) | ((ps[0]^xormask) & srcmask)); - - // This *must* be here, because we could be going up *or* down... - if ( dy == dy2 ) - break; - dy += yinc; - pd += yDstDelta; - ps += ySrcDelta; - } - } - else if ( !(0xFF00 & (srcmask<<shift) ) ) // Check if ps[0] not needed... - { - for ( ;; ) - { - *pd = (BYTE)((*pd & dstmask) - | ( ( (ps[1]^xormask) >> shift ) & srcmask )); - - // This *must* be here, because we could be going up *or* down... - if ( dy == dy2 ) - break; - dy += yinc; - pd += yDstDelta; - ps += ySrcDelta; - } - } - else if ( !(0xFF & (srcmask<<shift) ) ) // Check if ps[1] not needed... - { - for ( ;; ) - { - *pd = (*pd & dstmask) - | ( ( (ps[0]^xormask) << ( 8 - shift ) ) & srcmask ); - - // This *must* be here, because we could be going up *or* down... - if ( dy == dy2 ) - break; - dy += yinc; - pd += yDstDelta; - ps += ySrcDelta; - } - } - else // Both ps[0] and ps[1] are needed - { - for ( ;; ) - { - *pd = (*pd & dstmask) - | ( ( ( ((ps[1]^xormask))|((ps[0]^xormask)<<8) ) >> shift ) & srcmask ); - - // This *must* be here, because we could be going up *or* down... - if ( dy == dy2 ) - break; - dy += yinc; - pd += yDstDelta; - ps += ySrcDelta; - } + while (Width--) + { + LONG xDst = DestRect->left + Width; + LONG xSrc = bLeftToRight ? + SourcePoint->x + RECTL_lGetWidth(DestRect) - Width + : SourcePoint->x + Width; + ULONG PixelPut = DIB_1BPP_GetPixel(SourceSurf, xSrc, ySrc); + if (XorBit) + PixelPut = !PixelPut; + DIB_1BPP_PutPixel(DestSurf, xDst, yDst, PixelPut); + } } - - // This *must* be here, because we could be going right *or* left... - if ( dwx == dwx2 ) - break; - d += xinc; - s += xinc; - dwx += xinc<<3; - swx += xinc<<3; - } } BOOLEAN @@ -338,11 +166,11 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) break; case BMF_8BPP: - DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", + DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", BltInfo->DestRect.left, BltInfo->DestRect.top, BltInfo->DestRect.right, BltInfo->DestRect.bottom, BltInfo->DestRect.right - BltInfo->DestRect.left); - + if (bTopToBottom) { // This sets sy to the bottom line @@ -371,7 +199,7 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) break; case BMF_16BPP: - DPRINT("16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", + DPRINT("16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", BltInfo->DestRect.left, BltInfo->DestRect.top, BltInfo->DestRect.right, BltInfo->DestRect.bottom, BltInfo->DestRect.right - BltInfo->DestRect.left); @@ -404,7 +232,7 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) case BMF_24BPP: - DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", + DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", BltInfo->DestRect.left, BltInfo->DestRect.top, BltInfo->DestRect.right, BltInfo->DestRect.bottom, BltInfo->DestRect.right - BltInfo->DestRect.left); @@ -437,7 +265,7 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo) case BMF_32BPP: - DPRINT("32BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", + DPRINT("32BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n", BltInfo->DestRect.left, BltInfo->DestRect.top, BltInfo->DestRect.right, BltInfo->DestRect.bottom, BltInfo->DestRect.right - BltInfo->DestRect.left); diff --git a/win32ss/gdi/ntgdi/rect.h b/win32ss/gdi/ntgdi/rect.h index a268311ad27..fadae970f0a 100644 --- a/win32ss/gdi/ntgdi/rect.h +++ b/win32ss/gdi/ntgdi/rect.h @@ -81,6 +81,20 @@ RECTL_bClipRectBySize( return !RECTL_bIsEmptyRect(prclDst); } +FORCEINLINE +LONG +RECTL_lGetHeight(_In_ const RECTL* prcl) +{ + return prcl->bottom - prcl->top; +} + +FORCEINLINE +LONG +RECTL_lGetWidth(_In_ const RECTL* prcl) +{ + return prcl->right - prcl->left; +} + BOOL FASTCALL RECTL_bUnionRect(

3 years, 6 months

[reactos] 01/01: [NTOS:MM] Fix integer arithmetics

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1d1260f5f59046842707… commit d1d1260f5f590468427077755d6f121a756e7738 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Mar 22 10:01:39 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Mar 22 10:02:12 2021 +0100 [NTOS:MM] Fix integer arithmetics --- ntoskrnl/mm/ARM3/expool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 4df9bbde217..74393137162 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -29,8 +29,6 @@ * etc. */ #define POOL_BIG_TABLE_USE_RATE 4 -#define POOL_BIG_TABLE_LOW_THRESHOLD (POOL_BIG_TABLE_USE_RATE * 2) -#define POOL_BIG_TABLE_HIGH_THRESHOLD ((POOL_BIG_TABLE_USE_RATE - 1) / POOL_BIG_TABLE_USE_RATE) typedef struct _POOL_DPC_CONTEXT { @@ -1636,7 +1634,7 @@ Retry: // which implies a massive number of concurrent big pool allocations. // ExpPoolBigEntriesInUse++; - if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize * POOL_BIG_TABLE_HIGH_THRESHOLD))) + if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize * (POOL_BIG_TABLE_USE_RATE - 1) / POOL_BIG_TABLE_USE_RATE))) { DPRINT("Attempting expansion since we now have %lu entries\n", ExpPoolBigEntriesInUse); @@ -1750,7 +1748,7 @@ ExpFindAndRemoveTagBigPages(IN PVOID Va, /* If reaching 12.5% of the size (or whatever integer rounding gets us to), * halve the allocation size, which will get us to 25% of space used. */ - if (ExpPoolBigEntriesInUse < (PoolBigPageTableSize / POOL_BIG_TABLE_LOW_THRESHOLD)) + if (ExpPoolBigEntriesInUse < (PoolBigPageTableSize / (POOL_BIG_TABLE_USE_RATE * 2))) { /* Shrink the table. */ ExpReallocateBigPageTable(OldIrql, TRUE);

3 years, 6 months

[reactos] 01/01: [SYSSETUP][TIMEDATE] Use exact setTimer() timeouts, to stay in sync (#3355)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cd92f0d01b342bbbbf46… commit 4cd92f0d01b342bbbbf4637e6b4ccbb0b5318291 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Mar 21 04:01:22 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 21 12:01:22 2021 +0900 [SYSSETUP][TIMEDATE] Use exact setTimer() timeouts, to stay in sync (#3355) CORE-13121 --- base/shell/explorer/trayclock.cpp | 9 --------- dll/cpl/timedate/clock.c | 16 ++++++++++++---- dll/cpl/timedate/dateandtime.c | 12 +++++++++--- dll/cpl/timedate/monthcal.c | 5 ----- dll/win32/syssetup/wizard.c | 27 +++++++++++++++++++++------ 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 9736ffbc8b8..cc289ddc0e2 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -429,15 +429,6 @@ UINT CTrayClockWnd::CalculateDueTime() if (!g_TaskbarSettings.bShowSeconds) uiDueTime += (59 - (UINT) LocalTime.wSecond) * 1000; - if (uiDueTime < USER_TIMER_MINIMUM || uiDueTime > USER_TIMER_MAXIMUM) - uiDueTime = 1000; - else - { - /* Add an artificial delay of 0.05 seconds to make sure the timer - doesn't fire too early*/ - uiDueTime += 50; - } - return uiDueTime; } diff --git a/dll/cpl/timedate/clock.c b/dll/cpl/timedate/clock.c index 3fb30f6d8b8..d5667a988db 100644 --- a/dll/cpl/timedate/clock.c +++ b/dll/cpl/timedate/clock.c @@ -152,10 +152,10 @@ ClockWndProc(HWND hwnd, pClockData->hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); pClockData->hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); - SetTimer(hwnd, ID_TIMER, 1000, NULL); - pClockData->bTimer = TRUE; GetLocalTime(&pClockData->stCurrent); pClockData->stPrevious = pClockData->stCurrent; + + pClockData->bTimer = (SetTimer(hwnd, ID_TIMER, 1000 - pClockData->stCurrent.wMilliseconds, NULL) != 0); break; case WM_SIZE: @@ -168,6 +168,12 @@ ClockWndProc(HWND hwnd, GetLocalTime(&pClockData->stCurrent); InvalidateRect(hwnd, NULL, FALSE); pClockData->stPrevious = pClockData->stCurrent; + + // Reset timeout. + if (pClockData->bTimer) + { + SetTimer(hwnd, ID_TIMER, 1000 - pClockData->stCurrent.wMilliseconds, NULL); + } break; case WM_PAINT: @@ -255,8 +261,10 @@ ClockWndProc(HWND hwnd, case CLM_STARTCLOCK: if (!pClockData->bTimer) { - SetTimer(hwnd, ID_TIMER, 1000, NULL); - pClockData->bTimer = TRUE; + SYSTEMTIME LocalTime; + + GetLocalTime(&LocalTime); + pClockData->bTimer = (SetTimer(hwnd, ID_TIMER, 1000 - LocalTime.wMilliseconds, NULL) != 0); } break; diff --git a/dll/cpl/timedate/dateandtime.c b/dll/cpl/timedate/dateandtime.c index 026cd305cfc..807bf76faf8 100644 --- a/dll/cpl/timedate/dateandtime.c +++ b/dll/cpl/timedate/dateandtime.c @@ -276,17 +276,20 @@ DateTimePageProc(HWND hwndDlg, FillMonthsComboBox(GetDlgItem(hwndDlg, IDC_MONTHCB)); - SetTimer(hwndDlg, ID_TIMER, 1000, NULL); - /* Set range and current year */ SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); pOldWndProc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWLP_WNDPROC, (LONG_PTR)DTPProc); + + SetTimer(hwndDlg, ID_TIMER, 1000 - st.wMilliseconds, NULL); break; case WM_TIMER: SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st); + + // Reset timeout. + SetTimer(hwndDlg, ID_TIMER, 1000 - st.wMilliseconds, NULL); break; case WM_COMMAND: @@ -347,6 +350,8 @@ DateTimePageProc(HWND hwndDlg, SendDlgItemMessageW(hwndDlg, IDC_CLOCKWND, CLM_STOPCLOCK, 0, 0); + // TODO: Set the clock to the input time. + /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -377,11 +382,12 @@ DateTimePageProc(HWND hwndDlg, case PSN_APPLY: SetLocalSystemTime(hwndDlg); - SetTimer(hwndDlg, ID_TIMER, 1000, NULL); /* Tell the clock to start ticking */ SendDlgItemMessageW(hwndDlg, IDC_CLOCKWND, CLM_STARTCLOCK, 0, 0); + + SetTimer(hwndDlg, ID_TIMER, 1000 - st.wMilliseconds, NULL); return TRUE; } break; diff --git a/dll/cpl/timedate/monthcal.c b/dll/cpl/timedate/monthcal.c index 3caf00fc96f..4f23396e7e4 100644 --- a/dll/cpl/timedate/monthcal.c +++ b/dll/cpl/timedate/monthcal.c @@ -238,11 +238,6 @@ MonthCalSetupDayTimer(IN PMONTHCALWND infoPtr) uElapse += (59 - (UINT)LocalTime.wMinute) * 60 * 1000; uElapse += (23 - (UINT)LocalTime.wHour) * 60 * 60 * 1000; - if (uElapse < USER_TIMER_MINIMUM || uElapse > USER_TIMER_MAXIMUM) - uElapse = 1000; - else - uElapse += 100; /* Add a delay of 0.1 seconds */ - /* Setup the new timer */ if (SetTimer(infoPtr->hSelf, ID_DAYTIMER, diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 75913c67d69..dd24193f5cd 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -1542,11 +1542,8 @@ SetSystemLocalTime(HWND hwnd, PSETUPDATA SetupData) static VOID -UpdateLocalSystemTime(HWND hwnd) +UpdateLocalSystemTime(HWND hwnd, SYSTEMTIME LocalTime) { - SYSTEMTIME LocalTime; - - GetLocalTime(&LocalTime); DateTime_SetSystemtime(GetDlgItem(hwnd, IDC_DATEPICKER), GDT_VALID, &LocalTime); DateTime_SetSystemtime(GetDlgItem(hwnd, IDC_TIMEPICKER), GDT_VALID, &LocalTime); } @@ -1625,25 +1622,43 @@ DateTimePageDlgProc(HWND hwndDlg, } case WM_TIMER: - UpdateLocalSystemTime(hwndDlg); + { + SYSTEMTIME LocalTime; + + GetLocalTime(&LocalTime); + UpdateLocalSystemTime(hwndDlg, LocalTime); + + // Reset timeout. + SetTimer(hwndDlg, 1, 1000 - LocalTime.wMilliseconds, NULL); break; + } case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { case PSN_SETACTIVE: + { + SYSTEMTIME LocalTime; + + GetLocalTime(&LocalTime); + UpdateLocalSystemTime(hwndDlg, LocalTime); + /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData->UnattendSetup && WriteDateTimeSettings(hwndDlg, SetupData)) { SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, SetupData->uFirstNetworkWizardPage); return TRUE; } - SetTimer(hwndDlg, 1, 1000, NULL); + + SetTimer(hwndDlg, 1, 1000 - LocalTime.wMilliseconds, NULL); break; + } case PSN_KILLACTIVE: case DTN_DATETIMECHANGE: + // NB: Not re-set until changing page (PSN_SETACTIVE). KillTimer(hwndDlg, 1); break;

3 years, 6 months

[reactos] 01/01: [BROWSEUI] Fix return value on sanity check of auto-completion (#3544)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53005587f42848bd8229b… commit 53005587f42848bd8229b45f9641c04e4b30ce0e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 20 14:04:02 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 20 14:04:02 2021 +0900 [BROWSEUI] Fix return value on sanity check of auto-completion (#3544) Reduce failures on sanity check of auto-completion. CORE-9281 - Return E_FAIL rather than E_INVALIDARG in sanity check of CAutoComplete::Init (IAutoComplete::Init). --- dll/win32/browseui/CAutoComplete.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index fa0c24adb6b..8fe44e27977 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -1133,7 +1133,7 @@ CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, if (m_hwndEdit || !punkACL) { ATLASSERT(0); - return E_INVALIDARG; + return E_FAIL; } // set this pointer to m_hwndEdit

3 years, 6 months

[reactos] 01/01: [BROWSEUI] Fix auto-completion on VK_DELETE (#3543)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f49c164428938dac61146… commit f49c164428938dac61146cfae15d583691650312 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 20 13:18:47 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 20 13:18:47 2021 +0900 [BROWSEUI] Fix auto-completion on VK_DELETE (#3543) Reduce failures against Delete key on auto-completion. CORE-9281 --- dll/win32/browseui/CAutoComplete.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index b5dfa888abd..fa0c24adb6b 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -961,8 +961,7 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) if (!CanAutoSuggest()) return FALSE; // do default m_hwndEdit.DefWindowProcW(WM_KEYDOWN, VK_DELETE, 0); // do default - if (IsWindowVisible()) - OnEditUpdate(FALSE); + OnEditUpdate(FALSE); return TRUE; // eat } case VK_BACK:

3 years, 6 months

[reactos] 01/01: [SYSSETUP] SamQueryInformationUser expects a pointer

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4885c34fa8007d8ce2295… commit 4885c34fa8007d8ce2295e83637b389920e5241d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 20 00:28:07 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Mar 20 00:28:07 2021 +0100 [SYSSETUP] SamQueryInformationUser expects a pointer --- dll/win32/syssetup/security.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index ffe73bbe336..eb505ffd3df 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -1154,7 +1154,7 @@ EnableAccount( { INFCONTEXT InfContext; SAM_HANDLE UserHandle = NULL; - USER_CONTROL_INFORMATION ControlInfo; + PUSER_CONTROL_INFORMATION ControlInfo = NULL; INT nValue = 0; NTSTATUS Status; @@ -1195,22 +1195,25 @@ EnableAccount( if (nValue == 0) { - ControlInfo.UserAccountControl |= USER_ACCOUNT_DISABLED; + ControlInfo->UserAccountControl |= USER_ACCOUNT_DISABLED; } else { - ControlInfo.UserAccountControl &= ~USER_ACCOUNT_DISABLED; + ControlInfo->UserAccountControl &= ~USER_ACCOUNT_DISABLED; } Status = SamSetInformationUser(UserHandle, UserControlInformation, - (PVOID)&ControlInfo); + ControlInfo); if (!NT_SUCCESS(Status)) { DPRINT1("SamSetInformationUser() failed (Status: 0x%08lx)\n", Status); } done: + if (ControlInfo != NULL) + SamFreeMemory(ControlInfo); + if (UserHandle != NULL) SamCloseHandle(UserHandle); }

3 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021