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

Nikolay Sivov : mfplat: Implement GetMajorType() for stream descriptor.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: 762a9ae4c7434847245eff4250fc0d73acdcee10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=762a9ae4c7434847245eff42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 21 10:42:53 2019 +0300 mfplat: Implement GetMajorType() for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 14 ++++++++++++-- dlls/mfplat/tests/mfplat.c | 11 ++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b526509..bdc4760 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -931,9 +931,19 @@ static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { - FIXME("%p, %p.\n", iface, type); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + EnterCriticalSection(&stream_desc->cs); + if (stream_desc->current_type) + hr = IMFMediaType_GetGUID(stream_desc->current_type, &MF_MT_MAJOR_TYPE, type); + else + hr = MF_E_ATTRIBUTENOTFOUND; + LeaveCriticalSection(&stream_desc->cs); + + return hr; } static const IMFMediaTypeHandlerVtbl mediatypehandlervtbl = diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b3fbc46..9985f59 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2387,7 +2387,6 @@ static void test_stream_descriptor(void) ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); -todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(media_types); ++i) @@ -2409,6 +2408,16 @@ todo_wine hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set major type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&major_type, &MFMediaType_Audio), "Unexpected major type.\n"); + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); ok(count == ARRAY_SIZE(media_types), "Unexpected type count.\n");

1 0

Nikolay Sivov : mfplat: Implement MFCalculateImageSize().
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: abcea9a35a89a75bb8eacf0e3ebee626d2b9fad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abcea9a35a89a75bb8eacf0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 21 10:42:55 2019 +0300 mfplat: Implement MFCalculateImageSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 47 +++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 21 ++++++++++++++++--- 4 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 272b1c2..4e6fa80 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1449,3 +1449,50 @@ HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor * return S_OK; } + +struct uncompressed_video_format +{ + const GUID *subtype; + unsigned int bytes_per_pixel; +}; + +static int uncompressed_video_format_compare(const void *a, const void *b) +{ + const GUID *guid = a; + const struct uncompressed_video_format *format = b; + return memcmp(guid, format->subtype, sizeof(*guid)); +} + +/*********************************************************************** + * MFCalculateImageSize (mfplat.@) + */ +HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) +{ + static const struct uncompressed_video_format video_formats[] = + { + { &MFVideoFormat_RGB24, 3 }, + { &MFVideoFormat_ARGB32, 4 }, + { &MFVideoFormat_RGB32, 4 }, + { &MFVideoFormat_RGB565, 2 }, + { &MFVideoFormat_RGB555, 2 }, + { &MFVideoFormat_A2R10G10B10, 4 }, + { &MFVideoFormat_RGB8, 1 }, + { &MFVideoFormat_A16B16G16R16F, 8 }, + }; + struct uncompressed_video_format *format; + + TRACE("%s, %u, %u, %p.\n", debugstr_guid(subtype), width, height, size); + + format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), + uncompressed_video_format_compare); + if (format) + { + *size = ((width * format->bytes_per_pixel + 3) & ~3) * height; + } + else + { + *size = 0; + } + + return format ? S_OK : E_INVALIDARG; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index be5d8b2..d8ed5f9 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -26,7 +26,7 @@ @ stub MFBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread @ stub MFCalculateBitmapImageSize -@ stub MFCalculateImageSize +@ stdcall MFCalculateImageSize(ptr long long ptr) @ stub MFCancelCreateFile @ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 9985f59..b420513 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2429,6 +2429,57 @@ static void test_stream_descriptor(void) IMFStreamDescriptor_Release(stream_desc); } +static void test_MFCalculateImageSize(void) +{ + static const struct image_size_test + { + const GUID *subtype; + UINT32 width; + UINT32 height; + UINT32 size; + } + image_size_tests[] = + { + { &MFVideoFormat_RGB8, 3, 5, 20 }, + { &MFVideoFormat_RGB8, 1, 1, 4 }, + { &MFVideoFormat_RGB555, 3, 5, 40 }, + { &MFVideoFormat_RGB555, 1, 1, 4 }, + { &MFVideoFormat_RGB565, 3, 5, 40 }, + { &MFVideoFormat_RGB565, 1, 1, 4 }, + { &MFVideoFormat_RGB24, 3, 5, 60 }, + { &MFVideoFormat_RGB24, 1, 1, 4 }, + { &MFVideoFormat_RGB32, 3, 5, 60 }, + { &MFVideoFormat_RGB32, 1, 1, 4 }, + { &MFVideoFormat_ARGB32, 3, 5, 60 }, + { &MFVideoFormat_ARGB32, 1, 1, 4 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + }; + unsigned int i; + UINT32 size; + HRESULT hr; + + size = 1; + hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); + ok(size == 0, "Unexpected size %u.\n", size); + + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) + { + /* Those are supported since Win10. */ + BOOL is_broken = IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A16B16G16R16F) || + IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A2R10G10B10); + + hr = MFCalculateImageSize(image_size_tests[i].subtype, image_size_tests[i].width, + image_size_tests[i].height, &size); + ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); + ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, + image_size_tests[i].size); + } +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2458,6 +2509,7 @@ START_TEST(mfplat) test_system_time_source(); test_MFInvokeCallback(); test_stream_descriptor(); + test_MFCalculateImageSize(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index b38953c..1b8eafa 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -48,11 +48,25 @@ extern "C" { DEFINE_GUID(name, format, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); #ifndef DIRECT3D_VERSION -#define D3DFMT_X8R8G8B8 22 +#define D3DFMT_R8G8B8 20 +#define D3DFMT_A8R8G8B8 21 +#define D3DFMT_X8R8G8B8 22 +#define D3DFMT_R5G6B5 23 +#define D3DFMT_X1R5G5B5 24 +#define D3DFMT_A2B10G10R10 31 +#define D3DFMT_P8 41 +#define D3DFMT_A16B16G16R16F 113 #endif -DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); -DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB8, D3DFMT_P8); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB555, D3DFMT_X1R5G5B5); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB565, D3DFMT_R5G6B5); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB24, D3DFMT_R8G8B8); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB32, D3DFMT_A8R8G8B8); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_A2R10G10B10, D3DFMT_A2B10G10R10); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_A16B16G16R16F, D3DFMT_A16B16G16R16F); #if defined(__cplusplus) && !defined(CINTERFACE) typedef struct tagMFASYNCRESULT : public IMFAsyncResult { @@ -172,6 +186,7 @@ typedef void (CALLBACK *MFPERIODICCALLBACK)(IUnknown *context); HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); +HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer);

1 0

Zhiyi Zhang : hidclass.sys: Handle create existent device failure.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: 56b509a84a26576e4dbfe95b076e5463f2496b6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b509a84a26576e4dbfe95b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 20 23:27:41 2019 +0800 hidclass.sys: Handle create existent device failure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 547c355..81d5c3c 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -90,26 +90,24 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) RtlInitUnicodeString( &nameW, ext->device_name); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); - if (!devinfo) + devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_HIDCLASS, NULL); + if (devinfo == INVALID_HANDLE_VALUE) { FIXME( "failed to get ClassDevs %x\n", GetLastError()); return STATUS_UNSUCCESSFUL; } Data.cbSize = sizeof(Data); - if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) + if (SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) { - if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) + if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL)) { - SetupDiDestroyDeviceInfoList(devinfo); - return STATUS_SUCCESS; + FIXME( "failed to register device info %x\n", GetLastError()); + goto error; } - FIXME( "failed to Create Device Info %x\n", GetLastError()); - goto error; } - if (!SetupDiRegisterDeviceInfo( devinfo, &Data, 0, NULL, NULL, NULL )) + else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) { - FIXME( "failed to Register Device Info %x\n", GetLastError()); + FIXME( "failed to create device info %x\n", GetLastError()); goto error; } SetupDiDestroyDeviceInfoList(devinfo);

1 0

Hans Leidekker : msi: Disable filesystem redirection only when really needed.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: 15f852015a0332313821804cc1fbad79216408c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15f852015a0332313821804c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 20 09:43:44 2019 +0100 msi: Disable filesystem redirection only when really needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46846 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 236 ++++++++++++------------------------- dlls/msi/appsearch.c | 172 ++++++++++++--------------- dlls/msi/custom.c | 2 +- dlls/msi/files.c | 319 +++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/font.c | 20 ++-- dlls/msi/install.c | 2 +- dlls/msi/media.c | 13 +-- dlls/msi/msi.c | 11 +- dlls/msi/msipriv.h | 31 ++++- dlls/msi/package.c | 7 ++ 10 files changed, 467 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15f852015a0332313821…

1 0

Aric Stewart : winebus.sys: Add UID to IOHID devices.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: 9491a5e58aaabae7a42f00a642087604eec86434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9491a5e58aaabae7a42f00a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 20 14:10:05 2019 -0500 winebus.sys: Add UID to IOHID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 95077ac..41a383d 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -286,7 +286,7 @@ static const platform_vtbl iohid_vtbl = static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) { DEVICE_OBJECT *device; - DWORD vid, pid, version; + DWORD vid, pid, version, uid; CFStringRef str = NULL; WCHAR serial_string[256]; BOOL is_gamepad = FALSE; @@ -298,6 +298,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); + uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) @@ -344,7 +345,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } } - device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, version, 0, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, &iohid_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, version, uid, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, &iohid_vtbl, sizeof(struct platform_private)); if (!device) ERR("Failed to create device\n"); else

1 0

Nikolay Sivov : mfplat/tests: Add stream descriptor tests.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: d3e819a5a71c9eaa54a5d7f997c5b10ddc5693b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e819a5a71c9eaa54a5d7f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 21 10:42:52 2019 +0300 mfplat/tests: Add stream descriptor tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4c878c9..b3fbc46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2347,6 +2347,79 @@ static void test_MFInvokeCallback(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_stream_descriptor(void) +{ + IMFMediaType *media_types[2], *media_type; + IMFMediaTypeHandler *type_handler; + IMFStreamDescriptor *stream_desc; + GUID major_type; + DWORD id, count; + unsigned int i; + HRESULT hr; + + hr = MFCreateStreamDescriptor(123, 0, NULL, &stream_desc); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(media_types); ++i) + { + hr = MFCreateMediaType(&media_types[i]); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + } + + hr = MFCreateStreamDescriptor(123, 0, media_types, &stream_desc); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(123, ARRAY_SIZE(media_types), media_types, &stream_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetStreamIdentifier(stream_desc, &id); + ok(hr == S_OK, "Failed to get descriptor id, hr %#x.\n", hr); + ok(id == 123, "Unexpected id %#x.\n", id); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_desc, &type_handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); + ok(count == ARRAY_SIZE(media_types), "Unexpected type count.\n"); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); +todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(media_types); ++i) + { + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, i, &media_type); + ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); + ok(media_type == media_types[i], "Unexpected object.\n"); + + if (SUCCEEDED(hr)) + IMFMediaType_Release(media_type); + } + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 2, &media_type); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); + ok(count == ARRAY_SIZE(media_types), "Unexpected type count.\n"); + + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(type_handler); + + IMFStreamDescriptor_Release(stream_desc); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2375,6 +2448,7 @@ START_TEST(mfplat) test_presentation_descriptor(); test_system_time_source(); test_MFInvokeCallback(); + test_stream_descriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Forward CopyAllItems() for presentation descriptor.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: 9caaebf2fcb7d3ac74b529f1548286d81933d55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9caaebf2fcb7d3ac74b529f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 21 10:42:54 2019 +0300 mfplat: Forward CopyAllItems() for presentation descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index bdc4760..272b1c2 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1249,9 +1249,8 @@ static HRESULT WINAPI presentation_descriptor_GetItemByIndex(IMFPresentationDesc static HRESULT WINAPI presentation_descriptor_CopyAllItems(IMFPresentationDescriptor *iface, IMFAttributes *dest) { - FIXME("%p, %p.\n", iface, dest); - - return E_NOTIMPL; + struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); + return IMFAttributes_CopyAllItems(&presentation_desc->attributes.IMFAttributes_iface, dest); } static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorCount(IMFPresentationDescriptor *iface, DWORD *count)

1 0

Zhiyi Zhang : winebus.sys: Handle create existent device failure.
by Alexandre Julliard March 21, 2019

March 21, 2019

Module: wine Branch: master Commit: f4d5b357d3a240bd80d14a4c11ab32b0a4e5d3b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d5b357d3a240bd80d14a4c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 20 23:28:15 2019 +0800 winebus.sys: Handle create existent device failure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fd68833..f9675b3 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -207,6 +207,8 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, UNICODE_STRING nameW; WCHAR dev_name[256]; HDEVINFO devinfo; + SP_DEVINFO_DATA data = {sizeof(data)}; + WCHAR *instance = NULL; NTSTATUS status; DWORD length; @@ -258,26 +260,31 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LeaveCriticalSection(&device_list_cs); - devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); - if (devinfo) + devinfo = SetupDiCreateDeviceInfoList(class, NULL); + if (devinfo == INVALID_HANDLE_VALUE) { - SP_DEVINFO_DATA data; - WCHAR *instance; - - data.cbSize = sizeof(data); - if (!(instance = get_instance_id(device))) - ERR("failed to generate instance id\n"); - else if (!SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) - ERR("failed to create device info: %x\n", GetLastError()); - else if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) - ERR("failed to register device info: %x\n", GetLastError()); - - HeapFree(GetProcessHeap(), 0, instance); - SetupDiDestroyDeviceInfoList(devinfo); + ERR("failed to create device info list, error %#x\n", GetLastError()); + goto error; } - else - ERR("failed to get ClassDevs: %x\n", GetLastError()); + instance = get_instance_id(device); + if (!instance) + { + ERR("failed to generate instance id\n"); + goto error; + } + + if (SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) + { + if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) + ERR("failed to register device info, error %#x\n", GetLastError()); + } + else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) + ERR("failed to create device info, error %#x\n", GetLastError()); + +error: + HeapFree(GetProcessHeap(), 0, instance); + SetupDiDestroyDeviceInfoList(devinfo); return device; }

1 0

Gabriel Ivăncescu : include: Add PtInRect as inline version of common RECT helpers.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: 897b1f5cc320ae10a0675b9004178418d4cfd6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=897b1f5cc320ae10a0675b90… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 11 13:54:04 2019 +0200 include: Add PtInRect as inline version of common RECT helpers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 6300cc9..3cffaa1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4052,7 +4052,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4281,6 +4280,7 @@ WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4321,6 +4321,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE;

1 0

Oliver Henning : po: Fix German translation.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: c2ed63d569b06f7c8a50b3a98778ab5d32e60033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ed63d569b06f7c8a50b3a9… Author: Oliver Henning <oliver.henning(a)gmail.com> Date: Tue Mar 19 15:11:12 2019 +0100 po: Fix German translation. Fixes typo and some comma mistakes. Signed-off-by: Oliver Henning <oliver.henning(a)gmail.com> Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index af4b1b8..6414410 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-02-27 09:09+0530\n" -"Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" +"PO-Revision-Date: 2019-03-19 15:03+0000\n" +"Last-Translator: Oliver Henning <oliver.henning(a)gmail.com>\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1633,7 +1633,7 @@ msgstr "Unternehmensstamm-OID" #: crypt32.rc:122 msgid "Dummy Signer" -msgstr "Attrapenunterzeichner" +msgstr "Attrappenunterzeichner" #: crypt32.rc:123 msgid "Encrypted Private Key" @@ -2207,7 +2207,7 @@ msgstr "Zertifikatsspeicher wählen" #: cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "Zertifikatsspeicher wählen den Sie benutzen möchten:" +msgstr "Zertifikatsspeicher wählen, den Sie benutzen möchten:" #: cryptui.rc:279 msgid "&Show physical stores" @@ -2436,7 +2436,7 @@ msgstr "&Verstärkte Sicherheit aktivieren" #: cryptui.rc:427 msgid "Delete the private &key if the export is successful" -msgstr "Priva&ten Schlüssel löschen wenn der Export erfolgreich war" +msgstr "Priva&ten Schlüssel löschen, wenn der Export erfolgreich war" #: cryptui.rc:444 msgid "Completing the Certificate Export Wizard" @@ -2518,7 +2518,7 @@ msgstr "Dieses Zertifikat hat eine ungültige Signatur." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." -msgstr "Dieses Zertifikat ist entweder abgelaufen, oder noch nicht gültig." +msgstr "Dieses Zertifikat ist entweder abgelaufen oder noch nicht gültig." #: cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." @@ -16950,7 +16950,7 @@ msgstr "Die Datei konnte nicht gespeichert werden." #: wordpad.rc:201 msgid "You do not have access to save the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu speichern." #: wordpad.rc:202 msgid "Could not open the file." @@ -16959,7 +16959,7 @@ msgstr "Die Datei konnte nicht geöffnet werden." #: wordpad.rc:203 msgid "You do not have access to open the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu öffnen." #: wordpad.rc:204 msgid "Printing not implemented."

1 0