November 2021 - Wine-Commits

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

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

Nov. 26, 2021

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

Eric Pouech : winedbg: Replace wine_dbgstr_longlong with I64 width modifier.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 07502a064671be9d68ee93f90e76e9bb14ff65dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=07502a064671be9d68ee93f9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:28 2021 +0100 winedbg: Replace wine_dbgstr_longlong with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/break.c | 7 +++---- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/info.c | 6 +++--- programs/winedbg/types.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 03f7bdf5a2f..d22dd7ac074 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -402,8 +402,7 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { case 4: case 2: case 1: break; default: - dbg_printf("Unsupported length (%s) for watch-points, defaulting to 4\n", - wine_dbgstr_longlong(l)); + dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to 4\n", l); break; } } @@ -752,8 +751,8 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) case be_xpoint_watch_write: dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); print_address(addr, TRUE); - dbg_printf(" new value %s\n", - wine_dbgstr_longlong(dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval)); + dbg_printf(" new value %I64x\n", + dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); } return FALSE; } diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b578ac289e1..0fb27023957 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1420,7 +1420,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) return packet_error; } - TRACE("%Iu => %s\n", reg, wine_dbgstr_longlong(cpu_register(gdbctx, &ctx, reg))); + TRACE("%Iu => %I64x\n", reg, cpu_register(gdbctx, &ctx, reg)); packet_reply_open(gdbctx); packet_reply_register_hex_to(gdbctx, &ctx, reg); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 23d87bbb006..07b2a5acc8b 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -168,9 +168,9 @@ struct info_modules static void module_print_info(const struct info_module *module, BOOL is_embedded) { - dbg_printf("%*.*s-%*.*s\t%-16s%s\n", - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage), - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage + module->mi.ImageSize), + dbg_printf("%*.*I64x-%*.*I64x\t%-16s%s\n", + ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage, + ADDRWIDTH, ADDRWIDTH, module->mi.BaseOfImage + module->mi.ImageSize, is_embedded ? "\\" : get_symtype_str(&module->mi), module->name); } diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index c091420ed50..9d98a136428 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -83,7 +83,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, } if (size > sizeof(rtn)) { - WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); + WINE_ERR("Size too large (%I64x)\n", size); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); return rtn; }

1 0

Huw Davies : winecoreaudio: Move midi_out_long_data to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 47c698fc14d6df4a032344209e97bc85240b952c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c698fc14d6df4a03234420… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:42 2021 +0000 winecoreaudio: Move midi_out_long_data to the unixlib. 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 | 12 ------ dlls/winecoreaudio.drv/coremidi.c | 59 ++++++++++++++++++++++++++ dlls/winecoreaudio.drv/coremidi.h | 7 ---- dlls/winecoreaudio.drv/midi.c | 85 -------------------------------------- 4 files changed, 59 insertions(+), 104 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index d3c53926c59..137b1e93bcf 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -83,15 +83,3 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) *right = *left; 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 4dc4166dda1..d80b8c1711b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -509,6 +509,62 @@ static DWORD midi_out_data(WORD dev_id, DWORD data) return MMSYSERR_NOERROR; } +static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + OSStatus sc; + + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (!hdr) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (!hdr->lpData || !(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + if ((UInt8)hdr->lpData[0] != 0xf0) + /* System Exclusive */ + ERR("Add missing 0xf0 marker at the beginning of system exclusive byte stream\n"); + + if ((UInt8)hdr->lpData[hdr->dwBufferLength - 1] != 0xF7) + /* Send end of System Exclusive */ + ERR("Add missing 0xf7 marker at the end of system exclusive byte stream\n"); + + dest = dests + dev_id; + + if (dest->caps.wTechnology == MOD_SYNTH) /* FIXME */ + { + sc = MusicDeviceSysEx(dest->synth, (const UInt8 *)hdr->lpData, hdr->dwBufferLength); + if (sc != noErr) + { + ERR("MusicDeviceSysEx returns %s\n", wine_dbgstr_fourcc(sc)); + return MMSYSERR_ERROR; + } + } + else if (dest->caps.wTechnology == MOD_MIDIPORT) + midi_send(midi_out_port, dest->dest, (UInt8 *)hdr->lpData, hdr->dwBufferLength); + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + + set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -532,6 +588,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index ca669db7db1..f764bad45aa 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -67,13 +67,6 @@ extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif -/* coremidi.c */ -extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); -extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); -extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon); - -extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); - /* midi.c */ typedef struct midi_dest { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 98b0a17a147..589a08e0907 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -135,14 +135,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - dwCallBack = destinations[wDevID].midiDesc.dwCallback; - uFlags = destinations[wDevID].wFlags; - hDev = destinations[wDevID].midiDesc.hMidi; - dwInstance = destinations[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -163,81 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - LPBYTE lpData; - OSStatus err = noErr; - - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (lpMidiHdr == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - lpData = (LPBYTE) lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latter is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - - if (lpData[0] != 0xF0) { - /* System Exclusive */ - ERR("Add missing 0xF0 marker at the beginning of system exclusive byte stream\n"); - } - if (lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - /* Send end of System Exclusive */ - ERR("Add missing 0xF7 marker at the end of system exclusive byte stream\n"); - } - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) /* FIXME */ - { - err = MusicDeviceSysEx(destinations[wDevID].synth, (const UInt8 *) lpData, lpMidiHdr->dwBufferLength); - if (err != noErr) - { - ERR("MusicDeviceSysEx(%p, %p, %d) return %s\n", destinations[wDevID].synth, lpData, lpMidiHdr->dwBufferLength, wine_dbgstr_fourcc(err)); - return MMSYSERR_ERROR; - } - } - else if (destinations[wDevID].caps.wTechnology == MOD_MIDIPORT) { - MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, lpData, lpMidiHdr->dwBufferLength); - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * MIDIOut_Prepare [internal] */ @@ -725,8 +642,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_LONGDATA: - return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE:

1 0

Huw Davies : winecoreaudio: Move midi_out_data to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 1a1ef23079151840e1a44ad5fe7ba563cf2ab971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1ef23079151840e1a44ad5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:41 2021 +0000 winecoreaudio: Move midi_out_data to the unixlib. 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 | 49 +++++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 40 -------------------------------- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6fddbd7d88a..4dc4166dda1 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -463,6 +463,52 @@ static DWORD midi_out_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static void midi_send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned len) +{ + Byte packet_buf[512]; + MIDIPacketList *packet_list = (MIDIPacketList *)packet_buf; + MIDIPacket *packet = MIDIPacketListInit(packet_list); + + packet = MIDIPacketListAdd(packet_list, sizeof(packet_buf), packet, mach_absolute_time(), len, buffer); + if (packet) MIDISend(port, dest, packet_list); +} + +static DWORD midi_out_data(WORD dev_id, DWORD data) +{ + struct midi_dest *dest; + UInt8 bytes[3]; + OSStatus sc; + + TRACE("dev_id = %d data = %08x\n", dev_id, data); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + bytes[0] = data & 0xff; + bytes[1] = (data >> 8) & 0xff; + bytes[2] = (data >> 16) & 0xff; + + dest = dests + dev_id; + if (dest->caps.wTechnology == MOD_SYNTH) + { + sc = MusicDeviceMIDIEvent(dest->synth, bytes[0], bytes[1], bytes[2], 0); + if (sc != noErr) + { + ERR("MusicDeviceMIDIEvent returns %s\n", wine_dbgstr_fourcc(sc)); + return MMSYSERR_ERROR; + } + } + else + { + midi_send(midi_out_port, dest->dest, bytes, sizeof(bytes)); + } + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -483,6 +529,9 @@ NTSTATUS midi_out_message(void *args) case MODM_CLOSE: *params->err = midi_out_close(params->dev_id, params->notify); break; + case MODM_DATA: + *params->err = midi_out_data(params->dev_id, params->param_1); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e2418645968..98b0a17a147 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -163,44 +163,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) -{ - WORD evt = LOBYTE(LOWORD(dwParam)); - UInt8 chn = (evt & 0x0F); - - TRACE("wDevID=%d dwParam=%08X\n", wDevID, dwParam); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - { - WORD d1 = HIBYTE(LOWORD(dwParam)); - WORD d2 = LOBYTE(HIWORD(dwParam)); - OSStatus err = noErr; - - err = MusicDeviceMIDIEvent(destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0); - if (err != noErr) - { - ERR("MusicDeviceMIDIEvent(%p, %04x, %04x, %04x, %d) return %s\n", destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0, wine_dbgstr_fourcc(err)); - return MMSYSERR_ERROR; - } - } - else - { - UInt8 buffer[3]; - buffer[0] = (evt & 0xF0) | chn; - buffer[1] = HIBYTE(LOWORD(dwParam)); - buffer[2] = LOBYTE(HIWORD(dwParam)); - - MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, buffer, 3); - } - - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { LPBYTE lpData; @@ -763,8 +725,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_DATA: - return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE:

1 0