July 2020 - Wine-Commits - list.winehq.org

Zhiyi Zhang : user32: Trace EnumDisplaySettingsExW() results.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 0503b17962ab109a5eff219a4b1f2dc055b50c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0503b17962ab109a5eff219a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:49:40 2020 +0800 user32: Trace EnumDisplaySettingsExW() results. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 61cd06f691..14d3778a53 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3440,8 +3440,9 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { WCHAR primary_adapter[CCHDEVICENAME]; + BOOL ret; - TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); if (!lpszDeviceName) { @@ -3451,7 +3452,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, lpszDeviceName = primary_adapter; } - return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + ret = USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + if (ret) + TRACE("device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " + "depth:%ubits orientation:%#x.\n", wine_dbgstr_w(lpszDeviceName), iModeNum, + lpDevMode->u1.s2.dmPosition.x, lpDevMode->u1.s2.dmPosition.y, lpDevMode->dmPelsWidth, + lpDevMode->dmPelsHeight, lpDevMode->dmDisplayFrequency, lpDevMode->dmBitsPerPel, + lpDevMode->u1.s2.dmDisplayOrientation); + else + WARN("Failed to query %s display settings.\n", wine_dbgstr_w(lpszDeviceName)); + return ret; }

1 0

Anton Baskanov : amstream: Start the stream when AMMSF_RUN is passed to AMMultiMediaStream::OpenFile.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: bd97b597e6a161081fbbffd694fafd240da16e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd97b597e6a161081fbbffd6… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:07 2020 -0500 amstream: Start the stream when AMMSF_RUN is passed to AMMultiMediaStream::OpenFile. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 3 +++ dlls/amstream/tests/amstream.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index b2c9082cae..200bd5c4a5 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -449,6 +449,9 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); + if (SUCCEEDED(ret) && (flags & AMMSF_RUN)) + ret = IAMMultiMediaStream_SetState(iface, STREAMSTATE_RUN); + if (EnumPins) IEnumPins_Release(EnumPins); if (BaseFilter) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8338a5a3ec..8adf9db934 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -271,8 +271,10 @@ static void test_interfaces(void) static void test_openfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaControl *media_control; IMediaStreamFilter *filter; IGraphBuilder *graph; + OAFilterState state; HRESULT hr; ULONG ref; @@ -308,6 +310,29 @@ static void test_openfile(const WCHAR *test_avi_path) ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IMediaStreamFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + hr = IGraphBuilder_QueryInterface(graph, &IID_IMediaControl, (void **)&media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + state = 0xdeadbeef; + hr = IMediaControl_GetState(media_control, INFINITE, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %#x.\n", state); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaControl_Release(media_control); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_renderfile(const WCHAR *test_avi_path)

1 0

Zhiyi Zhang : user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 7b5dac2fe17c1dd17e3ac7ab72f368e9546db82d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5dac2fe17c1dd17e3ac7ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:49:49 2020 +0800 user32/tests: Test that EnumDisplayMonitors() doesn't set error codes. ERROR_INVALID_HANDLE or ERROR_INVALID_MONITOR_HANDLE is from GetMonitorInfo(), not EnumDisplayMonitor(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6e8c9a275d..5d7069591b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1199,6 +1199,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor { MONITORINFOEXA mi, mi2; DEVMODEA old_dm, dm; + DWORD error; INT count; LONG ret; @@ -1235,13 +1236,18 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor if (GetSystemMetrics(SM_CMONITORS) != count - 1) { skip("Failed to detach %s.\n", mi.szDevice); + SetLastError(0xdeadbeef); return TRUE; } /* The monitor handle should be invalid now */ mi2.cbSize = sizeof(mi2); + SetLastError(0xdeadbeef); ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); ok(!ret, "GetMonitorInfoA succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); /* Restore the original display settings */ ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, @@ -1253,6 +1259,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor mi.szDevice, ret); } + SetLastError(0xdeadbeef); return TRUE; } @@ -1276,16 +1283,10 @@ static void test_EnumDisplayMonitors(void) ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0); error = GetLastError(); if (count >= 2) - { todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n"); - todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, - "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); - } else - { ok(ret, "EnumDisplayMonitors failed.\n"); - ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); - } + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); } static void test_QueryDisplayConfig_result(UINT32 flags,

1 0

Anton Baskanov : amstream/tests: Move the testfilter code above to use it in SetState tests.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 0e6f24db19a29fce4cb6a2f7107d5318e6a131b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6f24db19a29fce4cb6a2f7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:05 2020 -0500 amstream/tests: Move the testfilter code above to use it in SetState tests. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 890 ++++++++++++++++++++--------------------- 1 file changed, 445 insertions(+), 445 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e6f24db19a29fce4cb6…

1 0

Anton Baskanov : amstream: Return S_OK from AMMultiMediaStream::SetState when IMediaControl::Run succeeds.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 6395c83d2ad48a9f660e22e58a1c4125eae32e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6395c83d2ad48a9f660e22e5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:06 2020 -0500 amstream: Return S_OK from AMMultiMediaStream::SetState when IMediaControl::Run succeeds. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 4 +++ dlls/amstream/tests/amstream.c | 71 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index f615e436b1..b2c9082cae 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -153,7 +153,11 @@ static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STR TRACE("(%p/%p)->(%u)\n", This, iface, new_state); if (new_state == STREAMSTATE_RUN) + { hr = IMediaControl_Run(This->media_control); + if (SUCCEEDED(hr)) + hr = S_OK; + } else if (new_state == STREAMSTATE_STOP) hr = IMediaControl_Stop(This->media_control); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9882b5c04e..8338a5a3ec 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -710,6 +710,8 @@ struct testfilter LONGLONG stop_position; HRESULT get_duration_hr; HRESULT set_positions_hr; + HRESULT init_stream_hr; + HRESULT cleanup_stream_hr; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -736,16 +738,20 @@ static HRESULT testfilter_init_stream(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); - BaseOutputPinImpl_Active(&filter->source); - return S_OK; + if (SUCCEEDED(filter->init_stream_hr)) + BaseOutputPinImpl_Active(&filter->source); + + return filter->init_stream_hr; } static HRESULT testfilter_cleanup_stream(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_BaseFilter(iface); - BaseOutputPinImpl_Inactive(&filter->source); - return S_OK; + if (SUCCEEDED(filter->cleanup_stream_hr)) + BaseOutputPinImpl_Inactive(&filter->source); + + return filter->cleanup_stream_hr; } static const struct strmbase_filter_ops testfilter_ops = @@ -2062,6 +2068,62 @@ static void test_initialize(void) IUnknown_Release(graph_inner_unk); } +static void test_set_state(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + struct testfilter source; + IGraphBuilder *graph; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.init_stream_hr = E_FAIL; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + source.init_stream_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + source.init_stream_hr = S_FALSE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.init_stream_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.cleanup_stream_hr = E_FAIL; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + source.cleanup_stream_hr = S_OK; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + source.cleanup_stream_hr = S_FALSE; + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + source.cleanup_stream_hr = S_OK; + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_enum_media_types(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5116,6 +5178,7 @@ START_TEST(amstream) test_find_pin(); test_pin_info(); test_initialize(); + test_set_state(); test_enum_media_types(); test_media_types(); test_IDirectDrawStreamSample();

1 0

Zebediah Figura : wine.inf: Map CursorBlinkRate to the registry.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: c3b35a44a44821eb0b32be04a28b650bc2f9bd41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3b35a44a44821eb0b32be04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:45 2020 -0500 wine.inf: Map CursorBlinkRate to the registry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=10106 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de0dd4e455..4c8f657f50 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 HKLM,%CurrentVersionNT%\OpenGLDrivers,,16

1 0

Derek Lesho : mountmgr.sys: Use SystemBuffer output for IOCTL_STORAGE_QUERY_PROPERTY.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e98dcd42e13bfeb5a2397ff… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Jul 20 11:20:15 2020 -0500 mountmgr.sys: Use SystemBuffer output for IOCTL_STORAGE_QUERY_PROPERTY. In METHOD_BUFFERED ioctls, SystemBuffer must be used as both the input and output buffer. Using UserBuffer directly, without any checks is dangerous and non-functional, as it will be overwritten by the contents of SystemBuffer in a correct implementation. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index f7a1f1e9b5..97208da481 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1771,12 +1771,11 @@ static void query_property( struct disk_device *device, IRP *irp ) if (device->serial) len += strlen( device->serial ) + 1; - if (!irp->UserBuffer - || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { - descriptor = irp->UserBuffer; + descriptor = irp->AssociatedIrp.SystemBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); descriptor->Size = len; irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); @@ -1786,8 +1785,8 @@ static void query_property( struct disk_device *device, IRP *irp ) { FIXME( "Faking StorageDeviceProperty data\n" ); - memset( irp->UserBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); - descriptor = irp->UserBuffer; + memset( irp->AssociatedIrp.SystemBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + descriptor = irp->AssociatedIrp.SystemBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); descriptor->Size = len; descriptor->DeviceType = FILE_DEVICE_DISK;

1 0

Zhiyi Zhang : user32: Check invalid device names in ChangeDisplaySettingsExW().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: a599d645e33a128fae2d6fbfd7fdc07a8cefda95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a599d645e33a128fae2d6fbf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:50:19 2020 +0800 user32: Check invalid device names in ChangeDisplaySettingsExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 16 +++++++++++++++- dlls/user32/tests/monitor.c | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 14d3778a53..d4462e589e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3307,7 +3307,8 @@ static BOOL is_detached_mode(const DEVMODEW *mode) LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - WCHAR primary_adapter[CCHDEVICENAME]; + WCHAR primary_adapter[CCHDEVICENAME], *end; + long int display_idx; BOOL def_mode = TRUE; DEVMODEW dm; LONG ret; @@ -3331,6 +3332,19 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND devname = primary_adapter; } + if (strncmpiW(devname, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX))) + { + ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + + display_idx = strtolW(devname + ARRAY_SIZE(ADAPTER_PREFIX), &end, 10); + if (*end || display_idx < 1) + { + ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + if (devmode) { trace_devmode(devmode); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fe763e46b4..badbfdaacf 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -369,13 +369,13 @@ static void test_ChangeDisplaySettingsEx(void) ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); res = ChangeDisplaySettingsExA("invalid", &dm, NULL, CDS_TEST, NULL); - todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY0", &dm, NULL, CDS_TEST, NULL); - todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY1\\Monitor0", &dm, NULL, CDS_TEST, NULL); - todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); /* Test dmDriverExtra */ memset(&dm, 0, sizeof(dm));

1 0

Anton Baskanov : amstream/tests: Fix file rendering test.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 7490b857b988baee2df547e2caac3d543088046e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7490b857b988baee2df547e2… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:03 2020 -0500 amstream/tests: Fix file rendering test. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c47f11f1f6..f6d4c5d3c4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -296,7 +296,7 @@ static void test_renderfile(void) ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); - ok(hr==S_OK, "IAMMultiMediaStream_AddMediaStream returned: %x\n", hr); + ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); @@ -315,14 +315,15 @@ static void test_renderfile(void) surface = NULL; hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface == NULL, "got %p\n", surface); + ok(surface != NULL, "Expected non-NULL surface.\n"); + IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(pddsample); hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, &rect, 0, &pddsample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); EXPECT_REF(surface, 2); IDirectDrawStreamSample_Release(pddsample);

1 0

Anton Baskanov : amstream/tests: Add a test AVI file.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 053b55d2a8a1bf6055293c78835a4a0843e95ae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=053b55d2a8a1bf6055293c78… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:04 2020 -0500 amstream/tests: Add a test AVI file. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/Makefile.in | 3 ++ dlls/amstream/tests/amstream.c | 63 +++++++++++++++++++++++++++++++--------- dlls/amstream/tests/rsrc.rc | 25 ++++++++++++++++ dlls/amstream/tests/test.avi | Bin 0 -> 12088 bytes 4 files changed, 78 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 81eaed3c15..eb756ddf39 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = strmbase strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f6d4c5d3c4..0175257c05 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -53,6 +53,45 @@ static const AM_MEDIA_TYPE audio_mt = static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; +static const WCHAR *load_resource(const WCHAR *name) +{ + HMODULE module = GetModuleHandleA(NULL); + HRSRC resource; + DWORD written; + HANDLE file; + WCHAR *path; + DWORD size; + void *ptr; + + path = calloc(MAX_PATH + 1, sizeof(WCHAR)); + ok(!!path, "Failed to allocate temp path string.\n"); + GetTempPathW(MAX_PATH + 1, path); + wcscat(path, name); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", wine_dbgstr_w(path), GetLastError()); + + resource = FindResourceW(module, name, (const WCHAR *)RT_RCDATA); + ok(!!resource, "Failed to find resource %s, error %u.\n", wine_dbgstr_w(name), GetLastError()); + + size = SizeofResource(module, resource); + ptr = LockResource(LoadResource(module, resource)); + + WriteFile(file, ptr, size, &written, NULL); + ok(written == size, "Failed to write file %s.\n", wine_dbgstr_w(path)); + + CloseHandle(file); + + return path; +} + +static void unload_resource(const WCHAR *path) +{ + BOOL ret = DeleteFileW(path); + ok(ret, "Failed to delete file %s.\n", wine_dbgstr_w(path)); + free((void *)path); +} + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -229,7 +268,7 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %u.\n", ref); } -static void test_openfile(void) +static void test_openfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); IMediaStreamFilter *filter; @@ -241,7 +280,7 @@ static void test_openfile(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!graph, "Expected NULL graph.\n"); - hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", AMMSF_NORENDER); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); @@ -260,7 +299,7 @@ static void test_openfile(void) check_interface(filter, &IID_IMediaSeeking, FALSE); - hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", 0); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); check_interface(filter, &IID_IMediaSeeking, TRUE); @@ -271,7 +310,7 @@ static void test_openfile(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_renderfile(void) +static void test_renderfile(const WCHAR *test_avi_path) { IAMMultiMediaStream *pams; HRESULT hr; @@ -298,7 +337,7 @@ static void test_renderfile(void) hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); + hr = IAMMultiMediaStream_OpenFile(pams, test_avi_path, 0); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); @@ -5066,7 +5105,7 @@ static void test_ddrawstream_getsetdirectdraw(void) START_TEST(amstream) { - HANDLE file; + const WCHAR *test_avi_path; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -5081,14 +5120,12 @@ START_TEST(amstream) test_media_types(); test_IDirectDrawStreamSample(); - file = CreateFileW(L"test.avi", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - if (file != INVALID_HANDLE_VALUE) - { - CloseHandle(file); + test_avi_path = load_resource(L"test.avi"); - test_openfile(); - test_renderfile(); - } + test_openfile(test_avi_path); + test_renderfile(test_avi_path); + + unload_resource(test_avi_path); test_audiodata_query_interface(); test_audiodata_get_info(); diff --git a/dlls/amstream/tests/rsrc.rc b/dlls/amstream/tests/rsrc.rc new file mode 100644 index 0000000000..e1fc277503 --- /dev/null +++ b/dlls/amstream/tests/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Resource file for amstream tests. + * + * Copyright 2020 Anton Baskanov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.1 -r 10 -ar 8000 -f avi -vcodec rawvideo -vf scale=32x24 -acodec pcm_u8 test.avi */ +/* @makedep: test.avi */ +test.avi RCDATA "test.avi" diff --git a/dlls/amstream/tests/test.avi b/dlls/amstream/tests/test.avi new file mode 100644 index 0000000000..70aead5453 Binary files /dev/null and b/dlls/amstream/tests/test.avi differ

1 0