November 2018 - Wine-devel - list.winehq.org

[PATCH v2] pdh: Add PdhVbAddCounter stub.
by Andrey Gusev 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44109 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa39f0..5f61a8a42c 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b648d8b8e6..bc3674a28a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1083,6 +1083,18 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) return PDH_CSTATUS_NO_COUNTER; } +/*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */ -- 2.17.2

1 0

[PATCH] oleaut32: Fix calling function with instance and VARIANT return type.
by Dmitry Timoshkov 13 Nov '18

13 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 59 +++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 16 ++++++++-- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 03031743df..90f0cb256e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1199,11 +1199,41 @@ static HRESULT WINAPI ret_false_func(void) return S_FALSE; } -static const void *vtable[] = { NULL, NULL, NULL, inst_func }; +static const WCHAR testW[] = { 'T','e','s','t',0 }; + +static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(ret) == VT_I4 || broken(V_VT(ret) == VT_VARIANT) /* win64 */, "unexpected %d\n", V_VT(ret)); + ok(V_I4(ret) == 1234, "unexpected %d\n", V_I4(ret)); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void *vtable[] = { NULL, NULL, NULL, inst_func }; +static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; static void test_DispCallFunc(void) { - const void **inst = vtable; + void **inst; HRESULT res; VARIANT result, args[5]; VARIANTARG *pargs[5]; @@ -1212,6 +1242,30 @@ static void test_DispCallFunc(void) for (i = 0; i < 5; i++) pargs[i] = &args[i]; + memset( args, 0x55, sizeof(args) ); + + types[0] = VT_VARIANT; + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 2; + types[1] = VT_VARIANT; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(testW); + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)variant_func2, CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + V_VT(&result) = VT_I4; + V_UI4(&result) = 1234; + inst = vtable2; + res = DispCallFunc(&inst, 3 * sizeof(void *), CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + VariantClear(&args[1]); + memset( args, 0x55, sizeof(args) ); types[0] = VT_UI4; V_UI4(&args[0]) = 1; @@ -1310,6 +1364,7 @@ static void test_DispCallFunc(void) types[0] = VT_I4; V_I4(&args[0]) = 3; memset( &result, 0xcc, sizeof(result) ); + inst = vtable; res = DispCallFunc( &inst, 3 * sizeof(void*), CC_STDCALL, VT_I4, 1, types, pargs, &result ); ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) ); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4555802a61..52d335fe47 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6720,7 +6720,13 @@ DispCallFunc( break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD)pvargResult; /* arg 1 is a pointer to the result */ + } + else + args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args, &stack_offset ); break; case VT_I8: @@ -6806,7 +6812,13 @@ DispCallFunc( break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ + if (pvInstance) + { + args[0] = (DWORD_PTR)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD_PTR)pvargResult; /* arg 1 is a pointer to the result */ + } + else + args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args ); break; case VT_HRESULT: -- 2.17.1

2 4

[PATCH v4 1/7] comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it
by Gabriel Ivăncescu 13 Nov '18

13 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index d0e8e60..3d8804a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2516,6 +2516,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED) -- 2.19.1

2 10

[PATCH vkd3d 4/8] tests: Add more tests for mapping resources.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1ddf7c2d4a48..e98dbfae18af 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5364,11 +5364,13 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); @@ -5385,8 +5387,10 @@ static void test_map_resource(void) else { /* The data pointer must be NULL for the UNKNOWN layout. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); } @@ -5401,11 +5405,39 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + ID3D12Resource_Release(resource); + + heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + + data = NULL; hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 0, NULL); + + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 1, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + data = NULL; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 1, NULL); + ID3D12Resource_Unmap(resource, 0, NULL); ID3D12Resource_Release(resource); -- 2.18.1

2 1

[PATCH vkd3d 8/8] vkd3d-shader: Avoid SIZE_T.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7b034482a7c6..22cf57ca9dab 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1651,7 +1651,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha DWORD opcode_token, opcode, previous_token; struct vkd3d_sm4_data *priv = data; unsigned int i, len; - SIZE_T remaining; + size_t remaining; const DWORD *p; DWORD precise; @@ -1679,7 +1679,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %zu).\n", len, remaining); goto fail; } --len; @@ -1980,7 +1980,7 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) return shader_parse_signature(tag, data, data_size, is); } -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) { int ret; @@ -2056,7 +2056,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc) vkd3d_shader_free_shader_signature(&desc->patch_constant_signature); } -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) { int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 651a5959f1d1..da17e361d4ab 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -795,11 +795,11 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; BOOL shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler; -- 2.18.1

2 1

[PATCH vkd3d 7/8] tests: Add test for trying to map external vkd3d resource.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/vkd3d_api.c | 60 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index e0912c549147..ff5704dff778 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -816,7 +816,62 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, return vk_memory; } -static void test_vulkan_resource_present_state(void) +static void test_external_resource_map(void) +{ + struct vkd3d_image_resource_create_info resource_create_info; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + ID3D12Resource *vk_resource; + VkDeviceMemory vk_memory; + ID3D12Device *device; + VkDevice vk_device; + VkImage vk_image; + ULONG refcount; + HRESULT hr; + void *ptr; + + device = create_device(); + ok(device, "Failed to create device.\n"); + + vk_image = create_vulkan_image(device, 32, 32, + VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + vk_memory = allocate_vulkan_image_memory(device, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; + resource_create_info.vk_image = vk_image; + resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_create_info.desc.Alignment = 0; + resource_create_info.desc.Width = 32; + resource_create_info.desc.Height = 32; + resource_create_info.desc.DepthOrArraySize = 1; + resource_create_info.desc.MipLevels = 1; + resource_create_info.desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_create_info.desc.SampleDesc.Count = 1; + resource_create_info.desc.SampleDesc.Quality = 0; + resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_create_info.desc.Flags = 0; + resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; + hr = vkd3d_create_image_resource(device, &resource_create_info, &vk_resource); + ok(hr == S_OK, "Failed to create D3D12 resource for Vulkan image, hr %#x.\n", hr); + + ptr = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(vk_resource, 0, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (void *)0xdeadbeef, "Pointer was modified %p.\n", ptr); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); + ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + ID3D12Resource_Release(vk_resource); + vk_device = vkd3d_get_vk_device(device); + vkDestroyImage(vk_device, vk_image, NULL); + vkFreeMemory(vk_device, vk_memory, NULL); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void test_external_resource_present_state(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -989,6 +1044,7 @@ START_TEST(vkd3d_api) run_test(test_device_parent); run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); - run_test(test_vulkan_resource_present_state); + run_test(test_external_resource_map); + run_test(test_external_resource_present_state); run_test(test_formats); } -- 2.18.1

2 1

[PATCH vkd3d 6/8] vkd3d: Initialize all members of d3d12_resource for external vkd3d resources.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80265ca1b6ef..bfbbad58b808 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1321,16 +1321,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; + memset(object, 0, sizeof(*object)); + object->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; object->u.vk_image = create_info->vk_image; - object->vk_memory = VK_NULL_HANDLE; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; - object->map_count = 0; - object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; -- 2.18.1

2 1

[PATCH vkd3d 5/8] vkd3d: Do not modify pointer on mapping failures.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 40 +++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f4619efcfb1a..80265ca1b6ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -238,6 +238,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) { struct d3d12_device *device = heap->device; + HRESULT hr = S_OK; VkResult vr; int rc; @@ -259,18 +260,20 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **dat { WARN("Failed to map device memory, vr %d.\n", vr); heap->map_ptr = NULL; - *data = NULL; - pthread_mutex_unlock(&heap->mutex); - return hresult_from_vk_result(vr); } + + hr = hresult_from_vk_result(vr); } - *data = (BYTE *)heap->map_ptr + offset; - ++heap->map_count; + if (heap->map_ptr) + { + *data = (BYTE *)heap->map_ptr + offset; + ++heap->map_count; + } pthread_mutex_unlock(&heap->mutex); - return S_OK; + return hr; } static void d3d12_heap_unmap(struct d3d12_heap *heap) @@ -813,8 +816,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; struct d3d12_device *device; + HRESULT hr = S_OK; VkResult vr; - HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); @@ -853,14 +856,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { if (resource->heap) { - hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_data); + hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr); } else { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, - 0, VK_WHOLE_SIZE, 0, &resource->map_data))) < 0) + 0, VK_WHOLE_SIZE, 0, &resource->map_ptr))) < 0) WARN("Failed to map device memory, vr %d.\n", vr); hr = hresult_from_vk_result(vr); @@ -869,16 +872,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (FAILED(hr)) { WARN("Failed to map resource, hr %#x.\n", hr); - resource->map_data = NULL; - *data = NULL; - return hr; + resource->map_ptr = NULL; } } - *data = resource->map_data; - ++resource->map_count; + if (resource->map_ptr) + { + *data = resource->map_ptr; + ++resource->map_count; + } - return S_OK; + return hr; } static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT sub_resource, @@ -913,7 +917,7 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - resource->map_data = NULL; + resource->map_ptr = NULL; if (resource->heap) d3d12_heap_unmap(resource->heap); @@ -1148,7 +1152,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 } resource->map_count = 0; - resource->map_data = NULL; + resource->map_ptr = NULL; resource->heap_properties = *heap_properties; resource->heap_flags = heap_flags; @@ -1326,7 +1330,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; object->map_count = 0; - object->map_data = NULL; + object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index daa60cb74eaa..2fc31da08a96 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -231,7 +231,7 @@ struct d3d12_resource unsigned int flags; unsigned int map_count; - void *map_data; + void *map_ptr; struct d3d12_heap *heap; UINT64 heap_offset; -- 2.18.1

2 1

[PATCH vkd3d 3/8] vkd3d: Validate sub-resource index in d3d12_resource_Unmap().
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80e7319ac30a..f4619efcfb1a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -885,11 +885,19 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s const D3D12_RANGE *written_range) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; TRACE("iface %p, sub_resource %u, written_range %p.\n", iface, sub_resource, written_range); + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return; + } + if (!resource->map_count) { WARN("Resource %p is not mapped.\n", resource); -- 2.18.1

2 1

[PATCH vkd3d 2/8] vkd3d: Validate sub-resource index in d3d12_resource_Map().
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 8 ++++++++ libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index be8bbed54072..80e7319ac30a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -811,6 +811,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT const D3D12_RANGE *read_range, void **data) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; VkResult vr; HRESULT hr; @@ -826,6 +827,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT return E_INVALIDARG; } + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return E_INVALIDARG; + } + if (d3d12_resource_is_texture(resource)) { /* Textures seem to be mappable only on UMA adapters. */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d6c821b75884..daa60cb74eaa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -861,6 +861,11 @@ static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOU return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; } +static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D12_RESOURCE_DESC *desc) +{ + return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; +} + enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; -- 2.18.1

2 1