Ros-diffs

ros-diffs@reactos.org

11 participants
81351 discussions

[reactos] 01/01: [MSPAINT] Don't copy bits on resizing (#5716)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98050f91390e1fc6f7034… commit 98050f91390e1fc6f7034c0033c44a66f1fd9f6e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 22 07:35:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 22 07:35:03 2023 +0900 [MSPAINT] Don't copy bits on resizing (#5716) - Fix the graphical glitches on resizing and moving toolbars. - Add SWP_NOCOPYBITS flag on positioning controls on resizing of main window. CORE-19137 --- base/applications/mspaint/winproc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 8a6e259b12f..8f9e0ca9b31 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -77,6 +77,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect, rc; GetClientRect(&clientRect); RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); if (::IsWindowVisible(g_hStatusBar)) { @@ -93,7 +94,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.right - CX_TOOLBAR, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.right -= CX_TOOLBAR; } else @@ -101,7 +102,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.left, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.left += CX_TOOLBAR; } } @@ -113,7 +114,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.bottom - CY_PALETTE, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.bottom -= CY_PALETTE; } else @@ -121,7 +122,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.top += CY_PALETTE; } } @@ -131,7 +132,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); } ::EndDeferWindowPos(hDWP);

1 year, 5 months

[reactos] 01/01: [WIN32K] Prevent dereferencing NULL pointer

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4661bc006d0e49e78b1eb… commit 4661bc006d0e49e78b1ebaee9509e078f12c70a8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Aug 18 08:35:59 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 21 23:45:31 2023 +0300 [WIN32K] Prevent dereferencing NULL pointer Initialize a window's ThreadListEntry as an empty list on creation and only remove the window from the list on destruction, when the entry is not an empty list. Previously the window creation could fail before the list entry was initialized and the window would get destroyed after that, resulting in a NULL pointer dereference. --- win32ss/user/ntuser/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e4a7b1affd6..27881a1cdf9 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -596,7 +596,8 @@ LRESULT co_UserFreeWindow(PWND Window, /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still in co_UserFreeWindow() */ - RemoveEntryList(&Window->ThreadListEntry); + if (!IsListEmpty(&Window->ThreadListEntry)) + RemoveEntryList(&Window->ThreadListEntry); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); @@ -1917,6 +1918,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->HideAccel = pWnd->spwndParent->HideAccel; } + InitializeListHead(&pWnd->ThreadListEntry); pWnd->head.pti->cWindows++; if (Class->spicn && !Class->spicnSm)

1 year, 5 months

[reactos] 01/01: [KERNEL32] Fix RaiseException to correctly copy the passed in parameters as ULONG_PTR

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41c99aa60ad9e8d9141ca… commit 41c99aa60ad9e8d9141caa988b68d54911d64c00 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 19 02:56:07 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 21 21:33:47 2023 +0300 [KERNEL32] Fix RaiseException to correctly copy the passed in parameters as ULONG_PTR Fixes C++ exception handling on x64. --- dll/win32/kernel32/client/except.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/except.c b/dll/win32/kernel32/client/except.c index b248878366e..04931ecd606 100644 --- a/dll/win32/kernel32/client/except.c +++ b/dll/win32/kernel32/client/except.c @@ -697,14 +697,16 @@ Quit: */ VOID WINAPI -RaiseException(IN DWORD dwExceptionCode, - IN DWORD dwExceptionFlags, - IN DWORD nNumberOfArguments, - IN CONST ULONG_PTR *lpArguments OPTIONAL) +RaiseException( + _In_ DWORD dwExceptionCode, + _In_ DWORD dwExceptionFlags, + _In_ DWORD nNumberOfArguments, + _In_opt_ const ULONG_PTR *lpArguments) { EXCEPTION_RECORD ExceptionRecord; /* Setup the exception record */ + RtlZeroMemory(&ExceptionRecord, sizeof(ExceptionRecord)); ExceptionRecord.ExceptionCode = dwExceptionCode; ExceptionRecord.ExceptionRecord = NULL; ExceptionRecord.ExceptionAddress = (PVOID)RaiseException; @@ -726,7 +728,7 @@ RaiseException(IN DWORD dwExceptionCode, ExceptionRecord.NumberParameters = nNumberOfArguments; RtlCopyMemory(ExceptionRecord.ExceptionInformation, lpArguments, - nNumberOfArguments * sizeof(ULONG)); + nNumberOfArguments * sizeof(ULONG_PTR)); } /* Better handling of Delphi Exceptions... a ReactOS Hack */

1 year, 5 months

[reactos] 01/01: [SHELL32][SDK] Implement SHOpenEffectiveToken and SHGetUserSessionId (#5713)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4407e0aefabb4b2f88628… commit 4407e0aefabb4b2f8862886719412dfe41ca34d0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 22:44:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 22:44:20 2023 +0900 [SHELL32][SDK] Implement SHOpenEffectiveToken and SHGetUserSessionId (#5713) - Implement SHOpenEffectiveToken and SHGetUserSessionId functions. - Add them to <undocshell.h>. --- dll/win32/shell32/stubs.cpp | 22 ----------------- dll/win32/shell32/utils.cpp | 53 ++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 3 +++ 3 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index a048e2c5274..ae4ce677e66 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1099,17 +1099,6 @@ SHSetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHOpenEffectiveToken(LPVOID Token) -{ - FIXME("SHOpenEffectiveToken() stub\n"); - return FALSE; -} - /* * Unimplemented */ @@ -1178,17 +1167,6 @@ SHGetProcessDword(DWORD dwUnknown1, DWORD dwUnknown2) return 0; } -/* - * Unimplemented - */ -EXTERN_C LPVOID -WINAPI -SHGetUserSessionId(HANDLE hHandle) -{ - FIXME("SHGetUserSessionId() stub\n"); - return NULL; -} - EXTERN_C DWORD WINAPI CheckStagingArea(VOID) { diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index edb1f64b87d..537f23a6504 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,6 +9,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static BOOL OpenEffectiveToken(DWORD DesiredAccess, HANDLE *phToken) +{ + BOOL ret; + + if (phToken == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *phToken = NULL; + + ret = OpenThreadToken(GetCurrentThread(), DesiredAccess, FALSE, phToken); + if (!ret && GetLastError() == ERROR_NO_TOKEN) + ret = OpenProcessToken(GetCurrentProcess(), DesiredAccess, phToken); + + return ret; +} + +/************************************************************************* + * SHOpenEffectiveToken (SHELL32.235) + */ +EXTERN_C BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken) +{ + TRACE("%p\n", phToken); + return OpenEffectiveToken(TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, phToken); +} + +/************************************************************************* + * SHGetUserSessionId (SHELL32.248) + */ +EXTERN_C DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken) +{ + DWORD dwSessionId, dwLength; + BOOL bOpenToken = FALSE; + + TRACE("%p\n", hToken); + + if (!hToken) + bOpenToken = SHOpenEffectiveToken(&hToken); + + if (!hToken || + !GetTokenInformation(hToken, TokenSessionId, &dwSessionId, sizeof(dwSessionId), &dwLength)) + { + dwSessionId = 0; + } + + if (bOpenToken) + CloseHandle(hToken); + + return dwSessionId; +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 93fc4201d8c..9c74f8d9b00 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -684,6 +684,9 @@ LargeIntegerToString( _In_opt_ const NUMBERFMTW *pNumberFormat, _In_ DWORD dwNumberFlags); +BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken); +DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken); + /***************************************************************************** * Shell32 resources */

1 year, 5 months

[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, 5 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, 5 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, 5 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, 5 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, 5 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, 5 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