Alexandre Julliard : crtdll:
Explicitly specify CDECL calling convention on exported functions.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 13 05:58:29 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 40cbe19e494d34716d6b3212ccceef99b0617618
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40cbe19e494d34716d6b3212ccceef99b0617618
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 12 21:35:20 2006 +0200
crtdll: Explicitly specify CDECL calling convention on exported functions.
---
dlls/crtdll/crtdll_main.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index 178e102..c6f4898 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -33,8 +33,8 @@ #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crtdll);
/* from msvcrt */
-extern void __getmainargs( int *argc, char ***argv, char ***envp,
- int expand_wildcards, int *new_mode );
+extern void CDECL __getmainargs( int *argc, char ***argv, char ***envp,
+ int expand_wildcards, int *new_mode );
/* The following data items are not exported from msvcrt */
unsigned int CRTDLL__basemajor_dll;
@@ -110,7 +110,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,D
/*********************************************************************
* __GetMainArgs (CRTDLL.@)
*/
-void __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards )
+void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards )
{
int new_mode = 0;
__getmainargs( argc, argv, envp, expand_wildcards, &new_mode );
@@ -120,7 +120,7 @@ void __GetMainArgs( int *argc, char ***a
/*********************************************************************
* _fstat (CRTDLL.@)
*/
-int CRTDLL__fstat(int fd, struct crtdll_stat* buf)
+int CDECL CRTDLL__fstat(int fd, struct crtdll_stat* buf)
{
extern int _fstat(int,struct _stat*);
struct _stat st;
@@ -134,7 +134,7 @@ int CRTDLL__fstat(int fd, struct crtdll_
/*********************************************************************
* _stat (CRTDLL.@)
*/
-int CRTDLL__stat(const char* path, struct crtdll_stat * buf)
+int CDECL CRTDLL__stat(const char* path, struct crtdll_stat * buf)
{
extern int _stat(const char*,struct _stat*);
struct _stat st;
@@ -148,7 +148,7 @@ int CRTDLL__stat(const char* path, struc
/*********************************************************************
* _strdec (CRTDLL.@)
*/
-char *_strdec(const char *str1, const char *str2)
+char * CDECL _strdec(const char *str1, const char *str2)
{
return (char *)(str2 - 1);
}
@@ -157,7 +157,7 @@ char *_strdec(const char *str1, const ch
/*********************************************************************
* _strinc (CRTDLL.@)
*/
-char *_strinc(const char *str)
+char * CDECL _strinc(const char *str)
{
return (char *)(str + 1);
}
@@ -166,7 +166,7 @@ char *_strinc(const char *str)
/*********************************************************************
* _strncnt (CRTDLL.@)
*/
-size_t _strncnt(const char *str, size_t maxlen)
+size_t CDECL _strncnt(const char *str, size_t maxlen)
{
size_t len = strlen(str);
return (len > maxlen) ? maxlen : len;
@@ -176,7 +176,7 @@ size_t _strncnt(const char *str, size_t
/*********************************************************************
* _strnextc (CRTDLL.@)
*/
-unsigned int _strnextc(const char *str)
+unsigned int CDECL _strnextc(const char *str)
{
return (unsigned int)str[0];
}
@@ -185,7 +185,7 @@ unsigned int _strnextc(const char *str)
/*********************************************************************
* _strninc (CRTDLL.@)
*/
-char *_strninc(const char *str, size_t len)
+char * CDECL _strninc(const char *str, size_t len)
{
return (char *)(str + len);
}
@@ -194,7 +194,7 @@ char *_strninc(const char *str, size_t l
/*********************************************************************
* _strspnp (CRTDLL.@)
*/
-char *_strspnp( const char *str1, const char *str2)
+char * CDECL _strspnp( const char *str1, const char *str2)
{
str1 += strspn( str1, str2 );
return *str1 ? (char*)str1 : NULL;
More information about the wine-cvs
mailing list