Use register functions with arguments for LogApiThk...

relay32/kernel32.spec

@@ -56,12 +56,12 @@ import  ntdll.dll
  39 register FreeMappedBuffer() FreeMappedBuffer
  40 register OT_32ThkLSF() OT_32ThkLSF
  41 stdcall ThunkInitLSF(long str long str str) ThunkInitLSF
- 42 register LogApiThkLSF() LogApiThkLSF
+ 42 register LogApiThkLSF(str) LogApiThkLSF
  43 stdcall ThunkInitLS(long str long str str) ThunkInitLS
- 44 register LogApiThkSL() LogApiThkSL
+ 44 register LogApiThkSL(str) LogApiThkSL
  45 register Common32ThkLS() Common32ThkLS 
  46 stdcall ThunkInitSL(long str long str str) ThunkInitSL
- 47 register LogCBThkSL() LogCBThkSL
+ 47 register LogCBThkSL(str) LogCBThkSL
  48 stdcall ReleaseThunkLock(ptr) ReleaseThunkLock
  49 stdcall RestoreThunkLock(long) RestoreThunkLock
  50 stdcall AddAtomA(str) AddAtomA

win32/kernel32.c

@@ -44,7 +44,7 @@ DECLARE_DEBUG_CHANNEL(win32)
  */
 void WINAPI LogApiThk( LPSTR func )
 {
-    TRACE_(thunk)( "%s\n", func );
+    TRACE_(thunk)( "%s\n", debugstr_a(func) );
 }
 
 /***********************************************************************
@@ -52,10 +52,9 @@ void WINAPI LogApiThk( LPSTR func )
  * 
  * NOTE: needs to preserve all registers!
  */
-void WINAPI REGS_FUNC(LogApiThkLSF)( CONTEXT *context )
+void WINAPI REGS_FUNC(LogApiThkLSF)( LPSTR func, CONTEXT *context )
 {
-    LPSTR func = (LPSTR)STACK32_POP( context );
-    TRACE_(thunk)( "%s\n", func );
+    TRACE_(thunk)( "%s\n", debugstr_a(func) );
 }
 
 /***********************************************************************
@@ -63,10 +62,9 @@ void WINAPI REGS_FUNC(LogApiThkLSF)( CONTEXT *context )
  * 
  * NOTE: needs to preserve all registers!
  */
-void WINAPI REGS_FUNC(LogApiThkSL)( CONTEXT *context )
+void WINAPI REGS_FUNC(LogApiThkSL)( LPSTR func, CONTEXT *context )
 {
-    LPSTR func = (LPSTR)STACK32_POP( context );
-    TRACE_(thunk)( "%s\n", func );
+    TRACE_(thunk)( "%s\n", debugstr_a(func) );
 }
 
 /***********************************************************************
@@ -74,10 +72,9 @@ void WINAPI REGS_FUNC(LogApiThkSL)( CONTEXT *context )
  * 
  * NOTE: needs to preserve all registers!
  */
-void WINAPI REGS_FUNC(LogCBThkSL)( CONTEXT *context )
+void WINAPI REGS_FUNC(LogCBThkSL)( LPSTR func, CONTEXT *context )
 {
-    LPSTR func = (LPSTR)STACK32_POP( context );
-    TRACE_(thunk)( "%s\n", func );
+    TRACE_(thunk)( "%s\n", debugstr_a(func) );
 }
 
 /***********************************************************************