January 2019 - Wine-Devel - list.winehq.org

[PATCH] kernel32: properly handle FindFirstFileEx flags
by Dorian Wouters Jan. 4, 2019

Jan. 4, 2019

- Implement FIND_FIRST_EX_CASE_SENSITIVE behaviour - Silently ignore FIND_FIRST_EX_LARGE_FETCH as it is of no consequence - Warn on use of unimplemented FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY * #define its flag constant in winbase.h - Fail with ERROR_INVALID_PARAMETER on unknown flags Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36946 Signed-off-by: Dorian Wouters <dorian(a)elementw.net> --- dlls/kernel32/file.c | 16 ++++++++++++++-- dlls/kernel32/tests/file.c | 11 ++++++++++- include/winbase.h | 5 +++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d724cb..7ca534f59c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1964,9 +1964,16 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); - if (flags != 0) + if (flags & ~(FIND_FIRST_EX_CASE_SENSITIVE | FIND_FIRST_EX_LARGE_FETCH | + FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY)) { FIXME("flags not implemented 0x%08x\n", flags ); + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + if (flags & FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY) + { + FIXME("FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY not implemented"); } if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) { @@ -2043,7 +2050,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, attr.Length = sizeof(attr); attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; + /* + * FIND_FIRST_EX_CASE_SENSITIVE should only work if HKLM\SYSTEM\CurrentControlSet\ + * Control\Session Manager\kernel\obcaseinsensitive is set to 0. Assume the application + * actually supports case sensitive lookups since it asked for it explicitly. + */ + attr.Attributes = (flags & FIND_FIRST_EX_CASE_SENSITIVE) ? 0 : OBJ_CASE_INSENSITIVE; attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d1b76bb711..8da272cea3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2739,7 +2739,7 @@ static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS se _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("Test-dir\\*", level, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); @@ -2759,6 +2759,15 @@ static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS se #define CHECK_NAME(fn) (strcmp((fn), "file1") == 0 || strcmp((fn), "file2") == 0 || strcmp((fn), "dir1") == 0) #define CHECK_LEVEL(fn) (level != FindExInfoBasic || !(fn)[0]) + if (flags & FIND_FIRST_EX_CASE_SENSITIVE) + { + ok(handle == INVALID_HANDLE_VALUE, "Case-sensitive FindFirstFile succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "Case-sensitive FindFirstFile failed with non-PATH_NOT_FOUND (err=%u)\n", GetLastError()); + SetLastError(0xdeadbeef); + handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); + } + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); diff --git a/include/winbase.h b/include/winbase.h index 20c73af319..3f5553ef24 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -292,8 +292,9 @@ typedef enum _FINDEX_INFO_LEVELS FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; -#define FIND_FIRST_EX_CASE_SENSITIVE 1 -#define FIND_FIRST_EX_LARGE_FETCH 2 +#define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 +#define FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY 4 typedef enum _FINDEX_SEARCH_OPS { -- 2.19.2

2 1

[PATCH] mscoree: Update Wine Mono to 4.7.4.
by Vincent Povirk Jan. 3, 2019

Jan. 3, 2019

Wine-Bug: 46369 This contains a bugfix from Akihiro Sagawa. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 79f667bbebb..6ed09a9257c 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.3" -#define MONO_SHA "d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a" +#define MONO_VERSION "4.7.4" +#define MONO_SHA "be99edb6dc6691ca17a2c2d90229547cd555e4e30cdb497ffe2e6e472356100f" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 234afe45efb..984da242991 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.3"; + static const char* mono_version = "4.7.4"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; -- 2.17.1

1 1

Introducing Myself.
by Denil Verghese Jan. 3, 2019

Jan. 3, 2019

Hi, I myself Denil C Verghese, doing a degree in Bachelors of Technology. I'm here because of two reasons. Foremost, I would like to be part of this endeavor. I could go on saying why I liked this community, but it would make this mail long. Second, I want to be an intern as a part of GSoC 2019. I've joined the IRC Channels #winehackers and #winehq as @dcv. I've gone through this guide <https://wiki.winehq.org/Summer_Of_Code/> and other developer guides. Submitted a small patch(a very small one! 😋). I would like to know where should I focus like, developing new features or solving bugs. I'm ready to resolve any mistakes that I may make. Hoping that I would get some guidance on how to be a part in this. Thank You, Denil C Verghese

2 1

[PATCH] winemac: Fix implementation of the AllowVerticalSync registry setting.
by Ken Thomases Jan. 3, 2019

Jan. 3, 2019

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d83a4ce..c3c2bee 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1539,8 +1539,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns } context->major = major; - if (allow_vsync) - InterlockedExchange(&context->update_swap_interval, TRUE); + InterlockedExchange(&context->update_swap_interval, TRUE); TRACE("created context %p/%p/%p\n", context, context->context, context->cglcontext); @@ -1742,7 +1741,9 @@ static void sync_swap_interval(struct wgl_context *context) { int interval; - if (context->draw_hwnd) + if (!allow_vsync) + interval = 0; + else if (context->draw_hwnd) { struct macdrv_win_data *data = get_win_data(context->draw_hwnd); if (data) @@ -3478,7 +3479,7 @@ static int macdrv_wglGetSwapIntervalEXT(void) release_win_data(data); if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE)) - set_swap_interval(context, value); + set_swap_interval(context, allow_vsync ? value : 0); } else { @@ -3543,8 +3544,8 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return FALSE; } - if (allow_vsync && (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || hwnd != context->draw_hwnd)) - set_swap_interval(context, data->swap_interval); + if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || hwnd != context->draw_hwnd) + set_swap_interval(context, allow_vsync ? data->swap_interval : 0); context->draw_hwnd = hwnd; context->draw_view = data->client_cocoa_view; @@ -3569,8 +3570,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return FALSE; } - if (allow_vsync && - (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer)) + if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer) set_swap_interval(context, 0); } else @@ -4115,6 +4115,9 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) else /* pbuffer */ interval = 0; + if (!allow_vsync) + interval = 0; + InterlockedExchange(&context->update_swap_interval, FALSE); if (!set_swap_interval(context, interval)) { -- 2.10.2

1 0

[PATCH vkd3d v2] tests: Modify ps_movc shader to avoid crashes on Windows.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Remove trailing spaces. --- tests/d3d12.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 314f08a2fb7a..0dbea933dc15 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7015,18 +7015,21 @@ static void test_shader_instructions(void) dcl_globalFlags refactoringAllowed dcl_constantbuffer cb0[3], immediateIndexed dcl_output o0.xyzw - mov o0.xyzw, cb0[0].xyzw - movc o0.xyzw, o0.xyzw, cb0[1].xyzw, cb0[2].xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + movc r0.xyzw, r0.xyzw, cb0[1].xyzw, cb0[2].xyzw + mov o0.xyzw, r0.xyzw ret #endif - 0x43425844, 0x317dec99, 0x3a8928ca, 0x5db9a8ea, 0xb4806d11, 0x00000001, 0x000000e8, 0x00000003, + 0x43425844, 0x59a5be58, 0x260c36c0, 0x7eadcff2, 0x947f4e9d, 0x00000001, 0x00000104, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, 0x00000023, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000, - 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0b000037, 0x001020f2, - 0x00000000, 0x00102e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, - 0x00000002, 0x0100003e, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x0b000037, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, + 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, }; static struct named_shader ps_movc = {"movc", ps_movc_code, sizeof(ps_movc_code)}; static const DWORD ps_swapc0_code[] = @@ -7274,7 +7277,7 @@ static void test_shader_instructions(void) {&ps_breakc_nz, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, {&ps_breakc_z, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, - {&ps_continue, {}, {{254.0f}}, TRUE}, + {&ps_continue, {}, {{254.0f}}, true}, {&ps_continuec_nz, {}, {{509.0f}}}, {&ps_retc_nz, {{ 0.0f}}, {{1.0f}}}, @@ -7634,12 +7637,12 @@ static void test_shader_instructions(void) {&ps_switch_no_default, {{{3}}}, {{2, 2, 2, 2}}}, {&ps_switch_no_default, {{{4}}}, {{3, 3, 3, 3}}}, - {&ps_movc, {{{0, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 8}}, true}, - {&ps_movc, {{{0, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 4}}, true}, - {&ps_movc, {{{1, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 8}}, true}, - {&ps_movc, {{{1, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 4}}, true}, - {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}, true}, - {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}, true}, + {&ps_movc, {{{0, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 8}}}, + {&ps_movc, {{{0, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 6, 7, 4}}}, + {&ps_movc, {{{1, 0, 0, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 8}}}, + {&ps_movc, {{{1, 0, 0, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 6, 7, 4}}}, + {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, + {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, { &ps_swapc0, @@ -8002,12 +8005,6 @@ static void test_shader_instructions(void) continue; } - if (uint_tests[i].ps == &ps_movc && is_amd_device(context.device)) - { - skip("ps_movc crashes on Windows with AMD GPUs.\n"); - continue; - } - if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) -- 2.19.2

2 1

[PATCH] d3d9/tests: Fix a typo in an undef
by Daniel Ansorregui Jan. 3, 2019

Jan. 3, 2019

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 392369a3f7..195b7301e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3236,8 +3236,8 @@ static void texbem_test(void) 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, }; +#undef tex #undef tex1 -#undef tex2 #undef origin hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, 0); -- 2.17.1

3 2

[PATCH vkd3d 5/5] vkd3d: Implement private data for ID3D12Device.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5bcfc293fdb5..7a7f4aaa143c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1469,6 +1469,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&device->private_store); + vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); @@ -1488,27 +1490,33 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) static HRESULT STDMETHODCALLTYPE d3d12_device_GetPrivateData(ID3D12Device *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_get_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateData(ID3D12Device *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_set_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateDataInterface(ID3D12Device *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_device *device = impl_from_ID3D12Device(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&device->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device *iface, const WCHAR *name) @@ -2526,6 +2534,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); + vkd3d_private_store_init(&device->private_store); + return S_OK; out_free_pipeline_cache: diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 74e34329a849..4e2650804bfa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -860,6 +860,8 @@ struct d3d12_device IUnknown *parent; LUID adapter_luid; + struct vkd3d_private_store private_store; + HRESULT removed_reason; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 38e66735f4e9..31c469b1c807 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2581,6 +2581,7 @@ static void test_private_data(void) &IID_ID3D12CommandAllocator, &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, + &IID_ID3D12Device, &IID_ID3D12Fence, }; @@ -2621,6 +2622,11 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) + { + vkd3d_test_set_context("device"); + unknown = (IUnknown *)create_device(); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Fence)) { vkd3d_test_set_context("fence"); @@ -2733,6 +2739,12 @@ static void test_private_data(void) ok(!size, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (IsEqualGUID(tests[i], &IID_ID3D12Device)) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); -- 2.19.2

2 1

[PATCH vkd3d 4/5] vkd3d: Implement private data for command lists.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 35 +++++++++++++++++++++-------------- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b947ad2f00db..8708aaf98285 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1610,6 +1610,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL { struct d3d12_device *device = list->device; + vkd3d_private_store_destroy(&list->private_store); + /* When command pool is destroyed, all command buffers are implicitly freed. */ if (list->allocator) d3d12_command_allocator_free_command_buffer(list->allocator, list); @@ -1625,25 +1627,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&list->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&list->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&list->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList *iface, const WCHAR *name) @@ -4282,6 +4290,8 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + vkd3d_private_store_init(&list->private_store); + list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 24d41e84fa45..74e34329a849 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -765,6 +765,8 @@ struct d3d12_command_list struct d3d12_command_allocator *allocator; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_list_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 70ee83ef3428..38e66735f4e9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,11 +2562,10 @@ static void test_private_data(void) D3D12_COMMAND_QUEUE_DESC queue_desc; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; - ID3D12CommandQueue *queue; IUnknown *test_object; ID3D12Device *device; ID3D12Object *object; - ID3D12Fence *fence; + IUnknown *unknown; unsigned int size; unsigned int i; IUnknown *ptr; @@ -2580,6 +2579,7 @@ static void test_private_data(void) static const GUID *tests[] = { &IID_ID3D12CommandAllocator, + &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, &IID_ID3D12Fence, }; @@ -2592,15 +2592,22 @@ static void test_private_data(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - object = NULL; if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) { vkd3d_test_set_context("allocator"); + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + } + else if (IsEqualGUID(tests[i], &IID_ID3D12CommandList)) + { + vkd3d_test_set_context("list"); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&allocator); ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); - hr = ID3D12CommandAllocator_QueryInterface(allocator, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + allocator, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); ID3D12CommandAllocator_Release(allocator); } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) @@ -2611,27 +2618,27 @@ static void test_private_data(void) queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; queue_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); + &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID3D12CommandQueue_Release(queue); } else if (IsEqualGUID(tests[i], &IID_ID3D12Fence)) { vkd3d_test_set_context("fence"); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, - &IID_ID3D12Fence, (void **)&fence); + &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); - hr = ID3D12Fence_QueryInterface(fence, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID3D12Fence_Release(fence); } else { - ok(false, "Unhandled object type %u.\n", i); + unknown = NULL; } + ok(unknown, "Unhandled object type %u.\n", i); + object = NULL; + hr = IUnknown_QueryInterface(unknown, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IUnknown_Release(unknown); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); -- 2.19.2

2 1

[PATCH vkd3d 2/5] vkd3d: Implement private data for fences.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 22 +++- libs/vkd3d/vkd3d_private.h | 2 + tests/d3d12.c | 234 +++++++++++++++++++++---------------- 3 files changed, 151 insertions(+), 107 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f63df84b760a..d27754029bba 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -384,6 +384,8 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) { struct d3d12_device *device = fence->device; + vkd3d_private_store_destroy(&fence->private_store); + vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); vkd3d_free(fence->events); @@ -400,27 +402,33 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", + struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_get_private_data(&fence->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateData(ID3D12Fence *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return vkd3d_set_private_data(&fence->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateDataInterface(ID3D12Fence *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&fence->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const WCHAR *name) @@ -590,6 +598,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; + vkd3d_private_store_init(&fence->private_store); + fence->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df44f80f4ad2..79b94d4d1f1d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -230,6 +230,8 @@ struct d3d12_fence size_t event_count; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_fence_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index a884a0a414c4..ef979cc5f0e5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2565,7 +2565,9 @@ static void test_private_data(void) IUnknown *test_object; ID3D12Device *device; ID3D12Object *object; + ID3D12Fence *fence; unsigned int size; + unsigned int i; IUnknown *ptr; HRESULT hr; @@ -2574,6 +2576,11 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const GUID *tests[] = + { + &IID_ID3D12CommandQueue, + &IID_ID3D12Fence, + }; if (!(device = create_device())) { @@ -2581,114 +2588,139 @@ static void test_private_data(void) return; } - queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ID3D12CommandQueue_Release(queue); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + object = NULL; + if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) + { + vkd3d_test_set_context("queue"); + queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12CommandQueue_Release(queue); + } + else if (IsEqualGUID(tests[i], &IID_ID3D12Fence)) + { + vkd3d_test_set_context("fence"); + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + hr = ID3D12Fence_QueryInterface(fence, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Fence_Release(fence); + } + else + { + ok(false, "Unhandled object type %u.\n", i); + } - hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - size = sizeof(ptr) * 2; - ptr = (IUnknown *)0xdeadbeef; - hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!ptr, "Got unexpected pointer %p.\n", ptr); - ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); - hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, - &IID_ID3D12Fence, (void **)&test_object); - ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); - refcount = get_refcount(test_object); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - expected_refcount = refcount + 1; - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); + refcount = get_refcount(test_object); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - --expected_refcount; - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + --expected_refcount; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - size = sizeof(data); - hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); - hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ++expected_refcount; - size = 2 * sizeof(ptr); - ptr = NULL; - hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); - ++expected_refcount; - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); - IUnknown_Release(ptr); - --expected_refcount; - - ptr = (IUnknown *)0xdeadbeef; - size = 1; - hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); - size = 2 * sizeof(ptr); - hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); - refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - (unsigned int)refcount, (unsigned int)expected_refcount); - - size = 1; - hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); - ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); - ok(size == sizeof(object), "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - size = 1; - hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(!size, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - - ID3D12Object_Release(object); - - refcount = IUnknown_Release(test_object); - ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(object), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(!size, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + ID3D12Object_Release(object); + + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + + vkd3d_test_set_context(NULL); + } refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d: Implement private data for command queues.
by Józef Kucia Jan. 3, 2019

Jan. 3, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_windows.h | 3 + libs/vkd3d/command.c | 22 ++++-- libs/vkd3d/utils.c | 100 +++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 51 ++++++++++++++ tests/d3d12.c | 138 +++++++++++++++++++++++++++++++++++++ 5 files changed, 308 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index ca7da534c8fc..58432fb7ec70 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -48,6 +48,9 @@ typedef int HRESULT; # define E_OUTOFMEMORY _HRESULT_TYPEDEF_(0x8007000E) # define E_INVALIDARG _HRESULT_TYPEDEF_(0x80070057) +# define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) +# define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) + /* Basic types */ typedef unsigned char BYTE; typedef unsigned int DWORD; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index a175091b04ff..f63df84b760a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4360,6 +4360,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *i { struct d3d12_device *device = command_queue->device; + vkd3d_private_store_destroy(&command_queue->private_store); + vkd3d_free(command_queue); ID3D12Device_Release(&device->ID3D12Device_iface); @@ -4371,25 +4373,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *i static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetPrivateData(ID3D12CommandQueue *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&command_queue->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateData(ID3D12CommandQueue *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&command_queue->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateDataInterface(ID3D12CommandQueue *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&command_queue->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue *iface, const WCHAR *name) @@ -4673,6 +4681,8 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); + vkd3d_private_store_init(&queue->private_store); + queue->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index fc09bf9824c1..6841bfb180d2 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -506,3 +506,103 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, TRACE("Loaded procs for VkDevice %p.\n", device); return S_OK; } + +static struct vkd3d_private_data *vkd3d_private_store_get_private_data( + const struct vkd3d_private_store *store, const GUID *tag) +{ + struct vkd3d_private_data *data; + + LIST_FOR_EACH_ENTRY(data, &store->content, struct vkd3d_private_data, entry) + { + if (IsEqualGUID(&data->tag, tag)) + return data; + } + + return NULL; +} + +static HRESULT vkd3d_private_store_set_private_data(struct vkd3d_private_store *store, + const GUID *tag, const void *data, unsigned int data_size, bool is_object) +{ + struct vkd3d_private_data *d, *old_data; + const void *ptr = data; + + if (is_object) + { + if (data_size != sizeof(IUnknown *)) + return E_INVALIDARG; + ptr = &data; + } + + if (!(d = vkd3d_malloc(offsetof(struct vkd3d_private_data, u.data[data_size])))) + return E_OUTOFMEMORY; + + d->tag = *tag; + d->size = data_size; + d->is_object = is_object; + memcpy(d->u.data, ptr, data_size); + if (is_object) + IUnknown_AddRef(d->u.object); + + if ((old_data = vkd3d_private_store_get_private_data(store, tag))) + vkd3d_private_data_destroy(old_data); + list_add_tail(&store->content, &d->entry); + + return S_OK; +} + +HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, + const GUID *tag, unsigned int *out_size, void *out) +{ + const struct vkd3d_private_data *data; + unsigned int size; + + if (!out_size) + return E_INVALIDARG; + + if (!(data = vkd3d_private_store_get_private_data(store, tag))) + { + *out_size = 0; + return DXGI_ERROR_NOT_FOUND; + } + + size = *out_size; + *out_size = data->size; + if (!out) + return S_OK; + + if (size < data->size) + return DXGI_ERROR_MORE_DATA; + + if (data->is_object) + IUnknown_AddRef(data->u.object); + memcpy(out, data->u.data, data->size); + + return S_OK; +} + +HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, + const GUID *tag, unsigned int data_size, const void *data) +{ + struct vkd3d_private_data *d; + + if (!data) + { + if (!(d = vkd3d_private_store_get_private_data(store, tag))) + return S_FALSE; + + vkd3d_private_data_destroy(d); + return S_OK; + } + + return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); +} + +HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, + const GUID *tag, const IUnknown *object) +{ + if (!object) + return vkd3d_set_private_data(store, tag, sizeof(object), &object); + + return vkd3d_private_store_set_private_data(store, tag, object, sizeof(object), true); +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7e04dc31a0c8..df44f80f4ad2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -163,6 +163,55 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; +struct vkd3d_private_store +{ + struct list content; +}; + +struct vkd3d_private_data +{ + struct list entry; + + GUID tag; + unsigned int size; + bool is_object; + union + { + BYTE data[1]; + IUnknown *object; + } u; +}; + +static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data) +{ + if (data->is_object) + IUnknown_Release(data->u.object); + list_remove(&data->entry); + vkd3d_free(data); +} + +static inline void vkd3d_private_store_init(struct vkd3d_private_store *store) +{ + list_init(&store->content); +} + +static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store) +{ + struct vkd3d_private_data *data, *cursor; + + LIST_FOR_EACH_ENTRY_SAFE(data, cursor, &store->content, struct vkd3d_private_data, entry) + { + vkd3d_private_data_destroy(data); + } +} + +HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, + const GUID *tag, unsigned int *out_size, void *out) DECLSPEC_HIDDEN; +HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, + const GUID *tag, unsigned int data_size, const void *data) DECLSPEC_HIDDEN; +HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, + const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN; + /* ID3D12Fence */ struct d3d12_fence { @@ -744,6 +793,8 @@ struct d3d12_command_queue struct vkd3d_queue *vkd3d_queue; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_queue_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 314f08a2fb7a..a884a0a414c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2557,6 +2557,143 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_private_data(void) +{ + D3D12_COMMAND_QUEUE_DESC queue_desc; + ULONG refcount, expected_refcount; + ID3D12CommandQueue *queue; + IUnknown *test_object; + ID3D12Device *device; + ID3D12Object *object; + unsigned int size; + IUnknown *ptr; + HRESULT hr; + + static const GUID test_guid + = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + static const GUID test_guid2 + = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; + static const DWORD data[] = {1, 2, 3, 4}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12CommandQueue_Release(queue); + + hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + refcount = get_refcount(test_object); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + --expected_refcount; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); + refcount = get_refcount(test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + (unsigned int)refcount, (unsigned int)expected_refcount); + + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(object), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + size = 1; + hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(!size, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + ID3D12Object_Release(object); + + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22054,6 +22191,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); + run_test(test_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

2 1