[ros-diffs] [reactos] 08/10: [MSVCRT] Fix build with vista exports

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0152722bc989f5bab5f00…

commit 0152722bc989f5bab5f002400607f2b69addcaac
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sat Aug 5 15:28:45 2023 +0300
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Fri Aug 11 19:00:42 2023 +0300

    [MSVCRT] Fix build with vista exports
---
 dll/win32/msvcrt/CMakeLists.txt | 2 +-
 dll/win32/msvcrt/msvcrt.spec    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index f2f922ed85f..6754ea58f1e 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -33,7 +33,7 @@ list(APPEND SOURCE
 add_library(msvcrt MODULE ${SOURCE})
 set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
 add_dependencies(msvcrt psdk)
-target_link_libraries(msvcrt crt wine ${PSEH_LIB})
+target_link_libraries(msvcrt crt cpprt wine ${PSEH_LIB})
 
 if(MSVC)
     # export of deleting destructor "name"
diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec
index a300b5cb60e..edff9b16392 100644
--- a/dll/win32/msvcrt/msvcrt.spec
+++ b/dll/win32/msvcrt/msvcrt.spec
@@ -241,7 +241,7 @@
 @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler
 @ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr)
__CxxFrameHandler
 @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr)
-@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr)
+#@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay -private __CxxFrameHandler3(ptr ptr
ptr ptr) # Commented out for now, as it causes linker errors
 @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
 @ cdecl -arch=i386 __CxxQueryExceptionSize()
 @ cdecl -arch=i386 __CxxRegisterExceptionObject()
@@ -1411,7 +1411,7 @@
 @ cdecl memchr(ptr long long)
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ stub -version=0x600+ memcpy_s
+@ cdecl -version=0x600+ memcpy_s(ptr long)
 @ cdecl memmove(ptr ptr long)
 @ cdecl -version=0x600+ memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)