Ros-diffs

ros-diffs@reactos.org

16 participants
81077 discussions

[reactos] 06/06: [NTOS:EX] Initialize ExpResourceTimeoutCount also via the "Session Manager/ResourceTimeoutCount" registry value (#4089)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bdfee8e8bec17c37b7b5… commit 4bdfee8e8bec17c37b7b57720f460fe3bded2e6a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 7 01:17:32 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:28 2023 +0200 [NTOS:EX] Initialize ExpResourceTimeoutCount also via the "Session Manager/ResourceTimeoutCount" registry value (#4089) For more details, see http://systemmanager.ru/win2k_regestry.en/29859.htm https://www.betaarchive.com/wiki/index.php/Microsoft_KB_Archive/102985#Reso… --- ntoskrnl/config/cmdata.c | 2 +- ntoskrnl/ex/resource.c | 15 ++++++++++----- ntoskrnl/include/internal/ex.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 28ac7041793..80c91534b44 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -561,7 +561,7 @@ DATA_SEG("INITDATA") CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = { L"Session Manager", L"ResourceTimeoutCount", - &DummyData, + &ExpResourceTimeoutCount, NULL, NULL }, diff --git a/ntoskrnl/ex/resource.c b/ntoskrnl/ex/resource.c index 5b90c89813c..2ea09a92053 100644 --- a/ntoskrnl/ex/resource.c +++ b/ntoskrnl/ex/resource.c @@ -18,7 +18,7 @@ #define IsOwnedExclusive(r) (r->Flag & ResourceOwnedExclusive) #define IsBoostAllowed(r) (!(r->Flag & ResourceHasDisabledPriorityBoost)) -#if (!(defined(CONFIG_SMP)) && !(DBG)) +#if !defined(CONFIG_SMP) && !DBG FORCEINLINE VOID @@ -65,13 +65,17 @@ ExReleaseResourceLock(IN PERESOURCE Resource, /* Release the lock */ KeReleaseInStackQueuedSpinLock(LockHandle); } -#endif + +#endif // !defined(CONFIG_SMP) && !DBG /* DATA***********************************************************************/ LARGE_INTEGER ExShortTime = {{-100000, -1}}; LARGE_INTEGER ExpTimeout; -ULONG ExpResourceTimeoutCount = 90 * 3600 / 2; + +/* Timeout value for resources in 4-second units (7 days) */ +ULONG ExpResourceTimeoutCount = 90 * 3600 / 2; // NT value: 648000 (30 days) + KSPIN_LOCK ExpResourceSpinLock; LIST_ENTRY ExpSystemResourcesList; BOOLEAN ExResourceStrict = TRUE; @@ -631,7 +635,7 @@ ExpWaitForResource(IN PERESOURCE Resource, /* Increase contention count and use a 5 second timeout */ Resource->ContentionCount++; - Timeout.QuadPart = 500 * -10000; + Timeout.QuadPart = 500 * -10000LL; for (;;) { /* Wait for ownership */ @@ -640,7 +644,8 @@ ExpWaitForResource(IN PERESOURCE Resource, KernelMode, FALSE, &Timeout); - if (Status != STATUS_TIMEOUT) break; + if (Status != STATUS_TIMEOUT) + break; /* Increase wait count */ WaitCount++; diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 03d9d29a8b5..f80cc7f8efd 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -19,6 +19,7 @@ extern ERESOURCE ExpFirmwareTableResource; extern ERESOURCE ExpTimeRefreshLock; extern LIST_ENTRY ExpFirmwareTableProviderListHead; extern BOOLEAN ExpIsWinPEMode; +extern ULONG ExpResourceTimeoutCount; extern LIST_ENTRY ExpSystemResourcesList; extern ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; extern ULONG ExpUnicodeCaseTableDataOffset;

1 year, 3 months

[reactos] 05/06: [RTL] Satisfy the RtlpTimeoutDisable condition when waiting for critical sections (#4089)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56417bfb930f62acd80ce… commit 56417bfb930f62acd80ce261a64d2c3437786555 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 6 19:40:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:28 2023 +0200 [RTL] Satisfy the RtlpTimeoutDisable condition when waiting for critical sections (#4089) --- sdk/lib/rtl/critical.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index c431b3a66df..c70ff191bbc 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -158,14 +158,14 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) Status = NtWaitForKeyedEvent(NULL, CriticalSection, FALSE, - &RtlpTimeout); + (RtlpTimeoutDisable ? NULL : &RtlpTimeout)); } else { /* Wait on the Event */ Status = NtWaitForSingleObject(CriticalSection->LockSemaphore, FALSE, - &RtlpTimeout); + (RtlpTimeoutDisable ? NULL : &RtlpTimeout)); } /* We have Timed out */

1 year, 3 months

[reactos] 04/06: [NTDLL][RTL] Move RtlpTimeoutDisable definition to the RTL (#4089)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dff55c9d335ccf729b580… commit dff55c9d335ccf729b580455757346f4188406c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 6 18:12:53 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:27 2023 +0200 [NTDLL][RTL] Move RtlpTimeoutDisable definition to the RTL (#4089) --- dll/ntdll/ldr/ldrinit.c | 2 +- sdk/lib/rtl/critical.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index d5a6b37d923..2dc616a4afd 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -55,7 +55,7 @@ ULONG LdrpNumberOfTlsEntries; ULONG LdrpNumberOfProcessors; PVOID NtDllBase; extern LARGE_INTEGER RtlpTimeout; -BOOLEAN RtlpTimeoutDisable; +extern BOOLEAN RtlpTimeoutDisable; PVOID LdrpHeap; LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; LIST_ENTRY LdrpDllNotificationList; diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index 6ff4737697a..c431b3a66df 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -21,7 +21,9 @@ static LIST_ENTRY RtlCriticalSectionList = {&RtlCriticalSectionList, &RtlCritica static BOOLEAN RtlpCritSectInitialized = FALSE; static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS]; static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; + LARGE_INTEGER RtlpTimeout; +BOOLEAN RtlpTimeoutDisable; extern BOOLEAN LdrpShutdownInProgress; extern HANDLE LdrpShutdownThreadId;

1 year, 3 months

[reactos] 03/06: [NTDLL:LDR] Fix process LoadConfig CS timeout conversion from ms to 100ns units (#4089)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f89a48349c0b16ce5937… commit 6f89a48349c0b16ce59378cbfa842823f38bbadf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 6 18:43:35 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:26 2023 +0200 [NTDLL:LDR] Fix process LoadConfig CS timeout conversion from ms to 100ns units (#4089) For more details, see https://forums.codeguru.com/showthread.php?370731-EnterCriticalSection-lock… --- dll/ntdll/ldr/ldrinit.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index ed9774fc0c2..d5a6b37d923 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1839,7 +1839,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, /* ReactOS specific: do not clear it. (Windows starts doing the same in later versions) */ //Peb->pShimData = NULL; - /* Save the number of processors and CS Timeout */ + /* Save the number of processors and CS timeout */ LdrpNumberOfProcessors = Peb->NumberOfProcessors; RtlpTimeout = Peb->CriticalSectionTimeout; @@ -1894,8 +1894,9 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (VALID_CONFIG_FIELD(GlobalFlagsClear) && LoadConfig->GlobalFlagsClear) Peb->NtGlobalFlag &= ~LoadConfig->GlobalFlagsClear; + /* Convert the default CS timeout from milliseconds to 100ns units */ if (VALID_CONFIG_FIELD(CriticalSectionDefaultTimeout) && LoadConfig->CriticalSectionDefaultTimeout) - RtlpTimeout.QuadPart = Int32x32To64(LoadConfig->CriticalSectionDefaultTimeout, -10000000); + RtlpTimeout.QuadPart = Int32x32To64(LoadConfig->CriticalSectionDefaultTimeout, -10000); if (VALID_CONFIG_FIELD(DeCommitFreeBlockThreshold) && LoadConfig->DeCommitFreeBlockThreshold) HeapParameters.DeCommitFreeBlockThreshold = LoadConfig->DeCommitFreeBlockThreshold; @@ -1935,12 +1936,9 @@ LdrpInitializeProcess(IN PCONTEXT Context, &CommandLine); } - /* If the timeout is too long */ + /* If the CS timeout is longer than 1 hour, disable it */ if (RtlpTimeout.QuadPart < Int32x32To64(3600, -10000000)) - { - /* Then disable CS Timeout */ RtlpTimeoutDisable = TRUE; - } /* Initialize Critical Section Data */ RtlpInitDeferredCriticalSection();

1 year, 3 months

[reactos] 02/06: [NTOS:EX] Minor header formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5c75ce506c37ff8d4e70… commit b5c75ce506c37ff8d4e703e467694ac07185112c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 7 04:21:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:25 2023 +0200 [NTOS:EX] Minor header formatting. --- ntoskrnl/include/internal/ex.h | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 66728280125..03d9d29a8b5 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -72,35 +72,35 @@ extern ULONG_PTR ExpDebuggerPageIn; VOID NTAPI ExpDebuggerWorker(IN PVOID Context); #ifdef _WIN64 -#define HANDLE_LOW_BITS (PAGE_SHIFT - 4) -#define HANDLE_HIGH_BITS (PAGE_SHIFT - 3) +#define HANDLE_LOW_BITS (PAGE_SHIFT - 4) +#define HANDLE_HIGH_BITS (PAGE_SHIFT - 3) #else -#define HANDLE_LOW_BITS (PAGE_SHIFT - 3) -#define HANDLE_HIGH_BITS (PAGE_SHIFT - 2) +#define HANDLE_LOW_BITS (PAGE_SHIFT - 3) +#define HANDLE_HIGH_BITS (PAGE_SHIFT - 2) #endif -#define HANDLE_TAG_BITS (2) -#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2*HANDLE_HIGH_BITS) -#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) +#define HANDLE_TAG_BITS (2) +#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2*HANDLE_HIGH_BITS) +#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) typedef union _EXHANDLE { - struct - { - ULONG_PTR TagBits: HANDLE_TAG_BITS; - ULONG_PTR Index: HANDLE_INDEX_BITS; - ULONG_PTR KernelFlag : KERNEL_FLAG_BITS; - }; - struct - { - ULONG_PTR TagBits2: HANDLE_TAG_BITS; - ULONG_PTR LowIndex: HANDLE_LOW_BITS; - ULONG_PTR MidIndex: HANDLE_HIGH_BITS; - ULONG_PTR HighIndex: HANDLE_HIGH_BITS; - ULONG_PTR KernelFlag2: KERNEL_FLAG_BITS; - }; - HANDLE GenericHandleOverlay; - ULONG_PTR Value; - ULONG AsULONG; + struct + { + ULONG_PTR TagBits: HANDLE_TAG_BITS; + ULONG_PTR Index: HANDLE_INDEX_BITS; + ULONG_PTR KernelFlag: KERNEL_FLAG_BITS; + }; + struct + { + ULONG_PTR TagBits2: HANDLE_TAG_BITS; + ULONG_PTR LowIndex: HANDLE_LOW_BITS; + ULONG_PTR MidIndex: HANDLE_HIGH_BITS; + ULONG_PTR HighIndex: HANDLE_HIGH_BITS; + ULONG_PTR KernelFlag2: KERNEL_FLAG_BITS; + }; + HANDLE GenericHandleOverlay; + ULONG_PTR Value; + ULONG AsULONG; } EXHANDLE, *PEXHANDLE; typedef struct _ETIMER @@ -131,12 +131,12 @@ typedef struct _HARDERROR_USER_PARAMETERS #define MAX_FAST_REFS 7 -#define ExAcquireRundownProtection _ExAcquireRundownProtection -#define ExReleaseRundownProtection _ExReleaseRundownProtection -#define ExInitializeRundownProtection _ExInitializeRundownProtection -#define ExWaitForRundownProtectionRelease _ExWaitForRundownProtectionRelease -#define ExRundownCompleted _ExRundownCompleted -#define ExGetPreviousMode KeGetPreviousMode +#define ExAcquireRundownProtection _ExAcquireRundownProtection +#define ExReleaseRundownProtection _ExReleaseRundownProtection +#define ExInitializeRundownProtection _ExInitializeRundownProtection +#define ExWaitForRundownProtectionRelease _ExWaitForRundownProtectionRelease +#define ExRundownCompleted _ExRundownCompleted +#define ExGetPreviousMode KeGetPreviousMode // @@ -159,9 +159,9 @@ typedef struct _HARDERROR_USER_PARAMETERS #define MAX_MID_INDEX (MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) -#define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&x->Ptr, (PVOID)y, (PVOID)z) -#define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)x, (PVOID)y, (PVOID)z) -#define ExpSetRundown(x, y) InterlockedExchangePointer(&x->Ptr, (PVOID)y) +#define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&x->Ptr, (PVOID)y, (PVOID)z) +#define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)x, (PVOID)y, (PVOID)z) +#define ExpSetRundown(x, y) InterlockedExchangePointer(&x->Ptr, (PVOID)y) NTSTATUS NTAPI

1 year, 3 months

[reactos] 01/06: [NTDLL][RTL] Fix english typo in (internal) function name.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=903a3dc622ae7d0a8244a… commit 903a3dc622ae7d0a8244aec877af8f8714b0dbfa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 6 18:52:27 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:18 2023 +0200 [NTDLL][RTL] Fix english typo in (internal) function name. --- dll/ntdll/ldr/ldrinit.c | 4 ++-- sdk/lib/rtl/critical.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index b41166c06ad..ed9774fc0c2 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -86,7 +86,7 @@ ULONG LdrpActiveUnloadCount; //extern LIST_ENTRY RtlCriticalSectionList; VOID NTAPI RtlpInitializeVectoredExceptionHandling(VOID); -VOID NTAPI RtlpInitDeferedCriticalSection(VOID); +VOID NTAPI RtlpInitDeferredCriticalSection(VOID); VOID NTAPI RtlInitializeHeapManager(VOID); ULONG RtlpDisableHeapLookaside; // TODO: Move to heap.c @@ -1943,7 +1943,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, } /* Initialize Critical Section Data */ - RtlpInitDeferedCriticalSection(); + RtlpInitDeferredCriticalSection(); /* Initialize VEH Call lists */ RtlpInitializeVectoredExceptionHandling(); diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index 0d2ca9913ad..6ff4737697a 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -251,7 +251,7 @@ RtlpUnWaitCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) } /*++ - * RtlpInitDeferedCriticalSection + * RtlpInitDeferredCriticalSection * * Initializes the Critical Section implementation. * @@ -267,7 +267,7 @@ RtlpUnWaitCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) *--*/ VOID NTAPI -RtlpInitDeferedCriticalSection(VOID) +RtlpInitDeferredCriticalSection(VOID) { /* Initialize the CS Protecting the List */ RtlInitializeCriticalSection(&RtlCriticalSectionLock);

1 year, 3 months

[reactos] 01/01: [DXGTHK] Export DriverEntry (#5607)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4d7cccd3ce13f4835c83… commit f4d7cccd3ce13f4835c834a3e8a28b5d2472c590 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Thu Sep 21 13:25:21 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 14:25:21 2023 +0300 [DXGTHK] Export DriverEntry (#5607) Export driver entry point function DriverEntry from our dxgthk.sys, following Windows behaviur. It is exported on XP SP3 and Server 2003. --- win32ss/reactx/dxgthk/dxgthk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/reactx/dxgthk/dxgthk.spec b/win32ss/reactx/dxgthk/dxgthk.spec index 481520bcd85..dabba56291f 100644 --- a/win32ss/reactx/dxgthk/dxgthk.spec +++ b/win32ss/reactx/dxgthk/dxgthk.spec @@ -1,3 +1,4 @@ +@ stdcall DriverEntry(ptr ptr) @ stdcall EngAcquireSemaphore(ptr) win32k.EngAcquireSemaphore @ stdcall EngAllocMem(long long long) win32k.EngAllocMem @ stdcall EngAllocUserMem(long long) win32k.EngAllocUserMem

1 year, 3 months

[reactos] 01/01: [SHELL32] SHChangeRegistrationReceive just returns FALSE

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=539123c62f2efc4604cdb… commit 539123c62f2efc4604cdb658ed8249e1f906006f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 12:09:28 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 21 12:09:28 2023 +0900 [SHELL32] SHChangeRegistrationReceive just returns FALSE --- dll/win32/shell32/changenotify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index 4666771734b..d21c3aaa2d2 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -592,8 +592,8 @@ static LPCSTR DumpEvent(LONG event) EXTERN_C BOOL WINAPI SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) { - FIXME("SHChangeRegistrationReceive() stub\n"); - return FALSE; + TRACE("\n"); + return FALSE; /* Just return FALSE */ } EXTERN_C VOID WINAPI

1 year, 3 months

[reactos] 01/01: [SHELL32][SDK] Implement SHGetShellStyleHInstance (#5707)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29e1a41d0774c7eee432b… commit 29e1a41d0774c7eee432b204a3eff26bd4cdd95b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 09:22:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 09:22:33 2023 +0900 [SHELL32][SDK] Implement SHGetShellStyleHInstance (#5707) Co-authored-by: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> This PR supersedes PR #3851. - Implement SHGetShellStyleHInstance function. - Add SHGetShellStyleHInstance prototype to <shlobj.h>. CORE-17707 --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ sdk/include/psdk/shlobj.h | 4 ++++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index a49a506928e..a048e2c5274 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1202,14 +1202,3 @@ DWORD WINAPI SHGetComputerDisplayNameW(DWORD param1, DWORD param2, DWORD param3, FIXME("SHGetComputerDisplayNameW() stub\n"); return E_FAIL; } - -/* - * Unimplemented - */ -EXTERN_C HINSTANCE -WINAPI -SHGetShellStyleHInstance(VOID) -{ - FIXME("SHGetShellStyleHInstance() stub\n"); - return NULL; -} diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 4140fcaa274..edb1f64b87d 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,6 +9,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/************************************************************************* + * SHGetShellStyleHInstance (SHELL32.749) + */ +EXTERN_C HINSTANCE +WINAPI +SHGetShellStyleHInstance(VOID) +{ + HINSTANCE hInst = NULL; + WCHAR szPath[MAX_PATH], szColorName[100]; + HRESULT hr; + CStringW strShellStyle; + + TRACE("SHGetShellStyleHInstance called\n"); + + /* First, attempt to load the shellstyle dll from the current active theme */ + hr = GetCurrentThemeName(szPath, _countof(szPath), szColorName, _countof(szColorName), NULL, 0); + if (FAILED(hr)) + goto DoDefault; + + /* Strip the theme filename */ + PathRemoveFileSpecW(szPath); + + strShellStyle = szPath; + strShellStyle += L"\\Shell\\"; + strShellStyle += szColorName; + strShellStyle += L"\\ShellStyle.dll"; + + hInst = LoadLibraryExW(strShellStyle, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hInst) + return hInst; + + /* Otherwise, use the version stored in the System32 directory */ +DoDefault: + if (!ExpandEnvironmentStringsW(L"%SystemRoot%\\System32\\ShellStyle.dll", + szPath, _countof(szPath))) + { + ERR("Expand failed\n"); + return NULL; + } + return LoadLibraryExW(szPath, NULL, LOAD_LIBRARY_AS_DATAFILE); +} + /************************************************************************* * SHCreatePropertyBag (SHELL32.715) */ diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 26745ce3390..601fd58f30c 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -336,6 +336,10 @@ SHOpenFolderAndSelectItems( int WINAPI PathCleanupSpec(_In_opt_ LPCWSTR, _Inout_ LPWSTR); +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) && (_WIN32_WINNT <= _WIN32_WINNT_WS03) +HINSTANCE WINAPI SHGetShellStyleHInstance(VOID); +#endif + /***************************************************************************** * IContextMenu interface */

1 year, 3 months

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement Int64ToString (#5706)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c55a3aa2ad4afb06a931… commit 6c55a3aa2ad4afb06a931ec648055abf63e42651 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 09:14:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 09:14:40 2023 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement Int64ToString (#5706) - Implement Int64ToString and LargeIntegerToString functions. - Add Int64ToString and LargeIntegerToString prototypes to <shellundoc.h>. - Add Int64ToString testcase. - I found a bug in GetNumberFormat.LeadingZero. http://undoc.airesoft.co.uk/shell32.dll/Int64ToString.php http://undoc.airesoft.co.uk/shell32.dll/LargeIntegerToString.php --- dll/win32/shell32/stubs.cpp | 32 ---- dll/win32/shell32/utils.cpp | 156 +++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/Int64ToString.cpp | 194 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 26 +++ 6 files changed, 379 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 4c019e9b031..a49a506928e 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -949,38 +949,6 @@ Printers_GetPidl(LPCITEMIDLIST pidl, LPCWSTR lpName, DWORD dwUnknown1, DWORD dwU return NULL; } -/* - * Unimplemented - */ -EXTERN_C INT -WINAPI -Int64ToString(LONGLONG llInt64, - LPWSTR lpOut, - UINT uSize, - BOOL bUseFormat, - NUMBERFMT *pNumberFormat, - DWORD dwNumberFlags) -{ - FIXME("Int64ToString() stub\n"); - return 0; -} - -/* - * Unimplemented - */ -EXTERN_C INT -WINAPI -LargeIntegerToString(LARGE_INTEGER *pLargeInt, - LPWSTR lpOut, - UINT uSize, - BOOL bUseFormat, - NUMBERFMT *pNumberFormat, - DWORD dwNumberFlags) -{ - FIXME("LargeIntegerToString() stub\n"); - return 0; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index c21e679a07b..4140fcaa274 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -99,3 +99,159 @@ SHFindComputer(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch) return SUCCEEDED(hr); } + +static HRESULT +Int64ToStr( + _In_ LONGLONG llValue, + _Out_writes_z_(cchValue) LPWSTR pszValue, + _In_ UINT cchValue) +{ + WCHAR szBuff[40]; + UINT ich = 0, ichValue; +#if (WINVER >= _WIN32_WINNT_VISTA) + BOOL bMinus = (llValue < 0); + + if (bMinus) + llValue = -llValue; +#endif + + if (cchValue <= 0) + return E_FAIL; + + do + { + szBuff[ich++] = (WCHAR)(L'0' + (llValue % 10)); + llValue /= 10; + } while (llValue != 0 && ich < _countof(szBuff) - 1); + +#if (WINVER >= _WIN32_WINNT_VISTA) + if (bMinus && ich < _countof(szBuff)) + szBuff[ich++] = '-'; +#endif + + for (ichValue = 0; ich > 0 && ichValue < cchValue; ++ichValue) + { + --ich; + pszValue[ichValue] = szBuff[ich]; + } + + if (ichValue >= cchValue) + { + pszValue[cchValue - 1] = UNICODE_NULL; + return E_FAIL; + } + + pszValue[ichValue] = UNICODE_NULL; + return S_OK; +} + +static VOID +Int64GetNumFormat( + _Out_ NUMBERFMTW *pDest, + _In_opt_ const NUMBERFMTW *pSrc, + _In_ DWORD dwNumberFlags, + _Out_writes_z_(cchDecimal) LPWSTR pszDecimal, + _In_ INT cchDecimal, + _Out_writes_z_(cchThousand) LPWSTR pszThousand, + _In_ INT cchThousand) +{ + WCHAR szBuff[20]; + + if (pSrc) + *pDest = *pSrc; + else + dwNumberFlags = 0; + + if (!(dwNumberFlags & FMT_USE_NUMDIGITS)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, szBuff, _countof(szBuff)); + pDest->NumDigits = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_LEADZERO)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO, szBuff, _countof(szBuff)); + pDest->LeadingZero = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_GROUPING)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuff, _countof(szBuff)); + pDest->Grouping = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_DECIMAL)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, pszDecimal, cchDecimal); + pDest->lpDecimalSep = pszDecimal; + } + + if (!(dwNumberFlags & FMT_USE_THOUSAND)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, pszThousand, cchThousand); + pDest->lpThousandSep = pszThousand; + } + + if (!(dwNumberFlags & FMT_USE_NEGNUMBER)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, szBuff, _countof(szBuff)); + pDest->NegativeOrder = StrToIntW(szBuff); + } +} + +/************************************************************************* + * Int64ToString [SHELL32.209] + * + * @see http://undoc.airesoft.co.uk/shell32.dll/Int64ToString.php + */ +EXTERN_C +INT WINAPI +Int64ToString( + _In_ LONGLONG llValue, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags) +{ + INT ret; + NUMBERFMTW NumFormat; + WCHAR szValue[80], szDecimalSep[6], szThousandSep[6]; + + Int64ToStr(llValue, szValue, _countof(szValue)); + + if (bUseFormat) + { + Int64GetNumFormat(&NumFormat, pNumberFormat, dwNumberFlags, + szDecimalSep, _countof(szDecimalSep), + szThousandSep, _countof(szThousandSep)); + ret = GetNumberFormatW(LOCALE_USER_DEFAULT, 0, szValue, &NumFormat, pszOut, cchOut); + if (ret) + --ret; + return ret; + } + + if (FAILED(StringCchCopyW(pszOut, cchOut, szValue))) + return 0; + + return lstrlenW(pszOut); +} + +/************************************************************************* + * LargeIntegerToString [SHELL32.210] + * + * @see http://undoc.airesoft.co.uk/shell32.dll/LargeIntegerToString.php + */ +EXTERN_C +INT WINAPI +LargeIntegerToString( + _In_ const LARGE_INTEGER *pLargeInt, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags) +{ + return Int64ToString(pLargeInt->QuadPart, pszOut, cchOut, bUseFormat, + pNumberFormat, dwNumberFlags); +} diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 602e25ad199..07ba4a96ca6 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -16,6 +16,7 @@ list(APPEND SOURCE ExtractIconEx.cpp FindExecutable.cpp GetDisplayNameOf.cpp + Int64ToString.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp diff --git a/modules/rostests/apitests/shell32/Int64ToString.cpp b/modules/rostests/apitests/shell32/Int64ToString.cpp new file mode 100644 index 00000000000..19ff028db6f --- /dev/null +++ b/modules/rostests/apitests/shell32/Int64ToString.cpp @@ -0,0 +1,194 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for Int64ToString + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <undocshell.h> +#include <versionhelpers.h> + +typedef struct tagTEST_RETURN +{ + INT ret; + LPCWSTR text; +} TEST_RETURN, *PTEST_RETURN; + +typedef struct tagTEST_ENTRY +{ + INT lineno; + LONGLONG value; + + UINT NumDigits; + UINT LeadingZero; + UINT Grouping; + LPCWSTR pszDecimalSep; + LPCWSTR pszThousandSep; + UINT NegativeOrder; + + TEST_RETURN NonVista; + TEST_RETURN Vista; +} TEST_ENTRY, *PTEST_ENTRY; + +#define DATA0 2, FALSE, 3, L".", L",", 0 +#define DATA1 3, TRUE, 3, L"<>", L":", 1 + +static const TEST_ENTRY s_Entries[] = +{ + { __LINE__, 0, DATA0, { 3, L".00" }, { 3, L".00" } }, + { __LINE__, 0, DATA1, { 6, L"0<>000" }, { 6, L"0<>000" } }, + { __LINE__, 1, DATA0, { 4, L"1.00" }, { 4, L"1.00" } }, + { __LINE__, 1, DATA1, { 6, L"1<>000" }, { 6, L"1<>000" } }, + { __LINE__, -999, DATA0, { 0, L"#####" }, { 8, L"(999.00)" } }, + { __LINE__, -999, DATA1, { 0, L"#####" }, { 9, L"-999<>000" } }, + { __LINE__, 100000, DATA0, { 10, L"100,000.00" }, { 10, L"100,000.00" } }, + { __LINE__, 100000, DATA1, { 12, L"100:000<>000" }, { 12, L"100:000<>000" } }, + { __LINE__, 0xE8D4A51000LL, DATA0, { 20, L"1,000,000,000,000.00" }, { 20, L"1,000,000,000,000.00" } }, + { __LINE__, 0xE8D4A51000LL, DATA1, { 22, L"1:000:000:000:000<>000" }, { 22, L"1:000:000:000:000<>000" } }, + { __LINE__, 0x7FFFFFFFFFFFFFFFLL, DATA0, { 28, L"9,223,372,036,854,775,807.00" }, { 28, L"9,223,372,036,854,775,807.00" } }, + { __LINE__, 0x7FFFFFFFFFFFFFFFLL, DATA1, { 30, L"9:223:372:036:854:775:807<>000" }, { 30, L"9:223:372:036:854:775:807<>000" } }, +}; +static const SIZE_T s_cEntries = _countof(s_Entries); + +static void DoTestEntry(BOOL bVista, const TEST_ENTRY *pEntry) +{ + INT lineno = pEntry->lineno; + + WCHAR szDecimalSep[10], szThousandSep[10]; + lstrcpynW(szDecimalSep, pEntry->pszDecimalSep, _countof(szDecimalSep)); + lstrcpynW(szThousandSep, pEntry->pszThousandSep, _countof(szThousandSep)); + + NUMBERFMTW format = + { + pEntry->NumDigits, pEntry->LeadingZero, pEntry->Grouping, + szDecimalSep, szThousandSep, pEntry->NegativeOrder + }; + + WCHAR szBuff[64]; + lstrcpynW(szBuff, L"#####", _countof(szBuff)); + + INT ret = Int64ToString(pEntry->value, szBuff, _countof(szBuff), TRUE, &format, -1); + if (bVista) + { + ok(pEntry->Vista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->Vista.ret, ret); + ok(lstrcmpW(pEntry->Vista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->Vista.text, szBuff); + } + else + { + ok(pEntry->NonVista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->NonVista.ret, ret); + ok(lstrcmpW(pEntry->NonVista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->NonVista.text, szBuff); + } + + lstrcpynW(szBuff, L"#####", _countof(szBuff)); + + LARGE_INTEGER LInt; + LInt.QuadPart = pEntry->value; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), TRUE, &format, -1); + if (bVista) + { + ok(pEntry->Vista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->Vista.ret, ret); + ok(lstrcmpW(pEntry->Vista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->Vista.text, szBuff); + } + else + { + ok(pEntry->NonVista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->NonVista.ret, ret); + ok(lstrcmpW(pEntry->NonVista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->NonVista.text, szBuff); + } +} + +static void Test_EntryTest(BOOL bVista) +{ + for (SIZE_T i = 0; i < s_cEntries; ++i) + { + DoTestEntry(bVista, &s_Entries[i]); + } +} + +static void Test_Int64ToString(BOOL bVista) +{ + WCHAR szBuff[64]; + INT ret; + + ret = Int64ToString(0, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"0"); + + ret = Int64ToString(1, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"1"); + + ret = Int64ToString(-9999, szBuff, _countof(szBuff), FALSE, NULL, 0); + if (bVista) + { + ok_int(ret, 5); + ok_wstr(szBuff, L"-9999"); + } + else + { + ok_int(ret, 4); + ok_wstr(szBuff, L"''''"); + } + + ret = Int64ToString(10000, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 5); + ok_wstr(szBuff, L"10000"); + + ret = Int64ToString(0xE8D4A51000LL, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 13); + ok_wstr(szBuff, L"1000000000000"); +} + +static void Test_LargeIntegerToString(BOOL bVista) +{ + LARGE_INTEGER LInt; + WCHAR szBuff[64]; + INT ret; + + LInt.QuadPart = 0; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"0"); + + LInt.QuadPart = 1; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"1"); + + LInt.QuadPart = -9999; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + if (bVista) + { + ok_int(ret, 5); + ok_wstr(szBuff, L"-9999"); + } + else + { + ok_int(ret, 4); + ok_wstr(szBuff, L"''''"); + } + + LInt.QuadPart = 10000; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 5); + ok_wstr(szBuff, L"10000"); + + LInt.QuadPart = 0xE8D4A51000LL; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 13); + ok_wstr(szBuff, L"1000000000000"); +} + +START_TEST(Int64ToString) +{ + BOOL bVista = IsWindowsVistaOrGreater(); + trace("bVista: %d\n", bVista); + + Test_EntryTest(bVista); + Test_Int64ToString(bVista); + Test_LargeIntegerToString(bVista); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 2d364f19770..424e878d3b9 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -17,6 +17,7 @@ extern void func_DragDrop(void); extern void func_ExtractIconEx(void); extern void func_FindExecutable(void); extern void func_GetDisplayNameOf(void); +extern void func_Int64ToString(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -52,6 +53,7 @@ const struct test winetest_testlist[] = { "ExtractIconEx", func_ExtractIconEx }, { "FindExecutable", func_FindExecutable }, { "GetDisplayNameOf", func_GetDisplayNameOf }, + { "Int64ToString", func_Int64ToString }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 370fef7377e..93fc4201d8c 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -658,6 +658,32 @@ BOOL WINAPI GUIDFromStringW( LPSTR WINAPI SheRemoveQuotesA(LPSTR psz); LPWSTR WINAPI SheRemoveQuotesW(LPWSTR psz); +/* Flags for Int64ToString and LargeIntegerToString */ +#define FMT_USE_NUMDIGITS 0x01 +#define FMT_USE_LEADZERO 0x02 +#define FMT_USE_GROUPING 0x04 +#define FMT_USE_DECIMAL 0x08 +#define FMT_USE_THOUSAND 0x10 +#define FMT_USE_NEGNUMBER 0x20 + +INT WINAPI +Int64ToString( + _In_ LONGLONG llValue, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags); + +INT WINAPI +LargeIntegerToString( + _In_ const LARGE_INTEGER *pLargeInt, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags); + /***************************************************************************** * Shell32 resources */

1 year, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs