Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support (#5046)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f491d7cc99ecaf156b47b… commit f491d7cc99ecaf156b47baf33e3d9933a7f49e6e Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Thu Sep 7 06:40:53 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 15:40:53 2023 -0700 [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support (#5046) * [KERNEL32][RTL] Implement One-Time initialization API and improve RTL support --- dll/win32/kernel32/kernel32.spec | 6 +- dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 2 +- dll/win32/kernel32/kernel32_vista/InitOnce.c | 62 +++++ .../kernel32/kernel32_vista/InitOnceExecuteOnce.c | 19 -- .../kernel32/kernel32_vista/kernel32_vista.spec | 4 + modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + modules/rostests/apitests/kernel32/InitOnce.c | 280 +++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + sdk/include/ndk/rtlfuncs.h | 37 +++ sdk/include/psdk/winbase.h | 37 ++- sdk/include/xdk/winnt_old.h | 10 +- sdk/lib/rtl/runonce.c | 77 +++--- 12 files changed, 472 insertions(+), 65 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index e72f99fb295..c4583be816f 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -708,10 +708,10 @@ @ stdcall -stub -version=0x600+ IdnToNameprepUnicode(long wstr long ptr long) @ stdcall -stub -version=0x600+ IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stdcall -stub -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) -@ stdcall -stub -version=0x600+ InitOnceComplete(ptr long ptr) +@ stdcall -version=0x600+ InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall -version=0x600+ InitOnceComplete(ptr long ptr) @ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ InitOnceInitialize(ptr) +@ stdcall -version=0x600+ InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize @ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index acc53b9d80a..3b2b8e735b7 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -9,7 +9,7 @@ spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE GetFileInformationByHandleEx.c GetTickCount64.c - InitOnceExecuteOnce.c + InitOnce.c sync.c vista.c) diff --git a/dll/win32/kernel32/kernel32_vista/InitOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnce.c new file mode 100644 index 00000000000..339c157286c --- /dev/null +++ b/dll/win32/kernel32/kernel32_vista/InitOnce.c @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: One-Time initialization API + * COPYRIGHT: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "k32_vista.h" + +BOOL +WINAPI +InitOnceExecuteOnce( + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context) +{ + return NT_SUCCESS(RtlRunOnceExecuteOnce(InitOnce, + (PRTL_RUN_ONCE_INIT_FN)InitFn, + Parameter, + Context)); +} + +BOOL +WINAPI +InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext) +{ + NTSTATUS Status; + + Status = RtlRunOnceBeginInitialize(lpInitOnce, dwFlags, lpContext); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + *fPending = (Status == STATUS_PENDING); + return TRUE; +} + +BOOL +WINAPI +InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext) +{ + NTSTATUS Status; + + Status = RtlRunOnceComplete(lpInitOnce, dwFlags, lpContext); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} diff --git a/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c deleted file mode 100644 index 1ef59160aef..00000000000 --- a/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c +++ /dev/null @@ -1,19 +0,0 @@ - -#include "k32_vista.h" - -#include <ndk/exfuncs.h> -#include <wine/config.h> -#include <wine/port.h> - -DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ); - -/* Taken from Wine kernel32/sync.c */ - -/* - * @implemented - */ -BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); -} diff --git a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec index 02c1cb05739..bf074328323 100644 --- a/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec @@ -1,5 +1,9 @@ +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall InitOnceComplete(ptr long ptr) @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize + @ stdcall GetFileInformationByHandleEx(long long ptr long) @ stdcall -ret64 GetTickCount64() diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 9aebaa979a5..8c26b340edc 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND SOURCE GetDriveType.c GetModuleFileName.c GetVolumeInformation.c + InitOnce.c interlck.c IsDBCSLeadByteEx.c JapaneseCalendar.c diff --git a/modules/rostests/apitests/kernel32/InitOnce.c b/modules/rostests/apitests/kernel32/InitOnce.c new file mode 100644 index 00000000000..586e87bac9d --- /dev/null +++ b/modules/rostests/apitests/kernel32/InitOnce.c @@ -0,0 +1,280 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for One-Time initialization APIs + * COPYRIGHT: Copyright 2023 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "precomp.h" + +typedef +VOID +WINAPI +FN_InitOnceInitialize(_Out_ PINIT_ONCE InitOnce); + +typedef +BOOL +WINAPI +FN_InitOnceExecuteOnce( + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context); + +typedef +BOOL +WINAPI +FN_InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext); + +typedef +BOOL +WINAPI +FN_InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext); + +static ULONG g_ulRandom; + +static +VOID +InitWorker(_Inout_ PULONG InitCount, _Out_ PULONG_PTR Context) +{ + /* Increase the initialization count */ + (*InitCount)++; + + /* Output context data */ + *Context = (ULONG_PTR)g_ulRandom; +} + +static +_Success_(return != FALSE) +BOOL +WINAPI +InitOnceProc( + _Inout_ PINIT_ONCE InitOnce, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID* Context) +{ + if (!Parameter || !Context) + { + return FALSE; + } + + InitWorker(Parameter, (PULONG_PTR)Context); + return TRUE; +} + +START_TEST(InitOnce) +{ + BOOL bRet, fPending; + ULONG i, ulInitCount, ulSeed, ulContextData; + ULONG_PTR ulTempContext; + DWORD dwError; + + HMODULE hKernel32; + FN_InitOnceInitialize* pfnInitOnceInitialize; + FN_InitOnceExecuteOnce* pfnInitOnceExecuteOnce; + FN_InitOnceBeginInitialize* pfnInitOnceBeginInitialize; + FN_InitOnceComplete* pfnInitOnceComplete; + + /* Load functions */ + hKernel32 = GetModuleHandleW(L"kernel32.dll"); + if (!hKernel32) + { + skip("Module kernel32 not found\n"); + return; + } + pfnInitOnceInitialize = (FN_InitOnceInitialize*)GetProcAddress(hKernel32, "InitOnceInitialize"); + pfnInitOnceExecuteOnce = (FN_InitOnceExecuteOnce*)GetProcAddress(hKernel32, "InitOnceExecuteOnce"); + pfnInitOnceBeginInitialize = (FN_InitOnceBeginInitialize*)GetProcAddress(hKernel32, "InitOnceBeginInitialize"); + pfnInitOnceComplete = (FN_InitOnceComplete*)GetProcAddress(hKernel32, "InitOnceComplete"); + + /* + * Use a random as output context data, + * which the low-order INIT_ONCE_CTX_RESERVED_BITS bits should be zero. + */ + ulSeed = (ULONG)(ULONG_PTR)&ulSeed ^ GetTickCount(); + g_ulRandom = RtlRandom(&ulSeed); + for (i = 0; i < INIT_ONCE_CTX_RESERVED_BITS; i++) + { + g_ulRandom &= (~(1 << i)); + } + + /* Initialize One-Time initialization structure */ + INIT_ONCE InitOnce = { (PVOID)(ULONG_PTR)0xDEADBEEF }; + if (pfnInitOnceInitialize) + { + pfnInitOnceInitialize(&InitOnce); + } + else + { + skip("InitOnceInitialize not found\n"); + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + } + + if (!pfnInitOnceExecuteOnce) + { + skip("InitOnceExecuteOnce not found\n"); + goto _test_sync; + } + + /* + * Perform synchronous initialization by using InitOnceExecuteOnce, + * which executes user-defined callback to initialize. + * Call InitOnceExecuteOnce twice will success, + * initialization count should be 1 and retrieve correct context data. + */ + ulInitCount = 0; + ulContextData = MAXULONG; + bRet = pfnInitOnceExecuteOnce(&InitOnce, InitOnceProc, &ulInitCount, (LPVOID*)&ulContextData); + ok(bRet, "InitOnceExecuteOnce failed with %lu\n", GetLastError()); + if (bRet) + { + /* Call InitOnceExecuteOnce again and check output values if the first call succeeded */ + bRet = pfnInitOnceExecuteOnce(&InitOnce, + InitOnceProc, + &ulInitCount, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceExecuteOnce failed with %lu\n", GetLastError()); + ok(ulInitCount == 1, "ulInitCount is not 1\n"); + ok(ulContextData == g_ulRandom, "Output ulContextData is incorrect\n"); + } + +_test_sync: + if (!pfnInitOnceBeginInitialize || !pfnInitOnceComplete) + { + skip("InitOnceBeginInitialize or InitOnceComplete not found\n"); + return; + } + + /* Re-initialize One-Time initialization structure by using INIT_ONCE_STATIC_INIT */ + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + + /* Perform synchronous initialization by using InitOnceBeginInitialize */ + fPending = FALSE; + bRet = pfnInitOnceBeginInitialize(&InitOnce, 0, &fPending, (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + goto _test_async; + } + ok(fPending, "fPending is not TRUE after the first success InitOnceBeginInitialize\n"); + if (!fPending) + { + goto _test_async; + } + + /* Complete the initialization */ + InitWorker(&ulInitCount, &ulTempContext); + bRet = pfnInitOnceComplete(&InitOnce, 0, (LPVOID)ulTempContext); + ok(bRet, "InitOnceComplete failed with %lu\n", GetLastError()); + if (!bRet) + { + goto _test_async; + } + + /* + * Initialization is completed, call InitOnceBeginInitialize with + * INIT_ONCE_CHECK_ONLY should retrieve status and context data successfully + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_CHECK_ONLY, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet && !fPending && ulContextData == g_ulRandom, + "InitOnceBeginInitialize returns incorrect result for a completed initialization\n"); + +_test_async: + InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + + /* Perform asynchronous initialization */ + fPending = FALSE; + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_ASYNC, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + ok(fPending, "fPending is not TRUE after a success InitOnceBeginInitialize\n"); + if (!fPending) + { + return; + } + + /* + * Now the initialization is in progress but not completed yet, + * call InitOnceBeginInitialize again without INIT_ONCE_ASYNC is invalid, + * should fail with ERROR_INVALID_PARAMETER + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, 0, &fPending, (LPVOID*)&ulContextData); + ok(!bRet, "InitOnceBeginInitialize should not success\n"); + if (!bRet) + { + dwError = GetLastError(); + ok(dwError == ERROR_INVALID_PARAMETER, + "Last error is %lu, but %u is expected\n", + dwError, + ERROR_INVALID_PARAMETER); + } + + /* + * Call InitOnceBeginInitialize again with INIT_ONCE_ASYNC + * should success because initialization could be executed in parallel + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_ASYNC, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet, "InitOnceBeginInitialize failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + ok(fPending, "fPending is not TRUE after a success InitOnceBeginInitialize\n"); + if (!fPending) + { + return; + } + + /* Complete the initialization once */ + InitWorker(&ulInitCount, &ulTempContext); + bRet = pfnInitOnceComplete(&InitOnce, INIT_ONCE_ASYNC, (LPVOID)ulTempContext); + ok(bRet, "InitOnceComplete failed with %lu\n", GetLastError()); + if (!bRet) + { + return; + } + + /* Subsequent InitOnceComplete should fail with ERROR_GEN_FAILURE */ + bRet = pfnInitOnceComplete(&InitOnce, INIT_ONCE_ASYNC, (LPVOID)ulTempContext); + ok(!bRet, "InitOnceComplete should not success\n"); + if (!bRet) + { + dwError = GetLastError(); + ok(dwError == ERROR_GEN_FAILURE, + "Last error is %lu, but %u is expected\n", + dwError, + ERROR_GEN_FAILURE); + } + + /* + * Initialization is completed, call InitOnceBeginInitialize with + * INIT_ONCE_CHECK_ONLY should retrieve status and context data successfully + */ + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_CHECK_ONLY, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet && !fPending && ulContextData == g_ulRandom, + "InitOnceBeginInitialize returns incorrect result for a completed initialization\n"); + + return; +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index b96dfa956f0..4802d88079c 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -18,6 +18,7 @@ extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); extern void func_GetVolumeInformation(void); +extern void func_InitOnce(void); extern void func_interlck(void); extern void func_IsDBCSLeadByteEx(void); extern void func_JapaneseCalendar(void); @@ -53,6 +54,7 @@ const struct test winetest_testlist[] = { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, { "GetVolumeInformation", func_GetVolumeInformation }, + { "InitOnce", func_InitOnce }, { "interlck", func_interlck }, { "IsDBCSLeadByteEx", func_IsDBCSLeadByteEx }, { "JapaneseCalendar", func_JapaneseCalendar }, diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 47830b87990..41aedeb7e2d 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4961,6 +4961,43 @@ RtlGetNativeSystemInformation( _Out_opt_ PULONG ReturnLength ); +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +NTSYSAPI +VOID +NTAPI +RtlRunOnceInitialize( + _Out_ PRTL_RUN_ONCE RunOnce); + +_Maybe_raises_SEH_exception_ +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceExecuteOnce( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ __inner_callback PRTL_RUN_ONCE_INIT_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID *Context); + +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceBeginInitialize( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _Outptr_opt_result_maybenull_ PVOID *Context); + +NTSYSAPI +NTSTATUS +NTAPI +RtlRunOnceComplete( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _In_opt_ PVOID Context); + +#endif + #if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (defined(__REACTOS__) && defined(_NTDLLBUILD_)) /* Put NTSYSAPI back when this will be really exported. Only statically linked for now */ // NTSYSAPI diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 4872e40d98b..6b616b07b39 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -3837,6 +3837,8 @@ typedef PRTL_RUN_ONCE LPINIT_ONCE; #define INIT_ONCE_ASYNC RTL_RUN_ONCE_ASYNC #define INIT_ONCE_INIT_FAILED RTL_RUN_ONCE_INIT_FAILED +#define INIT_ONCE_CTX_RESERVED_BITS RTL_RUN_ONCE_CTX_RESERVED_BITS + typedef BOOL (WINAPI *PINIT_ONCE_FN)( _Inout_ PINIT_ONCE InitOnce, @@ -3961,14 +3963,41 @@ CopyFile2( #endif /* _WIN32_WINNT >= 0x0601 */ +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +WINBASEAPI +VOID +WINAPI +InitOnceInitialize( + _Out_ PINIT_ONCE InitOnce); + +WINBASEAPI +BOOL +WINAPI +InitOnceBeginInitialize( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _Out_ PBOOL fPending, + _Outptr_opt_result_maybenull_ LPVOID *lpContext); + +WINBASEAPI +BOOL +WINAPI +InitOnceComplete( + _Inout_ LPINIT_ONCE lpInitOnce, + _In_ DWORD dwFlags, + _In_opt_ LPVOID lpContext); + +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) */ + WINBASEAPI BOOL WINAPI InitOnceExecuteOnce( - _Inout_ PINIT_ONCE InitOnce, - _In_ __callback PINIT_ONCE_FN InitFn, - _Inout_opt_ PVOID Parameter, - _Outptr_opt_result_maybenull_ LPVOID *Context); + _Inout_ PINIT_ONCE InitOnce, + _In_ __callback PINIT_ONCE_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ LPVOID *Context); #if defined(_SLIST_HEADER_) && !defined(_NTOS_) && !defined(_NTOSP_) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 8e0de26a3da..7e564277b9a 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -2778,6 +2778,8 @@ RtlQueryDepthSList( #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2 + #define RTL_RUN_ONCE_INIT {0} typedef union _RTL_RUN_ONCE { @@ -2787,14 +2789,6 @@ typedef union _RTL_RUN_ONCE { typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; -NTSYSAPI -DWORD -WINAPI -RtlRunOnceComplete( - PRTL_RUN_ONCE, - DWORD, - PVOID); - #endif #define RTL_CONDITION_VARIABLE_INIT {0} diff --git a/sdk/lib/rtl/runonce.c b/sdk/lib/rtl/runonce.c index 0ffa49b9fa4..da970e9febd 100644 --- a/sdk/lib/rtl/runonce.c +++ b/sdk/lib/rtl/runonce.c @@ -8,52 +8,58 @@ /****************************************************************** * RtlRunOnceInitialize (NTDLL.@) */ -void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +VOID NTAPI RtlRunOnceInitialize(_Out_ PRTL_RUN_ONCE RunOnce) { - once->Ptr = NULL; + RunOnce->Ptr = NULL; } /****************************************************************** * RtlRunOnceBeginInitialize (NTDLL.@) */ -DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +_Must_inspect_result_ +NTSTATUS +NTAPI +RtlRunOnceBeginInitialize( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _Outptr_opt_result_maybenull_ PVOID *Context) { - if (flags & RTL_RUN_ONCE_CHECK_ONLY) + if (Flags & RTL_RUN_ONCE_CHECK_ONLY) { - ULONG_PTR val = (ULONG_PTR)once->Ptr; + ULONG_PTR val = (ULONG_PTR)RunOnce->Ptr; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; - if (context) *context = (void *)(val & ~3); + if (Context) *Context = (void *)(val & ~3); return STATUS_SUCCESS; } for (;;) { - ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + ULONG_PTR next, val = (ULONG_PTR)RunOnce->Ptr; switch (val & 3) { case 0: /* first time */ - if (!interlocked_cmpxchg_ptr( &once->Ptr, - (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + if (!interlocked_cmpxchg_ptr( &RunOnce->Ptr, + (Flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0)) return STATUS_PENDING; break; case 1: /* in progress, wait */ - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; next = val & ~3; - if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, (void *)((ULONG_PTR)&next | 1), (void *)val ) == (void *)val) NtWaitForKeyedEvent( 0, &next, FALSE, NULL ); break; case 2: /* done */ - if (context) *context = (void *)(val & ~3); + if (Context) *Context = (void *)(val & ~3); return STATUS_SUCCESS; case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (!(Flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; return STATUS_PENDING; } } @@ -62,25 +68,30 @@ DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void ** /****************************************************************** * RtlRunOnceComplete (NTDLL.@) */ -DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +NTSTATUS +NTAPI +RtlRunOnceComplete( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ ULONG Flags, + _In_opt_ PVOID Context) { - if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + if ((ULONG_PTR)Context & 3) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_INIT_FAILED) + if (Flags & RTL_RUN_ONCE_INIT_FAILED) { - if (context) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if (Context) return STATUS_INVALID_PARAMETER; + if (Flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; } - else context = (void *)((ULONG_PTR)context | 2); + else Context = (void *)((ULONG_PTR)Context | 2); for (;;) { - ULONG_PTR val = (ULONG_PTR)once->Ptr; + ULONG_PTR val = (ULONG_PTR)RunOnce->Ptr; switch (val & 3) { case 1: /* in progress */ - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, Context, (void *)val ) != (void *)val) break; val &= ~3; while (val) { @@ -91,8 +102,8 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context return STATUS_SUCCESS; case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + if (!(Flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &RunOnce->Ptr, Context, (void *)val) != (void *)val) break; return STATUS_SUCCESS; default: @@ -104,18 +115,24 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context /****************************************************************** * RtlRunOnceExecuteOnce (NTDLL.@) */ -DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) +_Maybe_raises_SEH_exception_ +NTSTATUS +NTAPI +RtlRunOnceExecuteOnce( + _Inout_ PRTL_RUN_ONCE RunOnce, + _In_ __inner_callback PRTL_RUN_ONCE_INIT_FN InitFn, + _Inout_opt_ PVOID Parameter, + _Outptr_opt_result_maybenull_ PVOID *Context) { - DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + DWORD ret = RtlRunOnceBeginInitialize( RunOnce, 0, Context ); if (ret != STATUS_PENDING) return ret; - if (!func( once, param, context )) + if (!InitFn( RunOnce, Parameter, Context )) { - RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + RtlRunOnceComplete( RunOnce, RTL_RUN_ONCE_INIT_FAILED, NULL ); return STATUS_UNSUCCESSFUL; } - return RtlRunOnceComplete( once, 0, context ? *context : NULL ); + return RtlRunOnceComplete( RunOnce, 0, Context ? *Context : NULL ); }

1 year, 9 months

[reactos] 01/01: [NTOSKRNL/x64] Fix bug in KiInitializeContextThread

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=583be404ddc0a52091a7a… commit 583be404ddc0a52091a7a22944520d94196cbf70 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 16 01:14:28 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 7 01:16:14 2023 +0300 [NTOSKRNL/x64] Fix bug in KiInitializeContextThread The function set CtxSwitchFrame->ApcBypass to FALSE, preventing APCs (like when user mode sets the context while the thread is suspended) from being delivered as soon as the thread lowers IRQL to PASSIVE_LEVEL. This resulted in the SetContext APC to be delivered only after the user mode APC was initialized, overwriting the user mode APC context in the trap frame. This caused kernel32_winetest process to break. --- ntoskrnl/ke/amd64/thrdini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c index b2119c6e8a3..3185de21cd6 100644 --- a/ntoskrnl/ke/amd64/thrdini.c +++ b/ntoskrnl/ke/amd64/thrdini.c @@ -134,7 +134,7 @@ KiInitializeContextThread(IN PKTHREAD Thread, /* Set up the Context Switch Frame */ CtxSwitchFrame->Return = (ULONG64)KiThreadStartup; - CtxSwitchFrame->ApcBypass = FALSE; + CtxSwitchFrame->ApcBypass = TRUE; StartFrame->P1Home = (ULONG64)StartRoutine; StartFrame->P2Home = (ULONG64)StartContext;

1 year, 9 months

[reactos] 02/02: [REACTOS] Fix various '% s' typos with a space

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995d2559623380857ce5f… commit 995d2559623380857ce5f371c2401cd8a8ff2913 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 7 00:34:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 7 00:34:02 2023 +0300 [REACTOS] Fix various '% s' typos with a space - [NOTEPAD][REGEDIT][SHELL32] were affected. - Also while being here, fix headers. --- base/applications/notepad/lang/hi-IN.rc | 10 +++++----- base/applications/regedit/lang/it-IT.rc | 16 ++++++++++++---- dll/win32/shell32/lang/hi-IN.rc | 9 ++++++++- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 5c568dc677e..59b16bb6cc6 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -1,8 +1,8 @@ /* - * PROJECT: Notepad Hindi Translation - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Hindi Translation Of Notepad - * COPYRIGHT: Copyright 2018 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2018 Arnav Bhatt <arnavbhatt2004(a)gmail.com> */ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA @@ -159,7 +159,7 @@ BEGIN STRING_UNTITLED "शीर्षकहीन" STRING_ALL_FILES "सभी फाइलें (*.*)" STRING_TEXT_FILES_TXT "पाठ फाइलें (*.txt)" - STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '% s' बहुत बड़ी है।\n\ + STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '%s' बहुत बड़ी है।\n\ कृपया एक अलग इडिटर का प्रयोग करें।" STRING_NOTEXT "आपने कोई टेक्स्ट दर्ज नहीं किया है।\ \nकृपया कुछ टाइप करें और पुनः प्रयास करें" diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 5226bad09d8..5394d596765 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Registry Editor + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2007-2013 Paolo Devoti <devotip(a)tiscali.it> + * Copyright 2013 Ivan Di Francesco (oswetto) <ivan.difrancesco(a)yahoo.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS @@ -458,10 +466,10 @@ END STRINGTABLE BEGIN - IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '% s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? " - IDS_IMPORT_OK "Le chiavi e i valori contenuti in '% s' sono stati correttamente aggiunti al Registro di sistema." - IDS_IMPORT_ERROR "Impossibile importare '% s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste." - IDS_EXPORT_ERROR "Impossibile esportare '% s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato." + IDS_IMPORT_PROMPT "Aggiungendo informazioni si possono involontariamente modificare o eliminare i valori e causare il giusto funzionamente dei componenti.\n Se non si considera attendibile la fonte di queste informazioni in '%s', non aggiungere al Registro di sistema.\n\n Si desidera continuare? " + IDS_IMPORT_OK "Le chiavi e i valori contenuti in '%s' sono stati correttamente aggiunti al Registro di sistema." + IDS_IMPORT_ERROR "Impossibile importare '%s': Errore durante l'apertura del file. Ci può essere un disco, file cdanneggiati o il file non esiste." + IDS_EXPORT_ERROR "Impossibile esportare '%s': Errore durante la creazione o la scrittura del file. Ci può essere un disco o un file di sistema danneggiato." END STRINGTABLE diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index b425b0d6e49..609c2bb38a8 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2019 Arnav Bhatt <arnavbhatt2004(a)gmail.com> + */ + LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA MENU_001 MENUEX @@ -1019,7 +1026,7 @@ BEGIN IDS_SPECIFY_ACTION "आपको एक कार्रवाई निर्दिष्ट करनी चाहिए।" IDS_INVALID_PROGRAM "निर्दिष्ट प्रोग्राम नहीं मिल सका। सुनिश्चित करें कि फ़ाइल का नाम और पथ सही है।" IDS_REMOVE_ACTION "क्या आप वाकई इस कार्रवाई को हटाना चाहते हैं?" - IDS_ACTION_EXISTS "इस फ़ाइल प्रकार के लिए कार्रवाई '% s' पहले से ही पंजीकृत है। कृपया एक अलग नाम दर्ज करें और पुनः प्रयास करें।" + IDS_ACTION_EXISTS "इस फ़ाइल प्रकार के लिए कार्रवाई '%s' पहले से ही पंजीकृत है। कृपया एक अलग नाम दर्ज करें और पुनः प्रयास करें।" IDS_EXE_FILTER "प्रोग्राम\0*.exe\0सारे फ़ाइल\0*.*\0" IDS_EDITING_ACTION "प्रकार के लिए संपादन कार्रवाई:" IDS_NO_ICONS "फ़ाइल '%s' में कोई आइकन नहीं है।\n\nसूची से एक आइकन चुनें या एक अलग फ़ाइल निर्दिष्ट करें।"

1 year, 9 months

[reactos] 01/02: [SHELL32] Fix standard log off dialog layout

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a81e5f4d72edf925aaa8… commit 6a81e5f4d72edf925aaa8942b30bec2db5fcbebb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 7 00:10:32 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 7 00:16:08 2023 +0300 [SHELL32] Fix standard log off dialog layout Make it consistent between translations and other misc fixes. --- dll/win32/shell32/lang/bg-BG.rc | 4 ++-- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 6 +++--- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 10 +++++----- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 10 +++++----- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/eu-ES.rc | 8 ++++---- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 10 +++++----- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 4 ++-- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 10 +++++----- dll/win32/shell32/lang/ja-JP.rc | 8 ++++---- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 6 +++--- dll/win32/shell32/lang/pl-PL.rc | 6 +++--- dll/win32/shell32/lang/pt-BR.rc | 4 ++-- dll/win32/shell32/lang/pt-PT.rc | 10 +++++----- dll/win32/shell32/lang/ro-RO.rc | 6 +++--- dll/win32/shell32/lang/ru-RU.rc | 8 ++++---- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 6 +++--- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 10 +++++----- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 6 +++--- dll/win32/shell32/lang/zh-HK.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 36 files changed, 84 insertions(+), 84 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 4482ced2728..01e2c9c0023 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -481,13 +481,13 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Излизане от РеактОС" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Сигурни ли сте, че искате да излезете?", -1, 43, 11, 140, 22 + LTEXT "Сигурни ли сте, че искате да излезете?", -1, 49, 15, 156, 8 DEFPUSHBUTTON "&Излизане", IDOK, 49, 38, 43, 14 PUSHBUTTON "Отказ", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 6cfafbc1556..5f2aaa48cc7 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 79b66910561..8af5dce9338 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -493,9 +493,9 @@ CAPTION "Odhlásit se ze systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Opravdu se chcete odhlásit?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Odhlásit", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Storno", IDCANCEL, 95, 39, 50, 14 + LTEXT "Opravdu se chcete odhlásit?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Odhlásit", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Storno", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index d7b93f3afd5..a2a8a198f60 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -493,7 +493,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 30dfc52306e..cfe026ee4c9 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Abmelden" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 166, 8 - DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Abmelden", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 1748705409b..a191eb18ce0 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 3c554179d20..c4df603d9b2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index be8e2c5b3bb..dc666d4a21b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d231def1651..c455913d518 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -490,15 +490,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Cerrar sesión de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Cerrar sesión", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Cerrar sesión", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 82297e87ea5..c61f8875535 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -494,7 +494,7 @@ CAPTION "Logi ReactOS'ist välja" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Kas soovid kindlasti välja logida?", -1, 49, 15, 131, 8 + LTEXT "Kas soovid kindlasti välja logida?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Logi välja", IDOK, 49, 38, 43, 14 PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 05942f367f5..aae6824a530 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -493,10 +493,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Amaitu ReactOS saioa" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Ziur zaude saioa amaitu nahi duzula?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "Ama&itu saioa", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Utzi", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Ziur zaude saioa amaitu nahi duzula?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "Ama&itu saioa", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Utzi", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 20601d5d01f..5da33435d2e 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index f2371b86e91..02c79aa67c6 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "Fermer", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Fermer", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Annuler", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 1cbdb451cb4..e41a4b769a3 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -489,7 +489,7 @@ CAPTION "התנתקות מ-ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "האם אתה בטוח שברצונך להתנתק?", -1, 49, 15, 131, 8 + LTEXT "האם אתה בטוח שברצונך להתנתק?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "התנתק", IDOK, 49, 38, 43, 14 PUSHBUTTON "ביטול", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 86805ece5a2..b425b0d6e49 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -487,7 +487,7 @@ CAPTION "लॉग ऑफ़ रिऐक्ट ओएस" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "क्या आप वाकई लॉग आफ़ करना चाहते हैं?", -1, 49, 15, 131, 8 + LTEXT "क्या आप वाकई लॉग आफ़ करना चाहते हैं?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&लॉग आफ़", IDOK, 49, 38, 43, 14 PUSHBUTTON "रद्द करें", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index e7837a056b8..28c4cbe7cb9 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -487,9 +487,9 @@ CAPTION "Kijelentkezés a ReactOS-ből" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Biztosan ki akar jelentkezni?", -1, 49, 15, 131, 8 + LTEXT "Biztosan ki akar jelentkezni?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Kijelentkezés", IDOK, 49, 38, 53, 14 - PUSHBUTTON "Mégse", IDCANCEL, 109, 38, 43, 14 + PUSHBUTTON "Mégse", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 3663a33cd09..661dac1ccd0 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -487,7 +487,7 @@ CAPTION "Keluar ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Anda yakin ingin keluar?", -1, 49, 15, 131, 8 + LTEXT "Anda yakin ingin keluar?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Keluar", IDOK, 49, 38, 43, 14 PUSHBUTTON "Batal", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 8220be84a37..32189f8de8e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Chiudi sessione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Chiudi sessione", IDOK, 35, 39, 55, 14 - PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Chiudi sessione", IDOK, 49, 38, 57, 14 + PUSHBUTTON "Annulla", IDCANCEL, 113, 38, 57, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 0bda0c01b04..7cf8c34729f 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -486,10 +486,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS のログオフ" FONT 9, "MS UI Gothic" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 22, 21 - LTEXT "ログオフしてもよろしいですか?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "ログオフ(&L)", IDOK, 41, 39, 50, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 95, 39, 50, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "ログオフしてもよろしいですか?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "ログオフ(&L)", IDOK, 49, 38, 43, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 71e8ec1c27c..fdbc263ae98 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -494,7 +494,7 @@ CAPTION "Log Off ReactOS" FONT 9, "굴림" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 2a5def28b66..fca4d439f46 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 2f5b88a6c5e..07aaf2547e6 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -487,9 +487,9 @@ CAPTION "Logg av ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Er du sikker på at du vil logge av?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Logg av", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14 + LTEXT "Er du sikker på at du vil logge av?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Logg av", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index cd90289414a..6f0eeef2235 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -493,9 +493,9 @@ CAPTION "Wylogowywanie z systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Czy na pewno chcesz się wylogować?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Wyloguj", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14 + LTEXT "Czy na pewno chcesz się wylogować?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Wyloguj", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 278, 122 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 9421ebf518e..d610d4a66f1 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -481,13 +481,13 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Você tem certeza que desejar realizar log off?", -1, 35, 15, 148, 8 + LTEXT "Você tem certeza que desejar realizar log off?", -1, 49, 15, 156, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5c24aa3e344..35a71da2a44 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL MENU_001 MENUEX BEGIN @@ -481,15 +481,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Terminar sessão ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Pretende terminar a sessão?", -1, 43, 15, 170, 8 - DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14 - PUSHBUTTON "&Cancelar", IDCANCEL, 99, 38, 43, 14 + LTEXT "Pretende terminar a sessão?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Terminar a sessão", IDOK, 49, 38, 67, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 123, 38, 67, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 546c875f56b..2ad102e0fc6 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -490,9 +490,9 @@ CAPTION "Deautentificare" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Sigur doriți să vă deautentificați?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Deautentifică", IDOK, 41, 39, 50, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 95, 39, 50, 14 + LTEXT "Sigur doriți să vă deautentificați?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Deautentifică", IDOK, 49, 38, 53, 14 + PUSHBUTTON "Anulează", IDCANCEL, 109, 38, 53, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index ab5a7e3d928..4b2d22971d9 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -488,15 +488,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Выход из ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Вы действительно хотите выйти из системы?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "В&ыход", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Отмена", IDCANCEL, 95, 39, 50, 14 + LTEXT "Вы действительно хотите выйти из системы?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "В&ыход", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Отмена", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 8f82b531d90..bcc4af294ce 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -487,7 +487,7 @@ CAPTION "Odhlásiť ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 131, 8 + LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "O&dhlásiť", IDOK, 49, 38, 43, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index e29cf6de4e4..d8ae90a55af 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -487,7 +487,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 35da9ad8e5e..408a46ee2f5 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -491,9 +491,9 @@ CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Jeni te sigurte qe doni të dilni?", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "&Dil", IDOK, 41, 39, 50, 14 - PUSHBUTTON "Anulo", IDCANCEL, 95, 39, 50, 14 + LTEXT "Jeni te sigurte qe doni të dilni?", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "&Dil", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Anulo", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 361fcae0b5a..e00a5433304 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -487,7 +487,7 @@ CAPTION "Logga ut från ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Är du säker på att du vill logga ut?", -1, 49, 15, 131, 8 + LTEXT "Är du säker på att du vill logga ut?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "&Logga ut", IDOK, 49, 38, 43, 14 PUSHBUTTON "Avbryt", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 2466291200f..b45a252a61f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -483,15 +483,15 @@ BEGIN ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 212, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Oturumunu Kapat" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 21, 20 - LTEXT "Oturumu kapatmak istediğinizden emin misiniz?", -1, 33, 16, 151, 8 - DEFPUSHBUTTON "&Oturumu Kapat", IDOK, 30, 39, 60, 14 - PUSHBUTTON "İptal", IDCANCEL, 95, 39, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Oturumu kapatmak istediğinizden emin misiniz?", -1, 49, 15, 156, 8 + DEFPUSHBUTTON "&Oturumu Kapat", IDOK, 49, 38, 57, 14 + PUSHBUTTON "İptal", IDCANCEL, 113, 38, 57, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e34d4d2d355..09997ef3c96 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -487,7 +487,7 @@ CAPTION "Вихід із ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 131, 8 + LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 132, 8 DEFPUSHBUTTON "В&ихід", IDOK, 49, 38, 43, 14 PUSHBUTTON "Скасувати", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index ce95ea14128..32f4421c1b0 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -497,9 +497,9 @@ CAPTION "注销 ReactOS" FONT 9, "宋体" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您确定要注销 ReactOS 吗？", -1, 35, 16, 146, 8 - DEFPUSHBUTTON "注销(&L)", IDOK, 41, 39, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 95, 39, 50, 14 + LTEXT "您确定要注销 ReactOS 吗？", -1, 49, 15, 132, 8 + DEFPUSHBUTTON "注销(&L)", IDOK, 49, 38, 43, 14 + PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 0af7a25a294..80a753e83f4 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -495,7 +495,7 @@ CAPTION "登出 ReactOS" FONT 9, "新細明體" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 131, 8 + LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 132, 8 DEFPUSHBUTTON "登出(&L)", IDOK, 49, 38, 43, 14 PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index af19932540c..6f3f37c48eb 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -496,7 +496,7 @@ CAPTION "登出 ReactOS" FONT 9, "新細明體" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 131, 8 + LTEXT "您確定要登出 ReactOS 嗎？", -1, 49, 15, 132, 8 DEFPUSHBUTTON "登出(&L)", IDOK, 49, 38, 43, 14 PUSHBUTTON "取消", IDCANCEL, 99, 38, 43, 14 END

1 year, 9 months

[reactos] 01/01: [WINHTTP_WINETEST] Skip wine_dbgstr_wn() call when returned text length is zero (#5656)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ce81f648517263cbc5a8… commit 9ce81f648517263cbc5a83883354c8589a3474c6 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Sep 6 16:02:48 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 7 00:02:48 2023 +0300 [WINHTTP_WINETEST] Skip wine_dbgstr_wn() call when returned text length is zero (#5656) On receiving a zero length response, do not try to print returned text using wine_dbgstr_wn(). Instead check the returned string for zero length and skip the print in that case. ROSTESTS-377 --- modules/rostests/winetests/winhttp/winhttp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/rostests/winetests/winhttp/winhttp.c b/modules/rostests/winetests/winhttp/winhttp.c index 776ee53e379..5655432f73b 100644 --- a/modules/rostests/winetests/winhttp/winhttp.c +++ b/modules/rostests/winetests/winhttp/winhttp.c @@ -4276,7 +4276,12 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); +#ifdef __REACTOS__ + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", + wine_dbgstr_wn(response, min(SysStringLen(response), 32)) ); +#else ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); +#endif SysFreeString( response ); IWinHttpRequest_Release( req );

1 year, 9 months

[reactos] 01/01: [NTOSKRNL] Mute some good-path log-spam, no functional change

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=195c491880c6e6e9cd7d4… commit 195c491880c6e6e9cd7d4669c1242da1f3836bda Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Sep 6 14:53:53 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Sep 6 14:53:53 2023 +0200 [NTOSKRNL] Mute some good-path log-spam, no functional change Now that the Memory Management is a bit more under control again, and branching releases/0.4.15 is near, do mute some frequent log-spam that got introduced during 0.4.15-dev'ing regarding lazy-flushes and MM balancing. It frequently logged even while being idle. Slightly improve the headers of the two touched files. No rocket-science. --- ntoskrnl/config/cmlazy.c | 11 +++++------ ntoskrnl/mm/balance.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index 13b74570b00..ed03247a8c7 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -1,15 +1,14 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmlazy.c - * PURPOSE: Configuration Manager - Internal Registry APIs - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu <alex.ionescu(a)reactos.org> */ /* INCLUDES *******************************************************************/ #include "ntoskrnl.h" -//#define NDEBUG +#define NDEBUG #include "debug.h" /* GLOBALS ********************************************************************/ diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index f33189dc247..3b11aeab2c8 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/balance.c - * PURPOSE: kernel memory management functions - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - * Cameron Gutman (cameron.gutman(a)reactos.org) + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: kernel memory management functions + * PROGRAMMERS: David Welch <welch(a)cwcom.net> + * Cameron Gutman <cameron.gutman(a)reactos.org> */ /* INCLUDES *****************************************************************/ @@ -144,7 +142,7 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) (*NrFreedPages) = 0; - DPRINT1("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); + DPRINT("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); FirstPage = MmGetLRUFirstUserPage(); CurrentPage = FirstPage;

1 year, 9 months

[reactos] 01/01: [TIMEDATE] Fix the way the current time-zone is found in the list. (#5649)

by Hermès BÉLUSCA - MAÏTO

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9cd76017336c2bc9d535… commit d9cd76017336c2bc9d535807f56e5e80f7ac0d87 Author: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 6 14:15:33 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 14:15:33 2023 +0200 [TIMEDATE] Fix the way the current time-zone is found in the list. (#5649) fies regression CORE-18666 'Wrong timezone saved/displayed' which was introduced by 0.4.14-dev-1522-g aa69236646f01a476377ec76ae7b762e061cd300 --- dll/cpl/timedate/timezone.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/dll/cpl/timedate/timezone.c b/dll/cpl/timedate/timezone.c index dcc8fab661a..8d1d94191fa 100644 --- a/dll/cpl/timedate/timezone.c +++ b/dll/cpl/timedate/timezone.c @@ -168,36 +168,51 @@ ShowTimeZoneList(HWND hwnd) { TIME_ZONE_INFORMATION TimeZoneInfo; PTIMEZONE_ENTRY Entry; - BOOL bDoAdvancedTest; - DWORD dwIndex; - DWORD i; + DWORD dwCount; + DWORD dwIndex = 0; + BOOL bFound = FALSE; - GetTimeZoneInformation(&TimeZoneInfo); - bDoAdvancedTest = (!*TimeZoneInfo.StandardName); + if (GetTimeZoneInformation(&TimeZoneInfo) == TIME_ZONE_ID_INVALID) + { + /* Failed to retrieve current time-zone info, reset it */ + ZeroMemory(&TimeZoneInfo, sizeof(TimeZoneInfo)); + } - dwIndex = 0; - i = 0; - Entry = TimeZoneListHead; - while (Entry != NULL) + for (Entry = TimeZoneListHead; Entry != NULL; Entry = Entry->Next) { - SendMessageW(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)Entry->Description); - - if ( (!bDoAdvancedTest && *Entry->StandardName && - wcscmp(Entry->StandardName, TimeZoneInfo.StandardName) == 0) || - ( (Entry->TimezoneInfo.Bias == TimeZoneInfo.Bias) && - (Entry->TimezoneInfo.StandardBias == TimeZoneInfo.StandardBias) && - (Entry->TimezoneInfo.DaylightBias == TimeZoneInfo.DaylightBias) && - (memcmp(&Entry->TimezoneInfo.StandardDate, &TimeZoneInfo.StandardDate, sizeof(SYSTEMTIME)) == 0) && - (memcmp(&Entry->TimezoneInfo.DaylightDate, &TimeZoneInfo.DaylightDate, sizeof(SYSTEMTIME)) == 0) ) ) + dwCount = SendMessageW(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)Entry->Description); + if (dwCount == CB_ERR || dwCount == CB_ERRSPACE) + continue; + + /* If the time-zone was found in the list, skip the tests */ + if (bFound) + continue; + + if (*TimeZoneInfo.StandardName && *Entry->StandardName) { - dwIndex = i; + /* Compare by name */ + if (wcscmp(Entry->StandardName, TimeZoneInfo.StandardName) == 0) + { + dwIndex = dwCount; + bFound = TRUE; + } + } + else + { + /* Compare by date and bias */ + if ((Entry->TimezoneInfo.Bias == TimeZoneInfo.Bias) && + (Entry->TimezoneInfo.StandardBias == TimeZoneInfo.StandardBias) && + (Entry->TimezoneInfo.DaylightBias == TimeZoneInfo.DaylightBias) && + (memcmp(&Entry->TimezoneInfo.StandardDate, &TimeZoneInfo.StandardDate, sizeof(SYSTEMTIME)) == 0) && + (memcmp(&Entry->TimezoneInfo.DaylightDate, &TimeZoneInfo.DaylightDate, sizeof(SYSTEMTIME)) == 0)) + { + dwIndex = dwCount; + bFound = TRUE; + } } - - i++; - Entry = Entry->Next; } SendMessageW(hwnd,

1 year, 9 months

[reactos] 01/01: [NTOS:CC][NTOS:MM] Add back CcRosTrimCache and add Delay for MM to work. (#5630)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b14056600bae80532f7a… commit 2b14056600bae80532f7ab9320fdc0853a55e30a Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Sep 6 06:34:25 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 13:34:25 2023 +0200 [NTOS:CC][NTOS:MM] Add back CcRosTrimCache and add Delay for MM to work. (#5630) MM/CC Add back CcRosTrimCache as suggested by Thomas Faber which was removed in 0.4.15-dev-1717-g d8cdb89fb03006595dc40ac23db5267b8d9d9c09 and call it once in a while also during read-operations. fixes JIRA issue: CORE-17624 'Cannot copy files > RAMsize anymore using TotalCommander' 1st testbot results on top of 0.4.15-dev-6526-g8d35887 VBox: https://reactos.org/testman/compare.php?ids=89111,89120 (additional random reboot in winhttp:winhttp) KVM: https://reactos.org/testman/compare.php?ids=89110,89119 We do assume that reboot to be unrelated. 2nd testbot results on top of 0.4.15-dev-6526-g8d35887 VBox: https://reactos.org/testman/compare.php?ids=89111,89232 KVM: https://reactos.org/testman/compare.php?ids=89110,89233 --- ntoskrnl/cc/view.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/mm/balance.c | 23 ++++++++++ 2 files changed, 141 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0e6917ea18a..efa4c8523d4 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -449,6 +449,124 @@ CcRosFlushDirtyPages ( return STATUS_SUCCESS; } +VOID +CcRosTrimCache( + _In_ ULONG Target, + _Out_ PULONG NrFreed) +/* + * FUNCTION: Try to free some memory from the file cache. + * ARGUMENTS: + * Target - The number of pages to be freed. + * NrFreed - Points to a variable where the number of pages + * actually freed is returned. + */ +{ + PLIST_ENTRY current_entry; + PROS_VACB current; + ULONG PagesFreed; + KIRQL oldIrql; + LIST_ENTRY FreeList; + PFN_NUMBER Page; + ULONG i; + BOOLEAN FlushedPages = FALSE; + + DPRINT("CcRosTrimCache(Target %lu)\n", Target); + + InitializeListHead(&FreeList); + + *NrFreed = 0; + +retry: + oldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + + current_entry = VacbLruListHead.Flink; + while (current_entry != &VacbLruListHead) + { + ULONG Refs; + + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + VacbLruListEntry); + current_entry = current_entry->Flink; + + KeAcquireSpinLockAtDpcLevel(&current->SharedCacheMap->CacheMapLock); + + /* Reference the VACB */ + CcRosVacbIncRefCount(current); + + /* Check if it's mapped and not dirty */ + if (InterlockedCompareExchange((PLONG)&current->MappedCount, 0, 0) > 0 && !current->Dirty) + { + /* Page out the VACB */ + for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++) + { + Page = (PFN_NUMBER)(MmGetPhysicalAddress((PUCHAR)current->BaseAddress + (i * PAGE_SIZE)).QuadPart >> PAGE_SHIFT); + + MmPageOutPhysicalAddress(Page); + } + } + + /* Dereference the VACB */ + Refs = CcRosVacbDecRefCount(current); + + /* Check if we can free this entry now */ + if (Refs < 2) + { + ASSERT(!current->Dirty); + ASSERT(!current->MappedCount); + ASSERT(Refs == 1); + + RemoveEntryList(&current->CacheMapVacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InitializeListHead(&current->VacbLruListEntry); + InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); + + /* Calculate how many pages we freed for Mm */ + PagesFreed = min(VACB_MAPPING_GRANULARITY / PAGE_SIZE, Target); + Target -= PagesFreed; + (*NrFreed) += PagesFreed; + } + + KeReleaseSpinLockFromDpcLevel(&current->SharedCacheMap->CacheMapLock); + } + + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); + + /* Try flushing pages if we haven't met our target */ + if ((Target > 0) && !FlushedPages) + { + /* Flush dirty pages to disk */ + CcRosFlushDirtyPages(Target, &PagesFreed, FALSE, FALSE); + FlushedPages = TRUE; + + /* We can only swap as many pages as we flushed */ + if (PagesFreed < Target) Target = PagesFreed; + + /* Check if we flushed anything */ + if (PagesFreed != 0) + { + /* Try again after flushing dirty pages */ + DPRINT("Flushed %lu dirty cache pages to disk\n", PagesFreed); + goto retry; + } + } + + while (!IsListEmpty(&FreeList)) + { + ULONG Refs; + + current_entry = RemoveHeadList(&FreeList); + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + CacheMapVacbListEntry); + InitializeListHead(&current->CacheMapVacbListEntry); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); + } + + DPRINT("Evicted %lu cache pages\n", (*NrFreed)); +} + NTSTATUS CcRosReleaseVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index ab71d0f195b..f33189dc247 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -316,6 +316,15 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PPFN_NUMBER AllocatedPage) { PFN_NUMBER Page; + static INT i = 0; + static LARGE_INTEGER TinyTime = {{-1L, -1L}}; + + /* Delay some requests for the Memory Manager to recover pages */ + if (i++ >= 100) + { + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); + i = 0; + } /* * Actually allocate the page. @@ -335,6 +344,10 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, return(STATUS_SUCCESS); } +VOID +CcRosTrimCache( + _In_ ULONG Target, + _Out_ PULONG NrFreed); VOID NTAPI MiBalancerThread(PVOID Unused) @@ -361,6 +374,8 @@ MiBalancerThread(PVOID Unused) if (Status == STATUS_WAIT_0 || Status == STATUS_WAIT_1) { ULONG InitialTarget = 0; + ULONG Target; + ULONG NrFreedPages; do { @@ -372,6 +387,14 @@ MiBalancerThread(PVOID Unused) InitialTarget = MiTrimMemoryConsumer(i, InitialTarget); } + /* Trim cache */ + Target = max(InitialTarget, abs(MiMinimumAvailablePages - MmAvailablePages)); + if (Target) + { + CcRosTrimCache(Target, &NrFreedPages); + InitialTarget -= min(NrFreedPages, InitialTarget); + } + /* No pages left to swap! */ if (InitialTarget != 0 && InitialTarget == OldTarget)

1 year, 9 months

[reactos] 01/01: [NOTEPAD] Do type cast to kill C4244 warnings (#5655)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=289dec6c391401b504e44… commit 289dec6c391401b504e4494a3c7548d3b59af697 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 6 19:26:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 19:26:23 2023 +0900 [NOTEPAD] Do type cast to kill C4244 warnings (#5655) - Do type cast to int from SendMessage return value. - Fix usage of EM_GETSEL and EM_LINEINDEX messages. CORE-18837 --- base/applications/notepad/dialog.c | 11 +++++++++-- base/applications/notepad/main.c | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 846a9abac57..111d0428a1d 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -865,6 +865,10 @@ VOID DIALOG_GoTo(VOID) else ich = (INT)SendMessage(Globals.hEdit, EM_LINEINDEX, GotoData.iLine, 0); + /* EM_LINEINDEX can return -1 on failure */ + if (ich < 0) + ich = 0; + /* Move the caret */ SendMessage(Globals.hEdit, EM_SETSEL, ich, ich); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); @@ -872,13 +876,16 @@ VOID DIALOG_GoTo(VOID) VOID DIALOG_StatusBarUpdateCaretPos(VOID) { - int line, col; + int line, ich, col; TCHAR buff[MAX_PATH]; DWORD dwStart, dwSize; SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize); line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0); - col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); + ich = (int)SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); + + /* EM_LINEINDEX can return -1 on failure */ + col = ((ich < 0) ? 0 : (dwStart - ich)); StringCchPrintf(buff, _countof(buff), Globals.szStatusBarLineCol, line + 1, col + 1); SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff); diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index a6477bfefd6..599ad5c60df 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -270,6 +270,7 @@ static VOID NOTEPAD_InitData(HINSTANCE hInstance) */ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) { + DWORD dwStart, dwEnd; int enable; UNREFERENCED_PARAMETER(index); @@ -280,8 +281,8 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); - enable = (int) SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); - enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + enable = ((dwStart == dwEnd) ? MF_GRAYED : MF_ENABLED); EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); EnableMenuItem(menu, CMD_DELETE, enable);

1 year, 9 months

[reactos] 01/01: [MSVCRT] Officially implement _localtime32{, _s} (#5652)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94e0c54c7dfc73aa03a6e… commit 94e0c54c7dfc73aa03a6e80be37e6a3fd25ec2e7 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Wed Sep 6 06:04:05 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 6 12:04:05 2023 +0200 [MSVCRT] Officially implement _localtime32{,_s} (#5652) required by the guest additions of an app called "UTM", which is a QEMU fork --- dll/apisets/api-ms-win-crt-time-l1-1-0.spec | 8 ++++---- dll/win32/msvcrt/msvcrt.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/apisets/api-ms-win-crt-time-l1-1-0.spec b/dll/apisets/api-ms-win-crt-time-l1-1-0.spec index db0fe40f724..6b571be4c03 100644 --- a/dll/apisets/api-ms-win-crt-time-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-time-l1-1-0.spec @@ -34,10 +34,10 @@ @ stub _gmtime32_s @ stdcall _gmtime64() msvcrt._gmtime64 @ stub _gmtime64_s -@ stub _localtime32 -@ stub _localtime32_s -@ stdcall _localtime64() msvcrt._localtime64 -@ stub _localtime64_s +@ cdecl -version=0x600+ _localtime32() msvcrt._localtime32 +@ cdecl -version=0x600+ _localtime32_s() msvcrt._localtime32_s +@ cdecl _localtime64() msvcrt._localtime64 +@ cdecl -version=0x600+ _localtime64_s() msvcrt._localtime64_s @ stub _mkgmtime32 @ stdcall _mkgmtime64() msvcrt._mkgmtime64 @ stub _mktime32 diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 0d5ab41eeee..e80a290e2fd 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -710,8 +710,8 @@ @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 -version=0x600+ _local_unwind4(ptr ptr long) -@ stub -version=0x600+ _localtime32 -@ stub -version=0x600+ _localtime32_s +@ cdecl -version=0x600+ _localtime32(ptr) +@ cdecl -version=0x600+ _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) @ cdecl -version=0x600+ _localtime64_s(ptr ptr) @ cdecl _lock(long)

1 year, 9 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