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

Alexandre Julliard : kernel32/tests: Add some tests for FormatMessageA/W buffer sizes.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 8a1656bdf0a403ba01f131ee23dfba0f479218c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1656bdf0a403ba01f131ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 20:26:25 2020 +0200 kernel32/tests: Add some tests for FormatMessageA/W buffer sizes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 87 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 7fed5ee4e5..7fd9d55377 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1009,7 +1009,7 @@ static void test_message_insufficient_buffer(void) { static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; static const char expected_buf[] = {'x', 'x', 'x', 'x', 'x'}; - DWORD ret; + DWORD ret, size, i; CHAR out[5]; SetLastError(0xdeadbeef); @@ -1041,11 +1041,63 @@ static void test_message_insufficient_buffer(void) GetLastError()); ok(!memcmp(expected_buf, out, sizeof(expected_buf)), "Expected the buffer to be untouched\n"); + + for (size = 32700; size < 32800; size++) + { + char *tmp = HeapAlloc( GetProcessHeap(), 0, size ); + char *buf = HeapAlloc( GetProcessHeap(), 0, size ); + + for (i = 0; i < size; i++) tmp[i] = 'A' + i % 26; + tmp[size - 1] = 0; + SetLastError( 0xdeadbeef ); + ret = FormatMessageA( FORMAT_MESSAGE_FROM_STRING, tmp, 0, 0, buf, size, NULL ); + if (size < 32768) + { + ok( ret == size - 1, "%u: got %u\n", size, ret ); + ok( !strcmp( tmp, buf ), "wrong buffer\n" ); + } + else + { + ok( ret == 0, "%u: got %u\n", size, ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + + SetLastError( 0xdeadbeef ); + ret = doit( FORMAT_MESSAGE_FROM_STRING, "%1", 0, 0, buf, size, tmp ); + if (size < 32768) + { + ok( ret == size - 1, "%u: got %u\n", size, ret ); + ok( !strcmp( tmp, buf ), "wrong buffer\n" ); + } + else + { + ok( ret == 0, "%u: got %u\n", size, ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_MORE_DATA), /* winxp */ + "wrong error %u\n", GetLastError() ); + } + HeapFree( GetProcessHeap(), 0, buf ); + + SetLastError( 0xdeadbeef ); + ret = FormatMessageA( FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + tmp, 0, 0, (char *)&buf, size, NULL ); + if (size < 32768) + { + ok( ret == size - 1, "%u: got %u\n", size, ret ); + ok( !strcmp( tmp, buf ), "wrong buffer\n" ); + HeapFree( GetProcessHeap(), 0, buf ); + } + else + { + ok( ret == 0, "%u: got %u\n", size, ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + HeapFree( GetProcessHeap(), 0, tmp ); + } } static void test_message_insufficient_buffer_wide(void) { - DWORD ret; + DWORD ret, size, i; WCHAR out[8]; SetLastError(0xdeadbeef); @@ -1079,6 +1131,28 @@ static void test_message_insufficient_buffer_wide(void) ok(!memcmp(out, L"tes\0xx", 6 * sizeof(WCHAR)) || broken(!lstrcmpW( out, L"xxxxxx" )), /* winxp */ "Expected the buffer to be truncated\n"); + + for (size = 1000; size < 1000000; size += size / 10) + { + WCHAR *tmp = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + WCHAR *buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + for (i = 0; i < size; i++) tmp[i] = 'A' + i % 26; + tmp[size - 1] = 0; + ret = FormatMessageW( FORMAT_MESSAGE_FROM_STRING, tmp, 0, 0, buf, size, NULL ); + ok(ret == size - 1 || broken(!ret), /* winxp */ "got %u\n", ret); + if (!ret) break; + ok( !lstrcmpW( tmp, buf ), "wrong buffer\n" ); + ret = doitW( FORMAT_MESSAGE_FROM_STRING, L"%1", 0, 0, buf, size, tmp ); + ok(ret == size - 1, "got %u\n", ret); + ok( !lstrcmpW( tmp, buf ), "wrong buffer\n" ); + HeapFree( GetProcessHeap(), 0, buf ); + ret = FormatMessageW( FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + tmp, 0, 0, (WCHAR *)&buf, size, NULL ); + ok(ret == size - 1, "got %u\n", ret); + ok( !lstrcmpW( tmp, buf ), "wrong buffer\n" ); + HeapFree( GetProcessHeap(), 0, tmp ); + HeapFree( GetProcessHeap(), 0, buf ); + } } static void test_message_null_buffer(void) @@ -1279,6 +1353,15 @@ static void test_message_allocate_buffer_wide(void) ok(GetLastError() == ERROR_NO_WORK_DONE || broken(GetLastError() == 0xdeadbeef), "Expected GetLastError() to return ERROR_NO_WORK_DONE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + buf = (WCHAR *)0xdeadbeef; + ret = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, L"%1", + 0, 0, (WCHAR *)&buf, 0, L"" ); + ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); + ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); + ok(GetLastError() == ERROR_NO_WORK_DONE || broken(GetLastError() == 0xdeadbeef), + "Expected GetLastError() to return ERROR_NO_WORK_DONE, got %u\n", GetLastError()); + buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, L"test", 0, 0, (WCHAR *)&buf, 0, NULL);

1 0

Alexandre Julliard : attrib: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 160654be6346c7af036b19a9630b2fe7d73a222d URL: https://source.winehq.org/git/wine.git/?a=commit;h=160654be6346c7af036b19a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:05:53 2020 +0200 attrib: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index e7fe468737..558a393253 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -74,11 +74,10 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) } __ms_va_start(parms, format); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); __ms_va_end(parms); - if (len == 0 && GetLastError() != NO_ERROR) { + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; }

1 0

Alexandre Julliard : regsvr32: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 919d9690877122ebf9f95b0e7bc244ad68ba7d48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=919d9690877122ebf9f95b0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:07:04 2020 +0200 regsvr32: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index a7fb12e0fc..730f1fef3d 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -51,11 +51,10 @@ static void WINAPIV output_write(UINT id, ...) } __ms_va_start(va_args, id); - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (LPWSTR)&str, 0, &va_args); __ms_va_end(va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Alexandre Julliard : reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: f81d15beb690c5e08c5995b90aec8015218bee55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81d15beb690c5e08c5995b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 22:06:51 2020 +0200 reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a1edd226ac..997a670383 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -132,10 +132,9 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WCHAR *str; DWORD len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return;

1 0

Ziqing Hui : windowscodecs/tests: Add tests for IWICDdsDecoder_GetParameters().
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: a9c70877f32d8cfdceee29f21d53a52aad947d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c70877f32d8cfdceee29f2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 12 10:25:06 2020 +0800 windowscodecs/tests: Add tests for IWICDdsDecoder_GetParameters(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 63 ++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index e548ee9655..f0814b46ef 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -276,27 +276,34 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) if (thumnail) IWICBitmapSource_Release(thumnail); } -static void test_dds_decoder_frame_count(void) +static void test_dds_decoder_image_parameters(void) { static struct test_data { void *data; UINT size; - UINT expected; + UINT expected_frame_count; + WICDdsParameters expected_parameters; } test_data[] = { - { test_dds_image, sizeof(test_dds_image), 1 }, - { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3 }, - { test_dds_volume, sizeof(test_dds_volume), 7 }, - { test_dds_array, sizeof(test_dds_array), 9 }, + { test_dds_image, sizeof(test_dds_image), 1, + { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, + { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, + { test_dds_volume, sizeof(test_dds_volume), 7, + { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, + { test_dds_array, sizeof(test_dds_array), 9, + { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, }; int i; HRESULT hr; + WICDdsParameters parameters; for (i = 0; i < ARRAY_SIZE(test_data); i++) { UINT frame_count; IWICStream *stream = NULL; IWICBitmapDecoder *decoder = NULL; + IWICDdsDecoder *dds_decoder = NULL; stream = create_stream(test_data[i].data, test_data[i].size); if (!stream) goto next; @@ -304,26 +311,64 @@ static void test_dds_decoder_frame_count(void) decoder = create_decoder(); if (!decoder) goto next; + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + if (hr != S_OK) goto next; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok (hr == WINCODEC_ERR_WRONGSTATE, "%d: Expected hr=WINCODEC_ERR_WRONGSTATE, got %x\n", i, hr); hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); ok (hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + todo_wine { + hr = IWICDdsDecoder_GetParameters(dds_decoder, &parameters); + ok(hr == WINCODEC_ERR_WRONGSTATE, "%d: Expected hr=WINCODEC_ERR_WRONGSTATE, got %x\n", i, hr); + hr = IWICDdsDecoder_GetParameters(dds_decoder, NULL); + ok(hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + }; + hr = init_decoder(decoder, stream, S_OK, -1); if (hr != S_OK) goto next; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); if (hr == S_OK) { - ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", - i, test_data[i].expected, frame_count); + ok (frame_count == test_data[i].expected_frame_count, "%d: expected frame count %d, got %d\n", + i, test_data[i].expected_frame_count, frame_count); } hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); ok (hr == E_INVALIDARG, "%d: Expected hr=S_OK, got %x\n", i, hr); + + todo_wine { + hr = IWICDdsDecoder_GetParameters(dds_decoder, &parameters); + ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); + if (hr == S_OK) { + ok (parameters.Width == test_data[i].expected_parameters.Width, + "%d, Expected Width=%d, got %d\n", i, test_data[i].expected_parameters.Width, parameters.Width); + ok (parameters.Height == test_data[i].expected_parameters.Height, + "%d, Expected Height=%d, got %d\n", i, test_data[i].expected_parameters.Height, parameters.Height); + ok (parameters.Depth == test_data[i].expected_parameters.Depth, + "%d, Expected Depth=%d, got %d\n", i, test_data[i].expected_parameters.Depth, parameters.Depth); + ok (parameters.MipLevels == test_data[i].expected_parameters.MipLevels, + "%d, Expected MipLevels=%d, got %d\n", i, test_data[i].expected_parameters.MipLevels, parameters.MipLevels); + ok (parameters.ArraySize == test_data[i].expected_parameters.ArraySize, + "%d, Expected ArraySize=%d, got %d\n", i, test_data[i].expected_parameters.ArraySize, parameters.ArraySize); + ok (parameters.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, + "%d, Expected DxgiFormat=0x%x, got 0x%x\n", i, test_data[i].expected_parameters.DxgiFormat, parameters.DxgiFormat); + ok (parameters.Dimension == test_data[i].expected_parameters.Dimension, + "%d, Expected Dimension=0x%x, got 0x%x\n", i, test_data[i].expected_parameters.Dimension, parameters.Dimension); + ok (parameters.AlphaMode == test_data[i].expected_parameters.AlphaMode, + "%d, Expected AlphaMode=0x%x, got 0x%x\n", i, test_data[i].expected_parameters.AlphaMode, parameters.AlphaMode); + } + hr = IWICDdsDecoder_GetParameters(dds_decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + }; + next: if (decoder) IWICBitmapDecoder_Release(decoder); if (stream) IWICStream_Release(stream); + if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); } } @@ -345,7 +390,7 @@ static void test_dds_decoder(void) test_dds_decoder_initialize(); test_dds_decoder_global_properties(decoder); - test_dds_decoder_frame_count(); + test_dds_decoder_image_parameters(); end: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Zebediah Figura : quartz/vmr9: Implement IVMRFilterConfig9::GetNumberOfStreams().
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 2d77107823f2a7a59cd9b2536c85a63d786c55d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d77107823f2a7a59cd9b253… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 12 21:24:59 2020 -0500 quartz/vmr9: Implement IVMRFilterConfig9::GetNumberOfStreams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 26 +++++++++++--------------- dlls/quartz/vmr9.c | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2129429bfb..3edc91a342 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -170,16 +170,14 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); - todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); - todo_wine { - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 3, "Got count %u.\n", count); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -195,10 +193,8 @@ static void test_filter_config(void) ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); - todo_wine { - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 3, "Got count %u.\n", count); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); ref = IVMRFilterConfig9_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -3147,14 +3143,14 @@ static void test_mixing_mode(void) ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); - todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 1); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_count == 1, "Got %u streams.\n", stream_count); hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3165,8 +3161,8 @@ static void test_mixing_mode(void) ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_count == 1, "Got %u streams.\n", stream_count); IVMRFilterConfig9_Release(config); ref = IBaseFilter_Release(filter); @@ -3195,7 +3191,7 @@ static void test_mixing_mode(void) todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); IVMRWindowlessControl9_Release(windowless_control); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index ef306a546b..6dfc82804f 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1301,12 +1301,24 @@ static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *ifa return S_OK; } -static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) +static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *count) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); + struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface); - FIXME("(%p/%p)->(%p) stub\n", iface, This, max); - return E_NOTIMPL; + TRACE("filter %p, count %p.\n", filter, count); + + EnterCriticalSection(&filter->renderer.filter.csFilter); + + if (!filter->stream_count) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return VFW_E_VMR_NOT_IN_MIXER_MODE; + } + + *count = filter->stream_count; + + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags)

1 0

Zebediah Figura : quartz/vmr9: Add IVMRMixerControl9.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 5dbede68f8846d70be1e6587d7236868a560e64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dbede68f8846d70be1e6587… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 12 21:25:00 2020 -0500 quartz/vmr9: Add IVMRMixerControl9. Needed by Sniper Fury and Modern Combat 5. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 7 +- dlls/quartz/vmr9.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3edc91a342..d7664adac0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -334,7 +334,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBasicVideo, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); check_interface(filter, &IID_IVideoWindow, TRUE); - todo_wine check_interface(filter, &IID_IVMRMixerControl9, TRUE); + check_interface(filter, &IID_IVMRMixerControl9, TRUE); /* IVMRMonitorConfig9 may not be available if the d3d9 device has * insufficient support. */ check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); @@ -3153,9 +3153,8 @@ static void test_mixing_mode(void) ok(stream_count == 1, "Got %u streams.\n", stream_count); hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - IVMRMixerControl9_Release(mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRMixerControl9_Release(mixer_control); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6dfc82804f..edcfe44732 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -63,6 +63,7 @@ struct quartz_vmr IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRMixerBitmap9 IVMRMixerBitmap9_iface; + IVMRMixerControl9 IVMRMixerControl9_iface; IVMRMonitorConfig IVMRMonitorConfig_iface; IVMRMonitorConfig9 IVMRMonitorConfig9_iface; IVMRSurfaceAllocatorNotify IVMRSurfaceAllocatorNotify_iface; @@ -597,6 +598,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRFilterConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) *out = &filter->IVMRMixerBitmap9_iface; + else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count) + *out = &filter->IVMRMixerControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) @@ -2121,6 +2124,173 @@ static const IVMRSurfaceAllocatorNotify9Vtbl VMR9_SurfaceAllocatorNotify_Vtbl = VMR9SurfaceAllocatorNotify_NotifyEvent }; +static inline struct quartz_vmr *impl_from_IVMRMixerControl9(IVMRMixerControl9 *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRMixerControl9_iface); +} + +static HRESULT WINAPI mixer_control9_QueryInterface(IVMRMixerControl9 *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI mixer_control9_AddRef(IVMRMixerControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI mixer_control9_Release(IVMRMixerControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI mixer_control9_SetAlpha(IVMRMixerControl9 *iface, DWORD stream, float alpha) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, alpha %.8e, stub!\n", filter, stream, alpha); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetAlpha(IVMRMixerControl9 *iface, DWORD stream, float *alpha) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, alpha %p, stub!\n", filter, stream, alpha); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_SetZOrder(IVMRMixerControl9 *iface, DWORD stream, DWORD z) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, z %u, stub!\n", filter, stream, z); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetZOrder(IVMRMixerControl9 *iface, DWORD stream, DWORD *z) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, z %p, stub!\n", filter, stream, z); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_SetOutputRect(IVMRMixerControl9 *iface, + DWORD stream, const VMR9NormalizedRect *rect) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, rect %s, stub!\n", filter, stream, debugstr_normalized_rect(rect)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetOutputRect(IVMRMixerControl9 *iface, + DWORD stream, VMR9NormalizedRect *rect) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, stream %u, rect %p, stub!\n", filter, stream, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_SetBackgroundClr(IVMRMixerControl9 *iface, COLORREF color) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, color #%06x, stub!\n", filter, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetBackgroundClr(IVMRMixerControl9 *iface, COLORREF *color) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, color %p, stub!\n", filter, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DWORD flags) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, flags %#x, stub!\n", filter, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DWORD *flags) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, flags %p, stub!\n", filter, flags); + + *flags = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + + return S_OK; +} + +static HRESULT WINAPI mixer_control9_SetProcAmpControl(IVMRMixerControl9 *iface, + DWORD stream, VMR9ProcAmpControl *settings) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, settings %p, stub!\n", filter, settings); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetProcAmpControl(IVMRMixerControl9 *iface, + DWORD stream, VMR9ProcAmpControl *settings) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, settings %p, stub!\n", filter, settings); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_control9_GetProcAmpControlRange(IVMRMixerControl9 *iface, + DWORD stream, VMR9ProcAmpControlRange *settings) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface); + + FIXME("filter %p, settings %p, stub!\n", filter, settings); + + return E_NOTIMPL; +} + +static const IVMRMixerControl9Vtbl mixer_control9_vtbl = +{ + mixer_control9_QueryInterface, + mixer_control9_AddRef, + mixer_control9_Release, + mixer_control9_SetAlpha, + mixer_control9_GetAlpha, + mixer_control9_SetZOrder, + mixer_control9_GetZOrder, + mixer_control9_SetOutputRect, + mixer_control9_GetOutputRect, + mixer_control9_SetBackgroundClr, + mixer_control9_GetBackgroundClr, + mixer_control9_SetMixingPrefs, + mixer_control9_GetMixingPrefs, + mixer_control9_SetProcAmpControl, + mixer_control9_GetProcAmpControl, + mixer_control9_GetProcAmpControlRange, +}; + static inline struct quartz_vmr *impl_from_IVMRMixerBitmap9(IVMRMixerBitmap9 *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRMixerBitmap9_iface); @@ -2307,6 +2477,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; object->IVMRMixerBitmap9_iface.lpVtbl = &mixer_bitmap9_vtbl; + object->IVMRMixerControl9_iface.lpVtbl = &mixer_control9_vtbl; object->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; object->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; object->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl;

1 0

Zebediah Figura : quartz/vmr9: Set the stream count to 4 in IVMRWindowlessControl9::SetVideoClippingWindow().
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: e15c13c5926f957578350a55fbeb0cfc640d70eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e15c13c5926f957578350a55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 12 21:25:01 2020 -0500 quartz/vmr9: Set the stream count to 4 in IVMRWindowlessControl9::SetVideoClippingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 13 ++++++------- dlls/quartz/vmr9.c | 5 ++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d7664adac0..e3efe56e44 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3178,20 +3178,19 @@ static void test_mixing_mode(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_count == 4, "Got %u streams.\n", stream_count); hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - IVMRMixerControl9_Release(mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRMixerControl9_Release(mixer_control); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + ok(stream_count == 4, "Got %u streams.\n", stream_count); IVMRWindowlessControl9_Release(windowless_control); IVMRFilterConfig9_Release(config); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index edcfe44732..73119431a6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1734,6 +1734,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND window) { struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); + HRESULT hr; TRACE("filter %p, window %p.\n", filter, window); @@ -1754,8 +1755,10 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles filter->clipping_window = window; + hr = IVMRFilterConfig9_SetNumberOfStreams(&filter->IVMRFilterConfig9_iface, 4); + LeaveCriticalSection(&filter->renderer.filter.csFilter); - return S_OK; + return hr; } static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 *iface, HWND hwnd, HDC hdc)

1 0

Alexandre Julliard : ntdll: Implement RtlFormatMessage().
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 5bb9f86dbe6cba002b3cd3b71c73f52a97ce6a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb9f86dbe6cba002b3cd3b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 14:38:36 2020 +0200 ntdll: Implement RtlFormatMessage(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/resource.c | 28 ----- dlls/ntdll/rtlstr.c | 245 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 3 +- include/winternl.h | 3 +- 6 files changed, 252 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bb9f86dbe6cba002b3c…

1 0

Zebediah Figura : quartz/vmr9: Allocate the surface array in allocate_surfaces().
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 040227e5b3e7d67dc441fee24ecaca8c848c9663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=040227e5b3e7d67dc441fee2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 12 21:25:02 2020 -0500 quartz/vmr9: Allocate the surface array in allocate_surfaces(). Avoid allocating it twice if we try multiple formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 73119431a6..81e265f104 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -339,25 +339,19 @@ static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const return S_OK; } -static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *info) +static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *info, DWORD count) { - DWORD buffer_count = 1, i; HRESULT hr; + DWORD i; if (FAILED(hr = IVMRSurfaceAllocatorEx9_InitializeDevice(filter->allocator, - filter->cookie, info, &buffer_count))) + filter->cookie, info, &count))) { WARN("Failed to initialize device (flags %#x), hr %#x.\n", info->dwFlags, hr); return hr; } - if (!(filter->surfaces = calloc(buffer_count, sizeof(IDirect3DSurface9 *)))) - { - IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); - return E_OUTOFMEMORY; - } - - for (i = 0; i < buffer_count; ++i) + for (i = 0; i < count; ++i) { if (FAILED(hr = IVMRSurfaceAllocatorEx9_GetSurface(filter->allocator, filter->cookie, i, 0, &filter->surfaces[i]))) @@ -370,7 +364,6 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * } } - filter->num_surfaces = buffer_count; return hr; } @@ -378,6 +371,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE { VMR9AllocationInfo info = {}; HRESULT hr = E_FAIL; + DWORD count = 1; unsigned int i; static const struct @@ -410,10 +404,13 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE return S_OK; info.Pool = D3DPOOL_DEFAULT; - info.MinBuffers = 1; + info.MinBuffers = count; info.dwWidth = info.szAspectRatio.cx = info.szNativeSize.cx = filter->bmiheader.biWidth; info.dwHeight = info.szAspectRatio.cy = info.szNativeSize.cy = filter->bmiheader.biHeight; + if (!(filter->surfaces = calloc(count, sizeof(IDirect3DSurface9 *)))) + return E_OUTOFMEMORY; + filter->num_surfaces = count; filter->cur_surface = 0; if (!is_vmr9(filter)) @@ -431,7 +428,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } info.dwFlags = VMR9AllocFlag_TextureSurface; - return initialize_device(filter, &info); + return initialize_device(filter, &info, count); } for (i = 0; i < ARRAY_SIZE(formats); ++i) @@ -443,14 +440,14 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE if (formats[i].flags & VMR9AllocFlag_TextureSurface) { info.dwFlags = VMR9AllocFlag_TextureSurface; - if (SUCCEEDED(hr = initialize_device(filter, &info))) + if (SUCCEEDED(hr = initialize_device(filter, &info, count))) return hr; } if (formats[i].flags & VMR9AllocFlag_OffscreenSurface) { info.dwFlags = VMR9AllocFlag_OffscreenSurface; - if (SUCCEEDED(hr = initialize_device(filter, &info))) + if (SUCCEEDED(hr = initialize_device(filter, &info, count))) return hr; } }

1 0