May 2020 - Wine-commits - list.winehq.org

Martin Storsjo : ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 93ecc54ae560a3677dfa78ca0f5448d7aef0cbd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ecc54ae560a3677dfa78ca… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:28 2020 +0300 ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64. This fixes crashes when handling GNU/mingw style SEH based C++ exceptions on arm64; in these cases unwind_full_data ended up where it tries to write handler_rva + 1 to *handler_data. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 30d445b408..e81ea8f82e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1843,7 +1843,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, &frame, + NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; } @@ -1866,7 +1867,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, + &frame, NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; }

1 0

Martin Storsjo : ntdll: Properly restore x29/x30 for arm64 packed unwind data with local stack.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 5f14b6357b8fefcd390f52b0c7a50790e5361976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f14b6357b8fefcd390f52b0… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:29 2020 +0300 ntdll: Properly restore x29/x30 for arm64 packed unwind data with local stack. For the CR == 3 case, x29/x30 should be restored from x29, not from sp, which may have been decremented further for local stack storage. This fixes uwinding the stack for C++ exceptions in code generated by MSVC. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e81ea8f82e..4c5944759f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1558,7 +1558,12 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (!skip) { - if (func->u.s.CR == 3) restore_regs( 29, 2, 0, context, ptrs ); + if (func->u.s.CR == 3) + { + DWORD64 *fp = (DWORD64 *) context->u.s.Fp; /* u.X[29] */ + context->u.X[29] = fp[0]; + context->u.X[30] = fp[1]; + } context->Sp += local_size; if (fp_size) restore_fpregs( 8, fp_size / 8, int_size, context, ptrs ); if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs );

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output when handling WM_ACTIVATEAPP with full screen swapchains.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 7962c3194ec7c4706cda8f54962a9996dfc7313a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7962c3194ec7c4706cda8f54… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 15 15:45:51 2020 +0800 wined3d: Move device window to the correct output when handling WM_ACTIVATEAPP with full screen swapchains. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dbbfc8e72c..21e9ec459e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1239,9 +1239,11 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + struct wined3d_output_desc output_desc; unsigned int screensaver_active; struct wined3d_output *output; BOOL focus_messages, filter; + HRESULT hr; /* This code is not protected by the wined3d mutex, so it may run while * wined3d_device_reset is active. Testing on Windows shows that changing @@ -1251,6 +1253,13 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (!(focus_messages = device->wined3d->flags & WINED3D_FOCUS_MESSAGES)) filter = wined3d_filter_messages(window, TRUE); + output = wined3d_swapchain_get_output(swapchain); + if (!output) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return; + } + if (activate) { SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); @@ -1266,16 +1275,19 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa * * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to * resume drawing after a focus loss. */ - SetWindowPos(window, NULL, 0, 0, swapchain->state.desc.backbuffer_width, - swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); + if (SUCCEEDED(hr = wined3d_output_get_desc(output, &output_desc))) + SetWindowPos(window, NULL, output_desc.desktop_rect.left, + output_desc.desktop_rect.top, swapchain->state.desc.backbuffer_width, + swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); + else + ERR("Failed to get output description, hr %#x.\n", hr); } if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(wined3d_output_set_display_mode(output, + if (FAILED(hr = wined3d_output_set_display_mode(output, &swapchain->state.d3d_mode))) - ERR("Failed to set display mode.\n"); + ERR("Failed to set display mode, hr %#x.\n", hr); } if (swapchain == device->swapchains[0]) @@ -1289,9 +1301,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa device->restore_screensaver = FALSE; } - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(wined3d_output_set_display_mode(output, NULL))) - ERR("Failed to set display mode.\n"); + if (FAILED(hr = wined3d_output_set_display_mode(output, NULL))) + ERR("Failed to set display mode, hr %#x.\n", hr); swapchain->reapply_mode = TRUE;

1 0

Alexandre Julliard : ntdll: Move the Wine version functions to the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 9b8afa0f83f2fc576723a0262ee17f32055b25d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8afa0f83f2fc576723a026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:09:30 2020 +0200 ntdll: Move the Wine version functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 8 ++++++++ dlls/ntdll/misc.c | 24 +++--------------------- dlls/ntdll/unix/loader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 5 +++++ tools/makedep.c | 5 ++++- 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index f1ecb395e3..ebf607e9d4 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -59,9 +59,17 @@ C_SRCS = \ RC_SRCS = version.rc +EXTRA_OBJS = unix/version.o + server_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DDLLDIR=\"${dlldir}\" \ -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + +unix/version.c: dummy + version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) + +dummy: +.PHONY: dummy diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index c29a1c26c2..fd9ba49113 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -23,13 +23,9 @@ #include <time.h> #include <math.h> -#ifdef HAVE_SYS_UTSNAME_H -#include <sys/utsname.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "wmistr.h" @@ -57,7 +53,7 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) */ const char * CDECL NTDLL_wine_get_version(void) { - return wine_get_version(); + return unix_funcs->get_version(); } /********************************************************************* @@ -65,7 +61,7 @@ const char * CDECL NTDLL_wine_get_version(void) */ const char * CDECL NTDLL_wine_get_build_id(void) { - return wine_get_build_id(); + return unix_funcs->get_build_id(); } /********************************************************************* @@ -73,21 +69,7 @@ const char * CDECL NTDLL_wine_get_build_id(void) */ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **release ) { -#ifdef HAVE_SYS_UTSNAME_H - static struct utsname buf; - static BOOL init_done; - - if (!init_done) - { - uname( &buf ); - init_done = TRUE; - } - if (sysname) *sysname = buf.sysname; - if (release) *release = buf.release; -#else - if (sysname) *sysname = ""; - if (release) *release = ""; -#endif + return unix_funcs->get_host_version( sysname, release ); } /********************************************************************* diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fdcca55beb..a8e7530c0c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_UTSNAME_H +#include <sys/utsname.h> +#endif #ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # define LoadResource MacLoadResource @@ -101,6 +104,48 @@ static void fixup_so_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int d } +/********************************************************************* + * get_version + */ +const char * CDECL get_version(void) +{ + return PACKAGE_VERSION; +} + + +/********************************************************************* + * get_build_id + */ +const char * CDECL get_build_id(void) +{ + extern const char wine_build[]; + return wine_build; +} + + +/********************************************************************* + * get_host_version + */ +void CDECL get_host_version( const char **sysname, const char **release ) +{ +#ifdef HAVE_SYS_UTSNAME_H + static struct utsname buf; + static BOOL init_done; + + if (!init_done) + { + uname( &buf ); + init_done = TRUE; + } + if (sysname) *sysname = buf.sysname; + if (release) *release = buf.release; +#else + if (sysname) *sysname = ""; + if (release) *release = ""; +#endif +} + + /************************************************************************* * map_so_dll * @@ -379,6 +424,9 @@ static HMODULE load_ntdll(void) */ static struct unix_funcs unix_funcs = { + get_version, + get_build_id, + get_host_version, map_so_dll, mmap_add_reserved_area, mmap_remove_reserved_area, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 753dea6acc..62ba2615ba 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,6 +28,11 @@ struct unix_funcs { + /* environment functions */ + const char * (CDECL *get_version)(void); + const char * (CDECL *get_build_id)(void); + void (CDECL *get_host_version)( const char **sysname, const char **release ); + /* virtual memory functions */ NTSTATUS (CDECL *map_so_dll)( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ); void (CDECL *mmap_add_reserved_area)( void *addr, SIZE_T size ); diff --git a/tools/makedep.c b/tools/makedep.c index 193de2d4d8..cde07f669c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1969,7 +1969,10 @@ static void add_generated_sources( struct makefile *make ) { /* default to .c for unknown extra object files */ if (strendswith( objs.str[i], ".o" )) - add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + { + file = add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + if (make->module || make->staticlib) file->file->flags |= FLAG_C_UNIX; + } else if (strendswith( objs.str[i], ".res" )) add_generated_source( make, replace_extension( objs.str[i], ".res", ".rc" ), NULL ); else

1 0

Alexandre Julliard : ntdll: Do the pre-exec checks in the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 50134cce826de71afeb1d30a366364f57ec9769a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50134cce826de71afeb1d30a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:11:28 2020 +0200 ntdll: Do the pre-exec checks in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ loader/main.c | 16 +++--- 2 files changed, 142 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8e7530c0c..73dfb7b6c7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -26,11 +26,15 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <stdarg.h> #include <stdio.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_SYS_UTSNAME_H #include <sys/utsname.h> #endif @@ -558,6 +562,121 @@ static void apple_main_thread(void) } #endif /* __APPLE__ */ + +#ifdef __ANDROID__ + +static int pre_exec(void) +{ +#if defined(__i386__) || defined(__x86_64__) + return 1; /* we have a preloader */ +#else + return 0; /* no exec needed */ +#endif +} + +#elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) + +static void check_vmsplit( void *stack ) +{ + if (stack < (void *)0x80000000) + { + /* if the stack is below 0x80000000, assume we can safely try a munmap there */ + if (munmap( (void *)0x80000000, 1 ) == -1 && errno == EINVAL) + ERR( "Warning: memory above 0x80000000 doesn't seem to be accessible.\n" + "Wine requires a 3G/1G user/kernel memory split to work properly.\n" ); + } +} + +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + +static int pre_exec(void) +{ + int temp; + + check_vmsplit( &temp ); + set_max_limit( RLIMIT_AS ); +#ifdef __i386__ + return 1; /* we have a preloader on x86 */ +#else + return 0; +#endif +} + +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) + +static int pre_exec(void) +{ + return 1; /* we have a preloader on x86-64/arm64 */ +} + +#elif defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)) + +static int pre_exec(void) +{ + return 1; /* we have a preloader */ +} + +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) + +static int pre_exec(void) +{ + struct rlimit rl; + + rl.rlim_cur = 0x02000000; + rl.rlim_max = 0x02000000; + setrlimit( RLIMIT_DATA, &rl ); + return 1; +} + +#else + +static int pre_exec(void) +{ + return 0; /* no exec needed */ +} + +#endif + + +/*********************************************************************** + * check_command_line + * + * Check if command line is one that needs to be handled specially. + */ +static void check_command_line( int argc, char *argv[] ) +{ + static const char usage[] = + "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" + " wine --help Display this help and exit\n" + " wine --version Output version information and exit"; + + if (argc <= 1) + { + fprintf( stderr, "%s\n", usage ); + exit(1); + } + if (!strcmp( argv[1], "--help" )) + { + printf( "%s\n", usage ); + exit(0); + } + if (!strcmp( argv[1], "--version" )) + { + printf( "%s\n", get_build_id() ); + exit(0); + } +} + + /*********************************************************************** * __wine_main * @@ -571,6 +690,21 @@ void __wine_main( int argc, char *argv[], char *envp[] ) HMODULE module; wine_init_argv0_path( argv[0] ); + + if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ + { + static char noexec[] = "WINELOADERNOEXEC=1"; + + putenv( noexec ); + check_command_line( argc, argv ); + if (pre_exec()) + { + wine_exec_wine_binary( NULL, argv, getenv( "WINELOADER" )); + ERR( "could not exec the wine loader\n" ); + exit(1); + } + } + __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_environ = envp; diff --git a/loader/main.c b/loader/main.c index 9f9165ff93..0e6b6f66b5 100644 --- a/loader/main.c +++ b/loader/main.c @@ -279,6 +279,14 @@ int main( int argc, char *argv[] ) int i; void *handle; + if ((handle = load_ntdll( argv[0] ))) + { + void (*init_func)(int, char **, char **) = dlsym( handle, "__wine_main" ); + if (init_func) init_func( argc, argv, environ ); + fprintf( stderr, "wine: __wine_main function not found in ntdll.so\n" ); + exit(1); + } + if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ { static char noexec[] = "WINELOADERNOEXEC=1"; @@ -294,14 +302,6 @@ int main( int argc, char *argv[] ) } } - if ((handle = load_ntdll( argv[0] ))) - { - void (*init_func)(int, char **, char **) = dlsym( handle, "__wine_main" ); - if (init_func) init_func( argc, argv, environ ); - fprintf( stderr, "wine: __wine_main function not found in ntdll.so\n" ); - exit(1); - } - if (wine_main_preload_info) { for (i = 0; wine_main_preload_info[i].size; i++)

1 0

Alexandre Julliard : ntdll: Store main() arguments in the Unix library.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 45a63e5b3ce0e5d7fcc55ce57f315086b87f8ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a63e5b3ce0e5d7fcc55ce5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:44:16 2020 +0200 ntdll: Store main() arguments in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 21 ++++++++------------- dlls/ntdll/loader.c | 10 ++++++---- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/ntdll/unixlib.h | 3 ++- 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 3acf7f52d5..5ba3c7c7b3 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -61,13 +61,6 @@ static inline SIZE_T get_env_length( const WCHAR *env ) return end + 1 - env; } -#ifdef __APPLE__ -extern char **__wine_get_main_environment(void); -#else -extern char **__wine_main_environ; -static char **__wine_get_main_environment(void) { return __wine_main_environ; } -#endif - /*********************************************************************** * is_special_env_var @@ -779,8 +772,6 @@ static void set_library_wargv( char **argv, const UNICODE_STRING *image ) total -= reslen; } wargv[argc] = NULL; - - __wine_main_argc = argc; __wine_main_wargv = wargv; } @@ -1465,6 +1456,10 @@ void init_user_process_params( SIZE_T data_size ) startup_info_t *info = NULL; RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; + int argc; + char **argv, **envp; + + unix_funcs->get_main_args( &argc, &argv, &envp ); if (!data_size) { @@ -1472,13 +1467,13 @@ void init_user_process_params( SIZE_T data_size ) WCHAR *env, curdir_buffer[MAX_PATH]; NtCurrentTeb()->Peb->ProcessParameters = &initial_params; - initial_params.Environment = build_initial_environment( __wine_get_main_environment() ); + initial_params.Environment = build_initial_environment( envp ); curdir.Buffer = curdir_buffer; curdir.MaximumLength = sizeof(curdir_buffer); get_current_directory( &curdir ); initial_params.CurrentDirectory.DosPath = curdir; - get_image_path( __wine_main_argv[0], &initial_params.ImagePathName ); - set_library_wargv( __wine_main_argv, &initial_params.ImagePathName ); + get_image_path( argv[0], &initial_params.ImagePathName ); + set_library_wargv( argv, &initial_params.ImagePathName ); build_command_line( __wine_main_wargv, &cmdline ); LdrGetDllPath( initial_params.ImagePathName.Buffer, 0, &load_path, &dummy ); RtlInitUnicodeString( &dllpath, load_path ); @@ -1566,7 +1561,7 @@ void init_user_process_params( SIZE_T data_size ) else params->Environment[0] = 0; } - set_library_wargv( __wine_main_argv, NULL ); + set_library_wargv( argv, NULL ); done: RtlFreeHeap( GetProcessHeap(), 0, info ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 35dc7e1eaa..fa65ae1e9f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1324,11 +1324,12 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) static void call_constructors( WINE_MODREF *wm ) { #ifdef HAVE_DLINFO - extern char **__wine_main_environ; struct link_map *map; void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL; ULONG_PTR i, init_arraysz = 0; + int argc; + char **argv, **envp; #ifdef _WIN64 const Elf64_Dyn *dyn; #else @@ -1351,11 +1352,12 @@ static void call_constructors( WINE_MODREF *wm ) TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), init_func, init_array, init_arraysz ); - if (init_func) init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + unix_funcs->get_main_args( &argc, &argv, &envp ); + + if (init_func) init_func( argc, argv, envp ); if (init_array) - for (i = 0; i < init_arraysz / sizeof(*init_array); i++) - init_array[i]( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + for (i = 0; i < init_arraysz / sizeof(*init_array); i++) init_array[i]( argc, argv, envp ); #endif } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 73dfb7b6c7..ebe143ca97 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -65,6 +65,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); extern IMAGE_NT_HEADERS __wine_spec_nt_header; extern void CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ); +extern int __wine_main_argc; +extern char **__wine_main_argv; +extern char **__wine_main_environ; + +static int main_argc; +static char **main_argv; +static char **main_envp; + static inline void *get_rva( const IMAGE_NT_HEADERS *nt, ULONG_PTR addr ) { return (BYTE *)nt + addr; @@ -150,6 +158,19 @@ void CDECL get_host_version( const char **sysname, const char **release ) } +/************************************************************************* + * get_main_args + * + * Return the initial arguments. + */ +static void CDECL get_main_args( int *argc, char **argv[], char **envp[] ) +{ + *argc = main_argc; + *argv = main_argv; + *envp = main_envp; +} + + /************************************************************************* * map_so_dll * @@ -428,6 +449,7 @@ static HMODULE load_ntdll(void) */ static struct unix_funcs unix_funcs = { + get_main_args, get_version, get_build_id, get_host_version, @@ -684,9 +706,6 @@ static void check_command_line( int argc, char *argv[] ) */ void __wine_main( int argc, char *argv[], char *envp[] ) { - extern int __wine_main_argc; - extern char **__wine_main_argv; - extern char **__wine_main_environ; HMODULE module; wine_init_argv0_path( argv[0] ); @@ -705,9 +724,9 @@ void __wine_main( int argc, char *argv[], char *envp[] ) } } - __wine_main_argc = argc; - __wine_main_argv = argv; - __wine_main_environ = envp; + __wine_main_argc = main_argc = argc; + __wine_main_argv = main_argv = argv; + __wine_main_environ = main_envp = envp; virtual_init(); module = load_ntdll(); @@ -734,6 +753,15 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void { const IMAGE_NT_HEADERS *nt = ptr_in; +#ifdef __APPLE__ + extern char **__wine_get_main_environment(void); + main_envp = __wine_get_main_environment(); +#else + main_envp = __wine_main_environ; +#endif + main_argc = __wine_main_argc; + main_argv = __wine_main_argv; + map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); *(struct unix_funcs **)ptr_out = &unix_funcs; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 62ba2615ba..12e7aa0265 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -24,11 +24,12 @@ #include "wine/debug.h" /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 3 +#define NTDLL_UNIXLIB_VERSION 4 struct unix_funcs { /* environment functions */ + void (CDECL *get_main_args)( int *argc, char **argv[], char **envp[] ); const char * (CDECL *get_version)(void); const char * (CDECL *get_build_id)(void); void (CDECL *get_host_version)( const char **sysname, const char **release );

1 0

Francois Gouget : windowscodecs/tests: Fix the spelling of a couple of variable names.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: fe2435c93f1400c5fbc360821fe8d1c977aaa762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2435c93f1400c5fbc36082… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:08 2020 +0200 windowscodecs/tests: Fix the spelling of a couple of variable names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- dlls/windowscodecs/tests/tiffformat.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 209d39f11f..bc22cc5072 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -234,16 +234,16 @@ static void test_dds_decoder_initialize(void) static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) { HRESULT hr; - IWICPalette *pallette = NULL; + IWICPalette *palette = NULL; IWICMetadataQueryReader *metadata_reader = NULL; IWICBitmapSource *preview = NULL, *thumnail = NULL; IWICColorContext *color_context = NULL; UINT count; - hr = IWICImagingFactory_CreatePalette(factory, &pallette); + hr = IWICImagingFactory_CreatePalette(factory, &palette); ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); if (hr == S_OK) { - hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); @@ -269,7 +269,7 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); - if (pallette) IWICPalette_Release(pallette); + if (palette) IWICPalette_Release(palette); if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader); if (preview) IWICBitmapSource_Release(preview); if (color_context) IWICColorContext_Release(color_context); diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 4769b9c8d2..b9d60de8a1 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -402,7 +402,7 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma return hr; } -static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *trasparency) +static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *transparency) { HRESULT hr; IWICComponentInfo *info; @@ -415,7 +415,7 @@ static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channel hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo2, (void **)&formatinfo); if (hr == S_OK) { - hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, trasparency); + hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, transparency); ok(hr == S_OK, "SupportsTransparency error %#x\n", hr); IWICPixelFormatInfo2_Release(formatinfo); } @@ -1093,7 +1093,7 @@ static void test_color_formats(void) IWICBitmapFrameDecode *frame; GUID format; UINT count, i, bpp, channels, ret; - BOOL trasparency; + BOOL transparency; struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL; struct IFD_entry *tag_width = NULL, *tag_height = NULL, *tag_extra_samples = NULL; short *bps; @@ -1236,12 +1236,12 @@ static void test_color_formats(void) i, td[i].photometric, td[i].samples, td[i].extra_samples, td[i].bps, wine_dbgstr_guid(td[i].data->format), wine_dbgstr_guid(&format)); - trasparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */ - hr = get_pixelformat_info(&format, &bpp, &channels, &trasparency); + transparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */ + hr = get_pixelformat_info(&format, &bpp, &channels, &transparency); ok(hr == S_OK, "%u: get_pixelformat_bpp error %#x\n", i, hr); ok(bpp == td[i].data->bpp, "%u: expected %u, got %u\n", i, td[i].data->bpp, bpp); ok(channels == td[i].samples, "%u: expected %u, got %u\n", i, td[i].samples, channels); - ok(trasparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, trasparency); + ok(transparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, transparency); memset(pixels, 0, sizeof(pixels)); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, width_bytes(td[i].data->width, bpp), sizeof(pixels), pixels);

1 0

Francois Gouget : msvcrt: Fix a couple of spelling errors in comments.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 10bfa512df7e8fbcdf8d4e2e2f205dd9c72076ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfa512df7e8fbcdf8d4e2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:21 2020 +0200 msvcrt: Fix a couple of spelling errors in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 407f819884..7baf8eee8e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -864,7 +864,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(b.data[BNUM_IDX(b.b)]) break; } - /* move decimal point to limb boundry */ + /* move decimal point to limb boundary */ if(limb_digits==dp && b.b==b.e-1) return make_double(sign, 0, b.data[BNUM_IDX(b.e-1)], ROUND_ZERO, err); off = (dp - limb_digits) % LIMB_DIGITS; @@ -893,7 +893,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } /* Check if fractional part is non-zero */ - /* Caution: it's only correct because bnum_to_mant returns more then 53 bits */ + /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ for(i=b.e-3; i>=b.b; i--) { if (!b.data[BNUM_IDX(b.b)]) continue; round = ROUND_DOWN;

1 0

Emilio Cobos Álvarez : widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: b1084ff910864a44d6fd0e0bda6b2b6c64987b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1084ff910864a44d6fd0e0b… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Sun May 17 01:02:04 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49173 Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a1db88a7c0..04280cbb72 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4813,20 +4813,21 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; else type_memsize_and_alignment( arg->declspec.type, &align ); - if (align >= pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); + if (align < pointer_size) + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + fprintf( file, "%s;\n", arg->name ); } if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, &retval->declspec, retval->name ); - if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || - type_memsize( retval->declspec.type ) == pointer_size) - fprintf( file, ";\n" ); - else - fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); + write_type_left( file, &retval->declspec, NAME_DEFAULT, TRUE, TRUE ); + if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); + if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && + type_memsize( retval->declspec.type ) != pointer_size) + { + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + } + fprintf( file, "%s;\n", retval->name ); } print_file(file, 1, "} %s;\n", var_decl ); if (needs_packing) print_file( file, 0, "#include <poppack.h>\n" );

1 0

Jacek Caban : makedep: Install also generated typelib for installed idl files.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 7a1a77b6765801b1375491602661d466ec2fee0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1a77b6765801b137549160… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 17 01:02:36 2020 +0200 makedep: Install also generated typelib for installed idl files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index cde07f669c..653c5488e1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2829,6 +2829,9 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, if (source->file->flags & FLAG_IDL_HEADER) add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); + if (source->file->flags & FLAG_IDL_TYPELIB) + add_install_rule( make, source->name, strmake( "%s.tlb", obj ), + strmake( "d$(includedir)/wine/%s.tlb", get_include_install_path( obj ) )); } if (!targets.count) return;

1 0