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

Zebediah Figura : configure: Check for a recent enough version of libusb.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 106d803db1962bdc7a9161d9a88ef88bb4fd0d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=106d803db1962bdc7a9161d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 21 23:55:12 2020 -0500 configure: Check for a recent enough version of libusb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 +++++++++++++------------- configure.ac | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 6c4a5f21b5..0b411702a7 100755 --- a/configure +++ b/configure @@ -13941,9 +13941,9 @@ ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $USB_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default" if test "x$ac_cv_header_libusb_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5 -$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; } -if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_interrupt_event_handler in -lusb-1.0" >&5 +$as_echo_n "checking for libusb_interrupt_event_handler in -lusb-1.0... " >&6; } +if ${ac_cv_lib_usb_1_0_libusb_interrupt_event_handler+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13957,27 +13957,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char libusb_init (); +char libusb_interrupt_event_handler (); int main () { -return libusb_init (); +return libusb_interrupt_event_handler (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_usb_1_0_libusb_init=yes + ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=yes else - ac_cv_lib_usb_1_0_libusb_init=no + ac_cv_lib_usb_1_0_libusb_interrupt_event_handler=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_init" >&5 -$as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; } -if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&5 +$as_echo "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" >&6; } +if test "x$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" = xyes; then : : else USB_LIBS="" @@ -13993,11 +13993,11 @@ test -z "$USB_CFLAGS" || USB_CFLAGS=`echo " $USB_CFLAGS" | sed 's/ -I$[^/]$/ - test -z "$USB_LIBS" || USB_LIBS=`echo " $USB_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"; then : +if test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"; then : case "x$with_usb" in - x) as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported." ;; + x) as_fn_append wine_notices "|libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported." ;; xno) ;; - *) as_fn_error $? "libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported. + *) as_fn_error $? "libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported. This is an error since --with-usb was requested." "$LINENO" 5 ;; esac enable_wineusb_sys=${enable_wineusb_sys:-no} diff --git a/configure.ac b/configure.ac index 37e3445a34..00b3f38d4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1480,11 +1480,11 @@ if test "x$with_usb" != "xno" then WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,, [AC_CHECK_HEADER([libusb.h], - [AC_CHECK_LIB(usb-1.0,libusb_init,[:],[USB_LIBS=""],[$USB_LIBS])], + [AC_CHECK_LIB(usb-1.0,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])], [USB_LIBS=""])]) fi -WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"], - [libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.], +WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"], + [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.], [enable_wineusb_sys]) dnl **** Check for libv4l2 ****

1 0

Roman Pišl : wineconsole: Don't activate window when computing positions.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 8d8eab04fbe6f0af1e0768682c8f6178989f0177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d8eab04fbe6f0af1e076868… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Apr 21 22:09:07 2020 +0200 wineconsole: Don't activate window when computing positions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48740 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 212c65cee4..de3f4ae98c 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -253,7 +253,7 @@ static void WCUSER_ComputePositions(struct inner_data* data) } SetWindowPos(data->hWnd, 0, 0, 0, r.right - r.left + dx, r.bottom - r.top + dy, - SWP_NOMOVE|SWP_NOZORDER); + SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); }

1 0

Roman Pišl : wineconsole: Don't allow recurrent resizing while grabbing changes.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 3d2277e04a7438cd25ad8cb7325bbb6773a18ec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2277e04a7438cd25ad8cb7… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Apr 21 22:09:55 2020 +0200 wineconsole: Don't allow recurrent resizing while grabbing changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 4b65e68939..38a8c71163 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -92,7 +92,7 @@ void WINECON_ResizeWithContainer(struct inner_data* data, int width, int height) { struct config_data cfg; - if (data->in_set_config) return; + if (data->in_set_config || data->in_grab_changes) return; cfg = data->curcfg; cfg.win_width = width;

1 0

Francois Gouget : appwiz.cpl: Rename ARCH_STRING to GECKO_ARCH.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: c2e3c8ec93e92278ce722b94956ea390c77f09f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e3c8ec93e92278ce722b94… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 22 00:36:47 2020 +0200 appwiz.cpl: Rename ARCH_STRING to GECKO_ARCH. This is less ambiguous and matches the MONO naming scheme. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index d73b72a773..0047278c73 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -46,15 +46,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_VERSION "2.47.1" - #ifdef __i386__ -#define ARCH_STRING "x86" +#define GECKO_ARCH "x86" #define GECKO_SHA "f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051" #elif defined(__x86_64__) -#define ARCH_STRING "x86_64" +#define GECKO_ARCH "x86_64" #define GECKO_SHA "69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a" #else -#define ARCH_STRING "" +#define GECKO_ARCH "" #define GECKO_SHA "???" #endif @@ -85,7 +84,7 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - L"wine-gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"wine-gecko-" GECKO_VERSION "-" GECKO_ARCH ".msi", L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", @@ -623,7 +622,7 @@ static void append_url_params( WCHAR *url ) memcpy(url+len, arch_formatW, sizeof(arch_formatW)); len += ARRAY_SIZE(arch_formatW); - len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), + len += MultiByteToWideChar(CP_ACP, 0, GECKO_ARCH, sizeof(GECKO_ARCH), url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); len += ARRAY_SIZE(v_formatW); @@ -767,7 +766,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA BOOL install_addon(addon_t addon_type) { - if(!*ARCH_STRING) + if(!*GECKO_ARCH) return FALSE; addon = addons_info+addon_type;

1 0

Zhiyi Zhang : winex11.drv: Allocate LUID for GPUs.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: de94f8a1d6804b3629b3f5f841bd0bfeb375cbdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=de94f8a1d6804b3629b3f5f8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 20:12:30 2020 +0800 winex11.drv: Allocate LUID for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ad74c9b4e..4429cb8922 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -278,9 +280,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR bufferW[1024]; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -306,6 +310,20 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), + wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL);

1 0

Zhiyi Zhang : winemac.drv: Allocate LUID for GPUs.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 31b112e718448ba18ad3127fae3b860dae7c7632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b112e718448ba18ad3127f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 20:12:43 2020 +0800 winemac.drv: Allocate LUID for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4c610c4573..851d549d5f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -51,6 +51,8 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -1313,11 +1315,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR nameW[MAX_PATH]; WCHAR bufferW[1024]; FILETIME filetime; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -1343,6 +1347,20 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), gpu->name, + luid.HighPart, luid.LowPart); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL);

1 0

Alexandre Julliard : ntdll: Call TLS callbacks also for the main exe.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 6f4272ce3e74f2d30f45bf0d407cdc9264b813a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f4272ce3e74f2d30f45bf0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 14:14:06 2020 +0200 ntdll: Call TLS callbacks also for the main exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48971 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 65f9d3f298..e26b9d6b7f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4028,6 +4028,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); + if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, DLL_PROCESS_ATTACH ); if (wm->so_handle) call_constructors( wm ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); }

1 0

Alexandre Julliard : ntdll: The builtin load callback is no longer used for ntdll itself.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 68e675d73db4fb90fff84c0e1f6de3b492061b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e675d73db4fb90fff84c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:50:44 2020 +0200 ntdll: The builtin load callback is no longer used for ntdll itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e26b9d6b7f..b457d60f6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2058,21 +2058,14 @@ static NTSTATUS build_so_dll_module( const WCHAR *load_path, const UNICODE_STRIN */ static void load_builtin_callback( void *module, const char *filename ) { - static const WCHAR emptyW[1]; - const WCHAR *load_path; - if (!module) { ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); builtin_load_info->status = STATUS_NO_MEMORY; return; } - - load_path = builtin_load_info->load_path; - if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (!load_path) load_path = emptyW; - - builtin_load_info->status = build_so_dll_module( load_path, builtin_load_info->filename, module, + builtin_load_info->status = build_so_dll_module( builtin_load_info->load_path, + builtin_load_info->filename, module, 0, &builtin_load_info->wm ); } @@ -4482,7 +4475,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - HMODULE ntdll_module; + HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4512,15 +4505,11 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ RtlInitUnicodeString( &nt_name, ntdllW ); - default_load_info.filename = &nt_name; + map_so_dll( &__wine_spec_nt_header, ntdll_module ); + status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); + assert( !status ); + wine_dll_set_callback( load_builtin_callback ); - ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); - if (!get_modref( ntdll_module )) - { - map_so_dll( &__wine_spec_nt_header, ntdll_module ); - status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); - assert( !status ); - } RtlInitUnicodeString( &nt_name, kernel32W ); if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS)

1 0

Alexandre Julliard : ntdll: Add a helper function to allocate module dependencies.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: d2b70aa57a77103107a2e620999181c518d14bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b70aa57a77103107a2e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 16:01:55 2020 +0200 ntdll: Add a helper function to allocate module dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b457d60f6b..04ea7ea121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -599,6 +599,27 @@ static WINE_MODREF *find_so_module( void *handle ) } +/************************************************************************* + * grow_module_deps + */ +static WINE_MODREF **grow_module_deps( WINE_MODREF *wm, int count ) +{ + WINE_MODREF **deps; + + if (wm->alloc_deps) + deps = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, wm->deps, + (wm->alloc_deps + count) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(*deps) ); + + if (deps) + { + wm->deps = deps; + wm->alloc_deps += count; + } + return deps; +} + /************************************************************************* * find_forwarded_export * @@ -632,18 +653,8 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS { if (!imports_fixup_done && current_modref) { - WINE_MODREF **deps; - if (current_modref->alloc_deps) - deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, - (current_modref->alloc_deps + 1) * sizeof(*deps) ); - else - deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); - if (deps) - { - deps[current_modref->nDeps++] = wm; - current_modref->deps = deps; - current_modref->alloc_deps++; - } + WINE_MODREF **deps = grow_module_deps( current_modref, 1 ); + if (deps) deps[current_modref->nDeps++] = wm; } else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { @@ -1087,9 +1098,8 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + if (!grow_module_deps( wm, 1 )) return STATUS_NO_MEMORY; wm->nDeps = 1; - wm->alloc_deps = 1; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); prev = current_modref; current_modref = wm; @@ -1144,14 +1154,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) while (imports[nb_imports].Name && imports[nb_imports].FirstThunk) nb_imports++; if (!nb_imports) return STATUS_SUCCESS; /* no imports */ + if (!grow_module_deps( wm, nb_imports )) return STATUS_NO_MEMORY; if (!create_module_activation_context( &wm->ldr )) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); - /* Allocate module dependency list */ - wm->alloc_deps = nb_imports; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); - /* load the imported modules. They are automatically * added to the modref list of the process. */

1 0

Jacek Caban : server: Don't change context flags in copy_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 89b4bdd6cd173db729f6ef9f8389a40d463ded68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b4bdd6cd173db729f6ef9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:01 2020 +0200 server: Don't change context flags in copy_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index 9c22d83a9d..0d3cb28f5c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1202,7 +1202,6 @@ void kill_thread( struct thread *thread, int violent_death ) static void copy_context( context_t *to, const context_t *from, unsigned int flags ) { assert( to->cpu == from->cpu ); - to->flags |= flags; if (flags & SERVER_CTX_CONTROL) to->ctl = from->ctl; if (flags & SERVER_CTX_INTEGER) to->integer = from->integer; if (flags & SERVER_CTX_SEGMENTS) to->seg = from->seg; @@ -1776,7 +1775,11 @@ DECL_HANDLER(get_thread_context) memset( context, 0, sizeof(context_t) ); context->cpu = thread->process->cpu; - if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); + if (thread->context) + { + copy_context( context, thread->context, req->flags & ~flags ); + context->flags |= req->flags & ~flags; + } if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); } release_object( thread ); @@ -1818,7 +1821,11 @@ DECL_HANDLER(set_thread_context) unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); - if (thread->context && !get_error()) copy_context( thread->context, context, client_flags ); + if (thread->context && !get_error()) + { + copy_context( thread->context, context, client_flags ); + thread->context->flags |= client_flags; + } } else set_error( STATUS_INVALID_PARAMETER );

1 0