- wine-devel - winehq.org

[PATCH] user32: Fix a memory leak.
by Zhiyi Zhang 06 Jan '19

06 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..088e50da4e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); } -- 2.19.2

2 1

[PATCH] user32: Check invalid handle in GetRawInputData.
by Zhiyi Zhang 06 Jan '19

06 Jan '19

Fix https://github.com/ValveSoftware/Proton/issues/2040. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a4ec..4bfccdfb84 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8f77..ffdd4b7137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); -- 2.19.2

2 1

[PATCH] wtsapi32/tests: Add WTSQueryUserToken parameter test.
by Gijs Vermeulen 06 Jan '19

06 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wtsapi32/tests/wtsapi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) This is for the staging patchset wtsapi32-WTSQueryUserToken. diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 341d9e605f..c24bd491a7 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -105,8 +105,20 @@ static void test_WTSQuerySessionInformationW(void) WTSFreeMemory(buf); } +static void test_WTSQueryUserToken(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); + ok(!ret, "expected WTSQueryUserToken to fail\n"); + todo_wine + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); test_WTSQuerySessionInformationW(); + test_WTSQueryUserToken(); } -- 2.20.1

1 0

[PATCH] po: Update Sinhala translation
by Isira Seneviratne 05 Jan '19

05 Jan '19

1 0

[PATCH] po/pt_BR: Translation of newly added messages
by Roberto Pungartnik 05 Jan '19

05 Jan '19

1 0

[PATCH v2] kernel32: properly handle FindFirstFileEx flags
by Dorian Wouters 04 Jan '19

04 Jan '19

- 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> --- Change test requirements related to FIND_FIRST_EX_CASE_SENSITIVE dlls/kernel32/file.c | 16 ++++++++++++++-- dlls/kernel32/tests/file.c | 10 +++++++++- include/winbase.h | 5 +++-- 3 files changed, 26 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..eae62fd646 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,14 @@ 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) && handle == INVALID_HANDLE_VALUE) + { + 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

1 0

[PATCH] wined3d: Recognise virgl.
by Henri Verbeet 04 Jan '19

04 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 14 ++++++++++++++ dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2a3514a1bef..af0db3eec21 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1192,6 +1192,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in || strstr(gl_vendor_string, "DRI R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") + || strstr(gl_vendor_string, "Red Hat") || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") || strstr(gl_renderer, "Gallium") @@ -1232,6 +1233,10 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; + if (strstr(gl_vendor_string, "Red Hat") + || strstr(gl_renderer, "virgl")) + return HW_VENDOR_REDHAT; + if (strstr(gl_renderer, "SVGA3D")) return HW_VENDOR_VMWARE; @@ -1790,6 +1795,10 @@ cards_nvidia_mesa[] = {"nv04", CARD_NVIDIA_RIVA_TNT}, {"nv03", CARD_NVIDIA_RIVA_128}, }, +cards_redhat[] = +{ + {"virgl", CARD_REDHAT_VIRGL}, +}, cards_vmware[] = { {"SVGA3D", CARD_VMWARE_SVGA3D}, @@ -1814,6 +1823,10 @@ nvidia_gl_vendor_table[] = {GL_VENDOR_MESA, "Mesa Nouveau driver", cards_nvidia_mesa, ARRAY_SIZE(cards_nvidia_mesa)}, {GL_VENDOR_NVIDIA, "NVIDIA binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, }, +redhat_gl_vendor_table[] = +{ + {GL_VENDOR_MESA, "Red Hat driver", cards_redhat, ARRAY_SIZE(cards_redhat)}, +}, vmware_gl_vendor_table[] = { {GL_VENDOR_MESA, "VMware driver", cards_vmware, ARRAY_SIZE(cards_vmware)}, @@ -1860,6 +1873,7 @@ card_vendor_table[] = { {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, ARRAY_SIZE(amd_gl_vendor_table)}, {HW_VENDOR_NVIDIA, "NVIDIA", nvidia_gl_vendor_table, ARRAY_SIZE(nvidia_gl_vendor_table)}, + {HW_VENDOR_REDHAT, "Red Hat",redhat_gl_vendor_table, ARRAY_SIZE(redhat_gl_vendor_table)}, {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, ARRAY_SIZE(vmware_gl_vendor_table)}, {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, ARRAY_SIZE(intel_gl_vendor_table)}, }; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 544c76ed5c1..75622be80c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 783}, {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 4052}, + /* Red Hat */ + {DRIVER_REDHAT_VIRGL, DRIVER_MODEL_GENERIC, "virgl.dll", 0, 0, 0}, + /* VMware */ {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, @@ -376,6 +379,9 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + /* Red Hat */ + {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, + /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e39db4fa86..0df3f2ab2a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2252,6 +2252,7 @@ enum wined3d_pci_vendor HW_VENDOR_AMD = 0x1002, HW_VENDOR_NVIDIA = 0x10de, HW_VENDOR_VMWARE = 0x15ad, + HW_VENDOR_REDHAT = 0x1af4, HW_VENDOR_INTEL = 0x8086, }; @@ -2435,6 +2436,8 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_REDHAT_VIRGL = 0x1010, + CARD_VMWARE_SVGA3D = 0x0405, CARD_INTEL_830M = 0x3577, @@ -2623,6 +2626,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCE6, DRIVER_NVIDIA_GEFORCE8, + DRIVER_REDHAT_VIRGL, DRIVER_VMWARE, DRIVER_WINE, DRIVER_UNKNOWN, -- 2.11.0

1 0

[PATCH v2 8/8] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 25c075781b..6ada39a1c9 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -919,12 +919,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + + EnterCriticalSection(&This->lock); if(items) - *items = 0; + *items = This->count; - return E_NOTIMPL; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4564f410d3..51c6a2abec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -409,28 +409,30 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; UINT32 uint32_value; UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -444,6 +446,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); @@ -786,8 +789,10 @@ static void test_IMFAttributes_item(void) hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 3); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); @@ -801,8 +806,10 @@ static void test_IMFAttributes_item(void) ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_GetItemByIndex(attributes, 2, &key, &ret_propvar); ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex should fail: 0x%08x.\n", hr); -- 2.20.1

2 1

[PATCH] comctl32/tests: Remove redundant assignment.
by Andrey Gusev 04 Jan '19

04 Jan '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3bb7902a13..86d0fabf9e 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -918,7 +918,6 @@ static void check_ilhead_data(const ILHEAD *ilh, INT cx, INT cy, INT cur, INT ma } else { - grow = (WORD)(grow + 3) & ~3; ok(ilh->cMaxImage == max, "wrong cMaxImage %d (expected %d)\n", ilh->cMaxImage, max); ok(ilh->cGrow == grow_aligned, "Unexpected cGrow %d, expected %d\n", ilh->cGrow, grow_aligned); } -- 2.20.1

1 0

[PATCH vkd3d 5/7] vkd3d: Implement private data for resources.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 6 ++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3fb3c1e8209d..8b628a6bcbba 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -706,6 +706,7 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) if (!refcount) { + vkd3d_private_store_destroy(&resource->private_store); d3d12_resource_destroy(resource, resource->device); vkd3d_free(resource); } @@ -781,25 +782,31 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_Release(ID3D12Resource *iface) static HRESULT STDMETHODCALLTYPE d3d12_resource_GetPrivateData(ID3D12Resource *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_resource *resource = impl_from_ID3D12Resource(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(&resource->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateData(ID3D12Resource *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_resource *resource = impl_from_ID3D12Resource(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(&resource->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateDataInterface(ID3D12Resource *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&resource->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, const WCHAR *name) @@ -1172,6 +1179,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; + vkd3d_private_store_init(&resource->private_store); + resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1350,6 +1359,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = D3D12_RESOURCE_STATE_COMMON; object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); + vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a7c23f9fd4e9..76a7a367b8e4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -295,6 +295,8 @@ struct d3d12_resource D3D12_RESOURCE_STATES present_state; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; static inline bool d3d12_resource_is_buffer(const struct d3d12_resource *resource) diff --git a/tests/d3d12.c b/tests/d3d12.c index a8cad289841f..8dd25aa1ae23 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2590,6 +2590,7 @@ static void test_private_data(void) &IID_ID3D12Fence, &IID_ID3D12Heap, &IID_ID3D12PipelineState, + &IID_ID3D12Resource, &IID_ID3D12RootSignature, }; @@ -2673,6 +2674,11 @@ static void test_private_data(void) root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); ID3D12RootSignature_Release(root_signature); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Resource)) + { + vkd3d_test_set_context("resource"); + unknown = (IUnknown *)create_readback_buffer(device, 512); + } else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) { vkd3d_test_set_context("root signature"); -- 2.19.2

2 1

[PATCH vkd3d 3/7] vkd3d: Implement private data for pipeline states.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 24 ++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 10 ++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index f0b61ec057d1..ee91c725f75d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1136,6 +1136,8 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState struct d3d12_device *device = state->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&state->private_store); + if (d3d12_pipeline_state_is_graphics(state)) d3d12_pipeline_state_destroy_graphics(state, device); else if (d3d12_pipeline_state_is_compute(state)) @@ -1159,25 +1161,31 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetPrivateData(ID3D12PipelineState *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_pipeline_state *state = impl_from_ID3D12PipelineState(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(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateData(ID3D12PipelineState *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_pipeline_state *state = impl_from_ID3D12PipelineState(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(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateDataInterface(ID3D12PipelineState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&state->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineState *iface, const WCHAR *name) @@ -1508,6 +1516,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } + vkd3d_private_store_init(&state->private_store); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -2349,6 +2359,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); + vkd3d_private_store_init(&state->private_store); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 14f95bfa5d4a..d4ebb5e62fc6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,6 +620,8 @@ struct d3d12_pipeline_state uint8_t uav_counter_mask; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) diff --git a/tests/d3d12.c b/tests/d3d12.c index 61b00e60ab4e..67df4d932e0e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,6 +2562,7 @@ static void test_private_data(void) D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; + ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; IUnknown *test_object; @@ -2586,6 +2587,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12PipelineState, &IID_ID3D12RootSignature, }; @@ -2650,6 +2652,14 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12PipelineState)) + { + vkd3d_test_set_context("pipeline state"); + root_signature = create_empty_root_signature(device, 0); + unknown = (IUnknown *)create_pipeline_state(device, + root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + ID3D12RootSignature_Release(root_signature); + } else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) { vkd3d_test_set_context("root signature"); -- 2.19.2

2 1

[PATCH vkd3d 7/7] vkd3d: Implement private data for query heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1b2e82d689cf..ffce926e476a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2630,6 +2630,8 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&heap->private_store); + VK_CALL(vkDestroyQueryPool(device->vk_device, heap->vk_query_pool, NULL)); vkd3d_free(heap); @@ -2643,25 +2645,31 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetPrivateData(ID3D12QueryHeap *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_query_heap *heap = impl_from_ID3D12QueryHeap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetPrivateData(ID3D12QueryHeap *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_query_heap *heap = impl_from_ID3D12QueryHeap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetPrivateDataInterface(ID3D12QueryHeap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface, const WCHAR *name) @@ -2774,6 +2782,8 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return hresult_from_vk_result(vr); } + vkd3d_private_store_init(&object->private_store); + ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index afb0e9c26811..c0c15b245902 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -467,6 +467,8 @@ struct d3d12_query_heap struct d3d12_device *device; + struct vkd3d_private_store private_store; + uint64_t availability_mask[]; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 45faf0764d97..b8563b32e91e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,6 +2562,7 @@ static void test_private_data(void) D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; + D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; @@ -2592,6 +2593,7 @@ static void test_private_data(void) &IID_ID3D12Fence, &IID_ID3D12Heap, &IID_ID3D12PipelineState, + &IID_ID3D12QueryHeap, &IID_ID3D12Resource, &IID_ID3D12RootSignature, }; @@ -2687,6 +2689,16 @@ static void test_private_data(void) root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); ID3D12RootSignature_Release(root_signature); } + else if (IsEqualGUID(tests[i], &IID_ID3D12QueryHeap)) + { + vkd3d_test_set_context("query heap"); + query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION; + query_heap_desc.Count = 8; + query_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateQueryHeap(device, &query_heap_desc, + &IID_ID3D12QueryHeap, (void **)&unknown); + ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Resource)) { vkd3d_test_set_context("resource"); -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d: Implement private data for descriptor heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 13 +++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8b628a6bcbba..1b2e82d689cf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2373,6 +2373,8 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea struct d3d12_device *device = heap->device; unsigned int i; + vkd3d_private_store_destroy(&heap->private_store); + switch (heap->desc.Type) { case D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV: @@ -2424,25 +2426,31 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetPrivateData(ID3D12DescriptorHeap *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_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetPrivateData(ID3D12DescriptorHeap *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_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetPrivateDataInterface(ID3D12DescriptorHeap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorHeap *iface, const WCHAR *name) @@ -2526,6 +2534,8 @@ static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_ descriptor_heap->desc = *desc; + vkd3d_private_store_init(&descriptor_heap->private_store); + descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76a7a367b8e4..afb0e9c26811 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -449,6 +449,8 @@ struct d3d12_descriptor_heap struct d3d12_device *device; + struct vkd3d_private_store private_store; + BYTE descriptors[]; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 8dd25aa1ae23..45faf0764d97 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2560,6 +2560,7 @@ static void test_create_fence(void) static void test_private_data(void) { D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; + D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; @@ -2586,6 +2587,7 @@ static void test_private_data(void) &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, &IID_ID3D12CommandSignature, + &IID_ID3D12DescriptorHeap, &IID_ID3D12Device, &IID_ID3D12Fence, &IID_ID3D12Heap, @@ -2643,6 +2645,17 @@ static void test_private_data(void) NULL, &IID_ID3D12CommandSignature, (void **)&unknown); ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12DescriptorHeap)) + { + vkd3d_test_set_context("descriptor heap"); + descriptor_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; + descriptor_heap_desc.NumDescriptors = 16; + descriptor_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; + descriptor_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateDescriptorHeap(device, &descriptor_heap_desc, + &IID_ID3D12DescriptorHeap, (void **)&unknown); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) { vkd3d_test_set_context("device"); -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d: Implement private data for heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 13 +++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a0c53d385e19..3fb3c1e8209d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -144,6 +144,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&heap->private_store); + VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); pthread_mutex_destroy(&heap->mutex); @@ -159,25 +161,31 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) static HRESULT STDMETHODCALLTYPE d3d12_heap_GetPrivateData(ID3D12Heap *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_heap *heap = impl_from_ID3D12Heap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateData(ID3D12Heap *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_heap *heap = impl_from_ID3D12Heap(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(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) @@ -378,6 +386,8 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } + vkd3d_private_store_init(&heap->private_store); + heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d4ebb5e62fc6..a7c23f9fd4e9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -253,6 +253,8 @@ struct d3d12_heap uint32_t vk_memory_type; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_heap_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 67df4d932e0e..a8cad289841f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2565,6 +2565,7 @@ static void test_private_data(void) ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; + D3D12_HEAP_DESC heap_desc; IUnknown *test_object; ID3D12Device *device; ID3D12Object *object; @@ -2587,6 +2588,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12Heap, &IID_ID3D12PipelineState, &IID_ID3D12RootSignature, }; @@ -2652,6 +2654,17 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Heap)) + { + vkd3d_test_set_context("heap"); + heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&unknown); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12PipelineState)) { vkd3d_test_set_context("pipeline state"); -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d: Implement private data for root signatures.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 21 +++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 +++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b2f177c9798d..f0b61ec057d1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -107,6 +107,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature if (!refcount) { struct d3d12_device *device = root_signature->device; + vkd3d_private_store_destroy(&root_signature->private_store); d3d12_root_signature_cleanup(root_signature, device); vkd3d_free(root_signature); ID3D12Device_Release(&device->ID3D12Device_iface); @@ -118,25 +119,31 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetPrivateData(ID3D12RootSignature *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_root_signature *root_signature = impl_from_ID3D12RootSignature(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(&root_signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetPrivateData(ID3D12RootSignature *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_root_signature *root_signature = impl_from_ID3D12RootSignature(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(&root_signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetPrivateDataInterface(ID3D12RootSignature *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&root_signature->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignature *iface, const WCHAR *name) @@ -992,6 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; + vkd3d_private_store_init(&root_signature->private_store); + root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eef7d904f686..14f95bfa5d4a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -559,6 +559,8 @@ struct d3d12_root_signature VkSampler *static_samplers; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e381cb4810d..61b00e60ab4e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2586,6 +2586,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12RootSignature, }; if (!(device = create_device())) @@ -2598,14 +2599,14 @@ static void test_private_data(void) { if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) { - vkd3d_test_set_context("allocator"); + vkd3d_test_set_context("command 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"); + vkd3d_test_set_context("command 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); @@ -2616,7 +2617,7 @@ static void test_private_data(void) } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) { - vkd3d_test_set_context("queue"); + vkd3d_test_set_context("command 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; @@ -2649,6 +2650,11 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) + { + vkd3d_test_set_context("root signature"); + unknown = (IUnknown *)create_empty_root_signature(device, 0); + } else { unknown = NULL; -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Implement private data for command signatures.
by Józef Kucia 04 Jan '19

04 Jan '19

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 | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8708aaf98285..4bf11d4b9997 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4811,6 +4811,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSign { struct d3d12_device *device = signature->device; + vkd3d_private_store_destroy(&signature->private_store); + vkd3d_free((void *)signature->desc.pArgumentDescs); vkd3d_free(signature); @@ -4823,25 +4825,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSign static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetPrivateData(ID3D12CommandSignature *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_signature *signature = impl_from_ID3D12CommandSignature(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(&signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateData(ID3D12CommandSignature *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_signature *signature = impl_from_ID3D12CommandSignature(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(&signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateDataInterface(ID3D12CommandSignature *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&signature->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSignature *iface, const WCHAR *name) @@ -4926,6 +4934,8 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); + vkd3d_private_store_init(&object->private_store); + object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4e2650804bfa..eef7d904f686 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -815,6 +815,8 @@ struct d3d12_command_signature D3D12_COMMAND_SIGNATURE_DESC desc; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc, diff --git a/tests/d3d12.c b/tests/d3d12.c index 534fd93c01b5..9e381cb4810d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2559,6 +2559,8 @@ static void test_create_fence(void) static void test_private_data(void) { + D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; + D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; @@ -2581,6 +2583,7 @@ static void test_private_data(void) &IID_ID3D12CommandAllocator, &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, + &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, }; @@ -2622,6 +2625,18 @@ 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_ID3D12CommandSignature)) + { + vkd3d_test_set_context("command signature"); + argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + command_signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); + command_signature_desc.NumArgumentDescs = 1; + command_signature_desc.pArgumentDescs = &argument_desc; + command_signature_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandSignature(device, &command_signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&unknown); + ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) { vkd3d_test_set_context("device"); -- 2.19.2

2 1

[PATCH v2 7/8] mfplat: Implement IMFattributes::{SetUINT32,SetUINT64,GetUINT32,GetUINT64}.
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 50 +++++++++++++++++++++++++++++--------- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++-- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..9a4e41c430 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 06a49b237f..25c075781b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "propvarutil.h" #include "wine/heap.h" #include "wine/debug.h" @@ -536,7 +537,7 @@ static int mfattributes_finditem(mfattributes *object, REFGUID key, struct mfatt return index; } -static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value) +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value, BOOL verify_type) { HRESULT hres; struct mfattribute *attribute = NULL; @@ -547,7 +548,12 @@ static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIA if(!attribute) hres = MF_E_ATTRIBUTENOTFOUND; else - hres = PropVariantCopy(value, &attribute->value); + { + if(verify_type && (attribute->value.vt != value->vt)) + hres = MF_E_INVALIDTYPE; + else + hres = PropVariantCopy(value, &attribute->value); + } LeaveCriticalSection(&object->lock); @@ -560,7 +566,7 @@ static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PR TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return mfattributes_getitem(This, key, value); + return mfattributes_getitem(This, key, value, FALSE); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -594,19 +600,33 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt32(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt64(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -809,19 +829,27 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattributes_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + attrval.uhVal.QuadPart = value; + return mfattributes_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7f7f413096..4564f410d3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -414,6 +414,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -423,13 +425,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1

[PATCH v2 6/8] mfplat: Implement IMFAttributes::GetItemByIndex().
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 16 ++++++++++++++-- dlls/mfplat/tests/mfplat.c | 15 +++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f897325502..06a49b237f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -903,9 +903,21 @@ static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 i { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %d, %p, %p\n", This, index, key, value); + TRACE("(%p, %d, %p, %p)\n", This, index, key, value); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + if(index >= This->count) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + *key = This->attributes[This->count - index - 1]->key; + PropVariantCopy(value, &This->attributes[This->count - index - 1]->value); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5dcb641486..7f7f413096 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -765,21 +765,24 @@ static void test_IMFAttributes_item(void) hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); PropVariantClear(&ret_propvar); PropVariantClear(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; U(propvar).uhVal.QuadPart = 65536; hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + hr = IMFAttributes_GetItemByIndex(attributes, 2, &key, &ret_propvar); + ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex should fail: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1

[PATCH v2 5/8] mfplat: Implement IMFAttributes::DeleteItem().
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 21 +++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2877e9a929..f897325502 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -774,10 +774,27 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { mfattributes *This = impl_from_IMFAttributes(iface); + struct mfattribute *attribute = NULL; + int index = 0; - FIXME("%p, %s\n", This, debugstr_guid(key)); + TRACE("(%p, %s)\n", This, debugstr_guid(key)); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + index = mfattributes_finditem(This, key, &attribute); + if(attribute) + { + PropVariantClear(&attribute->value); + heap_free(attribute); + + This->count--; + for(; index < This->count; index++) + This->attributes[index] = This->attributes[index + 1]; + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 13c1d3cb2f..5dcb641486 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,7 +763,7 @@ static void test_IMFAttributes_item(void) ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); - todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); @@ -777,6 +777,9 @@ static void test_IMFAttributes_item(void) todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1

[PATCH v2 4/8] mfplat: Implement IMFAttributes::{SetItem,GetItem}.
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 158 ++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 88 +++++++++++++++++++ 3 files changed, 242 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..2877e9a929 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -35,6 +35,7 @@ #include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -448,10 +449,20 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } +struct mfattribute +{ + GUID key; + PROPVARIANT value; +}; + typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; LONG ref; + CRITICAL_SECTION lock; + struct mfattribute **attributes; + int count; + int allocated; } mfattributes; static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) @@ -491,6 +502,8 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) return ref; } +static void free_attribute_object(mfattributes *object); + static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) { mfattributes *This = impl_from_IMFAttributes(iface); @@ -500,19 +513,54 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!ref) { + free_attribute_object(This); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static int mfattributes_finditem(mfattributes *object, REFGUID key, struct mfattribute **attribute) +{ + int index; + + *attribute = NULL; + for(index = 0; index < object->count; index++) + { + if(IsEqualGUID(key, &object->attributes[index]->key)) + { + *attribute = object->attributes[index]; + break; + } + } + return index; +} + +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value) +{ + HRESULT hres; + struct mfattribute *attribute = NULL; + + EnterCriticalSection(&object->lock); + + mfattributes_finditem(object, key, &attribute); + if(!attribute) + hres = MF_E_ATTRIBUTENOTFOUND; + else + hres = PropVariantCopy(value, &attribute->value); + + LeaveCriticalSection(&object->lock); + + return hres; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + return mfattributes_getitem(This, key, value); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -645,13 +693,82 @@ static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, return E_NOTIMPL; } -static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT mfattributes_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) +{ + struct mfattribute *new_attribute = NULL; + int index; + + EnterCriticalSection(&object->lock); + + index = mfattributes_finditem(object, key, &new_attribute); + + if(!new_attribute) + { + if(index == object->allocated) + { + object->allocated *= 2; + object->attributes = heap_realloc(object->attributes, sizeof(struct mfattribute *) * object->allocated); + if(!object->attributes) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + } + + new_attribute = heap_alloc(sizeof(struct mfattribute)); + if(!new_attribute) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + new_attribute->key = *key; + + object->attributes[index] = new_attribute; + object->count++; + } + else + PropVariantClear(&new_attribute->value); + + PropVariantCopy(&new_attribute->value, value); + + LeaveCriticalSection(&object->lock); + + return S_OK; + } + +static BOOL is_type_valid(DWORD type) +{ + switch(type) + { + case MF_ATTRIBUTE_UINT32: + case MF_ATTRIBUTE_UINT64: + case MF_ATTRIBUTE_DOUBLE: + case MF_ATTRIBUTE_GUID: + case MF_ATTRIBUTE_STRING: + case MF_ATTRIBUTE_BLOB: + case MF_ATTRIBUTE_IUNKNOWN: + return TRUE; + default: + return FALSE; + } +} + +static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + if(!is_type_valid(value->vt)) + { + PROPVARIANT empty_value; + + PropVariantClear(&empty_value); + mfattributes_setitem(This, key, &empty_value); + return MF_E_INVALIDTYPE; + } + else + return mfattributes_setitem(This, key, value); } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) @@ -824,6 +941,31 @@ static void init_attribute_object(mfattributes *object, UINT32 size) { object->ref = 1; object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; + InitializeCriticalSection(&object->lock); + object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IMFAttributes.lock"); + if(!size) + size = 3; + object->attributes = heap_alloc_zero(sizeof(struct mfattribute*) * size); + object->count = 0; + object->allocated = size; +} + +static void free_attribute_object(mfattributes *object) +{ + int i; + + EnterCriticalSection(&object->lock); + + for(i = 0; i < object->count; i++) + { + PropVariantClear(&object->attributes[i]->value); + heap_free(object->attributes[i]); + } + + LeaveCriticalSection(&object->lock); + + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); } /*********************************************************************** @@ -901,6 +1043,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1368,6 +1511,7 @@ static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor * if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2064,6 +2208,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2426,6 +2571,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2940,6 +3086,7 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } @@ -3437,6 +3584,7 @@ static ULONG WINAPI mfsample_Release(IMFSample *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..e80a3b7cfc 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat propsys C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..13c1d3cb2f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "propvarutil.h" #include "wine/test.h" @@ -51,6 +52,7 @@ DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x8 DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -693,6 +695,91 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_IMFAttributes_item(void) +{ + IMFAttributes *attributes; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + GUID key; + + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "MFCreateAttributes failed: 0x%08x.\n", hr); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_STRING; + U(ret_propvar).pwszVal = NULL; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_SetItem should failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).lVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -708,6 +795,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_IMFAttributes_item(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH v2 3/8] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index a24d3e762b..e87787e947 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -299,6 +300,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -306,6 +365,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v2 2/8] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++ dlls/propsys/tests/propstore.c | 51 ++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc71654a8..19c5a24c92 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee433f..65d157d0cc 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613a8b..a24d3e762b 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,54 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + /* EXPECT_REF(serialized, 1); */ + /* IPersistSerializedPropStorage_Release(serialized); */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf8a1..bdd67fa6a5 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -- 2.20.1

1 0

[PATCH v2 1/8] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng 04 Jan '19

04 Jan '19

This series superseded patch 156218~156226. And it seems that patch will lose randomly when sending too much patches at a time. So I split it into a smaller series. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8c9f79e8d6 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.20.1

1 0

[PATCH] shell32/tests: Move the cursor away from the dropdown listbox.
by Huw Davies 04 Jan '19

04 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46275 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/shell32/tests/autocomplete.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0da164b464..4f81214b02 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -799,6 +799,8 @@ START_TEST(autocomplete) HRESULT r; MSG msg; IAutoComplete* ac; + RECT win_rect; + POINT orig_pos; r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x). Tests aborted.\n", r); @@ -809,6 +811,11 @@ START_TEST(autocomplete) ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); if (!hMainWnd) return; + /* Move the cursor away from the dropdown listbox */ + GetWindowRect(hMainWnd, &win_rect); + GetCursorPos(&orig_pos); + SetCursorPos(win_rect.left, win_rect.top); + test_invalid_init(); ac = test_init(); if (!ac) @@ -826,6 +833,7 @@ START_TEST(autocomplete) IAutoComplete_Release(ac); cleanup: + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hEdit); DestroyWindow(hMainWnd); -- 2.18.0

1 0

[PATCH] po: Update Sinhala translation
by Isira Seneviratne 04 Jan '19

04 Jan '19

1 0

[PATCH v3] systray: Hide systray for fullscreen games
by Hamish Claxton 04 Jan '19

04 Jan '19

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Furthermore it also handles borderless fullscreen modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- v3: Rewritten - properly checks the foreground window. Also now supports fullscreen borderless modes. programs/explorer/systray.c | 68 +++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..0d727a7302 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -99,7 +99,7 @@ static unsigned int alloc_displayed; static unsigned int nb_displayed; static struct icon **displayed; /* array of currently displayed icons */ -static BOOL hide_systray, enable_shell; +static BOOL systray_hidden, hide_systray, enable_shell; static int icon_cx, icon_cy, tray_width, tray_height; static int start_button_width, taskbar_button_width; static WCHAR start_label[50]; @@ -107,6 +107,9 @@ static WCHAR start_label[50]; static struct icon *balloon_icon; static HWND balloon_window; +/* Fullscreen checking */ +static BOOL fullscreen; + #define MIN_DISPLAYED 8 #define ICON_BORDER 2 @@ -780,7 +783,13 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + /* Show the systray if the foreground window is not fullscreen */ + else if ( !fullscreen ) { + do_show_systray(); + systray_hidden = FALSE; + InvalidateRect( tray_window, NULL, TRUE ); /* Force a redraw of the systray */ + SendMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, 0, 0 ); /* Notify desktop of update */ + } break; case WM_TIMER: @@ -879,6 +888,60 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } +/* + Check if a window is fullscreen, accounting for a maximum + difference of two pixels on width and height for borderless + fullscreen modes +*/ +static BOOL is_window_fullscreen( HWND window ) +{ + int width_delta, height_delta; + RECT window_rect, desktop_rect; + + if ( window == GetShellWindow() + || window == GetDesktopWindow() + || window == tray_window ) return FALSE; + + GetWindowRect( window, &window_rect ); + GetWindowRect( GetDesktopWindow(), &desktop_rect ); + + width_delta = window_rect.right - desktop_rect.right; + height_delta = window_rect.bottom - desktop_rect.bottom; + + return ( width_delta >= 0 + && width_delta <= 2 + && height_delta >= 0 + && height_delta <= 2 ); +} + +/* Handle systray visibilty */ +void handle_systray( void ) +{ + /* Check if fullscreen and the foreground window is not fullscreen */ + if ( fullscreen && !is_window_fullscreen( GetForegroundWindow() ) ) + fullscreen = FALSE; + + /* Check if not fullscreen and the foreground window is fullscreen */ + else if ( !fullscreen && is_window_fullscreen( GetForegroundWindow() ) ) + fullscreen = TRUE; + + /* Hide the systray */ + if ( ( hide_systray || ( !nb_displayed && !enable_shell ) + || fullscreen ) && !systray_hidden ) + { + do_hide_systray(); + systray_hidden = TRUE; + } + + /* Show the systray */ + else if ( !fullscreen && systray_hidden ) + { + do_show_systray(); + systray_hidden = FALSE; + InvalidateRect( tray_window, NULL, TRUE ); /* Force a redraw of the systray */ + } +} + /* notification posted to the desktop window */ void handle_parent_notify( HWND hwnd, WPARAM wp ) { @@ -893,6 +956,7 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) break; } sync_taskbar_buttons(); + handle_systray(); } /* this function creates the listener window */ -- 2.20.1

1 0

[PATCH v2] systray: Hide systray for fullscreen games
by Hamish Claxton 04 Jan '19

04 Jan '19

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- v2: Properly do the resolution checks programs/explorer/systray.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..893a9dadda 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -780,7 +780,11 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + else { + if ( !( GetSystemMetrics( SM_CXFULLSCREEN ) >= GetSystemMetrics( SM_CXSCREEN ) + && GetSystemMetrics( SM_CYFULLSCREEN ) >= GetSystemMetrics( SM_CYSCREEN ) ) ) + do_show_systray(); + } break; case WM_TIMER: -- 2.20.1

4 5

[PATCH] kernel32: properly handle FindFirstFileEx flags
by Dorian Wouters 04 Jan '19

04 Jan '19

- 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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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 03 Jan '19

03 Jan '19

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

[PATCH vkd3d 3/5] vkd3d: Implement private data for command allocators.
by Józef Kucia 03 Jan '19

03 Jan '19

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 | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d27754029bba..b947ad2f00db 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1016,6 +1016,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&allocator->private_store); + if (allocator->current_command_list) d3d12_command_list_allocator_destroyed(allocator->current_command_list); @@ -1043,25 +1045,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetPrivateData(ID3D12CommandAllocator *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_allocator *allocator = impl_from_ID3D12CommandAllocator(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(&allocator->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateData(ID3D12CommandAllocator *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_allocator *allocator = impl_from_ID3D12CommandAllocator(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(&allocator->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetPrivateDataInterface(ID3D12CommandAllocator *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&allocator->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAllocator *iface, const WCHAR *name) @@ -1232,6 +1240,8 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; + vkd3d_private_store_init(&allocator->private_store); + allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 79b94d4d1f1d..24d41e84fa45 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -693,6 +693,8 @@ struct d3d12_command_allocator struct d3d12_command_list *current_command_list; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_allocator_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index ef979cc5f0e5..70ee83ef3428 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2561,6 +2561,7 @@ 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; @@ -2578,6 +2579,7 @@ static void test_private_data(void) static const DWORD data[] = {1, 2, 3, 4}; static const GUID *tests[] = { + &IID_ID3D12CommandAllocator, &IID_ID3D12CommandQueue, &IID_ID3D12Fence, }; @@ -2591,7 +2593,17 @@ static void test_private_data(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { object = NULL; - if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) + if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) + { + vkd3d_test_set_context("allocator"); + 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); + ID3D12CommandAllocator_Release(allocator); + } + else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) { vkd3d_test_set_context("queue"); queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; -- 2.19.2

2 1

[PATCH vkd3d] tests: Modify ps_movc shader to avoid crashes on Windows.
by Józef Kucia 03 Jan '19

03 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 314f08a2fb7a..defcd288b271 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, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, - 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, + 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, 0x0000008c, 0x00000050, 0x00000023, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x03000065, 0x001020f2, 0x00000000, + 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] comctl32/tests: Move the cursor over the treeview to avoid random mouse move messages.
by Huw Davies 03 Jan '19

03 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45719 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c60aa8a6c4..8ba7f543de 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2809,7 +2809,7 @@ static void test_right_click(void) HTREEITEM selected; RECT rc; LRESULT result; - POINT pt; + POINT pt, orig_pos; hTree = create_treeview_control(0); fill_tree(hTree); @@ -2828,6 +2828,8 @@ static void test_right_click(void) pt.x = (rc.left + rc.right) / 2; pt.y = (rc.top + rc.bottom) / 2; ClientToScreen(hMainWnd, &pt); + GetCursorPos(&orig_pos); + SetCursorPos(pt.x, pt.y); flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2843,6 +2845,7 @@ static void test_right_click(void) selected = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); ok(selected == hChild, "child item should still be selected\n"); + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hTree); } -- 2.18.0

1 0

[PATCH 2/2] po: Updated Sinhala translation.
by Isira Seneviratne 03 Jan '19

03 Jan '19

2 2

[PATCH 1/2] po: Updated French translation.
by Isira Seneviratne 03 Jan '19

03 Jan '19

3 2

[PATCH] msi: Return an error code instead of a button id in msi_change_media().
by Alexandre Julliard 03 Jan '19

03 Jan '19

Found while trying to install Borland C++ Builder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3d4a8c09eb6e..5f8c26a34436 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) -- 2.19.2

2 1

Wine staging 4.0-rc4 release
by Alistair Leslie-Hughes 02 Jan '19

02 Jan '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc4 (830 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * urlmon/tests: Add test for opening cache file with DELETE access. * appwiz.cpl: Copy addons to cache instead of moving. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[RFC PATCH] port: Provide ucrt compat functions required for mingw build.
by Jacek Caban 02 Jan '19

02 Jan '19

Hi all, Recent mingw-w64 changed quite a lot its crt to be able to support different runtime DLLs (most notably both msvcrt.dll and ucrtbase.dll at the same time). This requires some compat code to be used depending on which DLL is used. Compat code lives in the same libraries as are used as importlibs (like libmsvcrt.a). Wine doesn't use this library and generates its own import library instead. This library misses compat code required by mingw startup code. Commit 32bac734632cf082da40a82de7f3135262688351 worked around the build problem by exporting more functions from our msvcrt. The problem is that those functions are not exported on Windows, so Wine DLLs compiled this way will fail to load on Windows. The attached patch adds required compat code from mingw-w64 (it's mostly just a copy of its code). It's just a proof of concept - if we want that, we'd need to make sure it builds with old mingw-w64 first. The solution has its problems: for example we may need to extend that in the future if more such changes will happen to be needed on mingw-w64 side. Also __acrt_iob_func situation is even more tricky than onexit table functions. It's pulled by code that is so late in linker order, that linker will not pull it from our lib. It happens to work because it's in the same object file as other onexit table functions which are pulled earlier in the process (so using GC sections could break it). It's not really nice, but it looks like a maintainable solution. Comments or better ideas are welcomed. Jacek --- libs/port/Makefile.in | 1 + libs/port/ucrt.c | 90 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 libs/port/ucrt.c

1 0

[PATCH] po: Update French translation
by Isira Seneviratne 02 Jan '19

02 Jan '19

1 0

[PATCH] po: Update French translation
by Isira Seneviratne 02 Jan '19

02 Jan '19

1 0

[PATCH] riched20: Fix a use after free.
by Zhiyi Zhang 02 Jan '19

02 Jan '19

In ME_DestroyEditor(), the item list is being freed when calling get_total_width() in destroy_para(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9bacc6315d..2bb285866b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3183,13 +3183,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) void ME_DestroyEditor(ME_TextEditor *editor) { - ME_DisplayItem *pFirst = editor->pBuffer->pFirst; - ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_DisplayItem *p = editor->pBuffer->pFirst, *pNext = NULL; ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); + editor->pBuffer->pFirst = NULL; while(p) { pNext = p->next; if (p->type == diParagraph) -- 2.19.2

2 1

[PATCH] dbghelp: Support full memory dumps.
by Eric Bissonnette 01 Jan '19

01 Jan '19

Add support of flag MinidumpWithFullMemory in function MinidumpWriteDump. A Memory64ListStream is added to the minidump streams and all memory regions of the process with MEM_COMMIT state are written to the last part of the minidump file. Signed-off-by: Eric Bissonnette <ebisso.dev(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 9 +++ dlls/dbghelp/minidump.c | 129 ++++++++++++++++++++++++++++++++++++++--- include/dbghelp.h | 13 +++++ 3 files changed, 144 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ae8bc50..8083408 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -471,6 +471,12 @@ struct dump_memory ULONG rva; }; +struct dump_memory64 +{ + ULONG64 base; + ULONG64 size; +}; + struct dump_module { unsigned is_elf; @@ -509,6 +515,9 @@ struct dump_context struct dump_memory* mem; unsigned num_mem; unsigned alloc_mem; + struct dump_memory64* mem64; + unsigned num_mem64; + unsigned alloc_mem64; /* callback information */ MINIDUMP_CALLBACK_INFORMATION* cb; }; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 04dc775..ad69ba5 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,6 +294,49 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } +void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +{ + if (!dc->mem64) + { + dc->alloc_mem64 = 32; + dc->mem64 = HeapAlloc(GetProcessHeap(), 0, dc->alloc_mem64 * sizeof(*dc->mem64)); + } + else if (dc->num_mem64 >= dc->alloc_mem64) + { + dc->alloc_mem64 *= 2; + dc->mem64 = HeapReAlloc(GetProcessHeap(), 0, dc->mem64, + dc->alloc_mem64 * sizeof(*dc->mem64)); + } + if (dc->mem64) + { + dc->mem64[dc->num_mem64].base = base; + dc->mem64[dc->num_mem64].size = size; + dc->num_mem64++; + } + else dc->num_mem64 = dc->alloc_mem64 = 0; +} + +static void fetch_memory64_info(struct dump_context* dc) +{ + ULONG_PTR addr; + MEMORY_BASIC_INFORMATION mbi; + + addr = 0; + while (VirtualQueryEx(dc->hProcess, (LPCVOID)addr, &mbi, sizeof(mbi)) != 0) + { + /* Memory regions with state MEM_COMMIT will be added to the dump */ + if (mbi.State == MEM_COMMIT) + { + minidump_add_memory64_block(dc, (ULONG_PTR)mbi.BaseAddress, mbi.RegionSize); + } + + if ((addr + mbi.RegionSize) < addr) + break; + + addr = (ULONG_PTR)mbi.BaseAddress + mbi.RegionSize; + } +} + static void fetch_modules_info(struct dump_context* dc) { EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); @@ -831,6 +874,60 @@ static unsigned dump_memory_info(struct dump_context* dc) return sz; } +/****************************************************************** + * dump_memory64_info + * + * dumps information about the memory of the process (virtual memory) + */ +static unsigned dump_memory64_info(struct dump_context* dc) +{ + MINIDUMP_MEMORY64_LIST mdMem64List; + MINIDUMP_MEMORY_DESCRIPTOR64 mdMem64; + DWORD written; + unsigned i, len, sz; + RVA rva_base; + char tmp[1024]; + ULONG64 pos; + LARGE_INTEGER filepos; + + sz = sizeof(mdMem64List.NumberOfMemoryRanges) + + sizeof(mdMem64List.BaseRva) + + dc->num_mem64 * sizeof(mdMem64); + + mdMem64List.NumberOfMemoryRanges = dc->num_mem64; + mdMem64List.BaseRva = dc->rva + sz; + + append(dc, &mdMem64List.NumberOfMemoryRanges, + sizeof(mdMem64List.NumberOfMemoryRanges)); + append(dc, &mdMem64List.BaseRva, + sizeof(mdMem64List.BaseRva)); + + rva_base = dc->rva; + dc->rva += dc->num_mem64 * sizeof(mdMem64); + + /* dc->rva is not updated past this point. The end of the dump + * is just the full memory data. */ + filepos.QuadPart = dc->rva; + for (i = 0; i < dc->num_mem64; i++) + { + mdMem64.StartOfMemoryRange = dc->mem64[i].base; + mdMem64.DataSize = dc->mem64[i].size; + SetFilePointerEx(dc->hFile, filepos, NULL, FILE_BEGIN); + for (pos = 0; pos < dc->mem64[i].size; pos += sizeof(tmp)) + { + len = min(dc->mem64[i].size - pos, sizeof(tmp)); + if (ReadProcessMemory(dc->hProcess, + (void*)(ULONG_PTR)(dc->mem64[i].base + pos), + tmp, len, NULL)) + WriteFile(dc->hFile, tmp, len, &written, NULL); + } + filepos.QuadPart += mdMem64.DataSize; + writeat(dc, rva_base + i * sizeof(mdMem64), &mdMem64, sizeof(mdMem64)); + } + + return sz; +} + static unsigned dump_misc_info(struct dump_context* dc) { MINIDUMP_MISC_INFO mmi; @@ -876,6 +973,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.mem = NULL; dc.num_mem = 0; dc.alloc_mem = 0; + dc.mem64 = NULL; + dc.num_mem64 = 0; + dc.alloc_mem64 = 0; dc.rva = 0; if (!fetch_process_info(&dc)) return FALSE; @@ -890,8 +990,6 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, if (DumpType & MiniDumpWithDataSegs) FIXME("NIY MiniDumpWithDataSegs\n"); - if (DumpType & MiniDumpWithFullMemory) - FIXME("NIY MiniDumpWithFullMemory\n"); if (DumpType & MiniDumpWithHandleData) FIXME("NIY MiniDumpWithHandleData\n"); if (DumpType & MiniDumpFilterMemory) @@ -940,11 +1038,15 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); - mdDir.StreamType = MemoryListStream; - mdDir.Location.Rva = dc.rva; - mdDir.Location.DataSize = dump_memory_info(&dc); - writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), - &mdDir, sizeof(mdDir)); + + if (!(DumpType & MiniDumpWithFullMemory)) + { + mdDir.StreamType = MemoryListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; @@ -977,12 +1079,25 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, } } + /* 3.4) write full memory (if requested) */ + if (DumpType & MiniDumpWithFullMemory) + { + fetch_memory64_info(&dc); + + mdDir.StreamType = Memory64ListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory64_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } + /* fill the remaining directory entries with 0's (unused stream types) */ /* NOTE: this should always come last in the dump! */ for (i = idx_stream; i < nStreams; i++) writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir)); HeapFree(GetProcessHeap(), 0, dc.mem); + HeapFree(GetProcessHeap(), 0, dc.mem64); HeapFree(GetProcessHeap(), 0, dc.modules); HeapFree(GetProcessHeap(), 0, dc.threads); diff --git a/include/dbghelp.h b/include/dbghelp.h index 6e8d375..4210616 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -747,6 +747,19 @@ typedef struct _MINIDUMP_MEMORY_LIST MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[1]; /* FIXME: 0-sized array not supported */ } MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 +{ + ULONG64 StartOfMemoryRange; + ULONG64 DataSize; +} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; + +typedef struct _MINIDUMP_MEMORY64_LIST +{ + ULONG64 NumberOfMemoryRanges; + RVA64 BaseRva; + MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; + #define MINIDUMP_MISC1_PROCESS_ID 0x00000001 #define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 -- 1.8.3.1

1 0

[PATCH 2/2] comctl32/listview: Add FIXMEs for LVM_MOVEITEMTOGROUP and LVM_MOVEGROUP messages
by Isira Seneviratne 30 Dec '18

30 Dec '18

3 2

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-devel