October 2020 - Wine-Commits

Michael Stefaniuc : dxdiag: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: d4fa8265c926382cf69e4c45b7dcd4ca8e084999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4fa8265c926382cf69e4c45… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:50 2020 +0200 dxdiag: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/information.c | 59 ++++++++++++------------------------ programs/dxdiag/main.c | 13 +++----- programs/dxdiag/output.c | 69 ++++++++++++++----------------------------- 3 files changed, 45 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4fa8265c926382cf69e…

1 0

Michael Stefaniuc : cabarc: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 28df6726660413f24bb972b08bdd3ec6d281eaf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28df6726660413f24bb972b0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:47 2020 +0200 cabarc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index d244d6ce27..3eb28fe908 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -470,7 +470,6 @@ static BOOL add_file( HFCI fci, WCHAR *name ) static BOOL add_directory( HFCI fci, WCHAR *dir ) { - static const WCHAR wildcardW[] = {'*',0}; WCHAR *p, *buffer; HANDLE handle; WIN32_FIND_DATAW data; @@ -480,7 +479,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - lstrcpyW( p, wildcardW ); + lstrcpyW( p, L"*" ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -524,7 +523,6 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { - static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -550,7 +548,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!lstrcmpW( *file, plusW )) + if (!lstrcmpW( *file, L"+" )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -586,9 +584,6 @@ static void usage( void ) int __cdecl wmain( int argc, WCHAR *argv[] ) { - static const WCHAR noneW[] = {'n','o','n','e',0}; - static const WCHAR mszipW[] = {'m','s','z','i','p',0}; - WCHAR *p, *command; char buffer[MAX_PATH]; char filename[MAX_PATH]; @@ -617,8 +612,8 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) break; case 'm': argv++; argc--; - if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], L"none" )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], L"mszip" )) opt_compression = tcompTYPE_MSZIP; else { WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1]));

1 0

Michael Stefaniuc : extrac32: Use wide-char string literals.
by Alexandre Julliard Oct. 6, 2020

Oct. 6, 2020

Module: wine Branch: master Commit: 69dd275285e96972b27f01e9b2fce5f8dc0ff9c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69dd275285e96972b27f01e9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 5 23:22:51 2020 +0200 extrac32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/extrac32/extrac32.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index c557ff0733..278f8ff9bf 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -115,11 +115,9 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) if (PathFileExistsW(destination) && !force_mode) { - static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; - static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - swprintf(msg, ARRAY_SIZE(msg), overwriteMsg, destination); - if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) + swprintf(msg, ARRAY_SIZE(msg), L"Overwrite \"%s\"?", destination); + if (MessageBoxW(NULL, msg, L"Extract", MB_YESNO | MB_ICONWARNING) != IDYES) return; }

1 0

Gijs Vermeulen : ucrtbase: Add [_]strtold[_l].
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 568e3e8b697a960881c162671a33c28727921797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568e3e8b697a960881c16267… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 5 16:15:31 2020 +0200 ucrtbase: Add [_]strtold[_l]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49873 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a67828e6d2..d662921d02 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -35,7 +35,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) ucrtbase._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) ucrtbase._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) ucrtbase._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) ucrtbase._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) ucrtbase._strtoui64_l @@ -96,7 +96,7 @@ @ cdecl strtof(str ptr) ucrtbase.strtof @ cdecl -ret64 strtoimax(str ptr long) ucrtbase.strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol -@ stub strtold +@ cdecl strtold(str ptr) ucrtbase.strtold @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll @ cdecl strtoul(str ptr long) ucrtbase.strtoul @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 87dc6585f3..4dd07406db 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -719,7 +719,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) ucrtbase._o__strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) ucrtbase._o__strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) ucrtbase._o__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) ucrtbase._o__strtold_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) ucrtbase._o__strtoll_l @ cdecl -ret64 _o__strtoui64(str ptr long) ucrtbase._o__strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) ucrtbase._o__strtoui64_l @@ -1126,7 +1126,7 @@ @ cdecl _o_strtok(str str) ucrtbase._o_strtok @ cdecl _o_strtok_s(ptr str ptr) ucrtbase._o_strtok_s @ cdecl _o_strtol(str ptr long) ucrtbase._o_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) ucrtbase._o_strtold @ cdecl -ret64 _o_strtoll(str ptr long) ucrtbase._o_strtoll @ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) ucrtbase._o_strtoull diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0d38f97fff..4c944a9d21 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1736,7 +1736,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2391,7 +2391,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2013b06cc7..9d292ccef5 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1447,7 +1447,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) msvcr120._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @@ -2054,7 +2054,7 @@ @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol -@ stub strtold +@ cdecl strtold(str ptr) msvcr120.strtold @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f556b9e1c3..468d8dbb5a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1383,7 +1383,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _o__strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -1791,7 +1791,7 @@ @ cdecl _o_strtok(str str) MSVCRT_strtok @ cdecl _o_strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl _o_strtol(str ptr long) MSVCRT_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 _o_strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) MSVCRT_strtoui64 @@ -1954,7 +1954,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2522,7 +2522,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64

1 0

Zhiyi Zhang : dxgi/tests: Run test_default_fullscreen_target_output() on d3d12 as well.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 39cf65e48f17686b13b848cfc6158a8e45f75d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39cf65e48f17686b13b848cf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:23:53 2020 +0800 dxgi/tests: Run test_default_fullscreen_target_output() on d3d12 as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index dac224f654..e6b5a4e66b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2796,7 +2796,7 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } -static void test_default_fullscreen_target_output(void) +static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d12) { IDXGIOutput *output, *containing_output, *target; unsigned int adapter_idx, output_idx; @@ -2806,19 +2806,12 @@ static void test_default_fullscreen_target_output(void) IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; - IDXGIDevice *device; + BOOL fullscreen, ret; RECT window_rect; ULONG refcount; HRESULT hr; - BOOL ret; - - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - get_factory((IUnknown *)device, FALSE, &factory); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; @@ -2828,8 +2821,8 @@ static void test_default_fullscreen_target_output(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); @@ -2848,6 +2841,14 @@ static void test_default_fullscreen_target_output(void) ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, output_idx, hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(!fullscreen, "Adapter %u output %u: Expected not fullscreen.\n", adapter_idx, + output_idx); + ok(!containing_output, "Adapter %u output %u: Expected a null output.\n", adapter_idx, + output_idx); + /* Move the OutputWindow to the current output. */ hr = IDXGIOutput_GetDesc(output, &output_desc); ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, @@ -2948,10 +2949,20 @@ static void test_default_fullscreen_target_output(void) continue; } + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(fullscreen, "Adapter %u output %u: Expected fullscreen.\n", adapter_idx, output_idx); + todo_wine_if(is_d3d12) + ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx, + output_idx); + if (containing_output) + IDXGIOutput_Release(containing_output); + ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); - ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + todo_wine_if(is_d3d12) ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), wine_dbgstr_rect(&window_rect)); @@ -2979,10 +2990,8 @@ static void test_default_fullscreen_target_output(void) IDXGIAdapter_Release(adapter); } - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); } static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, @@ -6989,7 +6998,6 @@ START_TEST(dxgi) /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); test_multi_adapter(); @@ -7006,6 +7014,7 @@ START_TEST(dxgi) run_on_d3d10(test_cursor_clipping); run_on_d3d10(test_get_containing_output); run_on_d3d10(test_window_association); + run_on_d3d10(test_default_fullscreen_target_output); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7034,6 +7043,7 @@ START_TEST(dxgi) run_on_d3d12(test_colour_space_support); run_on_d3d12(test_get_containing_output); run_on_d3d12(test_window_association); + run_on_d3d12(test_default_fullscreen_target_output); FreeLibrary(d3d12_module); }

1 0

Zhiyi Zhang : dxgi: Retrieve d3d12 swapchain fullscreen state from wined3d.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 0e58bcea7fdf5b6f77bb6f8680bda6ba49b76c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e58bcea7fdf5b6f77bb6f86… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:24:16 2020 +0800 dxgi: Retrieve d3d12 swapchain fullscreen state from wined3d. Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 19 +++++++++++++++++-- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d778ab9e03..f3b74389d2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2276,7 +2276,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = !swapchain->fullscreen_desc.Windowed; + { + wined3d_mutex_lock(); + *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + } if (target && (*target = swapchain->target)) IDXGIOutput_AddRef(*target); @@ -2289,6 +2293,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc = &swapchain->fullscreen_desc; const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2298,6 +2303,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + desc->BufferDesc.Width = swapchain_desc->Width; desc->BufferDesc.Height = swapchain_desc->Height; desc->BufferDesc.RefreshRate = fullscreen_desc->RefreshRate; @@ -2308,7 +2317,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, desc->BufferUsage = swapchain_desc->BufferUsage; desc->BufferCount = swapchain_desc->BufferCount; desc->OutputWindow = swapchain->window; - desc->Windowed = fullscreen_desc->Windowed; + desc->Windowed = windowed; desc->SwapEffect = swapchain_desc->SwapEffect; desc->Flags = swapchain_desc->Flags; @@ -2470,6 +2479,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2479,7 +2489,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + *desc = swapchain->fullscreen_desc; + desc->Windowed = windowed; return S_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6270c363bb..d0d93417a1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2266,6 +2266,13 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st return WINED3D_OK; } +BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state) +{ + TRACE("state %p.\n", state); + + return state->desc.windowed; +} + void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { heap_free(state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cf792746cc..d11e06d0c3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -291,6 +291,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) +@ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3535a69bac..238961006a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2806,6 +2806,7 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); +BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state,

1 0

Nikolay Sivov : comctl32/tests: Remove some workarounds from ListView tests.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 120364fa9ceee0ce90a82512f550b195a42c165e URL: https://source.winehq.org/git/wine.git/?a=commit;h=120364fa9ceee0ce90a82512… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:01:49 2020 +0300 comctl32/tests: Remove some workarounds from ListView tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 116 +++++++++-------------------------------- 1 file changed, 25 insertions(+), 91 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9db3dc6ec4..e95b81f5bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -62,8 +62,6 @@ static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; -/* indicates we're running < 5.80 version */ -static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; /* alter notification code A->W */ @@ -727,20 +725,6 @@ static HWND create_listview_controlW(DWORD style, HWND parent) return hwnd; } -static BOOL is_win_xp(void) -{ - HWND hwnd, header; - BOOL ret; - - hwnd = create_listview_control(LVS_ICON); - SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, LVS_EX_HEADERINALLVIEWS); - header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); - ret = !IsWindow(header); - - DestroyWindow(hwnd); - - return ret; -} static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1039,12 +1023,6 @@ static void test_checkboxes(void) item.stateMask = 0xffff; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); - if (item.state != 0x1ccc) - { - win_skip("LVS_EX_CHECKBOXES style is unavailable. Skipping.\n"); - DestroyWindow(hwnd); - return; - } /* Now add an item without specifying a state and check that its state goes to 0x1000 */ item.iItem = 2; @@ -1638,12 +1616,6 @@ static void test_create(BOOL is_version_6) DWORD style; ATOM class; - if (is_win_xp() && is_version_6) - { - win_skip("Skipping some tests on XP.\n"); - return; - } - cls.cbSize = sizeof(WNDCLASSEXA); r = GetClassInfoExA(GetModuleHandleA(NULL), WC_LISTVIEWA, &cls); ok(r, "Failed to get class info.\n"); @@ -3136,29 +3108,22 @@ static void test_ownerdata(void) DWORD res; LVITEMA item; - /* it isn't possible to set LVS_OWNERDATA after creation */ - if (g_is_below_5) - { - win_skip("set LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); + /* Setting LVS_OWNERDATA after creation leads to crash on older versions < 5.80 */ + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA) && style, "LVS_OWNERDATA isn't expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); - DestroyWindow(hwnd); - } + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_OWNERDATA), "LVS_OWNERDATA isn't expected\n"); + DestroyWindow(hwnd); /* try to set LVS_OWNERDATA after creation just having it */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -3174,28 +3139,20 @@ static void test_ownerdata(void) "try to switch to LVS_OWNERDATA seq", FALSE); DestroyWindow(hwnd); - /* try to remove LVS_OWNERDATA after creation just having it */ - if (g_is_below_5) - { - win_skip("remove LVS_OWNERDATA after creation leads to crash on < 5.80\n"); - } - else - { - hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); - ok(ret == style, "Expected set GWL_STYLE to succeed\n"); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, - "try to switch to LVS_OWNERDATA seq", FALSE); - style = GetWindowLongPtrA(hwnd, GWL_STYLE); - ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); - DestroyWindow(hwnd); - } + ret = SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_OWNERDATA); + ok(ret == style, "Expected set GWL_STYLE to succeed\n"); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_ownerdata_switchto_seq, + "try to switch to LVS_OWNERDATA seq", FALSE); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "LVS_OWNERDATA is expected\n"); + DestroyWindow(hwnd); /* try select an item */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); @@ -4624,27 +4581,6 @@ static void test_indentation(void) DestroyWindow(hwnd); } -static INT CALLBACK DummyCompareEx(LPARAM first, LPARAM second, LPARAM param) -{ - return 0; -} - -static BOOL is_below_comctl_5(void) -{ - HWND hwnd; - BOOL ret; - - hwnd = create_listview_control(LVS_REPORT); - ok(hwnd != NULL, "failed to create a listview window\n"); - insert_item(hwnd, 0); - - ret = SendMessageA(hwnd, LVM_SORTITEMSEX, 0, (LPARAM)&DummyCompareEx); - - DestroyWindow(hwnd); - - return !ret; -} - static void test_get_set_view(void) { HWND hwnd; @@ -6700,8 +6636,6 @@ START_TEST(listview) hwndparent = create_parent_window(FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - g_is_below_5 = is_below_comctl_5(); - test_header_notification(); test_header_notification2(); test_images();

1 0

Nikolay Sivov : rtworkq: Add remaining queue management stubs.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 1d7469d9a6e82e3a4c6a170e542f48fd4a342ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7469d9a6e82e3a4c6a170e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:02:56 2020 +0300 rtworkq: Add remaining queue management stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 +++--- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +++--- include/mfapi.h | 3 +++ include/rtworkq.idl | 2 ++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index f55a8237d3..8f5e7db6ae 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -25,7 +25,7 @@ @ stub MFBeginGetHostByName @ stub MFBeginRegisterWorkQueueWithMMCSS @ stdcall MFBeginRegisterWorkQueueWithMMCSSEx(long wstr long long ptr ptr) rtworkq.RtwqBeginRegisterWorkQueueWithMMCSS -@ stub MFBeginUnregisterWorkQueueWithMMCSS +@ stdcall MFBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) rtworkq.RtwqBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread @ stub MFCalculateBitmapImageSize @ stdcall MFCalculateImageSize(ptr long long ptr) @@ -87,8 +87,8 @@ @ stub MFDeserializePresentationDescriptor @ stdcall MFEndCreateFile(ptr ptr) @ stub MFEndGetHostByName -@ stub MFEndRegisterWorkQueueWithMMCSS -@ stub MFEndUnregisterWorkQueueWithMMCSS +@ stdcall MFEndRegisterWorkQueueWithMMCSS(ptr ptr) rtworkq.RtwqEndRegisterWorkQueueWithMMCSS +@ stdcall MFEndUnregisterWorkQueueWithMMCSS(ptr) rtworkq.RtwqEndUnregisterWorkQueueWithMMCSS @ stub MFFrameRateToAverageTimePerFrame @ stub MFFreeAdaptersAddresses @ stub MFGetAdaptersAddresses diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 07d124cfb7..f4e9f10d3f 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1533,6 +1533,27 @@ HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *cla return E_NOTIMPL; } +HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid) +{ + FIXME("%p, %p.\n", result, taskid); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state) +{ + FIXME("%#x, %p, %p.\n", queue, callback, state); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqEndUnregisterWorkQueueWithMMCSS(IRtwqAsyncResult *result) +{ + FIXME("%p.\n", result); + + return E_NOTIMPL; +} + HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events) { FIXME("%p.\n", events); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 09d877790d..2200b0863b 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -2,13 +2,13 @@ @ stdcall RtwqAllocateSerialWorkQueue(long ptr) @ stdcall RtwqAllocateWorkQueue(long ptr) @ stdcall RtwqBeginRegisterWorkQueueWithMMCSS(long wstr long long ptr ptr) -@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stdcall RtwqBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) @ stdcall RtwqCancelDeadline(long) @ stub RtwqCancelMultipleWaitingWorkItem @ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) -@ stub RtwqEndRegisterWorkQueueWithMMCSS -@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stdcall RtwqEndRegisterWorkQueueWithMMCSS(ptr ptr) +@ stdcall RtwqEndUnregisterWorkQueueWithMMCSS(ptr) @ stub RtwqGetPlatform @ stdcall RtwqGetWorkQueueMMCSSClass(long ptr ptr) @ stdcall RtwqGetWorkQueueMMCSSPriority(long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index b1edeac02f..e9b26f322c 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -490,6 +490,7 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSSEx(DWORD queue, const WCHAR *usage_class, DWORD taskid, LONG priority, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size); HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -517,6 +518,8 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); +HRESULT WINAPI MFEndRegisterWorkQueueWithMMCSS(IMFAsyncResult *result, DWORD *taskid); +HRESULT WINAPI MFEndUnregisterWorkQueueWithMMCSS(IMFAsyncResult *result); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); diff --git a/include/rtworkq.idl b/include/rtworkq.idl index ed32df1c3b..e7ff768074 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -93,9 +93,11 @@ cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") +cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);")

1 0

Nikolay Sivov : evr/presenter: Better validate input rectangles in SetVideoPosition().
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: a419b3eb79741adc9f6f22f84b71ed3e8ae19025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a419b3eb79741adc9f6f22f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:42 2020 +0300 evr/presenter: Better validate input rectangles in SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 10 +++++++++- dlls/evr/tests/evr.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 4a7a4021c2..babaca6885 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -510,7 +510,15 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo return E_POINTER; if (src_rect && (src_rect->left < 0.0f || src_rect->top < 0.0f || - src_rect->right > 1.0f || src_rect->bottom > 1.0f)) + src_rect->right > 1.0f || src_rect->bottom > 1.0f || + src_rect->left > src_rect->right || + src_rect->top > src_rect->bottom)) + { + return E_INVALIDARG; + } + + if (dst_rect && (dst_rect->left > dst_rect->right || + dst_rect->top > dst_rect->bottom)) return E_INVALIDARG; EnterCriticalSection(&presenter->cs); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 48bf01a2ef..0436836963 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1111,6 +1111,21 @@ static void test_default_presenter(void) hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* Flipped source rectangle. */ + src_rect.left = 0.5f; + src_rect.top = 0.0f; + src_rect.right = 0.4f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = 0.0f; + src_rect.top = 0.5f; + src_rect.right = 0.4f; + src_rect.bottom = 0.1f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + src_rect.left = 0.1f; src_rect.top = 0.2f; src_rect.right = 0.8f; @@ -1123,6 +1138,15 @@ static void test_default_presenter(void) ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); + /* Flipped destination rectangle. */ + SetRect(&dst_rect, 100, 1, 50, 1000); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 100, 100, 50); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + SetRect(&dst_rect, 1, 2, 999, 1000); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Set VIDEO_ZOOM_RECT on SetVideoPosition().
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 94b2db85b6ae695c91f2a7c872549bc6ebca19f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b2db85b6ae695c91f2a7c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:44 2020 +0300 evr/presenter: Set VIDEO_ZOOM_RECT on SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 37f4e67593..eceabfd381 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,25 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static void video_presenter_set_mixer_rect(struct video_presenter *presenter) +{ + IMFAttributes *attributes; + HRESULT hr; + + if (!presenter->mixer) + return; + + if (SUCCEEDED(IMFTransform_GetAttributes(presenter->mixer, &attributes))) + { + if (FAILED(hr = IMFAttributes_SetBlob(attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&presenter->src_rect, + sizeof(presenter->src_rect)))) + { + WARN("Failed to set zoom rectangle attribute, hr %#x.\n", hr); + } + IMFAttributes_Release(attributes); + } +} + static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; @@ -389,6 +408,8 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I presenter->mixer = NULL; } + video_presenter_set_mixer_rect(presenter); + return hr; } @@ -528,7 +549,13 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo else { if (src_rect) - presenter->src_rect = *src_rect; + { + if (memcmp(&presenter->src_rect, src_rect, sizeof(*src_rect))) + { + presenter->src_rect = *src_rect; + video_presenter_set_mixer_rect(presenter); + } + } if (dst_rect) presenter->dst_rect = *dst_rect; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 869af10b22..db9546a945 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1414,16 +1414,13 @@ static void test_presenter_video_position(void) hr = IMFAttributes_GetCount(mixer_attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected count %u.\n", count); memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); -} hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1505,11 +1502,10 @@ todo_wine { /* Presenter updates mixer attribute. */ memset(&src_rect, 0, sizeof(src_rect)); hr = IMFAttributes_GetBlob(mixer_attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&src_rect, sizeof(src_rect), NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); -} + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f &&

1 0