commit b46cf438f8366e667c08ef2d5464c08b4c656cb1
author Alexandre Julliard <julliard@winehq.org> Wed Aug 12 14:35:43 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Aug 12 17:04:20 2009 +0200
tree 469c8b75bd5054c379718a93c2b6d366e9ce18e0
parent 2df20cb92160e3642f7e5ebde3ef4a490fe9be47

ntdll: Add a ret to DEFINE_REGS_ENTRYPOINT to make copy protections happy.

dlls/kernel32/kernel_private.h

diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index 39a5e23..20f6399 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -152,7 +152,8 @@
                        ".byte 0x68\n\t"  /* pushl $__regs_func */       \
                        ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \
                        ".byte 0x6a," #args "\n\t" /* pushl $args */     \
-                       "call " __ASM_NAME("__wine_call_from_32_regs"))
+                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
+                       "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */
 #endif
 
 #endif

dlls/ntdll/ntdll_misc.h

diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index ea2234a..06b5d4c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -233,7 +233,8 @@
                        ".byte 0x68\n\t"  /* pushl $__regs_func */       \
                        ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \
                        ".byte 0x6a," #args "\n\t" /* pushl $args */     \
-                       "call " __ASM_NAME("__wine_call_from_32_regs"))
+                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
+                       "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */
 #elif defined(__x86_64__)
 #define DEFINE_REGS_ENTRYPOINT( name, args ) \
     __ASM_GLOBAL_FUNC( name, \