October 2021 - Wine-Commits

Robert Wilhelm : oleaut32: Rescale result after overflow in VarDecAdd.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: b440573d2a9228495a4814ccba0483e05bab14e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b440573d2a9228495a4814cc… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 12 22:25:08 2021 +0200 oleaut32: Rescale result after overflow in VarDecAdd. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bf31fde2b7a..995fd254208 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3967,14 +3967,14 @@ static void test_VarDecAdd(void) S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC64(l,1,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,1,0,0,1); MATH2(VarDecAdd); - todo_wine EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); + EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); SETDEC64(l,0,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,0,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC64(l,1,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,1,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); - todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); + EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index dfdb0a15c51..0c6249d48db 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4643,6 +4643,43 @@ VarDecAdd_AsPositive: DEC_LO32(pDecOut) = VARIANT_Add(DEC_LO32(pDecLeft), DEC_LO32(pDecRight), &overflow); DEC_MID32(pDecOut) = VARIANT_Add(DEC_MID32(pDecLeft), DEC_MID32(pDecRight), &overflow); DEC_HI32(pDecOut) = VARIANT_Add(DEC_HI32(pDecLeft), DEC_HI32(pDecRight), &overflow); + + if (overflow) + { + int i; + DWORD n[4]; + unsigned char remainder; + + if (!DEC_SCALE(pDecLeft)) + return DISP_E_OVERFLOW; + + DEC_SCALE(pDecOut) = DEC_SCALE(pDecLeft) - 1; + DEC_SIGN(pDecOut) = sign; + + n[0] = DEC_LO32(pDecOut); + n[1] = DEC_MID32(pDecOut); + n[2] = DEC_HI32(pDecOut); + n[3] = overflow; + + remainder = VARIANT_int_divbychar(n,4,10); + + /* round up the result */ + if (remainder >= 5) + { + for (remainder = 1, i = 0; i < ARRAY_SIZE(n) && remainder; i++) + { + ULONGLONG digit = n[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + n[i] = digit & 0xFFFFFFFF; + } + } + + DEC_LO32(pDecOut) = n[0] ; + DEC_MID32(pDecOut) = n[1]; + DEC_HI32(pDecOut) = n[2]; + + return S_OK; + } } if (overflow)

1 0

Dmitry Timoshkov : winex11.drv: Add GPU hardware information values to the registry.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: b54199101fd307199c481709d4b1358ba4bcce58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b54199101fd307199c481709… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 18 16:41:11 2021 +0800 winex11.drv: Add GPU hardware information values to the registry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> 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, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..bf32e82cb3e 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -538,9 +543,9 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g * 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); + size = (strlenW(gpu->name) + 1) * sizeof(WCHAR); /* Write DriverDesc value */ - if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, - (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, size)) goto done; /* Write DriverDateData value, using current time as driver date, needed by Evoland */ GetSystemTimeAsFileTime(&filetime); @@ -551,6 +556,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + /* The following hardware information value type may be REG_BINARY or REG_SZ */ + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_BINARY, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_BINARY, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_BINARY, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) + goto done; RegCloseKey(hkey);

1 0

Zebediah Figura : wined3d: Fully initialize the allocator structure in wined3d_allocator_init().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: b344d1d0913fb7f87c72e7c4693587a78915abef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b344d1d0913fb7f87c72e7c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 17 15:08:30 2021 -0500 wined3d: Fully initialize the allocator structure in wined3d_allocator_init(). Allows the allocator to be uninitialized and reinitialized. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47718c9f710..29326668e07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -7432,5 +7432,7 @@ bool wined3d_allocator_init(struct wined3d_allocator *allocator, list_init(&allocator->pools[i].chunks); } + allocator->free = NULL; + return true; }

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d copy (sub)resource functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 83c9610c4d723c4f1db894572b912a5ac2794442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83c9610c4d723c4f1db89457… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:09 2021 +0200 d3d11: Don't grab wined3d lock for wined3d copy (sub)resource functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d9a75de20e9..36dc442d59f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1343,10 +1343,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopySubresourceRegion(ID3D11D wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); - wined3d_mutex_lock(); wined3d_device_context_copy_sub_resource_region(context->wined3d_context, wined3d_dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_CopyResource(ID3D11DeviceContext1 *iface, @@ -1359,9 +1357,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopyResource(ID3D11DeviceCont wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); - wined3d_mutex_lock(); wined3d_device_context_copy_resource(context->wined3d_context, wined3d_dst_resource, wined3d_src_resource); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_UpdateSubresource(ID3D11DeviceContext1 *iface, @@ -2771,10 +2767,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopySubresourceRegion1(ID3D11 wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); - wined3d_mutex_lock(); wined3d_device_context_copy_sub_resource_region(context->wined3d_context, wined3d_dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, flags); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, @@ -5014,11 +5008,9 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); - wined3d_mutex_lock(); wined3d_device_context_copy_sub_resource_region(device->immediate_context.wined3d_context, wined3d_dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface, @@ -5031,10 +5023,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface, wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); - wined3d_mutex_lock(); wined3d_device_context_copy_resource(device->immediate_context.wined3d_context, wined3d_dst_resource, wined3d_src_resource); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *iface,

1 0

Alistair Leslie-Hughes : powrprof: Add PowerRegisterSuspendResumeNotification stub.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 9d77624d99551168b97fc89b9a41b0c13df6fa76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d77624d99551168b97fc89b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 15 18:31:44 2021 +1100 powrprof: Add PowerRegisterSuspendResumeNotification stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec | 2 +- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec index e51426c4bd0..dd056946ac6 100644 --- a/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec +++ b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall CallNtPowerInformation(long ptr long ptr long) powrprof.CallNtPowerInformation @ stdcall GetPwrCapabilities(ptr) powrprof.GetPwrCapabilities @ stdcall PowerDeterminePlatformRoleEx(long) powrprof.PowerDeterminePlatformRoleEx -@ stub PowerRegisterSuspendResumeNotification +@ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) powrprof.PowerRegisterSuspendResumeNotification @ stub PowerUnregisterSuspendResumeNotification diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index fc6f5706f87..0fd20b9f29b 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -330,6 +330,12 @@ DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) +{ + FIXME("(0x%08x,%p,%p) stub!\n", flags, recipient, handle); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 611e03de3b2..bf12e14a323 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -17,6 +17,7 @@ @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) +@ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e..546e259a39a 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -145,6 +145,7 @@ extern "C" { #endif typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +typedef PVOID HPOWERNOTIFY, *PHPOWERNOTIFY; NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); @@ -159,6 +160,7 @@ BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD, HANDLE, PHPOWERNOTIFY); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0

Paul Gofman : winex11.drv: Detach vulkan surfaces during thread detach.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 6dcaff421f87a93efe18b2efe0ec64d94ed1d483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dcaff421f87a93efe18b2ef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 15 21:50:52 2021 +0300 winex11.drv: Detach vulkan surfaces during thread detach. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 56 +++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 1bbdba2ce1d..4f6624b3db8 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -57,12 +57,16 @@ static XContext vulkan_hwnd_context; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 +static struct list surface_list = LIST_INIT( surface_list ); + struct wine_vk_surface { LONG ref; + struct list entry; Window window; VkSurfaceKHR surface; /* native surface */ HWND hwnd; + DWORD hwnd_thread_id; }; typedef struct VkXlibSurfaceCreateInfoKHR @@ -207,6 +211,10 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (InterlockedDecrement(&surface->ref)) return; + EnterCriticalSection(&context_section); + list_remove(&surface->entry); + LeaveCriticalSection(&context_section); + if (surface->window) XDestroyWindow(gdi_display, surface->window); @@ -219,12 +227,33 @@ void wine_vk_surface_destroy(HWND hwnd) EnterCriticalSection(&context_section); if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) { + surface->hwnd_thread_id = 0; + surface->hwnd = NULL; wine_vk_surface_release(surface); } XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); LeaveCriticalSection(&context_section); } +void vulkan_thread_detach(void) +{ + struct wine_vk_surface *surface, *next; + DWORD thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&context_section); + LIST_FOR_EACH_ENTRY_SAFE(surface, next, &surface_list, struct wine_vk_surface, entry) + { + if (surface->hwnd_thread_id != thread_id) + continue; + + TRACE("Detaching surface %p, hwnd %p.\n", surface, surface->hwnd); + XReparentWindow(gdi_display, surface->window, get_dummy_parent(), 0, 0); + XSync(gdi_display, False); + wine_vk_surface_destroy(surface->hwnd); + } + LeaveCriticalSection(&context_section); +} + static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -278,7 +307,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, { VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; - struct wine_vk_surface *x11_surface, *prev; + struct wine_vk_surface *x11_surface; TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); @@ -298,8 +327,15 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, x11_surface->ref = 1; x11_surface->hwnd = create_info->hwnd; - x11_surface->window = x11_surface->hwnd ? create_client_window(create_info->hwnd, &default_visual) - : create_dummy_client_window(); + if (x11_surface->hwnd) + { + x11_surface->window = create_client_window(create_info->hwnd, &default_visual); + x11_surface->hwnd_thread_id = GetWindowThreadProcessId(x11_surface->hwnd, NULL); + } + else + { + x11_surface->window = create_dummy_client_window(); + } if (!x11_surface->window) { @@ -323,16 +359,14 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + EnterCriticalSection(&context_section); if (x11_surface->hwnd) { - EnterCriticalSection(&context_section); - if (!XFindContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char **)&prev)) - { - wine_vk_surface_release(prev); - } + wine_vk_surface_destroy( x11_surface->hwnd ); XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); - LeaveCriticalSection(&context_section); } + list_add_tail(&surface_list, &x11_surface->entry); + LeaveCriticalSection(&context_section); *surface = (uintptr_t)x11_surface; @@ -713,4 +747,8 @@ void wine_vk_surface_destroy(HWND hwnd) { } +void vulkan_thread_detach(void) +{ +} + #endif /* SONAME_LIBVULKAN */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..7ec2639e309 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1446,7 +1446,7 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co * * Create a dummy parent window for child windows that don't have a true X11 parent. */ -static Window get_dummy_parent(void) +Window get_dummy_parent(void) { static Window dummy_parent; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..e82ee921830 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -587,11 +587,13 @@ extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; +extern Window get_dummy_parent(void) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, BOOL known_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; +extern void vulkan_thread_detach(void) DECLSPEC_HIDDEN; extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ) DECLSPEC_HIDDEN; extern Window init_clip_window(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..bd21afc8174 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -645,6 +645,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + vulkan_thread_detach(); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display );

1 0

Paul Gofman : server: Use SO_BINDTODEVICE in bind_to_index() if possible.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 5f916f7f35d648287ab2d8ce825c81341bfce983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f916f7f35d648287ab2d8ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 12 21:48:42 2021 +0300 server: Use SO_BINDTODEVICE in bind_to_index() if possible. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 74 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/server/sock.c b/server/sock.c index 43a7c707740..4cb5503ad25 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1757,12 +1757,21 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) #ifdef IP_BOUND_IF -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - return setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) ); + static const int enable = 1; + unsigned int index; + + if (!(index = if_nametoindex( name ))) + return -1; + + if (setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } -#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) && defined(SO_BINDTODEVICE) struct interface_filter { @@ -1795,27 +1804,43 @@ static struct interface_filter generic_interface_filter = BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - in_addr_t ifindex = htonl( index ); struct interface_filter specific_interface_filter; struct sock_fprog filter_prog; - int ret; + static const int enable = 1; + unsigned int index; + in_addr_t ifindex; - if ((ret = setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) )) < 0) - return ret; + if (!setsockopt( fd, SOL_SOCKET, SO_BINDTODEVICE, name, strlen( name ) + 1 )) + return 0; + + /* SO_BINDTODEVICE requires NET_CAP_RAW until Linux 5.7. */ + if (debug_level) + fprintf( stderr, "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", + fd, name, strerror( errno )); + + if (!(index = if_nametoindex( name ))) + return -1; + + ifindex = htonl( index ); + if (setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) ) < 0) + return -1; specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = index; specific_interface_filter.ip_rule.k = htonl( bind_addr ); filter_prog.len = sizeof(generic_interface_filter) / sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *)&specific_interface_filter; - return setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) ); + if (setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } #else -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { errno = EOPNOTSUPP; return -1; @@ -1841,8 +1866,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr in_addr_t bind_addr = addr->sin_addr.s_addr; struct ifaddrs *ifaddrs, *ifaddr; int fd = get_unix_fd( sock->fd ); - static const int enable = 1; - unsigned int index; + int err = 0; if (bind_addr == htonl( INADDR_ANY ) || bind_addr == htonl( INADDR_LOOPBACK )) return 0; @@ -1856,36 +1880,16 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { - index = if_nametoindex( ifaddr->ifa_name ); - if (!index) - { - if (debug_level) - fprintf( stderr, "Unable to look up interface index for %s: %s\n", - ifaddr->ifa_name, strerror( errno ) ); - continue; - } - - freeifaddrs( ifaddrs ); - - if (bind_to_index( fd, bind_addr, index ) < 0) + if ((err = bind_to_iface_name( fd, bind_addr, ifaddr->ifa_name )) < 0) { if (debug_level) fprintf( stderr, "failed to bind to interface: %s\n", strerror( errno ) ); - return 0; } - - if (setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ) < 0) - { - if (debug_level) - fprintf( stderr, "failed to reuse address: %s\n", strerror( errno ) ); - return 0; - } - return 1; + break; } } - freeifaddrs( ifaddrs ); - return 0; + return !err; } #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_update_sub_resource().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 483d44c62335f58cdde50c056863e9989f7c76a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483d44c62335f58cdde50c05… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:10 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_update_sub_resource(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 36dc442d59f..979b0632c49 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1375,10 +1375,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_UpdateSubresource(ID3D11Devic wined3d_box_set(&wined3d_box, box->left, box->top, box->right, box->bottom, box->front, box->back); wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_CopyStructureCount(ID3D11DeviceContext1 *iface, @@ -2787,10 +2785,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_UpdateSubresource1(ID3D11Devi box->front, box->back); wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, flags); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_DiscardResource(ID3D11DeviceContext1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for generating mipmaps.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 7eaae6b7971b969e261a30e6f506759493f5e34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eaae6b7971b969e261a30e6… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:13 2021 +0200 d3d11: Don't grab wined3d lock for generating mipmaps. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4839d81dd19..43db6b76b8c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1474,9 +1474,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_GenerateMips(ID3D11DeviceCont TRACE("iface %p, view %p.\n", iface, view); - wined3d_mutex_lock(); wined3d_device_context_generate_mipmaps(context->wined3d_context, srv->wined3d_view); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_SetResourceMinLOD(ID3D11DeviceContext1 *iface, @@ -5077,9 +5075,7 @@ static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface, TRACE("iface %p, view %p.\n", iface, view); - wined3d_mutex_lock(); wined3d_device_context_generate_mipmaps(device->immediate_context.wined3d_context, srv->wined3d_view); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: fa63f80d0ebc80e9c8b32dde95ad6f1089c528d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa63f80d0ebc80e9c8b32dde… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:16 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e5618f09174..248634a245d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1392,10 +1392,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopyStructureCount(ID3D11Devi buffer_impl = unsafe_impl_from_ID3D11Buffer(dst_buffer); uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); - wined3d_mutex_lock(); wined3d_device_context_copy_uav_counter(context->wined3d_context, buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearRenderTargetView(ID3D11DeviceContext1 *iface,

1 0