November 2020 - Wine-Commits

Zhiyi Zhang : user32/tests: Pass a struct DEVMODEA pointer to expect_dm() for monitor tests.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: 73756156f4bf978d46e96d966c94360531201edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73756156f4bf978d46e96d96… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 13 15:53:09 2020 +0800 user32/tests: Pass a struct DEVMODEA pointer to expect_dm() for monitor tests. No need to pass parameters via struct copying. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 009fc0d626e..c3f5d1eddcb 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -284,7 +284,7 @@ struct device_info }; #define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) -static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) +static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, DWORD test) { DEVMODEA dm; BOOL ret; @@ -295,27 +295,27 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); - ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, - "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); + ok_(__FILE__, line)((dm.dmFields & expected->dmFields) == expected->dmFields, + "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected->dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, - "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, - "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, - "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, - "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, - "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || - dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected->dmFields & DM_BITSPERPEL && expected->dmBitsPerPel != 32 && expected->dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected->dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected->dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected->dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected->dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected->dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected->dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected->dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.x == expected->dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected->dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.y == expected->dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected->dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected->dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected->dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || - dm.dmDisplayOrientation == expected.dmDisplayOrientation, - "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected->dmDisplayOrientation, + "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected->dmDisplayOrientation, dm.dmDisplayOrientation); } @@ -667,7 +667,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } flush_events(); - expect_dm(dm3, devices[device].name, test); + expect_dm(&dm3, devices[device].name, test); /* Change the registry mode to the second mode */ res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); @@ -765,7 +765,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, mode); + expect_dm(&dm, devices[device].name, mode); } /* Restore settings */ @@ -838,7 +838,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); /* Test specifying only position, width and height */ memset(&dm, 0, sizeof(dm)); @@ -883,7 +883,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); } /* Test dmPosition */ @@ -955,7 +955,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; - expect_dm(dm2, devices[1].name, 0); + expect_dm(&dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ for (test = 0; test < 8; ++test) @@ -1014,7 +1014,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm2, devices[1].name, test); + expect_dm(&dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */ @@ -1079,7 +1079,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", devices[device].name, mode, res); flush_events(); - expect_dm(dm2, devices[device].name, mode); + expect_dm(&dm2, devices[device].name, mode); /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ memset(&dm3, 0, sizeof(dm3)); @@ -1125,7 +1125,7 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA returned unexpected %d\n", res); for (device = 0; device < device_count; ++device) - expect_dm(devices[device].original_mode, devices[device].name, 0); + expect_dm(&devices[device].original_mode, devices[device].name, 0); heap_free(devices); }

1 0

Nikolay Sivov : mfplat/buffer: Fix byte width set for d3d9 surface buffers.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: ed1dd4990e7318290cad7ea2810a4f30eef83188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1dd4990e7318290cad7ea2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:34:18 2020 +0300 mfplat/buffer: Fix byte width set for d3d9 surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 3d1d2abdf88..b47d2a9ba16 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -941,6 +941,18 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF { struct memory_buffer *object; D3DSURFACE_DESC desc; + unsigned int stride; + GUID subtype; + BOOL is_yuv; + + IDirect3DSurface9_GetDesc((IDirect3DSurface9 *)surface, &desc); + TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = desc.Format; + + if (!(stride = mf_format_get_stride(&subtype, desc.Width, &is_yuv))) + return MF_E_INVALIDMEDIATYPE; object = heap_alloc_zero(sizeof(*object)); if (!object) @@ -954,11 +966,8 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF object->d3d9_surface.surface = (IDirect3DSurface9 *)surface; IUnknown_AddRef(surface); - IDirect3DSurface9_GetDesc(object->d3d9_surface.surface, &desc); - TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); - MFGetPlaneSize(desc.Format, desc.Width, desc.Height, &object->_2d.plane_size); - object->_2d.width = desc.Width; + object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size;

1 0

Nikolay Sivov : dxva2: Add a semi-stub for VideoProcessBlt().
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: 0824d408ba20ddbf30607e4d50ccb6a0c65f2fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0824d408ba20ddbf30607e4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:30:03 2020 +0300 dxva2: Add a semi-stub for VideoProcessBlt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 83c4723a7dc..341ee33d44d 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -218,13 +218,60 @@ static HRESULT WINAPI video_processor_GetFilterPropertyRange(IDirectXVideoProces return E_NOTIMPL; } +static BOOL intersect_rect(RECT *dest, const RECT *src1, const RECT *src2) +{ + if (IsRectEmpty(src1) || IsRectEmpty(src2) || + (src1->left >= src2->right) || (src2->left >= src1->right) || + (src1->top >= src2->bottom) || (src2->top >= src1->bottom)) + { + SetRectEmpty(dest); + return FALSE; + } + dest->left = max(src1->left, src2->left); + dest->right = min(src1->right, src2->right); + dest->top = max(src1->top, src2->top); + dest->bottom = min(src1->bottom, src2->bottom); + + return TRUE; +} + static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *iface, IDirect3DSurface9 *rt, const DXVA2_VideoProcessBltParams *params, const DXVA2_VideoSample *samples, UINT sample_count, HANDLE *complete_handle) { - FIXME("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + IDirect3DDevice9 *device; + unsigned int i; + RECT dst_rect; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %u, %p.\n", iface, rt, params, samples, sample_count, complete_handle); + + if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) + { + WARN("Failed to get surface device, hr %#x.\n", hr); + return hr; + } + + /* FIXME: use specified color */ + IDirect3DDevice9_ColorFill(device, rt, NULL, 0); + + for (i = 0; i < sample_count; ++i) + { + dst_rect = params->TargetRect; + + if (!intersect_rect(&dst_rect, &dst_rect, &samples[i].DstRect)) + continue; + + if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect, + rt, &dst_rect, D3DTEXF_POINT))) + { + WARN("Failed to copy sample %u, hr %#x.\n", i, hr); + } + } + + IDirect3DDevice9_Release(device); + + return S_OK; } static const IDirectXVideoProcessorVtbl video_processor_vtbl =

1 0

Nikolay Sivov : evr/mixer: Fix method function name for consistency.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: 8b9b16151df2c5f36fb7d6c51ef282349fac210b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9b16151df2c5f36fb7d6c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:34 2020 +0300 evr/mixer: Fix method function name for consistency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 8eba3e3611b..66cb9b021a7 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -2207,7 +2207,7 @@ static ULONG WINAPI video_mixer_quality_advise_AddRef(IMFQualityAdvise *iface) return IMFTransform_AddRef(&mixer->IMFTransform_iface); } -static ULONG WINAPI video_mixer_quality_Release(IMFQualityAdvise *iface) +static ULONG WINAPI video_mixer_quality_advise_Release(IMFQualityAdvise *iface) { struct video_mixer *mixer = impl_from_IMFQualityAdvise(iface); return IMFTransform_Release(&mixer->IMFTransform_iface); @@ -2252,7 +2252,7 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = { video_mixer_quality_advise_QueryInterface, video_mixer_quality_advise_AddRef, - video_mixer_quality_Release, + video_mixer_quality_advise_Release, video_mixer_quality_advise_SetDropMode, video_mixer_quality_advise_SetQualityLevel, video_mixer_quality_advise_GetDropMode,

1 0

Nikolay Sivov : evr/presenter: Create a swapchain for given output window.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: 02d982de3856bd1c98da34fb80085963f29aed05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d982de3856bd1c98da34fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:32 2020 +0300 evr/presenter: Create a swapchain for given output window. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 54 +++++++++++++++++++++- dlls/evr/tests/evr.c | 128 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d982de3856bd1c98da…

1 0

Paul Gofman : ws2_32: Force adding completion for error status in WS2_ConnectEx().
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: 2793bdeb2694b5dc15883773cbabe0300990ffc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2793bdeb2694b5dc15883773… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 13 22:05:52 2020 +0300 ws2_32: Force adding completion for error status in WS2_ConnectEx(). Fixes Paradox launcher hang on start (which happens after commit 0c2f556afe7b5fcc873c737512fae5b9c8c07624). The referenced commit did not introduce the problem, it just made getsockopt(..., WS_SO_PROTOCOL_INFOW, ) working and the application is taking another path after getting XP1_IFS_HANDLES flag for protocol. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..7d810c6d7b2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3485,7 +3485,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = sock_error_to_ntstatus( get_sock_error( s, FD_CONNECT_BIT )); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, TRUE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9357ad0d872..2d69a05aec5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7182,11 +7182,13 @@ static void test_ConnectEx(void) SOCKET connector = INVALID_SOCKET; struct sockaddr_in address, conaddress; int addrlen; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; + HANDLE previous_port, io_port; DWORD bytesReturned; char buffer[1024]; + ULONG_PTR key; BOOL bret; DWORD dwret; int iret; @@ -7305,18 +7307,39 @@ static void test_ConnectEx(void) address.sin_port = htons(1); + previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + bytesReturned = 0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &bytesReturned, &key, &olp, 200 ); + ok(!bret && GetLastError() == ERROR_CONNECTION_REFUSED, "Got unexpected bret %#x, GetLastError() %u.\n", + bret, GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(!bytesReturned, "Number of bytes transferred is %u\n", bytesReturned); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + CloseHandle(io_port); + WSACloseEvent(overlapped.hEvent); closesocket(connector); + + CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -10557,7 +10580,6 @@ START_TEST( sock ) test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); - test_completion_port(); test_address_list_query();

1 0

Nikolay Sivov : ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: c455053486e717b6518ec292444f0284ae442a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c455053486e717b6518ec292… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 00:07:05 2020 +0300 ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index adf4c2f3370..27794c739ee 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2103,6 +2103,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; + ULARGE_INTEGER ularge; ULONG count; assert(var); @@ -2161,6 +2162,13 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_I8: + case VT_UI8: + { + StorageUtl_WriteULargeInteger(&ularge, 0, &var->u.uhVal); + hr = IStream_Write(This->stm, &ularge, sizeof(ularge), &bytesWritten); + break; + } case VT_LPSTR: { if (This->codePage == CP_UNICODE)

1 0

Jacek Caban : hostname: Use CP_ACP for non-console output encoding.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: bf6e8815ded939c7f16559966b46f2ad1b9fa716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6e8815ded939c7f1655996… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 20:38:08 2020 +0100 hostname: Use CP_ACP for non-console output encoding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index e6c2ed76cd1..812703d909d 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -47,14 +47,13 @@ static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + len = WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Rémi Bernon : gdi32: Rewrite find_face_from_filename using the rbtree.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: ec646de3aa64ae6320a13d95a5d73efea7b366fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec646de3aa64ae6320a13d95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 13 09:05:56 2020 +0000 gdi32: Rewrite find_face_from_filename using the rbtree. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a095bcdd27b..450d31ca82a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -618,29 +618,39 @@ static const struct list *get_family_face_list( const struct gdi_font_family *fa return family->replacement ? &family->replacement->faces : &family->faces; } +static struct gdi_font_face *family_find_face_from_filename( struct gdi_font_family *family, const WCHAR *file_name ) +{ + struct gdi_font_face *face; + const WCHAR *file; + LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) + { + if (!face->file) continue; + file = wcsrchr(face->file, '\\'); + if (!file) file = face->file; + else file++; + if (wcsicmp( file, file_name )) continue; + face->refcount++; + return face; + } + return NULL; +} + static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, const WCHAR *family_name ) { struct gdi_font_family *family; struct gdi_font_face *face; - const WCHAR *file; TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) ); - WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if (!family_name) { - if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue; - LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) - { - if (!face->file) continue; - file = wcsrchr(face->file, '\\'); - if (!file) file = face->file; - else file++; - if (wcsicmp( file, file_name )) continue; - face->refcount++; - return face; - } + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if ((face = family_find_face_from_filename( family, file_name ))) return face; + return NULL; } - return NULL; + + if (!(family = find_family_from_name( family_name ))) return NULL; + return family_find_face_from_filename( family, file_name ); } static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace )

1 0

Nikolay Sivov : mf/evr: Add IMFQualityAdvise stub.
by Alexandre Julliard Nov. 13, 2020

Nov. 13, 2020

Module: wine Branch: master Commit: f3b0fc6ae016c462870ffd4f4e62ff2868d184c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b0fc6ae016c462870ffd4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 15:31:36 2020 +0300 mf/evr: Add IMFQualityAdvise stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 1 + 2 files changed, 81 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index f14f2f46612..8fa4e33f4e3 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -76,6 +76,7 @@ struct video_renderer IMFTopologyServiceLookup IMFTopologyServiceLookup_iface; IMediaEventSink IMediaEventSink_iface; IMFAttributes IMFAttributes_iface; + IMFQualityAdvise IMFQualityAdvise_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -141,6 +142,11 @@ static struct video_renderer *impl_from_IMFAttributes(IMFAttributes *iface) return CONTAINING_RECORD(iface, struct video_renderer, IMFAttributes_iface); } +static struct video_renderer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFQualityAdvise_iface); +} + static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); @@ -657,6 +663,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFAttributes_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdvise)) + { + *obj = &renderer->IMFQualityAdvise_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2120,6 +2130,75 @@ static const IMFAttributesVtbl video_renderer_attributes_vtbl = video_renderer_attributes_CopyAllItems, }; +static HRESULT WINAPI video_renderer_quality_advise_QueryInterface(IMFQualityAdvise *iface, REFIID riid, void **out) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, out); +} + +static ULONG WINAPI video_renderer_quality_advise_AddRef(IMFQualityAdvise *iface) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_quality_Release(IMFQualityAdvise *iface) +{ + struct video_renderer *renderer = impl_from_IMFQualityAdvise(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_quality_advise_SetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE mode) +{ + FIXME("%p, %u.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_SetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL level) +{ + FIXME("%p, %u.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_GetDropMode(IMFQualityAdvise *iface, + MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_GetQualityLevel(IMFQualityAdvise *iface, + MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_quality_advise_DropTime(IMFQualityAdvise *iface, LONGLONG interval) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(interval)); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseVtbl video_renderer_quality_advise_vtbl = +{ + video_renderer_quality_advise_QueryInterface, + video_renderer_quality_advise_AddRef, + video_renderer_quality_Release, + video_renderer_quality_advise_SetDropMode, + video_renderer_quality_advise_SetQualityLevel, + video_renderer_quality_advise_GetDropMode, + video_renderer_quality_advise_GetQualityLevel, + video_renderer_quality_advise_DropTime, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -2141,6 +2220,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFTopologyServiceLookup_iface.lpVtbl = &video_renderer_service_lookup_vtbl; object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; object->IMFAttributes_iface.lpVtbl = &video_renderer_attributes_vtbl; + object->IMFQualityAdvise_iface.lpVtbl = &video_renderer_quality_advise_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bd38785ea51..43dc9a49ee7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3284,6 +3284,7 @@ static void test_evr(void) check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); + check_interface(sink, &IID_IMFQualityAdvise, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control);

1 0