Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHDOCVW_APITEST] Add WinList testcase (#7702)
by Katayama Hirofumi MZ 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d969be0fb4a4ac34eed2e… commit d969be0fb4a4ac34eed2e710a4b29cc14c11f7c8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 6 22:07:56 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 6 22:07:56 2025 +0900 [SHDOCVW_APITEST] Add WinList testcase (#7702) JIRA issue: CORE-9368 - Add WinList testcase for CLSID_ShellWindows class and shdocvw!WinList_* functions. --- modules/rostests/apitests/shdocvw/CMakeLists.txt | 1 + modules/rostests/apitests/shdocvw/WinList.cpp | 157 +++++++++++++++++++++++ modules/rostests/apitests/shdocvw/testlist.c | 2 + 3 files changed, 160 insertions(+) diff --git a/modules/rostests/apitests/shdocvw/CMakeLists.txt b/modules/rostests/apitests/shdocvw/CMakeLists.txt index 3f4c6324b57..69531225073 100644 --- a/modules/rostests/apitests/shdocvw/CMakeLists.txt +++ b/modules/rostests/apitests/shdocvw/CMakeLists.txt @@ -1,6 +1,7 @@ list(APPEND SOURCE MRUList.cpp + WinList.cpp testlist.c) add_executable(shdocvw_apitest ${SOURCE}) diff --git a/modules/rostests/apitests/shdocvw/WinList.cpp b/modules/rostests/apitests/shdocvw/WinList.cpp new file mode 100644 index 00000000000..e8a9eeb69ca --- /dev/null +++ b/modules/rostests/apitests/shdocvw/WinList.cpp @@ -0,0 +1,157 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Tests for shdocvw!WinList_* functions + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <shlobj.h> + +typedef BOOL (WINAPI *FN_WinList_Init)(VOID); +typedef VOID (WINAPI *FN_WinList_Terminate)(VOID); +typedef IShellWindows* (WINAPI *FN_WinList_GetShellWindows)(BOOL); + +static FN_WinList_Init g_pWinList_Init = NULL; +static FN_WinList_Terminate g_pWinList_Terminate = NULL; +static FN_WinList_GetShellWindows g_pWinList_GetShellWindows = NULL; + +static VOID +TEST_WinList_GetShellWindows(VOID) +{ + BOOL bInited = g_pWinList_Init && g_pWinList_Init(); + ok_int(bInited, FALSE); // WinList_Init should fail because this process is not explorer.exe + + IShellWindows *pShellWindows1 = g_pWinList_GetShellWindows(FALSE); + trace("%p\n", pShellWindows1); + ok(pShellWindows1 != NULL, "pShellWindows1 was null\n"); + + IShellWindows *pShellWindows2 = g_pWinList_GetShellWindows(FALSE); + trace("%p\n", pShellWindows2); + ok(pShellWindows2 != NULL, "pShellWindows2 was null\n"); + + IShellWindows *pShellWindows3 = g_pWinList_GetShellWindows(TRUE); + trace("%p\n", pShellWindows3); + ok(pShellWindows3 != NULL, "pShellWindows3 was null\n"); + + ok_ptr(pShellWindows1, pShellWindows2); + ok_ptr(pShellWindows2, pShellWindows3); + + if (pShellWindows1) + { + LONG nCount = -1; + HRESULT hr = pShellWindows1->get_Count(&nCount); + ok_hex(hr, S_OK); + ok(nCount >= 0, "nCount was %ld\n", nCount); + trace("%ld\n", nCount); + + pShellWindows1->Release(); + } + else + { + ok_int(TRUE, FALSE); + ok_int(TRUE, FALSE); + } + + if (pShellWindows2) + pShellWindows2->Release(); + + if (pShellWindows3) + pShellWindows3->Release(); + + if (bInited && g_pWinList_Terminate) + g_pWinList_Terminate(); +} + +static VOID +TEST_WinList_Mix(VOID) +{ + IShellWindows *pShellWindows1 = g_pWinList_GetShellWindows(FALSE); + trace("%p\n", pShellWindows1); + ok(pShellWindows1 != NULL, "pShellWindows1 was null\n"); + + IShellWindows *pShellWindows2 = NULL; + CoCreateInstance(CLSID_ShellWindows, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, + IID_IShellWindows, (LPVOID *)&pShellWindows2); + ok(pShellWindows2 != NULL, "pShellWindows2 was null\n"); + + ok_ptr(pShellWindows1, pShellWindows2); + + if (pShellWindows1) + pShellWindows1->Release(); + if (pShellWindows2) + pShellWindows2->Release(); +} + +static VOID +TEST_SHDOCVW_WinList(VOID) +{ + HINSTANCE hSHDOCVW = LoadLibraryW(L"shdocvw.dll"); + if (!hSHDOCVW) + { + skip("shdocvw.dll not loaded\n"); + return; + } + + g_pWinList_Init = (FN_WinList_Init)GetProcAddress(hSHDOCVW, MAKEINTRESOURCEA(110)); + g_pWinList_Terminate = (FN_WinList_Terminate)GetProcAddress(hSHDOCVW, MAKEINTRESOURCEA(111)); + g_pWinList_GetShellWindows = (FN_WinList_GetShellWindows)GetProcAddress(hSHDOCVW, MAKEINTRESOURCEA(179)); + if (!g_pWinList_Init || !g_pWinList_Terminate || !g_pWinList_GetShellWindows) + { + skip("Some WinList_* functions not found: %p %p %p\n", + g_pWinList_Init, g_pWinList_Terminate, g_pWinList_GetShellWindows); + } + else + { + TEST_WinList_GetShellWindows(); + TEST_WinList_Mix(); + } + + FreeLibrary(hSHDOCVW); +} + +static VOID +TEST_CLSID_ShellWindows(VOID) +{ + IShellWindows *pShellWindows1 = NULL; + CoCreateInstance(CLSID_ShellWindows, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, + IID_IShellWindows, (LPVOID *)&pShellWindows1); + ok(pShellWindows1 != NULL, "pShellWindows1 was null\n"); + + IShellWindows *pShellWindows2 = NULL; + CoCreateInstance(CLSID_ShellWindows, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, + IID_IShellWindows, (LPVOID *)&pShellWindows2); + ok(pShellWindows2 != NULL, "pShellWindows2 was null\n"); + + ok_ptr(pShellWindows1, pShellWindows2); + + if (pShellWindows1) + { + LONG nCount = -1; + HRESULT hr = pShellWindows1->get_Count(&nCount); + ok_hex(hr, S_OK); + ok(nCount >= 0, "nCount was %ld\n", nCount); + trace("%ld\n", nCount); + + pShellWindows1->Release(); + } + else + { + ok_int(TRUE, FALSE); + ok_int(TRUE, FALSE); + } + + if (pShellWindows2) + pShellWindows2->Release(); +} + +START_TEST(WinList) +{ + HRESULT hrCoInit = CoInitialize(NULL); + + TEST_SHDOCVW_WinList(); + TEST_CLSID_ShellWindows(); + + if (SUCCEEDED(hrCoInit)) + CoUninitialize(); +} diff --git a/modules/rostests/apitests/shdocvw/testlist.c b/modules/rostests/apitests/shdocvw/testlist.c index 1a34744c0df..725ec086153 100644 --- a/modules/rostests/apitests/shdocvw/testlist.c +++ b/modules/rostests/apitests/shdocvw/testlist.c @@ -2,9 +2,11 @@ #include <apitest.h> extern void func_MRUList(void); +extern void func_WinList(void); const struct test winetest_testlist[] = { { "MRUList", func_MRUList }, + { "WinList", func_WinList }, { 0, 0 } };

1 0

[reactos] 06/06: [VCRUNTIME] Add initialization / cleanup of wine code
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92d479a54b1960acf420a… commit 92d479a54b1960acf420a981fc6f4c7c87d7a09b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 29 13:15:16 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME] Add initialization / cleanup of wine code --- sdk/lib/vcruntime/CMakeLists.txt | 3 +- sdk/lib/vcruntime/__vcrt_init.c | 47 +++++++++++++++++++--- .../{__vcrt_init.c => __vcrt_init_stubs.c} | 4 +- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt index 633a1b7a466..405dc705bd9 100644 --- a/sdk/lib/vcruntime/CMakeLists.txt +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND VCRT_COMMON_SOURCES __report_gsfailure.c __report_rangecheckfailure.c __security_init_cookie.c - __vcrt_init.c _fltused.c initializers.cpp isa_available.cpp @@ -29,11 +28,13 @@ list(APPEND VCRT_COMMON_SOURCES list(APPEND VCRT_RUNTIME_SOURCES __std_terminate.c + __vcrt_init.c ) list(APPEND VCRT_STARTUP_SOURCES __acrt_initialize_stub.cpp __scrt_uninitialize_crt.cpp + __vcrt_init_stubs.c mainCRTStartup.cpp wmainCRTStartup.cpp ) diff --git a/sdk/lib/vcruntime/__vcrt_init.c b/sdk/lib/vcruntime/__vcrt_init.c index 45cce866e92..839c24de7e8 100644 --- a/sdk/lib/vcruntime/__vcrt_init.c +++ b/sdk/lib/vcruntime/__vcrt_init.c @@ -8,29 +8,64 @@ // SPDX-License-Identifier: MIT // -#include <vcruntime_startup.h> +#include <internal_shared.h> + +void msvcrt_init_exception(HINSTANCE hinstDLL); +BOOL msvcrt_init_tls(void); +void msvcrt_free_tls_mem(void); +BOOL msvcrt_free_tls(void); __vcrt_bool __cdecl __vcrt_initialize(void) { - return 1; + msvcrt_init_exception(GetModuleHandle(NULL)); + + if (!msvcrt_init_tls()) + return FALSE; + + return TRUE; } __vcrt_bool __cdecl __vcrt_uninitialize(_In_ __vcrt_bool _Terminating) { - return 1; + if (!msvcrt_free_tls()) + return FALSE; + + return TRUE; } __vcrt_bool __cdecl __vcrt_uninitialize_critical(void) { - return 1; + return TRUE; } __vcrt_bool __cdecl __vcrt_thread_attach(void) { - return 1; + // Not called by UCRT + return TRUE; } __vcrt_bool __cdecl __vcrt_thread_detach(void) { - return 1; + // Not called by UCRT + return TRUE; } + +// UCRT doesn't have a thread detach callback for the vcruntime TLS, because +// the native vcruntime uses FlsAlloc and provides a cleanup callback there. +// Since we don't have that, we use TLS callbacks. +const IMAGE_TLS_DIRECTORY* __p_tls_used = &_tls_used; + +static +VOID +WINAPI +wine_tls_cleanup_callback(PVOID hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + // For the last thread, only DLL_PROCESS_DETACH is called + if ((fdwReason == DLL_THREAD_DETACH) || + (fdwReason == DLL_PROCESS_DETACH)) + { + msvcrt_free_tls_mem(); + } +} + +_CRTALLOC(".CRT$XLD") PIMAGE_TLS_CALLBACK wine_tls_cleanup_ptr = wine_tls_cleanup_callback; diff --git a/sdk/lib/vcruntime/__vcrt_init.c b/sdk/lib/vcruntime/__vcrt_init_stubs.c similarity index 84% copy from sdk/lib/vcruntime/__vcrt_init.c copy to sdk/lib/vcruntime/__vcrt_init_stubs.c index 45cce866e92..3b01a3f119b 100644 --- a/sdk/lib/vcruntime/__vcrt_init.c +++ b/sdk/lib/vcruntime/__vcrt_init_stubs.c @@ -1,9 +1,9 @@ // -// __vcrt_init.c +// __vcrt_init_stubs.c // // Copyright (c) 2024 Timo Kreuzer // -// Implementation of vcruntime initialization and termination functions. +// Stubs for vcruntime initialization and termination in vcstartup. // // SPDX-License-Identifier: MIT //

1 0

[reactos] 05/06: [VCRUNTIME] Add TLS callback support
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32c349d30ed6b08f9c277… commit 32c349d30ed6b08f9c277ca22593479361791494 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 30 10:11:38 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME] Add TLS callback support --- sdk/lib/vcruntime/CMakeLists.txt | 1 + sdk/lib/vcruntime/inc/internal_shared.h | 16 ++++++++++++++ sdk/lib/vcruntime/tlssup.c | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt index 21630765497..633a1b7a466 100644 --- a/sdk/lib/vcruntime/CMakeLists.txt +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -24,6 +24,7 @@ list(APPEND VCRT_COMMON_SOURCES _fltused.c initializers.cpp isa_available.cpp + tlssup.c ) list(APPEND VCRT_RUNTIME_SOURCES diff --git a/sdk/lib/vcruntime/inc/internal_shared.h b/sdk/lib/vcruntime/inc/internal_shared.h index 892799639fc..968f5ecb498 100644 --- a/sdk/lib/vcruntime/inc/internal_shared.h +++ b/sdk/lib/vcruntime/inc/internal_shared.h @@ -38,6 +38,20 @@ extern "C" { #pragma section(".CRT$XPZ", long, read) #pragma section(".CRT$XTA", long, read) #pragma section(".CRT$XTZ", long, read) + + +#pragma section(".CRT$XDA",long,read) +#pragma section(".CRT$XDC",long,read) +#pragma section(".CRT$XDZ",long,read) + +#pragma section(".CRT$XLA",long,read) // TLS callback start +#pragma section(".CRT$XLC",long,read) // TLS constructors +#pragma section(".CRT$XLD",long,read) // TLS destructors +#pragma section(".CRT$XLZ",long,read) // TLS callback end + +#pragma section(".tls",long,read,write) +#pragma section(".tls$AAA",long,read,write) +#pragma section(".tls$ZZZ",long,read,write) #endif extern _PIFV __xi_a[]; @@ -51,6 +65,8 @@ extern _PVFV __xt_z[]; extern char __ImageBase; +extern const IMAGE_TLS_DIRECTORY _tls_used; + #define CRT_WARNING_DISABLE_PUSH(wn, message) \ __pragma(warning(push)) \ __pragma(warning(disable: wn)) diff --git a/sdk/lib/vcruntime/tlssup.c b/sdk/lib/vcruntime/tlssup.c new file mode 100644 index 00000000000..ba3f97ba1ce --- /dev/null +++ b/sdk/lib/vcruntime/tlssup.c @@ -0,0 +1,38 @@ +// +// tlssup.c +// +// Copyright (c) 2025 Timo Kreuzer +// +// TLS callback support +// +// SPDX-License-Identifier: MIT +// + +#include <internal_shared.h> + +// Dummy TLS undex +unsigned int _tls_index; + +// The TLS data +_CRTALLOC(".tls") char *_tls_start = NULL; +_CRTALLOC(".tls$ZZZ") char *_tls_end = NULL; + +// Describes the range of TLS callbacks. +_CRTALLOC(".CRT$XLA") PIMAGE_TLS_CALLBACK __xl_a = 0; +_CRTALLOC(".CRT$XLZ") PIMAGE_TLS_CALLBACK __xl_z = 0; + +// +// The TLS directory. +// The linker will point the executables TLS data directory entry to this. +// Must be force-included with "#pragma comment(linker, "/INCLUDE:_tls_used")" +// or by referencing it from another compilation unit. +// +const IMAGE_TLS_DIRECTORY _tls_used = +{ + (ULONG_PTR)&_tls_start, + (ULONG_PTR)&_tls_end, + (ULONG_PTR)&_tls_index, + (ULONG_PTR)(&__xl_a + 1), + (ULONG)0, + (ULONG)0 +};

1 0

[reactos] 04/06: [VCRUNTIME] Improve includes in internal_shared.h
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f050e0a6dee285efc805… commit 7f050e0a6dee285efc805d86842ce8088b9ad5ee Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 28 09:26:58 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME] Improve includes in internal_shared.h --- sdk/lib/vcruntime/inc/internal_shared.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/lib/vcruntime/inc/internal_shared.h b/sdk/lib/vcruntime/inc/internal_shared.h index 340407bed96..892799639fc 100644 --- a/sdk/lib/vcruntime/inc/internal_shared.h +++ b/sdk/lib/vcruntime/inc/internal_shared.h @@ -10,12 +10,10 @@ #pragma once -#include <suppress.h> -#include <intrin.h> #include <corecrt_startup.h> #include <crtdbg.h> -#include <windows.h> // for HMODULE -#include <malloc.h> +#include <windef.h> +#include <winbase.h> #ifdef __cplusplus extern "C" {

1 0

[reactos] 03/06: [VCSTARTUP] Implement (w)mainCRTStartup
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a978879ddb43ada0d6978… commit a978879ddb43ada0d697892b68f9a2a7a34ca713 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 28 21:56:12 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCSTARTUP] Implement (w)mainCRTStartup __acrt_initialize is here as a stub to later support linking ucrt statically. When it is statically linked the real function should be called, but when the executable links to ucrtdll, the initialization happens when the DLL is loaded, so we call a stub here. --- sdk/lib/vcruntime/CMakeLists.txt | 3 + sdk/lib/vcruntime/__acrt_initialize_stub.cpp | 8 +++ sdk/lib/vcruntime/commonCRTStartup.hpp | 89 ++++++++++++++++++++++++++++ sdk/lib/vcruntime/mainCRTStartup.cpp | 18 ++++++ sdk/lib/vcruntime/wmainCRTStartup.cpp | 18 ++++++ 5 files changed, 136 insertions(+) diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt index b534b1b620d..21630765497 100644 --- a/sdk/lib/vcruntime/CMakeLists.txt +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -31,7 +31,10 @@ list(APPEND VCRT_RUNTIME_SOURCES ) list(APPEND VCRT_STARTUP_SOURCES + __acrt_initialize_stub.cpp __scrt_uninitialize_crt.cpp + mainCRTStartup.cpp + wmainCRTStartup.cpp ) if(${ARCH} STREQUAL "i386") diff --git a/sdk/lib/vcruntime/__acrt_initialize_stub.cpp b/sdk/lib/vcruntime/__acrt_initialize_stub.cpp new file mode 100644 index 00000000000..cbf566e9756 --- /dev/null +++ b/sdk/lib/vcruntime/__acrt_initialize_stub.cpp @@ -0,0 +1,8 @@ + +#include <internal_shared.h> + +extern "C" +__crt_bool __cdecl __acrt_initialize() +{ + return true; +} diff --git a/sdk/lib/vcruntime/commonCRTStartup.hpp b/sdk/lib/vcruntime/commonCRTStartup.hpp new file mode 100644 index 00000000000..5bb560dcfa8 --- /dev/null +++ b/sdk/lib/vcruntime/commonCRTStartup.hpp @@ -0,0 +1,89 @@ +// +// commonCRTStartup.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of common executable startup code. +// +// SPDX-License-Identifier: MIT +// + +#include <corecrt_startup.h> +#include <internal_shared.h> +#include <excpt.h> +#include <stdlib.h> +#include <intrin.h> +#include <pseh/pseh2.h> + +// Defined in winnt.h +#define FAST_FAIL_FATAL_APP_EXIT 7 + +extern "C" int __cdecl main(int, char**, char**); +extern "C" int __cdecl wmain(int, wchar_t**, wchar_t**); + +template<typename Tmain> +static int call_main(); + +template<> +int call_main<decltype(main)>() +{ + _configure_narrow_argv(_crt_argv_unexpanded_arguments); + + return main(*__p___argc(), *__p___argv(), _get_initial_narrow_environment()); +} + +template<> +int call_main<decltype(wmain)>() +{ + _configure_wide_argv(_crt_argv_unexpanded_arguments); + + return wmain(*__p___argc(), *__p___wargv(), _get_initial_wide_environment()); +} + +static bool __scrt_initialize() +{ + __isa_available_init(); + + if (!__vcrt_initialize()) + { + return false; + } + + if (!__acrt_initialize()) + { + __vcrt_uninitialize(false); + return false; + } + + if (_initterm_e(__xi_a, __xi_z) != 0) + { + return false; + } + + _initterm(__xc_a, __xc_z); + + return true; +} + +template<typename Tmain> +static __declspec(noinline) int __cdecl __commonCRTStartup() +{ + int exitCode; + + if (!__scrt_initialize()) + { + __fastfail(FAST_FAIL_FATAL_APP_EXIT); + } + + __try + { + exitCode = call_main<Tmain>(); + } + __except(EXCEPTION_EXECUTE_HANDLER) + { + exitCode = GetExceptionCode(); + } + __endtry + + exit(exitCode); +} diff --git a/sdk/lib/vcruntime/mainCRTStartup.cpp b/sdk/lib/vcruntime/mainCRTStartup.cpp new file mode 100644 index 00000000000..8fada5e065f --- /dev/null +++ b/sdk/lib/vcruntime/mainCRTStartup.cpp @@ -0,0 +1,18 @@ +// +// mainCRTStartup.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of ANSI executable entry point. +// +// SPDX-License-Identifier: MIT +// + +#include "commonCRTStartup.hpp" + +extern "C" unsigned long mainCRTStartup(void*) +{ + __security_init_cookie(); + + return __commonCRTStartup<decltype(main)>(); +} diff --git a/sdk/lib/vcruntime/wmainCRTStartup.cpp b/sdk/lib/vcruntime/wmainCRTStartup.cpp new file mode 100644 index 00000000000..364cff2a0d4 --- /dev/null +++ b/sdk/lib/vcruntime/wmainCRTStartup.cpp @@ -0,0 +1,18 @@ +// +// wmainCRTStartup.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of unicode executable entry point. +// +// SPDX-License-Identifier: MIT +// + +#include "commonCRTStartup.hpp" + +extern "C" unsigned long wmainCRTStartup(void*) +{ + __security_init_cookie(); + + return __commonCRTStartup<decltype(wmain)>(); +}

1 0

[reactos] 02/06: [VCRUNTIME] Implement __std_terminate()
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d243b6cdf366ddf6b1010… commit d243b6cdf366ddf6b10109811c64c09078e32dd6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 28 21:57:55 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME] Implement __std_terminate() --- sdk/lib/vcruntime/CMakeLists.txt | 2 +- sdk/lib/vcruntime/__std_terminate.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt index 3c7076acafd..b534b1b620d 100644 --- a/sdk/lib/vcruntime/CMakeLists.txt +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -27,7 +27,7 @@ list(APPEND VCRT_COMMON_SOURCES ) list(APPEND VCRT_RUNTIME_SOURCES - # TBD + __std_terminate.c ) list(APPEND VCRT_STARTUP_SOURCES diff --git a/sdk/lib/vcruntime/__std_terminate.c b/sdk/lib/vcruntime/__std_terminate.c new file mode 100644 index 00000000000..84239d4980e --- /dev/null +++ b/sdk/lib/vcruntime/__std_terminate.c @@ -0,0 +1,19 @@ +// +// __std_terminate.c +// +// Copyright (c) 2024 Timo Kreuzer +// +// Implementation of __std_terminate. +// +// SPDX-License-Identifier: MIT +// + +#include <process.h> + +__declspec(noreturn) void __cdecl terminate(); + +__declspec(noreturn) +void __std_terminate(void) +{ + terminate(); +}

1 0

[reactos] 01/06: [VCRUNTIME][VCSTARTUP] Add separate vcruntime and vcstartup lib
by Timo Kreuzer 06 Feb '25

06 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9186b861a6d94023d2d5f… commit 9186b861a6d94023d2d5f74f574ea2fa82d0a04c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 17 11:45:05 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME][VCSTARTUP] Add separate vcruntime and vcstartup lib vcruntime contains the code that is linked into ucrtbase (in VS it is also provided as vcruntime140.dll) vcstartup contains the code that is statically linked into executables that link to ucrtbase.dll. In Visual Studio this is part of msvcrt.lib (the import library for msvcrt), similar to our current msvcrtex, and it gets linked when you link to ucrtbase as well. The name is based on the folder name in the library. Both libraries share some code, but each file is only compiled once. --- dll/win32/ucrtbase/CMakeLists.txt | 4 ++ sdk/lib/CMakeLists.txt | 1 + sdk/lib/ucrt/CMakeLists.txt | 3 +- sdk/lib/ucrt/float/float.cmake | 2 +- sdk/lib/ucrt/startup/startup.cmake | 1 - sdk/lib/ucrt/vcruntime/vcruntime.cmake | 19 ------ sdk/lib/vcruntime/CMakeLists.txt | 71 ++++++++++++++++++++++ sdk/lib/{ucrt => }/vcruntime/__report_gsfailure.c | 0 .../vcruntime/__report_rangecheckfailure.c | 0 .../__scrt_uninitialize_crt.cpp | 0 .../{ucrt => }/vcruntime/__security_init_cookie.c | 4 +- sdk/lib/{ucrt => }/vcruntime/__vcrt_init.c | 0 sdk/lib/{ucrt/float => vcruntime}/_fltused.c | 0 .../vcruntime/amd64/__security_check_cookie.s | 0 .../vcruntime/i386/__security_check_cookie.s | 0 sdk/lib/{ucrt => vcruntime}/inc/internal_shared.h | 0 sdk/lib/{ucrt => vcruntime}/inc/nt.h | 0 sdk/lib/{ucrt => vcruntime}/inc/ntrtl.h | 0 sdk/lib/{ucrt => vcruntime}/inc/nturtl.h | 0 sdk/lib/{ucrt => }/vcruntime/initializers.cpp | 0 sdk/lib/{ucrt => }/vcruntime/isa_available.cpp | 0 21 files changed, 79 insertions(+), 26 deletions(-) diff --git a/dll/win32/ucrtbase/CMakeLists.txt b/dll/win32/ucrtbase/CMakeLists.txt index 7001c9e0e25..e22d60db0aa 100644 --- a/dll/win32/ucrtbase/CMakeLists.txt +++ b/dll/win32/ucrtbase/CMakeLists.txt @@ -21,9 +21,13 @@ set_entrypoint(ucrtbase __acrt_DllMain 12) target_link_libraries(ucrtbase ucrt ucrtsupport + vcruntime wine ) +# Implicitly link to vcstartup +target_link_libraries(libucrtbase vcstartup) + if(MSVC) target_link_libraries(ucrtbase runtmchk) else() diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index e50c21cad8c..e3344d8c621 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -55,6 +55,7 @@ add_subdirectory(tzlib) add_subdirectory(ucrt) add_subdirectory(udmihelp) add_subdirectory(uuid) +add_subdirectory(vcruntime) add_subdirectory(wdmguid) else() diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt index a10b7b60029..f6fdd2b5e2a 100644 --- a/sdk/lib/ucrt/CMakeLists.txt +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -102,7 +102,6 @@ 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} @@ -128,5 +127,5 @@ add_library(ucrt OBJECT ${UCRT_VCRUNTIME_SOURCES} ) -#target_link_libraries(ucrt pseh) +target_link_libraries(ucrt vcruntime) add_dependencies(ucrt psdk asm) diff --git a/sdk/lib/ucrt/float/float.cmake b/sdk/lib/ucrt/float/float.cmake index a0306235771..a1b5174d50a 100644 --- a/sdk/lib/ucrt/float/float.cmake +++ b/sdk/lib/ucrt/float/float.cmake @@ -1,4 +1,4 @@ list(APPEND UCRT_FLOAT_SOURCES - float/_fltused.c + # TBD ) diff --git a/sdk/lib/ucrt/startup/startup.cmake b/sdk/lib/ucrt/startup/startup.cmake index 4bf94341ace..9bc9b454df7 100644 --- a/sdk/lib/ucrt/startup/startup.cmake +++ b/sdk/lib/ucrt/startup/startup.cmake @@ -1,6 +1,5 @@ list(APPEND UCRT_STARTUP_SOURCES - startup/__scrt_uninitialize_crt.cpp startup/abort.cpp startup/argv_data.cpp startup/argv_parsing.cpp diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake deleted file mode 100644 index dc610565944..00000000000 --- a/sdk/lib/ucrt/vcruntime/vcruntime.cmake +++ /dev/null @@ -1,19 +0,0 @@ - -list(APPEND UCRT_VCRUNTIME_SOURCES - vcruntime/__report_gsfailure.c - vcruntime/__report_rangecheckfailure.c - vcruntime/__security_init_cookie.c - vcruntime/__vcrt_init.c - vcruntime/initializers.cpp - vcruntime/isa_available.cpp -) - -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() diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt new file mode 100644 index 00000000000..3c7076acafd --- /dev/null +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -0,0 +1,71 @@ + +# Replace the old CRT include directory with the UCRT include directory +get_property(INCLUDE_DIRS DIRECTORY . PROPERTY INCLUDE_DIRECTORIES) +list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt") +set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS}) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt) + +include_directories(inc) + +# Silence GCC/Clang warnings +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR + CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_options( + -Wno-builtin-declaration-mismatch + -Wno-unused-function + ) +endif() + +list(APPEND VCRT_COMMON_SOURCES + __report_gsfailure.c + __report_rangecheckfailure.c + __security_init_cookie.c + __vcrt_init.c + _fltused.c + initializers.cpp + isa_available.cpp +) + +list(APPEND VCRT_RUNTIME_SOURCES + # TBD +) + +list(APPEND VCRT_STARTUP_SOURCES + __scrt_uninitialize_crt.cpp +) + +if(${ARCH} STREQUAL "i386") + list(APPEND VCRT_COMMON_SOURCES + i386/__security_check_cookie.s + ) +elseif(${ARCH} STREQUAL "amd64") + list(APPEND VCRT_COMMON_SOURCES + amd64/__security_check_cookie.s + ) +endif() + +# Common between vcstartup and vcruntime +add_library(vcrt_common ${VCRT_COMMON_SOURCES}) +target_compile_definitions(vcrt_common PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcrt_common ${PSEH_LIB}) +add_dependencies(vcrt_common psdk) + +# Runtime library (linked into ucrtbase) +add_library(vcruntime ${VCRT_RUNTIME_SOURCES} $<TARGET_OBJECTS:vcrt_common>) +target_compile_definitions(vcruntime PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcruntime ${PSEH_LIB}) +target_include_directories(vcruntime INTERFACE inc) + +# Startup library (inked into executables, linking to ucrtbase) +add_library(vcstartup ${VCRT_STARTUP_SOURCES} $<TARGET_OBJECTS:vcrt_common>) +target_compile_definitions(vcstartup PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcstartup ${PSEH_LIB} libucrtbase libkernel32) diff --git a/sdk/lib/ucrt/vcruntime/__report_gsfailure.c b/sdk/lib/vcruntime/__report_gsfailure.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__report_gsfailure.c rename to sdk/lib/vcruntime/__report_gsfailure.c diff --git a/sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c b/sdk/lib/vcruntime/__report_rangecheckfailure.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c rename to sdk/lib/vcruntime/__report_rangecheckfailure.c diff --git a/sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp b/sdk/lib/vcruntime/__scrt_uninitialize_crt.cpp similarity index 100% rename from sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp rename to sdk/lib/vcruntime/__scrt_uninitialize_crt.cpp diff --git a/sdk/lib/ucrt/vcruntime/__security_init_cookie.c b/sdk/lib/vcruntime/__security_init_cookie.c similarity index 96% rename from sdk/lib/ucrt/vcruntime/__security_init_cookie.c rename to sdk/lib/vcruntime/__security_init_cookie.c index 7488aec954d..54edfa745cb 100644 --- a/sdk/lib/ucrt/vcruntime/__security_init_cookie.c +++ b/sdk/lib/vcruntime/__security_init_cookie.c @@ -8,9 +8,7 @@ // SPDX-License-Identifier: MIT // -#include <stdlib.h> -#include <intrin.h> -#include <corecrt_internal.h> +#include <internal_shared.h> #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE 0x00002B992DDFA232ull diff --git a/sdk/lib/ucrt/vcruntime/__vcrt_init.c b/sdk/lib/vcruntime/__vcrt_init.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__vcrt_init.c rename to sdk/lib/vcruntime/__vcrt_init.c diff --git a/sdk/lib/ucrt/float/_fltused.c b/sdk/lib/vcruntime/_fltused.c similarity index 100% rename from sdk/lib/ucrt/float/_fltused.c rename to sdk/lib/vcruntime/_fltused.c diff --git a/sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s b/sdk/lib/vcruntime/amd64/__security_check_cookie.s similarity index 100% rename from sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s rename to sdk/lib/vcruntime/amd64/__security_check_cookie.s diff --git a/sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s b/sdk/lib/vcruntime/i386/__security_check_cookie.s similarity index 100% rename from sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s rename to sdk/lib/vcruntime/i386/__security_check_cookie.s diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/vcruntime/inc/internal_shared.h similarity index 100% rename from sdk/lib/ucrt/inc/internal_shared.h rename to sdk/lib/vcruntime/inc/internal_shared.h diff --git a/sdk/lib/ucrt/inc/nt.h b/sdk/lib/vcruntime/inc/nt.h similarity index 100% rename from sdk/lib/ucrt/inc/nt.h rename to sdk/lib/vcruntime/inc/nt.h diff --git a/sdk/lib/ucrt/inc/ntrtl.h b/sdk/lib/vcruntime/inc/ntrtl.h similarity index 100% rename from sdk/lib/ucrt/inc/ntrtl.h rename to sdk/lib/vcruntime/inc/ntrtl.h diff --git a/sdk/lib/ucrt/inc/nturtl.h b/sdk/lib/vcruntime/inc/nturtl.h similarity index 100% rename from sdk/lib/ucrt/inc/nturtl.h rename to sdk/lib/vcruntime/inc/nturtl.h diff --git a/sdk/lib/ucrt/vcruntime/initializers.cpp b/sdk/lib/vcruntime/initializers.cpp similarity index 100% rename from sdk/lib/ucrt/vcruntime/initializers.cpp rename to sdk/lib/vcruntime/initializers.cpp diff --git a/sdk/lib/ucrt/vcruntime/isa_available.cpp b/sdk/lib/vcruntime/isa_available.cpp similarity index 100% rename from sdk/lib/ucrt/vcruntime/isa_available.cpp rename to sdk/lib/vcruntime/isa_available.cpp

1 0

[reactos] 01/01: [RTL][NTDLL_APITEST] Fix buffer overflow in RtlDosSearchPath_Ustr (#7698)
by Max Korostil 05 Feb '25

05 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b2bdabe7221f9b35f135… commit 2b2bdabe7221f9b35f135b013e44bce4bfd16c66 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Wed Feb 5 23:17:11 2025 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 5 21:17:11 2025 +0100 [RTL][NTDLL_APITEST] Fix buffer overflow in RtlDosSearchPath_Ustr (#7698) In addition: - `IS_PATH_SEPARATOR(*--End)` -> `--End; IS_PATH_SEPARATOR(*End)` fix, - Use SIZE_T type for `WorstCaseLength` and `NamePlusExtLength`. --- .../apitests/ntdll/RtlDosSearchPath_Ustr.c | 19 ++++++++++++ sdk/lib/rtl/path.c | 35 ++++++++++++---------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c index 29794bf4e8d..e6eb386cc29 100644 --- a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c @@ -210,4 +210,23 @@ START_TEST(RtlDosSearchPath_Ustr) ok_eq_pointer(FullNameOut, NULL); ok_eq_ulong(FilePartSize, 0UL); ok_eq_ulong(LengthNeeded, 0UL); + + /* Buffer overflow test + * length(longDirName) + length(longFileName) + length(ext) = MAX_PATH + */ + RtlInitUnicodeString(&PathString, L"C:\\Program Files\\Very_long_test_path_which_can_trigger_heap_overflow_test_1234567890______________________________________________________AB"); + RtlInitUnicodeString(&FileNameString, L"this_is_long_file_name_for_checking______________________________________________________________________________CD"); + RtlInitUnicodeString(&ExtensionString, L".txt"); + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + &PathString, + &FileNameString, + &ExtensionString, + &CallerBuffer, + &DynamicString, + &FullNameOut, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); } diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index e045e16ebb4..4104daeb838 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -2571,8 +2571,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, NTSTATUS Status; RTL_PATH_TYPE PathType; PWCHAR p, End, CandidateEnd, SegmentEnd; - SIZE_T SegmentSize, ByteCount, PathSize, MaxPathSize = 0; - USHORT NamePlusExtLength, WorstCaseLength, ExtensionLength = 0; + SIZE_T WorstCaseLength, NamePlusExtLength, SegmentSize, ByteCount, PathSize, MaxPathSize = 0; + USHORT ExtensionLength = 0; PUNICODE_STRING FullIsolatedPath; DPRINT("DOS Path Search: %lx %wZ %wZ %wZ %wZ %wZ\n", Flags, PathString, FileNameString, ExtensionString, CallerBuffer, DynamicString); @@ -2669,7 +2669,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, while (End > FileNameString->Buffer) { /* If we find a path separator, there's no extension */ - if (IS_PATH_SEPARATOR(*--End)) break; + --End; + if (IS_PATH_SEPARATOR(*End)) break; /* Otherwise, did we find an extension dot? */ if (*End == L'.') @@ -2689,17 +2690,20 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, /* Start parsing the path name, looking for path separators */ End = &PathString->Buffer[PathString->Length / sizeof(WCHAR)]; p = End; - while ((p > PathString->Buffer) && (*--p == L';')) + while (p > PathString->Buffer) { - /* This is the size of the path -- handle a trailing slash */ - PathSize = End - p - 1; - if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; + if (*--p == L';') + { + /* This is the size of the path -- handle a trailing slash */ + PathSize = End - p - 1; + if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; - /* Check if we found a bigger path than before */ - if (PathSize > MaxPathSize) MaxPathSize = PathSize; + /* Check if we found a bigger path than before */ + if (PathSize > MaxPathSize) MaxPathSize = PathSize; - /* Keep going with the path after this path separator */ - End = p; + /* Keep going with the path after this path separator */ + End = p; + } } /* This is the trailing path, run the same code as above */ @@ -2749,7 +2753,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, /* Now check if our initial static buffer is too small */ if (StaticCandidateString.MaximumLength < - (SegmentSize + ExtensionLength + FileNameString->Length)) + (SegmentSize + ExtensionLength + FileNameString->Length + sizeof(UNICODE_NULL))) { /* At this point we should've been using our static buffer */ ASSERT(StaticCandidateString.Buffer == StaticCandidateBuffer); @@ -2784,8 +2788,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, } /* Now allocate the dynamic string */ - StaticCandidateString.MaximumLength = FileNameString->Length + - WorstCaseLength; + StaticCandidateString.MaximumLength = WorstCaseLength; StaticCandidateString.Buffer = RtlpAllocateStringMemory(WorstCaseLength, TAG_USTR); if (!StaticCandidateString.Buffer) @@ -2832,6 +2835,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, StaticCandidateString.Length = (USHORT)(CandidateEnd - StaticCandidateString.Buffer) * sizeof(WCHAR); + ASSERT(StaticCandidateString.Length < StaticCandidateString.MaximumLength); /* Check if this file exists */ DPRINT("BUFFER: %S\n", StaticCandidateString.Buffer); @@ -2901,7 +2905,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, while (End > p) { /* If there's a path separator, there's no extension */ - if (IS_PATH_SEPARATOR(*--End)) break; + --End; + if (IS_PATH_SEPARATOR(*End)) break; /* Othwerwise, did we find an extension dot? */ if (*End == L'.')

1 0

[reactos] 11/11: [FREELDR] Fix pc98 build
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1a169fbe811b621188b4… commit a1a169fbe811b621188b41c907c8ef51304644cb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 23 09:16:36 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Fix pc98 build --- boot/freeldr/freeldr/arch/arcemul.c | 10 ++++++++++ boot/freeldr/freeldr/freeldr.spec | 1 + boot/freeldr/freeldr/include/machine.h | 2 ++ boot/freeldr/freeldr/miscboot.c | 6 +----- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arcemul.c b/boot/freeldr/freeldr/arch/arcemul.c index f44ffaf7b6c..edf8d66fc45 100644 --- a/boot/freeldr/freeldr/arch/arcemul.c +++ b/boot/freeldr/freeldr/arch/arcemul.c @@ -61,4 +61,14 @@ VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers) MachVtbl.VideoGetFontsFromFirmware(RomFontPointers); } +ULONG +MachGetBootSectorLoadAddress(IN UCHAR DriveNumber) +{ +#if defined(SARCH_PC98) + return Pc98GetBootSectorLoadAddress(DriveNumber); +#else + return 0x7C00; +#endif +} + /* EOF */ diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index 6d7b5f9d788..eaab809e800 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -119,6 +119,7 @@ @ cdecl Relocator16Boot() @ stdcall RtlAssert(ptr ptr long ptr) @ cdecl StallExecutionProcessor() +@ cdecl MachGetBootSectorLoadAddress() # Additional stuff for scsiport @ stdcall CpDoesPortExist(ptr) diff --git a/boot/freeldr/freeldr/include/machine.h b/boot/freeldr/freeldr/include/machine.h index 2cab94982e1..1a44f5f14e9 100644 --- a/boot/freeldr/freeldr/include/machine.h +++ b/boot/freeldr/freeldr/include/machine.h @@ -130,6 +130,7 @@ VOID MachInit(const char *CmdLine); #define MachHwIdle() \ MachVtbl.HwIdle() + /* ARC FUNCTIONS **************************************************************/ TIMEINFO* ArcGetTime(VOID); @@ -139,5 +140,6 @@ PCONFIGURATION_COMPONENT_DATA MachHwDetect(_In_opt_ PCSTR Options); VOID MachPrepareForReactOS(VOID); VOID MachGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize); VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers); +ULONG MachGetBootSectorLoadAddress(IN UCHAR DriveNumber); /* EOF */ diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index b080fdfbed1..9d9c4bf8efb 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -161,11 +161,7 @@ LoadAndBootSector( return Status; } -#if defined(SARCH_PC98) - LoadAddress = Pc98GetBootSectorLoadAddress(BiosDriveNumber); -#else - LoadAddress = 0x7C00; -#endif + LoadAddress = MachGetBootSectorLoadAddress(BiosDriveNumber); /* * Now try to load the boot sector: disk MBR (when PartitionNumber == 0),

1 0

[reactos] 10/11: [ROSLOAD] Enable registry healing code for x64
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b71c738b8beb8798e586… commit 2b71c738b8beb8798e586df373fad185ed24a776 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 11:49:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [ROSLOAD] Enable registry healing code for x64 --- boot/freeldr/freeldr/ntldr/registry.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 73d6f68097e..0b81b71cf16 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -99,14 +99,7 @@ RegInitializeHive( _In_ BOOLEAN LoadAlternate) { NTSTATUS Status; -/* - * FIXME: Disable compilation of some parts of code for AMD64 for now, - * since it makes the FreeLdr binary size so large that it prevents - * x64 ROS from booting. - */ -#if !defined(_M_AMD64) CM_CHECK_REGISTRY_STATUS CmStatusCode; -#endif /* Initialize the hive */ Status = HvInitialize(GET_HHIVE(CmHive), @@ -128,8 +121,6 @@ RegInitializeHive( return FALSE; } -/* FIXME: See the comment above */ -#if !defined(_M_AMD64) /* Now check the hive and purge volatile data */ CmStatusCode = CmCheckRegistry(CmHive, CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) @@ -137,13 +128,10 @@ RegInitializeHive( ERR("CmCheckRegistry detected problems with the loaded flat hive (check code %lu)\n", CmStatusCode); return FALSE; } -#endif return TRUE; } -/* FIXME: See the comment above */ -#if !defined(_M_AMD64) /** * @brief * Loads and reads a hive log at specified @@ -418,7 +406,6 @@ RegRecoverDataHive( HiveBaseBlock->CheckSum = HvpHiveHeaderChecksum(HiveBaseBlock); return TRUE; } -#endif /** * @brief @@ -464,14 +451,6 @@ RegImportBinaryHive( CmSystemHive = FrLdrTempAlloc(sizeof(CMHIVE), 'eviH'); Success = RegInitializeHive(CmSystemHive, ChunkBase, LoadAlternate); if (!Success) -/* FIXME: See the comment above */ -#if defined(_M_AMD64) - { - ERR("Corrupted hive %p!\n", ChunkBase); - FrLdrTempFree(CmSystemHive, 'eviH'); - return FALSE; - } -#else { /* Free the buffer and retry again */ FrLdrTempFree(CmSystemHive, 'eviH'); @@ -505,7 +484,6 @@ RegImportBinaryHive( */ ((PHBASE_BLOCK)ChunkBase)->BootRecover = HBOOT_BOOT_RECOVERED_BY_HIVE_LOG; } -#endif /* Save the root key node */ SystemHive = GET_HHIVE(CmSystemHive);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs