November 2017 - Wine-Commits

Alexandre Julliard : include: Use the hard-float calling convention for Windows APIs on ARM
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 644f497e87c51f1a1c62b26ea9f588e7bc97d13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=644f497e87c51f1a1c62b26ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:56 2017 +0100 include: Use the hard-float calling convention for Windows APIs on ARM Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 10 +++++++++- include/windef.h | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 9ec2082..ff0f4bd 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -60,6 +60,8 @@ # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -78,6 +80,8 @@ # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -102,7 +106,11 @@ #endif #ifndef WINAPIV -# define WINAPIV __cdecl +# if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +# else +# define WINAPIV __cdecl +# endif #endif #ifndef DECLSPEC_ALIGN diff --git a/include/windef.h b/include/windef.h index e77b1ca..d2afcf4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -69,6 +69,8 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -87,6 +89,8 @@ extern "C" { # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -110,6 +114,12 @@ extern "C" { # endif #endif +#if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +#else +# define WINAPIV __cdecl +#endif + #ifdef __WINESRC__ #define __ONLY_IN_WINELIB(x) do_not_use_this_in_wine #else @@ -179,7 +189,6 @@ extern "C" { #define PASCAL __stdcall #define CDECL __cdecl #define _CDECL __cdecl -#define WINAPIV __cdecl #define APIENTRY WINAPI #define CONST __ONLY_IN_WINELIB(const)

1 0

Alexandre Julliard : taskkill: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6c4cea952f94c3cef262ca74e539126a11414382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4cea952f94c3cef262ca74e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:10 2017 +0100 taskkill: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index b9dd1a5..6e4e1eb 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -74,7 +74,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL taskkill_printfW(const WCHAR *msg, ...) +static int WINAPIV taskkill_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -86,7 +86,7 @@ static int CDECL taskkill_printfW(const WCHAR *msg, ...) return len; } -static int CDECL taskkill_message_printfW(int msg, ...) +static int WINAPIV taskkill_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192];

1 0

Alexandre Julliard : regsvr32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: a31e62a2676806aafe05bc9ddc6150b65597efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e62a2676806aafe05bc9dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:01 2017 +0100 regsvr32: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 6338bae..988aaa3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -40,7 +40,7 @@ typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); static BOOL Silent = FALSE; -static void __cdecl output_write(UINT id, ...) +static void WINAPIV output_write(UINT id, ...) { WCHAR fmt[1024]; __ms_va_list va_args;

1 0

Alexandre Julliard : regedit: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7344ac9b728ac60fdabf2ee10113c5e94c5d9e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7344ac9b728ac60fdabf2ee10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:53 2017 +0100 regedit: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 4 ++-- programs/regedit/main.h | 2 +- programs/regedit/regedit.c | 4 ++-- programs/regedit/regproc.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3694627..6ccce00 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -64,7 +64,7 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l return ret; } -int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) { __ms_va_list ap; INT result; @@ -76,7 +76,7 @@ int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) return result; } -static void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) +static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) { __ms_va_list ap; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 8e05888..788de1a 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -160,7 +160,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern int __cdecl messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); +extern int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); /* hexedit.c */ extern void HexEdit_Register(void); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 4dd71ca..2d724f9 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -67,7 +67,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -void __cdecl output_message(unsigned int id, ...) +void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1536]; __ms_va_list va_args; @@ -82,7 +82,7 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -void __cdecl error_exit(unsigned int id, ...) +void WINAPIV error_exit(unsigned int id, ...) { WCHAR fmt[1536]; __ms_va_list va_args; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 4031255..9364fde 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,8 +24,8 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void __cdecl output_message(unsigned int id, ...); -void __cdecl error_exit(unsigned int id, ...); +void WINAPIV output_message(unsigned int id, ...); +void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size);

1 0

Alexandre Julliard : net: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 399feae786147162837cacb2280afb322bc3aff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399feae786147162837cacb22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:10 2017 +0100 net: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 2e540ea..d8123eb 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -70,7 +70,7 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) return 0; } -static int __cdecl output_printf(const WCHAR* fmt, ...) +static int WINAPIV output_printf(const WCHAR* fmt, ...) { __ms_va_list arguments; @@ -80,7 +80,7 @@ static int __cdecl output_printf(const WCHAR* fmt, ...) return 0; } -static int __cdecl output_string(int msg, ...) +static int WINAPIV output_string(int msg, ...) { WCHAR fmt[8192]; __ms_va_list arguments;

1 0

Alexandre Julliard : ipconfig: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 308bf48b7348c520a254885fda82467e043140e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308bf48b7348c520a254885fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:57 2017 +0100 ipconfig: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index a74ded6..936dfa2 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -62,7 +62,7 @@ static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL ipconfig_printfW(const WCHAR *msg, ...) +static int WINAPIV ipconfig_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -74,7 +74,7 @@ static int CDECL ipconfig_printfW(const WCHAR *msg, ...) return len; } -static int CDECL ipconfig_message_printfW(int msg, ...) +static int WINAPIV ipconfig_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192];

1 0

Alexandre Julliard : cmd: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: bcb6bf98e09ca9802ea08a2b91bb12ca6e8c8540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb6bf98e09ca9802ea08a2b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:52 2017 +0100 cmd: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmd.h | 6 +++--- programs/cmd/wcmdmain.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1180251..557be14 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -75,9 +75,9 @@ void WCMD_if (WCHAR *, CMD_LIST **cmdList); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); -WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...); -void CDECL WCMD_output (const WCHAR *format, ...); -void CDECL WCMD_output_stderr (const WCHAR *format, ...); +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); +void WINAPIV WCMD_output (const WCHAR *format, ...); +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 102e485..cec6df0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -128,7 +128,7 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) * */ -void CDECL WCMD_output (const WCHAR *format, ...) { +void WINAPIV WCMD_output (const WCHAR *format, ...) { __ms_va_list ap; WCHAR* string; @@ -154,7 +154,7 @@ void CDECL WCMD_output (const WCHAR *format, ...) { * */ -void CDECL WCMD_output_stderr (const WCHAR *format, ...) { +void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { __ms_va_list ap; WCHAR* string; @@ -180,8 +180,8 @@ void CDECL WCMD_output_stderr (const WCHAR *format, ...) { * */ -WCHAR* CDECL WCMD_format_string (const WCHAR *format, ...) { - +WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) +{ __ms_va_list ap; WCHAR* string; DWORD len;

1 0

Alexandre Julliard : kernel32/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: e488a246a5467814bf1d3ef0f0b88373a72d82af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e488a246a5467814bf1d3ef0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:17:04 2017 +0100 kernel32/tests: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1f88e24..7098805 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -26,7 +26,7 @@ #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) -static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, +static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { __ms_va_list list; @@ -39,7 +39,7 @@ static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, return r; } -static DWORD __cdecl doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, +static DWORD WINAPIV doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPWSTR out, DWORD outsize, ... ) { __ms_va_list list;

1 0

Alexandre Julliard : uninstaller: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 7c555f5c907ca42ec01d0af57d4fd17aaeadf7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c555f5c907ca42ec01d0af57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:17 2017 +0100 uninstaller: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 1c834ea..736593e 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -97,7 +97,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -static void __cdecl output_message(unsigned int id, ...) +static void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -112,7 +112,7 @@ static void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_array(WCHAR *fmt, ...) +static void WINAPIV output_array(WCHAR *fmt, ...) { __ms_va_list va_args;

1 0

Alexandre Julliard : netstat: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 83d6249c412aaaa89723ff7a5ce12fab9a3317ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d6249c412aaaa89723ff7a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:15 2017 +0100 netstat: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 6112497..8fe5900 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -70,7 +70,7 @@ static const WCHAR tcpstatesW[][16] = { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...) +static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0