From 40692f2aa4c4cc293e14573f7d4cef6f7e887642 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 22 Oct 2004 19:55:14 +0000
Subject: [PATCH] There is no point making '--register' functions stdcall so
 just implement them as cdecl.

---
 dlls/kernel/heap.c      |  4 +--
 dlls/kernel/ne_module.c |  8 +++---
 dlls/kernel/selector.c  | 46 +++++++++++++++----------------
 dlls/kernel/thunk.c     | 61 ++++++++++++++++++++---------------------
 4 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c
index a5a760bf583..e6597c5bd0f 100644
--- a/dlls/kernel/heap.c
+++ b/dlls/kernel/heap.c
@@ -980,7 +980,7 @@ BOOL WINAPI LocalUnlock(
  *
  *       The SEGPTR is used by the caller!
  */
-void WINAPI AllocMappedBuffer( CONTEXT86 *context )
+void AllocMappedBuffer( CONTEXT86 *context )
 {
     HGLOBAL handle = GlobalAlloc(0, context->Edi + 8);
     DWORD *buffer = (DWORD *)GlobalLock(handle);
@@ -1013,7 +1013,7 @@ void WINAPI AllocMappedBuffer( CONTEXT86 *context )
  *
  * Input: EDI register: pointer to buffer
  */
-void WINAPI FreeMappedBuffer( CONTEXT86 *context )
+void FreeMappedBuffer( CONTEXT86 *context )
 {
     if (context->Edi)
     {
diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c
index 5c053bde92a..001faa799ef 100644
--- a/dlls/kernel/ne_module.c
+++ b/dlls/kernel/ne_module.c
@@ -2268,7 +2268,7 @@ HMODULE WINAPI MapHModuleSL(HMODULE16 hmod)
  *		MapHInstLS			(KERNEL32.@)
  *		MapHInstLS			(KERNEL.472)
  */
-void WINAPI MapHInstLS( CONTEXT86 *context )
+void MapHInstLS( CONTEXT86 *context )
 {
     context->Eax = MapHModuleLS( (HMODULE)context->Eax );
 }
@@ -2277,7 +2277,7 @@ void WINAPI MapHInstLS( CONTEXT86 *context )
  *		MapHInstSL			(KERNEL32.@)
  *		MapHInstSL			(KERNEL.473)
  */
-void WINAPI MapHInstSL( CONTEXT86 *context )
+void MapHInstSL( CONTEXT86 *context )
 {
     context->Eax = (DWORD)MapHModuleSL( context->Eax );
 }
@@ -2285,7 +2285,7 @@ void WINAPI MapHInstSL( CONTEXT86 *context )
 /***************************************************************************
  *		MapHInstLS_PN			(KERNEL32.@)
  */
-void WINAPI MapHInstLS_PN( CONTEXT86 *context )
+void MapHInstLS_PN( CONTEXT86 *context )
 {
     if (context->Eax) context->Eax = MapHModuleLS( (HMODULE)context->Eax );
 }
@@ -2293,7 +2293,7 @@ void WINAPI MapHInstLS_PN( CONTEXT86 *context )
 /***************************************************************************
  *		MapHInstSL_PN			(KERNEL32.@)
  */
-void WINAPI MapHInstSL_PN( CONTEXT86 *context )
+void MapHInstSL_PN( CONTEXT86 *context )
 {
     if (context->Eax) context->Eax = (DWORD)MapHModuleSL( context->Eax );
 }
diff --git a/dlls/kernel/selector.c b/dlls/kernel/selector.c
index 42e29d92e9e..d5f21cf83da 100644
--- a/dlls/kernel/selector.c
+++ b/dlls/kernel/selector.c
@@ -565,7 +565,7 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr )
  *           UnMapSLFixArray   (KERNEL32.@)
  */
 
-void WINAPI UnMapSLFixArray( SEGPTR sptr[], INT length, CONTEXT86 *context )
+void UnMapSLFixArray( SEGPTR sptr[], INT length, CONTEXT86 *context )
 {
     /* Must not change EAX, hence defined as 'register' function */
 }
@@ -644,8 +644,8 @@ BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldten
  * Win95 uses some kind of alias structs, which it stores in [EBP+x] to
  * unravel them at SUnMapLS. We just store the segmented pointer there.
  */
-static void
-x_SMapLS_IP_EBP_x(CONTEXT86 *context,int argoff) {
+static void x_SMapLS_IP_EBP_x(CONTEXT86 *context,int argoff)
+{
     DWORD	val,ptr;
 
     val =*(DWORD*)(context->Ebp + argoff);
@@ -662,52 +662,52 @@ x_SMapLS_IP_EBP_x(CONTEXT86 *context,int argoff) {
 /***********************************************************************
  *		SMapLS_IP_EBP_8 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_8 (CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context, 8);}
+void SMapLS_IP_EBP_8 (CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context, 8);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_12 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_12(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,12);}
+void SMapLS_IP_EBP_12(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,12);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_16 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_16(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,16);}
+void SMapLS_IP_EBP_16(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,16);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_20 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_20(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,20);}
+void SMapLS_IP_EBP_20(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,20);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_24 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_24(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,24);}
+void SMapLS_IP_EBP_24(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,24);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_28 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_28(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,28);}
+void SMapLS_IP_EBP_28(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,28);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_32 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_32(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,32);}
+void SMapLS_IP_EBP_32(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,32);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_36 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_36(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,36);}
+void SMapLS_IP_EBP_36(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,36);}
 
 /***********************************************************************
  *		SMapLS_IP_EBP_40 (KERNEL32.@)
  */
-void WINAPI SMapLS_IP_EBP_40(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,40);}
+void SMapLS_IP_EBP_40(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,40);}
 
 /***********************************************************************
  *		SMapLS (KERNEL32.@)
  */
-void WINAPI SMapLS( CONTEXT86 *context )
+void SMapLS( CONTEXT86 *context )
 {
     if (HIWORD(context->Eax))
     {
@@ -722,7 +722,7 @@ void WINAPI SMapLS( CONTEXT86 *context )
  *		SUnMapLS (KERNEL32.@)
  */
 
-void WINAPI SUnMapLS( CONTEXT86 *context )
+void SUnMapLS( CONTEXT86 *context )
 {
     if (HIWORD(context->Eax)) UnMapLS( (SEGPTR)context->Eax );
 }
@@ -740,44 +740,44 @@ inline static void x_SUnMapLS_IP_EBP_x(CONTEXT86 *context,int argoff)
 /***********************************************************************
  *		SUnMapLS_IP_EBP_8 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_8 (CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context, 8); }
+void SUnMapLS_IP_EBP_8 (CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context, 8); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_12 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_12(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,12); }
+void SUnMapLS_IP_EBP_12(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,12); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_16 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_16(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,16); }
+void SUnMapLS_IP_EBP_16(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,16); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_20 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_20(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,20); }
+void SUnMapLS_IP_EBP_20(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,20); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_24 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_24(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,24); }
+void SUnMapLS_IP_EBP_24(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,24); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_28 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_28(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,28); }
+void SUnMapLS_IP_EBP_28(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,28); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_32 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_32(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,32); }
+void SUnMapLS_IP_EBP_32(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,32); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_36 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_36(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,36); }
+void SUnMapLS_IP_EBP_36(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,36); }
 
 /***********************************************************************
  *		SUnMapLS_IP_EBP_40 (KERNEL32.@)
  */
-void WINAPI SUnMapLS_IP_EBP_40(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,40); }
+void SUnMapLS_IP_EBP_40(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,40); }
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 20ad9fb8bb7..a984f1c3dcd 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -185,7 +185,7 @@ void WINAPI LogApiThk( LPSTR func )
  *
  * NOTE: needs to preserve all registers!
  */
-void WINAPI LogApiThkLSF( LPSTR func, CONTEXT86 *context )
+void LogApiThkLSF( LPSTR func, CONTEXT86 *context )
 {
     TRACE( "%s\n", debugstr_a(func) );
 }
@@ -195,7 +195,7 @@ void WINAPI LogApiThkLSF( LPSTR func, CONTEXT86 *context )
  *
  * NOTE: needs to preserve all registers!
  */
-void WINAPI LogApiThkSL( LPSTR func, CONTEXT86 *context )
+void LogApiThkSL( LPSTR func, CONTEXT86 *context )
 {
     TRACE( "%s\n", debugstr_a(func) );
 }
@@ -205,7 +205,7 @@ void WINAPI LogApiThkSL( LPSTR func, CONTEXT86 *context )
  *
  * NOTE: needs to preserve all registers!
  */
-void WINAPI LogCBThkSL( LPSTR func, CONTEXT86 *context )
+void LogCBThkSL( LPSTR func, CONTEXT86 *context )
 {
     TRACE( "%s\n", debugstr_a(func) );
 }
@@ -438,7 +438,7 @@ UINT WINAPI ThunkConnect32(
  * FIXME: DDJ talks of certain register usage rules; I'm not sure
  * whether we cover this 100%.
  */
-void WINAPI QT_Thunk( CONTEXT86 *context )
+void QT_Thunk( CONTEXT86 *context )
 {
     CONTEXT86 context16;
     DWORD argsize;
@@ -521,8 +521,7 @@ void WINAPI QT_Thunk( CONTEXT86 *context )
  *  ESP is EBP-64 after return.
  *
  */
-
-void WINAPI FT_Prolog( CONTEXT86 *context )
+void FT_Prolog( CONTEXT86 *context )
 {
     /* Build stack frame */
     stack32_push(context, context->Ebp);
@@ -563,8 +562,7 @@ void WINAPI FT_Prolog( CONTEXT86 *context )
  *        of arguments, so that the single DWORD bitmap is no longer
  *        sufficient ...
  */
-
-void WINAPI FT_Thunk( CONTEXT86 *context )
+void FT_Thunk( CONTEXT86 *context )
 {
     DWORD mapESPrelative = *(DWORD *)(context->Ebp - 20);
     DWORD callTarget     = *(DWORD *)(context->Ebp - 52);
@@ -621,7 +619,6 @@ void WINAPI FT_Thunk( CONTEXT86 *context )
  * and perform a return to the CALLER of the thunk code (while removing
  * the given number of arguments from the caller's stack).
  */
-
 static void FT_Exit(CONTEXT86 *context, int nPopArgs)
 {
     /* Return value is in EBX */
@@ -645,77 +642,77 @@ static void FT_Exit(CONTEXT86 *context, int nPopArgs)
 /***********************************************************************
  *		FT_Exit0 (KERNEL32.@)
  */
-void WINAPI FT_Exit0 (CONTEXT86 *context) { FT_Exit(context,  0); }
+void FT_Exit0(CONTEXT86 *context) { FT_Exit(context,  0); }
 
 /***********************************************************************
  *		FT_Exit4 (KERNEL32.@)
  */
-void WINAPI FT_Exit4 (CONTEXT86 *context) { FT_Exit(context,  4); }
+void FT_Exit4(CONTEXT86 *context) { FT_Exit(context,  4); }
 
 /***********************************************************************
  *		FT_Exit8 (KERNEL32.@)
  */
-void WINAPI FT_Exit8 (CONTEXT86 *context) { FT_Exit(context,  8); }
+void FT_Exit8(CONTEXT86 *context) { FT_Exit(context,  8); }
 
 /***********************************************************************
  *		FT_Exit12 (KERNEL32.@)
  */
-void WINAPI FT_Exit12(CONTEXT86 *context) { FT_Exit(context, 12); }
+void FT_Exit12(CONTEXT86 *context) { FT_Exit(context, 12); }
 
 /***********************************************************************
  *		FT_Exit16 (KERNEL32.@)
  */
-void WINAPI FT_Exit16(CONTEXT86 *context) { FT_Exit(context, 16); }
+void FT_Exit16(CONTEXT86 *context) { FT_Exit(context, 16); }
 
 /***********************************************************************
  *		FT_Exit20 (KERNEL32.@)
  */
-void WINAPI FT_Exit20(CONTEXT86 *context) { FT_Exit(context, 20); }
+void FT_Exit20(CONTEXT86 *context) { FT_Exit(context, 20); }
 
 /***********************************************************************
  *		FT_Exit24 (KERNEL32.@)
  */
-void WINAPI FT_Exit24(CONTEXT86 *context) { FT_Exit(context, 24); }
+void FT_Exit24(CONTEXT86 *context) { FT_Exit(context, 24); }
 
 /***********************************************************************
  *		FT_Exit28 (KERNEL32.@)
  */
-void WINAPI FT_Exit28(CONTEXT86 *context) { FT_Exit(context, 28); }
+void FT_Exit28(CONTEXT86 *context) { FT_Exit(context, 28); }
 
 /***********************************************************************
  *		FT_Exit32 (KERNEL32.@)
  */
-void WINAPI FT_Exit32(CONTEXT86 *context) { FT_Exit(context, 32); }
+void FT_Exit32(CONTEXT86 *context) { FT_Exit(context, 32); }
 
 /***********************************************************************
  *		FT_Exit36 (KERNEL32.@)
  */
-void WINAPI FT_Exit36(CONTEXT86 *context) { FT_Exit(context, 36); }
+void FT_Exit36(CONTEXT86 *context) { FT_Exit(context, 36); }
 
 /***********************************************************************
  *		FT_Exit40 (KERNEL32.@)
  */
-void WINAPI FT_Exit40(CONTEXT86 *context) { FT_Exit(context, 40); }
+void FT_Exit40(CONTEXT86 *context) { FT_Exit(context, 40); }
 
 /***********************************************************************
  *		FT_Exit44 (KERNEL32.@)
  */
-void WINAPI FT_Exit44(CONTEXT86 *context) { FT_Exit(context, 44); }
+void FT_Exit44(CONTEXT86 *context) { FT_Exit(context, 44); }
 
 /***********************************************************************
  *		FT_Exit48 (KERNEL32.@)
  */
-void WINAPI FT_Exit48(CONTEXT86 *context) { FT_Exit(context, 48); }
+void FT_Exit48(CONTEXT86 *context) { FT_Exit(context, 48); }
 
 /***********************************************************************
  *		FT_Exit52 (KERNEL32.@)
  */
-void WINAPI FT_Exit52(CONTEXT86 *context) { FT_Exit(context, 52); }
+void FT_Exit52(CONTEXT86 *context) { FT_Exit(context, 52); }
 
 /***********************************************************************
  *		FT_Exit56 (KERNEL32.@)
  */
-void WINAPI FT_Exit56(CONTEXT86 *context) { FT_Exit(context, 56); }
+void FT_Exit56(CONTEXT86 *context) { FT_Exit(context, 56); }
 
 /***********************************************************************
  * 		ThunkInitLS 	(KERNEL32.43)
@@ -783,7 +780,7 @@ DWORD WINAPI ThunkInitLS(
  * in the BL register by the called 16-bit routine.
  *
  */
-void WINAPI Common32ThkLS( CONTEXT86 *context )
+void Common32ThkLS( CONTEXT86 *context )
 {
     CONTEXT86 context16;
     DWORD argsize;
@@ -842,7 +839,7 @@ void WINAPI Common32ThkLS( CONTEXT86 *context )
  * (Note that this function seems only to be used for
  *  OLECLI32 -> OLECLI and OLESVR32 -> OLESVR thunking.)
  */
-void WINAPI OT_32ThkLSF( CONTEXT86 *context )
+void OT_32ThkLSF( CONTEXT86 *context )
 {
     CONTEXT86 context16;
     DWORD argsize;
@@ -951,7 +948,7 @@ LPVOID WINAPI ThunkInitLSF(
  * Note: The two DWORD arguments get popped off the stack.
  *
  */
-void WINAPI FT_PrologPrime( CONTEXT86 *context )
+void FT_PrologPrime( CONTEXT86 *context )
 {
     DWORD  targetTableOffset;
     LPBYTE relayCode;
@@ -980,7 +977,7 @@ void WINAPI FT_PrologPrime( CONTEXT86 *context )
  *         EAX    start of relay code
  *
  */
-void WINAPI QT_ThunkPrime( CONTEXT86 *context )
+void QT_ThunkPrime( CONTEXT86 *context )
 {
     DWORD  targetTableOffset;
     LPBYTE relayCode;
@@ -1121,7 +1118,7 @@ DWORD WINAPIV SSCall(
 /**********************************************************************
  *           W32S_BackTo32                      (KERNEL32.51)
  */
-void WINAPI W32S_BackTo32( CONTEXT86 *context )
+void W32S_BackTo32( CONTEXT86 *context )
 {
     LPDWORD stack = (LPDWORD)context->Esp;
     FARPROC proc = (FARPROC)context->Eip;
@@ -1244,7 +1241,7 @@ BOOL16 WINAPI IsPeFormat16(
 /***********************************************************************
  *           K32Thk1632Prolog			(KERNEL32.@)
  */
-void WINAPI K32Thk1632Prolog( CONTEXT86 *context )
+void K32Thk1632Prolog( CONTEXT86 *context )
 {
    LPBYTE code = (LPBYTE)context->Eip - 5;
 
@@ -1305,7 +1302,7 @@ void WINAPI K32Thk1632Prolog( CONTEXT86 *context )
 /***********************************************************************
  *           K32Thk1632Epilog			(KERNEL32.@)
  */
-void WINAPI K32Thk1632Epilog( CONTEXT86 *context )
+void K32Thk1632Epilog( CONTEXT86 *context )
 {
    LPBYTE code = (LPBYTE)context->Eip - 13;
 
@@ -2104,7 +2101,7 @@ LPVOID WINAPI GetPK16SysVar(void)
 /**********************************************************************
  *           CommonUnimpStub    (KERNEL32.17)
  */
-void WINAPI CommonUnimpStub( CONTEXT86 *context )
+void CommonUnimpStub( CONTEXT86 *context )
 {
     FIXME("generic stub: %s\n", ((LPSTR)context->Eax ? (LPSTR)context->Eax : "?"));