November 2018 - Wine-commits

Alex Henrie : kernel32: Remove duplicate spec file entries.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 305597439b34bdace061706c11f1dd91de13da1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=305597439b34bdace061706c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 12 22:35:06 2018 -0700 kernel32: Remove duplicate spec file entries. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4..f600c7e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -195,7 +195,6 @@ # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle -# @ stub BaseVerifyUnicodeString @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -286,13 +285,11 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateHardLinkTransactedA(str str ptr ptr) -@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) -# @ stub CreateHardLinkTransactedA -# @ stub CreateHardLinkTransactedW +@ stdcall CreateHardLinkTransactedA(str str ptr ptr) +@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str)

1 0

Alex Henrie : kernel32: Implement GetMaximumProcessorCount.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 8fae94c57a7c5182fdd1795a1724096bb3232015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fae94c57a7c5182fdd1795a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 23:37:49 2018 -0700 kernel32: Implement GetMaximumProcessorCount. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951..89482a6 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -329,6 +329,21 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) } /*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + SYSTEM_INFO si; + DWORD cpus; + + GetSystemInfo( &si ); + cpus = si.dwNumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ DWORD64 WINAPI GetEnabledXStateFeatures(void) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f600c7e..5490b07 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -715,7 +715,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long)

1 0

Nikolay Sivov : gdi32/tests: Fix some test failures on newer Win10 releases.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: ce3e220c26844ff2e7fca5fa5789eacd53ac803b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3e220c26844ff2e7fca5fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 13 12:03:35 2018 +0300 gdi32/tests: Fix some test failures on newer Win10 releases. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d07709..4f10e2f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,10 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == ERROR_CAN_NOT_COMPLETE || ret == 0xdeadbeef /* Win10 */, "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError());

1 0

Byeongsik Jeon : gdi32: Specify the suitable hinting flags explicitly.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 7da7930a10f22cf186e9454fec2807d75f239fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da7930a10f22cf186e9454f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Nov 13 09:27:09 2018 +0000 gdi32: Specify the suitable hinting flags explicitly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c..99b7d8c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,37 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_load_flags( UINT format ) +{ + FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + + if (format & GGO_UNHINTED) + return load_flags | FT_LOAD_NO_HINTING; + + switch (format & ~GGO_GLYPH_INDEX) + { + case GGO_BITMAP: + load_flags |= FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD_V; + break; + } + + return load_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6820,7 +6851,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Vector adv; INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FT_Int load_flags = get_load_flags(format); double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; @@ -6859,10 +6890,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, tategaki = check_unicode_tategaki(glyph); } - if(format & GGO_UNHINTED) { - load_flags |= FT_LOAD_NO_HINTING; - format &= ~GGO_UNHINTED; - } + format &= ~GGO_UNHINTED; if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1);

1 0

Alexandre Julliard : rpcrt4: Support stubless proxies on ARM.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: da383cb8e4fe62da4e638b6295e6041170344656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da383cb8e4fe62da4e638b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:07:49 2018 +0100 rpcrt4: Support stubless proxies on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/ndr_typelib.c | 6 +++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index ab24b81..56ef84d 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -17,8 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: Handle non-i386 architectures */ #include "config.h" @@ -155,6 +153,49 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) thunk->call_stubless = call_stubless_func; } +#elif defined(__arm__) + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC(call_stubless_func, + "push {r0-r3}\n\t" + "mov r2, sp\n\t" /* stack_top */ + "push {fp,lr}\n\t" + "mov fp, sp\n\t" + "ldr r0, [r0]\n\t" /* This->lpVtbl */ + "ldr r0, [r0,#-8]\n\t" /* MIDL_STUBLESS_PROXY_INFO */ + "ldr r1, [r0,#8]\n\t" /* info->FormatStringOffset */ + "ldrh r1, [r1,ip]\n\t" /* info->FormatStringOffset[index] */ + "ldr ip, [r0,#4]\n\t" /* info->ProcFormatString */ + "add r1, ip\n\t" /* info->ProcFormatString + offset */ + "ldr r0, [r0]\n\t" /* info->pStubDesc */ +#ifdef __SOFTFP__ + "mov r3, #0\n\t" +#else + "vpush {s0-s15}\n\t" /* store the s0-s15/d0-d7 arguments */ + "mov r3, sp\n\t" /* fpu_stack */ +#endif + "bl " __ASM_NAME("ndr_client_call") "\n\t" + "mov sp, fp\n\t" + "pop {fp,lr}\n\t" + "add sp, #16\n\t" + "bx lr" ); + +struct thunk +{ + DWORD ldr_ip; /* ldr ip,[pc] */ + DWORD ldr_pc; /* ldr pc,[pc] */ + DWORD index; + void *func; +}; + +static inline void init_thunk( struct thunk *thunk, unsigned int index ) +{ + thunk->ldr_ip = 0xe59fc000; /* ldr ip,[pc] */ + thunk->ldr_pc = 0xe59ff000; /* ldr pc,[pc] */ + thunk->index = index * sizeof(unsigned short); + thunk->func = call_stubless_func; +} + #else /* __i386__ */ #warning You must implement stubless proxies for your CPU diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f68e61e..215ea7d 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -579,7 +579,7 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, switch (tdesc->vt) { case VT_VARIANT: -#ifndef __i386__ +#if !defined(__i386__) && !defined(__arm__) *flags |= IsSimpleRef | MustFree; break; #endif @@ -608,9 +608,9 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, *basetype = FC_ENUM32; break; case TKIND_RECORD: -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) *flags |= IsByValue | MustFree; -#elif defined(__x86_64__) +#else if (attr->cbSizeInstance <= 8) *flags |= IsByValue | MustFree; else

1 0

Alexandre Julliard : rpcrt4: Support delegated proxies on ARM.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: e24f2f3b90937f00bb011c05af98f63d9934b920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24f2f3b90937f00bb011c05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:08:06 2018 +0100 rpcrt4: Support delegated proxies on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cstub.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 77b0faf..b85d411 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -167,6 +167,25 @@ typedef struct static const BYTE opcodes[16] = { 0x48, 0x8b, 0x49, 0x20, 0x48, 0x8b, 0x01, 0xff, 0xa0, 0, 0, 0, 0, 0x48, 0x8d, 0x36 }; +#elif defined(__arm__) + +static const DWORD opcodes[] = +{ + 0xe52d4004, /* push {r4} */ + 0xe5900010, /* ldr r0, [r0, #16] */ + 0xe5904000, /* ldr r4, [r0] */ + 0xe59fc008, /* ldr ip, [pc, #8] */ + 0xe08cc004, /* add ip, ip, r4 */ + 0xe49d4004, /* pop {r4} */ + 0xe59cf000 /* ldr pc, [ip] */ +}; + +typedef struct +{ + DWORD opcodes[ARRAY_SIZE(opcodes)]; + DWORD offset; +} vtbl_method_t; + #else #warning You must implement delegated proxies/stubs for your CPU

1 0

Józef Kucia : tests: Add more tests for mapping resources.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: vkd3d Branch: master Commit: bebda782c8ee47de6956e06aa89faef4d0da58c2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bebda782c8ee47de6956e06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:29 2018 +0100 tests: Add more tests for mapping resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1ddf7c2..e98dbfa 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);

1 0

Józef Kucia : vkd3d: Do not modify pointer on mapping failures.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: vkd3d Branch: master Commit: b4c36e389af4721298c2a79f239710242a6bc0e1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b4c36e389af4721298c2a79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:30 2018 +0100 vkd3d: Do not modify pointer on mapping failures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f4619ef..80265ca 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 daa60cb..2fc31da 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;

1 0

Józef Kucia : vkd3d: Initialize all members of d3d12_resource for external vkd3d resources.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: vkd3d Branch: master Commit: 11a1a9289e391a48f0f0e1524390c8ba944fac66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11a1a9289e391a48f0f0e15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:31 2018 +0100 vkd3d: Initialize all members of d3d12_resource for external vkd3d resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 80265ca..bfbbad5 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;

1 0

Józef Kucia : tests: Add test for trying to map external vkd3d resource.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: vkd3d Branch: master Commit: 9058193365c1a2d723bf0fc2dd73ca3265b82bc9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9058193365c1a2d723bf0fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 00:23:32 2018 +0100 tests: Add test for trying to map external vkd3d resource. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e0912c5..ff5704d 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); }

1 0