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

[PATCH 2/2] d3dcompiler: Use d3dcompiler_47 for importlib.
by Jacek Caban 31 Jul '18

31 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It is needed for winelib dxvk tests builds. It needs newer version than what we currently use for importlib. We currently have one import lib, like Windows SDK, but recent Windows SDK point to d3dcompiler_47 (like this patch). We might consider other approaches for this. mingw provides versioned import libs, so it's possible to link like -ld3dcompiler_47, explicitly choosing the version. It also provides 'default', not versioned d3dcompiler importlib. For example, this could be useful if we ever have to case which d3dcompiler* version is used by which d3dx9_* DLLs. dlls/d3dcompiler_43/Makefile.in | 1 - dlls/d3dcompiler_47/Makefile.in | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] d3dx9_36: Return a mesh in D3DXCreateTeapot
by André Hentschel 31 Jul '18

31 Jul '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=36884 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 62acd21..10b5f9b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5168,7 +5168,7 @@ HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, { FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); - return E_NOTIMPL; + return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency); } HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, -- 2.7.4

2 1

[PATCH] wmp: Make it possible to query IUnknown from IWMPControls.
by Nikolay Sivov 31 Jul '18

31 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/player.c | 4 +++- dlls/wmp/tests/oleobj.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 97fd66b79c..56b408f5b1 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1365,7 +1365,9 @@ static const IWMPNetworkVtbl WMPNetworkVtbl = { static HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) { - if(IsEqualGUID(riid, &IID_IDispatch)) { + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = iface; }else if(IsEqualGUID(riid, &IID_IWMPControls)) { *ppv = iface; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 6dfaa1c9e1..472b985244 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -889,7 +889,6 @@ static void test_ConnectionPoint(IOleObject *unk) IConnectionPoint_Release(point); } - static void test_wmp_ifaces(IOleObject *oleobj) { IWMPSettings *settings, *settings_qi; @@ -899,6 +898,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPControls *controls; VARIANT_BOOL vbool; IWMPNetwork *network; + IUnknown *unk; HRESULT hres; BSTR filename; BSTR url; @@ -913,9 +913,15 @@ static void test_wmp_ifaces(IOleObject *oleobj) player = NULL; hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); - ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(hres == E_NOINTERFACE, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); ok(player == NULL, "player != NULL\n"); + unk = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IUnknown, (void **)&unk); + ok(hres == S_OK, "Failed to get IUnknown, hr %#x.\n", hres); + ok(unk != NULL, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + IWMPControls_Release(controls); /* IWPNetwork */ -- 2.18.0

2 1

[PATCH v2 1/2] winevulkan: Expose driver vkGetInstanceProcAddr via winevulkan exports.
by Jacek Caban 31 Jul '18

31 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 12 insertions(+)

2 1

[PATCH v2 2/2] winevulkan: Mark ICD and thunking functions as private.
by Jacek Caban 31 Jul '18

31 Jul '18

We don't need them in importlib. We use them only for vulkan-1 forwarding, which doesn't need an importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/winevulkan.spec | 360 ++++++++++++++++++++-------------------- 2 files changed, 183 insertions(+), 183 deletions(-)

3 4

Re: [PATCH 13/13] msvcp90: Add implementation of _Concurrent_vector_Internal_push_back.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40335 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 error: patch failed: dlls/msvcp90/misc.c:2041 error: patch failed: dlls/msvcp90/misc.c:1616 error: patch failed: dlls/msvcp90/misc.c:2029 Task: Patch failed to apply

1 0

Re: [PATCH 12/13] msvcp90: Add implementation of _Concurrent_vector_Internal_compact.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40334 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 error: patch failed: dlls/msvcp90/misc.c:2041 error: patch failed: dlls/msvcp90/misc.c:1616 Task: Patch failed to apply

1 0

Re: [PATCH 11/13] msvcp90: Add implementation of _Concurrent_vector_Internal_swap.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40333 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 error: patch failed: dlls/msvcp90/misc.c:2041 Task: Patch failed to apply

1 0

Re: [PATCH 10/13] msvcp90: Add implementation of _Concurrent_vector_Internal_resize.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40332 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0

Re: [PATCH 09/13] msvcp90: Add implementation of _Concurrent_vector_Internal_grow_to_at_least_with_result.
by Marvin 31 Jul '18

31 Jul '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=40331 Your paranoid android. === debian9 (build) === error: patch failed: dlls/msvcp90/misc.c:2224 Task: Patch failed to apply

1 0