December 2019 - Wine-commits

Alexandre Julliard : makefiles: Add the builtin flag again after stripping.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 5b0ba5be0bf6a99435e46a5813e942ad6d34807a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b0ba5be0bf6a99435e46a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 18 21:05:58 2019 +0100 makefiles: Add the builtin flag again after stripping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47718 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 7451ee4433..6d1500534d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2424,6 +2424,7 @@ static void output_install_commands( struct makefile *make, const struct makefil case 'c': /* cross-compiled program */ output( "\tSTRIPPROG=%s-strip %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", crosstarget, install_sh, obj_dir_path( make, file ), dest ); + output( "\t%s --builtin %s\n", tools_path( make, "winebuild" ), dest ); break; case 'd': /* data file */ output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n",

1 0

Jacek Caban : rpcrt4: Fix implicit in attribute handling in write_param_fs.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 1aaf870039dfb8419ae060d8c67240df1366b953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aaf870039dfb8419ae060d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 18 20:56:58 2019 +0100 rpcrt4: Fix implicit in attribute handling in write_param_fs. Fixes regression caused by typelib marshaling rewrite. Spotted by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 13 +++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++++ dlls/rpcrt4/ndr_typelib.c | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index ac0969bdfa..8710645c61 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1571,6 +1571,14 @@ static HRESULT WINAPI Widget_Coclass_ptr(IWidget *iface, Coclass1 **in, Coclass1 return S_OK; } +static HRESULT WINAPI Widget_no_in_out(IWidget *iface, BSTR str, int i) +{ + ok(SysStringLen(str) == 4, "unexpected len\n"); + ok(!lstrcmpW(str, L"test"), "unexpected str %s\n", wine_dbgstr_w(str)); + ok(i == 5, "i = %d\n", i); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1629,6 +1637,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_myint, Widget_Coclass, Widget_Coclass_ptr, + Widget_no_in_out, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2441,6 +2450,10 @@ static void test_marshal_bstr(IWidget *widget, IDispatch *disp) out = in_ptr = in_out = NULL; hr = IWidget_bstr(widget, NULL, &out, &in_ptr, &in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); + + in = SysAllocString(L"test"); + hr = IWidget_no_in_out(widget, in, 5); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_marshal_variant(IWidget *widget, IDispatch *disp) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 14b80c4eec..f1e040ed4d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -72,6 +72,7 @@ enum IWidget_dispids DISPID_TM_TYPEDEF, DISPID_TM_COCLASS, DISPID_TM_COCLASS_PTR, + DISPID_TM_NOINOUT }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -373,6 +374,9 @@ library TestTypelib [id(DISPID_TM_COCLASS_PTR)] HRESULT Coclass_ptr([in] Coclass1 **in, [out] Coclass1 **out, [in, out] Coclass1 **in_out); + + [id(DISPID_TM_NOINOUT)] + HRESULT no_in_out(BSTR str, int i); } [ diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index dd3043e78b..cb5e4f17df 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1026,16 +1026,18 @@ static HRESULT write_param_fs(ITypeInfo *typeinfo, unsigned char *type, BOOL is_return, unsigned short *stack_offset) { USHORT param_flags = desc->paramdesc.wParamFlags; - int is_in = param_flags & PARAMFLAG_FIN; - int is_out = param_flags & PARAMFLAG_FOUT; TYPEDESC *tdesc = &desc->tdesc, *tfs_tdesc; unsigned short server_size; unsigned short stack_size = get_stack_size(typeinfo, tdesc); unsigned char basetype; unsigned short flags; + int is_in, is_out; size_t off = 0; HRESULT hr; + is_out = param_flags & PARAMFLAG_FOUT; + is_in = (param_flags & PARAMFLAG_FIN) || (!is_out && !is_return); + hr = get_param_info(typeinfo, tdesc, is_in, is_out, &server_size, &flags, &basetype, &tfs_tdesc);

1 0

Alistair Leslie-Hughes : dmime: IDirectMusicAudioPath Release primary buffer.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: fa66c1b3011a32036b42c436320212aa3b30ae3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa66c1b3011a32036b42c436… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 18 05:06:44 2019 +0000 dmime: IDirectMusicAudioPath Release primary buffer. In IDirectMusicAudioPath CreateStandardAudioPath we create a AudioPath object and assign it a primary buffer object which needs to be released. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index ac3121c0e0..1aadba92ae 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -108,6 +108,8 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + if (This->pPrimary) + IDirectSoundBuffer_Release(This->pPrimary); if (This->pDSBuffer) IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL;

1 0

Alexandre Julliard : tools: Upgrade the autoconf scripts.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: f6a1b37d132d516cf7577b697553c1a7e2050878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a1b37d132d516cf7577b69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 18 17:23:46 2019 +0100 tools: Upgrade the autoconf scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 679 ++++++++++++++++++++++++++++------------------------- tools/config.sub | 284 +++++++++++----------- tools/install-sh | 397 +++++++++++++++---------------- 3 files changed, 689 insertions(+), 671 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6a1b37d132d516cf757…

1 0

Nikolay Sivov : ole32/tests: Add equality tests for antimonikers.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 06479cb789d2f5768d78c10615cb84b550dfbac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06479cb789d2f5768d78c106… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 18 12:06:50 2019 +0300 ole32/tests: Add equality tests for antimonikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7b4bf5c0fa..7e77847837 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2025,6 +2025,9 @@ todo_wine IMoniker_Release(moniker2); /* Load with composed number > 1. */ + hr = CreateAntiMoniker(&moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); @@ -2034,6 +2037,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); todo_wine @@ -2076,6 +2087,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); todo_wine @@ -2087,10 +2106,27 @@ todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); + /* Back to initial value. */ + stream_write_dword(stream, 1); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); + IMoniker_Release(moniker2); } static void test_generic_composite_moniker(void)

1 0

Nikolay Sivov : ole32/tests: Add some more tests for item moniker hashing.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: adcb5f98d844aacd49b5c85aaad5f497c958d2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcb5f98d844aacd49b5c85a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 18 12:06:51 2019 +0300 ole32/tests: Add some more tests for item moniker hashing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7e77847837..b65c0115ca 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1747,6 +1747,20 @@ static void test_item_moniker(void) { NULL, L"Item1", NULL, L"Item2", S_FALSE }, { NULL, L"Item1", NULL, L"ITEM1", S_OK }, }; + static const struct + { + const WCHAR *delim; + const WCHAR *item; + DWORD hash; + } hash_tests[] = + { + { L"!", L"Test", 0x73c }, + { L"%", L"Test", 0x73c }, + { L"%", L"TEST", 0x73c }, + { L"%", L"T", 0x54 }, + { L"%", L"A", 0x41 }, + { L"%", L"a", 0x41 }, + }; IMoniker *moniker, *moniker2; HRESULT hr; DWORD moniker_type, i; @@ -1851,6 +1865,20 @@ todo_wine IMoniker_Release(moniker2); IMoniker_Release(moniker); + /* Hashing */ + + for (i = 0; i < ARRAY_SIZE(hash_tests); ++i) + { + hr = CreateItemMoniker(hash_tests[i].delim, hash_tests[i].item, &moniker); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); + ok(hash == hash_tests[i].hash, "%d: unexpected hash value %#x.\n", i, hash); + + IMoniker_Release(moniker); + } + hr = CreateItemMoniker(wszDelimiter, wszObjectName, &moniker); ok_ole_success(hr, CreateItemMoniker); @@ -1860,15 +1888,6 @@ todo_wine expected_item_moniker_comparison_data, sizeof(expected_item_moniker_comparison_data), 54, expected_display_name); - /* Hashing */ - - hr = IMoniker_Hash(moniker, &hash); - ok_ole_success(hr, IMoniker_Hash); - - ok(hash == 0x73c, - "Hash value != 0x73c, instead was 0x%08x\n", - hash); - /* IsSystemMoniker test */ hr = IMoniker_IsSystemMoniker(moniker, &moniker_type);

1 0

Nikolay Sivov : ole32/tests: Add PropVariantCopy() test for BSTR with embedded null.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 126cf25617613d282a73e42f357993ea13907de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=126cf25617613d282a73e42f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 18 12:06:52 2019 +0300 ole32/tests: Add PropVariantCopy() test for BSTR with embedded null. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/propvariant.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 18ecfa6528..2b7e6d7285 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -367,6 +367,19 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_BSTR...) failed\n"); + /* BSTR with embedded null */ + propvarSrc.vt = VT_BSTR; + U(propvarSrc).bstrVal = SysAllocStringLen(L"Test Str\0ing", 12); + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "Failed to copy propvar, hr %#x.\n", hr); + ok(SysStringLen(U(propvarDst).bstrVal) == 8, "Unexpected copy length.\n"); + ok(SysStringLen(U(propvarSrc).bstrVal) == 12, "Unexpected source length.\n"); + ok(!lstrcmpW(U(propvarSrc).bstrVal, U(propvarDst).bstrVal), "BSTR not copied properly\n"); + hr = PropVariantClear(&propvarSrc); + ok(hr == S_OK, "Failed to clear propvar, hr %#x.\n", hr); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "Failed to clear propvar, hr %#x.\n", hr); + propvarSrc.vt = VT_LPWSTR; U(propvarSrc).pwszVal = wszTestString; hr = PropVariantCopy(&propvarDst, &propvarSrc);

1 0

Nikolay Sivov : include: Add I1 vector definitions for PROPVARIANT.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: bfb1908055f552ec1cee86cdbaf370541e7edfee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb1908055f552ec1cee86cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 18 18:49:23 2019 +0300 include: Add I1 vector definitions for PROPVARIANT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propidl.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/propidl.idl b/include/propidl.idl index 71401cb454..f3d517d6b0 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -85,6 +85,7 @@ interface IPropertyStorage : IUnknown type *pElems; \ } name + TYPEDEF_CA(char, CAC); TYPEDEF_CA(unsigned char, CAUB); TYPEDEF_CA(short, CAI); TYPEDEF_CA(USHORT, CAUI); @@ -143,6 +144,7 @@ interface IPropertyStorage : IUnknown [case(VT_LPWSTR)] LPWSTR pwszVal; [case(VT_UNKNOWN)] IUnknown *punkVal; [case(VT_DISPATCH)] IDispatch *pdispVal; + [case(VT_I1|VT_VECTOR)] CAC cac; [case(VT_UI1|VT_VECTOR)] CAUB caub; [case(VT_I2|VT_VECTOR)] CAI cai; [case(VT_UI2|VT_VECTOR)] CAUI caui;

1 0

Chip Davis : winemac.drv: Pass the CAMetalLayer to MoltenVK.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 606424bbbc614f720ac6190151f9fe5cc3e57005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=606424bbbc614f720ac61901… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 23:58:17 2019 -0600 winemac.drv: Pass the CAMetalLayer to MoltenVK. It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 877653ea00..edbfab518e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3796,6 +3796,18 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 676adb435b..b02ad79f02 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -140,6 +140,7 @@ typedef struct macdrv_opaque_opengl_context* macdrv_opengl_context; #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -587,6 +588,7 @@ extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_conte extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index cc7f22f678..21e93827c1 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -282,7 +282,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS)

1 0

Chip Davis : winemac.drv: Support VK_EXT_metal_surface.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 1eba86fcccda74f1ea9c96054ab7dca33cd07d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eba86fcccda74f1ea9c9605… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 23:58:18 2019 -0600 winemac.drv: Support VK_EXT_metal_surface. Prefer it to VK_MVK_macos_surface when present. MoltenVK has deprecated VK_MVK_macos_surface in favor of VK_EXT_metal_surface. It's likely that the former extension will vanish at some point. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 62 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 21e93827c1..360dd02f7b 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -50,6 +50,9 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000 +typedef VkFlags VkMetalSurfaceCreateFlagsEXT; +#define VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT 1000217000 + struct wine_vk_surface { macdrv_metal_device device; @@ -65,9 +68,18 @@ typedef struct VkMacOSSurfaceCreateInfoMVK const void *pView; /* NSView */ } VkMacOSSurfaceCreateInfoMVK; +typedef struct VkMetalSurfaceCreateInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkMetalSurfaceCreateFlagsEXT flags; + const void *pLayer; /* CAMetalLayer */ +} VkMetalSurfaceCreateInfoEXT; + static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); +static VkResult (*pvkCreateMetalSurfaceEXT)(VkInstance, const VkMetalSurfaceCreateInfoEXT*, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); @@ -103,6 +115,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) + LOAD_FUNCPTR(vkCreateMetalSurfaceEXT) LOAD_FUNCPTR(vkDestroyInstance) LOAD_FUNCPTR(vkDestroySurfaceKHR) LOAD_FUNCPTR(vkDestroySwapchainKHR) @@ -159,7 +172,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo */ if (!strcmp(src->ppEnabledExtensionNames[i], "VK_KHR_win32_surface")) { - enabled_extensions[i] = "VK_MVK_macos_surface"; + enabled_extensions[i] = pvkCreateMetalSurfaceEXT ? "VK_EXT_metal_surface" : "VK_MVK_macos_surface"; } else { @@ -239,7 +252,6 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { VkResult res; - VkMacOSSurfaceCreateInfoMVK create_info_host; struct wine_vk_surface *mac_surface; struct macdrv_win_data *data; @@ -279,12 +291,26 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } - create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; - create_info_host.pNext = NULL; - create_info_host.flags = 0; /* reserved */ - create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); + if (pvkCreateMetalSurfaceEXT) + { + VkMetalSurfaceCreateInfoEXT create_info_host; + create_info_host.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT; + create_info_host.pNext = NULL; + create_info_host.flags = 0; /* reserved */ + create_info_host.pLayer = macdrv_view_get_metal_layer(mac_surface->view); + + res = pvkCreateMetalSurfaceEXT(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); + } + else + { + VkMacOSSurfaceCreateInfoMVK create_info_host; + create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; + create_info_host.pNext = NULL; + create_info_host.flags = 0; /* reserved */ + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); - res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); + res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); + } if (res != VK_SUCCESS) { ERR("Failed to create MoltenVK surface, res=%d\n", res); @@ -342,6 +368,7 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ uint32_t *count, VkExtensionProperties* properties) { unsigned int i; + BOOL seen_surface = FALSE; VkResult res; TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); @@ -353,8 +380,9 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ return VK_ERROR_LAYER_NOT_PRESENT; } - /* We will return the same number of instance extensions reported by the host back to - * winevulkan. Along the way we may replace MoltenVK extensions with their win32 equivalents. + /* We will return at most the same number of instance extensions reported by the host back to + * winevulkan. Along the way we may replace MoltenVK extensions with their win32 equivalents, + * or remove redundant extensions outright. * Winevulkan will perform more detailed filtering as it knows whether it has thunks * for a particular extension. */ @@ -364,14 +392,24 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ for (i = 0; i < *count; i++) { - /* For now the only MoltenVK extension we need to fixup. Long-term we may need an array. */ - if (!strcmp(properties[i].extensionName, "VK_MVK_macos_surface")) + /* For now the only MoltenVK extensions we need to fixup. Long-term we may need an array. */ + if (!strcmp(properties[i].extensionName, "VK_MVK_macos_surface") || + !strcmp(properties[i].extensionName, "VK_EXT_metal_surface")) { - TRACE("Substituting VK_MVK_macos_surface for VK_KHR_win32_surface\n"); + if (seen_surface) + { + /* If we've already seen a surface extension, just hide this one. */ + memmove(properties + i, properties + i + 1, (*count - i - 1) * sizeof(*properties)); + --*count; + --i; + continue; + } + TRACE("Substituting %s for VK_KHR_win32_surface\n", properties[i].extensionName); snprintf(properties[i].extensionName, sizeof(properties[i].extensionName), VK_KHR_WIN32_SURFACE_EXTENSION_NAME); properties[i].specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; + seen_surface = TRUE; } }

1 0