October 2021 - Wine-commits

Alexandre Julliard : winetest: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

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 : wmic: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

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 : xcopy: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

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 : makefiles: Don't try to link a library to itself.
by Alexandre Julliard 25 Oct '21

25 Oct '21

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

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

25 Oct '21

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

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

25 Oct '21

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

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

25 Oct '21

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

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

25 Oct '21

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 : ntdll: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard 25 Oct '21

25 Oct '21

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 : libs/wine: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 24b26f8bd6a49c855eec417a6585d44c9458e3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b26f8bd6a49c855eec417a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:16:23 2021 +0200 libs/wine: 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> --- libs/wine/config.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index cb42421c168..23c76fda128 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -28,8 +28,12 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <limits.h> #include <sys/types.h> #include <sys/stat.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -56,8 +60,6 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; -#elif defined (__FreeBSD__) || defined(__DragonFly__) -static const char exe_link[] = "/proc/curproc/file"; #else static const char exe_link[] = ""; #endif @@ -141,8 +143,18 @@ static char *symlink_dirname( const char *name ) /* return the directory that contains the main exe at run-time */ static char *get_runtime_exedir(void) { +#if defined(__FreeBSD__) || defined(__DragonFly__) + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t dir_size = PATH_MAX; + char *dir = malloc( dir_size ); + if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + return dir; + free( dir ); + return NULL; +#else if (exe_link[0]) return symlink_dirname( exe_link ); return NULL; +#endif } /* return the base directory from argv0 */

1 0