October 2021 - Wine-Commits

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

Oct. 25, 2021

Module: wine Branch: master Commit: 9183aec7c7dee9acdd5a7eec783ac20859a30330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9183aec7c7dee9acdd5a7eec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:12 2021 +0200 uninstaller: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 8941d3a47ad..d8203b6763b 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -70,7 +70,7 @@ static void output_writeconsole(const WCHAR *str, DWORD len) } } -static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +static void output_formatstring(const WCHAR *fmt, va_list va_args) { WCHAR *str; DWORD len; @@ -89,25 +89,25 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) static void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; - __ms_va_list va_args; + va_list va_args; if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; } - __ms_va_start(va_args, id); + va_start(va_args, id); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); } static void WINAPIV output_array(const WCHAR *fmt, ...) { - __ms_va_list va_args; + va_list va_args; - __ms_va_start(va_args, fmt); + va_start(va_args, fmt); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); } /**

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: 789ba0fe412b0e1d44d5b37a67d9570c1aa90f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=789ba0fe412b0e1d44d5b37a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:03:00 2021 +0200 wmic: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f0b6ea0f05d..50c28ebec5d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -95,14 +95,14 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) { - __ms_va_list va_args; + va_list va_args; int len; DWORD count; WCHAR buffer[8192]; - __ms_va_start( va_args, msg ); + va_start( va_args, msg ); len = vswprintf( buffer, ARRAY_SIZE(buffer), msg, va_args ); - __ms_va_end( va_args ); + va_end( va_args ); if (!WriteConsoleW( handle, buffer, len, &count, NULL )) WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE );

1 0

Alexandre Julliard : makefiles: Don't try to link a library to itself.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: d1248c8a0cffaa617e326127f17bcedfe9601f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1248c8a0cffaa617e326127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:04:11 2021 +0200 makefiles: Don't try to link a library to itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index a7a7924a20b..3792a2b223b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2050,10 +2050,16 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s const char *name = all_libs.str[i] + 2; for (j = 0; j < subdirs.count; j++) + { + if (make == submakes[j]) continue; if ((lib = get_static_lib( submakes[j], name ))) break; + } if (!lib && make->native_unix_lib) for (j = 0; j < subdirs.count; j++) + { + if (make == submakes[j]) continue; if ((lib = get_native_unix_lib( submakes[j], name ))) break; + } } if (lib)

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: f5e51cfc5551a80f096a80d1f1512386e4df09a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e51cfc5551a80f096a80d1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:15:14 2021 +0200 loader: 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> --- loader/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/loader/main.c b/loader/main.c index fdc77c56162..242ff15accd 100644 --- a/loader/main.c +++ b/loader/main.c @@ -29,6 +29,10 @@ #include <sys/stat.h> #include <unistd.h> #include <dlfcn.h> +#include <limits.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "main.h" @@ -83,8 +87,14 @@ static const char *get_self_exe( char *argv0 ) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) return "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) - return "/proc/curproc/file"; -#else + 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 )) + return path; + free( path ); +#endif + if (!strchr( argv0, '/' )) /* search in PATH */ { char *p, *path = getenv( "PATH" ); @@ -104,7 +114,6 @@ static const char *get_self_exe( char *argv0 ) return NULL; } return argv0; -#endif } static void *try_dlopen( const char *dir, const char *name )

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: e224d74a57705ca589b8d6670961d29880eb645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e224d74a57705ca589b8d667… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:14:38 2021 +0200 server: 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> --- server/unicode.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/server/unicode.c b/server/unicode.c index 67698d7639c..86a1217b01f 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -25,6 +25,10 @@ #include <stdio.h> #include <stdarg.h> #include <unistd.h> +#include <limits.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "windef.h" #include "winternl.h" @@ -240,7 +244,17 @@ static char *get_nls_dir(void) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - dir = realpath( "/proc/curproc/file", NULL ); + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t dir_size = PATH_MAX; + dir = malloc( dir_size ); + if (dir) + { + if (sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + { + free( dir ); + dir = NULL; + } + } #else dir = realpath( server_argv0, NULL ); #endif

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: e0e6eda6927042e09ba6486f20d68110a4879385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e6eda6927042e09ba6486f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:03:06 2021 +0200 xcopy: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index c2427f355aa..809f24433a3 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -98,7 +98,7 @@ static int WINAPIV XCOPY_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; @@ -116,10 +116,10 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { return 0; } - __ms_va_start(parms, format); + va_start(parms, format); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); - __ms_va_end(parms); + va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0;

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: 43e3e1e409225336dccc820983ade69010e35beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e3e1e409225336dccc8209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:19 2021 +0200 winedbg: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0a629e880fa..57c2eb82972 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -147,12 +147,12 @@ void dbg_outputW(const WCHAR* buffer, int len) int WINAPIV dbg_printf(const char* format, ...) { static char buf[4*1024]; - __ms_va_list valist; + va_list valist; int len; - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buf, sizeof(buf), format, valist); - __ms_va_end(valist); + va_end(valist); if (len <= -1 || len >= sizeof(buf)) {

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: 2c2e75503bea973a3091ea48d431782da656ef8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c2e75503bea973a3091ea48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:02:04 2021 +0200 taskkill: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 193ed058297..6704b121aa9 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -39,7 +39,7 @@ struct pid_close_info BOOL found; }; -static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) +static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; DWORD count, ret; @@ -75,27 +75,27 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) static int WINAPIV taskkill_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 = taskkill_vprintfW(msg, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; } static int WINAPIV taskkill_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 = taskkill_vprintfW(msg_buffer, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; }

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: 942f9f71575d4a53ae032360e03f1297be1319f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942f9f71575d4a53ae032360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:29 2021 +0200 reg: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 617ec9df56f..1af63498b05 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -72,7 +72,7 @@ void output_writeconsole(const WCHAR *str, DWORD wlen) } } -static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +static void output_formatstring(const WCHAR *fmt, va_list va_args) { WCHAR *str; DWORD len; @@ -92,7 +92,7 @@ void WINAPIV output_message(unsigned int id, ...) { WCHAR *fmt = NULL; int len; - __ms_va_list va_args; + va_list va_args; if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) { @@ -106,20 +106,20 @@ void WINAPIV output_message(unsigned int id, ...) LoadStringW(GetModuleHandleW(NULL), id, fmt, len); - __ms_va_start(va_args, id); + va_start(va_args, id); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); free(fmt); } void WINAPIV output_string(const WCHAR *fmt, ...) { - __ms_va_list va_args; + va_list va_args; - __ms_va_start(va_args, fmt); + va_start(va_args, fmt); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); } /* ask_confirm() adapted from programs/cmd/builtins.c */

1 0

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

Oct. 25, 2021

Module: wine Branch: master Commit: bac8aff2934c4dd7a360d604643bde81cc3a97bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bac8aff2934c4dd7a360d604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:02 2021 +0200 icinfo: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 25b847b5a36..01ddbfb6833 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -26,14 +26,14 @@ static int WINAPIV mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; static WCHAR output_bufW[sizeof(output_bufA)]; - __ms_va_list parms; + va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); - __ms_va_start(parms, format); + va_start(parms, format); vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); - __ms_va_end(parms); + va_end(parms); /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3)

1 0