November 2021 - Wine-commits

Paul Gofman : windowscodecs: Return stub IEnumString from mqr_GetEnumerator().
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 3b3394bc8e5a8ecdb7992b6e023c0da833203c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3394bc8e5a8ecdb7992b6e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 24 15:04:14 2021 +0300 windowscodecs: Return stub IEnumString from mqr_GetEnumerator(). Based on a patch by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51748 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 120 +++++++++++++++++++++++++++++++++++-- 1 file changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 29ec6fd5160..7ef2c10cf07 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -596,14 +596,126 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW return hr; } -static HRESULT WINAPI mqr_GetEnumerator(IWICMetadataQueryReader *iface, - IEnumString **ppIEnumString) +struct string_enumerator { - QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%p)\n", This, ppIEnumString); + IEnumString IEnumString_iface; + LONG ref; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + TRACE("iface %p, riid %s, ppv %p.\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + *ppv = &this->IEnumString_iface; + else + { + WARN("Unknown riid %s.\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef(&this->IEnumString_iface); + return S_OK; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + ULONG ref = InterlockedIncrement(&this->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + ULONG ref = InterlockedDecrement(&this->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + if (!ref) + free(this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG count, LPOLESTR *strings, ULONG *ret) +{ + FIXME("iface %p, count %u, strings %p, ret %p stub.\n", iface, count, strings, ret); + + if (!strings || !ret) + return E_INVALIDARG; + + *ret = 0; + return count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + TRACE("iface %p.\n", iface); + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG count) +{ + FIXME("iface %p, count %u stub.\n", iface, count); + + return count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + FIXME("iface %p, out %p stub.\n", iface, out); + + *out = NULL; return E_NOTIMPL; } +static const IEnumStringVtbl string_enumerator_vtbl = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(IEnumString **enum_string) +{ + struct string_enumerator *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IEnumString_iface.lpVtbl = &string_enumerator_vtbl; + object->ref = 1; + + *enum_string = &object->IEnumString_iface; + + return S_OK; +} + +static HRESULT WINAPI mqr_GetEnumerator(IWICMetadataQueryReader *iface, + IEnumString **enum_string) +{ + TRACE("iface %p, enum_string %p.\n", iface, enum_string); + + return string_enumerator_create(enum_string); +} + static IWICMetadataQueryReaderVtbl mqr_vtbl = { mqr_QueryInterface, mqr_AddRef,

1 0

Paul Gofman : windowscodecs: Return stub IEnumString from mqw_GetEnumerator().
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 9716f4e0287e5b9ed3d3ae31c7bd2cf6f0960186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9716f4e0287e5b9ed3d3ae31… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 24 15:04:15 2021 +0300 windowscodecs: Return stub IEnumString from mqw_GetEnumerator(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 7ef2c10cf07..ed80d26d54f 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -819,9 +819,9 @@ static HRESULT WINAPI mqw_GetContainerFormat(IWICMetadataQueryWriter *iface, GUI static HRESULT WINAPI mqw_GetEnumerator(IWICMetadataQueryWriter *iface, IEnumString **enum_string) { - FIXME("iface %p, enum_string %p stub.\n", iface, enum_string); + TRACE("iface %p, enum_string %p.\n", iface, enum_string); - return E_NOTIMPL; + return string_enumerator_create(enum_string); } static HRESULT WINAPI mqw_GetLocation(IWICMetadataQueryWriter *iface, UINT max_length, WCHAR *namespace, UINT *actual_length)

1 0

Paul Gofman : windowscodecs/tests: Add basic test for IWICMetadataQueryWriter_GetEnumerator().
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 67489d553aa55c19c1bbe708ec362bfbc4d5289a URL: https://source.winehq.org/git/wine.git/?a=commit;h=67489d553aa55c19c1bbe708… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 24 15:04:16 2021 +0300 windowscodecs/tests: Add basic test for IWICMetadataQueryWriter_GetEnumerator(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b597e5490c6..bec8bb08c76 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -198,6 +198,13 @@ static const char animatedgif[] = { 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','2',0x00,0x3B }; +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static IStream *create_stream(const char *data, int data_size) { HRESULT hr; @@ -3073,6 +3080,9 @@ static void test_metadata_writer(void) IWICBitmapFrameEncode *frameencode; IWICComponentFactory *factory; IWICBitmapEncoder *encoder; + IEnumString *enumstring; + LPOLESTR olestring; + ULONG ref, count; IStream *stream; unsigned int i; HRESULT hr; @@ -3124,6 +3134,47 @@ static void test_metadata_writer(void) IWICComponentFactory_Release(factory); if (querywriter) { + ref = get_refcount(querywriter); + ok(ref == 1, "Got unexpected ref %u, i %u.\n", ref, i); + + hr = IWICMetadataQueryWriter_QueryInterface(querywriter, &IID_IEnumString, (void **)&enumstring); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IWICMetadataQueryWriter_GetEnumerator(querywriter, &enumstring); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + ref = get_refcount(querywriter); + ok(ref == 1, "Got unexpected ref %u, i %u.\n", ref, i); + + hr = IEnumString_Skip(enumstring, 0); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + count = 0xdeadbeef; + hr = IEnumString_Next(enumstring, 0, NULL, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(count == 0xdeadbeef, "Got unexpected count %u, i %u.\n", count, i); + + hr = IEnumString_Next(enumstring, 0, &olestring, &count); + ok(hr == S_OK || hr == WINCODEC_ERR_VALUEOUTOFRANGE, "Got unexpected hr %#x, i %u.\n", hr, i); + + count = 0xdeadbeef; + hr = IEnumString_Next(enumstring, 1, &olestring, &count); + ok(hr == S_OK || hr == S_FALSE, "Got unexpected hr %#x, i %u.\n", hr, i); + ok((hr && !count) || (!hr && count == 1), "Got unexpected hr %#x, count %u, i %u.\n", hr, count, i); + if (count) + { + CoTaskMemFree(olestring); + + /* IEnumString_Skip() crashes at least on Win7 when + * trying to skip past the string count. */ + hr = IEnumString_Reset(enumstring); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IEnumString_Skip(enumstring, 1); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + } + IEnumString_Release(enumstring); + IWICMetadataQueryWriter_Release(querywriter); IWICMetadataQueryWriter_Release(querywriter2); IWICMetadataBlockWriter_Release(blockwriter);

1 0

Mohamad Al-Jaf : api-ms-win-appmodel-runtime-l1-1-0: Add new dll.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 4862f38db91547b2b106577202cfe0a9b2c5dd4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4862f38db91547b2b1065772… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Nov 26 01:33:22 2021 -0500 api-ms-win-appmodel-runtime-l1-1-0: Add new dll. Fix error caused by some applications attempting to load Windows Runtime support libraries. Example: Adobe Photoshop 2021 attempts to load WinRTSupport.dll. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-appmodel-runtime-l1-1-0/Makefile.in | 1 + .../api-ms-win-appmodel-runtime-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index d974d5b3324..67bcd371525 100755 --- a/configure +++ b/configure @@ -946,6 +946,7 @@ enable_advpack enable_amsi enable_amstream enable_api_ms_win_appmodel_identity_l1_1_0 +enable_api_ms_win_appmodel_runtime_l1_1_0 enable_api_ms_win_appmodel_runtime_l1_1_1 enable_api_ms_win_appmodel_runtime_l1_1_2 enable_api_ms_win_core_apiquery_l1_1_0 @@ -20724,6 +20725,7 @@ wine_fn_config_makefile dlls/amsi enable_amsi wine_fn_config_makefile dlls/amstream enable_amstream wine_fn_config_makefile dlls/amstream/tests enable_tests wine_fn_config_makefile dlls/api-ms-win-appmodel-identity-l1-1-0 enable_api_ms_win_appmodel_identity_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-appmodel-runtime-l1-1-0 enable_api_ms_win_appmodel_runtime_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-appmodel-runtime-l1-1-1 enable_api_ms_win_appmodel_runtime_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-appmodel-runtime-l1-1-2 enable_api_ms_win_appmodel_runtime_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 diff --git a/configure.ac b/configure.ac index 51ac2eb8e56..b69f738ebca 100644 --- a/configure.ac +++ b/configure.ac @@ -2407,6 +2407,7 @@ WINE_CONFIG_MAKEFILE(dlls/amsi) WINE_CONFIG_MAKEFILE(dlls/amstream) WINE_CONFIG_MAKEFILE(dlls/amstream/tests) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-identity-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-runtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-runtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-runtime-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-apiquery-l1-1-0) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-0/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-0/Makefile.in new file mode 100644 index 00000000000..b04ec857dc9 --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-appmodel-runtime-l1-1-0.dll diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-0/api-ms-win-appmodel-runtime-l1-1-0.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-0/api-ms-win-appmodel-runtime-l1-1-0.spec new file mode 100644 index 00000000000..acb4eb8b0a5 --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-0/api-ms-win-appmodel-runtime-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stub GetApplicationUserModelId +@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName +@ stub PackageFamilyNameFromFullName diff --git a/tools/make_specfiles b/tools/make_specfiles index 83f05bd116c..019f16d3f14 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -205,6 +205,7 @@ my @dll_groups = "kernel32", # "kernelbase", "api-ms-win-appmodel-identity-l1-1-0", + "api-ms-win-appmodel-runtime-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1",

1 0

Nikolay Sivov : mfplat: Explicitly check for d3d device interface in ResetDevice().
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 568d0a5db41b5f83f8fc4b1baa52531c510f0abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=568d0a5db41b5f83f8fc4b1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 27 00:03:57 2021 +0300 mfplat: Explicitly check for d3d device interface in ResetDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d7cd0d360d9..a70d7d401a1 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8570,7 +8570,7 @@ struct dxgi_device_manager IMFDXGIDeviceManager IMFDXGIDeviceManager_iface; LONG refcount; UINT token; - IDXGIDevice *device; + IUnknown *device; unsigned int *handles; size_t count; @@ -8633,7 +8633,7 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) if (!refcount) { if (manager->device) - IDXGIDevice_Release(manager->device); + IUnknown_Release(manager->device); DeleteCriticalSection(&manager->cs); free(manager->handles); free(manager); @@ -8709,7 +8709,7 @@ static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager * if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) hr = MF_E_DXGI_NEW_VIDEO_DEVICE; else if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_OPEN) - hr = IDXGIDevice_QueryInterface(manager->device, riid, service); + hr = IUnknown_QueryInterface(manager->device, riid, service); else hr = E_HANDLE; } @@ -8738,7 +8738,7 @@ static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface } else if (manager->locking_tid == GetCurrentThreadId()) { - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(manager->device, riid, obj))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(manager->device, riid, obj))) dxgi_device_manager_lock_handle(manager, idx); } else if (manager->locking_tid && !block) @@ -8756,7 +8756,7 @@ static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface { if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) hr = MF_E_DXGI_NEW_VIDEO_DEVICE; - else if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(manager->device, riid, obj))) + else if (SUCCEEDED(hr = IUnknown_QueryInterface(manager->device, riid, obj))) { manager->locking_tid = GetCurrentThreadId(); dxgi_device_manager_lock_handle(manager, idx); @@ -8814,7 +8814,7 @@ static HRESULT WINAPI dxgi_device_manager_OpenDeviceHandle(IMFDXGIDeviceManager static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *iface, IUnknown *device, UINT token) { struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); - IDXGIDevice *dxgi_device; + IUnknown *d3d_device; size_t i; TRACE("%p, %p, %u.\n", iface, device, token); @@ -8822,8 +8822,14 @@ static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *ifac if (!device || token != manager->token) return E_INVALIDARG; - if (FAILED(IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device))) - return E_INVALIDARG; + if (FAILED(IUnknown_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d_device))) + { + if (FAILED(IUnknown_QueryInterface(device, &IID_ID3D12Device, (void **)&d3d_device))) + { + WARN("Unsupported device interface.\n"); + return E_INVALIDARG; + } + } EnterCriticalSection(&manager->cs); @@ -8836,9 +8842,9 @@ static HRESULT WINAPI dxgi_device_manager_ResetDevice(IMFDXGIDeviceManager *ifac } manager->locking_tid = 0; manager->locks = 0; - IDXGIDevice_Release(manager->device); + IUnknown_Release(manager->device); } - manager->device = dxgi_device; + manager->device = d3d_device; LeaveCriticalSection(&manager->cs);

1 0

Nikolay Sivov : mfplat/tests: Split video sample allocator tests per device type.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: c568a200bbdeddbcf2979db9000a994228432425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c568a200bbdeddbcf2979db9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 27 00:03:58 2021 +0300 mfplat/tests: Split video sample allocator tests per device type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 219 ++++++++++++++++++++++++++------------------- 1 file changed, 127 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c568a200bbdeddbcf297…

1 0

Nikolay Sivov : mfplat/tests: Add some tests for video sample allocator using D3D12 device.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: f03933fbb73152c7a54383fba411a611af7aaa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f03933fbb73152c7a54383fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 27 00:03:59 2021 +0300 mfplat/tests: Add some tests for video sample allocator using D3D12 device. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 654467a0bdb..cec27c2c23f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -48,6 +48,10 @@ #include "ks.h" #include "ksmedia.h" #include "dxva2api.h" +#include "d3d12.h" +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID +#include "mfd3d12.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); @@ -220,6 +224,8 @@ static DWORD get_d3d11_texture_color(ID3D11Texture2D *texture, unsigned int x, u static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); +static HRESULT (WINAPI *pD3D12CreateDevice)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device); static HRESULT (WINAPI *pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); @@ -1025,6 +1031,11 @@ static void init_functions(void) X(D3D11CreateDevice); } + if ((mod = LoadLibraryA("d3d12.dll"))) + { + X(D3D12CreateDevice); + } + mod = GetModuleHandleA("ole32.dll"); X(CoGetApartmentType); @@ -6542,6 +6553,18 @@ static void update_d3d11_texture(ID3D11Texture2D *texture, unsigned int sub_reso ID3D11Device_Release(device); } +static ID3D12Device *create_d3d12_device(void) +{ + ID3D12Device *device; + HRESULT hr; + + hr = pD3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (FAILED(hr)) + return NULL; + + return device; +} + static void test_dxgi_surface_buffer(void) { DWORD max_length, cur_length, length, color; @@ -7309,6 +7332,96 @@ static void test_sample_allocator_d3d11(void) ID3D11Device_Release(device); } +static void test_sample_allocator_d3d12(void) +{ + IMFVideoSampleAllocator *allocator; + IMFDXGIDeviceManager *manager; + IMFDXGIBuffer *dxgi_buffer; + IMFMediaType *video_type; + ID3D12Resource *resource; + D3D12_RESOURCE_DESC desc; + IMFMediaBuffer *buffer; + ID3D12Device *device; + unsigned int token; + IMFSample *sample; + HRESULT hr; + + if (!pD3D12CreateDevice) + { + skip("Missing d3d12 support, some tests will be skipped.\n"); + return; + } + + if (!(device = create_d3d12_device())) + { + skip("Failed to create a D3D12 device, skipping tests.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create device manager, hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(manager, 1); + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(manager, 2); + + video_type = create_video_type(&MFVideoFormat_RGB32); + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_D3D_RESOURCE_VERSION, MF_D3D12_RESOURCE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); +todo_wine + ok(hr == S_OK || broken(hr == MF_E_UNEXPECTED) /* Some Win10 versions fail. */, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) goto done; + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + resource->lpVtbl->GetDesc(resource, &desc); + ok(desc.Width == 64, "Unexpected width.\n"); + ok(desc.Height == 64, "Unexpected height.\n"); + ok(desc.DepthOrArraySize == 1, "Unexpected array size %u.\n", desc.DepthOrArraySize); + ok(desc.MipLevels == 1, "Unexpected miplevels %u.\n", desc.MipLevels); + ok(desc.Format == DXGI_FORMAT_B8G8R8X8_UNORM, "Unexpected format %u.\n", desc.Format); + ok(desc.SampleDesc.Count == 1, "Unexpected sample count %u.\n", desc.SampleDesc.Count); + ok(!desc.SampleDesc.Quality, "Unexpected sample quality %u.\n", desc.SampleDesc.Quality); + ok(!desc.Layout, "Unexpected layout %u.\n", desc.Layout); + ok(!desc.Flags, "Unexpected flags %#x.\n", desc.Flags); + + ID3D12Resource_Release(resource); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + +done: + IMFDXGIDeviceManager_Release(manager); + ID3D12Device_Release(device); +} + static void test_MFLockSharedWorkQueue(void) { DWORD taskid, queue, queue2; @@ -7594,6 +7707,7 @@ START_TEST(mfplat) test_sample_allocator_sysmem(); test_sample_allocator_d3d9(); test_sample_allocator_d3d11(); + test_sample_allocator_d3d12(); test_MFMapDX9FormatToDXGIFormat(); test_MFllMulDiv(); test_shared_dxgi_device_manager();

1 0

Alexandre Julliard : mountmgr: Move the DiskArbitration support to the Unix library.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 236a1bc8f0c8a01e9312748eca149ec5e773397d URL: https://source.winehq.org/git/wine.git/?a=commit;h=236a1bc8f0c8a01e9312748e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 16:50:41 2021 +0100 mountmgr: Move the DiskArbitration support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 5 --- dlls/mountmgr.sys/diskarb.c | 72 ++++++++++++++++++++------------------------ dlls/mountmgr.sys/mountmgr.c | 6 ---- dlls/mountmgr.sys/mountmgr.h | 6 ---- dlls/mountmgr.sys/unixlib.c | 1 + dlls/mountmgr.sys/unixlib.h | 1 + 6 files changed, 34 insertions(+), 57 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 43f79d39034..28b229f03d0 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -827,9 +827,4 @@ void run_dbus_loop(void) TRACE( "Skipping, DBUS support not compiled in\n" ); } -NTSTATUS dhcp_request( void *args ) -{ - return STATUS_NOT_SUPPORTED; -} - #endif /* SONAME_LIBDBUS_1 */ diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 7c55659862d..e034a4c1c5b 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -18,8 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" -#include "wine/port.h" #include <assert.h> #include <errno.h> @@ -43,6 +46,8 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "dhcpcsdk.h" +#include "unixlib.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -163,9 +168,9 @@ static void appeared_callback( DADiskRef disk, void *context ) } if (removable) - add_dos_device( -1, device, device, mount_point, type, guid_ptr, &scsi_info ); + queue_device_op( ADD_DOS_DEVICE, device, device, mount_point, type, guid_ptr, NULL, &scsi_info ); else - if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL, &scsi_info ); + if (guid_ptr) queue_device_op( ADD_VOLUME, device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL, &scsi_info ); done: CFRelease( dict ); @@ -191,20 +196,17 @@ static void disappeared_callback( DADiskRef disk, void *context ) TRACE( "got unmount notification for '%s'\n", device ); - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - remove_dos_device( -1, device ); - else - remove_volume( device ); + queue_device_op( REMOVE_DEVICE, device, NULL, NULL, 0, NULL, NULL, NULL ); done: CFRelease( dict ); } -static DWORD WINAPI runloop_thread( void *arg ) +void run_diskarbitration_loop(void) { DASessionRef session = DASessionCreate( NULL ); - if (!session) return 1; + if (!session) return; DASessionScheduleWithRunLoop( session, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode ); DARegisterDiskAppearedCallback( session, kDADiskDescriptionMatchVolumeMountable, @@ -216,20 +218,11 @@ static DWORD WINAPI runloop_thread( void *arg ) CFRunLoopRun(); DASessionUnscheduleFromRunLoop( session, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode ); CFRelease( session ); - return 0; -} - -void initialize_diskarbitration(void) -{ - HANDLE handle; - - if (!(handle = CreateThread( NULL, 0, runloop_thread, NULL, 0, NULL ))) return; - CloseHandle( handle ); } #else /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ -void initialize_diskarbitration(void) +void run_diskarbitration_loop(void) { TRACE( "Skipping, Disk Arbitration support not compiled in\n" ); } @@ -291,17 +284,17 @@ done: return ret; } -ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, - ULONG size ) +NTSTATUS dhcp_request( void *args ) { - CFStringRef service_id = find_service_id( unix_name ); + const struct dhcp_request_params *params = args; + CFStringRef service_id = find_service_id( params->unix_name ); CFDictionaryRef dict; CFDataRef value; DWORD ret = 0; CFIndex len; - param->offset = 0; - param->size = 0; + params->req->offset = 0; + params->req->size = 0; if (!service_id) return 0; if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id ))) @@ -310,25 +303,25 @@ ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_reques return 0; } CFRelease( service_id ); - if (!(value = DHCPInfoGetOptionData( dict, map_option(param->id) ))) + if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) ))) { CFRelease( dict ); return 0; } len = CFDataGetLength( value ); - switch (param->id) + switch (params->req->id) { case OPTION_SUBNET_MASK: case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(buf + offset); - if (len == sizeof(*ptr) && size >= sizeof(*ptr)) + DWORD *ptr = (DWORD *)(params->buffer + params->offset); + if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); - param->offset = offset; - param->size = sizeof(*ptr); + params->req->offset = params->offset; + params->req->size = sizeof(*ptr); TRACE( "returning %08x\n", *ptr ); } ret = sizeof(*ptr); @@ -338,33 +331,32 @@ ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_reques case OPTION_DOMAIN_NAME: case OPTION_MSFT_IE_PROXY: { - char *ptr = buf + offset; - if (size >= len) + char *ptr = params->buffer + params->offset; + if (params->size >= len) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); - param->offset = offset; - param->size = len; + params->req->offset = params->offset; + params->req->size = len; TRACE( "returning %s\n", debugstr_an(ptr, len) ); } ret = len; break; } default: - FIXME( "option %u not supported\n", param->id ); + FIXME( "option %u not supported\n", params->req->id ); break; } CFRelease( dict ); - return ret; + *params->ret_size = ret; + return STATUS_SUCCESS; } #elif !defined(SONAME_LIBDBUS_1) -ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, - ULONG size ) +NTSTATUS dhcp_request( void *args ) { - FIXME( "support not compiled in\n" ); - return 0; + return STATUS_NOT_SUPPORTED; } #endif diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 8aeaee8dc04..2e3ff80c36a 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -408,15 +408,11 @@ static void WINAPI query_dhcp_request_params( TP_CALLBACK_INSTANCE *instance, vo offset = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[query->count]); for (i = 0; i < query->count; i++) { -#ifdef __APPLE__ - offset += get_dhcp_request_param( query->unix_name, &query->params[i], (char *)query, offset, outsize - offset ); -#else ULONG ret_size; struct dhcp_request_params params = { query->unix_name, &query->params[i], (char *)query, offset, outsize - offset, &ret_size }; MOUNTMGR_CALL( dhcp_request, &params ); offset += ret_size; -#endif if (offset > outsize) { if (offset >= sizeof(query->size)) query->size = offset; @@ -685,8 +681,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) params.op_apc = device_op; CloseHandle( CreateThread( NULL, 0, run_loop_thread, &params, 0, NULL )); - initialize_diskarbitration(); - #ifdef _WIN64 /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */ RegCreateKeyExW( HKEY_LOCAL_MACHINE, wow64_ports_keyW, 0, NULL, REG_OPTION_CREATE_LINK, diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index c3557d7e548..0297f6f11fe 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -36,8 +36,6 @@ #define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h" -extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; - extern WCHAR *strdupW( const WCHAR * ) DECLSPEC_HIDDEN; /* device functions */ @@ -114,8 +112,4 @@ extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICOD extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN; extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN; -#ifdef __APPLE__ -extern ULONG get_dhcp_request_param( const char *unix_name, struct mountmgr_dhcp_request_param *param, - char *buf, ULONG offset, ULONG size ) DECLSPEC_HIDDEN; -#endif #endif /* __WINE_MOUNTMGR_H */ diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index caecb0140a8..54ba8c81b78 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -128,6 +128,7 @@ static NTSTATUS run_loop( void *args ) const struct run_loop_params *params = args; run_loop_params = *params; + run_diskarbitration_loop(); run_dbus_loop(); return STATUS_SUCCESS; } diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index afaed5fa559..74d076fa4fd 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -152,6 +152,7 @@ extern void queue_device_op( enum device_op op, const char *udi, const char *dev const char *mount_point, enum device_type type, const GUID *guid, const char *disk_serial, const struct scsi_info *info ) DECLSPEC_HIDDEN; extern void run_dbus_loop(void) DECLSPEC_HIDDEN; +extern void run_diskarbitration_loop(void) DECLSPEC_HIDDEN; extern NTSTATUS dhcp_request( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN;

1 0

Huw Davies : winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: 1f0591dd4558c606d844fc30c21f5c2b1e11c34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0591dd4558c606d844fc30… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:36 2021 +0000 winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c. This is to enable coremidi.c to become the unixlib, while still enabling code on the user-side to be able to call MIDIOut_Send() for the time being. Eventually, its equivalent will move to the unixlib and audiounit.c will disappear. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/audiounit.c | 13 +++++++++++++ dlls/winecoreaudio.drv/coremidi.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 030ff4d090a..c91fec216bd 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,6 +22,7 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT +#include <mach/mach_time.h> #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -195,3 +196,15 @@ int SynthUnit_Close(AUGraph graph) return 1; } + +void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length) +{ + Byte packetBuff[512]; + MIDIPacketList *packetList = (MIDIPacketList *)packetBuff; + + MIDIPacket *packet = MIDIPacketListInit(packetList); + + packet = MIDIPacketListAdd(packetList, sizeof(packetBuff), packet, mach_absolute_time(), length, buffer); + if (packet) + MIDISend(port, dest, packetList); +} diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 94761b05c4f..6d54d89cfac 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -67,15 +67,3 @@ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefC packet = MIDIPacketNext(packet); } } - -void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length) -{ - Byte packetBuff[512]; - MIDIPacketList *packetList = (MIDIPacketList *)packetBuff; - - MIDIPacket *packet = MIDIPacketListInit(packetList); - - packet = MIDIPacketListAdd(packetList, sizeof(packetBuff), packet, mach_absolute_time(), length, buffer); - if (packet) - MIDISend(port, dest, packetList); -}

1 0

Huw Davies : winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc.
by Alexandre Julliard 26 Nov '21

26 Nov '21

Module: wine Branch: master Commit: dcbbe185197b6c81b5a9cd9fdcdb9cfd64c4aab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcbbe185197b6c81b5a9cd9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:37 2021 +0000 winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 31 ++++++++++++++++++------- dlls/winecoreaudio.drv/coremidi.h | 8 ++++++- dlls/winecoreaudio.drv/midi.c | 48 +++++---------------------------------- 3 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6d54d89cfac..92f52c972d3 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1,7 +1,11 @@ /* - * Wine Midi driver for Mac OS X + * MIDI driver for macOS (unixlib) * - * Copyright 2006 Emmanuel Maillard + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH + * Copyright 2005, 2006 Emmanuel Maillard + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,14 +60,25 @@ void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size) */ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { - unsigned int i; - + CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); MIDIPacket *packet = (MIDIPacket *)pktlist->packet; - for (i = 0; i < pktlist->numPackets; ++i) { - UInt16 devID = *((UInt16 *)connRefCon); - - MIDIIn_SendMessage(devID, packet->data, packet->length); + CFMutableDataRef data; + MIDIMessage msg; + unsigned int i; + for (i = 0; i < pktlist->numPackets; ++i) + { + msg.devID = *(UInt16 *)connRefCon; + msg.length = packet->length; + data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + packet->length); + if (data) + { + CFDataAppendBytes(data, (UInt8 *)&msg, sizeof(msg)); + CFDataAppendBytes(data, packet->data, packet->length); + CFMessagePortSendRequest(msg_port, 0, data, 0.0, 0.0, NULL, NULL); + CFRelease(data); + } packet = MIDIPacketNext(packet); } + CFRelease(msg_port); } diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 3433a1d4342..47566345b54 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -73,6 +73,12 @@ extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *c extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); /* midi.c */ -void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length); +extern CFStringRef MIDIInThreadPortName; + +typedef struct { + UInt16 devID; + UInt16 length; + Byte data[]; +} MIDIMessage; #endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 32826cb658c..2c89f32b430 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -1,14 +1,11 @@ /* - * Sample MIDI Wine Driver for Mac OS X (based on OSS midi driver) + * MIDI driver for macOS (PE-side) * - * Copyright 1994 Martin Ayotte - * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) - * Copyright 1998/1999 Eric POUECH : - * 98/7 changes for making this MIDI driver work on OSS - * current support is limited to MIDI ports of OSS systems - * 98/9 rewriting MCI code for MIDI - * 98/11 split in midi.c and mcimidi.c + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH * Copyright 2005, 2006 Emmanuel Maillard + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -78,14 +75,8 @@ typedef struct tagMIDISource { DWORD startTime; } MIDISource; -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[]; -} MIDIMessage; - static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ -static CFStringRef MIDIInThreadPortName = NULL; +CFStringRef MIDIInThreadPortName = NULL; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); @@ -798,33 +789,6 @@ static DWORD MIDIIn_Reset(WORD wDevID) /* * MIDI In Mach message handling */ - -/* - * Call from CoreMIDI IO threaded callback, - * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. - */ -void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length) -{ - MIDIMessage msg; - CFMutableDataRef data; - - CFMessagePortRef messagePort; - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); - - msg.devID = devID; - msg.length = length; - - data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + length); - if (data) - { - CFDataAppendBytes(data, (UInt8 *) &msg, sizeof(msg)); - CFDataAppendBytes(data, buffer, length); - CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); - CFRelease(data); - } - CFRelease(messagePort); -} - static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) { MIDIMessage *msg = NULL;

1 0