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

Jactry Zeng : mfplat: Implement IMFDXGIDeviceManager::ResetDevice().
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 4fc9ecda1ca87360ae6cccd580f8ac541936643a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc9ecda1ca87360ae6cccd5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Aug 29 23:49:40 2019 +0800 mfplat: Implement IMFDXGIDeviceManager::ResetDevice(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 706251b..d213935 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 c58a046..dafb429 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 e0029ab..721ec12 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); }

1 0

Alexandre Julliard : mfplat: Fix a GUID name.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 7f87c89227bf733f0948848f63ddc8e063b112e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f87c89227bf733f0948848f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 30 20:06:52 2019 +0200 mfplat: Fix a GUID name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- include/mfapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d213935..5cbf121 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -681,7 +681,7 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_3DVideo_SampleFormat), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), - X(MF_MT_AAC_PAYLOAD_TIME), + X(MF_MT_AAC_PAYLOAD_TYPE), X(MF_TOPOLOGY_PLAYBACK_FRAMERATE), X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_MT_AUDIO_FOLDDOWN_MATRIX), diff --git a/include/mfapi.h b/include/mfapi.h index f84c051..1a8fa25 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -261,7 +261,7 @@ DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGREF, 0x9d62927f, 0x36be, 0x4cf DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGTARGET, 0x9d629280, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 0xa901aaba, 0xe037, 0x458a, 0xbd, 0xf6, 0x54, 0x5b, 0xe2, 0x07, 0x40, 0x42); DEFINE_GUID(MF_MT_AUDIO_FLAC_MAX_BLOCK_SIZE, 0x8b81adae, 0x4b5a, 0x4d40, 0x80, 0x22, 0xf3, 0x8d, 0x09, 0xca, 0x3c, 0x5c); -DEFINE_GUID(MF_MT_AAC_PAYLOAD_TIME, 0xbfbabe79, 0x7434, 0x4d1c, 0x94, 0xf0, 0x72, 0xa3, 0xb9, 0xe1, 0x71, 0x88); +DEFINE_GUID(MF_MT_AAC_PAYLOAD_TYPE, 0xbfbabe79, 0x7434, 0x4d1c, 0x94, 0xf0, 0x72, 0xa3, 0xb9, 0xe1, 0x71, 0x88); DEFINE_GUID(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 0x7632f0e6, 0x9538, 0x4d61, 0xac, 0xda, 0xea, 0x29, 0xc8, 0xc1, 0x44, 0x56); DEFINE_GUID(MFT_CATEGORY_VIDEO_DECODER, 0xd6c02d4b, 0x6833, 0x45b4, 0x97, 0x1a, 0x05, 0xa4, 0xb0, 0x4b, 0xab, 0x91);

1 0

Zebediah Figura : httpapi/tests: Add some tests for version 2 request queues.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 12f1c2de1c6f5ba7a850d68c6ef2b43510a65be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1c2de1c6f5ba7a850d68c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:07 2019 -0500 httpapi/tests: Add some tests for version 2 request queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 343 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 317 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1c2de1c6f5ba7a850…

1 0

Zhiyi Zhang : winemac.drv: Handle display device change events.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: b8415e0310595d239b5bcef4e74efd1f0972fac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8415e0310595d239b5bcef4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:41 2019 -0500 winemac.drv: Handle display device change events. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 8 ++++++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a953e0c..236f63d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -946,6 +946,8 @@ better: SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + + macdrv_init_display_devices(TRUE); } else { @@ -1452,6 +1454,8 @@ void macdrv_displays_changed(const macdrv_event *event) free_display_mode_descriptor(desc); CGDisplayModeRelease(mode); + macdrv_init_display_devices(TRUE); + if (is_original && retina_enabled) { width *= 2; @@ -1728,7 +1732,7 @@ static void cleanup_devices(void) * * Initialize display device registry data. */ -void macdrv_init_display_devices(void) +void macdrv_init_display_devices(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -1755,7 +1759,7 @@ void macdrv_init_display_devices(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index b9f58b9..a7c0b4c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,7 +223,7 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event) DECLSPEC_ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; -extern void macdrv_init_display_devices(void) DECLSPEC_HIDDEN; +extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0385784..694a46b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,7 +299,7 @@ static BOOL process_attach(void) return FALSE; } - macdrv_init_display_devices(); + macdrv_init_display_devices(FALSE); return TRUE; }

1 0

Zebediah Figura : httpapi: Prefer the builtin version.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 44a136cf9d9ecebd69305569641ebedc72d5aa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a136cf9d9ecebd69305569… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 29 19:58:08 2019 -0500 httpapi: Prefer the builtin version. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3b0b86f..0d6895b 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -37,19 +37,6 @@ static WCHAR *heap_strdupW(const WCHAR *str) return ret; } -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /*********************************************************************** * HttpInitialize (HTTPAPI.@) *

1 0

Zhiyi Zhang : winemac.drv: Add GPU initialization functions.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: d8d1fe486b4a5ebd3b8b14ee097cd6588c737c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d1fe486b4a5ebd3b8b14ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:37 2019 -0500 winemac.drv: Add GPU initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_display.m | 258 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 206 +++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 17 +++ 5 files changed, 483 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8d1fe486b4a5ebd3b8b…

1 0

Zebediah Figura : amstream/tests: Separate and expand tests for IAMMultiMediaStream::AddMediaStream().
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 6fc75827132146515bc4a10cb37a31f1c5cad768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc75827132146515bc4a10c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 29 22:49:24 2019 -0500 amstream/tests: Separate and expand tests for IAMMultiMediaStream::AddMediaStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 626 +++++++++++++++++++++++++++++++++++------ 1 file changed, 547 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fc75827132146515bc4…

1 0

Zhiyi Zhang : winemac.drv: Use generic EnumDisplayMonitors and GetMonitorInfo.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 792521f33b2786cb100cb202dcb4181a579ef3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=792521f33b2786cb100cb202… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:42 2019 -0500 winemac.drv: Use generic EnumDisplayMonitors and GetMonitorInfo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 2 + dlls/winemac.drv/display.c | 154 +++++--------------------------------- dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/winemac.drv.spec | 2 - 4 files changed, 26 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=792521f33b2786cb100c…

1 0

Zhiyi Zhang : winemac.drv: Add monitor initialization functions.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 83a2ff33b316fa3a5751e706996dac25cd602b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a2ff33b316fa3a5751e706… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:40 2019 -0500 winemac.drv: Add monitor initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 109 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 103 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 14 +++++ dlls/winemac.drv/macdrv_main.c | 2 + 4 files changed, 223 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83a2ff33b316fa3a5751…

1 0

Zhiyi Zhang : winemac.drv: Add adapter initialization functions.
by Alexandre Julliard Aug. 30, 2019

Aug. 30, 2019

Module: wine Branch: master Commit: 039a7715f30ecc892f80df9c7aae24aa2530a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=039a7715f30ecc892f80df9c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 29 16:11:39 2019 -0500 winemac.drv: Add adapter initialization functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 99 +++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 134 +++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 15 +++++ 3 files changed, 241 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=039a7715f30ecc892f80…

1 0