Convert --register APIs to cdecl
Francois Gouget
fgouget at free.fr
Fri Oct 22 10:36:23 CDT 2004
As promised, here is a patch to convert the --register functions to
cdecl and thus silence the warnings added to winapi_check yesterday.
Changelog:
* dlls/kernel/heap.c
dlls/kernel/ne_module.c
dlls/kernel/selector.c
dlls/kernel/thunk.c
There is no point making '--register' functions stdcall so just
implement them as cdecl.
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
145 = 1! + 4! + 5!
-------------- next part --------------
Index: dlls/kernel/heap.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/heap.c,v
retrieving revision 1.11
diff -u -r1.11 heap.c
--- dlls/kernel/heap.c 13 Aug 2004 19:47:11 -0000 1.11
+++ dlls/kernel/heap.c 21 Oct 2004 23:58:26 -0000
@@ -980,7 +980,7 @@
*
* 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 @@
*
* Input: EDI register: pointer to buffer
*/
-void WINAPI FreeMappedBuffer( CONTEXT86 *context )
+void FreeMappedBuffer( CONTEXT86 *context )
{
if (context->Edi)
{
Index: dlls/kernel/ne_module.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/ne_module.c,v
retrieving revision 1.26
diff -u -r1.26 ne_module.c
--- dlls/kernel/ne_module.c 10 Sep 2004 21:16:02 -0000 1.26
+++ dlls/kernel/ne_module.c 21 Oct 2004 23:58:57 -0000
@@ -2268,7 +2268,7 @@
* MapHInstLS (KERNEL32.@)
* MapHInstLS (KERNEL.472)
*/
-void WINAPI MapHInstLS( CONTEXT86 *context )
+void MapHInstLS( CONTEXT86 *context )
{
context->Eax = MapHModuleLS( (HMODULE)context->Eax );
}
@@ -2277,7 +2277,7 @@
* MapHInstSL (KERNEL32.@)
* MapHInstSL (KERNEL.473)
*/
-void WINAPI MapHInstSL( CONTEXT86 *context )
+void MapHInstSL( CONTEXT86 *context )
{
context->Eax = (DWORD)MapHModuleSL( context->Eax );
}
@@ -2285,7 +2285,7 @@
/***************************************************************************
* 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 @@
/***************************************************************************
* MapHInstSL_PN (KERNEL32.@)
*/
-void WINAPI MapHInstSL_PN( CONTEXT86 *context )
+void MapHInstSL_PN( CONTEXT86 *context )
{
if (context->Eax) context->Eax = (DWORD)MapHModuleSL( context->Eax );
}
Index: dlls/kernel/selector.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/selector.c,v
retrieving revision 1.3
diff -u -r1.3 selector.c
--- dlls/kernel/selector.c 14 Jun 2004 17:04:35 -0000 1.3
+++ dlls/kernel/selector.c 21 Oct 2004 23:59:58 -0000
@@ -565,7 +565,7 @@
* 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,7 @@
* 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 +661,52 @@
/***********************************************************************
* 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 +721,7 @@
* SUnMapLS (KERNEL32.@)
*/
-void WINAPI SUnMapLS( CONTEXT86 *context )
+void SUnMapLS( CONTEXT86 *context )
{
if (HIWORD(context->Eax)) UnMapLS( (SEGPTR)context->Eax );
}
@@ -740,44 +739,44 @@
/***********************************************************************
* 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); }
Index: dlls/kernel/thunk.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/thunk.c,v
retrieving revision 1.50
diff -u -r1.50 thunk.c
--- dlls/kernel/thunk.c 16 Jun 2004 19:02:11 -0000 1.50
+++ dlls/kernel/thunk.c 22 Oct 2004 00:15:50 -0000
@@ -185,7 +185,7 @@
*
* 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 @@
*
* 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 @@
*
* 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 @@
* 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 @@
* 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 @@
* 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 @@
* 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 @@
/***********************************************************************
* 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 @@
* 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 @@
* (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 @@
* 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 @@
* EAX start of relay code
*
*/
-void WINAPI QT_ThunkPrime( CONTEXT86 *context )
+void QT_ThunkPrime( CONTEXT86 *context )
{
DWORD targetTableOffset;
LPBYTE relayCode;
@@ -1121,7 +1118,7 @@
/**********************************************************************
* 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 @@
/***********************************************************************
* K32Thk1632Prolog (KERNEL32.@)
*/
-void WINAPI K32Thk1632Prolog( CONTEXT86 *context )
+void K32Thk1632Prolog( CONTEXT86 *context )
{
LPBYTE code = (LPBYTE)context->Eip - 5;
@@ -1305,7 +1302,7 @@
/***********************************************************************
* K32Thk1632Epilog (KERNEL32.@)
*/
-void WINAPI K32Thk1632Epilog( CONTEXT86 *context )
+void K32Thk1632Epilog( CONTEXT86 *context )
{
LPBYTE code = (LPBYTE)context->Eip - 13;
@@ -2104,7 +2101,7 @@
/**********************************************************************
* CommonUnimpStub (KERNEL32.17)
*/
-void WINAPI CommonUnimpStub( CONTEXT86 *context )
+void CommonUnimpStub( CONTEXT86 *context )
{
FIXME("generic stub: %s\n", ((LPSTR)context->Eax ? (LPSTR)context->Eax : "?"));
More information about the wine-patches
mailing list