Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 09/20: [UCRT:VCRUNTIME] Implement vcruntime init stubs
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4198ceb83aa95e799f32c… commit 4198ceb83aa95e799f32ca7b71e3768b468422e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 17 11:44:15 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:VCRUNTIME] Implement vcruntime init stubs --- sdk/lib/ucrt/vcruntime/__vcrt_init.c | 36 ++++++++++++++++++++++++++++++++++ sdk/lib/ucrt/vcruntime/vcruntime.cmake | 1 + 2 files changed, 37 insertions(+) diff --git a/sdk/lib/ucrt/vcruntime/__vcrt_init.c b/sdk/lib/ucrt/vcruntime/__vcrt_init.c new file mode 100644 index 00000000000..45cce866e92 --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/__vcrt_init.c @@ -0,0 +1,36 @@ +// +// __vcrt_init.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of vcruntime initialization and termination functions. +// +// SPDX-License-Identifier: MIT +// + +#include <vcruntime_startup.h> + +__vcrt_bool __cdecl __vcrt_initialize(void) +{ + return 1; +} + +__vcrt_bool __cdecl __vcrt_uninitialize(_In_ __vcrt_bool _Terminating) +{ + return 1; +} + +__vcrt_bool __cdecl __vcrt_uninitialize_critical(void) +{ + return 1; +} + +__vcrt_bool __cdecl __vcrt_thread_attach(void) +{ + return 1; +} + +__vcrt_bool __cdecl __vcrt_thread_detach(void) +{ + return 1; +} diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake index d0f06931599..feb4a44d66d 100644 --- a/sdk/lib/ucrt/vcruntime/vcruntime.cmake +++ b/sdk/lib/ucrt/vcruntime/vcruntime.cmake @@ -3,6 +3,7 @@ list(APPEND UCRT_VCRUNTIME_SOURCES vcruntime/__report_gsfailure.c vcruntime/__report_rangecheckfailure.c vcruntime/__security_init_cookie.c + vcruntime/__vcrt_init.c ) if(${ARCH} STREQUAL "i386")

1 0

[reactos] 08/20: [UCRT:VCRUNTIME] Implement __report_rangecheckfailure()
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d809565663c95a145d32… commit 4d809565663c95a145d32b68da03be07ff1c0109 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 17 11:43:24 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:VCRUNTIME] Implement __report_rangecheckfailure() --- sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c | 17 +++++++++++++++++ sdk/lib/ucrt/vcruntime/vcruntime.cmake | 1 + 2 files changed, 18 insertions(+) diff --git a/sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c b/sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c new file mode 100644 index 00000000000..0e8784b8815 --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c @@ -0,0 +1,17 @@ +// +// __report_rangecheckfailure.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __report_rangecheckfailure. +// +// SPDX-License-Identifier: MIT +// + +#include <intrin.h> +#include <ntrtl.h> + +__declspec(noreturn) void __cdecl __report_rangecheckfailure(void) +{ + __fastfail(FAST_FAIL_RANGE_CHECK_FAILURE); +} diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake index 3e571e76517..d0f06931599 100644 --- a/sdk/lib/ucrt/vcruntime/vcruntime.cmake +++ b/sdk/lib/ucrt/vcruntime/vcruntime.cmake @@ -1,6 +1,7 @@ list(APPEND UCRT_VCRUNTIME_SOURCES vcruntime/__report_gsfailure.c + vcruntime/__report_rangecheckfailure.c vcruntime/__security_init_cookie.c )

1 0

[reactos] 07/20: [UCRT:VCRUNTIME] Implement __report_gsfailure()
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0f3e623b7efdd04fca95… commit b0f3e623b7efdd04fca9523d0168ab14f5bae8ab Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 17 11:42:45 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:VCRUNTIME] Implement __report_gsfailure() --- sdk/lib/ucrt/vcruntime/__report_gsfailure.c | 21 +++++++++++++++++++++ sdk/lib/ucrt/vcruntime/vcruntime.cmake | 1 + 2 files changed, 22 insertions(+) diff --git a/sdk/lib/ucrt/vcruntime/__report_gsfailure.c b/sdk/lib/ucrt/vcruntime/__report_gsfailure.c new file mode 100644 index 00000000000..d45f96df22f --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/__report_gsfailure.c @@ -0,0 +1,21 @@ +// +// __report_gsfailure.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __report_gsfailure. +// +// SPDX-License-Identifier: MIT +// + +#include <intrin.h> +#include <ntrtl.h> + +#if defined(_M_IX86) +__declspec(noreturn) void __cdecl __report_gsfailure(void) +#else +__declspec(noreturn) void __cdecl __report_gsfailure(_In_ uintptr_t _StackCookie) +#endif +{ + __fastfail(FAST_FAIL_STACK_COOKIE_CHECK_FAILURE); +} diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake index e4857cfe95c..3e571e76517 100644 --- a/sdk/lib/ucrt/vcruntime/vcruntime.cmake +++ b/sdk/lib/ucrt/vcruntime/vcruntime.cmake @@ -1,5 +1,6 @@ list(APPEND UCRT_VCRUNTIME_SOURCES + vcruntime/__report_gsfailure.c vcruntime/__security_init_cookie.c )

1 0

[reactos] 06/20: [UCRT:VCRUNTIME] Implement __security_init_cookie and __security_check_cookie
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dcd1d1714663fcc7db6f… commit 5dcd1d1714663fcc7db6fb4dab48ac16e6c0c5d5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 22 09:05:04 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:VCRUNTIME] Implement __security_init_cookie and __security_check_cookie --- sdk/lib/ucrt/CMakeLists.txt | 2 + sdk/lib/ucrt/vcruntime/__security_init_cookie.c | 87 ++++++++++++++++++++++ .../ucrt/vcruntime/amd64/__security_check_cookie.s | 27 +++++++ .../ucrt/vcruntime/i386/__security_check_cookie.s | 27 +++++++ sdk/lib/ucrt/vcruntime/vcruntime.cmake | 14 ++++ 5 files changed, 157 insertions(+) diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt index deeb3c7b27e..a5106b5037c 100644 --- a/sdk/lib/ucrt/CMakeLists.txt +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -101,6 +101,7 @@ include(stdio/stdio.cmake) include(stdlib/stdlib.cmake) include(string/string.cmake) include(time/time.cmake) +include(vcruntime/vcruntime.cmake) add_library(ucrt OBJECT ${UCRT_CONIO_SOURCES} @@ -122,6 +123,7 @@ add_library(ucrt OBJECT ${UCRT_STDLIB_SOURCES} ${UCRT_STRING_SOURCES} ${UCRT_TIME_SOURCES} + ${UCRT_VCRUNTIME_SOURCES} ) #target_link_libraries(ucrt pseh) diff --git a/sdk/lib/ucrt/vcruntime/__security_init_cookie.c b/sdk/lib/ucrt/vcruntime/__security_init_cookie.c new file mode 100644 index 00000000000..7488aec954d --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/__security_init_cookie.c @@ -0,0 +1,87 @@ +// +// __security_init_cookie.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __security_init_cookie. +// +// SPDX-License-Identifier: MIT +// + +#include <stdlib.h> +#include <intrin.h> +#include <corecrt_internal.h> + +#ifdef _WIN64 +#define DEFAULT_SECURITY_COOKIE 0x00002B992DDFA232ull +#define _rotlptr _rotl64 +#else +#define DEFAULT_SECURITY_COOKIE 0xBB40E64E +#define _rotlptr _rotl +#endif + +uintptr_t __security_cookie = DEFAULT_SECURITY_COOKIE; +uintptr_t __security_cookie_complement = ~DEFAULT_SECURITY_COOKIE; + +void __security_init_cookie(void) +{ + LARGE_INTEGER performanceCounter; + FILETIME fileTime; + uintptr_t randomValue = (uintptr_t)0x27E30B2C16B07297ull; + +#if defined(_M_IX86) || defined(_M_X64) + if (IsProcessorFeaturePresent(PF_RDRAND_INSTRUCTION_AVAILABLE)) + { +#ifdef _M_X64 + while (!_rdrand64_step(&randomValue)) + _mm_pause(); +#else + while (!_rdrand32_step(&randomValue)) + _mm_pause(); +#endif + } + + if (IsProcessorFeaturePresent(PF_RDTSC_INSTRUCTION_AVAILABLE)) + { + randomValue += __rdtsc(); + } +#endif + + randomValue += (uintptr_t)&randomValue; + randomValue ^= GetTickCount(); + + QueryPerformanceCounter(&performanceCounter); +#ifdef _WIN64 + randomValue ^= performanceCounter.QuadPart; +#else + randomValue ^= performanceCounter.LowPart; + randomValue ^= performanceCounter.HighPart; +#endif + + randomValue += GetCurrentThreadId(); + randomValue = _rotlptr(randomValue, GetCurrentThreadId() >> 2); + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) + GetSystemTimePreciseAsFileTime(&fileTime); +#else + GetSystemTimeAsFileTime(&fileTime); +#endif + randomValue += fileTime.dwLowDateTime; + randomValue += fileTime.dwHighDateTime; + + randomValue += GetCurrentProcessId(); + randomValue = _rotlptr(randomValue, GetCurrentProcessId() >> 2); + + if (randomValue == DEFAULT_SECURITY_COOKIE) + { + randomValue++; + } + +#ifdef _WIN64 + /* Zero out highest 16 bits */ + randomValue &= 0x0000FFFFFFFFFFFFull; +#endif + + __security_cookie = randomValue; + __security_cookie_complement = ~randomValue; +} diff --git a/sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s b/sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s new file mode 100644 index 00000000000..621426521f4 --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s @@ -0,0 +1,27 @@ +// +// __security_check_cookie.asm +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __security_check_cookie for x64. +// +// SPDX-License-Identifier: MIT +// + +#include <asm.inc> + +EXTERN __security_cookie:QWORD +EXTERN __report_gsfailure:PROC + +.code64 + +// This function must not clobber any registers! +PUBLIC __security_check_cookie +__security_check_cookie: + cmp rcx, qword ptr __security_cookie[rip] + jne __security_check_cookie_fail + ret +__security_check_cookie_fail: + jmp __report_gsfailure + +END diff --git a/sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s b/sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s new file mode 100644 index 00000000000..276025efae3 --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s @@ -0,0 +1,27 @@ +// +// __security_check_cookie.asm +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __security_check_cookie for x86. +// +// SPDX-License-Identifier: MIT +// + +#include <asm.inc> + +EXTERN ___security_cookie:QWORD +EXTERN ___report_gsfailure:PROC + +.code + +// This function must not clobber any registers! +PUBLIC ___security_check_cookie +___security_check_cookie: + cmp ecx, dword ptr [___security_cookie] + jne ___security_check_cookie_fail + ret +___security_check_cookie_fail: + jmp ___report_gsfailure + +END diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake new file mode 100644 index 00000000000..e4857cfe95c --- /dev/null +++ b/sdk/lib/ucrt/vcruntime/vcruntime.cmake @@ -0,0 +1,14 @@ + +list(APPEND UCRT_VCRUNTIME_SOURCES + vcruntime/__security_init_cookie.c +) + +if(${ARCH} STREQUAL "i386") + list(APPEND UCRT_VCRUNTIME_SOURCES + vcruntime/i386/__security_check_cookie.s + ) +elseif(${ARCH} STREQUAL "amd64") + list(APPEND UCRT_VCRUNTIME_SOURCES + vcruntime/amd64/__security_check_cookie.s + ) +endif()

1 0

[reactos] 05/20: [UCRT:FLOAT] Add _fltused
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=055875fbd894e73de031a… commit 055875fbd894e73de031aaf4c876171068e270ab Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 28 19:17:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:FLOAT] Add _fltused --- sdk/lib/ucrt/CMakeLists.txt | 2 ++ sdk/lib/ucrt/float/_fltused.c | 11 +++++++++++ sdk/lib/ucrt/float/float.cmake | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt index 4c2b2e18559..deeb3c7b27e 100644 --- a/sdk/lib/ucrt/CMakeLists.txt +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -88,6 +88,7 @@ include(dll/dll.cmake) include(env/env.cmake) include(exec/exec.cmake) include(filesystem/filesystem.cmake) +include(float/float.cmake) include(heap/heap.cmake) include(initializers/initializers.cmake) include(internal/internal.cmake) @@ -108,6 +109,7 @@ add_library(ucrt OBJECT ${UCRT_ENV_SOURCES} ${UCRT_EXEC_SOURCES} ${UCRT_FILESYSTEM_SOURCES} + ${UCRT_FLOAT_SOURCES} ${UCRT_HEAP_SOURCES} ${UCRT_INITIALIZERS_SOURCES} ${UCRT_INTERNAL_SOURCES} diff --git a/sdk/lib/ucrt/float/_fltused.c b/sdk/lib/ucrt/float/_fltused.c new file mode 100644 index 00000000000..234d3cf0cd4 --- /dev/null +++ b/sdk/lib/ucrt/float/_fltused.c @@ -0,0 +1,11 @@ +// +// _fltused.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of _fltused. +// +// SPDX-License-Identifier: MIT +// + +int _fltused = 0x9875; diff --git a/sdk/lib/ucrt/float/float.cmake b/sdk/lib/ucrt/float/float.cmake new file mode 100644 index 00000000000..a0306235771 --- /dev/null +++ b/sdk/lib/ucrt/float/float.cmake @@ -0,0 +1,4 @@ + +list(APPEND UCRT_FLOAT_SOURCES + float/_fltused.c +)

1 0

[reactos] 04/20: [UCRT:STARTUP] Implement __scrt_uninitialize_crt stub
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=446234207603320f29d98… commit 446234207603320f29d98852d73f1fdd930405f8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 4 13:38:04 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:STARTUP] Implement __scrt_uninitialize_crt stub --- sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp | 17 +++++++++++++++++ sdk/lib/ucrt/startup/startup.cmake | 1 + 2 files changed, 18 insertions(+) diff --git a/sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp b/sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp new file mode 100644 index 00000000000..dcb70fdebc5 --- /dev/null +++ b/sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp @@ -0,0 +1,17 @@ +// +// __scrt_uninitialize_crt.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __scrt_uninitialize_crt. +// +// SPDX-License-Identifier: MIT +// + +extern "C" +bool +__cdecl +__scrt_uninitialize_crt(bool is_terminating, bool from_exit) +{ + return true; +} diff --git a/sdk/lib/ucrt/startup/startup.cmake b/sdk/lib/ucrt/startup/startup.cmake index 9bc9b454df7..4bf94341ace 100644 --- a/sdk/lib/ucrt/startup/startup.cmake +++ b/sdk/lib/ucrt/startup/startup.cmake @@ -1,5 +1,6 @@ list(APPEND UCRT_STARTUP_SOURCES + startup/__scrt_uninitialize_crt.cpp startup/abort.cpp startup/argv_data.cpp startup/argv_parsing.cpp

1 0

[reactos] 03/20: [UCRT:LOCALE] Implement __acrt_WideCharToMultiByte
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d21fd3765078594e07543… commit d21fd3765078594e07543840e5dd835df1994111 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Dec 2 13:47:49 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:LOCALE] Implement __acrt_WideCharToMultiByte --- sdk/lib/ucrt/locale/WideCharToMultiByte.c | 35 +++++++++++++++++++++++++++++++ sdk/lib/ucrt/locale/locale.cmake | 1 + 2 files changed, 36 insertions(+) diff --git a/sdk/lib/ucrt/locale/WideCharToMultiByte.c b/sdk/lib/ucrt/locale/WideCharToMultiByte.c new file mode 100644 index 00000000000..5e89e52f8dc --- /dev/null +++ b/sdk/lib/ucrt/locale/WideCharToMultiByte.c @@ -0,0 +1,35 @@ +// +// WideCharToMultiByte.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Definition of __acrt_WideCharToMultiByte. +// +// SPDX-License-Identifier: MIT +// + +#include <windows.h> +//#include <stringapiset.h> + +_Success_(return != 0) +int +__cdecl +__acrt_WideCharToMultiByte ( + _In_ UINT _CodePage, + _In_ DWORD _DWFlags, + _In_ LPCWSTR _LpWideCharStr, + _In_ int _CchWideChar, + _Out_writes_opt_(_CbMultiByte) LPSTR _LpMultiByteStr, + _In_ int _CbMultiByte, + _In_opt_ LPCSTR _LpDefaultChar, + _Out_opt_ LPBOOL _LpUsedDefaultChar) +{ + return WideCharToMultiByte(_CodePage, + _DWFlags, + _LpWideCharStr, + _CchWideChar, + _LpMultiByteStr, + _CbMultiByte, + _LpDefaultChar, + _LpUsedDefaultChar); +} diff --git a/sdk/lib/ucrt/locale/locale.cmake b/sdk/lib/ucrt/locale/locale.cmake index 7227d7e8d1f..c4622e4c445 100644 --- a/sdk/lib/ucrt/locale/locale.cmake +++ b/sdk/lib/ucrt/locale/locale.cmake @@ -24,4 +24,5 @@ list(APPEND UCRT_LOCALE_SOURCES locale/nlsdata.cpp locale/setlocale.cpp locale/wsetlocale.cpp + locale/WideCharToMultiByte.c )

1 0

[reactos] 02/20: [UCRT:LOCALE] Implement __acrt_MultiByteToWideChar
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd3c7654ec5483e735d46… commit bd3c7654ec5483e735d46b238a262c617eadca6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Dec 2 13:46:14 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:LOCALE] Implement __acrt_MultiByteToWideChar --- sdk/lib/ucrt/locale/MultiByteToWideChar.c | 31 +++++++++++++++++++++++++++++++ sdk/lib/ucrt/locale/locale.cmake | 1 + 2 files changed, 32 insertions(+) diff --git a/sdk/lib/ucrt/locale/MultiByteToWideChar.c b/sdk/lib/ucrt/locale/MultiByteToWideChar.c new file mode 100644 index 00000000000..fab0e2656a9 --- /dev/null +++ b/sdk/lib/ucrt/locale/MultiByteToWideChar.c @@ -0,0 +1,31 @@ +// +// MultiByteToWideChar.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Definition of __acrt_MultiByteToWideChar. +// +// SPDX-License-Identifier: MIT +// + +#include <windows.h> +//#include <stringapiset.h> + +_Success_(return != 0) +int +__cdecl +__acrt_MultiByteToWideChar ( + _In_ UINT _CodePage, + _In_ DWORD _DWFlags, + _In_ LPCSTR _LpMultiByteStr, + _In_ int _CbMultiByte, + _Out_writes_opt_(_CchWideChar) LPWSTR _LpWideCharStr, + _In_ int _CchWideChar) +{ + return MultiByteToWideChar(_CodePage, + _DWFlags, + _LpMultiByteStr, + _CbMultiByte, + _LpWideCharStr, + _CchWideChar); +} diff --git a/sdk/lib/ucrt/locale/locale.cmake b/sdk/lib/ucrt/locale/locale.cmake index 038a0f46dc0..7227d7e8d1f 100644 --- a/sdk/lib/ucrt/locale/locale.cmake +++ b/sdk/lib/ucrt/locale/locale.cmake @@ -20,6 +20,7 @@ list(APPEND UCRT_LOCALE_SOURCES locale/localeconv.cpp locale/locale_refcounting.cpp locale/locale_update.cpp + locale/MultiByteToWideChar.c locale/nlsdata.cpp locale/setlocale.cpp locale/wsetlocale.cpp

1 0

[reactos] 01/20: [UCRT:LOCALE] Implement __acrt_GetStringTypeW
by Timo Kreuzer 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ea1841f31e178d0bbf63… commit 4ea1841f31e178d0bbf6346e37e51f154a539e8b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 21 17:33:43 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 26 18:08:55 2025 +0200 [UCRT:LOCALE] Implement __acrt_GetStringTypeW --- sdk/lib/ucrt/locale/GetStringTypeW.c | 24 ++++++++++++++++++++++++ sdk/lib/ucrt/locale/locale.cmake | 1 + 2 files changed, 25 insertions(+) diff --git a/sdk/lib/ucrt/locale/GetStringTypeW.c b/sdk/lib/ucrt/locale/GetStringTypeW.c new file mode 100644 index 00000000000..10ac0d85132 --- /dev/null +++ b/sdk/lib/ucrt/locale/GetStringTypeW.c @@ -0,0 +1,24 @@ +// +// GetStringTypeW.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Definition of __acrt_GetStringTypeW. +// +// SPDX-License-Identifier: MIT +// + +#include <windows.h> +//#include <stringapiset.h> + +_Success_(return) +BOOL +__cdecl +__acrt_GetStringTypeW ( + _In_ DWORD _DWInfoType, + _In_NLS_string_(_CchSrc) PCWCH _LpSrcStr, + _In_ int _CchSrc, + _Out_ LPWORD _LpCharType) +{ + return GetStringTypeW(_DWInfoType, _LpSrcStr, _CchSrc, _LpCharType); +} diff --git a/sdk/lib/ucrt/locale/locale.cmake b/sdk/lib/ucrt/locale/locale.cmake index 97fe554114a..038a0f46dc0 100644 --- a/sdk/lib/ucrt/locale/locale.cmake +++ b/sdk/lib/ucrt/locale/locale.cmake @@ -6,6 +6,7 @@ list(APPEND UCRT_LOCALE_SOURCES locale/GetLocaleInfoA.cpp locale/getqloc_downlevel.cpp locale/GetStringTypeA.cpp + locale/GetStringTypeW.c locale/get_qualified_locale.cpp locale/glstatus.cpp locale/initctype.cpp

1 0

[reactos] 01/01: [SYSSETUP] Move the creation of start menu items into the wizard
by Eric Kohl 26 Jan '25

26 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56b0f836c518d7f737dc9… commit 56b0f836c518d7f737dc933697836a753fea1bbb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 26 11:45:28 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 26 11:46:04 2025 +0100 [SYSSETUP] Move the creation of start menu items into the wizard Start menu items were created after the wizard had finished. This patch moves the creation of the start menu items into the process page of the wizard and enables the 2nd item of the task list. --- dll/win32/syssetup/globals.h | 45 ++++++++++++++ dll/win32/syssetup/install.c | 142 ++++++++++++++++++++++++++++++++----------- dll/win32/syssetup/wizard.c | 38 +++--------- 3 files changed, 159 insertions(+), 66 deletions(-) diff --git a/dll/win32/syssetup/globals.h b/dll/win32/syssetup/globals.h index 8c020acefb3..85b3f8dea3a 100644 --- a/dll/win32/syssetup/globals.h +++ b/dll/win32/syssetup/globals.h @@ -25,12 +25,57 @@ typedef struct _ADMIN_INFO LPWSTR Password; } ADMIN_INFO, *PADMIN_INFO; + +typedef struct _ITEMSDATA +{ + HWND hwndDlg; +} ITEMSDATA, *PITEMSDATA; + +typedef struct _REGISTRATIONNOTIFY +{ + ULONG Progress; + UINT ActivityID; + LPCWSTR CurrentItem; + LPCWSTR ErrorMessage; + UINT MessageID; + DWORD LastError; +} REGISTRATIONNOTIFY, *PREGISTRATIONNOTIFY; + + +#define PM_REGISTRATION_NOTIFY (WM_APP + 1) +/* Private Message used to communicate progress from the background + registration thread to the main thread. + wParam = 0 Registration in progress + = 1 Registration completed + lParam = Pointer to a REGISTRATIONNOTIFY structure */ + +#define PM_ITEM_START (WM_APP + 2) +/* Start of a new Item + wParam = item number + lParam = number of steps */ + +#define PM_ITEM_END (WM_APP + 3) +/* End of a new Item + wParam = unused + lParam = Error Code */ + +#define PM_STEP_START (WM_APP + 4) +#define PM_STEP_END (WM_APP + 5) +#define PM_ITEMS_DONE (WM_APP + 6) + + extern HINSTANCE hDllInstance; extern HINF hSysSetupInf; extern ADMIN_INFO AdminInfo; BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); +/* install */ + +VOID +InstallStartMenuItems( + _In_ PITEMSDATA pItemsData); + /* netinstall.c */ BOOL diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 0f6a150da4e..61d5da1bc33 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -180,7 +180,13 @@ CreateShortcut( } -static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR pszFolder) +static BOOL +CreateShortcutsFromSection( + _In_ PITEMSDATA pItemsData, + _In_ PREGISTRATIONNOTIFY pNotify, + _In_ HINF hinf, + _In_ LPWSTR pszSection, + _In_ LPCWSTR pszFolder) { INFCONTEXT Context; DWORD dwFieldCount; @@ -196,6 +202,10 @@ static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR psz do { + pNotify->Progress++; + + SendMessage(pItemsData->hwndDlg, PM_STEP_START, 0, (LPARAM)pNotify); + dwFieldCount = SetupGetFieldCount(&Context); if (dwFieldCount < 3) continue; @@ -222,12 +232,19 @@ static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR psz CreateShortcut(pszFolder, szName, szCommand, szDescription, iIconNr, szDirectory, szArgs); + SendMessage(pItemsData->hwndDlg, PM_STEP_END, 0, (LPARAM)pNotify); + } while (SetupFindNextLine(&Context, &Context)); return TRUE; } -static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection) +static BOOL +CreateShortcuts( + _In_ PITEMSDATA pItemsData, + _In_ PREGISTRATIONNOTIFY pNotify, + _In_ HINF hinf, + _In_ LPCWSTR szSection) { INFCONTEXT Context; WCHAR szPath[MAX_PATH]; @@ -257,7 +274,7 @@ static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection) if (FAILED(SHGetFolderPathAndSubDirW(NULL, csidl|CSIDL_FLAG_CREATE, (HANDLE)-1, SHGFP_TYPE_DEFAULT, szFolder, szPath))) continue; - CreateShortcutsFromSection(hinf, szFolderSection, szPath); + CreateShortcutsFromSection(pItemsData, pNotify, hinf, szFolderSection, szPath); } while (SetupFindNextLine(&Context, &Context)); @@ -266,6 +283,92 @@ static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection) return TRUE; } +static LONG +CountShortcuts( + _In_ HINF hinf, + _In_ LPCWSTR szSection) +{ + INFCONTEXT Context; + WCHAR szFolderSection[MAX_PATH]; + LONG Steps = 0; + + if (!SetupFindFirstLine(hinf, szSection, NULL, &Context)) + return FALSE; + + do + { + if (SetupGetFieldCount(&Context) < 2) + continue; + + if (!SetupGetStringFieldW(&Context, 0, szFolderSection, ARRAYSIZE(szFolderSection), NULL)) + continue; + + Steps += SetupGetLineCountW(hinf, szFolderSection); + } while (SetupFindNextLine(&Context, &Context)); + + return Steps; +} + +VOID +InstallStartMenuItems( + _In_ PITEMSDATA pItemsData) +{ + HINF hShortcutsInf1 = INVALID_HANDLE_VALUE; + HINF hShortcutsInf2 = INVALID_HANDLE_VALUE; + LONG Steps = 0; + DWORD LastError = 0; + REGISTRATIONNOTIFY Notify; + + ZeroMemory(&Notify, sizeof(Notify)); + + hShortcutsInf1 = SetupOpenInfFileW(L"shortcuts.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hShortcutsInf1 == INVALID_HANDLE_VALUE) + { + DPRINT1("Failed to open shortcuts.inf"); + return; + } + + hShortcutsInf2 = SetupOpenInfFileW(L"rosapps_shortcuts.inf", + NULL, + INF_STYLE_WIN4, + NULL); + +// Steps = SetupGetLineCountW(hShortcutsInf1, L"ShortcutFolders"); + Steps = CountShortcuts(hShortcutsInf1, L"ShortcutFolders"); + if (hShortcutsInf2 != INVALID_HANDLE_VALUE) + Steps += CountShortcuts(hShortcutsInf2, L"ShortcutFolders"); +// Steps += SetupGetLineCountW(hShortcutsInf2, L"ShortcutFolders"); + + SendMessage(pItemsData->hwndDlg, PM_ITEM_START, 1, (LPARAM)Steps); + + if (!CreateShortcuts(pItemsData, &Notify, hShortcutsInf1, L"ShortcutFolders")) + { + DPRINT1("CreateShortcuts() failed"); + goto done; + } + + if (hShortcutsInf2 != INVALID_HANDLE_VALUE) + { + if (!CreateShortcuts(pItemsData, &Notify, hShortcutsInf2, L"ShortcutFolders")) + { + DPRINT1("CreateShortcuts(rosapps) failed"); + goto done; + } + } + +done: + if (hShortcutsInf2 != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hShortcutsInf2); + + if (hShortcutsInf1 != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hShortcutsInf1); + + SendMessage(pItemsData->hwndDlg, PM_ITEM_END, 1, LastError); +} + static VOID CreateTempDir( IN LPCWSTR VarName) @@ -1393,7 +1496,6 @@ InstallReactOS(VOID) HANDLE token; TOKEN_PRIVILEGES privs; HKEY hKey; - HINF hShortcutsInf; HANDLE hHotkeyThread; BOOL ret; @@ -1484,38 +1586,6 @@ InstallReactOS(VOID) SetAutoAdminLogon(); - hShortcutsInf = SetupOpenInfFileW(L"shortcuts.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hShortcutsInf == INVALID_HANDLE_VALUE) - { - FatalError("Failed to open shortcuts.inf"); - return 0; - } - - if (!CreateShortcuts(hShortcutsInf, L"ShortcutFolders")) - { - FatalError("CreateShortcuts() failed"); - return 0; - } - - SetupCloseInfFile(hShortcutsInf); - - hShortcutsInf = SetupOpenInfFileW(L"rosapps_shortcuts.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hShortcutsInf != INVALID_HANDLE_VALUE) - { - if (!CreateShortcuts(hShortcutsInf, L"ShortcutFolders")) - { - FatalError("CreateShortcuts(rosapps) failed"); - return 0; - } - SetupCloseInfFile(hShortcutsInf); - } - SetupCloseInfFile(hSysSetupInf); SetSetupType(0); diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 491e2504e12..4675ff904a9 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -27,34 +27,6 @@ #define NDEBUG #include <debug.h> -#define PM_REGISTRATION_NOTIFY (WM_APP + 1) -/* Private Message used to communicate progress from the background - registration thread to the main thread. - wParam = 0 Registration in progress - = 1 Registration completed - lParam = Pointer to a REGISTRATIONNOTIFY structure */ - -#define PM_ITEM_START (WM_APP + 2) -#define PM_ITEM_END (WM_APP + 3) -#define PM_STEP_START (WM_APP + 4) -#define PM_STEP_END (WM_APP + 5) -#define PM_ITEMS_DONE (WM_APP + 6) - -typedef struct _REGISTRATIONNOTIFY -{ - ULONG Progress; - UINT ActivityID; - LPCWSTR CurrentItem; - LPCWSTR ErrorMessage; - UINT MessageID; - DWORD LastError; -} REGISTRATIONNOTIFY, *PREGISTRATIONNOTIFY; - -typedef struct _ITEMSDATA -{ - HWND hwndDlg; -} ITEMSDATA, *PITEMSDATA; - typedef struct _REGISTRATIONDATA { HWND hwndDlg; @@ -2043,7 +2015,7 @@ RegistrationNotificationProc(PVOID Context, { DPRINT("Received SPFILENOTIFY_STARTREGISTRATION notification for %S\n", StatusInfo->FileName); - RegistrationNotify.ErrorMessage = NULL; +// RegistrationNotify.ErrorMessage = NULL; RegistrationNotify.Progress = RegistrationData->Registered; SendMessage(RegistrationData->hwndDlg, PM_STEP_START, 0, (LPARAM)&RegistrationNotify); } @@ -2193,10 +2165,14 @@ ItemCompletionThread( pItemsData = (PITEMSDATA)Parameter; hwndDlg = pItemsData->hwndDlg; + /* Step 0 - Registering components */ RegisterDlls(pItemsData); RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries"); + /* Step 1 - Installing start menu items */ + InstallStartMenuItems(pItemsData); + /* FIXME: Add completion steps here! */ // FIXME: Move this call to a separate cleanup page! @@ -2345,7 +2321,6 @@ ProcessPageDlgProc(HWND hwndDlg, /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); - ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT2), SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT3), SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT4), SW_HIDE); break; @@ -2354,12 +2329,15 @@ ProcessPageDlgProc(HWND hwndDlg, switch (((LPNMHDR)lParam)->code) { case PSN_SETACTIVE: + LogItem(L"BEGIN", L"ProcessPage"); + /* Disable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), 0); RunItemCompletionThread(hwndDlg); break; case PSN_WIZNEXT: + LogItem(L"END", L"ProcessPage"); break; case PSN_WIZBACK:

1 0

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