wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Alexandre Julliard : regedit: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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 : reg: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: a37358d0f5ab6e447f96f22ceee0da6c34b5355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37358d0f5ab6e447f96f22ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:21:30 2017 +0100 reg: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 4 ++-- programs/reg/reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fac3d22..42fd6e9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,7 +151,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[1024]; __ms_va_list va_args; @@ -166,7 +166,7 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_string(const WCHAR *fmt, ...) +static void WINAPIV output_string(const WCHAR *fmt, ...) { __ms_va_list va_args; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 14c05b1..07bbecf 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,7 @@ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); -void __cdecl output_message(unsigned int id, ...); +void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); /* import.c */

1 0

Alexandre Julliard : netstat: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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

Alexandre Julliard : net: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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 02 Nov '17

02 Nov '17

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 02 Nov '17

02 Nov '17

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 : attrib: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 1722db40e5a14613aa7a44becfef05ef4124c804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1722db40e5a14613aa7a44bec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:40 2017 +0100 attrib: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 0938cb8..a574204 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -48,7 +48,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) * 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 ATTRIB_wprintf(const WCHAR *format, ...) +static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : include: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 667b150a98a5df15302749cb5243568b8ffa1564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667b150a98a5df15302749cb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:20:27 2017 +0100 include: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledlg.h | 4 ++-- include/rpcndr.h | 2 +- include/vfw.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index f009d76..80829ec 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -967,8 +967,8 @@ BOOL WINAPI OleUIAddVerbMenuW(LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, HMEN UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial); UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial); #define OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial) -INT __cdecl OleUIPromptUserA(INT,HWND, ...); -INT __cdecl OleUIPromptUserW(INT,HWND, ...); +INT WINAPIV OleUIPromptUserA(INT,HWND, ...); +INT WINAPIV OleUIPromptUserW(INT,HWND, ...); #define OleUIPromptUser WINELIB_NAME_AW(OleUIPromptUser) #ifdef __cplusplus diff --git a/include/rpcndr.h b/include/rpcndr.h index 9029950..0f751d7 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -114,7 +114,7 @@ typedef UINT64 MIDL_uhyper; typedef unsigned char boolean; #define __RPC_CALLEE WINAPI -#define RPC_VAR_ENTRY __cdecl +#define RPC_VAR_ENTRY WINAPIV #define NDR_SHAREABLE static #define MIDL_ascii_strlen(s) strlen(s) diff --git a/include/vfw.h b/include/vfw.h index aa3d4f5..cec5345 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1082,10 +1082,10 @@ BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream, PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions); HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions); -HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); -HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, +HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...); #define AVISave WINELIB_NAME_AW(AVISave)

1 0

Alexandre Julliard : msvcrt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 7726157e19f030690c209e59cd1102a6d0e243a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7726157e19f030690c209e59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:19:18 2017 +0100 msvcrt: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 4 +-- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcr90/tests/msvcr90.c | 4 +-- dlls/msvcrt/console.c | 4 +-- dlls/msvcrt/except_i386.c | 2 +- dlls/msvcrt/file.c | 26 +++++++------- dlls/msvcrt/msvcrt.h | 12 +++---- dlls/msvcrt/process.c | 32 ++++++++--------- dlls/msvcrt/scanf.c | 80 +++++++++++++++++++++--------------------- dlls/msvcrt/scheduler.c | 2 +- dlls/msvcrt/tests/printf.c | 22 ++++++------ dlls/msvcrt/tests/scanf.c | 2 +- dlls/msvcrt/wcs.c | 42 +++++++++++----------- dlls/ucrtbase/tests/printf.c | 12 +++---- include/msvcrt/conio.h | 8 ++--- include/msvcrt/crtdbg.h | 2 +- include/msvcrt/crtdefs.h | 4 +++ include/msvcrt/io.h | 12 +++---- include/msvcrt/process.h | 48 ++++++++++++------------- include/msvcrt/stdio.h | 62 ++++++++++++++++---------------- include/msvcrt/wchar.h | 50 +++++++++++++------------- 21 files changed, 218 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7726157e19f030690c209…

1 0

Alexandre Julliard : kernel32/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2017