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

Sven Baars : shell32: Fix a leak on error path (Coverity).
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 2dac80524440bbae0ee0ef67c470bc0073b8bfaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dac80524440bbae0ee0ef67… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:23 2020 +0200 shell32: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a37b1bf588..48d5fe4ecb 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1251,7 +1251,10 @@ static HRESULT WINAPI ShellFolder2_GetDisplayNameOf(IShellFolder2* iface, LPWSTR pwszDosFileName = wine_get_dos_file_name(This->m_pszPath); if (!pwszDosFileName) return HRESULT_FROM_WIN32(GetLastError()); lpName->u.pOleStr = SHAlloc((lstrlenW(pwszDosFileName) + 1) * sizeof(WCHAR)); - if (!lpName->u.pOleStr) return HRESULT_FROM_WIN32(GetLastError()); + if (!lpName->u.pOleStr) { + heap_free(pwszDosFileName); + return HRESULT_FROM_WIN32(GetLastError()); + } lstrcpyW(lpName->u.pOleStr, pwszDosFileName); PathRemoveBackslashW(lpName->u.pOleStr); heap_free(pwszDosFileName);

1 0

Rémi Bernon : winex11.drv: Split clip cursor message in notify/request.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 0120a1aa40936fc6d57d83eb12709b951c7b88d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0120a1aa40936fc6d57d83eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 1 22:24:30 2020 +0200 winex11.drv: Split clip cursor message in notify/request. The message was sent to two different types of windows, with a different semantic. We can now add parameters to the request without changing the notify parameters semantics. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 41 +++++++++++++++++++++++++++-------------- dlls/winex11.drv/window.c | 4 +++- dlls/winex11.drv/x11drv.h | 4 +++- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 68e24a320a..add38a95ba 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -445,7 +445,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -465,7 +465,7 @@ void ungrab_clipping_window(void) XUnmapWindow( display, clip_window ); if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; - SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, 0 ); } /*********************************************************************** @@ -493,12 +493,10 @@ void retry_grab_clipping_window(void) ClipCursor( &last_clip_rect ); } -BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); - /*********************************************************************** * clip_cursor_notify * - * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. + * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR_NOTIFY. */ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) { @@ -511,7 +509,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) HWND prev = clip_hwnd; clip_hwnd = new_clip_hwnd; if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); - if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, (WPARAM)prev, 0 ); + if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR_NOTIFY, (WPARAM)prev, 0 ); } else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { @@ -521,13 +519,6 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) disable_xinput2(); DestroyWindow( hwnd ); } - else if (hwnd == GetForegroundWindow()) /* request to clip */ - { - RECT clip; - - GetClipCursor( &clip ); - X11DRV_ClipCursor( &clip ); - } else if (prev_clip_hwnd) { /* This is a notification send by the desktop window to an old @@ -1539,7 +1530,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, 0, 0 ); return TRUE; } @@ -1563,6 +1554,28 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) return TRUE; } +/*********************************************************************** + * clip_cursor_request + * + * Function called upon receiving a WM_X11DRV_CLIP_CURSOR_REQUEST. + */ +LRESULT clip_cursor_request( HWND hwnd ) +{ + RECT clip; + + if (hwnd == GetDesktopWindow()) + WARN( "ignoring clip cursor request on desktop window.\n" ); + else if (hwnd != GetForegroundWindow()) + WARN( "ignoring clip cursor request on non-foreground window.\n" ); + else + { + GetClipCursor( &clip ); + X11DRV_ClipCursor( &clip ); + } + + return 0; +} + /*********************************************************************** * move_resize_window */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 455957264b..b0312b1a18 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2781,8 +2781,10 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) else if (hwnd == x11drv_thread_data()->clip_hwnd) set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; - case WM_X11DRV_CLIP_CURSOR: + case WM_X11DRV_CLIP_CURSOR_NOTIFY: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); + case WM_X11DRV_CLIP_CURSOR_REQUEST: + return clip_cursor_request( hwnd ); default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a92c738a68..d4ee4a7c8d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -538,7 +538,8 @@ enum x11drv_window_messages WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, - WM_X11DRV_CLIP_CURSOR + WM_X11DRV_CLIP_CURSOR_NOTIFY, + WM_X11DRV_CLIP_CURSOR_REQUEST }; /* _NET_WM_STATE properties that we keep track of */ @@ -627,6 +628,7 @@ extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; +extern LRESULT clip_cursor_request( HWND hwnd ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : xactengine3_7: Explicity copy the XACT_RUNTIME_PARAMETERS members.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 8ea0607befc4c1ad349cd85c6587aa91a6d0220d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea0607befc4c1ad349cd85c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 2 17:23:24 2020 +1000 xactengine3_7: Explicity copy the XACT_RUNTIME_PARAMETERS members. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49911 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 84ed35d2c4..281aecc154 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -776,7 +776,16 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pParams); - memcpy(&params, pParams, sizeof(FACTRuntimeParameters)); + memset(&params, 0, sizeof(FACTRuntimeParameters)); + /* Explicitly copy to the FAudio structure as the packing is wrong under 64 bits */ + params.lookAheadTime = pParams->lookAheadTime; + params.pGlobalSettingsBuffer = pParams->pGlobalSettingsBuffer; + params.globalSettingsBufferSize = pParams->globalSettingsBufferSize; + params.globalSettingsFlags = pParams->globalSettingsFlags; + params.globalSettingsAllocAttributes = pParams->globalSettingsAllocAttributes; + params.pRendererID = (int16_t*)pParams->pRendererID; + params.pXAudio2 = NULL; + params.pMasteringVoice = NULL; /* FIXME: pXAudio2 and pMasteringVoice are pointers to * IXAudio2/IXAudio2MasteringVoice objects. FACT wants pointers to @@ -789,12 +798,10 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, * -flibit */ if (pParams->pXAudio2 != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pXAudio2 = NULL; + FIXME("pXAudio2 parameter not supported!\n"); if (pParams->pMasteringVoice != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pMasteringVoice = NULL; + FIXME("pMasteringVoice parameter not supported!\n"); } }

1 0

Nikolay Sivov : mf: Implement MFCreateVideoRenderer().
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 6019f3c17989085ed0349edaade0c1c44e007e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6019f3c17989085ed0349eda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:41 2020 +0300 mf: Implement MFCreateVideoRenderer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 28 ++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 4 ++++ include/evr.idl | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 31bc110ea4..c5b2ceecd6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1388,3 +1388,31 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) return hr; } + +/*********************************************************************** + * MFCreateVideoRenderer (mf.@) + */ +HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer) +{ + IMFAttributes *attributes; + IUnknown *obj; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), renderer); + + *renderer = NULL; + + if (FAILED(hr = MFCreateAttributes(&attributes, 0))) + return hr; + + hr = evr_create_object(attributes, NULL, &obj); + IMFAttributes_Release(attributes); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(obj, riid, renderer); + IUnknown_Release(obj); + } + + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 4b5b085d08..2927d9f8a8 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -66,7 +66,7 @@ @ stub MFCreateTranscodeSinkActivate @ stub MFCreateTranscodeTopology @ stub MFCreateUrlmonSchemePlugin -@ stub MFCreateVideoRenderer +@ stdcall MFCreateVideoRenderer(ptr ptr) @ stdcall MFCreateVideoRendererActivate(long ptr) @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2c02b1d8e5..0bc297cc69 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3253,6 +3253,10 @@ static void test_evr(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + hr = MFCreateVideoRenderer(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = MFCreateVideoRendererActivate(NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 77c46a075f..c217883538 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -313,5 +313,6 @@ cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device cpp_quote("HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *presenter_outer, ") cpp_quote(" REFIID riid_mixer, void **mixer, REFIID riid_presenter, void **presenter);") cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoRenderer(REFIID riid, void **renderer);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **allocator);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);")

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: b32083f9ccfa82a694dcfc52d351601597bd3f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b32083f9ccfa82a694dcfc52… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:23:35 2020 +0800 dxgi/tests: Run test_window_association() 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 | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2a68947c68..dac224f654 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6122,15 +6122,13 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } -static void test_window_association(void) +static void test_window_association(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; LONG_PTR original_wndproc, wndproc; IDXGIFactory *factory, *factory2; IDXGISwapChain *swapchain; IDXGIOutput *output; - IDXGIAdapter *adapter; - IDXGIDevice *device; HWND hwnd, hwnd2; BOOL fullscreen; unsigned int i; @@ -6142,6 +6140,7 @@ static void test_window_association(void) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; + BOOL todo_on_d3d12; } tests[] = { @@ -6155,24 +6154,18 @@ static void test_window_association(void) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE}, + {0, TRUE, FALSE, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE}, + {0, TRUE, FALSE, TRUE}, {0, FALSE} }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - swapchain_desc.BufferDesc.Width = 640; swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; @@ -6183,10 +6176,10 @@ static void test_window_association(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.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; original_wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); @@ -6195,11 +6188,7 @@ static void test_window_association(void) hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); @@ -6229,7 +6218,7 @@ static void test_window_association(void) ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Alt+Enter tests. */ - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); @@ -6275,6 +6264,7 @@ static void test_window_association(void) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); @@ -6299,10 +6289,8 @@ static void test_window_association(void) ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); - 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_output_ownership(IUnknown *device, BOOL is_d3d12) @@ -7008,7 +6996,6 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); - test_window_association(); run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); @@ -7018,6 +7005,7 @@ START_TEST(dxgi) run_on_d3d10(test_output_ownership); run_on_d3d10(test_cursor_clipping); run_on_d3d10(test_get_containing_output); + run_on_d3d10(test_window_association); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7045,6 +7033,7 @@ START_TEST(dxgi) run_on_d3d12(test_frame_latency_event); run_on_d3d12(test_colour_space_support); run_on_d3d12(test_get_containing_output); + run_on_d3d12(test_window_association); FreeLibrary(d3d12_module); }

1 0

Nikolay Sivov : evr/presenter: Check video window in SetVideoPosition().
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: f859a4d0482aeb5dc1a2831ba4795b46184315e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f859a4d0482aeb5dc1a2831b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:43 2020 +0300 evr/presenter: Check video window in SetVideoPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 16 ++- dlls/evr/tests/evr.c | 385 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 308 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f859a4d0482aeb5dc1a2…

1 0

Rémi Bernon : winex11.drv: Forward clip_fullscreen_window to foreground thread.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 16984895f0191dad12d55dee422214645b51aece URL: https://source.winehq.org/git/wine.git/?a=commit;h=16984895f0191dad12d55dee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 1 22:24:31 2020 +0200 winex11.drv: Forward clip_fullscreen_window to foreground thread. If the current thread isn't the foreground thread. Otherwise we may clip the cursor in the wrong thread, that isn't expecting mouse messages or may not be checking its messages. Red Faction has some race condition where this can happen for instance, with clip_fullscreen_window called from X11DRV_DisplayDevices_Update callback in a background thread. This thread starts clipping the cursor, and the foreground thread isn't receiving MotionNotify events anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 11 +++++++++-- dlls/winex11.drv/mouse.c | 6 ++++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cf55a5c1fb..0f61f9f7b2 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -372,14 +372,14 @@ static BOOL CALLBACK update_windows_on_display_change(HWND hwnd, LPARAM lparam) XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); } release_win_data(data); - if (hwnd == GetForegroundWindow()) - clip_fullscreen_window(hwnd, TRUE); return TRUE; } void X11DRV_DisplayDevices_Update(BOOL send_display_change) { RECT old_virtual_rect, new_virtual_rect; + DWORD tid, pid; + HWND foreground; UINT mask = 0; old_virtual_rect = get_virtual_screen_rect(); @@ -394,6 +394,13 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) X11DRV_resize_desktop(send_display_change); EnumWindows(update_windows_on_display_change, (LPARAM)mask); + + /* forward clip_fullscreen_window request to the foreground window */ + if ((foreground = GetForegroundWindow()) && (tid = GetWindowThreadProcessId( foreground, &pid )) && pid == GetCurrentProcessId()) + { + if (tid == GetCurrentThreadId()) clip_fullscreen_window( foreground, TRUE ); + else SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE ); + } } /* Initialize a GPU instance. diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index add38a95ba..dd25f8b172 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1530,7 +1530,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, 0, 0 ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, FALSE, FALSE ); return TRUE; } @@ -1559,7 +1559,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) * * Function called upon receiving a WM_X11DRV_CLIP_CURSOR_REQUEST. */ -LRESULT clip_cursor_request( HWND hwnd ) +LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) { RECT clip; @@ -1567,6 +1567,8 @@ LRESULT clip_cursor_request( HWND hwnd ) WARN( "ignoring clip cursor request on desktop window.\n" ); else if (hwnd != GetForegroundWindow()) WARN( "ignoring clip cursor request on non-foreground window.\n" ); + else if (fullscreen) + clip_fullscreen_window( hwnd, reset ); else { GetClipCursor( &clip ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b0312b1a18..457173964e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2784,7 +2784,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_CLIP_CURSOR_NOTIFY: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: - return clip_cursor_request( hwnd ); + return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d4ee4a7c8d..173d94b9ef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -628,7 +628,7 @@ extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; -extern LRESULT clip_cursor_request( HWND hwnd ) DECLSPEC_HIDDEN; +extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : dxgi: Support creating a fullscreen swapchain on d3d12.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 0a322f0ca596f460a480ab3f619eeabb66b07223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a322f0ca596f460a480ab3f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:24:06 2020 +0800 dxgi: Support creating a fullscreen swapchain on d3d12. 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 | 27 ++++++++++++++++++++++++--- dlls/dxgi/tests/dxgi.c | 3 +-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c8f1502a13..d778ab9e03 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2981,11 +2981,34 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, output, window, swapchain_desc, fullscreen_desc); - IDXGIOutput_Release(output); if (FAILED(hr)) + { + IDXGIOutput_Release(output); return hr; + } + if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, &swapchain->state))) + { + IDXGIOutput_Release(output); return hr; + } + + if (!fullscreen_desc->Windowed) + { + hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); + if (FAILED(hr)) + { + wined3d_swapchain_state_destroy(swapchain->state); + IDXGIOutput_Release(output); + return hr; + } + + swapchain->target = output; + } + else + { + IDXGIOutput_Release(output); + } if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); @@ -3002,8 +3025,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); if (fullscreen_desc->Scaling) FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - if (!fullscreen_desc->Windowed) - FIXME("Fullscreen not supported yet.\n"); vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(device)); vk_physical_device = vkd3d_get_vk_physical_device(device); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e6b5a4e66b..f747e236f3 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2953,7 +2953,6 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 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) @@ -2962,7 +2961,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); - todo_wine_if(is_d3d12) ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + 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));

1 0

Sven Baars : ntdll: Fix a memory leak (Valgrind).
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 973b0e1dfcfb20fe5ac2713721a4844e3e3c0671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=973b0e1dfcfb20fe5ac27137… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:24 2020 +0200 ntdll: Fix a memory leak (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49904 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f12cc51899..c2b6ea603e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -920,7 +920,9 @@ static void load_libwine(void) if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); else path = build_path( dll_dir, "../" LIBWINE ); - if (!(handle = dlopen( path, RTLD_NOW )) && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; + handle = dlopen( path, RTLD_NOW ); + free( path ); + if (!handle && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); p___wine_main_argc = dlsym( handle, "__wine_main_argc" );

1 0

Daniel Lehman : msxml3/tests: Add some removeNamedItem tests.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: f726691bdc6d23fe7882fc5690bfa281d3ea5490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f726691bdc6d23fe7882fc56… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Sep 22 16:35:37 2020 -0700 msxml3/tests: Add some removeNamedItem tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 75 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 806d63bb1f..76e42d5029 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4064,9 +4064,9 @@ static void test_removeNamedItem(void) { IXMLDOMDocument *doc; IXMLDOMElement *element; - IXMLDOMNode *pr_node, *removed_node, *removed_node2; + IXMLDOMNode *node, *removed_node, *removed_node2; IXMLDOMNodeList *root_list; - IXMLDOMNamedNodeMap * pr_attrs; + IXMLDOMNamedNodeMap *map; VARIANT_BOOL b; BSTR str; LONG len; @@ -4084,61 +4084,102 @@ static void test_removeNamedItem(void) r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNodeList_get_item( root_list, 1, &pr_node ); + r = IXMLDOMNodeList_get_item( root_list, 1, &node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNode_get_attributes( pr_node, &pr_attrs ); + r = IXMLDOMNode_get_attributes( node, &map ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 3, "length %d\n", len); removed_node = (void*)0xdeadbeef; - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, NULL, &removed_node ); ok ( r == E_INVALIDARG, "ret %08x\n", r); ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node); removed_node = (void*)0xdeadbeef; str = SysAllocString(szvr); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node ); ok ( r == S_OK, "ret %08x\n", r); removed_node2 = (void*)0xdeadbeef; - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, &removed_node2 ); ok ( r == S_FALSE, "ret %08x\n", r); ok ( removed_node2 == NULL, "got %p\n", removed_node2 ); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 2, "length %d\n", len); - r = IXMLDOMNamedNodeMap_setNamedItem( pr_attrs, removed_node, NULL); + r = IXMLDOMNamedNodeMap_setNamedItem( map, removed_node, NULL ); ok ( r == S_OK, "ret %08x\n", r); IXMLDOMNode_Release(removed_node); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 3, "length %d\n", len); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, NULL ); ok ( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + r = IXMLDOMNamedNodeMap_get_length( map, &len ); ok( r == S_OK, "ret %08x\n", r); ok( len == 2, "length %d\n", len); - r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + r = IXMLDOMNamedNodeMap_removeNamedItem( map, str, NULL ); ok ( r == S_FALSE, "ret %08x\n", r); SysFreeString(str); - IXMLDOMNamedNodeMap_Release( pr_attrs ); - IXMLDOMNode_Release( pr_node ); + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMNode_Release( node ); IXMLDOMNodeList_Release( root_list ); IXMLDOMElement_Release( element ); - IXMLDOMDocument_Release( doc ); + /* test with namespaces */ + r = IXMLDOMDocument_loadXML( doc, _bstr_(default_ns_doc), &b ); + EXPECT_HR(r, S_OK); + + r = IXMLDOMDocument_selectSingleNode( doc, _bstr_("a"), &node ); + EXPECT_HR(r, S_OK); + + r = IXMLDOMNode_QueryInterface( node, &IID_IXMLDOMElement, (void**)&element ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( node ); + + r = IXMLDOMElement_get_attributes( element, &map ); + EXPECT_HR(r, S_OK); + + removed_node = (void*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("foo:bar"), &removed_node ); + EXPECT_HR(r, S_FALSE); + ok ( removed_node == NULL, "got %p\n", removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("d"), &removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("ns:b"), &removed_node ); + todo_wine EXPECT_HR(r, S_OK); + if (removed_node) IXMLDOMNode_Release( removed_node ); + + removed_node = NULL; + r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("xml:lang"), &removed_node ); + todo_wine EXPECT_HR(r, S_OK); + if (removed_node) IXMLDOMNode_Release( removed_node ); + + len = -1; + r = IXMLDOMNamedNodeMap_get_length( map, &len ); + EXPECT_HR(r, S_OK); + todo_wine ok( len == 2, "length %d\n", len ); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); free_bstrs(); }

1 0

Daniel Lehman : msxml3: Handle namespaces in removeNamedItem.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 38844dc31e6afb7c6a3e824979b2bc1a403d104b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38844dc31e6afb7c6a3e8249… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Sep 22 16:35:38 2020 -0700 msxml3: Handle namespaces in removeNamedItem. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 10 +++++----- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index ecebd39fea..a352621bfb 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1749,8 +1749,43 @@ static HRESULT domelem_remove_qualified_item(xmlNodePtr node, BSTR name, BSTR ur static HRESULT domelem_remove_named_item(xmlNodePtr node, BSTR name, IXMLDOMNode **item) { + xmlChar *nameA, *local, *prefix; + BSTR uriW, localW; + xmlNsPtr ns; + HRESULT hr; + TRACE("(%p)->(%s %p)\n", node, debugstr_w(name), item); - return domelem_remove_qualified_item(node, name, NULL, item); + + nameA = xmlchar_from_wchar(name); + local = xmlSplitQName2(nameA, &prefix); + heap_free(nameA); + + if (!local) + return domelem_remove_qualified_item(node, name, NULL, item); + + ns = xmlSearchNs(node->doc, node, prefix); + + xmlFree(prefix); + + if (!ns) + { + xmlFree(local); + if (item) *item = NULL; + return item ? S_FALSE : E_INVALIDARG; + } + + uriW = bstr_from_xmlChar(ns->href); + localW = bstr_from_xmlChar(local); + xmlFree(local); + + TRACE("removing qualified node %s, uri=%s\n", debugstr_w(localW), debugstr_w(uriW)); + + hr = domelem_remove_qualified_item(node, localW, uriW, item); + + SysFreeString(localW); + SysFreeString(uriW); + + return hr; } static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode **item) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 76e42d5029..304c08acf6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4164,18 +4164,18 @@ static void test_removeNamedItem(void) removed_node = NULL; r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("ns:b"), &removed_node ); - todo_wine EXPECT_HR(r, S_OK); - if (removed_node) IXMLDOMNode_Release( removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); removed_node = NULL; r = IXMLDOMNamedNodeMap_removeNamedItem( map, _bstr_("xml:lang"), &removed_node ); - todo_wine EXPECT_HR(r, S_OK); - if (removed_node) IXMLDOMNode_Release( removed_node ); + EXPECT_HR(r, S_OK); + IXMLDOMNode_Release( removed_node ); len = -1; r = IXMLDOMNamedNodeMap_get_length( map, &len ); EXPECT_HR(r, S_OK); - todo_wine ok( len == 2, "length %d\n", len ); + ok( len == 2, "length %d\n", len ); IXMLDOMNamedNodeMap_Release( map ); IXMLDOMElement_Release( element );

1 0

Nikolay Sivov : msxml3/tests: Use wide string literals in more tests.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 20e36dcb1b3df78839f9d14f0a4308e7d0e886d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e36dcb1b3df78839f9d14f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:00 2020 +0300 msxml3/tests: Use wide string literals in more tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 +- dlls/msxml3/tests/saxreader.c | 158 +++++++++++++++++------------------------- dlls/msxml3/tests/schema.c | 21 ++---- dlls/msxml3/tests/xmldoc.c | 79 ++++++++------------- dlls/msxml3/tests/xmlview.c | 16 ++--- 5 files changed, 110 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20e36dcb1b3df78839f9…

1 0

Nikolay Sivov : msxml3/tests: Fix tests failures with unreachable network resources.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 44705156b588c679b2fc0a192ff1a07ef6084ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44705156b588c679b2fc0a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 14:55:01 2020 +0300 msxml3/tests: Fix tests failures with unreachable network resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5f5137dd16..4a23f1d82a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1295,7 +1295,6 @@ static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID r hr = IXMLHttpRequest_get_responseText(httpreq, &text); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(*text != 0, "got %s\n", wine_dbgstr_w(text)); SysFreeString(text); } @@ -1798,7 +1797,7 @@ static void test_server_xhr(void) V_VT(&body) = VT_EMPTY; hr = IServerXMLHTTPRequest_send(xhr, body); - if (hr == INET_E_RESOURCE_NOT_FOUND) + if (hr == INET_E_RESOURCE_NOT_FOUND || hr == WININET_E_NAME_NOT_RESOLVED) { skip("No connection could be made with test.winehq.org\n"); IServerXMLHTTPRequest_Release(xhr);

1 0

Nikolay Sivov : evr/presenter: Validate mixer's device id.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 93de829b13c6ff93bcdce510e1a90f17f5d88f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93de829b13c6ff93bcdce510… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 15:26:40 2020 +0300 evr/presenter: Validate mixer's device id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 55 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04e9a55684..4a7a4021c2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -357,6 +357,41 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); } +static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) +{ + IMFVideoDeviceID *device_id; + unsigned int count; + GUID id = { 0 }; + HRESULT hr; + + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) + { + WARN("Failed to get mixer interface, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(presenter->mixer, &IID_IMFVideoDeviceID, (void **)&device_id))) + { + if (SUCCEEDED(hr = IMFVideoDeviceID_GetDeviceID(device_id, &id))) + { + if (!IsEqualGUID(&id, &IID_IDirect3DDevice9)) + hr = MF_E_INVALIDREQUEST; + } + + IMFVideoDeviceID_Release(device_id); + } + + if (FAILED(hr)) + { + IMFTransform_Release(presenter->mixer); + presenter->mixer = NULL; + } + + return hr; +} + static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { @@ -384,20 +419,16 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClock, (void **)&presenter->clock, &count); - count = 1; - if (SUCCEEDED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) - { - /* FIXME: presumably should validate mixer's device id. */ - } - else - WARN("Failed to get mixer interface, hr %#x.\n", hr); + hr = video_presenter_attach_mixer(presenter, service_lookup); - count = 1; - if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, - &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + if (SUCCEEDED(hr)) { - WARN("Failed to get renderer event sink, hr %#x.\n", hr); + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + { + WARN("Failed to get renderer event sink, hr %#x.\n", hr); + } } if (SUCCEEDED(hr))

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 6061c593229534876deb2155e2274f65d394b905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6061c593229534876deb2155… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 5 17:23:23 2020 +0800 dxgi/tests: Run test_get_containing_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 | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a34f574236..2a68947c68 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2123,7 +2123,7 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp return NULL; } -static void test_get_containing_output(void) +static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) { unsigned int adapter_idx, output_idx, output_count; DXGI_OUTPUT_DESC output_desc, output_desc2; @@ -2134,7 +2134,6 @@ static void test_get_containing_output(void) IDXGIFactory *factory; IDXGIAdapter *adapter; POINT points[4 * 16]; - IDXGIDevice *device; unsigned int i, j; HMONITOR monitor; HMONITOR primary; @@ -2143,17 +2142,21 @@ static void test_get_containing_output(void) HRESULT hr; BOOL ret; - if (!(device = create_device(0))) + adapter = get_adapter(device, is_d3d12); + if (!adapter) { - skip("Failed to create device.\n"); + skip("Failed to get adapter on Direct3D %d.\n", is_d3d12 ? 12 : 10); return; } - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + output_count = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_count, &output)) != DXGI_ERROR_NOT_FOUND) + { + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); + IDXGIOutput_Release(output); + ++output_count; + } + IDXGIAdapter_Release(adapter); swapchain_desc.BufferDesc.Width = 100; swapchain_desc.BufferDesc.Height = 100; @@ -2165,23 +2168,15 @@ static void test_get_containing_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.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - output_count = 0; - while (IDXGIAdapter_EnumOutputs(adapter, output_count, &output) != DXGI_ERROR_NOT_FOUND) - { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); - IDXGIOutput_Release(output); - ++output_count; - } - IDXGIAdapter_Release(adapter); - - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, 0); @@ -2436,7 +2431,7 @@ static void test_get_containing_output(void) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - ok(!fullscreen, "Expect swapchain not full screen.\n"); + todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2490,10 +2485,8 @@ static void test_get_containing_output(void) done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - 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); DestroyWindow(swapchain_desc.OutputWindow); } @@ -7011,7 +7004,6 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); - test_get_containing_output(); test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); @@ -7025,6 +7017,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_formats); run_on_d3d10(test_output_ownership); run_on_d3d10(test_cursor_clipping); + run_on_d3d10(test_get_containing_output); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7051,6 +7044,7 @@ START_TEST(dxgi) run_on_d3d12(test_cursor_clipping); run_on_d3d12(test_frame_latency_event); run_on_d3d12(test_colour_space_support); + run_on_d3d12(test_get_containing_output); FreeLibrary(d3d12_module); }

1 0

Martin Storsjo : ntdll: Unwind to the LR register if no unwind info is available.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: df794f342500f1b4bfd988f292302afa890354c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df794f342500f1b4bfd988f2… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:39 2020 +0300 ntdll: Unwind to the LR register if no unwind info is available. Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe..c9f44e92d3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp;

1 0

Rémi Bernon : include: Split objidl.idl to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 6e09636f68c30d0452db3268e366a4c26301f826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e09636f68c30d0452db3268… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:13 2020 +0200 include: Split objidl.idl to objidlbase.idl. Windows SDKs use #include here to import one into the other, so we do the same. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/objidl.idl | 1217 ++---------------------------------------------- include/objidlbase.idl | 1198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1227 insertions(+), 1189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e09636f68c30d0452db…

1 0

Daniel Lehman : tzres: Add North Korea Time Zone.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: a486680a2b008d18da1a321b3ed2a921312bce69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a486680a2b008d18da1a321b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 4 16:22:37 2020 -0700 tzres: Add North Korea Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 14 +++++ po/ar.po | 142 ++++++++++++++++++++++++++++----------------------- po/ast.po | 142 ++++++++++++++++++++++++++++----------------------- po/bg.po | 138 ++++++++++++++++++++++++++----------------------- po/ca.po | 142 ++++++++++++++++++++++++++++----------------------- po/cs.po | 142 ++++++++++++++++++++++++++++----------------------- po/da.po | 142 ++++++++++++++++++++++++++++----------------------- po/de.po | 142 ++++++++++++++++++++++++++++----------------------- po/el.po | 138 ++++++++++++++++++++++++++----------------------- po/en.po | 138 ++++++++++++++++++++++++++----------------------- po/en_US.po | 138 ++++++++++++++++++++++++++----------------------- po/eo.po | 142 ++++++++++++++++++++++++++++----------------------- po/es.po | 142 ++++++++++++++++++++++++++++----------------------- po/fa.po | 140 +++++++++++++++++++++++++++----------------------- po/fi.po | 142 ++++++++++++++++++++++++++++----------------------- po/fr.po | 142 ++++++++++++++++++++++++++++----------------------- po/he.po | 142 ++++++++++++++++++++++++++++----------------------- po/hi.po | 138 ++++++++++++++++++++++++++----------------------- po/hr.po | 142 ++++++++++++++++++++++++++++----------------------- po/hu.po | 142 ++++++++++++++++++++++++++++----------------------- po/it.po | 142 ++++++++++++++++++++++++++++----------------------- po/ja.po | 142 ++++++++++++++++++++++++++++----------------------- po/ko.po | 142 ++++++++++++++++++++++++++++----------------------- po/lt.po | 142 ++++++++++++++++++++++++++++----------------------- po/ml.po | 138 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 142 ++++++++++++++++++++++++++++----------------------- po/nl.po | 142 ++++++++++++++++++++++++++++----------------------- po/or.po | 138 ++++++++++++++++++++++++++----------------------- po/pa.po | 138 ++++++++++++++++++++++++++----------------------- po/pl.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 142 ++++++++++++++++++++++++++++----------------------- po/rm.po | 138 ++++++++++++++++++++++++++----------------------- po/ro.po | 142 ++++++++++++++++++++++++++++----------------------- po/ru.po | 138 ++++++++++++++++++++++++++----------------------- po/si.po | 142 ++++++++++++++++++++++++++++----------------------- po/sk.po | 142 ++++++++++++++++++++++++++++----------------------- po/sl.po | 142 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 141 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 141 +++++++++++++++++++++++++++----------------------- po/sv.po | 142 ++++++++++++++++++++++++++++----------------------- po/ta.po | 138 ++++++++++++++++++++++++++----------------------- po/te.po | 138 ++++++++++++++++++++++++++----------------------- po/th.po | 140 +++++++++++++++++++++++++++----------------------- po/tr.po | 142 ++++++++++++++++++++++++++++----------------------- po/uk.po | 138 ++++++++++++++++++++++++++----------------------- po/wa.po | 140 +++++++++++++++++++++++++++----------------------- po/wine.pot | 138 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 142 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 142 ++++++++++++++++++++++++++++----------------------- 51 files changed, 3725 insertions(+), 3185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a486680a2b008d18da1a…

1 0

Matteo Bruni : winex11: Add DriverDate registry property to display adapters.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: bd27af974a21085cd0dc78b37b715bbcc3cfab69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd27af974a21085cd0dc78b3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 1 11:01:11 2020 +0200 winex11: Add DriverDate registry property to display adapters. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 47e4733dba..cf55a5c1fb 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -107,6 +108,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -403,14 +405,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR bufferW[1024]; + FILETIME filetime; HKEY hkey = NULL; GUID guid; LUID luid; INT written; DWORD size; BOOL ret = FALSE; - FILETIME filetime; TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); @@ -468,6 +471,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Rémi Bernon : include: Add IAgileObject to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: cdf013b9b984e4d161b7a3ae27adde366969eee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf013b9b984e4d161b7a3ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:14 2020 +0200 include: Add IAgileObject to objidlbase.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidlbase.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 7f649dd005..6449be8417 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -83,6 +83,15 @@ interface IMarshal : IUnknown [in] DWORD dwReserved); } +[ + local, + object, + uuid(94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90) +] +interface IAgileObject : IUnknown +{ +} + [ local, object,

1 0

Martin Storsjo : ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: dcf3874e005f864a87205bb7da7ac4bda24a81b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf3874e005f864a87205bb7… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:40 2020 +0300 ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64. When a signal is raised in a leaf function (that hasn't backed up the Lr register itself), we need to restore both Pc and Lr separately. This doesn't seem to be possible via libunwind, so add a special case unwinding rule for this function. As we have a special case for the function, we could also just as well skip normal dwarf unwinding for this function altogether and just restore the full context from the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 62 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index e08d6a2ee1..3beef729dc 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -157,6 +157,7 @@ static inline struct arm64_thread_data *arm64_thread_data(void) return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); /*********************************************************************** * unwind_builtin_dll @@ -276,6 +277,17 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + if (info.start_ip == (unw_word_t)raise_func_trampoline) { + /* raise_func_trampoline has a full CONTEXT stored on the stack; + * restore the original Lr value from there. The function we unwind + * to might be a leaf function that hasn't backed up its own original + * Lr value on the stack. + * We could also just restore the full context here without doing + * unw_step at all. */ + const CONTEXT *next_ctx = (const CONTEXT *) dispatch->EstablisherFrame; + context->u.s.Lr = next_ctx->u.s.Lr; + } + TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); @@ -573,20 +585,49 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher, void *sp ); +/* Note, unwind_builtin_dll above has hardcoded assumptions on how this + * function stores things on the stack; if modified, modify that one in + * sync as well. */ __ASM_GLOBAL_FUNC( raise_func_trampoline, - __ASM_CFI(".cfi_signal_frame\n\t") - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + "stp x0, x1, [sp, #0x10]\n\t" + "str x2, [sp, #0x20]\n\t" "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x3, [sp, 0x10]\n\t" __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x03,0x8d,0x10,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x02,0x8d,0x00\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x02,0x8d,0x08\n\t") /* x30 */ + + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + "mov x0, sp\n\t" + "mov x2, #0x390\n\t" + "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0x88,0x02\n\t") /* x30 = pc */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + "ldp x0, x1, [x29, #0x10]\n\t" + "ldr x2, [x29, #0x20]\n\t" "blr x2\n\t" __ASM_CFI(".cfi_restore_state\n\t") "brk #1") @@ -625,7 +666,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) stack->rec = *rec; stack->context = context; - REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; LR_sig(sigcontext) = PC_sig(sigcontext); PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0

Michael Stefaniuc : combase/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 4c4ac8a98714264857a2fd63ed543c27cdceb0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4ac8a98714264857a2fd63… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:48 2020 +0200 combase/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/roapi.c | 8 +++----- dlls/combase/tests/string.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index eef00fcc8b..6180ad24d6 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -60,9 +60,6 @@ static BOOL init_functions(void) static void test_ActivationFactories(void) { - static const WCHAR xmldocumentW[] = { 'W','i','n','d','o','w','s','.','D','a','t','a','.','X','m','l','.', - 'D','o','m','.','X','m','l','D','o','c','u','m','e','n','t',0 }; - static const WCHAR nonexistW[] = { 'D','o','e','s','.','N','o','t','.','E','x','i','s','t',0 }; HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; @@ -74,10 +71,11 @@ static void test_ActivationFactories(void) return; } - hr = pWindowsCreateString(xmldocumentW, ARRAY_SIZE(xmldocumentW) - 1, &str); + hr = pWindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", + ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); ok(hr == S_OK, "got %08x\n", hr); - hr = pWindowsCreateString(nonexistW, ARRAY_SIZE(nonexistW) - 1, &str2); + hr = pWindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2); ok(hr == S_OK, "got %08x\n", hr); hr = pRoInitialize(RO_INIT_MULTITHREADED); diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 04d0f3e3a5..a84973ff56 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -101,12 +101,11 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n"); } -static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; -static const WCHAR input_string1[] = { 'a', 'b', 'c', '\0' }; -static const WCHAR input_string2[] = { 'd', 'e', 'f', '\0' }; -static const WCHAR input_empty_string[] = { '\0' }; -static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; -static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; +static const WCHAR input_string[] = L"abcdef\0"; +static const WCHAR input_string1[] = L"abc"; +static const WCHAR input_string2[] = L"def"; +static const WCHAR input_embed_null[] = L"a\0c\0ef"; +static const WCHAR output_substring[] = L"cdef"; static void test_create_delete(void) { @@ -147,7 +146,7 @@ static void test_create_delete(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test an empty string */ - ok(pWindowsCreateString(input_empty_string, 0, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateString(L"", 0, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -155,7 +154,7 @@ static void test_create_delete(void) ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); - ok(pWindowsCreateStringReference(input_empty_string, 0, &header, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateStringReference(L"", 0, &header, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -230,7 +229,7 @@ static void test_string_buffer(void) ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n"); - check_string(str, input_empty_string, 0, FALSE); + check_string(str, L"", 0, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n");

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: e2ac51d89e052f0f8704cdd2d1df91fb5c30455b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ac51d89e052f0f8704cdd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:47 2020 +0200 combase: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/roapi.c | 12 ++++-------- dlls/combase/rpc.c | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 94b79ff3cf..53da979d68 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -39,11 +39,6 @@ static const char *debugstr_hstring(HSTRING hstr) static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) { - static const WCHAR classkeyW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','R','u','n','t','i','m','e','\\', - 'A','c','t','i','v','a','t','a','b','l','e','C','l','a','s','s','I','d',0}; - static const WCHAR dllpathW[] = {'D','l','l','P','a','t','h',0}; HKEY hkey_root, hkey_class; DWORD type, size; HRESULT hr; @@ -52,7 +47,8 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) *out = NULL; /* load class registry key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, classkeyW, 0, KEY_READ, &hkey_root)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\WindowsRuntime\\ActivatableClassId", + 0, KEY_READ, &hkey_root)) return REGDB_E_READREGDB; if (RegOpenKeyExW(hkey_root, classid, 0, KEY_READ, &hkey_class)) { @@ -63,7 +59,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) RegCloseKey(hkey_root); /* load (and expand) DllPath registry value */ - if (RegQueryValueExW(hkey_class, dllpathW, NULL, &type, NULL, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, &type, NULL, &size)) { hr = REGDB_E_READREGDB; goto done; @@ -78,7 +74,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) hr = E_OUTOFMEMORY; goto done; } - if (RegQueryValueExW(hkey_class, dllpathW, NULL, NULL, (BYTE *)buf, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, NULL, (BYTE *)buf, &size)) { hr = REGDB_E_READREGDB; goto done; diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index c4bc8983a2..55450ad7f1 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -77,8 +77,7 @@ struct registered_if static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) { /* FIXME: should get endpoint from rpcss */ - static const WCHAR wszEndpointFormat[] = {'\\','p','i','p','e','\\','O','L','E','_','%','0','8','l','x','%','0','8','l','x',0}; - wsprintfW(endpoint, wszEndpointFormat, (DWORD)(*oxid >> 32),(DWORD)*oxid); + wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid); } typedef struct

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 144d898fbaf716c536c8fec1ad45321485165316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=144d898fbaf716c536c8fec1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:28 2020 +0200 wiaservc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/service.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index c1cdb83e60..524181f72a 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -107,7 +107,6 @@ StartCount(void) VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { - static const WCHAR stisvc_nameW[] = {'s','t','i','s','v','c',0}; TRACE("(%d, %p)\n", dwArgc, lpszArgv); stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -116,7 +115,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) return; } - status_handle = RegisterServiceCtrlHandlerExW(stisvc_nameW, ServiceHandler, NULL); + status_handle = RegisterServiceCtrlHandlerExW(L"stisvc", ServiceHandler, NULL); if (!status_handle) { ERR("failed to register handler: %u\n", GetLastError()); return;

1 0

Michael Stefaniuc : virtdisk/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 153dcacfc8be4d4cc966c4bdd874d82173abacff URL: https://source.winehq.org/git/wine.git/?a=commit;h=153dcacfc8be4d4cc966c4bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:27 2020 +0200 virtdisk/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index 23d070574a..34118e532b 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -55,7 +55,7 @@ static void test_OpenVirtualDisk(void) HANDLE handle; VIRTUAL_STORAGE_TYPE stgtype; OPEN_VIRTUAL_DISK_PARAMETERS param; - static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + static const WCHAR vdisk[] = L"test.vhd"; ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret);

1 0

Michael Stefaniuc : msacm32.drv: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 60eb0d4ba735958d65384ab0515fbf0b3b4d640f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eb0d4ba735958d65384ab0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:20 2020 +0200 msacm32.drv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 75d1a60c71..bb51e2235c 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -493,8 +493,6 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { - static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; - TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ @@ -511,7 +509,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC woc.wMid = 0x00FF; woc.wPid = 0x0001; woc.vDriverVersion = 0x0332; - lstrcpyW(woc.szPname, name); + lstrcpyW(woc.szPname, L"Wine wave out mapper"); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -1063,11 +1061,10 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { WAVEINCAPSW wic; - static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - lstrcpyW(wic.szPname, init); + lstrcpyW(wic.szPname, L"Wine wave in mapper"); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 250e6d9f8c417341e498ba35ad7938ec93d21a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=250e6d9f8c417341e498ba35… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:19 2020 +0200 mlang: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e3582cca2d..62e9947fb7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -392,8 +392,6 @@ static const MIME_CP_INFO vietnamese_cp[] = "windows-1258", "windows-1258", "windows-1258" } }; -static const WCHAR asciiW[] = {'a','s','c','i','i',0}; - static const MIME_CP_INFO western_cp[] = { { "IBM EBCDIC (US-Canada)", @@ -446,7 +444,7 @@ static const MIME_CP_INFO western_cp[] = 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - "us-ascii", "us-ascii", "us-ascii", asciiW }, + "us-ascii", "us-ascii", "us-ascii", L"ascii" }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | @@ -3934,14 +3932,7 @@ static BOOL register_codepages(void) WCHAR buf[32]; LSTATUS status; - static const WCHAR db_key_nameW[] = { - 'M','I','M','E', - '\\','D','a','t','a','b','a','s','e', - '\\','C','o','d','e','p','a','g','e',0}; - static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; - static const WCHAR formatW[] = {'%','u',0}; - - status = RegCreateKeyW(HKEY_CLASSES_ROOT, db_key_nameW, &db_key); + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"MIME\\Database\\Codepage", &db_key); if (status != ERROR_SUCCESS) return FALSE; @@ -3949,7 +3940,7 @@ static BOOL register_codepages(void) { for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) { - swprintf(buf, ARRAY_SIZE(buf), formatW, info->cp); + swprintf(buf, ARRAY_SIZE(buf), L"%u", info->cp); status = RegCreateKeyW(db_key, buf, &key); if (status != ERROR_SUCCESS) continue; @@ -3966,7 +3957,7 @@ static BOOL register_codepages(void) } else { - RegSetValueExW(key, familyW, 0, REG_DWORD, (BYTE*)&family->family_codepage, + RegSetValueExW(key, L"Family", 0, REG_DWORD, (BYTE*)&family->family_codepage, sizeof(family->family_codepage)); }

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 4c9e8c67880471e0cd9f840e6e85c9428b2dc77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9e8c67880471e0cd9f840e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:18 2020 +0200 midimap: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index d15e3d76b9..86e4289d89 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -220,9 +220,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) size = sizeof(out); if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - static const WCHAR cs[] = {'C','u','r','r','e','n','t','S','c','h','e','m','e',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, cs, 0, &type, (void*)buffer, &size)) + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) { if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) ret = MIDIMAP_LoadSettingsDefault(mom, NULL); @@ -234,9 +233,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) } if (ret == 2) { - static const WCHAR ci[] = {'C','u','r','r','e','n','t','I','n','s','t','r','u','m','e','n','t',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, ci, 0, &type, (void*)buffer, &size) && *buffer) + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) { ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } @@ -470,8 +468,7 @@ static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiC { static const MIDIOUTCAPSW mappercaps = { 0x00FF, 0x0001, 0x0100, /* Manufacturer and Product ID */ - {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}, - MOD_MAPPER, 0, 0, 0xFFFF, + L"Wine midi mapper", MOD_MAPPER, 0, 0, 0xFFFF, /* Native returns volume caps of underlying device + MIDICAPS_STREAM */ MIDICAPS_VOLUME|MIDICAPS_LRVOLUME }; @@ -552,7 +549,6 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { - static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; BOOL found_valid_port = FALSE; @@ -574,7 +570,7 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0) + if (wcsncmp(midiOutPorts[dev].name, L"Midi Through", lstrlenW(L"Midi Through")) != 0) found_valid_port = TRUE; } else

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 21dca0a2d07dcdea7e43ebbb63dd80970ddd40aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dca0a2d07dcdea7e43ebbb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:16 2020 +0200 mciseq: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/mcimidi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 8c52730b15..33f9fde42c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1509,7 +1509,6 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp { LPCWSTR str = 0; DWORD ret = 0; - static const WCHAR wszMidiSeq[] = {'W','i','n','e','\'','s',' ','M','I','D','I',' ','s','e','q','u','e','n','c','e','r',0}; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); @@ -1519,7 +1518,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszMidiSeq; break; + case MCI_INFO_PRODUCT: str = L"Wine's MIDI sequencer"; break; case MCI_INFO_FILE: str = wmm->lpstrElementName; break; case MCI_INFO_COPYRIGHT: str = wmm->lpstrCopyright; break; case MCI_INFO_NAME: str = wmm->lpstrName; break; @@ -1529,10 +1528,9 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp } if (!ret) { if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY))

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 1d5e028ef47c2112e86be7620792394401656beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5e028ef47c2112e86be762… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:15 2020 +0200 mcicda: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/mcicda.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index e23ba5a2d6..ea7e2a6261 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -665,15 +665,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); if (dwFlags & MCI_INFO_PRODUCT) { - static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; - str = wszAudioCd; + str = L"Wine's audio CD"; } else if (dwFlags & MCI_INFO_MEDIA_UPC) { ret = MCIERR_NO_IDENTITY; } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { DWORD res = 0; CDROM_TOC toc; DWORD br; - static const WCHAR wszLu[] = {'%','l','u',0}; if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { @@ -681,7 +679,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), L"%lu", res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags);

1 0

Michael Stefaniuc : msdmo/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: dea1fceb71117d449356c45e9fb547a044a8cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea1fceb71117d449356c45e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:21 2020 +0200 msdmo/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/tests/msdmo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index b1b2f544ce..41e6d57d2e 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -41,7 +41,6 @@ static const char *guid_to_string(const GUID *guid) static void test_DMOUnregister(void) { static char buffer[200]; - static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); @@ -51,10 +50,10 @@ static void test_DMOUnregister(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); /* can't register for all categories */ - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); if (hr != S_OK) { win_skip("Failed to register DMO. Probably user doesn't have persmissions to do so.\n"); return;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 796cd56faf3384dab41be23967766d01e45dd7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=796cd56faf3384dab41be239… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:17 2020 +0200 mciwave: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/mciwave.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 78f26c2672..13dd927cd4 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1683,15 +1683,11 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; } else { - static const WCHAR wszAudio [] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','p','l','a','y','e','r',0}; - static const WCHAR wszWaveIn [] = {'W','i','n','e',' ','W','a','v','e',' ','I','n',0}; - static const WCHAR wszWaveOut[] = {'W','i','n','e',' ','W','a','v','e',' ','O','u','t',0}; - switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszAudio; break; + case MCI_INFO_PRODUCT: str = L"Wine's audio player"; break; case MCI_INFO_FILE: str = wmw->lpFileName; break; - case MCI_WAVE_INPUT: str = wszWaveIn; break; - case MCI_WAVE_OUTPUT: str = wszWaveOut; break; + case MCI_WAVE_INPUT: str = L"Wine Wave In"; break; + case MCI_WAVE_OUTPUT: str = L"Wine Wave Out"; break; default: WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; @@ -1699,10 +1695,9 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l } if (!ret) { if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY))

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: eede9959edb5a91ada6651a10ca6ba257e213c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eede9959edb5a91ada6651a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:30 2020 +0200 xolehlp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/xolehlp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 4baf31f260..29b3024445 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -657,11 +657,10 @@ static BOOL is_local_machineA( const CHAR *server ) } static BOOL is_local_machineW( const WCHAR *server ) { - static const WCHAR dotW[] = {'.',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !wcscmp( server, dotW )) return TRUE; + if (!server || !wcscmp( server, L"." )) return TRUE; if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; }

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: f6e7f00010195966c022ca7456fdd4e3952cac82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6e7f00010195966c022ca74… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:29 2020 +0200 xinput1_3: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index bb719ed56c..8aea638a8d 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -243,12 +243,11 @@ void HID_find_gamepads(xinput_controller *devices) while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, &interface_data)) { - static const WCHAR ig[] = {'I','G','_',0}; if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) continue; - if (!wcsstr(data->DevicePath, ig)) + if (!wcsstr(data->DevicePath, L"IG_")) continue; open_device_idx = -1;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: b72440fa2e1016681cbfcebcdc4792b6ced3eb53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72440fa2e1016681cbfcebc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:24 2020 +0200 propsys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys_main.c | 12 +++--------- dlls/propsys/propvar.c | 21 ++++++--------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 75963d7b6c..91ebc62127 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -280,12 +280,6 @@ HRESULT WINAPI PSRefreshPropertySchema(void) HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) { - static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - static const WCHAR pid_fmtW[] = {'%','u',0}; - WCHAR pidW[PKEY_PIDSTR_MAX + 1]; LPWSTR p = psz; int len; @@ -305,8 +299,8 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; } - swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, - pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], + swprintf(psz, cch, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", pkey->fmtid.Data1, + pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -315,7 +309,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1; - len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), L"%u", pkey->pid); if (cch >= len + 1) { diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index dcfee2b0cc..ae08cd1d8d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -245,10 +245,6 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) { - static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR falseW[] = {'f','a','l','s','e',0}; - static const WCHAR true2W[] = {'#','T','R','U','E','#',0}; - static const WCHAR false2W[] = {'#','F','A','L','S','E','#',0}; LONGLONG res; HRESULT hr; @@ -267,13 +263,13 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) if (!propvarIn->u.pwszVal) return DISP_E_TYPEMISMATCH; - if (!lstrcmpiW(propvarIn->u.pwszVal, trueW) || !lstrcmpW(propvarIn->u.pwszVal, true2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"true") || !lstrcmpW(propvarIn->u.pwszVal, L"#TRUE#")) { *ret = TRUE; return S_OK; } - if (!lstrcmpiW(propvarIn->u.pwszVal, falseW) || !lstrcmpW(propvarIn->u.pwszVal, false2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"false") || !lstrcmpW(propvarIn->u.pwszVal, L"#FALSE#")) { *ret = FALSE; return S_OK; @@ -406,11 +402,10 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) { - static const WCHAR str_empty[] = {0}; if (propvarIn->vt == VT_BSTR) { if (propvarIn->u.bstrVal == NULL) - return str_empty; + return L""; return propvarIn->u.bstrVal; } @@ -580,13 +575,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) { - static const WCHAR format[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X', - '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - - swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, + guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar)

1 0

Michael Stefaniuc : netcfgx/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: bbb00dce7ee0f14a6e6a157c880b0228eddc17cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb00dce7ee0f14a6e6a157c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:23 2020 +0200 netcfgx/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/tests/netcfgx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index fda39f5773..31558f44f4 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -25,8 +25,6 @@ static void create_configuration(void) { - static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; - static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; HRESULT hr; INetCfg *config = NULL; INetCfgLock *netlock = NULL; @@ -40,7 +38,7 @@ static void create_configuration(void) hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); if(hr == S_OK) @@ -55,10 +53,10 @@ static void create_configuration(void) ok(hr == S_OK, "got 0x%08x\n", hr); /* AcquireWriteLock needs to be run before Initialize */ - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - hr = INetCfg_FindComponent(config, tcpipW, &component); + hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) {

1 0

Michael Stefaniuc : msg711.acm: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 2c209ccb0bbe7109a0c5d47cf0653ee0ac9bf78f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c209ccb0bbe7109a0c5d47c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:22 2020 +0200 msg711.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 6909494e29..7478bfd92a 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -675,10 +675,6 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szALaw[]={'A','-','L','a','w',0}; - static const WCHAR szULaw[]={'U','-','L','a','w',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -712,19 +708,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); - lstrcpyW(aftd->szFormatTag, szALaw); + lstrcpyW(aftd->szFormatTag, L"A-Law"); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); - lstrcpyW(aftd->szFormatTag, szULaw); + lstrcpyW(aftd->szFormatTag, L"U-Law"); break; } return MMSYSERR_NOERROR;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 69e612c51253ef27796fe4f16263f432dd7ae2a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e612c51253ef27796fe4f1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:14 2020 +0200 mciavi32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/info.c | 9 +++------ dlls/mciavi32/mciavi.c | 3 +-- dlls/mciavi32/wnd.c | 13 ++++--------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index d516c4d4b0..d603912954 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -190,8 +190,6 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) LPCWSTR str = 0; WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = 0; - static const WCHAR wszAviPlayer[] = {'W','i','n','e','\'','s',' ','A','V','I',' ','p','l','a','y','e','r',0}; - static const WCHAR wszVersion[] = {'1','.','1',0}; if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -203,9 +201,9 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) EnterCriticalSection(&wma->cs); if (dwFlags & MCI_INFO_PRODUCT) - str = wszAviPlayer; + str = L"Wine's AVI player"; else if (dwFlags & MCI_INFO_VERSION) - str = wszVersion; + str = L"1.1"; else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { @@ -213,9 +211,8 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) ret = MCIERR_UNRECOGNIZED_COMMAND; } if (!ret) { - WCHAR zero = 0; /* Only mciwave, mciseq and mcicda set dwRetSize (since NT). */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } LeaveCriticalSection(&wma->cs); return ret; diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index d8df240826..7a1657f79e 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -71,7 +71,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIAVI* wma; - static const WCHAR mciAviWStr[] = {'M','C','I','A','V','I',0}; TRACE("%s, %p\n", debugstr_w(str), modp); @@ -88,7 +87,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; - wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); + wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, L"MCIAVI", 0); wma->dwStatus = MCI_MODE_NOT_READY; modp->wCustomCommandTable = wma->wCommandTable; modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index c9da9ec5c4..d48dbb1357 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); -static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0}; - static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); @@ -87,7 +85,7 @@ static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA BOOL MCIAVI_UnregisterClass(void) { - return UnregisterClassW(mciaviW, MCIAVI_hInstance); + return UnregisterClassW(L"MCIAVI", MCIAVI_hInstance); } BOOL MCIAVI_RegisterClass(void) @@ -101,7 +99,7 @@ BOOL MCIAVI_RegisterClass(void) wndClass.hInstance = MCIAVI_hInstance; wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - wndClass.lpszClassName = mciaviW; + wndClass.lpszClassName = L"MCIAVI"; if (RegisterClassW(&wndClass)) return TRUE; if (GetLastError() == ERROR_CLASS_ALREADY_EXISTS) return TRUE; @@ -111,7 +109,6 @@ BOOL MCIAVI_RegisterClass(void) BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { - static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; DWORD dwStyle = WS_OVERLAPPEDWINDOW; RECT rc; @@ -135,10 +132,8 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM rc.left = rc.top = CW_USEDEFAULT; } - wma->hWnd = CreateWindowW(mciaviW, captionW, - dwStyle, rc.left, rc.top, - rc.right, rc.bottom, - hParent, 0, MCIAVI_hInstance, + wma->hWnd = CreateWindowW(L"MCIAVI", L"Wine MCI-AVI player", dwStyle, rc.left, rc.top, + rc.right, rc.bottom, hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 1d17d8d4712c34ed186db6205f3316374b9c274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d17d8d4712c34ed186db620… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:11 2020 +0200 explorerframe: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 12 ++++-------- dlls/explorerframe/tests/nstc.c | 17 +++++------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 37e1a553a4..0abaded85a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -75,8 +75,6 @@ static const DWORD unsupported_styles2 = NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING | NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED; -static const WCHAR thispropW[] = {'P','R','O','P','_','T','H','I','S',0}; - static inline NSTC2Impl *impl_from_INameSpaceTreeControl2(INameSpaceTreeControl2 *iface) { return CONTAINING_RECORD(iface, NSTC2Impl, INameSpaceTreeControl2_iface); @@ -510,7 +508,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc) - SetPropW(This->hwnd_tv, thispropW, This); + SetPropW(This->hwnd_tv, L"PROP_THIS", This); return TRUE; } @@ -534,7 +532,7 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) if(This->tv_oldwndproc) { SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc); - RemovePropW(This->hwnd_tv, thispropW); + RemovePropW(This->hwnd_tv, L"PROP_THIS"); } INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface); @@ -762,7 +760,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, thispropW); + NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, L"PROP_THIS"); switch(uMessage) { case WM_KEYDOWN: @@ -879,9 +877,7 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, DWORD window_style, window_ex_style; INITCOMMONCONTROLSEX icex; RECT rc; - static const WCHAR NSTC2_CLASS_NAME[] = - {'N','a','m','e','s','p','a','c','e','T','r','e','e', - 'C','o','n','t','r','o','l',0}; + static const WCHAR NSTC2_CLASS_NAME[] = L"NamespaceTreeControl"; TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index a48e3affef..6433b69ebf 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -781,13 +781,6 @@ static void test_basics(void) int cbstate; WCHAR curdirW[MAX_PATH]; WCHAR buf[MAX_PATH]; - static const WCHAR testdirW[] = {'t','e','s','t','d','i','r',0}; - static const WCHAR testdir2W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; - static const WCHAR test1W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; - static const WCHAR randomW[] = {'_','_','h','e','l','l','o',0}; /* These should exist on platforms supporting the NSTC */ ok(pSHCreateShellItem != NULL, "No SHCreateShellItem.\n"); @@ -827,19 +820,19 @@ static void test_basics(void) lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdirW); + lstrcatW(buf, L"testdir"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdir2W); + lstrcatW(buf, L"testdir\\testdir2"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir2); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, test1W); + lstrcatW(buf, L"testdir\\test1.txt"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitest1); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; @@ -1725,9 +1718,9 @@ static void test_basics(void) { hr = INameSpaceTreeControl_SetTheme(pnstc, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, explorerW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"Explorer"); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, randomW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"__hello"); ok(hr == S_OK, "Got 0x%08x\n", hr); }

1 0

Henri Verbeet : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 32e07a38095771463c372feac3183947ce69acb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e07a38095771463c372fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Oct 3 15:07:57 2020 +0330 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit ec6fe1cc9dd31ed17d5c9818632ce9ab83d6c441. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 390 ++++++++++++++++++++++++++++++++++++++++++++- include/d3d12sdklayers.idl | 13 ++ 2 files changed, 399 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32e07a38095771463c37…

1 0