Ros-diffs December 2024

ros-diffs@reactos.org

17 participants
106 discussions

[reactos] 06/09: [NTOS:EX] Minor enhancements to ExpDebuggerWorker()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da59d797d15a957e14d97… commit da59d797d15a957e14d97d179f0859b89f4447ca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 7 16:31:15 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:51 2024 +0100 [NTOS:EX] Minor enhancements to ExpDebuggerWorker() - Add some DbgPrints. - Use SAL2 annotations. --- ntoskrnl/ex/dbgctrl.c | 24 +++++++++++++++--------- ntoskrnl/include/internal/ex.h | 5 ++++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/ex/dbgctrl.c b/ntoskrnl/ex/dbgctrl.c index 70280703a31..f3fc6c0b43b 100644 --- a/ntoskrnl/ex/dbgctrl.c +++ b/ntoskrnl/ex/dbgctrl.c @@ -49,7 +49,8 @@ ULONG_PTR ExpDebuggerPageIn; */ VOID NTAPI -ExpDebuggerWorker(IN PVOID Context) +ExpDebuggerWorker( + _In_ PVOID Context) { PEPROCESS ProcessToAttach, ProcessToKill; ULONG_PTR PageInAddress; @@ -83,11 +84,10 @@ ExpDebuggerWorker(IN PVOID Context) Process = NULL; /* Check if we need to attach or kill some process */ - if (ProcessToAttach != NULL || ProcessToKill != NULL) + if (ProcessToAttach || ProcessToKill) { /* Find the process in the list */ - Process = PsGetNextProcess(Process); - while (Process) + while ((Process = PsGetNextProcess(Process))) { /* Is this the process we want to attach to? */ if (Process == ProcessToAttach) @@ -104,12 +104,16 @@ ExpDebuggerWorker(IN PVOID Context) ObDereferenceObject(Process); return; } + } - /* Get the next process */ - Process = PsGetNextProcess(Process); + if (!Process) + { + DbgPrintEx(DPFLTR_SYSTEM_ID, DPFLTR_ERROR_LEVEL, + "EX debug work: Unable to find process %p\n", + ProcessToAttach ? ProcessToAttach : ProcessToKill); } - /* We either have found a process, or we default to the current process */ + /* We either have found a process, or we default to the current one */ } /* If we have an address to page in... */ @@ -122,7 +126,9 @@ ExpDebuggerWorker(IN PVOID Context) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("Failed to page in address 0x%p, Status 0x%08lx\n", PageInAddress, _SEH2_GetExceptionCode()); + DbgPrintEx(DPFLTR_SYSTEM_ID, DPFLTR_ERROR_LEVEL, + "EX page in: Failed to page-in address 0x%p, Status 0x%08lx\n", + PageInAddress, _SEH2_GetExceptionCode()); } _SEH2_END; } @@ -135,7 +141,7 @@ ExpDebuggerWorker(IN PVOID Context) { /* ... we can detach from the process */ KeUnstackDetachProcess(&ApcState); - /* Dereference the process which was referenced for us by PsGetNextProcess */ + /* Dereference the process referenced by PsGetNextProcess() */ ObDereferenceObject(Process); } } diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 50dde0cbfc8..4c212972fcb 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -70,7 +70,10 @@ extern PEPROCESS ExpDebuggerProcessAttach; extern PEPROCESS ExpDebuggerProcessKill; extern ULONG_PTR ExpDebuggerPageIn; -VOID NTAPI ExpDebuggerWorker(IN PVOID Context); +VOID +NTAPI +ExpDebuggerWorker( + _In_ PVOID Context); #ifdef _WIN64 #define HANDLE_LOW_BITS (PAGE_SHIFT - 4)

5 months, 3 weeks

[reactos] 05/09: [NTOS:EX] Revamp ExpLoadBootSymbols() a bit.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec4c169e3ebe128892141… commit ec4c169e3ebe128892141d2d39b7ac80dec18bdf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 28 20:18:32 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:49 2024 +0100 [NTOS:EX] Revamp ExpLoadBootSymbols() a bit. - Use a for-loop. - Make some comments more accurate. - Reduce indentation level in the loop. --- ntoskrnl/ex/init.c | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 433a635d7d2..6393a1083f9 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -790,84 +790,79 @@ ExpIsLoaderValid(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return TRUE; } -CODE_SEG("INIT") +static CODE_SEG("INIT") VOID -NTAPI -ExpLoadBootSymbols(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +ExpLoadBootSymbols( + _In_ PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG i = 0; PLIST_ENTRY NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + NTSTATUS Status; + ULONG i; ULONG Count, Length; PWCHAR Name; - PLDR_DATA_TABLE_ENTRY LdrEntry; + STRING ImageName; CHAR NameBuffer[256]; - STRING SymbolString; - NTSTATUS Status; - /* Loop the driver list */ - NextEntry = LoaderBlock->LoadOrderListHead.Flink; - while (NextEntry != &LoaderBlock->LoadOrderListHead) + /* Loop over the boot modules list */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink, i = 0; + NextEntry != &LoaderBlock->LoadOrderListHead; + NextEntry = NextEntry->Flink, ++i) { - /* Skip the first two images */ - if (i >= 2) + /* Skip the first two images: HAL and kernel */ + if (i < 2) + continue; + + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (LdrEntry->FullDllName.Buffer[0] == L'\\') { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - if (LdrEntry->FullDllName.Buffer[0] == L'\\') - { - /* We have a name, read its data */ - Name = LdrEntry->FullDllName.Buffer; - Length = LdrEntry->FullDllName.Length / sizeof(WCHAR); + /* We have a name, read its data */ + Name = LdrEntry->FullDllName.Buffer; + Length = LdrEntry->FullDllName.Length / sizeof(WCHAR); - /* Check if our buffer can hold it */ - if (sizeof(NameBuffer) < Length + sizeof(ANSI_NULL)) - { - /* It's too long */ - Status = STATUS_BUFFER_OVERFLOW; - } - else - { - /* Copy the name */ - Count = 0; - do - { - /* Copy the character */ - NameBuffer[Count++] = (CHAR)*Name++; - } while (Count < Length); - - /* Null-terminate */ - NameBuffer[Count] = ANSI_NULL; - Status = STATUS_SUCCESS; - } - } - else + /* Check if our buffer can hold it */ + if (sizeof(NameBuffer) < Length + sizeof(ANSI_NULL)) { - /* Safely print the string into our buffer */ - Status = RtlStringCbPrintfA(NameBuffer, - sizeof(NameBuffer), - "%S\\System32\\Drivers\\%wZ", - &SharedUserData->NtSystemRoot[2], - &LdrEntry->BaseDllName); + /* It's too long */ + Status = STATUS_BUFFER_OVERFLOW; } - - /* Check if the buffer was ok */ - if (NT_SUCCESS(Status)) + else { - /* Initialize the STRING for the debugger */ - RtlInitString(&SymbolString, NameBuffer); + /* Copy the name */ + Count = 0; + do + { + /* Do cheap Unicode to ANSI conversion */ + NameBuffer[Count++] = (CHAR)*Name++; + } while (Count < Length); - /* Load the symbols */ - DbgLoadImageSymbols(&SymbolString, - LdrEntry->DllBase, - (ULONG_PTR)PsGetCurrentProcessId()); + /* Null-terminate */ + NameBuffer[Count] = ANSI_NULL; + Status = STATUS_SUCCESS; } } + else + { + /* Safely print the string into our buffer */ + Status = RtlStringCbPrintfA(NameBuffer, + sizeof(NameBuffer), + "%S\\System32\\Drivers\\%wZ", + &SharedUserData->NtSystemRoot[2], + &LdrEntry->BaseDllName); + } - /* Go to the next entry */ - i++; - NextEntry = NextEntry->Flink; + /* Check if the buffer is OK */ + if (NT_SUCCESS(Status)) + { + /* Load the symbols */ + RtlInitString(&ImageName, NameBuffer); + DbgLoadImageSymbols(&ImageName, + LdrEntry->DllBase, + (ULONG_PTR)PsGetCurrentProcessId()); + } } } @@ -1108,7 +1103,8 @@ ExpInitializeExecutive(IN ULONG Cpu, ExpLoadBootSymbols(LoaderBlock); /* Check if we should break after symbol load */ - if (KdBreakAfterSymbolLoad) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + if (KdBreakAfterSymbolLoad) + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); /* Check if this loader is compatible with NT 5.2 */ if (LoaderBlock->Extension->Size >= sizeof(LOADER_PARAMETER_EXTENSION))

5 months, 3 weeks

[reactos] 04/09: [NTOS:MM] MiScanMemoryDescriptors(): Use the MiIsMemoryTypeInvisible() and MiIsMemoryTypeFree() helpers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f395f87bb35fbc66c920a… commit f395f87bb35fbc66c920abf2ea6acb9be9dd49fa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 28 21:11:24 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:48 2024 +0100 [NTOS:MM] MiScanMemoryDescriptors(): Use the MiIsMemoryTypeInvisible() and MiIsMemoryTypeFree() helpers. --- ntoskrnl/mm/ARM3/mminit.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index bd5ab3caa88..30e17c6edff 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -421,20 +421,14 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Count this descriptor */ MiNumberDescriptors++; - /* Check if this is invisible memory */ - if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || - (Descriptor->MemoryType == LoaderSpecialMemory) || - (Descriptor->MemoryType == LoaderHALCachedMemory) || - (Descriptor->MemoryType == LoaderBBTMemory)) - { - /* Skip this descriptor */ + /* If this is invisible memory, skip this descriptor */ + if (MiIsMemoryTypeInvisible(Descriptor->MemoryType)) continue; - } - /* Check if this is bad memory */ + /* Check if this isn't bad memory */ if (Descriptor->MemoryType != LoaderBad) { - /* Count this in the total of pages */ + /* Count it in the physical pages */ MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount; } @@ -454,12 +448,9 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Check if this is free memory */ - if ((Descriptor->MemoryType == LoaderFree) || - (Descriptor->MemoryType == LoaderLoadedProgram) || - (Descriptor->MemoryType == LoaderFirmwareTemporary) || - (Descriptor->MemoryType == LoaderOsloaderStack)) + if (MiIsMemoryTypeFree(Descriptor->MemoryType)) { - /* Count it too free pages */ + /* Count it in the free pages */ MiNumberOfFreePages += Descriptor->PageCount; /* Check if this is the largest memory descriptor */

5 months, 3 weeks

[reactos] 03/09: [NTOS:KD64] Revamp the debugger banner helpers a little.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c53eb190c7a7dcd5752d3… commit c53eb190c7a7dcd5752d3c59281d2b6203c11102 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 28 21:52:22 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:47 2024 +0100 [NTOS:KD64] Revamp the debugger banner helpers a little. - Directly call KdpGetMemorySizeInMBs() within KdpPrintBanner(), instead of having the caller doing it. - Use the miarm.h MiIsMemoryTypeInvisible() helper. - Add Doxygen comments. --- ntoskrnl/kd64/kdinit.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c index 99ff187b962..c371d1526b2 100644 --- a/ntoskrnl/kd64/kdinit.c +++ b/ntoskrnl/kd64/kdinit.c @@ -25,14 +25,15 @@ /* UTILITY FUNCTIONS *********************************************************/ -/* - * Get the total size of the memory before - * Mm is initialized, by counting the number - * of physical pages. Useful for debug logging. +#include <mm/ARM3/miarm.h> // For MiIsMemoryTypeInvisible() + +/** + * @brief + * Retrieves the total size of the memory before Mm is initialized, + * by counting the number of physical pages. Useful for debug logging. * - * Strongly inspired by: - * mm\ARM3\mminit.c : MiScanMemoryDescriptors(...) - */ + * Adapted from mm/ARM3/mminit.c!MiScanMemoryDescriptors(). + **/ static SIZE_T KdpGetMemorySizeInMBs( @@ -63,20 +64,14 @@ KdpGetMemorySizeInMBs( MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - /* Check if this is invisible memory */ - if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || - (Descriptor->MemoryType == LoaderSpecialMemory) || - (Descriptor->MemoryType == LoaderHALCachedMemory) || - (Descriptor->MemoryType == LoaderBBTMemory)) - { - /* Skip this descriptor */ + /* If this is invisible memory, skip this descriptor */ + if (MiIsMemoryTypeInvisible(Descriptor->MemoryType)) continue; - } - /* Check if this is bad memory */ + /* Check if this isn't bad memory */ if (Descriptor->MemoryType != LoaderBad) { - /* Count this in the total of pages */ + /* Count it in the physical pages */ NumberOfPhysicalPages += Descriptor->PageCount; } } @@ -86,10 +81,16 @@ ReturnSize: return ALIGN_UP_BY(NumberOfPhysicalPages * PAGE_SIZE, 1024 * 1024) / (1024 * 1024); } +/** + * @brief + * Displays the kernel debugger initialization banner. + **/ static VOID -KdpPrintBanner(IN SIZE_T MemSizeMBs) +KdpPrintBanner(VOID) { + SIZE_T MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); + DPRINT1("-----------------------------------------------------\n"); DPRINT1("ReactOS " KERNEL_VERSION_STR " (Build " KERNEL_VERSION_BUILD_STR ") (Commit " KERNEL_VERSION_COMMIT_HASH ")\n"); DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); @@ -97,7 +98,9 @@ KdpPrintBanner(IN SIZE_T MemSizeMBs) if (KeLoaderBlock) { DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtHalPathName, KeLoaderBlock->ArcHalDeviceName, KeLoaderBlock->NtBootPathName); + DPRINT1("ARC Paths: %s %s %s %s\n", + KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtHalPathName, + KeLoaderBlock->ArcHalDeviceName, KeLoaderBlock->NtBootPathName); } } @@ -165,7 +168,6 @@ KdInitSystem( BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable = FALSE; PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG i; - SIZE_T MemSizeMBs; /* Check if this is Phase 1 */ if (BootPhase) @@ -401,9 +403,8 @@ KdInitSystem( /* Let user-mode know that it's enabled as well */ SharedUserData->KdDebuggerEnabled = TRUE; - /* Display separator + ReactOS version at start of the debug log */ - MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); - KdpPrintBanner(MemSizeMBs); + /* Display separator + ReactOS version at the start of the debug log */ + KdpPrintBanner(); /* Check if the debugger should be disabled initially */ if (DisableKdAfterInit)

5 months, 3 weeks

[reactos] 02/09: [NTOS:KD64] KdInitSystem(): Minor code enhancements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb0c9a4570b2c563c866d… commit cb0c9a4570b2c563c866d07d98be1b7729cbbc26 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 28 20:07:25 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:46 2024 +0100 [NTOS:KD64] KdInitSystem(): Minor code enhancements. - Move local variables to the code blocks where they are used. - if-s one-line bodies on their own lines. - Massage the boot-images symbols loading, using a for-loop. --- ntoskrnl/kd64/kdinit.c | 71 +++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c index 93f2bd7dfca..99ff187b962 100644 --- a/ntoskrnl/kd64/kdinit.c +++ b/ntoskrnl/kd64/kdinit.c @@ -162,21 +162,10 @@ KdInitSystem( _In_ ULONG BootPhase, _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable; - PSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd; - STRING ImageName; + BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable = FALSE; PLDR_DATA_TABLE_ENTRY LdrEntry; - PLIST_ENTRY NextEntry; - ULONG i, j, Length; - SIZE_T DebugOptionLength; + ULONG i; SIZE_T MemSizeMBs; - CHAR NameBuffer[256]; - PWCHAR Name; - -#if defined(__GNUC__) - /* Make gcc happy */ - BlockEnable = FALSE; -#endif /* Check if this is Phase 1 */ if (BootPhase) @@ -187,7 +176,8 @@ KdInitSystem( } /* Check if we already initialized once */ - if (KdDebuggerEnabled) return TRUE; + if (KdDebuggerEnabled) + return TRUE; /* Set the Debug Routine as the Stub for now */ KiDebugRoutine = KdpStub; @@ -233,6 +223,8 @@ KdInitSystem( /* Check if we have a loader block */ if (LoaderBlock) { + PSTR CommandLine, DebugLine; + /* Get the image entry */ LdrEntry = CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, @@ -263,7 +255,7 @@ KdInitSystem( /* Don't enable KD and don't let it be enabled later */ KdPitchDebugger = TRUE; } - else if ((DebugLine = strstr(CommandLine, "DEBUG")) != NULL) + else if ((DebugLine = strstr(CommandLine, "DEBUG"))) { /* Enable KD */ EnableKd = TRUE; @@ -272,11 +264,14 @@ KdInitSystem( if (DebugLine[5] == '=') { /* Save pointers */ + PSTR DebugOptionStart, DebugOptionEnd; DebugOptionStart = DebugOptionEnd = &DebugLine[6]; /* Scan the string for debug options */ for (;;) { + SIZE_T DebugOptionLength; + /* Loop until we reach the end of the string */ while (*DebugOptionEnd != ANSI_NULL) { @@ -287,7 +282,7 @@ KdInitSystem( { /* * We reached the end of the option or - * the end of the string, break out + * the end of the string, break out. */ break; } @@ -301,20 +296,19 @@ KdInitSystem( /* Calculate the length of the current option */ DebugOptionLength = (DebugOptionEnd - DebugOptionStart); - /* - * Break out if we reached the last option - * or if there were no options at all - */ - if (!DebugOptionLength) break; + /* + * Break out if we reached the last option + * or if there were no options at all. + */ + if (!DebugOptionLength) + break; /* Now check which option this is */ if ((DebugOptionLength == 10) && !(strncmp(DebugOptionStart, "AUTOENABLE", 10))) { - /* - * Disable the debugger, but - * allow it to be reenabled - */ + /* Disable the debugger, but + * allow to re-enable it later */ DisableKdAfterInit = TRUE; BlockEnable = FALSE; KdAutoEnableOnEvent = TRUE; @@ -335,14 +329,11 @@ KdInitSystem( } /* - * If there are more options then - * the next character should be a comma + * If there are more options then the next character + * should be a comma. Break out if it isn't. */ if (*DebugOptionEnd != ',') - { - /* It isn't, break out */ break; - } /* Move on to the next option */ DebugOptionEnd++; @@ -431,10 +422,16 @@ KdInitSystem( /* Check if we have a loader block */ if (LoaderBlock) { - /* Loop boot images */ - NextEntry = LoaderBlock->LoadOrderListHead.Flink; - i = 0; - while ((NextEntry != &LoaderBlock->LoadOrderListHead) && (i < 2)) + PLIST_ENTRY NextEntry; + ULONG j, Length; + PWCHAR Name; + STRING ImageName; + CHAR NameBuffer[256]; + + /* Loop over the first two boot images: HAL and kernel */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink, i = 0; + NextEntry != &LoaderBlock->LoadOrderListHead && (i < 2); + NextEntry = NextEntry->Flink, ++i) { /* Get the image entry */ LdrEntry = CONTAINING_RECORD(NextEntry, @@ -454,15 +451,11 @@ KdInitSystem( /* Null-terminate */ NameBuffer[j] = ANSI_NULL; - /* Load symbols for image */ + /* Load the symbols */ RtlInitString(&ImageName, NameBuffer); DbgLoadImageSymbols(&ImageName, LdrEntry->DllBase, (ULONG_PTR)PsGetCurrentProcessId()); - - /* Go to the next entry */ - NextEntry = NextEntry->Flink; - i++; } /* Check for incoming break-in and break on symbol load

5 months, 3 weeks

[reactos] 01/09: [FREELDR] peloader.c: Minor code enhancements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba342e1d14e9a36fb3ad6… commit ba342e1d14e9a36fb3ad6f739a5cd46a1a458b59 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 25 22:43:56 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 23:31:41 2024 +0100 [FREELDR] peloader.c: Minor code enhancements. PeLdrCheckForLoadedDll(): - Use a for-loop to iterate over the linked list. - Adjust few comments. - Use SAL2 annotations. PeLdrpCompareDllName(): - Make its input paramters const. - Use SAL2 annotations. --- boot/freeldr/freeldr/include/peloader.h | 6 ++--- boot/freeldr/freeldr/lib/peloader.c | 44 ++++++++++++++++----------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index b2374f74ceb..80792698c08 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -63,9 +63,9 @@ PeLdrScanImportDescriptorTable( BOOLEAN PeLdrCheckForLoadedDll( - IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); + _Inout_ PLIST_ENTRY ModuleListHead, + _In_ PCSTR DllName, + _Out_ PLDR_DATA_TABLE_ENTRY* LoadedEntry); PVOID PeLdrInitSecurityCookie( diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 06bcf41720b..279647d04ac 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -74,11 +74,11 @@ PeLdrpFetchAddressOfSecurityCookie(PVOID BaseAddress, ULONG SizeOfImage) return Cookie; } -/* DllName - physical, UnicodeString->Buffer - virtual */ +/* DllName: physical, UnicodeString->Buffer: virtual */ static BOOLEAN PeLdrpCompareDllName( - IN PCH DllName, - IN PUNICODE_STRING UnicodeName) + _In_ PCSTR DllName, + _In_ PCUNICODE_STRING UnicodeName) { PWSTR Buffer; SIZE_T i, Length; @@ -92,8 +92,8 @@ PeLdrpCompareDllName( UnicodeNamePA.Length = UnicodeName->Length; UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - TRACE("PeLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + TRACE("PeLdrpCompareDllName: %s and %wZ, Length = %d, UN->Length %d\n", + DllName, &UnicodeNamePA, Length, UnicodeName->Length); } #endif @@ -122,7 +122,7 @@ PeLdrpCompareDllName( return TRUE; } - /* Strings don't match, return FALSE */ + /* Strings don't match */ return FALSE; } @@ -582,27 +582,28 @@ PeLdrInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) return Cookie; } -/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ +/* Returns TRUE if the DLL has already been loaded in the module list */ BOOLEAN PeLdrCheckForLoadedDll( - IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) + _Inout_ PLIST_ENTRY ModuleListHead, + _In_ PCSTR DllName, + _Out_ PLDR_DATA_TABLE_ENTRY* LoadedEntry) { + PLIST_ENTRY ModuleEntry; PLDR_DATA_TABLE_ENTRY DataTableEntry; - LIST_ENTRY *ModuleEntry; TRACE("PeLdrCheckForLoadedDll: DllName %s\n", DllName); - /* Just go through each entry in the LoadOrderList and compare loaded module's - name with a given name */ - ModuleEntry = ModuleListHead->Flink; - while (ModuleEntry != ModuleListHead) + /* Go through each entry in the LoadOrderList and + * compare the module's name with the given name */ + for (ModuleEntry = ModuleListHead->Flink; + ModuleEntry != ModuleListHead; + ModuleEntry = ModuleEntry->Flink) { - /* Get pointer to the current DTE */ + /* Get a pointer to the current DTE */ DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); TRACE("PeLdrCheckForLoadedDll: DTE %p, EP %p, Base %p, Name '%.*S'\n", DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, @@ -612,16 +613,13 @@ PeLdrCheckForLoadedDll( /* Compare names */ if (PeLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) { - /* Yes, found it, report pointer to the loaded module's DTE - to the caller and increase load count for it */ + /* Found it, return a pointer to the loaded module's + * DTE to the caller and increase its load count */ *LoadedEntry = DataTableEntry; DataTableEntry->LoadCount++; TRACE("PeLdrCheckForLoadedDll: LoadedEntry 0x%p\n", DataTableEntry); return TRUE; } - - /* Go to the next entry */ - ModuleEntry = ModuleEntry->Flink; } /* Nothing found */

5 months, 3 weeks

[reactos] 01/01: [SETUPAPI] CM_Set_Class_Registry_PropertyW: Do not convert SD if ulLength is 0

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d376dfd6487d63c3374f… commit 4d376dfd6487d63c3374f62d75dcb82a4563aac3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 14 20:09:27 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 14 20:09:27 2024 +0100 [SETUPAPI] CM_Set_Class_Registry_PropertyW: Do not convert SD if ulLength is 0 --- dll/win32/setupapi/cfgmgr.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 0444611c184..f0b49db3fe9 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7975,17 +7975,21 @@ CM_Set_Class_Registry_PropertyW( if (ulProperty == CM_CRP_SECURITY_SDS) { - if (!ConvertStringSecurityDescriptorToSecurityDescriptorW((LPCWSTR)Buffer, - SDDL_REVISION_1, - &pSecurityDescriptor, - &SecurityDescriptorSize)) + if (ulLength != 0) { - ERR("ConvertStringSecurityDescriptorToSecurityDescriptorW() failed (Error %lu)\n", GetLastError()); - return CR_INVALID_DATA; + if (!ConvertStringSecurityDescriptorToSecurityDescriptorW((LPCWSTR)Buffer, + SDDL_REVISION_1, + &pSecurityDescriptor, + &SecurityDescriptorSize)) + { + ERR("ConvertStringSecurityDescriptorToSecurityDescriptorW() failed (Error %lu)\n", GetLastError()); + return CR_INVALID_DATA; + } + + Buffer = (PCVOID)pSecurityDescriptor; + ulLength = SecurityDescriptorSize; } - Buffer = (PCVOID)pSecurityDescriptor; - ulLength = SecurityDescriptorSize; ulProperty = CM_CRP_SECURITY; ulType = REG_BINARY; }

5 months, 3 weeks

[reactos] 01/01: [DRIVERS] Fix misusages of the RTL_REGISTRY_OPTIONAL flag.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4795177ced1da7d33a72b… commit 4795177ced1da7d33a72b652a6ebfaee3ce2612b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 13 22:33:26 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 14 19:12:11 2024 +0100 [DRIVERS] Fix misusages of the RTL_REGISTRY_OPTIONAL flag. See https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/nf-wdm-r… The RTL_REGISTRY_OPTIONAL applies to the first parameter of the RtlQueryRegistryValues() function, not to the Flags member of the table entries. However, a RTL_QUERY_REGISTRY_REQUIRED flag exists to mark values whose existence is NOT optional. Problematic usage was introduced in the following modules: drivers/input/i8042prt: Commit e7e959fb0 (r30000) drivers/input/kbdclass: Commit 5a77f871d (r18911) drivers/input/mouclass: Commit aeeab7d1f (r18906) drivers/input/sermouse: Commit 3f348259c (r19100) rosapps/drivers/green : Commit c8a90f769 (r21165) --- drivers/input/i8042prt/registry.c | 32 ++++++++++++++++---------------- drivers/input/kbdclass/kbdclass.c | 8 ++++---- drivers/input/mouclass/mouclass.c | 8 ++++---- drivers/input/sermouse/sermouse.c | 4 ++-- modules/rosapps/drivers/green/misc.c | 8 ++++---- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/input/i8042prt/registry.c b/drivers/input/i8042prt/registry.c index 48b6ebfd234..9a675daa742 100644 --- a/drivers/input/i8042prt/registry.c +++ b/drivers/input/i8042prt/registry.c @@ -55,105 +55,105 @@ ReadRegistryEntries( Parameters[0].Flags = RTL_QUERY_REGISTRY_SUBKEY; Parameters[0].Name = L"Parameters"; - Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[1].Name = L"KeyboardDataQueueSize"; Parameters[1].EntryContext = &Settings->KeyboardDataQueueSize; Parameters[1].DefaultType = REG_DWORD; Parameters[1].DefaultData = &DefaultKeyboardDataQueueSize; Parameters[1].DefaultLength = sizeof(ULONG); - Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[2].Name = L"KeyboardDeviceBaseName"; Parameters[2].EntryContext = &Settings->KeyboardDeviceBaseName; Parameters[2].DefaultType = REG_SZ; Parameters[2].DefaultData = (PVOID)DefaultKeyboardDeviceBaseName; Parameters[2].DefaultLength = 0; - Parameters[3].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[3].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[3].Name = L"MouseDataQueueSize"; Parameters[3].EntryContext = &Settings->MouseDataQueueSize; Parameters[3].DefaultType = REG_DWORD; Parameters[3].DefaultData = &DefaultMouseDataQueueSize; Parameters[3].DefaultLength = sizeof(ULONG); - Parameters[4].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[4].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[4].Name = L"MouseResolution"; Parameters[4].EntryContext = &Settings->MouseResolution; Parameters[4].DefaultType = REG_DWORD; Parameters[4].DefaultData = &DefaultMouseResolution; Parameters[4].DefaultLength = sizeof(ULONG); - Parameters[5].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[5].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[5].Name = L"MouseSynchIn100ns"; Parameters[5].EntryContext = &Settings->MouseSynchIn100ns; Parameters[5].DefaultType = REG_DWORD; Parameters[5].DefaultData = &DefaultMouseSynchIn100ns; Parameters[5].DefaultLength = sizeof(ULONG); - Parameters[6].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[6].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[6].Name = L"NumberOfButtons"; Parameters[6].EntryContext = &Settings->NumberOfButtons; Parameters[6].DefaultType = REG_DWORD; Parameters[6].DefaultData = &DefaultNumberOfButtons; Parameters[6].DefaultLength = sizeof(ULONG); - Parameters[7].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[7].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[7].Name = L"PointerDeviceBaseName"; Parameters[7].EntryContext = &Settings->PointerDeviceBaseName; Parameters[7].DefaultType = REG_SZ; Parameters[7].DefaultData = (PVOID)DefaultPointerDeviceBaseName; Parameters[7].DefaultLength = 0; - Parameters[8].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[8].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[8].Name = L"PollStatusIterations"; Parameters[8].EntryContext = &Settings->PollStatusIterations; Parameters[8].DefaultType = REG_DWORD; Parameters[8].DefaultData = &DefaultPollStatusIterations; Parameters[8].DefaultLength = sizeof(ULONG); - Parameters[9].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[9].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[9].Name = L"OverrideKeyboardType"; Parameters[9].EntryContext = &Settings->OverrideKeyboardType; Parameters[9].DefaultType = REG_DWORD; Parameters[9].DefaultData = &DefaultOverrideKeyboardType; Parameters[9].DefaultLength = sizeof(ULONG); - Parameters[10].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[10].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[10].Name = L"OverrideKeyboardSubtype"; Parameters[10].EntryContext = &Settings->OverrideKeyboardSubtype; Parameters[10].DefaultType = REG_DWORD; Parameters[10].DefaultData = &DefaultOverrideKeyboardSubtype; Parameters[10].DefaultLength = sizeof(ULONG); - Parameters[11].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[11].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[11].Name = L"PollingIterations"; Parameters[11].EntryContext = &Settings->PollingIterations; Parameters[11].DefaultType = REG_DWORD; Parameters[11].DefaultData = &DefaultPollingIterations; Parameters[11].DefaultLength = sizeof(ULONG); - Parameters[12].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[12].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[12].Name = L"PollingIterationsMaximum"; Parameters[12].EntryContext = &Settings->PollingIterationsMaximum; Parameters[12].DefaultType = REG_DWORD; Parameters[12].DefaultData = &DefaultPollingIterationsMaximum; Parameters[12].DefaultLength = sizeof(ULONG); - Parameters[13].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[13].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[13].Name = L"ResendIterations"; Parameters[13].EntryContext = &Settings->ResendIterations; Parameters[13].DefaultType = REG_DWORD; Parameters[13].DefaultData = &DefaultResendIterations; Parameters[13].DefaultLength = sizeof(ULONG); - Parameters[14].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[14].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[14].Name = L"SampleRate"; Parameters[14].EntryContext = &Settings->SampleRate; Parameters[14].DefaultType = REG_DWORD; Parameters[14].DefaultData = &DefaultSampleRate; Parameters[14].DefaultLength = sizeof(ULONG); - Parameters[15].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[15].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[15].Name = L"CrashOnCtrlScroll"; Parameters[15].EntryContext = &Settings->CrashOnCtrlScroll; Parameters[15].DefaultType = REG_DWORD; @@ -161,7 +161,7 @@ ReadRegistryEntries( Parameters[15].DefaultLength = sizeof(ULONG); Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, RegistryPath->Buffer, Parameters, NULL, diff --git a/drivers/input/kbdclass/kbdclass.c b/drivers/input/kbdclass/kbdclass.c index ccf83532aaf..357eb581cd1 100644 --- a/drivers/input/kbdclass/kbdclass.c +++ b/drivers/input/kbdclass/kbdclass.c @@ -254,21 +254,21 @@ ReadRegistryEntries( RtlZeroMemory(Parameters, sizeof(Parameters)); - Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[0].Name = L"ConnectMultiplePorts"; Parameters[0].EntryContext = &DriverExtension->ConnectMultiplePorts; Parameters[0].DefaultType = REG_DWORD; Parameters[0].DefaultData = &DefaultConnectMultiplePorts; Parameters[0].DefaultLength = sizeof(ULONG); - Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[1].Name = L"KeyboardDataQueueSize"; Parameters[1].EntryContext = &DriverExtension->DataQueueSize; Parameters[1].DefaultType = REG_DWORD; Parameters[1].DefaultData = &DefaultDataQueueSize; Parameters[1].DefaultLength = sizeof(ULONG); - Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[2].Name = L"KeyboardDeviceBaseName"; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; @@ -276,7 +276,7 @@ ReadRegistryEntries( Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, ParametersRegistryKey.Buffer, Parameters, NULL, diff --git a/drivers/input/mouclass/mouclass.c b/drivers/input/mouclass/mouclass.c index f84dcc30238..81e1e38618d 100644 --- a/drivers/input/mouclass/mouclass.c +++ b/drivers/input/mouclass/mouclass.c @@ -221,21 +221,21 @@ ReadRegistryEntries( RtlZeroMemory(Parameters, sizeof(Parameters)); - Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[0].Name = L"ConnectMultiplePorts"; Parameters[0].EntryContext = &DriverExtension->ConnectMultiplePorts; Parameters[0].DefaultType = REG_DWORD; Parameters[0].DefaultData = &DefaultConnectMultiplePorts; Parameters[0].DefaultLength = sizeof(ULONG); - Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[1].Name = L"MouseDataQueueSize"; Parameters[1].EntryContext = &DriverExtension->DataQueueSize; Parameters[1].DefaultType = REG_DWORD; Parameters[1].DefaultData = &DefaultDataQueueSize; Parameters[1].DefaultLength = sizeof(ULONG); - Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[2].Name = L"PointerDeviceBaseName"; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; @@ -243,7 +243,7 @@ ReadRegistryEntries( Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, ParametersRegistryKey.Buffer, Parameters, NULL, diff --git a/drivers/input/sermouse/sermouse.c b/drivers/input/sermouse/sermouse.c index c7e8b789a46..9b4868133d7 100644 --- a/drivers/input/sermouse/sermouse.c +++ b/drivers/input/sermouse/sermouse.c @@ -56,7 +56,7 @@ ReadRegistryEntries( RtlZeroMemory(Parameters, sizeof(Parameters)); - Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[0].Name = L"NumberOfButtons"; Parameters[0].EntryContext = &DriverExtension->NumberOfButtons; Parameters[0].DefaultType = REG_DWORD; @@ -64,7 +64,7 @@ ReadRegistryEntries( Parameters[0].DefaultLength = sizeof(ULONG); Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, ParametersRegistryKey.Buffer, Parameters, NULL, diff --git a/modules/rosapps/drivers/green/misc.c b/modules/rosapps/drivers/green/misc.c index b467146a742..50b84755bbf 100644 --- a/modules/rosapps/drivers/green/misc.c +++ b/modules/rosapps/drivers/green/misc.c @@ -85,18 +85,18 @@ ReadRegistryEntries( RtlZeroMemory(Parameters, sizeof(Parameters)); - Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; Parameters[0].Name = L"AttachedDevice"; Parameters[0].EntryContext = &DriverExtension->AttachedDeviceName; - Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[1].Name = L"DeviceReported"; Parameters[1].EntryContext = &DriverExtension->DeviceReported; Parameters[1].DefaultType = REG_DWORD; Parameters[1].DefaultData = &DefaultDeviceReported; Parameters[1].DefaultLength = sizeof(ULONG); - Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[2].Name = L"SampleRate"; Parameters[2].EntryContext = &DriverExtension->SampleRate; Parameters[2].DefaultType = REG_DWORD; @@ -104,7 +104,7 @@ ReadRegistryEntries( Parameters[2].DefaultLength = sizeof(ULONG); Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, + RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, ParametersRegistryKey.Buffer, Parameters, NULL,

5 months, 3 weeks

[reactos] 01/01: [SETUPAPI] CM_Set_Class_Registry_PropertyW: Implement SD conversion

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b96e648019152e20f984b… commit b96e648019152e20f984bdb1dab11167ab0b1722 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 14 13:52:55 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 14 13:52:55 2024 +0100 [SETUPAPI] CM_Set_Class_Registry_PropertyW: Implement SD conversion Convert text SD to binary SD for the CM_CRP_SECURITY_SDS property. --- dll/win32/setupapi/cfgmgr.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index bfd1da4a5f7..0444611c184 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7933,6 +7933,8 @@ CM_Set_Class_Registry_PropertyW( RPC_BINDING_HANDLE BindingHandle = NULL; WCHAR szGuidString[PNP_MAX_GUID_STRING_LEN + 1]; ULONG ulType = 0; + PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + ULONG SecurityDescriptorSize = 0; CONFIGRET ret; TRACE("CM_Set_Class_Registry_PropertyW(%p %lx %p %lu %lx %p)\n", @@ -7973,8 +7975,19 @@ CM_Set_Class_Registry_PropertyW( if (ulProperty == CM_CRP_SECURITY_SDS) { - FIXME("Conversion from text SD to binary SD is not implemented yet!\n"); - return CR_CALL_NOT_IMPLEMENTED; + if (!ConvertStringSecurityDescriptorToSecurityDescriptorW((LPCWSTR)Buffer, + SDDL_REVISION_1, + &pSecurityDescriptor, + &SecurityDescriptorSize)) + { + ERR("ConvertStringSecurityDescriptorToSecurityDescriptorW() failed (Error %lu)\n", GetLastError()); + return CR_INVALID_DATA; + } + + Buffer = (PCVOID)pSecurityDescriptor; + ulLength = SecurityDescriptorSize; + ulProperty = CM_CRP_SECURITY; + ulType = REG_BINARY; } RpcTryExcept @@ -7993,6 +8006,9 @@ CM_Set_Class_Registry_PropertyW( } RpcEndExcept; + if (pSecurityDescriptor) + LocalFree(pSecurityDescriptor); + return ret; }

5 months, 3 weeks

[reactos] 01/01: [USER32_APITEST] Improve RedrawWindow API test. Follow up of #7160 (#7297)

by Tomáš Veselý

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0540c212eae4c42c66abb… commit 0540c212eae4c42c66abbac41e9469e35dd44c31 Author: Tomáš Veselý <turican0(a)gmail.com> AuthorDate: Wed Dec 11 20:58:15 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 11 13:58:15 2024 -0600 [USER32_APITEST] Improve RedrawWindow API test. Follow up of #7160 (#7297) * extension-RedrawWindow-apitest-by-flags-update Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- modules/rostests/apitests/user32/RedrawWindow.c | 268 ++++++++++++------------ 1 file changed, 135 insertions(+), 133 deletions(-) diff --git a/modules/rostests/apitests/user32/RedrawWindow.c b/modules/rostests/apitests/user32/RedrawWindow.c index c5ce8d333f4..a36b6291e2a 100644 --- a/modules/rostests/apitests/user32/RedrawWindow.c +++ b/modules/rostests/apitests/user32/RedrawWindow.c @@ -34,7 +34,7 @@ WndProc( return DefWindowProcW(hWnd, message, wParam, lParam); } -void GetMessageRedrawWindowTest() +void GetMessageRedrawWindowTest(void) { HWND hWnd; MSG msg; @@ -52,9 +52,9 @@ void GetMessageRedrawWindowTest() ShowWindow(hWnd, SW_SHOW); - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - DispatchMessageA( &msg ); + DispatchMessageW(&msg); } ok(got_paint == TRUE, "Did not process WM_PAINT message\n"); @@ -66,7 +66,7 @@ void GetMessageRedrawWindowTest() ok(ret == TRUE, "RedrawWindow failed\n"); i = 0; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { RECORD_MESSAGE(1, msg.message, POST, 0, 0); if (msg.message == WM_PAINT) @@ -79,7 +79,7 @@ void GetMessageRedrawWindowTest() } if (msg.message != WM_PAINT || i >= 10) { - DispatchMessageA( &msg ); + DispatchMessageW(&msg); } } @@ -136,12 +136,13 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } } - return DefWindowProc(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } LRESULT CALLBACK ChildWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch (uMsg) { + switch (uMsg) + { case WM_SYNCPAINT: { PAINTSTRUCT ps; @@ -168,7 +169,7 @@ LRESULT CALLBACK ChildWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa return 0; } } - return DefWindowProc(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } typedef struct STRUCT_TestRedrawWindow @@ -223,10 +224,10 @@ void ServeSomeMessages(int messageTime, int messageCount) startTime = GetTickCount(); while (GetTickCount() - startTime < messageTime * messageCount) { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + if (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } else { @@ -235,7 +236,8 @@ void ServeSomeMessages(int messageTime, int messageCount) } } -void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { +void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) +{ DWORD style; int width; int height; @@ -252,7 +254,7 @@ void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { wc.hInstance = GetModuleHandle(NULL); wc.lpszClassName = ptestRW->testName; RegisterClassW(&wc); - RECT rectWin = { 0, 0, 800, 600 }; + RECT rectWin = { 0, 0, 700, 500 }; style = WS_OVERLAPPEDWINDOW; AdjustWindowRectEx(&rectWin, style, FALSE, 0); width = rectWin.right - rectWin.left; @@ -261,6 +263,7 @@ void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { CW_USEDEFAULT, CW_USEDEFAULT, width, height, NULL, NULL, GetModuleHandle(NULL), NULL); if (hwnd == NULL) return; + MoveWindow(hwnd, 10, 10, width, height, TRUE); ShowWindow(hwnd, SW_SHOW); if(!ptestRW->testChild) @@ -285,10 +288,12 @@ void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { GetModuleHandle(NULL), NULL ); + if (hChildWnd == NULL) + return; } HDC hdc = GetDC(hwnd); - RECT drect = { 0, 0, 800, 600 }; + RECT drect = { 0, 0, 700, 500 }; DrawContent(hdc, &drect, RGB(255, 0, 0)); ReleaseDC(hwnd, hdc); @@ -298,7 +303,7 @@ void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { RgnUpdate = CreateRectRgn(ptestRW->regRect.left, ptestRW->regRect.top, ptestRW->regRect.right, ptestRW->regRect.bottom); } - prect=NULL; + prect = NULL; if (ptestRW->useRect) { prect = &ptestRW->rectRect; @@ -337,7 +342,8 @@ void TestRedrawWindow(STRUCT_TestRedrawWindow* ptestRW) { ptestRW->resultWmNcPaint = resultWmNcPaint; ptestRW->resultPaintIndex = paintIndex; - if (RgnUpdate) DeleteObject(RgnUpdate); + if (RgnUpdate) + DeleteObject(RgnUpdate); if (hChildWnd != NULL) DestroyWindow(hChildWnd); @@ -425,14 +431,7 @@ UINT TestRedrawWindow2(STRUCT_TestRedrawWindow* ptestRW, STRUCT_TestRedrawWindow return countErrors; } -void InitRect(RECT *rect, int left, int top, int right, int bottom) { - rect->left = left; - rect->top = top; - rect->right = right; - rect->bottom = bottom; -} - -void FlagsRedrawWindowTest() +void FlagsRedrawWindowTest(void) { STRUCT_TestRedrawWindow testRW; STRUCT_TestRedrawWindowCompare testRWcompare; @@ -440,19 +439,22 @@ void FlagsRedrawWindowTest() testRW.testPixelPre1x = 50; testRW.testPixelPre1y = 50; testRW.testPixelPre2x = 50; - testRW.testPixelPre2y = 550; + testRW.testPixelPre2y = 400; testRW.testPixelPost1x = 50; testRW.testPixelPost1y = 50; testRW.testPixelPost2x = 50; - testRW.testPixelPost2y = 550; + testRW.testPixelPost2y = 400; + + trace("Screen Width/Height (%dx%d)\n", + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); // RDW_ERASE tests testRW.testName = L"Test1"; testRW.flags = 0; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -460,7 +462,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); + SetRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -470,9 +472,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test2"; testRW.flags = RDW_ERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -480,7 +482,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); + SetRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -490,9 +492,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test3"; testRW.flags = RDW_INVALIDATE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -500,7 +502,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -510,9 +512,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test4"; testRW.flags = RDW_INVALIDATE | RDW_ERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -520,7 +522,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = TRUE; testRWcompare.resultWmNcPaint = FALSE; @@ -531,9 +533,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test5"; testRW.flags = RDW_FRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -541,7 +543,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -551,9 +553,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test6"; testRW.flags = RDW_INVALIDATE | RDW_FRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -561,7 +563,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = TRUE; @@ -572,9 +574,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test7"; testRW.flags = RDW_INTERNALPAINT; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -582,7 +584,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -592,9 +594,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test8"; testRW.flags = RDW_INVALIDATE | RDW_INTERNALPAINT; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -602,7 +604,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -613,9 +615,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test9"; testRW.flags = RDW_NOERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -623,7 +625,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -633,9 +635,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test10"; testRW.flags = RDW_INVALIDATE | RDW_NOERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -643,7 +645,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -653,9 +655,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test11"; testRW.flags = RDW_NOERASE | RDW_ERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -663,7 +665,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -673,9 +675,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test12"; testRW.flags = RDW_INVALIDATE | RDW_NOERASE | RDW_ERASE; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -683,7 +685,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = TRUE; testRWcompare.resultWmNcPaint = FALSE; @@ -694,9 +696,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test13"; testRW.flags = RDW_NOFRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -704,7 +706,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -714,9 +716,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test14"; testRW.flags = RDW_INVALIDATE | RDW_NOFRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -724,7 +726,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -734,9 +736,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test15"; testRW.flags = RDW_INVALIDATE | RDW_VALIDATE | RDW_NOFRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -744,7 +746,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -754,9 +756,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test16"; testRW.flags = RDW_VALIDATE | RDW_NOFRAME; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -764,7 +766,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -775,9 +777,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test17"; testRW.flags = RDW_NOINTERNALPAINT; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -785,7 +787,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -795,9 +797,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test18"; testRW.flags = RDW_INVALIDATE | RDW_NOINTERNALPAINT; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -805,7 +807,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -815,9 +817,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test19"; testRW.flags = RDW_VALIDATE | RDW_NOINTERNALPAINT; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -825,7 +827,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -836,9 +838,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test20"; testRW.flags = RDW_ERASENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -846,7 +848,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -856,9 +858,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test21"; testRW.flags = RDW_INVALIDATE | RDW_ERASENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -866,7 +868,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -876,9 +878,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test22"; testRW.flags = RDW_VALIDATE | RDW_ERASENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -886,7 +888,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -897,9 +899,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test23"; testRW.flags = RDW_UPDATENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -907,7 +909,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -917,9 +919,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test24"; testRW.flags = RDW_INVALIDATE | RDW_UPDATENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -927,7 +929,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -937,9 +939,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test25"; testRW.flags = RDW_VALIDATE | RDW_UPDATENOW; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -947,7 +949,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -958,9 +960,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test26"; testRW.flags = RDW_NOCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -968,7 +970,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -978,9 +980,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test27"; testRW.flags = RDW_INVALIDATE | RDW_NOCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -988,7 +990,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x0000FF00; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -998,9 +1000,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test28"; testRW.flags = RDW_VALIDATE | RDW_NOCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1008,7 +1010,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1018,9 +1020,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test29"; testRW.flags = RDW_ALLCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1028,7 +1030,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1038,9 +1040,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test30"; testRW.flags = RDW_INVALIDATE | RDW_ALLCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1048,7 +1050,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPre1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1058,9 +1060,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test31"; testRW.flags = RDW_VALIDATE | RDW_ALLCHILDREN; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1068,7 +1070,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1078,9 +1080,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test32"; testRW.flags = RDW_NOCHILDREN; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1088,7 +1090,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1098,9 +1100,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test33"; testRW.flags = RDW_INVALIDATE | RDW_NOCHILDREN; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1108,7 +1110,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPre1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1118,9 +1120,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test34"; testRW.flags = RDW_VALIDATE | RDW_NOCHILDREN; testRW.useRegion = TRUE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = FALSE; - InitRect(&testRW.rectRect, 0, 0, 200, 200); + SetRect(&testRW.rectRect, 0, 0, 200, 200); testRW.forcePaint = TRUE; testRW.testChild = TRUE; @@ -1128,7 +1130,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x0000FF00; testRWcompare.resultColorPost1 = 0x00FF0000; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1139,9 +1141,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test35"; testRW.flags = 0; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = TRUE; - InitRect(&testRW.rectRect, 0, 500, 800, 600); + SetRect(&testRW.rectRect, 0, 300, 700, 500); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -1149,7 +1151,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x000000FF; - InitRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); + SetRect(&testRWcompare.resultUpdateRect, 0, 0, 200, 200); testRWcompare.resultNeedsUpdate = FALSE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE; @@ -1159,9 +1161,9 @@ void FlagsRedrawWindowTest() testRW.testName = L"Test36"; testRW.flags = RDW_INVALIDATE | RDW_ERASENOW; testRW.useRegion = FALSE; - InitRect(&testRW.regRect, 0, 500, 800, 600); + SetRect(&testRW.regRect, 0, 300, 700, 500); testRW.useRect = TRUE; - InitRect(&testRW.rectRect, 0, 500, 800, 600); + SetRect(&testRW.rectRect, 0, 300, 700, 500); testRW.forcePaint = TRUE; testRW.testChild = FALSE; @@ -1169,7 +1171,7 @@ void FlagsRedrawWindowTest() testRWcompare.resultColorPre2 = 0x000000FF; testRWcompare.resultColorPost1 = 0x000000FF; testRWcompare.resultColorPost2 = 0x0000FF00; - InitRect(&testRWcompare.resultUpdateRect, 0, 500, 800, 600); + SetRect(&testRWcompare.resultUpdateRect, 0, 300, 700, 500); testRWcompare.resultNeedsUpdate = TRUE; testRWcompare.resultWmEraseGnd = FALSE; testRWcompare.resultWmNcPaint = FALSE;

5 months, 3 weeks

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2024