From 06ed85e2c36d304b64e0b680290fe0b9b40bd982 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 10 Jan 2026 20:25:26 +0200 Subject: [PATCH] [MSVCRT] Fix use of __wine_RtlUnwind --- dll/win32/msvcrt/CMakeLists.txt | 5 +---- dll/win32/msvcrt/i386/__wine_RtlUnwind.s | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 80135d6e92c..dd66cba8581 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -36,6 +36,7 @@ add_definitions( if(ARCH STREQUAL "i386") add_definitions( -D__ASM_USE_THISCALL_WRAPPER + -DRtlUnwind=__wine_RtlUnwind # See i386/__wine_RtlUnwind.s ) endif() @@ -116,10 +117,6 @@ add_library(msvcrt_shared ) target_compile_definitions(msvcrt_shared PRIVATE _MSVCR_VER=0) -if(ARCH STREQUAL "i386") - # ASM wrapper for Wine code, implemented in i386/__wine_RtlUnwind.s - target_compile_definitions(msvcrt_shared PRIVATE RtlUnwind=__wine_RtlUnwind) -endif() add_dependencies(msvcrt_shared psdk asm) ############################################################################### diff --git a/dll/win32/msvcrt/i386/__wine_RtlUnwind.s b/dll/win32/msvcrt/i386/__wine_RtlUnwind.s index 329c0bce5ad..fc8f926f8db 100644 --- a/dll/win32/msvcrt/i386/__wine_RtlUnwind.s +++ b/dll/win32/msvcrt/i386/__wine_RtlUnwind.s @@ -50,4 +50,9 @@ ___wine_RtlUnwind@16: pop ebp ret 16 + +PUBLIC __imp____wine_RtlUnwind@16 +__imp____wine_RtlUnwind@16: + .long ___wine_RtlUnwind@16 + END