wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zebediah Figura : user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: c55980a47cf17079597e11291d97611355bab244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55980a47cf17079597e1129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:18:37 2022 -0500 user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a103751a109..e9ac5e9aff2 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -101,10 +101,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, SP_DEVINFO_DATA device_data = {sizeof(device_data)}; PHIDP_PREPARSED_DATA preparsed_data = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + struct hid_preparsed_data *preparsed; struct device *device = NULL; RID_DEVICE_INFO info; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; UINT32 handle; DWORD i, size; HANDLE file; @@ -167,15 +167,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, ERR( "Failed to get preparsed data.\n" ); goto fail; } + preparsed = (struct hid_preparsed_data *)preparsed_data; - if (!HidP_GetCaps( preparsed_data, &caps )) - { - ERR( "Failed to get caps.\n" ); - goto fail; - } - - info.hid.usUsagePage = caps.UsagePage; - info.hid.usUsage = caps.Usage; + info.hid.usUsagePage = preparsed->usage_page; + info.hid.usUsage = preparsed->usage; break; case RIM_TYPEMOUSE:

1 0

Zebediah Figura : user32: Handle failure from HID APIs.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 4c4c64bf3254e103d58534e821ef7d932ba0de5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4c64bf3254e103d58534e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 14:20:47 2022 -0500 user32: Handle failure from HID APIs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1867e213223..a103751a109 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -153,17 +153,26 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, case RIM_TYPEHID: attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes( device->file, &attr )) - WARN("Failed to get attributes.\n"); + { + ERR( "Failed to get attributes.\n" ); + goto fail; + } info.hid.dwVendorId = attr.VendorID; info.hid.dwProductId = attr.ProductID; info.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData( file, &preparsed_data )) - WARN("Failed to get preparsed data.\n"); + { + ERR( "Failed to get preparsed data.\n" ); + goto fail; + } if (!HidP_GetCaps( preparsed_data, &caps )) - WARN("Failed to get caps.\n"); + { + ERR( "Failed to get caps.\n" ); + goto fail; + } info.hid.usUsagePage = caps.UsagePage; info.hid.usUsage = caps.Usage; @@ -198,9 +207,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, else { ERR("Failed to allocate memory.\n"); - CloseHandle(file); - free(detail); - return NULL; + goto fail; } device->detail = detail; @@ -210,6 +217,12 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, device->data = preparsed_data; return device; + +fail: + free( preparsed_data ); + CloseHandle( file ); + free( detail ); + return NULL; } void rawinput_update_device_list(void)

1 0

Zebediah Figura : user32: Populate the RID_DEVICE_INFO structure in add_device().
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 8962ec5a83286488da6f839ceba3c39ad1cf00b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8962ec5a83286488da6f839c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 14:17:12 2022 -0500 user32: Populate the RID_DEVICE_INFO structure in add_device(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 84 ++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d706e19d64f..1867e213223 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -94,15 +94,21 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, DWORD type ) { + static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + PHIDP_PREPARSED_DATA preparsed_data = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; struct device *device = NULL; + RID_DEVICE_INFO info; + HIDD_ATTRIBUTES attr; + HIDP_CAPS caps; UINT32 handle; + DWORD i, size; HANDLE file; WCHAR *pos; - DWORD i, size, type; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) @@ -138,6 +144,40 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + info.dwType = type; + + switch (type) + { + case RIM_TYPEHID: + attr.Size = sizeof(HIDD_ATTRIBUTES); + if (!HidD_GetAttributes( device->file, &attr )) + WARN("Failed to get attributes.\n"); + + info.hid.dwVendorId = attr.VendorID; + info.hid.dwProductId = attr.ProductID; + info.hid.dwVersionNumber = attr.VersionNumber; + + if (!HidD_GetPreparsedData( file, &preparsed_data )) + WARN("Failed to get preparsed data.\n"); + + if (!HidP_GetCaps( preparsed_data, &caps )) + WARN("Failed to get caps.\n"); + + info.hid.usUsagePage = caps.UsagePage; + info.hid.usUsage = caps.Usage; + break; + + case RIM_TYPEMOUSE: + info.mouse = mouse_info; + break; + + case RIM_TYPEKEYBOARD: + info.keyboard = keyboard_info; + break; + } + for (i = 0; i < rawinput_devices_count && !device; ++i) if (rawinput_devices[i].handle == UlongToHandle(handle)) device = rawinput_devices + i; @@ -166,8 +206,8 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device->detail = detail; device->file = file; device->handle = ULongToHandle(handle); - device->info.cbSize = sizeof(RID_DEVICE_INFO); - device->data = NULL; + device->info = info; + device->data = preparsed_data; return device; } @@ -176,8 +216,6 @@ void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; - HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; DWORD idx; @@ -201,26 +239,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { - if (!(device = add_device(set, &iface))) + if (!(device = add_device( set, &iface, RIM_TYPEHID ))) continue; - - attr.Size = sizeof(HIDD_ATTRIBUTES); - if (!HidD_GetAttributes(device->file, &attr)) - WARN("Failed to get attributes.\n"); - - device->info.dwType = RIM_TYPEHID; - device->info.hid.dwVendorId = attr.VendorID; - device->info.hid.dwProductId = attr.ProductID; - device->info.hid.dwVersionNumber = attr.VersionNumber; - - if (!HidD_GetPreparsedData(device->file, &device->data)) - WARN("Failed to get preparsed data.\n"); - - if (!HidP_GetCaps(device->data, &caps)) - WARN("Failed to get caps.\n"); - - device->info.hid.usUsagePage = caps.UsagePage; - device->info.hid.usUsage = caps.Usage; } SetupDiDestroyDeviceInfoList(set); @@ -229,13 +249,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) { - static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - - if (!(device = add_device(set, &iface))) + if (!(device = add_device( set, &iface, RIM_TYPEMOUSE ))) continue; - - device->info.dwType = RIM_TYPEMOUSE; - device->info.mouse = mouse_info; } SetupDiDestroyDeviceInfoList(set); @@ -244,13 +259,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_KEYBOARD, idx, &iface); ++idx) { - static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; - - if (!(device = add_device(set, &iface))) + if (!(device = add_device( set, &iface, RIM_TYPEHID ))) continue; - - device->info.dwType = RIM_TYPEKEYBOARD; - device->info.keyboard = keyboard_info; } SetupDiDestroyDeviceInfoList(set);

1 0

Andrew Eikum : d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: a64ec46e4e33aea801cfbe033e68591abdddfb14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64ec46e4e33aea801cfbe03… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:25 2022 -0500 d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation. The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fc148aca4a8..86ac7cf5109 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4925,12 +4925,24 @@ static void test_pinned_buffers(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9Ex *device; D3DCOLOR color; ULONG refcount; HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); if (!(device = create_device(window, NULL))) { @@ -4954,6 +4966,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(!!device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9Ex_Release(device); } START_TEST(d3d9ex) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d8fe10fc79..025cd556ee4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26202,6 +26202,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCOLOR color; @@ -26209,6 +26210,17 @@ static void test_desktop_window(void) HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -26236,6 +26248,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + /* test device with NULL HWND */ + device = create_device(d3d, NULL, NULL, TRUE); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); }

1 0

Andrew Eikum : d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: de61c58308acae5a5c71e3935d3536bd942d2dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=de61c58308acae5a5c71e393… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:15 2022 -0500 d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fc148aca4a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4923,6 +4923,39 @@ static void test_pinned_buffers(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); + + device = create_device(GetDesktopWindow(), NULL); + ok(!!device, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4982,6 +5015,7 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Andrew Eikum : xaudio2/tests: Remove failing legacy CLSID tests.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: c1e793f1119de0c0ef7d4bd6d9fefbafdb5dbbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e793f1119de0c0ef7d4bd6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:06:28 2022 -0500 xaudio2/tests: Remove failing legacy CLSID tests. Modern Windows fails these tests, and no application is known to need this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52998 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9d50944b8d3..f4f808c2656 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1067,10 +1067,6 @@ static void test_xapo_creation_modern(const char *module) /* CLSIDs are the same across all versions */ static const GUID *const_clsids[] = { - &CLSID_FXEQ27, - &CLSID_FXMasteringLimiter27, - &CLSID_FXReverb27, - &CLSID_FXEcho27, &CLSID_FXEQ, &CLSID_FXMasteringLimiter, &CLSID_FXReverb, @@ -1111,19 +1107,6 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08lx\n", module, hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %lu\n", rc); - } - pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module);

1 0

Zebediah Figura : wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d67a9b5faa7ac9e67234eff93f4e4748b0dc19d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67a9b5faa7ac9e67234eff9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:08 2022 -0500 wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52663 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8da17c9aa94..5ae237db54b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2937,7 +2937,8 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + if (context_gl->c.d3d_info->persistent_map + && context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) { TRACE("Not unmapping BO %p.\n", bo); return; @@ -2960,6 +2961,7 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context if (bo->b.client_map_count) { wined3d_device_bo_map_unlock(context_gl->c.device); + assert(context_gl->c.d3d_info->persistent_map); TRACE("BO %p is still in use by a client thread; not unmapping.\n", bo); return; }

1 0

Zebediah Figura : wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d838cf70041863f6d316b15f89ceadf9a76d7c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d838cf70041863f6d316b15f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:07 2022 -0500 wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently. I.e. if ARB_buffer_storage is not supported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0d9f6953de3..05e8c112388 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5231,6 +5231,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->fences = wined3d_fence_supported(gl_info); d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); d3d_info->filling_convention_offset = gl_info->filling_convention_offset; + d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cd1748afe90..3b87ab63ee5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2351,6 +2351,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; + d3d_info->persistent_map = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0d6550bf613..9b0d98139ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,11 +1008,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (context->d3d_info->persistent_map) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e3888cd30d..7bfca0bcb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -243,6 +243,7 @@ struct wined3d_d3d_info uint32_t pbo : 1; uint32_t subpixel_viewport : 1; uint32_t fences : 1; + uint32_t persistent_map : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: 1c66d05a9c5b634f0e141113536bd9431c5e371e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c66d05a9c5b634f0e141113… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:34 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 89165a55af2..716eb7f44fb 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -398,6 +398,12 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor) +{ + FIXME("info %p, processor %p stub!\n", info, processor); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 82b71b5fa5c..c0a2c9fa56c 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -16,7 +16,7 @@ @ stdcall D3DX10CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) -@ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) +@ stdcall D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) @ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stdcall D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) diff --git a/include/d3dx10.h b/include/d3dx10.h index cb7b65c53cc..004342411b6 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -29,9 +29,9 @@ #include "d3d10.h" #include "d3dx10math.h" #include "d3dx10core.h" -#include "d3dx10async.h" #include "d3dx10tex.h" #include "d3dx10mesh.h" +#include "d3dx10async.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 0b7aca9c023..c932be91b01 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -76,4 +76,6 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor); + #endif

1 0

Piotr Caban : d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d3f5b69bdc8513dd4720724695200b113601eb25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f5b69bdc8513dd47207246… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:15 2022 +0200 d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index db46a9353f6..89165a55af2 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -345,6 +345,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *reso return E_OUTOFMEMORY; if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) + rsrc = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); @@ -377,6 +379,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return E_OUTOFMEMORY; if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) + rsrc = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022