Ros-diffs December 2020

ros-diffs@reactos.org

17 participants
131 discussions

[reactos] 03/03: [CRT] Fix _onexit
by Jérôme Gardou 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a6d65304483b2cea0fef… commit 8a6d65304483b2cea0fef4d7d35fa0b5b2a7db59 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 28 12:06:34 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Dec 30 19:03:52 2020 +0100 [CRT] Fix _onexit Avoid calling malloc in CR initialisation code. Have executables call msvcrt implementation, while the DLLs keep their own function tables CORE-17362 --- dll/win32/msvcrt/msvcrt.spec | 4 +-- sdk/lib/crt/startup/atonexit.c | 77 ++++++++++++++++++++++++------------------ sdk/lib/crt/startup/crtdll.c | 15 +++----- sdk/lib/crt/startup/crtexe.c | 2 +- 4 files changed, 53 insertions(+), 45 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 00bf4e65f3d..848e2602e45 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -883,7 +883,7 @@ @ stub -version=0x600+ -arch=i386 _msize_debug @ cdecl _nextafter(double double) @ stub -arch=x86_64 _nextafterf -@ cdecl _onexit(ptr) +@ extern _onexit # Declaring it as extern let us use the symbol from msvcrtex while having the __imp_ symbol defined in the import lib @ varargs _open(str long) @ cdecl _open_osfhandle(long long) @ extern _osplatform @@ -1293,7 +1293,7 @@ @ cdecl atan2(double double) @ cdecl -arch=x86_64,arm atan2f(long) @ cdecl -arch=x86_64,arm atanf(long) -@ extern atexit # <-- keep this as an extern, thank you +@ extern atexit # Declaring it as extern let us use the symbol from msvcrtex while having the __imp_ symbol defined in the import lib for those who really need it @ cdecl atof(str) @ cdecl atoi(str) @ cdecl atol(str) diff --git a/sdk/lib/crt/startup/atonexit.c b/sdk/lib/crt/startup/atonexit.c index 1774e90f1b3..ff6021aacfe 100644 --- a/sdk/lib/crt/startup/atonexit.c +++ b/sdk/lib/crt/startup/atonexit.c @@ -4,7 +4,6 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#undef CRTDLL #ifndef _DLL #define _DLL #endif @@ -20,7 +19,7 @@ void __cdecl _lock (int _File); void __cdecl _unlock (int _File); - + _PVFV *__onexitbegin; _PVFV *__onexitend; @@ -33,16 +32,19 @@ void __call_atexit(void) /* Note: should only be called with the exit lock held */ _PVFV *first, *last; - first = (_PVFV *)_decode_pointer(__onexitbegin); - last = (_PVFV *)_decode_pointer(__onexitend);; + if (!__onexitbegin) + return; - if (!first) return; + first = (_PVFV *)_decode_pointer(__onexitbegin); + last = (_PVFV *)_decode_pointer(__onexitend); while (--last >= first) if (*last) (**last)(); free(first); + + __onexitbegin = __onexitend = NULL; } /* Choose a different name to prevent name conflicts. The CRT one works fine. */ @@ -50,34 +52,45 @@ _onexit_t __cdecl _onexit(_onexit_t func); _onexit_t __cdecl _onexit(_onexit_t func) { - _PVFV *onexitbegin; - _PVFV *onexitend; - _onexit_t retval; - - onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); - - if (onexitbegin == (_PVFV *) -1) -#ifdef __REACTOS__ - { - onexitbegin = (_PVFV *)calloc(32, sizeof(_onexit_t)); - if (onexitbegin == NULL) - return NULL; - __onexitbegin = _encode_pointer(onexitbegin); - __onexitend = _encode_pointer(onexitbegin + 32); - } -#else - return (* __MINGW_IMP_SYMBOL(_onexit)) (func); + _PVFV *onexitbegin; + _PVFV *onexitend; + _onexit_t retval; + +#ifndef CRTDLL + if (__onexitbegin == (_PVFV *) -1) + return (* __MINGW_IMP_SYMBOL(_onexit)) (func); #endif - _lock (_EXIT_LOCK1); - onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); - onexitend = (_PVFV *) _decode_pointer (__onexitend); - - retval = __dllonexit (func, &onexitbegin, &onexitend); - - __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); - __onexitend = (_PVFV *) _encode_pointer (onexitend); - _unlock (_EXIT_LOCK1); - return retval; + + _lock (_EXIT_LOCK1); + + if (!__onexitbegin) + { + /* First time we are called. Initialize our array */ + onexitbegin = calloc(1, sizeof(*onexitbegin)); + if (!onexitbegin) + { + _unlock(_EXIT_LOCK1); + return NULL; + } + onexitend = onexitbegin; + } + else + { + onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); + onexitend = (_PVFV *) _decode_pointer (__onexitend); + } + + retval = __dllonexit (func, &onexitbegin, &onexitend); + + if (retval != NULL) + { + /* Update our globals in case of success */ + __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); + __onexitend = (_PVFV *) _encode_pointer (onexitend); + } + + _unlock (_EXIT_LOCK1); + return retval; } int __cdecl diff --git a/sdk/lib/crt/startup/crtdll.c b/sdk/lib/crt/startup/crtdll.c index afe23284f50..b9f5838b9fb 100644 --- a/sdk/lib/crt/startup/crtdll.c +++ b/sdk/lib/crt/startup/crtdll.c @@ -62,14 +62,8 @@ static int __cdecl pre_c_init (void) { - _PVFV *onexitbegin; + __onexitend = __onexitbegin = NULL; - onexitbegin = (_PVFV *) malloc (32 * sizeof (_PVFV)); - __onexitend = __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); - - if (onexitbegin == NULL) - return 1; - *onexitbegin = (_PVFV) NULL; return 0; } @@ -136,14 +130,15 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) } else { - _PVFV * onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); - if (onexitbegin) + if (__onexitbegin) { + _PVFV *onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); _PVFV *onexitend = (_PVFV *) _decode_pointer (__onexitend); while (--onexitend >= onexitbegin) if (*onexitend != NULL) (**onexitend) (); - free (onexitbegin); + if (!lpreserved) + free(onexitbegin); __onexitbegin = __onexitend = (_PVFV *) NULL; } __native_startup_state = __uninitialized; diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index a09d4b5b441..4e6f1e4d1f6 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -127,7 +127,7 @@ pre_c_init (void) __set_app_type(_GUI_APP); else __set_app_type (_CONSOLE_APP); - __onexitbegin = __onexitend = (_PVFV *) _encode_pointer ((_PVFV *)(-1)); + __onexitbegin = __onexitend = (_PVFV *)(-1); * __MINGW_IMP_SYMBOL(_fmode) = _fmode; * __MINGW_IMP_SYMBOL(_commode) = _commode;

1 0

[reactos] 02/03: [CRT] Do not call atexit at process initialization
by Jérôme Gardou 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c6d9bee68bc0068cede5… commit 6c6d9bee68bc0068cede58b41a575fd923b04e01 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 28 10:47:38 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Dec 30 19:03:52 2020 +0100 [CRT] Do not call atexit at process initialization There is no guarantee that the underlying APIs are initialized at this point CORE-17362 --- sdk/lib/crt/startup/crtexe.c | 12 +++++++++--- sdk/lib/crt/startup/gccmain.c | 2 -- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/startup/crtexe.c b/sdk/lib/crt/startup/crtexe.c index efc29191191..a09d4b5b441 100644 --- a/sdk/lib/crt/startup/crtexe.c +++ b/sdk/lib/crt/startup/crtexe.c @@ -115,6 +115,10 @@ _CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; extern int _MINGW_INSTALL_DEBUG_MATHERR; +#ifdef __GNUC__ +extern void __do_global_dtors(void); +#endif + static int __cdecl pre_c_init (void) { @@ -211,8 +215,6 @@ int __cdecl mainCRTStartup (void) return ret; } -void __call_atexit(); - static __declspec(noinline) int __cdecl @@ -326,7 +328,11 @@ __tmainCRTStartup (void) #endif mainret = main (argc, argv, envp); #endif - __call_atexit(); + +#ifdef __GNUC__ + __do_global_dtors(); +#endif + if (!managedapp) exit (mainret); diff --git a/sdk/lib/crt/startup/gccmain.c b/sdk/lib/crt/startup/gccmain.c index a1cd04b026e..3370a126947 100644 --- a/sdk/lib/crt/startup/gccmain.c +++ b/sdk/lib/crt/startup/gccmain.c @@ -43,8 +43,6 @@ __do_global_ctors (void) { __CTOR_LIST__[i] (); } - - atexit (__do_global_dtors); } static int initialized = 0;

1 0

[reactos] 01/03: [CRT] Format source a bit.
by Jérôme Gardou 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26863538a4b5ee9a340b4… commit 26863538a4b5ee9a340b49070f67879328619401 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 28 09:53:04 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Dec 30 19:03:52 2020 +0100 [CRT] Format source a bit. This is horrendous. --- sdk/lib/crt/startup/crtdll.c | 216 +++++++++++++++++++++---------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/sdk/lib/crt/startup/crtdll.c b/sdk/lib/crt/startup/crtdll.c index e52f240f2c5..afe23284f50 100644 --- a/sdk/lib/crt/startup/crtdll.c +++ b/sdk/lib/crt/startup/crtdll.c @@ -62,95 +62,95 @@ static int __cdecl pre_c_init (void) { - _PVFV *onexitbegin; + _PVFV *onexitbegin; - onexitbegin = (_PVFV *) malloc (32 * sizeof (_PVFV)); - __onexitend = __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); + onexitbegin = (_PVFV *) malloc (32 * sizeof (_PVFV)); + __onexitend = __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); - if (onexitbegin == NULL) - return 1; - *onexitbegin = (_PVFV) NULL; - return 0; + if (onexitbegin == NULL) + return 1; + *onexitbegin = (_PVFV) NULL; + return 0; } WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { - if (dwReason == DLL_PROCESS_DETACH) + if (dwReason == DLL_PROCESS_DETACH) { - if (__proc_attached > 0) - __proc_attached--; - else - return FALSE; + if (__proc_attached > 0) + __proc_attached--; + else + return FALSE; } - if (dwReason == DLL_PROCESS_ATTACH) + if (dwReason == DLL_PROCESS_ATTACH) { - void *lock_free = NULL; - void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase; - int nested = FALSE; - - while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock, - fiberid, 0)) != 0) - { - if (lock_free == fiberid) - { - nested = TRUE; - break; - } - Sleep(1000); - } - if (__native_startup_state == __initializing) - { - _amsg_exit (31); - } - else if (__native_startup_state == __uninitialized) - { - __native_startup_state = __initializing; - - _initterm ((_PVFV *) (void *) __xi_a, (_PVFV *) (void *) __xi_z); - } - if (__native_startup_state == __initializing) - { - _initterm (__xc_a, __xc_z); - __native_startup_state = __initialized; - } - if (! nested) - { - (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - } - if (__dyn_tls_init_callback != NULL) - { - __dyn_tls_init_callback (hDllHandle, DLL_THREAD_ATTACH, lpreserved); - } - __proc_attached++; + void *lock_free = NULL; + void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase; + int nested = FALSE; + + while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock, + fiberid, 0)) != 0) + { + if (lock_free == fiberid) + { + nested = TRUE; + break; + } + Sleep(1000); + } + if (__native_startup_state == __initializing) + { + _amsg_exit (31); + } + else if (__native_startup_state == __uninitialized) + { + __native_startup_state = __initializing; + + _initterm ((_PVFV *) (void *) __xi_a, (_PVFV *) (void *) __xi_z); + } + if (__native_startup_state == __initializing) + { + _initterm (__xc_a, __xc_z); + __native_startup_state = __initialized; + } + if (! nested) + { + (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); + } + if (__dyn_tls_init_callback != NULL) + { + __dyn_tls_init_callback (hDllHandle, DLL_THREAD_ATTACH, lpreserved); + } + __proc_attached++; } - else if (dwReason == DLL_PROCESS_DETACH) + else if (dwReason == DLL_PROCESS_DETACH) { - void *lock_free = NULL; - while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,(PVOID) 1, 0)) != 0) - { - Sleep(1000); - } - if (__native_startup_state != __initialized) - { - _amsg_exit (31); - } - else - { - _PVFV * onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); - if (onexitbegin) - { - _PVFV *onexitend = (_PVFV *) _decode_pointer (__onexitend); - while (--onexitend >= onexitbegin) - if (*onexitend != NULL) - (**onexitend) (); - free (onexitbegin); - __onexitbegin = __onexitend = (_PVFV *) NULL; - } - __native_startup_state = __uninitialized; - (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - } + void *lock_free = NULL; + while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,(PVOID) 1, 0)) != 0) + { + Sleep(1000); + } + if (__native_startup_state != __initialized) + { + _amsg_exit (31); + } + else + { + _PVFV * onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); + if (onexitbegin) + { + _PVFV *onexitend = (_PVFV *) _decode_pointer (__onexitend); + while (--onexitend >= onexitbegin) + if (*onexitend != NULL) + (**onexitend) (); + free (onexitbegin); + __onexitbegin = __onexitend = (_PVFV *) NULL; + } + __native_startup_state = __uninitialized; + (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); + } } - return TRUE; + return TRUE; } static WINBOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID); @@ -161,59 +161,59 @@ int __mingw_init_ehandler (void); WINBOOL WINAPI DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { - mingw_app_type = 0; - if (dwReason == DLL_PROCESS_ATTACH) + mingw_app_type = 0; + if (dwReason == DLL_PROCESS_ATTACH) { - __security_init_cookie (); + __security_init_cookie (); #ifdef _WIN64 - __mingw_init_ehandler (); + __mingw_init_ehandler (); #endif } - return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved); + return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved); } __declspec(noinline) WINBOOL __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { - WINBOOL retcode = TRUE; + WINBOOL retcode = TRUE; - __native_dllmain_reason = dwReason; - if (dwReason == DLL_PROCESS_DETACH && __proc_attached == 0) + __native_dllmain_reason = dwReason; + if (dwReason == DLL_PROCESS_DETACH && __proc_attached == 0) { - retcode = FALSE; - goto i__leave; + retcode = FALSE; + goto i__leave; } - _pei386_runtime_relocator (); - if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) + _pei386_runtime_relocator (); + if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) { retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved); if (!retcode) - goto i__leave; + goto i__leave; retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); - if (! retcode) - { - if (dwReason == DLL_PROCESS_ATTACH) - _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - goto i__leave; - } + if (! retcode) + { + if (dwReason == DLL_PROCESS_ATTACH) + _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + goto i__leave; + } } - if (dwReason == DLL_PROCESS_ATTACH) - __main (); - retcode = DllMain(hDllHandle,dwReason,lpreserved); - if (dwReason == DLL_PROCESS_ATTACH && ! retcode) + if (dwReason == DLL_PROCESS_ATTACH) + __main (); + retcode = DllMain(hDllHandle,dwReason,lpreserved); + if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); } - if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH) + if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH) { retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); - if (_CRT_INIT (hDllHandle, dwReason, lpreserved) == FALSE) - retcode = FALSE; + if (_CRT_INIT (hDllHandle, dwReason, lpreserved) == FALSE) + retcode = FALSE; } i__leave: - __native_dllmain_reason = UINT_MAX; - return retcode ; + __native_dllmain_reason = UINT_MAX; + return retcode ; } #endif

1 0

[reactos] 04/04: [NTOS:CM] Do not create ProcessorNameString value if there is no Brand String
by Stanislav Motylkov 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f234cb6e595949175c65a… commit f234cb6e595949175c65ae62468120affb3bc7a2 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 30 03:24:06 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 30 19:38:41 2020 +0300 [NTOS:CM] Do not create ProcessorNameString value if there is no Brand String If the CPU does support CPUID instruction but does not have the Brand String, the legacy name detection should be performed either in CIM_Processor (WMI), in the Processor device driver, or in the application itself. The deleted Intel CPU name detection code can go to the WMI at some point. In fact Windows XP and 2003 kernels do not have any strings of that kind. This effectively reverts the hack committed 6 years ago in 7a985425 (r63798) that was intended to workaround CORE-7952. CORE-17413 --- ntoskrnl/config/i386/cmhardwr.c | 118 +--------------------------------------- 1 file changed, 3 insertions(+), 115 deletions(-) diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index b98c2691000..4b7457d12ac 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -226,99 +226,6 @@ Match: return TRUE; } -VOID -NTAPI -CmpGetIntelBrandString(OUT PCHAR CpuString) -{ - CPU_INFO CpuInfo; - ULONG BrandId, Signature; - - /* Get the Brand Id */ - KiCpuId(&CpuInfo, 0x00000001); - Signature = CpuInfo.Eax; - BrandId = CpuInfo.Ebx & 0xFF; - - switch (BrandId) - { - case 0x01: - strcpy(CpuString, "Intel(R) Celeron(R) processor"); - break; - case 0x02: - case 0x04: - strcpy(CpuString, "Intel(R) Pentium(R) III processor"); - break; - case 0x03: - if(Signature == 0x000006B1) - strcpy(CpuString, "Intel(R) Celeron(R) processor"); - else - strcpy(CpuString, "Intel(R) Pentium(R) III Xeon(R) processor"); - break; - case 0x06: - strcpy(CpuString, "Mobile Intel(R) Pentium(R) III Processor-M"); - break; - case 0x08: - if(Signature >= 0x00000F13) - strcpy(CpuString, "Intel(R) Genuine Processor"); - else - strcpy(CpuString, "Intel(R) Pentium(R) 4 processor"); - break; - case 0x09: - strcpy(CpuString, "Intel(R) Pentium(R) 4 processor"); - break; - case 0x0B: - if(Signature >= 0x00000F13) - strcpy(CpuString, "Intel(R) Xeon(R) processor"); - else - strcpy(CpuString, "Intel(R) Xeon(R) processor MP"); - break; - case 0x0C: - strcpy(CpuString, "Intel(R) Xeon(R) processor MP"); - break; - case 0x0E: - if(Signature >= 0x00000F13) - strcpy(CpuString, "Mobile Intel(R) Pentium(R) 4 processor-M"); - else - strcpy(CpuString, "Intel(R) Xeon(R) processor"); - break; - case 0x12: - strcpy(CpuString, "Intel(R) Celeron(R) M processor"); - break; - case 0x07: - case 0x0F: - case 0x13: - case 0x17: - strcpy(CpuString, "Mobile Intel(R) Celeron(R) processor"); - break; - case 0x0A: - case 0x14: - strcpy(CpuString, "Intel(R) Celeron(R) Processor"); - break; - case 0x15: - strcpy(CpuString, "Mobile Genuine Intel(R) Processor"); - break; - case 0x16: - strcpy(CpuString, "Intel(R) Pentium(R) M processor"); - break; - default: - strcpy(CpuString, "Unknown Intel processor"); - } -} - -VOID -NTAPI -CmpGetVendorString(IN PKPRCB Prcb, OUT PCHAR CpuString) -{ - /* Check if we have a Vendor String */ - if (Prcb->VendorString[0]) - { - strcpy(CpuString, Prcb->VendorString); - } - else - { - strcpy(CpuString, "Unknown x86 processor"); - } -} - NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -332,7 +239,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; CPU_INFO CpuInfo; - ULONG VendorId, ExtendedId; + ULONG ExtendedId; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; ANSI_STRING TempString; @@ -527,9 +434,8 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc KeSetSystemAffinityThread(Prcb->SetMember); if (!Prcb->CpuID) { - /* Uh oh, no CPUID! */ - PartialString = CpuString; - CmpGetVendorString(Prcb, PartialString); + /* Uh oh, no CPUID! Should not happen as we don't support 80386 and older 80486 */ + ASSERT(FALSE); } else { @@ -556,24 +462,6 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Null-terminate it */ CpuString[47] = ANSI_NULL; } - else - { - KiCpuId(&CpuInfo, 0x00000000); - VendorId = CpuInfo.Ebx; - PartialString = CpuString; - switch (VendorId) - { - case 'uneG': /* Intel */ - CmpGetIntelBrandString(PartialString); - break; - case 'htuA': /* AMD */ - /* FIXME */ - CmpGetVendorString(Prcb, PartialString); - break; - default: - CmpGetVendorString(Prcb, PartialString); - } - } } /* Go back to user affinity */

1 0

[reactos] 03/04: [ACPI] Do not panic if ProcessorNameString does not exist
by Stanislav Motylkov 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c57d0b7b980f0135129dd… commit c57d0b7b980f0135129ddabe8d16eeb63b34b8a8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 30 02:40:03 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 30 19:38:33 2020 +0300 [ACPI] Do not panic if ProcessorNameString does not exist Windows does not create this value in the registry if the processor core does not expose the Brand String. It's an optional value and existing code accessing it already has proper NULL checks: https://git.reactos.org/?p=reactos.git;a=blob;f=drivers/bus/acpi/buspdo.c;h… This is the proper fix for regression in CORE-7952. Addendum to 48912992 (r61666) and 4d992804 (r62642). CORE-17413 --- drivers/bus/acpi/main.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/drivers/bus/acpi/main.c b/drivers/bus/acpi/main.c index d9dc256312c..6c294a8deb7 100644 --- a/drivers/bus/acpi/main.c +++ b/drivers/bus/acpi/main.c @@ -520,32 +520,29 @@ GetProcessorInformation(VOID) NULL, NULL, &Length); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - DPRINT1("Failed to query ProcessorNameString value: 0x%lx\n", Status); - goto done; - } - - /* Allocate a buffer large enough to be zero terminated */ - Length += sizeof(UNICODE_NULL); - ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IpcA'); - if (ProcessorNameString == NULL) - { - DPRINT1("Failed to allocate 0x%lx bytes\n", Length); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } + /* Allocate a buffer large enough to be zero terminated */ + Length += sizeof(UNICODE_NULL); + ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IpcA'); + if (ProcessorNameString == NULL) + { + DPRINT1("Failed to allocate 0x%lx bytes\n", Length); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } - /* Query the processor name string */ - Status = AcpiRegQueryValue(ProcessorHandle, - L"ProcessorNameString", - NULL, - ProcessorNameString, - &Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to query ProcessorNameString value: 0x%lx\n", Status); - goto done; + /* Query the processor name string */ + Status = AcpiRegQueryValue(ProcessorHandle, + L"ProcessorNameString", + NULL, + ProcessorNameString, + &Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query ProcessorNameString value: 0x%lx\n", Status); + goto done; + } } /* Query the vendor identifier length */

1 0

[reactos] 02/04: [DXDIAG] If ProcessorNameString not found, fall back to Identifier
by Stanislav Motylkov 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=740beb65e6d92752630f5… commit 740beb65e6d92752630f517624235e797c44b021 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 30 03:18:17 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 30 19:38:26 2020 +0300 [DXDIAG] If ProcessorNameString not found, fall back to Identifier It also should have its own routine for detecting CPU name, add a comment. Windows XP and 2003 does have CPU name strings in dxdiagn.dll. CORE-17413 --- base/applications/dxdiag/system.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/base/applications/dxdiag/system.c b/base/applications/dxdiag/system.c index c10df851e4c..7359d0ca30f 100644 --- a/base/applications/dxdiag/system.c +++ b/base/applications/dxdiag/system.c @@ -196,6 +196,7 @@ InitializeSystemPage(HWND hwndDlg) OSVERSIONINFO VersionInfo; PVOID SMBiosBuf; PCHAR DmiStrings[ID_STRINGS_MAX] = { 0 }; + BOOL Result; /* set date/time */ szTime[0] = L'\0'; @@ -322,7 +323,16 @@ InitializeSystemPage(HWND hwndDlg) FreeSMBiosData(SMBiosBuf); /* set processor string */ - if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", REG_SZ, szDesc, sizeof(szDesc))) + Result = GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", REG_SZ, szDesc, sizeof(szDesc)); + if (!Result) + { + /* Processor Brand String not found */ + /* FIXME: Implement CPU name detection routine */ + + /* Finally try to use Identifier string */ + Result = GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"Identifier", REG_SZ, szDesc, sizeof(szDesc)); + } + if (Result) { TrimDmiStringW(szDesc); /* FIXME retrieve current speed */

1 0

[reactos] 01/04: [SYSDM] If ProcessorNameString not found, fall back to Identifier
by Stanislav Motylkov 30 Dec '20

30 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9f9f83c0ae75c8fb6d04… commit e9f9f83c0ae75c8fb6d04c4331d578742fb889a5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 30 03:04:38 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 30 19:38:14 2020 +0300 [SYSDM] If ProcessorNameString not found, fall back to Identifier Also add a comment about CIM_Processor. CORE-17413 --- dll/cpl/sysdm/general.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 85bc450cc2f..938cb820e8c 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -479,15 +479,30 @@ static VOID GetSystemInformation(HWND hwnd) */ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ProcKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { + INT PrevMachineLine; + SetRegTextData(hwnd, hKey, _T("VendorIdentifier"), CurMachineLine); CurMachineLine++; + PrevMachineLine = CurMachineLine; CurMachineLine += SetProcNameString(hwnd, hKey, _T("ProcessorNameString"), CurMachineLine, CurMachineLine + 1); + if (CurMachineLine == PrevMachineLine) + { + /* TODO: Try obtaining CPU name from WMI (i.e. CIM_Processor) */ + + /* Brand String is not available, use Identifier instead */ + CurMachineLine += SetProcNameString(hwnd, + hKey, + _T("Identifier"), + CurMachineLine, + CurMachineLine + 1); + } + SetProcSpeed(hwnd, hKey, _T("~MHz"), CurMachineLine); CurMachineLine++; RegCloseKey(hKey);

1 0

[reactos] 06/06: [CMAKE] Turn import libs into regular C static libs
by Jérôme Gardou 28 Dec '20

28 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b96e88894a4d55f5e8b94… commit b96e88894a4d55f5e8b94430deeb0f086151b24f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 2 10:51:08 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [CMAKE] Turn import libs into regular C static libs Embed msvcrtex into libmsvcrt Idea taken from Thomas Faber --- dll/win32/msvcrt/CMakeLists.txt | 17 +++++------ sdk/cmake/gcc.cmake | 54 +++++++++++++++++++++++++++------- sdk/cmake/msvc.cmake | 59 ++++++++++++++++++-------------------- sdk/lib/crt/msvcrtex.cmake | 12 +++++--- sdk/lib/crt/oldnames.cmake | 19 ++++++++++-- win32ss/gdi/gdi32/CMakeLists.txt | 5 +++- win32ss/user/user32/CMakeLists.txt | 5 ++-- 7 files changed, 110 insertions(+), 61 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 2e0c6625971..61ae9432d74 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -1,14 +1,12 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/crt/include) -spec2def(msvcrt.dll msvcrt.spec) +spec2def(msvcrt.dll msvcrt.spec ADD_IMPORTLIB) -# The msvcrt <-> msvcrtex trick -generate_import_lib(libmsvcrt_real msvcrt.dll msvcrt.spec) -add_library(libmsvcrt INTERFACE) +# Let consumers of msvcrt have the right defines target_compile_definitions(libmsvcrt INTERFACE _DLL __USE_CRTIMP) -# if the linked module is one of win32gui;win32cui;win32dll;win32ocx;cpl link it with msvcrtex, which itself is linked to libmsvcrt_real -# Otherwise, just link to libmsvcrt_real -target_link_libraries(libmsvcrt INTERFACE "$<IF:$<IN_LIST:$<TARGET_PROPERTY:REACTOS_MODULE_TYPE>,win32gui;win32cui;win32dll;win32ocx;cpl>,msvcrtex,libmsvcrt_real>") +# Embed msvcrtex into libmsvcrt +target_sources(libmsvcrt PRIVATE $<TARGET_OBJECTS:msvcrtex>) + add_definitions( -DUSE_MSVCRT_PREFIX @@ -35,7 +33,10 @@ target_link_libraries(msvcrt crt wine ${PSEH_LIB}) if(MSVC) # export of deleting destructor "name" target_link_options(msvcrt PRIVATE "/ignore:4102") - set_property(TARGET libmsvcrt_real APPEND PROPERTY STATIC_LIBRARY_OPTIONS "/ignore:4102") + set_property(TARGET libmsvcrt APPEND PROPERTY STATIC_LIBRARY_OPTIONS "/ignore:4102") + if(ARCH STREQUAL "i386") + target_sources(libmsvcrt PRIVATE $<TARGET_OBJECTS:ftol2_sse>) + endif() endif() add_importlibs(msvcrt kernel32 ntdll) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 938bc0e2454..bec502d75c7 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -322,20 +322,52 @@ function(generate_import_lib _libname _dllname _spec_file) OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} ${ARGN} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) - # Create normal importlib - _add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) - set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") - - # Create delayed importlib - _add_library(${_libname}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) - set_target_properties(${_libname}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") + # With this, we let DLLTOOL create an import library + set(LIBRARY_PRIVATE_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_libname}.dir) + add_custom_command( + OUTPUT ${LIBRARY_PRIVATE_DIR}/${_libname}.a + # ar just puts stuff into the archive, without looking twice. Just delete the lib, we're going to rebuild it anyway + COMMAND ${CMAKE_COMMAND} -E rm -f $<TARGET_FILE:${_libname}> + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def --kill-at --output-lib=${_libname}.a -t ${_libname} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def + WORKING_DIRECTORY ${LIBRARY_PRIVATE_DIR}) + + # We create a static library with the importlib thus created as object. AR will extract the obj files and archive it again as a thin lib + set_source_files_properties( + ${LIBRARY_PRIVATE_DIR}/${_libname}.a + PROPERTIES + EXTERNAL_OBJECT TRUE) + _add_library(${_libname} STATIC EXCLUDE_FROM_ALL + ${LIBRARY_PRIVATE_DIR}/${_libname}.a) + set_target_properties(${_libname} + PROPERTIES + LINKER_LANGUAGE "C" + PREFIX "") + + # Do the same with delay-import libs + set(LIBRARY_PRIVATE_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_libname}_delayed.dir) + add_custom_command( + OUTPUT ${LIBRARY_PRIVATE_DIR}/${_libname}_delayed.a + # ar just puts stuff into the archive, without looking twice. Just delete the lib, we're going to rebuild it anyway + COMMAND ${CMAKE_COMMAND} -E rm -f $<TARGET_FILE:${_libname}_delayed> + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def --kill-at --output-delaylib=${_libname}_delayed.a -t ${_libname}_delayed + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def + WORKING_DIRECTORY ${LIBRARY_PRIVATE_DIR}) + + # We create a static library with the importlib thus created. AR will extract the obj files and archive it again as a thin lib + set_source_files_properties( + ${LIBRARY_PRIVATE_DIR}/${_libname}_delayed.a + PROPERTIES + EXTERNAL_OBJECT TRUE) + _add_library(${_libname}_delayed STATIC EXCLUDE_FROM_ALL + ${LIBRARY_PRIVATE_DIR}/${_libname}_delayed.a) + set_target_properties(${_libname}_delayed + PROPERTIES + LINKER_LANGUAGE "C" + PREFIX "") endfunction() -# Cute little hack to produce import libs -set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-lib=<TARGET>") -set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "VERSION" "" ${ARGN}) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 10beb82f704..1601805404a 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -264,9 +264,6 @@ function(set_module_type_toolchain MODULE TYPE) endfunction() -# Define those for having real libraries -set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") - if(ARCH STREQUAL "arm") set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <SOURCE>") else() @@ -299,41 +296,41 @@ function(generate_import_lib _libname _dllname _spec_file) set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) - # Generate the asm stub file and the def file for import library + # Generate the def and asm stub files add_custom_command( OUTPUT ${_asm_stubs_file} ${_def_file} COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - if(MSVC_IDE) - # Compile the generated asm stub file - if(ARCH STREQUAL "arm") - set(_asm_stub_command ${CMAKE_ASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) - else() - set(_asm_stub_command ${CMAKE_ASM_COMPILER} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) - endif() - add_custom_command( - OUTPUT ${_asm_stubs_file}.obj - COMMAND ${_asm_stub_command} - DEPENDS ${_asm_stubs_file}) + # Compile the generated asm stub file + if(ARCH STREQUAL "arm") + set(_asm_stub_command ${CMAKE_ASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) else() - # Be clear about the "language" - # Thanks MS for creating a stupid linker - set_source_files_properties(${_asm_stubs_file} PROPERTIES LANGUAGE "STUB_ASM") + set(_asm_stub_command ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) endif() + add_custom_command( + OUTPUT ${_asm_stubs_file}.obj + COMMAND ${_asm_stub_command} + DEPENDS ${_asm_stubs_file}) - # Add our library - if(MSVC_IDE) - add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}.obj) - set_source_files_properties(${_asm_stubs_file}.obj PROPERTIES EXTERNAL_OBJECT TRUE) - set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "C") - else() - # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}) - # set correct "link rule" - set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB") - endif() - set_target_properties(${_libname} PROPERTIES STATIC_LIBRARY_FLAGS "/DEF:${_def_file}") + # generate the intermediate import lib + set(_libfile_tmp ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_tmp.lib) + set(_static_lib_options ) + + add_custom_command( + OUTPUT ${_libfile_tmp} + COMMAND + LINK /LIB ∕NOLOGO /MACHINE:${WINARCH} + $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_FLAGS> $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_OPTIONS> + ∕DEF:${_def_file} /OUT:${_libfile_tmp} ${_asm_stubs_file}.obj + DEPENDS ${_asm_stubs_file}.obj ${_def_file}) + + # By giving the import lib as an object input, LIB extracts the relevant object files and make a new library. + # This allows us to treat the implib as a regular static library + set_source_files_properties(${_libfile_tmp} PROPERTIES EXTERNAL_OBJECT TRUE) + add_library(${_libname} STATIC ${_libfile_tmp}) + + set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "C") endfunction() if(ARCH STREQUAL "amd64") @@ -376,7 +373,7 @@ function(spec2def _dllname _spec_file) if(__spec2def_ADD_IMPORTLIB) generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) if(__spec2def_NO_PRIVATE_WARNINGS) - add_target_property(lib${_file} STATIC_LIBRARY_FLAGS "/ignore:4104") + set_property(TARGET lib${_file} APPEND PROPERTY STATIC_LIBRARY_OPTIONS /ignore:4104) endif() endif() endfunction() diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 0b6bff8520d..f720b977534 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -49,7 +49,6 @@ if(ARCH STREQUAL "i386") list(APPEND MSVCRTEX_ASM_SOURCE except/i386/chkstk_asm.s except/i386/chkstk_ms.s - math/i386/ftol2_asm.s math/i386/alldiv_asm.s) list(APPEND MSVCRTEX_SOURCE math/i386/ci.c @@ -102,11 +101,16 @@ endif() set_source_files_properties(${MSVCRTEX_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_DLL;_MSVCRTEX_") add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) -add_library(msvcrtex ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) +add_library(msvcrtex OBJECT ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) target_compile_definitions(msvcrtex PRIVATE _DLL _MSVCRTEX_) -# Link msvcrtex to the "real" msvcrt.dll library. See msvcrt.dll CMakeLists.txt to see what really happens here -target_link_libraries(msvcrtex libmsvcrt_real libkernel32) +if(MSVC AND (ARCH STREQUAL "i386")) + # user32.dll needs this as a stand-alone object file + add_asm_files(ftol2_asm math/i386/ftol2_asm.s) + add_library(ftol2_sse OBJECT ${ftol2_asm}) + target_compile_definitions(ftol2_sse PRIVATE $<TARGET_PROPERTY:msvcrtex,COMPILE_DEFINITIONS>) +endif() + if(GCC OR CLANG) target_compile_options(msvcrtex PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-main>) diff --git a/sdk/lib/crt/oldnames.cmake b/sdk/lib/crt/oldnames.cmake index 806ada3570b..c1b2a98999a 100644 --- a/sdk/lib/crt/oldnames.cmake +++ b/sdk/lib/crt/oldnames.cmake @@ -1,8 +1,21 @@ if(NOT MSVC) - _add_library(oldnames STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def) - set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def PROPERTIES EXTERNAL_OBJECT TRUE) - set_target_properties(oldnames PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") + # Use the same trick as with the other import libs. See gcc.cmake --> generate_import_lib function + set(LIBRARY_PRIVATE_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/oldnames.dir) + add_custom_command( + OUTPUT ${LIBRARY_PRIVATE_DIR}/oldnames.a + # ar just puts stuff into the archive, without looking twice. Just delete the lib, we're going to rebuild it anyway + COMMAND ${CMAKE_COMMAND} -E rm -f $<TARGET_FILE:oldnames> + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib=oldnames.a -t oldnames + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def + WORKING_DIRECTORY ${LIBRARY_PRIVATE_DIR}) + set_source_files_properties( + ${LIBRARY_PRIVATE_DIR}/oldnames.a + PROPERTIES + EXTERNAL_OBJECT TRUE) + + _add_library(oldnames STATIC EXCLUDE_FROM_ALL ${LIBRARY_PRIVATE_DIR}/oldnames.a) + set_target_properties(oldnames PROPERTIES LINKER_LANGUAGE "C") else() add_asm_files(oldnames_asm oldnames-msvcrt.S) add_library(oldnames ${oldnames_asm}) diff --git a/win32ss/gdi/gdi32/CMakeLists.txt b/win32ss/gdi/gdi32/CMakeLists.txt index e1f1644cbd6..4c9d32368bc 100644 --- a/win32ss/gdi/gdi32/CMakeLists.txt +++ b/win32ss/gdi/gdi32/CMakeLists.txt @@ -60,10 +60,13 @@ target_link_libraries(gdi32 wine win32ksys dxguid - msvcrtex atan2 ${PSEH_LIB}) +if(MSVC AND (ARCH STREQUAL "i386")) + target_sources(gdi32 PRIVATE $<TARGET_OBJECTS:ftol2_sse>) +endif() + add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 include/precomp.h SOURCE) add_dependencies(gdi32 psdk) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index 0d38852d684..fb2655dcf6c 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -82,9 +82,8 @@ set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) add_dependencies(user32 asm) -if(MSVC) - # for __ftol2_sse, float to int cast helper - target_link_libraries(user32 msvcrtex) +if(MSVC AND (ARCH STREQUAL "i386")) + target_sources(user32 PRIVATE $<TARGET_OBJECTS:ftol2_sse>) endif() add_delay_importlibs(user32 imm32 usp10)

1 0

[reactos] 05/06: [GITHUB] Get LLVM latest version from chocolatey repository
by Jérôme Gardou 28 Dec '20

28 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cad583967ba462080a3f2… commit cad583967ba462080a3f2ea16fbed8a9ecfd3b82 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Nov 24 18:30:40 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [GITHUB] Get LLVM latest version from chocolatey repository Also, explicitly set target in toolchain file to help CMake getting things right. --- .github/workflows/build.yml | 6 ++++-- toolchain-msvc.cmake | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b61db65ac0..fc5600f9200 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,7 +102,9 @@ jobs: runs-on: windows-latest steps: - name: Install packages - run: choco install ninja -y + run: | + choco install ninja -y + choco install --x86 -y llvm - name: Install Flex and Bison run: | curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z @@ -121,7 +123,7 @@ jobs: run: | mkdir build cd build - $env:PATH = "$env:VCToolsInstallDir\..\..\Llvm\bin;$env:PATH" + $env:PATH = "${env:PROGRAMFILES(X86)}\llvm\bin;$env:PATH" cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=1 ${{github.workspace}}\src - name: Build working-directory: ${{github.workspace}}\build diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index f1ff2d77570..e30e075cba0 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -13,11 +13,38 @@ endif() set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686) +# set the generator platform +if (NOT DEFINED CMAKE_GENERATOR_PLATFORM) + if(ARCH STREQUAL "amd64") + set(CMAKE_GENERATOR_PLATFORM "x64") + elseif(ARCH STREQUAL "arm") + set(CMAKE_GENERATOR_PLATFORM "ARM") + elseif(ARCH STREQUAL "arm64") + set(CMAKE_GENERATOR_PLATFORM "ARM64") + else() + set(CMAKE_GENERATOR_PLATFORM "Win32") + endif() +endif() + if(USE_CLANG_CL) set(CMAKE_C_COMPILER clang-cl) set(CMAKE_CXX_COMPILER clang-cl) # Clang now defaults to lld-link which we're not compatible with yet set(CMAKE_LINKER link) + # Explicitly set target so CMake doesn't get confused + if (ARCH STREQUAL "amd64") + set(CMAKE_C_COMPILER_TARGET "x86_64-pc-windows-msvc") + set(CMAKE_CXX_COMPILER_TARGET "x86_64-pc-windows-msvc") + elseif(ARCH STREQUAL "arm") + set(CMAKE_C_COMPILER_TARGET "arm-pc-windows-msvc") + set(CMAKE_CXX_COMPILER_TARGET "arm-pc-windows-msvc") + elseif(ARCH STREQUAL "arm64") + set(CMAKE_C_COMPILER_TARGET "arm64-pc-windows-msvc") + set(CMAKE_CXX_COMPILER_TARGET "arm64-pc-windows-msvc") + else() + set(CMAKE_C_COMPILER_TARGET "i686-pc-windows-msvc") + set(CMAKE_CXX_COMPILER_TARGET "i686-pc-windows-msvc") + endif() else() set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl) @@ -35,6 +62,7 @@ else() set(CMAKE_ASM_COMPILER ml) endif() + set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")

1 0

[reactos] 04/06: [CMAKE] Use -fcommon when using CLang
by Jérôme Gardou 28 Dec '20

28 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56e56f8eccc4e6d4678ab… commit 56e56f8eccc4e6d4678ab2723ece2981001715ca Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 22 12:32:45 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Dec 28 12:13:30 2020 +0100 [CMAKE] Use -fcommon when using CLang --- sdk/cmake/msvc.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index a3048c34e1d..10beb82f704 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -55,6 +55,11 @@ if(ARCH STREQUAL "i386") endif() endif() +# CLang default to -fno-common from version 11 onward. We are not rady for this now +if (USE_CLANG_CL) + add_compile_options(-fcommon) +endif() + # VS 12+ requires /FS when used in parallel compilations if(NOT MSVC_IDE) add_compile_options(/FS)

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 December 2020