December 2022 - Wine-Commits

Gerald Pfeifer : wmc: Avoid uninitialized variable in init_argv0_dir.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 4bbdbc759a8c1b8eab8aea8c8f581eafe5ed4d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bbdbc759a8c1b8eab8aea8c8f581e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 20 00:02:19 2022 +0100 wmc: Avoid uninitialized variable in init_argv0_dir. init_argv0_dir has conditional code for different operating systems. In case of FreeBSD a variable remains uninitialized in the error case, yet is then used. Fix that by handling the error case. --- tools/wmc/wmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index f5ff7abcdf9..145acb5d718 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -160,6 +160,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Alexandre Julliard : d3d8/tests: Don't require WM_MOVE on window reactivation.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 971ef0d3b376f3b67f8608219b4f495263fbb15f URL: https://gitlab.winehq.org/wine/wine/-/commit/971ef0d3b376f3b67f8608219b4f49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:42:17 2022 +0100 d3d8/tests: Don't require WM_MOVE on window reactivation. It can be activated without moving. --- dlls/d3d8/tests/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 12d8aeb89f6..9dcdcab066f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2922,7 +2922,6 @@ static void test_wndproc(void) { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, };

1 0

Alexandre Julliard : d3d8/tests: Make sure that the window has focus before testing loss of focus.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9761191f1c3aa7714204da470db1c8ef5dedc5c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9761191f1c3aa7714204da470db1c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:44:07 2022 +0100 d3d8/tests: Make sure that the window has focus before testing loss of focus. --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9dcdcab066f..59532d0a208 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3305,6 +3305,7 @@ static void test_wndproc(void) skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + SetForegroundWindow(focus_window); /* make sure that the window has focus */ filter_messages = NULL;

1 0

Zebediah Figura : httpapi/tests: Test passing NULL size to request reading functions.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 266c855fbd2a6a939c78cfb44391bdb5d71b5e2b URL: https://gitlab.winehq.org/wine/wine/-/commit/266c855fbd2a6a939c78cfb44391bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:58:56 2022 -0600 httpapi/tests: Test passing NULL size to request reading functions. --- dlls/httpapi/tests/httpapi.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 1d00aa22c50..fa412b1093a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -572,27 +572,39 @@ static void test_v1_short_buffer(void) ok(ret == strlen(req_text), "send() returned %d.\n", ret); memset(req_buffer, 0xcc, sizeof(req_buffer)); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1) - 1, &ret_size, NULL); ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", ret); + ok(ret_size == 1 /* win < 10 */ || !ret_size, "Got size %lu.\n", ret_size); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1), &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!!req->ConnectionId, "Got connection ID %s.\n", wine_dbgstr_longlong(req->ConnectionId)); ok(!!req->RequestId, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); ok(!req->Version.MajorVersion || req->Version.MajorVersion == 0xcccc /* < Vista */, "Got major version %u.\n", req->Version.MajorVersion); ok(!req->BytesReceived || req->BytesReceived == ((ULONGLONG)0xcccccccc << 32 | 0xcccccccc) /* < Vista */, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + req_id = req->RequestId; /* At this point the request has been assigned a specific ID, and one cannot * receive it by calling with HTTP_NULL_ID. */ ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl); ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); - req_id = req->RequestId; memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + + memset(req_buffer, 0xcc, sizeof(req_buffer)); + ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, NULL, NULL); + ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size, &ret_size, NULL); @@ -828,11 +840,15 @@ static void test_v1_entity_body(void) ok(ret_size == 2, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 1, NULL, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(!memcmp(recv_body, "n", 1), "Entity body didn't match.\n"); + ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 3, "Got size %lu.\n", ret_size); - ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + ok(ret_size == 2, "Got size %lu.\n", ret_size); + ok(!memcmp(recv_body, "g", 2), "Entity body didn't match.\n"); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL);

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: c9f628042216eea338a154f0585003fe9187bacc URL: https://gitlab.winehq.org/wine/wine/-/commit/c9f628042216eea338a154f0585003… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:38 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody(). --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index cd00608c1ca..10131fdd029 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -278,6 +278,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", @@ -292,6 +293,9 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, ret_size, ovl)) ret = GetLastError();

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveHttpRequest().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: d1d37e40d2cd2e7eb181db733ac8a2141cae4d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d37e40d2cd2e7eb181db733ac8a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:18 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveHttpRequest(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53980 --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 964589021d6..cd00608c1ca 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -323,6 +323,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", @@ -340,6 +341,9 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, ret_size, ovl)) ret = GetLastError();

1 0

Eric Pouech : kernel32/tests: Silence a failing test on Win10+.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: f5a81ff02a8f359f9b1a7b1aa78ce1a5341c2158 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5a81ff02a8f359f9b1a7b1aa78ce1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 20 15:47:56 2022 +0100 kernel32/tests: Silence a failing test on Win10+. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..eb0b5fec772 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -87,7 +87,9 @@ static void test_query_dos_deviceA(void) for (;;) { if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); + /* Win10+ exposes security device which requires extra priviledges to be queried. So skip it */ + ok(ret2 || broken( !strcmp( p, "MSSECFLTSYS" ) && GetLastError() == ERROR_ACCESS_DENIED ), + "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); p += strlen(p) + 1; if (ret <= (p-buffer)) break; }

1 0

Ziqing Hui : mf/tests: Use one input type for GetOutputType tests.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9c4bcbea00b1f31b4cdece3fee501070c428c8c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c4bcbea00b1f31b4cdece3fee5010… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 20 09:54:44 2022 +0800 mf/tests: Use one input type for GetOutputType tests. --- dlls/mf/tests/transform.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ccb2413faf4..35dc6aea6b8 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4956,30 +4956,11 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputType returned %#lx.\n", hr); /* Test GetOutputType after setting input type. */ - for (i = 0; i < ARRAY_SIZE(expected_input_types); ++i) - { - const GUID *subtype = &expected_input_types[i].subtype; - if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) - || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) - { - skip("Skipping GetOutputType tests for input subtype %s.\n", debugstr_guid(subtype)); - continue; - } - - winetest_push_context("in %lu", i); - - init_dmo_media_type_video(input_type, &expected_input_types[i].subtype, 16, 16); - hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); - - todo_wine - check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); - - winetest_pop_context(); - } + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : mf/tests: Test SetOutputType for WMV decoder.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 3eaa44a75cc3205bf5d3f4fef05b024570c30d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3eaa44a75cc3205bf5d3f4fef05b02… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Dec 19 10:16:36 2022 +0800 mf/tests: Test SetOutputType for WMV decoder. --- dlls/mf/tests/transform.c | 130 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 35dc6aea6b8..3c068aae743 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -55,6 +55,58 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +static BOOL is_compressed_subtype(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVP) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) + || IsEqualGUID(subtype, &MFVideoFormat_WMV_Unknown) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV3) + || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) + return TRUE; + return FALSE; +} + +static DWORD subtype_to_compression(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return BI_RGB; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565)) + return BI_BITFIELDS; + else + return subtype->Data1; +} + +static DWORD subtype_to_bpp(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return 8; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_NV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_IYUV) + || IsEqualGUID(subtype, &MEDIASUBTYPE_I420) + || IsEqualGUID(subtype, &MEDIASUBTYPE_NV11)) + return 12; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YUY2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_UYVY) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YVYU) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555)) + return 16; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24)) + return 24; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32)) + return 32; + else + return 0; +} + static void load_resource(const WCHAR *filename, const BYTE **data, DWORD *length) { HRSRC resource = FindResourceW(NULL, filename, (const WCHAR *)RT_RCDATA); @@ -274,17 +326,19 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, const GUID *subtype, const LONG width, const LONG height) { VIDEOINFOHEADER *header = (VIDEOINFOHEADER *)(media_type + 1); + BOOL compressed = is_compressed_subtype(subtype); memset(header, 0, sizeof(*header)); header->bmiHeader.biSize = sizeof(header->bmiHeader); header->bmiHeader.biWidth = width; header->bmiHeader.biHeight = height; - header->bmiHeader.biCompression = subtype->Data1; + header->bmiHeader.biBitCount = subtype_to_bpp(subtype); + header->bmiHeader.biCompression = subtype_to_compression(subtype); media_type->majortype = MEDIATYPE_Video; media_type->subtype = *subtype; - media_type->bFixedSizeSamples = FALSE; - media_type->bTemporalCompression = TRUE; + media_type->bFixedSizeSamples = !compressed; + media_type->bTemporalCompression = compressed; media_type->lSampleSize = 0; media_type->formattype = FORMAT_VideoInfo; media_type->pUnk = NULL; @@ -1411,6 +1465,62 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); } +static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *subtype) +{ + DMO_MEDIA_TYPE bad_media_type, *good_media_type; + char buffer[1024]; + DWORD i, flag; + HRESULT hr; + + const DWORD flags[] = {0, 0x4, DMO_SET_TYPEF_CLEAR, DMO_SET_TYPEF_TEST_ONLY, DMO_SET_TYPEF_TEST_ONLY | 0x4}; + + memset(&bad_media_type, 0, sizeof(bad_media_type)); + good_media_type = (DMO_MEDIA_TYPE *)buffer; + init_dmo_media_type_video(good_media_type, subtype, 16, 16); + + /* Test invalid stream index. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 1, NULL, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, &bad_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, good_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test unaccepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + if (!(flag & DMO_SET_TYPEF_CLEAR)) + { + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == E_POINTER, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + hr = IMediaObject_SetOutputType(media_object, 0, &bad_media_type, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test clearing the type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = DMO_SET_TYPEF_CLEAR | flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test accepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, good_media_type, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } +} + + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -4962,6 +5072,20 @@ static void test_wmv_decoder_media_object(void) todo_wine check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); + /* Test SetOutputType without setting input type. */ + hr = IMediaObject_SetInputType(media_object, 0, NULL, DMO_SET_TYPEF_CLEAR); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + hr = IMediaObject_SetOutputType(media_object, 0, &media_type, 0); + todo_wine + ok(hr == DMO_E_TYPE_NOT_SET, "SetOutputType returned %#lx.\n", hr); + + /* Test SetOutputType after setting input type. */ + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_set_output_type(media_object, &MEDIASUBTYPE_RGB24); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Eric Pouech : kernel32/tests: Test that control characters can be read & stored.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 26699b363003d8040edca5f0a47de0490c539c8d URL: https://gitlab.winehq.org/wine/wine/-/commit/26699b363003d8040edca5f0a47de0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 19 18:09:58 2022 +0100 kernel32/tests: Test that control characters can be read & stored. WriteConsole (not in processed mode) and WriteConsoleOutput* functions allow to write control characters, which can then be read back as is. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1f285faf1e2..f8e39c164d2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -306,6 +306,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) DWORD len, mode; const char* mytest = "123"; const int mylen = strlen(mytest); + char ctrl_buf[32]; int ret; int p; @@ -336,6 +337,17 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + + /* test how control chars are handled. */ + c.X = c.Y = 0; + ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); + for (p = 0; p < 32; p++) ctrl_buf[p] = (char)p; + ok(WriteConsoleA(hCon, ctrl_buf, 32, &len, NULL) != 0 && len == 32, "WriteConsole\n"); + for (p = 0; p < 32; p++) + { + c.X = p; c.Y = 0; + okCHAR(hCon, c, (char)p, TEST_ATTRIB); + } } static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) @@ -2378,6 +2390,19 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 0, "Expected count to be 0, got %lu\n", count); + + for (i = 1; i < 32; i++) + { + CONSOLE_SCREEN_BUFFER_INFO csbi; + char ch = (char)i; + COORD c = {1, 2}; + + ret = WriteConsoleOutputCharacterA(output_handle, &ch, 1, c, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %lu\n", count); + okCHAR(output_handle, c, (char)i, 7); + ret = GetConsoleScreenBufferInfo(output_handle, &csbi); + } } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle)

1 0