August 2019 - Wine-Devel - list.winehq.org

[PATCH v4 2/6] mfplat: Implement IMFDXGIDeviceManager::ResetDevice().

by Jactry Zeng

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 26 +++++++++++++++++++-- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 706251b3e0..d213935c3a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "initguid.h" #include "ole2.h" #include "propsys.h" +#include "dxgi.h" #include "wine/debug.h" #include "wine/list.h" @@ -7623,6 +7624,7 @@ struct dxgi_device_manager IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; LONG refcount; UINT token; + IDXGIDevice *device; }; static struct dxgi_device_manager *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) @@ -7666,6 +7668,8 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) if (!refcount) { + if (manager->device) + IDXGIDevice_Release(manager->device); heap_free(manager); } @@ -7704,9 +7708,26 @@ static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) { - FIXME("(%p, %p, %u): stub.\n", iface, device, token); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p, %u).\n", iface, device, token); + + if (!device || token != manager->token) + return E_INVALIDARG; + + hr = IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + if (SUCCEEDED(hr)) + { + if (manager->device) + IDXGIDevice_Release(manager->device); + manager->device = dxgi_device; + } + else + hr = E_INVALIDARG; + + return hr; } static HRESULT WINAPI dxgi_device_manager_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) @@ -7753,6 +7774,7 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; object->refcount = 1; object->token = GetTickCount(); + object->device = NULL; TRACE("Created device manager: %p, token: %u.\n", object, object->token); diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index c58a0463e5..dafb429142 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys uuid +IMPORTS = ole32 mfplat mfuuid propsys uuid d3d11 C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e0029ab4ff..721ec120ef 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,10 @@ #include "wine/test.h" #include "wine/heap.h" +#define D3D11_INIT_GUID #include "initguid.h" +#include "d3d11_4.h" + DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); @@ -3709,6 +3712,7 @@ if (0) static void test_dxgi_device_manager(void) { IMFDXGIDeviceManager *manager, *manager2; + ID3D11Device *d3d11_dev, *d3d11_dev2; UINT token, token2; HRESULT hr; @@ -3740,7 +3744,47 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, + NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); + ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev, 1); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token - 1); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev, 1); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, NULL, token); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)manager2, token); + ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#x.\n", hr); + EXPECT_REF(manager2, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev, 2); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); + ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); + EXPECT_REF(d3d11_dev2, 1); + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev2, token); + ok(hr == S_OK, "IMFDXGIDeviceManager_ResetDevice failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + EXPECT_REF(d3d11_dev2, 2); + EXPECT_REF(d3d11_dev, 1); + IMFDXGIDeviceManager_Release(manager); + EXPECT_REF(d3d11_dev2, 1); + ID3D11Device_Release(d3d11_dev); + ID3D11Device_Release(d3d11_dev2); IMFDXGIDeviceManager_Release(manager2); } -- 2.23.0.rc1

Aug. 29, 2019

[PATCH v4 1/6] mfplat: Implement MFCreateDXGIDeviceManager().

by Jactry Zeng

Superseded patch 169212 to 169217. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 144 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 41 +++++++++++ include/mfapi.h | 1 + include/mfobjects.idl | 17 +++++ 5 files changed, 204 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f8f4b502a5..706251b3e0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7617,3 +7617,147 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } + +struct dxgi_device_manager +{ + IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; + LONG refcount; + UINT token; +}; + +static struct dxgi_device_manager *impl_from_IMFDXGIDeviceManager(IMFDXGIDeviceManager *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_device_manager, IMFDXGIDeviceManager_iface); +} + +static HRESULT WINAPI dxgi_device_manager_QueryInterface(IMFDXGIDeviceManager *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFDXGIDeviceManager) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFDXGIDeviceManager_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dxgi_device_manager_AddRef(IMFDXGIDeviceManager *iface) +{ + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedIncrement(&manager->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) +{ + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + ULONG refcount = InterlockedDecrement(&manager->refcount); + + TRACE("(%p) ref=%u.\n", iface, refcount); + + if (!refcount) + { + heap_free(manager); + } + + return refcount; +} + +static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **service) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, device, debugstr_guid(riid), service); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE device, + REFIID riid, void **ppv, BOOL block) +{ + FIXME("(%p, %p, %s, %p, %d): stub.\n", iface, device, wine_dbgstr_guid(riid), ppv, block); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager *iface, HANDLE *device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) +{ + FIXME("(%p, %p, %u): stub.\n", iface, device, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_TestDevice(IMFDXGIDeviceManager *iface, HANDLE device) +{ + FIXME("(%p, %p): stub.\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dxgi_device_manager_UnlockDevice(IMFDXGIDeviceManager *iface, HANDLE device, BOOL state) +{ + FIXME("(%p, %p, %d): stub.\n", iface, device, state); + + return E_NOTIMPL; +} + +static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl = +{ + dxgi_device_manager_QueryInterface, + dxgi_device_manager_AddRef, + dxgi_device_manager_Release, + dxgi_device_manager_CloseDeviceHandle, + dxgi_device_manager_GetVideoService, + dxgi_device_manager_LockDevice, + dxgi_device_manager_OpenDeviceHandle, + dxgi_device_manager_ResetDevice, + dxgi_device_manager_TestDevice, + dxgi_device_manager_UnlockDevice, +}; + +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) +{ + struct dxgi_device_manager *object; + + TRACE("(%p, %p).\n", token, manager); + + if (!token || !manager) + return E_POINTER; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; + object->refcount = 1; + object->token = GetTickCount(); + + TRACE("Created device manager: %p, token: %u.\n", object, object->token); + + *token = object->token; + *manager = &object->IMFDXGIDeviceManager_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2f16bbd197..cc440c5ee0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -42,6 +42,7 @@ @ stdcall MFCreateAttributes(ptr long) @ stub MFCreateAudioMediaType @ stdcall MFCreateCollection(ptr) +@ stdcall MFCreateDXGIDeviceManager(ptr ptr) @ stdcall MFCreateEventQueue(ptr) @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b4ba6b6c57..e0029ab4ff 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -58,6 +58,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); @@ -510,6 +511,7 @@ static void init_functions(void) X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); + X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFHeapAlloc); @@ -3704,6 +3706,44 @@ if (0) ok(!refcount, "Unexpected refcount %u.\n", refcount); } +static void test_dxgi_device_manager(void) +{ + IMFDXGIDeviceManager *manager, *manager2; + UINT token, token2; + HRESULT hr; + + if (!pMFCreateDXGIDeviceManager) + { + win_skip("MFCreateDXGIDeviceManager not found.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(NULL, &manager); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + + token = 0; + hr = pMFCreateDXGIDeviceManager(&token, NULL); + ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#x.\n", hr); + ok(!token, "got wrong token: %u.\n", token); + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager, 1); + ok(!!token, "got wrong token: %u.\n", token); + + Sleep(50); + token2 = 0; + hr = pMFCreateDXGIDeviceManager(&token2, &manager2); + ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + EXPECT_REF(manager2, 1); + ok(token2 && token2 != token, "got wrong token: %u, %u.\n", token2, token); + ok(manager != manager2, "got wrong pointer: %p.\n", manager2); + EXPECT_REF(manager, 1); + + IMFDXGIDeviceManager_Release(manager); + IMFDXGIDeviceManager_Release(manager2); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3741,6 +3781,7 @@ START_TEST(mfplat) test_async_create_file(); test_local_handlers(); test_create_property_store(); + test_dxgi_device_manager(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 957fb0df9f..f84c051792 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -384,6 +384,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 0cc8f422da..203acc770f 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -727,3 +727,20 @@ interface IMFMediaEventQueue : IUnknown [in] HRESULT status, [in, unique] IUnknown *unk); HRESULT Shutdown(); } + +[ + object, + uuid(eb533d5d-2db6-40f8-97a9-494692014f07), + local, + pointer_default(unique) +] +interface IMFDXGIDeviceManager : IUnknown +{ + HRESULT CloseDeviceHandle([in] HANDLE device); + HRESULT GetVideoService([in] HANDLE device, [in] REFIID riid, [out] void **service); + HRESULT LockDevice([in] HANDLE device, [in] REFIID riid, [out] void **ppv, [in] BOOL block); + HRESULT OpenDeviceHandle([out] HANDLE *device); + HRESULT ResetDevice([in] IUnknown *device, [in] UINT token); + HRESULT TestDevice([in] HANDLE device); + HRESULT UnlockDevice([in] HANDLE device, [in] BOOL state); +} -- 2.23.0.rc1

Aug. 29, 2019

Re: [PATCH v3 6/6] mfmediaengine: Add MFMediaEngineClassFactory stub.

by Marvin

Hi, While running your changed tests, 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=55985 Your paranoid android. === debian10 (32 bit report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154. === debian10 (32 bit French report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154. === debian10 (32 bit Japanese:Japan report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154. === debian10 (32 bit Chinese:China report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154. === debian10 (32 bit WoW report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154. === debian10 (64 bit WoW report) === mfmediaengine: mfmediaengine.c:41: Test failed: Failed to create class factory, hr 0x80040154. mfmediaengine.c:46: Test failed: Unexpected hr 0x80040154.

Aug. 29, 2019

Re: [PATCH resend 1/2] wineserver: Implement thread priorities with sched_setscheduler / setpriority

by Chip Davis

August 29, 2019 5:32 AM, "Rémi Bernon" <rbernon(a)codeweavers.com> wrote: > diff --git a/server/thread.c b/server/thread.c > index e753c8d0dda..a807f19a42b 100644 > --- a/server/thread.c > +++ b/server/thread.c > @@ -515,28 +521,147 @@ affinity_t get_thread_affinity( struct thread *thread ) [...] > +#ifdef HAVE_SETPRIORITY > + if (setpriority( PRIO_PROCESS, thread->unix_tid, > + get_unix_priority( priority_class, priority ) ) == 0) > + return 0; > +#endif This may have... unexpected effects on Mac OS. The 'unix_tid' there isn't a PID at all, but a Mach port. Chip

Aug. 29, 2019

Re: [PATCH 1/4] msvcrt/tests: Restore the multibyte codepage after the tests.

by Piotr Caban

Hi Akihiro, It looks like you're working around a bug in setlocale implementation. Is mbcp ever changed on Windows during this tests (it's not on testbot)? It's better to add a test for that and fix the implementation. Thanks, Piotr

Aug. 29, 2019

Re: [PATCH v3 1/6] mfplat: Implement MFCreateDXGIDeviceManager().

by Nikolay Sivov

On 8/29/19 4:46 PM, Jactry Zeng wrote: > +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) > +{ > + struct dxgi_device_manager *object; > + > + TRACE("(%p, %p).\n", token, manager); > + > + if (!token || !manager) > + return E_POINTER; > + > + object = heap_alloc(sizeof(*object)); > + if (!object) > + return E_OUTOFMEMORY; > + > + object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; > + object->refcount = 1; > + object->token = MFGetSystemTime() >> 16; > + > + TRACE("Created device manager: %p, token: %u.\n", object, object->token); > + > + *token = object->token; > + *manager = &object->IMFDXGIDeviceManager_iface; > + > + return S_OK; > +} Turns out it's using GetTickCount(), as strange as it might sound. That's why tests will have to keep small sleep pause.

Aug. 29, 2019

Re: [PATCH v3 1/6] mfplat: Implement MFCreateDXGIDeviceManager().

by Nikolay Sivov

On 8/29/19 4:46 PM, Jactry Zeng wrote: > +HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) > +{ > + struct dxgi_device_manager *object; > + > + TRACE("(%p, %p).\n", token, manager); > + > + if (!token || !manager) > + return E_POINTER; > + > + object = heap_alloc(sizeof(*object)); > + if (!object) > + return E_OUTOFMEMORY; > + > + object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; > + object->refcount = 1; > + object->token = MFGetSystemTime() >> 16; > + > + TRACE("Created device manager: %p, token: %u.\n", object, object->token); > + > + *token = object->token; > + *manager = &object->IMFDXGIDeviceManager_iface; > + > + return S_OK; > +} Why 16? I still think it'd be better to use something more predictable, like sequentially incremented global counter. I'll take a look, maybe it's easy to get "right" pattern for it.

Aug. 29, 2019

Re: [PATCH v2 6/6] mfmediaengine: Add MFMediaEngineClassFactory stub.

by Marvin

Hi, While running your changed tests, 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=55979 Your paranoid android. === debian10 (build log) === ../../../wine/dlls/mfplat/main.c:7717:29: error: ‘This’ undeclared (first use in this function) Task: The win32 build failed === debian10 (build log) === ../../../wine/dlls/mfplat/main.c:7717:29: error: ‘This’ undeclared (first use in this function) Task: The wow64 build failed

Aug. 29, 2019

[PATCH v3 6/6] mfmediaengine: Add MFMediaEngineClassFactory stub.

by Jactry Zeng

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/mfmediaengine/Makefile.in | 3 + dlls/mfmediaengine/main.c | 141 +++++++++++++++++++++ dlls/mfmediaengine/mediaengine.idl | 26 ++++ dlls/mfmediaengine/mediaengine_classes.idl | 26 ++++ dlls/mfmediaengine/mfmediaengine.spec | 4 +- dlls/mfmediaengine/tests/Makefile.in | 5 + dlls/mfmediaengine/tests/mfmediaengine.c | 65 ++++++++++ 9 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 dlls/mfmediaengine/mediaengine.idl create mode 100644 dlls/mfmediaengine/mediaengine_classes.idl create mode 100644 dlls/mfmediaengine/tests/Makefile.in create mode 100644 dlls/mfmediaengine/tests/mfmediaengine.c diff --git a/configure b/configure index 82c3611b40..db7db910c0 100755 --- a/configure +++ b/configure @@ -20380,6 +20380,7 @@ wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mferror enable_mferror wine_fn_config_makefile dlls/mfmediaengine enable_mfmediaengine +wine_fn_config_makefile dlls/mfmediaengine/tests enable_tests wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfplay enable_mfplay diff --git a/configure.ac b/configure.ac index ef41e94df6..2dbcaebed4 100644 --- a/configure.ac +++ b/configure.ac @@ -3359,6 +3359,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mferror) WINE_CONFIG_MAKEFILE(dlls/mfmediaengine) +WINE_CONFIG_MAKEFILE(dlls/mfmediaengine/tests) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfplay) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index 1654130574..fc84c48a7e 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,7 +1,10 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine +IMPORTS = mfuuid uuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = mediaengine_classes.idl diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 81aaf77e2c..4bca0fe0ba 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -16,11 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "mfmediaengine.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -34,3 +42,136 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +static HRESULT WINAPI media_engine_factory_QueryInterface(IMFMediaEngineClassFactory *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineClassFactory) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_factory_AddRef(IMFMediaEngineClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFactory *iface, DWORD flags, + IMFAttributes *attributes, IMFMediaEngine **engine) +{ + FIXME("(%p, %#x, %p, %p): stub.\n", iface, flags, attributes, engine); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, + IMFMediaTimeRange **range) +{ + FIXME("(%p, %p): stub.\n", iface, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) +{ + FIXME("(%p, %p): stub.\n", iface, error); + + return E_NOTIMPL; +} + +static const IMFMediaEngineClassFactoryVtbl media_engine_factory_vtbl = +{ + media_engine_factory_QueryInterface, + media_engine_factory_AddRef, + media_engine_factory_Release, + media_engine_factory_CreateInstance, + media_engine_factory_CreateTimeRange, + media_engine_factory_CreateError, +}; + +static IMFMediaEngineClassFactory media_engine_factory = { &media_engine_factory_vtbl }; + +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + TRACE("(%s, %p).\n", debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + WARN("interface %s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI classfactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p).\n", outer, debugstr_guid(riid), obj); + + *obj = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + return IMFMediaEngineClassFactory_QueryInterface(&media_engine_factory, riid, obj); +} + +static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%d): stub.\n", dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl class_factory_vtbl = +{ + classfactory_QueryInterface, + classfactory_AddRef, + classfactory_Release, + classfactory_CreateInstance, + classfactory_LockServer, +}; + +static IClassFactory classfactory = { &class_factory_vtbl }; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) +{ + TRACE("(%s, %s, %p).\n", debugstr_guid(clsid), debugstr_guid(riid), obj); + + if (IsEqualGUID(clsid, &CLSID_MFMediaEngineClassFactory)) + return IClassFactory_QueryInterface(&classfactory, riid, obj); + + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + *obj = NULL; + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/mfmediaengine/mediaengine.idl b/dlls/mfmediaengine/mediaengine.idl new file mode 100644 index 0000000000..a04dabe6a8 --- /dev/null +++ b/dlls/mfmediaengine/mediaengine.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("Media Engine Class Factory"), + threading(both), + uuid(b44392da-499b-446b-a4cb-005fead0e6d5) +] +coclass MFMediaEngineClassFactory { interface IMFMediaEngineClassFactory; } diff --git a/dlls/mfmediaengine/mediaengine_classes.idl b/dlls/mfmediaengine/mediaengine_classes.idl new file mode 100644 index 0000000000..a04dabe6a8 --- /dev/null +++ b/dlls/mfmediaengine/mediaengine_classes.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("Media Engine Class Factory"), + threading(both), + uuid(b44392da-499b-446b-a4cb-005fead0e6d5) +] +coclass MFMediaEngineClassFactory { interface IMFMediaEngineClassFactory; } diff --git a/dlls/mfmediaengine/mfmediaengine.spec b/dlls/mfmediaengine/mfmediaengine.spec index a7e7cb9036..f216d235a3 100644 --- a/dlls/mfmediaengine/mfmediaengine.spec +++ b/dlls/mfmediaengine/mfmediaengine.spec @@ -1,3 +1,3 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in new file mode 100644 index 0000000000..3f2bb5a094 --- /dev/null +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mfmediaengine.dll +IMPORTS = ole32 mfplat mfmediaengine mfuuid + +C_SRCS = \ + mfmediaengine.c diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c new file mode 100644 index 0000000000..c7fc89f2b1 --- /dev/null +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -0,0 +1,65 @@ +/* + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "mfapi.h" +#include "mfmediaengine.h" + +#include "wine/heap.h" +#include "wine/test.h" + +static void test_factory(void) +{ + IMFMediaEngineClassFactory *factory, *factory2; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IMFMediaEngineClassFactory, (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, + "Failed to create class factory, hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, + &IID_IMFMediaEngineClassFactory, (void **)&factory2); + ok(hr == CLASS_E_NOAGGREGATION || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, + "Unexpected hr %#x.\n", hr); + + if (factory) + IMFMediaEngineClassFactory_Release(factory); + + CoUninitialize(); +} + +START_TEST(mfmediaengine) +{ + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); + + test_factory(); + + MFShutdown(); +} -- 2.23.0.rc1

Aug. 29, 2019

[PATCH v3 5/6] mfuuid: Import mfmediaengine.h.

by Jactry Zeng

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfuuid/mfuuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index 5bfd521aec..c4976d7dc9 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -31,3 +31,4 @@ #include "mfapi.h" #include "mfidl.h" #include "mfreadwrite.h" +#include "mfmediaengine.h" -- 2.23.0.rc1

Aug. 29, 2019