April 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : qedit/tests: Add some tests for sample grabber pin interfaces.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: eb5b2cfbc25632de6e7d7e3cf3668fa5da2d4138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5b2cfbc25632de6e7d7e3c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:50 2019 -0500 qedit/tests: Add some tests for sample grabber pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 5e4ee6e..04b63d3 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -71,7 +71,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_sample_grabber(); + IUnknown *unk; + HRESULT hr; ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -94,6 +97,39 @@ static void test_interfaces(void) check_interface(filter, &IID_ISeekingPassThru, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + /* Queries for IMediaPosition or IMediaSeeking do not seem to increase the + * reference count. */ + hr = IPin_QueryInterface(pin, &IID_IMediaPosition, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IPin_QueryInterface(pin, &IID_IMediaSeeking, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMemInputPin, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); }

1 0

Zebediah Figura : qedit/tests: Clean up and expand aggregation tests.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: a6b00b4db64082f0ab735be680d6b77a9fcb32e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b00b4db64082f0ab735be6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:51 2019 -0500 qedit/tests: Clean up and expand aggregation tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 148 +++++++++++++++++++++++---------------- dlls/qedit/tests/samplegrabber.c | 95 +++++++++++++++++++++++++ dlls/qedit/tests/timeline.c | 108 +++++++++++++++++++++++++++- 3 files changed, 288 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6b00b4db64082f0ab73…

1 0

Zebediah Figura : qedit: Fix return code for requesting aggregation with an interface other than IUnknown.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 96eb82f7012076b60a36ecc542488de38a2ddf7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=96eb82f7012076b60a36ecc5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:52 2019 -0500 qedit: Fix return code for requesting aggregation with an interface other than IUnknown. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 2 +- dlls/qedit/tests/mediadet.c | 2 +- dlls/qedit/tests/samplegrabber.c | 2 +- dlls/qedit/tests/timeline.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a46f3f0..578e9df 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -106,7 +106,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter *ppobj = NULL; if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) - return E_INVALIDARG; + return E_NOINTERFACE; hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); if (SUCCEEDED(hres)) { diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 62685af..34c43fd 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -82,7 +82,7 @@ static void test_aggregation(void) detector = (IMediaDet *)0xdeadbeef; hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (void **)&detector); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!detector, "Got interface %p.\n", detector); hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 76fdfbb..22f6ddb 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -400,7 +400,7 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index a1e38e0..9e24062 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -74,7 +74,7 @@ static void test_aggregation(void) timeline = (IAMTimeline *)0xdeadbeef; hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!timeline, "Got interface %p.\n", timeline); hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,

1 0

Zebediah Figura : widl: Correctly set the import library offset for all imported types.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 6c64d02117ecb9b259a55237f145fc9d5e70cdad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c64d02117ecb9b259a55237… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 17 00:14:55 2019 -0500 widl: Correctly set the import library offset for all imported types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47031 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index afca4c0..1177c1a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -497,6 +497,7 @@ struct _importinfo_t { }; struct _importlib_t { + int offset; char *name; int version; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cb4f0f3..4dcbc03 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -702,15 +702,15 @@ static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo) guid_idx = ctl2_alloc_guid(typelib, &guid); - alloc_importfile(typelib, guid_idx, importlib->version&0xffff, - importlib->version>>16, importlib->name); + importlib->offset = alloc_importfile(typelib, guid_idx, importlib->version & 0xffff, + importlib->version >> 16, importlib->name); } if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) { MSFT_ImpInfo impinfo; impinfo.flags = importinfo->flags; - impinfo.oImpFile = 0; + impinfo.oImpFile = importlib->offset; if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_GuidEntry guid;

1 0

Hans Leidekker : msi: Use KEY_WOW64_* flags in ACTION_Register/ UnregisterClassInfo.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 70732e273eb52821bfd725f3b1ea1919b8c0e3b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70732e273eb52821bfd725f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:25:28 2019 +0200 msi: Use KEY_WOW64_* flags in ACTION_Register/UnregisterClassInfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 25 ++++++++++++------------- dlls/msi/msipriv.h | 1 - 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 293aa10..7b0a4a4 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -747,7 +747,7 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) { static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; HKEY hkey, hkey2, hkey3; MSICLASS *cls; @@ -760,12 +760,12 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegCreateKeyW(HKEY_CLASSES_ROOT, keypath, &hkey) != ERROR_SUCCESS) + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) @@ -873,7 +873,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (cls->DefInprocHandler32) msi_reg_set_subkey_val( hkey2, szInprocHandler32, NULL, cls->DefInprocHandler32 ); - RegCloseKey(hkey2); /* if there is a FileTypeMask, register the FileType */ @@ -902,7 +901,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) index ++; } } - + uirow = MSI_CreateRecord(1); MSI_RecordSetStringW( uirow, 1, cls->clsid ); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); @@ -915,7 +914,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR szFileType[] = {'F','i','l','e','T','y','p','e','\\',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; MSICLASS *cls; HKEY hkey, hkey2; @@ -928,13 +927,13 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegOpenKeyW( HKEY_CLASSES_ROOT, keypath, &hkey ) != ERROR_SUCCESS) - return ERROR_SUCCESS; + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) + return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbab8e2..8354882 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1207,7 +1207,6 @@ static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szARM64[] = {'A','r','m','6','4',0}; -static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};

1 0

Zebediah Figura : quartz: Vend CLSID_NullRenderer from qedit.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: e9ad430ab61af81f094401984fdd4c4d8d39bfb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ad430ab61af81f09440198… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:53 2019 -0500 quartz: Vend CLSID_NullRenderer from qedit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 1 + dlls/qedit/main.c | 1 + dlls/{quartz => qedit}/nullrenderer.c | 25 ++++++------------------- dlls/qedit/qedit_classes.idl | 7 +++++++ dlls/qedit/qedit_private.h | 1 + dlls/quartz/Makefile.in | 1 - dlls/quartz/main.c | 1 - dlls/quartz/quartz_private.h | 1 - dlls/quartz/quartz_strmif.idl | 7 ------- 9 files changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 35ec0e3..b47ee26 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 C_SRCS = \ main.c \ mediadet.c \ + nullrenderer.c \ samplegrabber.c \ timeline.c diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 578e9df..a271f9a 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -60,6 +60,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_AMTimeline, AMTimeline_create }, { &CLSID_MediaDet, MediaDet_create }, + { &CLSID_NullRenderer, NullRenderer_create }, { &CLSID_SampleGrabber, SampleGrabber_create }, }; diff --git a/dlls/quartz/nullrenderer.c b/dlls/qedit/nullrenderer.c similarity index 93% rename from dlls/quartz/nullrenderer.c rename to dlls/qedit/nullrenderer.c index e17d19e..c19a90d 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -1,5 +1,5 @@ /* - * Null Renderer (Promiscuous, not rendering anything at all!) + * Null renderer filter * * Copyright 2004 Christian Costa * Copyright 2008 Maarten Lankhorst @@ -19,25 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "quartz_private.h" -#include "pin.h" - -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "windef.h" -#include "winbase.h" +#define COBJMACROS #include "dshow.h" -#include "evcode.h" -#include "strmif.h" -#include "ddraw.h" - -#include "wine/unicode.h" #include "wine/debug.h" +#include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(quartz); +WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct NullRendererImpl { @@ -89,7 +76,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r { NullRendererImpl *This = impl_from_IUnknown(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + TRACE("filter %p, iid %s, out %p.\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -112,7 +99,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r } if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/qedit/qedit_classes.idl b/dlls/qedit/qedit_classes.idl index 7dca0f1..35a5abd 100644 --- a/dlls/qedit/qedit_classes.idl +++ b/dlls/qedit/qedit_classes.idl @@ -33,6 +33,13 @@ coclass AMTimeline { interface IAMTimeline; interface IPersistStream; interface coclass MediaDet { interface IMediaDet; } [ + helpstring("Null Renderer"), + threading(both), + uuid(c1f400a4-3f08-11d3-9f0b-006008039e37) +] +coclass NullRenderer { interface IBaseFilter; } + +[ helpstring("Sample Grabber"), threading(both), uuid(c1f400a0-3f08-11d3-9f0b-006008039e37) diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 708c53d..344656d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -34,6 +34,7 @@ HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT NullRenderer_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; #endif /* __QEDIT_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 147d395..efd96db 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -16,7 +16,6 @@ C_SRCS = \ main.c \ memallocator.c \ mpegsplit.c \ - nullrenderer.c \ parser.c \ pin.c \ regsvr.c \ diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4575c6e..08287a7 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -74,7 +74,6 @@ static const struct object_creation_info object_creation[] = { &CLSID_AviSplitter, AVISplitter_create }, { &CLSID_MPEG1Splitter, MPEGSplitter_create }, { &CLSID_VideoRenderer, VideoRenderer_create }, - { &CLSID_NullRenderer, NullRenderer_create }, { &CLSID_VideoMixingRenderer, VMR7Impl_create }, { &CLSID_VideoMixingRenderer9, VMR9Impl_create }, { &CLSID_VideoRendererDefault, VideoRendererDefault_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 2104f80..8d4b6a3 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -59,7 +59,6 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index 44dc668..ab1af89 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -120,13 +120,6 @@ coclass DSoundRender { interface IBaseFilter; } coclass AudioRender { interface IBaseFilter; } [ - helpstring("Null Renderer"), - threading(both), - uuid(c1f400a4-3f08-11d3-9f0b-006008039e37) -] -coclass NullRenderer { interface IBaseFilter; } - -[ helpstring("Video Renderer"), threading(both), uuid(70e102b0-5556-11ce-97c0-00aa0055595a)

1 0

Józef Kucia : wined3d: Make the adapter responsible for creating devices.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 32c3afba51cdf20217a525c2a50d3822222d86ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c3afba51cdf20217a525c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:20 2019 +0200 wined3d: Make the adapter responsible for creating devices. 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> --- dlls/wined3d/adapter_gl.c | 33 +++++++++++++++++ dlls/wined3d/adapter_vk.c | 42 ++++++++++++++++++++++ dlls/wined3d/device.c | 82 ++++++++++++++++++++++-------------------- dlls/wined3d/directx.c | 50 +++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 10 ++++-- 5 files changed, 164 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c3afba51cdf20217a5…

1 0

Hans Leidekker : msi: Remove system environment variables on uninstall.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 7f95ed7cd2d440420c0c3d1a938af8b48960f352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f95ed7cd2d440420c0c3d1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 17 15:14:01 2019 +0200 msi: Remove system environment variables on uninstall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 849335e..03b6abf 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7050,7 +7050,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) else if (*cptr == '!') *flags |= ENV_ACT_REMOVEMATCH; else if (*cptr == '*') - *flags |= ENV_MOD_MACHINE; + *flags |= ENV_MOD_MACHINE | ENV_ACT_REMOVE; else break; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 951b89c..7750351 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -247,7 +247,8 @@ static const char env_environment_dat[] = "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var28\t-MSITESTVAR22\t1\tOne\n" - "Var29\t-MSITESTVAR23\t2\tOne\n"; + "Var29\t-MSITESTVAR23\t2\tOne\n" + "Var30\t*MSITESTVAR100\t1\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -4843,7 +4844,7 @@ static void test_envvar(void) { char buffer[16]; UINT r, i; - HKEY env; + HKEY env, env2; LONG res; if (is_process_limited()) @@ -4857,6 +4858,10 @@ static void test_envvar(void) res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Session Manager\\Environment", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env2, NULL); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4910,6 +4915,7 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1"); + CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4937,11 +4943,15 @@ todo_wine { ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); } + res = RegDeleteValueA(env2, "MSITESTVAR100"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); + RegCloseKey(env2); DeleteFileA(msifile); }

1 0

Hans Leidekker : msi: Get rid of a redundant get_registry_view call.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 5caebb2650e386904544a2c0326e2b0f1bd39bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5caebb2650e386904544a2c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:25:29 2019 +0200 msi: Get rid of a redundant get_registry_view call. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e2f91c3..5290806 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2922,7 +2922,7 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path) HKEY key; LONG res; - key = open_key(comp, root, path, FALSE, get_registry_view(comp) | KEY_READ); + key = open_key(comp, root, path, FALSE, KEY_READ); if (!key) return 0; res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0); @@ -2934,12 +2934,10 @@ static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path) static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { LONG res = ERROR_SUCCESS; - REGSAM access = 0; + REGSAM access = get_registry_view( comp ); WCHAR *subkey, *p; HKEY hkey; - access |= get_registry_view( comp ); - if (!(subkey = strdupW( path ))) return; do { @@ -2947,7 +2945,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); + hkey = open_key( comp, root, subkey, FALSE, READ_CONTROL ); if (!hkey) break; if (!is_key_empty(comp, hkey, p + 1)) {

1 0

Zebediah Figura : qedit/samplegrabber: Separate sink and source QueryInterface() implementations.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 7b6604d97f33be1638d85d249e99af849a9718e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b6604d97f33be1638d85d24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 15 23:20:49 2019 -0500 qedit/samplegrabber: Separate sink and source QueryInterface() implementations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 78 +++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c788fb2..e66a000 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -794,8 +794,30 @@ SampleGrabber_IMemInputPin_ReceiveCanBlock(IMemInputPin *iface) return This->memOutput ? IMemInputPin_ReceiveCanBlock(This->memOutput) : S_OK; } +static HRESULT WINAPI sample_grabber_sink_QueryInterface(IPin *iface, REFIID iid, void **out) +{ + SG_Pin *pin = impl_from_IPin(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPin)) + { + *out = iface; + } + else if (IsEqualGUID(iid, &IID_IMemInputPin)) + { + *out = &pin->sg->IMemInputPin_iface; + } + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; + } -/* SampleGrabber member pin implementation */ + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} /* IUnknown */ static ULONG WINAPI @@ -813,31 +835,6 @@ SampleGrabber_IPin_Release(IPin *iface) return ISampleGrabber_Release(&This->sg->ISampleGrabber_iface); } -/* IUnknown */ -static HRESULT WINAPI -SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) -{ - SG_Pin *This = impl_from_IPin(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMemInputPin)) - *ppv = &This->sg->IMemInputPin_iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(This->sg->seekthru_unk, riid, ppv); - else if (IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->sg->seekthru_unk, riid, ppv); - else { - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - /* IPin - input pin */ static HRESULT WINAPI SampleGrabber_In_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *mtype) @@ -1202,7 +1199,7 @@ static const IMemInputPinVtbl IMemInputPin_VTable = static const IPinVtbl IPin_In_VTable = { - SampleGrabber_IPin_QueryInterface, + sample_grabber_sink_QueryInterface, SampleGrabber_IPin_AddRef, SampleGrabber_IPin_Release, SampleGrabber_In_IPin_Connect, @@ -1222,9 +1219,34 @@ static const IPinVtbl IPin_In_VTable = SampleGrabber_IPin_NewSegment, }; +static HRESULT WINAPI sample_grabber_source_QueryInterface(IPin *iface, REFIID iid, void **out) +{ + SG_Pin *pin = impl_from_IPin(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IPin)) + { + *out = iface; + } + else if (IsEqualGUID(iid, &IID_IMediaPosition) || IsEqualGUID(iid, &IID_IMediaSeeking)) + { + return IUnknown_QueryInterface(pin->sg->seekthru_unk, iid, out); + } + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const IPinVtbl IPin_Out_VTable = { - SampleGrabber_IPin_QueryInterface, + sample_grabber_source_QueryInterface, SampleGrabber_IPin_AddRef, SampleGrabber_IPin_Release, SampleGrabber_Out_IPin_Connect,

1 0

Nikolay Sivov : mfplat/tests: Add a test for stream descriptor major type behavior.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 4c9517ee0d3de7850f9227dd8828190679ecde48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9517ee0d3de7850f9227dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 14:35:31 2019 +0300 mfplat/tests: Add a test for stream descriptor major type behavior. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 176f339..571d57a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -216,9 +216,13 @@ static void test_source_resolver(void) IMFAttributes *attributes; IMFMediaSource *mediasource; IMFPresentationDescriptor *descriptor; + IMFMediaTypeHandler *handler; MF_OBJECT_TYPE obj_type; + IMFStreamDescriptor *sd; HRESULT hr; WCHAR *filename; + BOOL selected; + GUID guid; static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; @@ -297,11 +301,23 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); - hr = IMFMediaSource_CreatePresentationDescriptor( - mediasource, &descriptor); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); + ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); ok(descriptor != NULL, "got %p\n", descriptor); + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); +todo_wine + ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + + IMFMediaTypeHandler_Release(handler); + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(bytestream);

1 0

Nikolay Sivov : mfreadwrite: Output warning for uninitialized stream descriptor.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 3e8b14adb38431a075eb9cc96f482f27d46f1fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8b14adb38431a075eb9cc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 14:35:30 2019 +0300 mfreadwrite: Output warning for uninitialized stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index fd9062f..7625669 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -727,7 +727,13 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor { hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + if (FAILED(hr)) + { + WARN("Failed to get stream major type, hr %#x.\n", hr); + continue; + } + + if (IsEqualGUID(&guid, major)) { return i; }

1 0

Józef Kucia : d3d11: Fix d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 51ef6190c771b56691696920da5d442a9eb001fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ef6190c771b56691696920… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:22 2019 +0200 d3d11: Fix d3d11_immediate_context_RSGetScissorRects(). 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> --- dlls/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 588395b..6b89a64 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2061,6 +2061,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock();

1 0

Józef Kucia : wined3d: Create Vulkan device for wined3d_device_vk.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: wine Branch: master Commit: 725c5156ef4b87e49d94289c3f071bf48e58c467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725c5156ef4b87e49d94289c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:21 2019 +0200 wined3d: Create Vulkan device for wined3d_device_vk. 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> --- dlls/wined3d/adapter_vk.c | 116 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 848c02c..813a027 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -27,6 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); struct wined3d_device_vk { struct wined3d_device d; + + VkDevice vk_device; + VkQueue vk_queue; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) @@ -45,6 +48,30 @@ static const char *debug_vk_version(uint32_t version) VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); } +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + WARN("Out of host memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + WARN("Out of device memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_DEVICE_LOST: + WARN("Device lost.\n"); + return E_FAIL; + case VK_ERROR_EXTENSION_NOT_PRESENT: + WARN("Extension not present.\n"); + return E_FAIL; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -106,33 +133,116 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) heap_free(adapter_vk); } +static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_vk *adapter_vk, + uint32_t *queue_family_index) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkQueueFamilyProperties *queue_properties; + uint32_t count, i; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, NULL)); + + if (!(queue_properties = heap_calloc(count, sizeof(*queue_properties)))) + return E_OUTOFMEMORY; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, queue_properties)); + + for (i = 0; i < count; ++i) + { + if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) + { + *queue_family_index = i; + heap_free(queue_properties); + return WINED3D_OK; + } + } + heap_free(queue_properties); + + WARN("Failed to find graphics queue.\n"); + return E_FAIL; +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { + const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + static const float priorities[] = {1.0f}; struct wined3d_device_vk *device_vk; + VkDevice vk_device = VK_NULL_HANDLE; + VkDeviceQueueCreateInfo queue_info; + VkPhysicalDeviceFeatures features; + VkPhysicalDevice physical_device; + VkDeviceCreateInfo device_info; + uint32_t queue_family_index; + VkResult vr; HRESULT hr; if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) return E_OUTOFMEMORY; + if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index))) + goto fail; + + physical_device = adapter_vk->physical_device; + + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); + + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = queue_family_index; + queue_info.queueCount = ARRAY_SIZE(priorities); + queue_info.pQueuePriorities = priorities; + + device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_info.pNext = NULL; + device_info.flags = 0; + device_info.queueCreateInfoCount = 1; + device_info.pQueueCreateInfos = &queue_info; + device_info.enabledLayerCount = 0; + device_info.ppEnabledLayerNames = NULL; + device_info.enabledExtensionCount = 0; + device_info.ppEnabledExtensionNames = NULL; + device_info.pEnabledFeatures = &features; + + if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) + { + WARN("Failed to create Vulkan device, vr %d.\n", vr); + vk_device = VK_NULL_HANDLE; + hr = hresult_from_vk_result(vr); + goto fail; + } + + device_vk->vk_device = vk_device; + VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(device_vk); - return hr; + goto fail; } return WINED3D_OK; + +fail: + VK_CALL(vkDestroyDevice(vk_device, NULL)); + heap_free(device_vk); + return hr; } static void adapter_vk_destroy_device(struct wined3d_device *device) { + struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(device); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - wined3d_device_cleanup(device); + wined3d_device_cleanup(&device_vk->d); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); }

1 0

Józef Kucia : vkd3d: Reject D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: 8df50592f66be7065d5b376fd1c6eb0745ca2a42 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8df50592f66be7065d5b376… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:41 2019 +0200 vkd3d: Reject D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME. 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> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/command.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 3cefd1f..ec78c66 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1547,6 +1547,7 @@ typedef enum D3D12_COMMAND_QUEUE_PRIORITY { D3D12_COMMAND_QUEUE_PRIORITY_NORMAL = 0, D3D12_COMMAND_QUEUE_PRIORITY_HIGH = 100, + D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME = 10000, } D3D12_COMMAND_QUEUE_PRIORITY; typedef enum D3D12_COMMAND_QUEUE_FLAGS diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7b4daa4..cdccfe8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5301,6 +5301,12 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (!(queue->vkd3d_queue = d3d12_device_get_vkd3d_queue(device, desc->Type))) return E_NOTIMPL; + if (desc->Priority == D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME) + { + FIXME("Global realtime priority is not implemented.\n"); + return E_NOTIMPL; + } + if (desc->Priority) FIXME("Ignoring priority %#x.\n", desc->Priority); if (desc->Flags)

1 0

Józef Kucia : vkd3d: Return S_OK from d3d12_command_queue_Wait().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: f886aecdc06c2d64ca7f24e5e543c22ee1603d0a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f886aecdc06c2d64ca7f24e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:39 2019 +0200 vkd3d: Return S_OK from d3d12_command_queue_Wait(). 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/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6410dd2..7b4daa4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5217,7 +5217,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if { FIXME("iface %p, fence %p, value %#"PRIx64" stub!\n", iface, fence, value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface,

1 0

Józef Kucia : vkd3d: Differentiate GPU and CPU fence signal operations.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: 81b33e7129d7b47f6ae6d01eabee1dabdbe00511 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=81b33e7129d7b47f6ae6d01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:34 2019 +0200 vkd3d: Differentiate GPU and CPU fence signal operations. 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/command.c | 109 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 6 +-- 2 files changed, 71 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b9deffe..6c9b145 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -19,6 +19,8 @@ #include "vkd3d_private.h" +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); + HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) { @@ -80,7 +82,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, - VkFence vk_fence, ID3D12Fence *fence, UINT64 value) + VkFence vk_fence, struct d3d12_fence *fence, uint64_t value) { int rc; @@ -118,7 +120,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, ID3D12Fence *fence) +static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) { struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -156,6 +158,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i, j; + VkFence vk_fence; HRESULT hr; int vr; @@ -174,12 +177,13 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) for (i = 0, j = 0; i < worker->fence_count; ++i) { - if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, worker->vk_fences[i])))) + vk_fence = worker->vk_fences[i]; + if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)))) { struct vkd3d_waiting_fence *current = &worker->fences[i]; - if (FAILED(hr = ID3D12Fence_Signal(current->fence, current->value))) - ERR("Failed to signal D3D12 fence, hr %d.\n", hr); - VK_CALL(vkDestroyFence(device->vk_device, worker->vk_fences[i], NULL)); + TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value); + if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) + ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); continue; } @@ -373,6 +377,48 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +{ + struct d3d12_device *device = fence->device; + unsigned int i, j; + int rc; + + if (vk_fence) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); + } + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + fence->value = value; + + for (i = 0, j = 0; i < fence->event_count; ++i) + { + struct vkd3d_waiting_event *current = &fence->events[i]; + + if (current->value <= value) + { + fence->device->signal_event(current->event); + } + else + { + if (i != j) + fence->events[j] = *current; + ++j; + } + } + fence->event_count = j; + + pthread_mutex_unlock(&fence->mutex); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence *iface, REFIID riid, void **object) { @@ -419,7 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); + vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) @@ -554,39 +600,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - unsigned int i, j; - int rc; TRACE("iface %p, value %#"PRIx64".\n", iface, value); - if ((rc = pthread_mutex_lock(&fence->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return hresult_from_errno(rc); - } - - fence->value = value; - - for (i = 0, j = 0; i < fence->event_count; ++i) - { - struct vkd3d_waiting_event *current = &fence->events[i]; - - if (current->value <= value) - { - fence->device->signal_event(current->event); - } - else - { - if (i != j) - fence->events[j] = *current; - ++j; - } - } - fence->event_count = j; - - pthread_mutex_unlock(&fence->mutex); - - return S_OK; + return d3d12_fence_signal(fence, value, VK_NULL_HANDLE); } static const struct ID3D12FenceVtbl d3d12_fence_vtbl = @@ -608,6 +625,14 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = d3d12_fence_Signal, }; +static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d12_fence_vtbl); + return impl_from_ID3D12Fence(iface); +} + static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { @@ -4886,21 +4911,24 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface, - ID3D12Fence *fence, UINT64 value) + ID3D12Fence *fence_iface, UINT64 value) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; VkFenceCreateInfo fence_info; struct d3d12_device *device; + struct d3d12_fence *fence; VkFence vk_fence; VkQueue vk_queue; VkResult vr; - TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence, value); + TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); device = command_queue->device; vk_procs = &device->vk_procs; + fence = unsafe_impl_from_ID3D12Fence(fence_iface); + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_info.pNext = NULL; fence_info.flags = 0; @@ -4929,8 +4957,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); if (vr == VK_SUCCESS) { - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return d3d12_fence_Signal(fence, value); + return d3d12_fence_signal(fence, value, vk_fence); } if (vr != VK_NOT_READY) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76fec70..68a51c0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,7 +147,7 @@ struct vkd3d_fence_worker size_t vk_fences_size; struct vkd3d_waiting_fence { - ID3D12Fence *fence; + struct d3d12_fence *fence; UINT64 value; } *fences; size_t fences_size; @@ -249,12 +249,12 @@ struct d3d12_fence ID3D12Fence ID3D12Fence_iface; LONG refcount; - UINT64 value; + uint64_t value; pthread_mutex_t mutex; struct vkd3d_waiting_event { - UINT64 value; + uint64_t value; HANDLE event; } *events; size_t events_size;

1 0

Józef Kucia : tests: Add test for ID3D12CommandQueue_Wait().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: a00ae0025f814a6c08471d9818a20c36f2e6a82f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a00ae0025f814a6c08471d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:40 2019 +0200 tests: Add test for ID3D12CommandQueue_Wait(). 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 | 252 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a00ae0025f814a6c084…

1 0

Józef Kucia : vkd3d: Signal Vulkan semaphore in d3d12_command_queue_Signal().
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: cf1faaf873b097b4f74b5c25595c7d733f7a76a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf1faaf873b097b4f74b5c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:35 2019 +0200 vkd3d: Signal Vulkan semaphore in d3d12_command_queue_Signal(). For d3d12_command_queue_Wait(). 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/command.c | 219 +++++++++++++++++++++++++++++++++++++++++---- libs/vkd3d/vkd3d_private.h | 9 ++ 2 files changed, 212 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cf1faaf873b097b4f74…

1 0

Józef Kucia : vkd3d: Reuse Vulkan fences.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: 3c4419520621851ecbee2425d4f485007ea0c858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c4419520621851ecbee242… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:36 2019 +0200 vkd3d: Reuse Vulkan fences. 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/command.c | 98 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 80 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0d30f43..6410dd2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -400,7 +400,46 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } -#define VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE 4 +static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *vk_fence) +{ + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + VkFenceCreateInfo fence_info; + unsigned int i; + VkResult vr; + int rc; + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + goto create_fence; + } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if ((*vk_fence = fence->old_vk_fences[i])) + { + fence->old_vk_fences[i] = VK_NULL_HANDLE; + break; + } + } + + pthread_mutex_unlock(&fence->mutex); + + if (*vk_fence) + return VK_SUCCESS; + +create_fence: + vk_procs = &device->vk_procs; + + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_info.pNext = NULL; + fence_info.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, vk_fence))) < 0) + *vk_fence = VK_NULL_HANDLE; + + return vr; +} static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, bool destroy_all) { @@ -411,12 +450,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, unsigned int i, j; semaphore_count = fence->semaphore_count; - if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) return; for (i = 0, j = 0; i < fence->semaphore_count; ++i) { - if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) break; /* The semaphore doesn't have a pending signal operation if the fence @@ -447,8 +486,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, fence->semaphore_count = j; } -static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) +static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) { + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + unsigned int i; + int rc; if ((rc = pthread_mutex_lock(&fence->mutex))) @@ -457,6 +500,15 @@ static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) return; } + vk_procs = &device->vk_procs; + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i]) + VK_CALL(vkDestroyFence(device->vk_device, fence->old_vk_fences[i], NULL)); + fence->old_vk_fences[i] = VK_NULL_HANDLE; + } + d3d12_fence_destroy_vk_semaphores_locked(fence, true); pthread_mutex_unlock(&fence->mutex); @@ -504,12 +556,6 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF unsigned int i, j; int rc; - if (vk_fence) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - } - if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); @@ -537,6 +583,8 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (vk_fence) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + for (i = 0; i < fence->semaphore_count; ++i) { struct vkd3d_signaled_semaphore *current = &fence->semaphores[i]; @@ -544,6 +592,19 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->vk_fence == vk_fence) current->vk_fence = VK_NULL_HANDLE; } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i] == VK_NULL_HANDLE) + { + fence->old_vk_fences[i] = vk_fence; + VK_CALL(vkResetFences(device->vk_device, 1, &vk_fence)); + vk_fence = VK_NULL_HANDLE; + break; + } + } + if (vk_fence) + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); } pthread_mutex_unlock(&fence->mutex); @@ -599,10 +660,9 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); - /* Destroy all Vulkan semaphores associated with this fence. */ - d3d12_fence_destroy_vk_semaphores(fence); - vkd3d_free(fence->semaphores); + d3d12_fence_destroy_vk_objects(fence); + vkd3d_free(fence->semaphores); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); @@ -796,6 +856,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->semaphores_size = 0; fence->semaphore_count = 0; + memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); @@ -5057,7 +5119,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * VkSemaphore vk_semaphore = VK_NULL_HANDLE; VkSemaphoreCreateInfo semaphore_info; VkFence vk_fence = VK_NULL_HANDLE; - VkFenceCreateInfo fence_info; struct d3d12_device *device; struct d3d12_fence *fence; VkSubmitInfo submit_info; @@ -5070,20 +5131,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * device = command_queue->device; vk_procs = &device->vk_procs; - /* XXX: It may be a good idea to re-use Vulkan fences/semaphores. */ - fence = unsafe_impl_from_ID3D12Fence(fence_iface); - fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; - fence_info.pNext = NULL; - fence_info.flags = 0; - if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, &vk_fence))) < 0) + if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - vk_fence = VK_NULL_HANDLE; goto fail_vkresult; } + /* XXX: It may be a good idea to re-use Vulkan semaphores. */ semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; semaphore_info.pNext = NULL; semaphore_info.flags = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3ca80c0..be0ef2e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -49,6 +49,7 @@ #define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u #define VKD3D_MAX_SHADER_STAGES 5u +#define VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE 4 struct d3d12_command_list; struct d3d12_device; @@ -269,6 +270,8 @@ struct d3d12_fence size_t semaphores_size; size_t semaphore_count; + VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE]; + struct d3d12_device *device; struct vkd3d_private_store private_store;

1 0

Józef Kucia : tests: Introduce universal create_command_queue() helper.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: a81f21004fccc1c018524e0cf2b02f13329d524c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a81f21004fccc1c018524e0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:37 2019 +0200 tests: Introduce universal create_command_queue() helper. 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 | 123 ++++++++++++++++---------------------------- tests/d3d12_invalid_usage.c | 9 +--- tests/d3d12_test_utils.h | 27 +++++++--- tests/vkd3d_api.c | 23 ++------- 4 files changed, 68 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a81f21004fccc1c0185…

1 0

Józef Kucia : tests: Add simple test for fence values.
by Alexandre Julliard April 18, 2019

April 18, 2019

Module: vkd3d Branch: master Commit: fd53b967fc080eb63863ebd15cbbb1a82fd5c9c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd53b967fc080eb63863ebd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:38 2019 +0200 tests: Add simple test for fence values. 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 | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 148989b..d44fff0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3922,6 +3922,87 @@ static void test_multithread_fence_wait(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_fence_values(void) +{ + ID3D12CommandQueue *queue; + UINT64 value, next_value; + ID3D12Device *device; + ID3D12Fence *fence; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); + + next_value = (uint64_t)1 << 60; + hr = ID3D12Device_CreateFence(device, next_value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + + for (i = 0; i < 100; ++i) + { + ++next_value; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + for (i = 0; i < 100; ++i) + { + next_value += 10000; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + ID3D12Fence_Release(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); + next_value = (uint64_t)1 << 60; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(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); + next_value = (uint64_t)1 << 60; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(fence); + + ID3D12CommandQueue_Release(queue); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_clear_depth_stencil_view(void) { static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f}; @@ -27532,6 +27613,7 @@ START_TEST(d3d12) run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); run_test(test_multithread_fence_wait); + run_test(test_fence_values); run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view);

1 0

Józef Kucia : d3d9: Fix memory leak in device_init() (Coverity).
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: wine Branch: master Commit: a4f547a6a97afa4ba6717d2df977a7381261c298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f547a6a97afa4ba6717d2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 14:37:44 2019 +0200 d3d9: Fix memory leak in device_init() (Coverity). 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> --- dlls/d3d9/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9999691..bef01a4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4547,6 +4547,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_decref(d3d_swapchain->wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); + heap_free(swapchain_desc); wined3d_mutex_unlock(); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : ntdll/tests: Add some tests for thread suspend/resume.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: wine Branch: master Commit: f9301c2b66450a1cdd986e9052fcaa76535ba8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9301c2b66450a1cdd986e90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 12 10:51:21 2019 +0300 ntdll/tests: Add some tests for thread suspend/resume. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index accb5d8..b7bf274 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3135,6 +3135,61 @@ static void test_vectored_continue_handler(void) } #endif /* defined(__i386__) || defined(__x86_64__) */ +static DWORD WINAPI suspend_thread_test( void *arg ) +{ + HANDLE event = arg; + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_suspend_thread(void) +{ + HANDLE thread, event; + NTSTATUS status; + ULONG count; + DWORD ret; + + status = NtSuspendThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + status = NtResumeThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, suspend_thread_test, event, 0, NULL); + ok(thread != NULL, "Failed to create a thread.\n"); + + ret = WaitForSingleObject(thread, 0); + ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + + status = NtResumeThread(thread, NULL); + ok(!status, "Unexpected status %#x.\n", status); + + status = NtResumeThread(thread, &count); + ok(!status, "Unexpected status %#x.\n", status); + ok(count == 0, "Unexpected suspended count %u.\n", count); + + status = NtSuspendThread(thread, NULL); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 1, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, &count); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(count == 2, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3253,6 +3308,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); + test_suspend_thread(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3294,6 +3350,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); + test_suspend_thread(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Nikolay Sivov : dwrite/layout: Fix invalid index access to cluster array.
by Alexandre Julliard April 15, 2019

April 15, 2019

Module: wine Branch: master Commit: 571ffaf380f3d80da60ff8bca4031baceefa7811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=571ffaf380f3d80da60ff8bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 15 18:22:46 2019 +0300 dwrite/layout: Fix invalid index access to cluster array. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45543 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4cd5ce4..d101a5a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1853,6 +1853,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust metrics.trailingWhitespaceLength += cluster->length; trailingspacewidth += cluster->width; + + if (index == 0) + break; } /* Line metrics length includes trailing whitespace length too */

1 0