Module: wine Branch: master Commit: 92d5ce3c76f0ae9cb070b39626c3e2f4bcd53243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d5ce3c76f0ae9cb070b39626... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 11:15:14 2017 +0200 krnl386: Simplify a couple of register functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/krnl386.exe16/krnl386.exe16.spec | 6 +++--- dlls/krnl386.exe16/thunk.c | 18 +++--------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index dedbb93..15cb998 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -49,12 +49,12 @@ 39 stdcall -noname -i386 -private -register FreeMappedBuffer() krnl386.exe16.FreeMappedBuffer 40 stdcall -noname -i386 -private -register OT_32ThkLSF() krnl386.exe16.OT_32ThkLSF 41 stdcall -noname -i386 -private ThunkInitLSF(long str long str str) krnl386.exe16.ThunkInitLSF - 42 stdcall -noname -i386 -private -register LogApiThkLSF(str) krnl386.exe16.LogApiThkLSF + 42 stdcall -noname -i386 -private -norelay LogApiThkLSF(str) krnl386.exe16.LogApiThkLSF 43 stdcall -noname -i386 -private ThunkInitLS(long str long str str) krnl386.exe16.ThunkInitLS - 44 stdcall -noname -i386 -private -register LogApiThkSL(str) krnl386.exe16.LogApiThkSL + 44 stdcall -noname -i386 -private -norelay LogApiThkSL(str) krnl386.exe16.LogApiThkSL 45 stdcall -noname -i386 -private -register Common32ThkLS() krnl386.exe16.Common32ThkLS 46 stdcall -noname -i386 -private ThunkInitSL(long str long str str) krnl386.exe16.ThunkInitSL - 47 stdcall -noname -i386 -private -register LogCBThkSL(str) krnl386.exe16.LogCBThkSL + 47 stdcall -noname -i386 -private -norelay LogCBThkSL(str) krnl386.exe16.LogCBThkSL 48 stdcall -noname -i386 -private ReleaseThunkLock(ptr) krnl386.exe16.ReleaseThunkLock 49 stdcall -noname -i386 -private RestoreThunkLock(long) krnl386.exe16.RestoreThunkLock diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 8d40f0f..66d33dd 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -588,12 +588,12 @@ @ stdcall -arch=win32 -register FreeMappedBuffer() @ stdcall -arch=win32 -register OT_32ThkLSF() @ stdcall -arch=win32 ThunkInitLSF(ptr str long str str) -@ stdcall -arch=win32 -register LogApiThkLSF(str) +@ stdcall -arch=win32 -norelay LogApiThkLSF(str) @ stdcall -arch=win32 ThunkInitLS(ptr str long str str) -@ stdcall -arch=win32 -register LogApiThkSL(str) +@ stdcall -arch=win32 -norelay LogApiThkSL(str) @ stdcall -arch=win32 -register Common32ThkLS() @ stdcall -arch=win32 ThunkInitSL(ptr str long str str) -@ stdcall -arch=win32 -register LogCBThkSL(str) +@ stdcall -arch=win32 -norelay LogCBThkSL(str) @ stdcall -arch=win32 ReleaseThunkLock(ptr) @ stdcall -arch=win32 RestoreThunkLock(long) @ stdcall -arch=win32 -register W32S_BackTo32() diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 9e12d27..8940605 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -187,33 +187,21 @@ void WINAPI LogApiThk( LPSTR func ) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogApiThkLSF( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogApiThkLSF, 1 ) +__ASM_STDCALL_FUNC( LogApiThkLSF, 4, "ret $4" ) /*********************************************************************** * LogApiThkSL (KERNEL32.44) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogApiThkSL( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogApiThkSL, 1 ) +__ASM_STDCALL_FUNC( LogApiThkSL, 4, "ret $4" ) /*********************************************************************** * LogCBThkSL (KERNEL32.47) * * NOTE: needs to preserve all registers! */ -void WINAPI __regs_LogCBThkSL( LPSTR func, CONTEXT *context ) -{ - TRACE( "%s\n", debugstr_a(func) ); -} -DEFINE_REGS_ENTRYPOINT( LogCBThkSL, 1 ) +__ASM_STDCALL_FUNC( LogCBThkSL, 4, "ret $4" ) /*********************************************************************** * Generates a FT_Prolog call.