October 2021 - Wine-Commits

Damjan Jovanovic : ntdll: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 70f486c28fcc323e415b1ac88854db187bea95ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f486c28fcc323e415b1ac8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:15:55 2021 +0200 ntdll: Use sysctl instead of /proc/curproc/file on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4e807744862..0542d2bc865 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -58,6 +58,10 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif +#include <limits.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # define LoadResource MacLoadResource @@ -600,7 +604,14 @@ static void init_paths( char *argv[] ) #if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) bin_dir = realpath_dirname( "/proc/self/exe" ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - bin_dir = realpath_dirname( "/proc/curproc/file" ); + { + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = malloc( path_size ); + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + bin_dir = realpath_dirname( path ); + free( path ); + } #else bin_dir = realpath_dirname( argv0 ); #endif

1 0

Damjan Jovanovic : winebus.sys: Get inotify working on FreeBSD.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 82a5be463796c78f16567507d19f6b58b5d8806d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a5be463796c78f16567507… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 11:35:41 2021 +0200 winebus.sys: Get inotify working on FreeBSD. FreeBSD requires linking to the inotify library, and including limits.h. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_udev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 6fc6fc5a632..d9ea33d267d 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = winebus.sys UNIXLIB = winebus.so IMPORTS = ntoskrnl hidparse -EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) $(INOTIFY_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 8889b6a3e1f..4c00fe6ad39 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -52,6 +52,7 @@ #ifdef HAVE_SYS_INOTIFY_H # include <sys/inotify.h> #endif +#include <limits.h> #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h>

1 0

Alexandre Julliard : makefiles: Add support for importing PE system libraries using the -l option.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 30fb17bda0d96c1778d18015c5292580de25f486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30fb17bda0d96c1778d18015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:05:07 2021 +0200 makefiles: Add support for importing PE system libraries using the -l option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3792a2b223b..b24acfa3053 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1411,6 +1411,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; + if (make->include_paths.count) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1); @@ -1961,6 +1962,7 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons static const char *get_static_lib( const struct makefile *make, const char *name ) { if (!make->staticlib) return NULL; + if (make->disabled) return NULL; if (strncmp( make->staticlib, "lib", 3 )) return NULL; if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL; if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL; @@ -2085,9 +2087,20 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (i = 0; i < imports.count; i++) { - const char *name = get_base_name( imports.str[i] ); + const char *name = imports.str[i]; const char *lib = NULL; + if (name[0] == '-') + { + switch (name[1]) + { + case 'L': strarray_add( &ret, name ); continue; + case 'l': name += 2; break; + default: continue; + } + } + else name = get_base_name( name ); + for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name ))

1 0

Alexandre Julliard : winetest: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: acefbcf6c9ad79d962b273d2ac0159075280b8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=acefbcf6c9ad79d962b273d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:53 2021 +0200 winetest: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/gui.c | 56 ++++++++++++++++++++++---------------------- programs/winetest/send.c | 6 ++--- programs/winetest/util.c | 16 ++++++------- programs/winetest/winetest.h | 2 +- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index bf9c3de8e82..e42d8c37112 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -60,7 +60,7 @@ MBdefault (int uType) /* report (R_STATUS, fmt, ...) */ static int -textStatus (__ms_va_list ap) +textStatus (va_list ap) { char *str = vstrmake (NULL, ap); @@ -71,7 +71,7 @@ textStatus (__ms_va_list ap) } static int -guiStatus (__ms_va_list ap) +guiStatus (va_list ap) { size_t len; char *str = vstrmake (&len, ap); @@ -84,7 +84,7 @@ guiStatus (__ms_va_list ap) /* report (R_PROGRESS, barnum, steps) */ static int -textProgress (__ms_va_list ap) +textProgress (va_list ap) { progressGroup = va_arg (ap, int); progressMax = va_arg (ap, int); @@ -93,7 +93,7 @@ textProgress (__ms_va_list ap) } static int -guiProgress (__ms_va_list ap) +guiProgress (va_list ap) { unsigned int max; HWND pb; @@ -114,7 +114,7 @@ guiProgress (__ms_va_list ap) /* report (R_STEP, fmt, ...) */ static int -textStep (__ms_va_list ap) +textStep (va_list ap) { char *str = vstrmake (NULL, ap); @@ -126,7 +126,7 @@ textStep (__ms_va_list ap) } static int -guiStep (__ms_va_list ap) +guiStep (va_list ap) { const int pgID = IDC_ST0 + progressGroup * 2; char *str = vstrmake (NULL, ap); @@ -141,7 +141,7 @@ guiStep (__ms_va_list ap) /* report (R_DELTA, inc, fmt, ...) */ static int -textDelta (__ms_va_list ap) +textDelta (va_list ap) { const int inc = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -154,7 +154,7 @@ textDelta (__ms_va_list ap) } static int -guiDelta (__ms_va_list ap) +guiDelta (va_list ap) { const int inc = va_arg (ap, int); const int pgID = IDC_ST0 + progressGroup * 2; @@ -170,7 +170,7 @@ guiDelta (__ms_va_list ap) /* report (R_TAG) */ static int -textTag (__ms_va_list ap) +textTag (va_list ap) { fputs ("Tag: ", stderr); fputs (tag, stderr); @@ -179,7 +179,7 @@ textTag (__ms_va_list ap) } static int -guiTag (__ms_va_list ap) +guiTag (va_list ap) { SetDlgItemTextA (dialog, IDC_TAG, tag); return 0; @@ -187,7 +187,7 @@ guiTag (__ms_va_list ap) /* report (R_DIR, fmt, ...) */ static int -textDir (__ms_va_list ap) +textDir (va_list ap) { char *str = vstrmake (NULL, ap); @@ -199,7 +199,7 @@ textDir (__ms_va_list ap) } static int -guiDir (__ms_va_list ap) +guiDir (va_list ap) { char *str = vstrmake (NULL, ap); @@ -210,7 +210,7 @@ guiDir (__ms_va_list ap) /* report (R_OUT, fmt, ...) */ static int -textOut (__ms_va_list ap) +textOut (va_list ap) { char *str = vstrmake (NULL, ap); @@ -222,7 +222,7 @@ textOut (__ms_va_list ap) } static int -guiOut (__ms_va_list ap) +guiOut (va_list ap) { char *str = vstrmake (NULL, ap); @@ -233,7 +233,7 @@ guiOut (__ms_va_list ap) /* report (R_WARNING, fmt, ...) */ static int -textWarning (__ms_va_list ap) +textWarning (va_list ap) { fputs ("Warning: ", stderr); textStatus (ap); @@ -241,7 +241,7 @@ textWarning (__ms_va_list ap) } static int -guiWarning (__ms_va_list ap) +guiWarning (va_list ap) { char *str = vstrmake (NULL, ap); @@ -252,7 +252,7 @@ guiWarning (__ms_va_list ap) /* report (R_ERROR, fmt, ...) */ static int -textError (__ms_va_list ap) +textError (va_list ap) { fputs ("Error: ", stderr); textStatus (ap); @@ -260,7 +260,7 @@ textError (__ms_va_list ap) } static int -guiError (__ms_va_list ap) +guiError (va_list ap) { char *str = vstrmake (NULL, ap); @@ -271,7 +271,7 @@ guiError (__ms_va_list ap) /* report (R_FATAL, fmt, ...) */ static int -textFatal (__ms_va_list ap) +textFatal (va_list ap) { textError (ap); exit (1); @@ -279,7 +279,7 @@ textFatal (__ms_va_list ap) } static int -guiFatal (__ms_va_list ap) +guiFatal (va_list ap) { guiError (ap); exit (1); @@ -288,7 +288,7 @@ guiFatal (__ms_va_list ap) /* report (R_ASK, type, fmt, ...) */ static int -textAsk (__ms_va_list ap) +textAsk (va_list ap) { int uType = va_arg (ap, int); int ret = MBdefault (uType); @@ -301,7 +301,7 @@ textAsk (__ms_va_list ap) } static int -guiAsk (__ms_va_list ap) +guiAsk (va_list ap) { int uType = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -395,13 +395,13 @@ guiAskEmail (void) /* Quiet functions */ static int -qNoOp (__ms_va_list ap) +qNoOp (va_list ap) { return 0; } static int -qAsk (__ms_va_list ap) +qAsk (va_list ap) { return MBdefault (va_arg (ap, int)); } @@ -480,9 +480,9 @@ DlgThreadProc (LPVOID param) int WINAPIV report (enum report_type t, ...) { - typedef int r_fun_t (__ms_va_list); + typedef int r_fun_t (va_list); - __ms_va_list ap; + va_list ap; int ret = 0; static r_fun_t * const text_funcs[] = {textStatus, textProgress, textStep, textDelta, @@ -547,9 +547,9 @@ int WINAPIV report (enum report_type t, ...) } } - __ms_va_start (ap, t); + va_start (ap, t); if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); - __ms_va_end (ap); + va_end (ap); return ret; } diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 1d4e3a78674..4b575e11a34 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -105,14 +105,14 @@ send_buf (SOCKET s, const char *buf, size_t length) static int WINAPIV send_str (SOCKET s, ...) { - __ms_va_list ap; + va_list ap; char *p; int ret; size_t len; - __ms_va_start (ap, s); + va_start (ap, s); p = vstrmake (&len, ap); - __ms_va_end (ap); + va_end (ap); if (!p) return 1; ret = send_buf (s, p, len); heap_free (p); diff --git a/programs/winetest/util.c b/programs/winetest/util.c index b3d112eab0f..ec145d7f5e6 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -57,7 +57,7 @@ void heap_free (void *op) HeapFree(GetProcessHeap(), 0, op); } -static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap) +static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) { size_t size = 1000; char *p, *q; @@ -81,7 +81,7 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap) return p; } -char *vstrmake (size_t *lenp, __ms_va_list ap) +char *vstrmake (size_t *lenp, va_list ap) { const char *fmt; @@ -91,27 +91,27 @@ char *vstrmake (size_t *lenp, __ms_va_list ap) char * WINAPIV strmake (size_t *lenp, ...) { - __ms_va_list ap; + va_list ap; char *p; - __ms_va_start (ap, lenp); + va_start (ap, lenp); p = vstrmake (lenp, ap); if (!p) report (R_FATAL, "Out of memory."); - __ms_va_end (ap); + va_end (ap); return p; } void WINAPIV xprintf (const char *fmt, ...) { - __ms_va_list ap; + va_list ap; size_t size; DWORD written; char *buffer, *head; - __ms_va_start (ap, fmt); + va_start (ap, fmt); buffer = vstrfmtmake (&size, fmt, ap); head = buffer; - __ms_va_end (ap); + va_end (ap); while (size) { if (!WriteFile( logfile, head, size, &written, NULL )) report (R_FATAL, "Can't write logs: %u", GetLastError()); diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 32d3f904709..6f02422ce4f 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -29,7 +29,7 @@ void fatal (const char* msg); void warning (const char* msg); void WINAPIV xprintf (const char *fmt, ...); -char *vstrmake (size_t *lenp, __ms_va_list ap); +char *vstrmake (size_t *lenp, va_list ap); char * WINAPIV strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag);

1 0

Alexandre Julliard : winemenubuilder: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 63bff91a7f0a9f3ece0ce3945861d923bf9d3d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bff91a7f0a9f3ece0ce394… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:26 2021 +0200 winemenubuilder: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 522e6192b24..16dc32a8859 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -246,7 +246,7 @@ static void heap_free( void *ptr ) static WCHAR * WINAPIV heap_wprintf(const WCHAR *format, ...) { - __ms_va_list args; + va_list args; int size = 4096; WCHAR *buffer; int n; @@ -254,9 +254,9 @@ static WCHAR * WINAPIV heap_wprintf(const WCHAR *format, ...) while (1) { buffer = xmalloc(size * sizeof(WCHAR)); - __ms_va_start(args, format); + va_start(args, format); n = _vsnwprintf(buffer, size, format, args); - __ms_va_end(args); + va_end(args); if (n == -1) size *= 2; else if (n >= size)

1 0

Alexandre Julliard : services/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 7f83b8fdd1be6ccfd10b256ef845b0d03564befa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f83b8fdd1be6ccfd10b256e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:56 2021 +0200 services/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 93eff0e36f0..7495232b7b1 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -65,12 +65,12 @@ static inline void service_event(const char *event) static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { - __ms_va_list valist; + va_list valist; char buf[512]; - __ms_va_start(valist, msg); + va_start(valist, msg); vsprintf(buf, msg, valist); - __ms_va_end(valist); + va_end(valist); send_msg(cnd ? "OK" : "FAIL", buf); }

1 0

Alexandre Julliard : regsvr32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: f8ffea3a8747587355569b761c58e89d39727d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ffea3a8747587355569b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:45 2021 +0200 regsvr32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index fb307d797a1..c56479015d8 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -39,7 +39,7 @@ static BOOL Silent = FALSE; static void WINAPIV output_write(UINT id, ...) { WCHAR fmt[1024]; - __ms_va_list va_args; + va_list va_args; WCHAR *str; DWORD len, nOut, ret; @@ -51,10 +51,10 @@ static void WINAPIV output_write(UINT id, ...) return; } - __ms_va_start(va_args, id); + va_start(va_args, id); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (LPWSTR)&str, 0, &va_args); - __ms_va_end(va_args); + va_end(va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));

1 0

Alexandre Julliard : netstat: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 3b6b24ea424c5f499c58f7de06e83a8c035b6ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6b24ea424c5f499c58f7de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:22 2021 +0200 netstat: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 563896629c9..243fca56055 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -78,7 +78,7 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) static BOOL traceOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 - __ms_va_list parms; + va_list parms; DWORD nOut; int len; DWORD res = 0; @@ -96,9 +96,9 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) return 0; } - __ms_va_start(parms, format); + va_start(parms, format); len = wvsprintfW(output_bufW, format, parms); - __ms_va_end(parms); + va_end(parms); /* Try to write as unicode all the time we think it's a console */ if (toConsole) {

1 0

Alexandre Julliard : ipconfig: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: b2240d6dfb90ace4dd7cf911a9eaebf031e515b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2240d6dfb90ace4dd7cf911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:09 2021 +0200 ipconfig: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index a056771128c..29f86521b07 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -28,7 +28,7 @@ #include "ipconfig.h" -static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) +static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; DWORD count, ret; @@ -64,27 +64,27 @@ static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) static int WINAPIV ipconfig_printfW(const WCHAR *msg, ...) { - __ms_va_list va_args; + va_list va_args; int len; - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = ipconfig_vprintfW(msg, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; } static int WINAPIV ipconfig_message_printfW(int msg, ...) { - __ms_va_list va_args; + va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = ipconfig_vprintfW(msg_buffer, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; }

1 0

Alexandre Julliard : net: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 3291ead14df517375a6a62e4d5e6d137a9924288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3291ead14df517375a6a62e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:16 2021 +0200 net: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index dbc4bf2bfc6..a8073956019 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -54,7 +54,7 @@ static int output_write(const WCHAR* str, int len) return count; } -static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) +static int output_vprintf(const WCHAR* fmt, va_list va_args) { WCHAR str[8192]; int len; @@ -69,23 +69,23 @@ static int output_vprintf(const WCHAR* fmt, __ms_va_list va_args) static int WINAPIV output_printf(const WCHAR* fmt, ...) { - __ms_va_list arguments; + va_list arguments; - __ms_va_start(arguments, fmt); + va_start(arguments, fmt); output_vprintf(fmt, arguments); - __ms_va_end(arguments); + va_end(arguments); return 0; } static int WINAPIV output_string(int msg, ...) { WCHAR fmt[8192]; - __ms_va_list arguments; + va_list arguments; LoadStringW(GetModuleHandleW(NULL), msg, fmt, ARRAY_SIZE(fmt)); - __ms_va_start(arguments, msg); + va_start(arguments, msg); output_vprintf(fmt, arguments); - __ms_va_end(arguments); + va_end(arguments); return 0; }

1 0