Maarten Lankhorst : kernel32: Change all functions to use CDECL.

Alexandre Julliard julliard at winehq.org
Tue Dec 23 13:40:50 CST 2008


Module: wine
Branch: master
Commit: 70441d5bb890db84a93e43e74ab2d6a27d8f9d42
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=70441d5bb890db84a93e43e74ab2d6a27d8f9d42

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Tue Dec 16 16:16:10 2008 +0100

kernel32: Change all functions to use CDECL.

---

 dlls/kernel32/path.c         |    4 ++--
 dlls/kernel32/process.c      |    2 +-
 dlls/ntdll/loader.c          |    2 +-
 include/winbase.h            |    4 ++--
 programs/start/start.c       |    2 +-
 programs/winepath/winepath.c |    4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index fca12cc..b0f2fa0 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -1583,7 +1583,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name )
  * Return the full Unix file name for a given path.
  * Returned buffer must be freed by caller.
  */
-char *wine_get_unix_file_name( LPCWSTR dosW )
+char CDECL *wine_get_unix_file_name( LPCWSTR dosW )
 {
     UNICODE_STRING nt_name;
     ANSI_STRING unix_name;
@@ -1607,7 +1607,7 @@ char *wine_get_unix_file_name( LPCWSTR dosW )
  * Return the full DOS file name for a given Unix path.
  * Returned buffer must be freed by caller.
  */
-WCHAR *wine_get_dos_file_name( LPCSTR str )
+WCHAR CDECL *wine_get_dos_file_name( LPCSTR str )
 {
     UNICODE_STRING nt_name;
     ANSI_STRING unix_name;
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 918ce3e..8b1fb9f 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -956,7 +956,7 @@ static void set_process_name( int argc, char *argv[] )
  *
  * Wine initialisation: load and start the main exe file.
  */
-void __wine_kernel_init(void)
+void CDECL __wine_kernel_init(void)
 {
     static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0};
     static const WCHAR dotW[] = {'.',0};
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3bada92..968d7fd 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2652,7 +2652,7 @@ void __wine_process_init(void)
     WINE_MODREF *wm;
     NTSTATUS status;
     ANSI_STRING func_name;
-    void (* DECLSPEC_NORETURN init_func)(void);
+    void (* DECLSPEC_NORETURN CDECL init_func)(void);
     extern mode_t FILE_umask;
 
     main_exe_file = thread_init();
diff --git a/include/winbase.h b/include/winbase.h
index 909a3e2..f7bb9bf 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2311,8 +2311,8 @@ WINBASEAPI VOID        WINAPI _LeaveSysLevel(SYSLEVEL*);
 
 /* Wine internal functions */
 
-extern char *wine_get_unix_file_name( LPCWSTR dos );
-extern WCHAR *wine_get_dos_file_name( LPCSTR str );
+extern char CDECL *wine_get_unix_file_name( LPCWSTR dos );
+extern WCHAR CDECL *wine_get_dos_file_name( LPCSTR str );
 
 
 /* Interlocked functions */
diff --git a/programs/start/start.c b/programs/start/start.c
index 2009e78..d98f215 100644
--- a/programs/start/start.c
+++ b/programs/start/start.c
@@ -258,7 +258,7 @@ int wmain (int argc, WCHAR *argv[])
 	sei.lpParameters = args;
 
 	if (unix_mode) {
-		LPWSTR (*wine_get_dos_file_name_ptr)(LPCSTR);
+		LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR);
 		char* multibyte_unixpath;
 		int multibyte_unixpath_len;
 
diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c
index f4430d3..2471803 100644
--- a/programs/winepath/winepath.c
+++ b/programs/winepath/winepath.c
@@ -142,8 +142,8 @@ static int parse_options(const WCHAR *argv[])
  */
 int wmain(int argc, const WCHAR *argv[])
 {
-    LPSTR (*wine_get_unix_file_name_ptr)(LPCWSTR) = NULL;
-    LPWSTR (*wine_get_dos_file_name_ptr)(LPCSTR) = NULL;
+    LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR) = NULL;
+    LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR) = NULL;
     WCHAR dos_pathW[MAX_PATH];
     char path[MAX_PATH];
     int outputformats;




More information about the wine-cvs mailing list