December 2020 - Wine-Devel - list.winehq.org

[PATCH vkd3d] vkd3d: Fix misplaced parenthesis.
by Andrey Gusev Dec. 9, 2020

Dec. 9, 2020

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bef6477..a63fc92 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -417,7 +417,7 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) callback_info.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; callback_info.pfnCallback = vkd3d_debug_report_callback; callback_info.pUserData = NULL; - if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback)) < 0)) + if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback))) < 0) { WARN("Failed to create debug report callback, vr %d.\n", vr); return; -- 2.28.0

2 1

[PATCH 2/2] wined3d: Use an sRGB fallback format for sRGB formats in wined3d_swapchain_vk_select_vk_format().
by Henri Verbeet Dec. 9, 2020

Dec. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50121 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ffffc18aa84..0c5a75ed02d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -635,6 +635,22 @@ done: return supported; } +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: + return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_R16G16B16A16_SFLOAT: + return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static VkFormat wined3d_swapchain_vk_select_vk_format(struct wined3d_swapchain_vk *swapchain_vk, VkSurfaceKHR vk_surface) { @@ -684,7 +700,7 @@ static VkFormat wined3d_swapchain_vk_select_vk_format(struct wined3d_swapchain_v if (i == format_count) { /* Try to create a swapchain with format conversion. */ - vk_format = VK_FORMAT_B8G8R8A8_UNORM; + vk_format = get_swapchain_fallback_format(vk_format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_d3dformat(desc->backbuffer_format)); for (i = 0; i < format_count; ++i) { -- 2.20.1

1 0

[PATCH 1/2] wined3d: Ensure the last mip-level is at least large enough to hold a single compressed block.
by Henri Verbeet Dec. 9, 2020

Dec. 9, 2020

This fixes a regression exposed by commit ca0c3f770ae4fe4d535f59f2d54b4c0a531e800f, but probably originally introduced by commit 3f7e5d647e40ce09292e7164eb5cc49ac77914cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48362 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6c9627d21f8..69f948c5fd2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3683,6 +3683,20 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (!offset) return WINED3DERR_INVALIDCALL; + /* Ensure the last mip-level is at least large enough to hold a single + * compressed block. It is questionable how useful these mip-levels are to + * the application with "broken pitch" formats, but we want to avoid + * memory corruption when loading textures into WINED3D_LOCATION_SYSMEM. */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_BROKEN_PITCH) + { + unsigned int min_size; + + min_size = texture->sub_resources[level_count * layer_count - 1].offset + format->block_byte_count; + min_size = (min_size + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1); + if (min_size > offset) + offset = min_size; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->bind_flags, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) -- 2.20.1

1 0

[PATCH] winegstreamer: Remove the color matrix setting for the other videoconvert as well.
by Zebediah Figura Dec. 9, 2020

Dec. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49535 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 77204bc55a2..9114e6610a3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1041,9 +1041,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - /* Avoid expensive color matrix conversions. */ - gst_util_set_object_arg(G_OBJECT(vconv2), "matrix-mode", "none"); - /* The bin takes ownership of these elements. */ gst_bin_add(GST_BIN(This->container), deinterlace); gst_element_sync_state_with_parent(deinterlace); -- 2.29.2

1 0

[PATCH] iphlpapi/tests: Skip Get[Icmp|Ip|Udp]StatisticsEx AF_INET6 tests on platforms where support is missing.
by Gijs Vermeulen Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 105 +++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..203aefb9f69 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -579,16 +579,21 @@ static void testGetIcmpStatisticsEx(void) } apiReturn = GetIcmpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetIcmpStatisticsEx(AF_INET6) not supported\n"); + else { - INT i; - trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); - trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); - trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); - for (i = 0; i < 256; i++) - trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + INT i; + trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); + trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); + trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); + for (i = 0; i < 256; i++) + trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + } } } @@ -636,34 +641,39 @@ static void testGetIpStatisticsEx(void) } apiReturn = GetIpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetIpStatisticsEx(AF_INET6) not supported\n"); + else { - trace( "IP IPv6 Ex stats:\n" ); - trace( " dwForwarding: %u\n", U(stats).dwForwarding ); - trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); - trace( " dwInReceives: %u\n", stats.dwInReceives ); - trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); - trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); - trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); - trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); - trace( " dwInDiscards: %u\n", stats.dwInDiscards ); - trace( " dwInDelivers: %u\n", stats.dwInDelivers ); - trace( " dwOutRequests: %u\n", stats.dwOutRequests ); - trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); - trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); - trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); - trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); - trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); - trace( " dwReasmOks: %u\n", stats.dwReasmOks ); - trace( " dwReasmFails: %u\n", stats.dwReasmFails ); - trace( " dwFragOks: %u\n", stats.dwFragOks ); - trace( " dwFragFails: %u\n", stats.dwFragFails ); - trace( " dwFragCreates: %u\n", stats.dwFragCreates ); - trace( " dwNumIf: %u\n", stats.dwNumIf ); - trace( " dwNumAddr: %u\n", stats.dwNumAddr ); - trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "IP IPv6 Ex stats:\n" ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); + trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); + trace( " dwInReceives: %u\n", stats.dwInReceives ); + trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); + trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); + trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); + trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); + trace( " dwInDiscards: %u\n", stats.dwInDiscards ); + trace( " dwInDelivers: %u\n", stats.dwInDelivers ); + trace( " dwOutRequests: %u\n", stats.dwOutRequests ); + trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); + trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); + trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); + trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); + trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); + trace( " dwReasmOks: %u\n", stats.dwReasmOks ); + trace( " dwReasmFails: %u\n", stats.dwReasmFails ); + trace( " dwFragOks: %u\n", stats.dwFragOks ); + trace( " dwFragFails: %u\n", stats.dwFragFails ); + trace( " dwFragCreates: %u\n", stats.dwFragCreates ); + trace( " dwNumIf: %u\n", stats.dwNumIf ); + trace( " dwNumAddr: %u\n", stats.dwNumAddr ); + trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + } } } @@ -752,16 +762,21 @@ static void testGetUdpStatisticsEx(void) } apiReturn = GetUdpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetUdpStatisticsEx(AF_INET6) not supported\n"); + else { - trace( "UDP IPv6 Ex stats:\n" ); - trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); - trace( " dwNoPorts: %u\n", stats.dwNoPorts ); - trace( " dwInErrors: %u\n", stats.dwInErrors ); - trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); - trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "UDP IPv6 Ex stats:\n" ); + trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); + trace( " dwNoPorts: %u\n", stats.dwNoPorts ); + trace( " dwInErrors: %u\n", stats.dwInErrors ); + trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); + trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + } } } -- 2.29.2

1 0

[PATCH] version/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 8, 2020

Dec. 8, 2020

Constify some variables in that process. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/tests/info.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 44e7511d8b1..f35af902f9b 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -292,19 +292,13 @@ static void test_32bit_win(void) UINT uiLengthA, uiLengthW; char mypathA[MAX_PATH]; WCHAR mypathW[MAX_PATH]; - char rootA[] = "\\"; - WCHAR rootW[] = { '\\', 0 }; - WCHAR emptyW[] = { 0 }; - char varfileinfoA[] = "\\VarFileInfo\\Translation"; - WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; - char WineVarFileInfoA[] = { 0x09, 0x04, 0xE4, 0x04 }; - char FileDescriptionA[] = "\\StringFileInfo\\040904E4\\FileDescription"; - WCHAR FileDescriptionW[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','0','4','0','9','0','4','E','4', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n', 0 }; - char WineFileDescriptionA[] = "FileDescription"; - WCHAR WineFileDescriptionW[] = { 'F','i','l','e','D','e','s','c','r','i','p','t','i','o','n', 0 }; + const char varfileinfoA[] = "\\VarFileInfo\\Translation"; + const WCHAR varfileinfoW[] = L"\\VarFileInfo\\Translation"; + const char WineVarFileInfoA[] = { 0x09, 0x04, 0xE4, 0x04 }; + const char FileDescriptionA[] = "\\StringFileInfo\\040904E4\\FileDescription"; + const WCHAR FileDescriptionW[] = L"\\StringFileInfo\\040904E4\\FileDescription"; + const char WineFileDescriptionA[] = "FileDescription"; + const WCHAR WineFileDescriptionW[] = L"FileDescription"; BOOL is_unicode_enabled = TRUE; /* A copy from dlls/version/info.c */ @@ -397,7 +391,7 @@ static void test_32bit_win(void) /* Get the VS_FIXEDFILEINFO information, this must be the same for both A- and W-Calls */ - retA = VerQueryValueA( pVersionInfoA, rootA, (LPVOID *)&pBufA, &uiLengthA ); + retA = VerQueryValueA( pVersionInfoA, "\\", (void **)&pBufA, &uiLengthA ); ok (retA, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); @@ -409,10 +403,10 @@ static void test_32bit_win(void) ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); } - retW = VerQueryValueW( pVersionInfoW, emptyW, (LPVOID *)&pBufW, &uiLengthW ); + retW = VerQueryValueW( pVersionInfoW, L"", (void **)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); - retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); + retW = VerQueryValueW( pVersionInfoW, L"\\", (void **)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthW == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthW ); @@ -639,7 +633,6 @@ static void test_GetFileVersionInfoEx(void) const LANGID lang = GetUserDefaultUILanguage(); const LANGID english = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); const WORD unicode = 1200; /* = UNICODE */ - const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; const DWORD test_flags[] = { 0, FILE_VER_GET_LOCALISED, FILE_VER_GET_NEUTRAL, FILE_VER_GET_LOCALISED | FILE_VER_GET_NEUTRAL, @@ -658,13 +651,13 @@ static void test_GetFileVersionInfoEx(void) return; } - size = GetFileVersionInfoSizeW(kernel32W, NULL); + size = GetFileVersionInfoSizeW(L"kernel32.dll", NULL); ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError()); ver = HeapAlloc(GetProcessHeap(), 0, size); assert(ver); - ret = GetFileVersionInfoW(kernel32W, 0, size, ver); + ret = GetFileVersionInfoW(L"kernel32.dll", 0, size, ver); ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); @@ -694,13 +687,13 @@ static void test_GetFileVersionInfoEx(void) for (i = 0; i < ARRAY_SIZE(test_flags); i++) { - size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); + size = pGetFileVersionInfoSizeExW(test_flags[i], L"kernel32.dll", NULL); ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); ver = HeapAlloc(GetProcessHeap(), 0, size); assert(ver); - ret = pGetFileVersionInfoExW(test_flags[i], kernel32W, 0, size, ver); + ret = pGetFileVersionInfoExW(test_flags[i], L"kernel32.dll", 0, size, ver); ok(ret, "[%u] GetFileVersionInfoEx error %u\n", i, GetLastError()); ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); -- 2.26.2

1 0

[PATCH] shcore/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shcore/tests/shcore.c | 46 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 2a8ebcc4686..a75bfd899eb 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -166,8 +166,6 @@ static void test_process_reference(void) static void test_SHUnicodeToAnsi(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; - static const WCHAR emptyW[] = { 0 }; char buff[16]; int ret; @@ -186,32 +184,31 @@ static void test_SHUnicodeToAnsi(void) buff[0] = 1; strcpy(buff, "test"); - ret = pSHUnicodeToAnsi(emptyW, buff, 1); + ret = pSHUnicodeToAnsi(L"", buff, 1); ok(ret == 1, "Unexpected return value %d.\n", ret); ok(*buff == 0, "Unexpected buffer contents.\n"); buff[0] = 1; - ret = pSHUnicodeToAnsi(testW, buff, 0); + ret = pSHUnicodeToAnsi(L"test", buff, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ok(buff[0] == 1, "Unexpected buffer contents.\n"); buff[0] = 1; - ret = pSHUnicodeToAnsi(testW, buff, 1); + ret = pSHUnicodeToAnsi(L"test", buff, 1); ok(ret == 1, "Unexpected return value %d.\n", ret); ok(*buff == 0, "Unexpected buffer contents.\n"); - ret = pSHUnicodeToAnsi(testW, buff, 16); + ret = pSHUnicodeToAnsi(L"test", buff, 16); ok(ret == 5, "Unexpected return value %d.\n", ret); ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); - ret = pSHUnicodeToAnsi(testW, buff, 2); + ret = pSHUnicodeToAnsi(L"test", buff, 2); ok(ret == 2, "Unexpected return value %d.\n", ret); ok(!strcmp(buff, "t"), "Unexpected buffer contents.\n"); } static void test_SHAnsiToUnicode(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; WCHAR buffW[16]; int ret; @@ -246,7 +243,7 @@ static void test_SHAnsiToUnicode(void) ret = pSHAnsiToUnicode("test", buffW, 16); ok(ret == 5, "Unexpected return value %d.\n", ret); - ok(!lstrcmpW(buffW, testW), "Unexpected buffer contents.\n"); + ok(!lstrcmpW(buffW, L"test"), "Unexpected buffer contents.\n"); ret = pSHAnsiToUnicode("test", buffW, 2); ok(ret == 2, "Unexpected return value %d.\n", ret); @@ -294,43 +291,40 @@ static void test_SHAnsiToAnsi(void) static void test_SHUnicodeToUnicode(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; - static const WCHAR strW[] = {'a','b','c','d','e','f','g','h','i','k','l','m',0}; - static const WCHAR emptyW[] = { 0 }; WCHAR buff[16]; int ret; ret = pSHUnicodeToUnicode(NULL, NULL, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); - lstrcpyW(buff, strW); - ret = pSHUnicodeToUnicode(testW, buff, 3); + lstrcpyW(buff, L"abcdefghiklm"); + ret = pSHUnicodeToUnicode(L"test", buff, 3); ok(ret == 0, "Unexpected return value %d.\n", ret); - ok(!memcmp(buff, testW, 2 * sizeof(WCHAR)) && !buff[2], "Unexpected buffer contents.\n"); + ok(!memcmp(buff, L"test", 2 * sizeof(WCHAR)) && !buff[2], "Unexpected buffer contents.\n"); ok(buff[3] == 'd', "Unexpected buffer contents.\n"); - lstrcpyW(buff, strW); - ret = pSHUnicodeToUnicode(emptyW, buff, 3); + lstrcpyW(buff, L"abcdefghiklm"); + ret = pSHUnicodeToUnicode(L"", buff, 3); ok(ret == 1, "Unexpected return value %d.\n", ret); ok(!*buff, "Unexpected buffer contents.\n"); ok(buff[3] == 'd', "Unexpected buffer contents.\n"); - lstrcpyW(buff, strW); - ret = pSHUnicodeToUnicode(testW, buff, 4); + lstrcpyW(buff, L"abcdefghiklm"); + ret = pSHUnicodeToUnicode(L"test", buff, 4); ok(ret == 0, "Unexpected return value %d.\n", ret); - ok(!memcmp(buff, testW, 3 * sizeof(WCHAR)) && !buff[3], "Unexpected buffer contents.\n"); + ok(!memcmp(buff, L"test", 3 * sizeof(WCHAR)) && !buff[3], "Unexpected buffer contents.\n"); ok(buff[4] == 'e', "Unexpected buffer contents.\n"); - lstrcpyW(buff, strW); - ret = pSHUnicodeToUnicode(testW, buff, 5); + lstrcpyW(buff, L"abcdefghiklm"); + ret = pSHUnicodeToUnicode(L"test", buff, 5); ok(ret == 5, "Unexpected return value %d.\n", ret); - ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(!lstrcmpW(buff, L"test"), "Unexpected buffer contents.\n"); ok(buff[5] == 'f', "Unexpected buffer contents.\n"); - lstrcpyW(buff, strW); - ret = pSHUnicodeToUnicode(testW, buff, 6); + lstrcpyW(buff, L"abcdefghiklm"); + ret = pSHUnicodeToUnicode(L"test", buff, 6); ok(ret == 5, "Unexpected return value %d.\n", ret); - ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(!lstrcmpW(buff, L"test"), "Unexpected buffer contents.\n"); ok(buff[5] == 'f', "Unexpected buffer contents.\n"); } -- 2.26.2

1 0

[PATCH] dnsapi/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/tests/record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 8d7b4974e83..c2f61b40843 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -28,8 +28,8 @@ #include "wine/test.h" -static WCHAR name1[] = {'l','o','c','a','l','h','o','s','t',0}; -static WCHAR name2[] = {'L','O','C','A','L','H','O','S','T',0}; +static WCHAR name1[] = L"localhost"; +static WCHAR name2[] = L"LOCALHOST"; static DNS_RECORDW r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; static DNS_RECORDW r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; -- 2.26.2

1 0

[PATCH] cryptui/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cryptui/tests/cryptui.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index bb1db929ba5..ea43f01962b 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -398,9 +398,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR CA[] = { 'C','A',0 }; HCERTSTORE ca = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, CA); + CERT_SYSTEM_STORE_CURRENT_USER, L"CA"); if (ca) { @@ -422,10 +421,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', - 'B','o','o','k',0 }; HCERTSTORE addressBook = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, AddressBook); + CERT_SYSTEM_STORE_CURRENT_USER, L"AddressBook"); if (addressBook) { @@ -476,10 +473,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', - 'B','o','o','k',0 }; HCERTSTORE addressBook = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, AddressBook); + CERT_SYSTEM_STORE_CURRENT_USER, L"AddressBook"); if (addressBook) { @@ -499,9 +494,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR CA[] = { 'C','A',0 }; HCERTSTORE ca = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, CA); + CERT_SYSTEM_STORE_CURRENT_USER, L"CA"); if (ca) { -- 2.26.2

1 0

[PATCH] scrrun/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 2 +- dlls/scrrun/tests/filesystem.c | 77 +++++++++++++++++----------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 12c41c3e401..4259bc71c8e 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -333,7 +333,7 @@ static void test_hash_value(void) L"123", L"A", L"a", - { 0 } + L"" }; static const int int_hash_tests[] = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5d64a0dcddb..5c55965ce88 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -44,7 +44,6 @@ static inline ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static const WCHAR crlfW[] = {'\r','\n',0}; static const char utf16bom[] = {0xff,0xfe,0}; static const WCHAR testfileW[] = L"test.txt"; @@ -1572,7 +1571,7 @@ static void test_WriteLine(void) len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, ARRAY_SIZE(buffW)); buffW[len] = 0; lstrcpyW(buff2W, nameW); - lstrcatW(buff2W, crlfW); + lstrcatW(buff2W, L"\r\n"); ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); CloseHandle(file); DeleteFileW(nameW); @@ -1596,7 +1595,7 @@ static void test_WriteLine(void) buff2W[0] = 0xfeff; buff2W[1] = 0; lstrcatW(buff2W, nameW); - lstrcatW(buff2W, crlfW); + lstrcatW(buff2W, L"\r\n"); ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); CloseHandle(file); DeleteFileW(nameW); @@ -1665,9 +1664,9 @@ static void test_ReadAll(void) ok(hr == S_OK, "got 0x%08x\n", hr); lstrcpyW(buffW, nameW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); @@ -1699,7 +1698,7 @@ static void test_ReadAll(void) SysFreeString(str); lstrcpyW(buffW, secondlineW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); @@ -1810,9 +1809,9 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); lstrcpyW(buffW, nameW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 500, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); @@ -1843,7 +1842,7 @@ static void test_Read(void) SysFreeString(str); lstrcpyW(buffW, secondlineW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 100, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); @@ -1856,9 +1855,9 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); lstrcpyW(buffW, nameW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); - lstrcatW(buffW, crlfW); + lstrcatW(buffW, L"\r\n"); str = NULL; hr = ITextStream_Read(stream, 500, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); @@ -2102,14 +2101,14 @@ struct driveexists_test { * with the drive letter of a drive of this type. If such a drive does not exist, * the test will be skipped. */ static const struct driveexists_test driveexiststestdata[] = { - { {'N',':','\\',0}, DRIVE_NO_ROOT_DIR, VARIANT_FALSE }, - { {'R',':','\\',0}, DRIVE_REMOVABLE, VARIANT_TRUE }, - { {'F',':','\\',0}, DRIVE_FIXED, VARIANT_TRUE }, - { {'F',':',0}, DRIVE_FIXED, VARIANT_TRUE }, - { {'F','?',0}, DRIVE_FIXED, VARIANT_FALSE }, - { {'F',0}, DRIVE_FIXED, VARIANT_TRUE }, - { {'?',0}, -1, VARIANT_FALSE }, - { { 0 } } + { L"N:\\", DRIVE_NO_ROOT_DIR, VARIANT_FALSE }, + { L"R:\\", DRIVE_REMOVABLE, VARIANT_TRUE }, + { L"F:\\", DRIVE_FIXED, VARIANT_TRUE }, + { L"F:", DRIVE_FIXED, VARIANT_TRUE }, + { L"F?", DRIVE_FIXED, VARIANT_FALSE }, + { L"F", DRIVE_FIXED, VARIANT_TRUE }, + { L"?", -1, VARIANT_FALSE }, + { L"" } }; static void test_DriveExists(void) @@ -2118,7 +2117,7 @@ static void test_DriveExists(void) HRESULT hr; VARIANT_BOOL ret; BSTR drivespec; - WCHAR root[] = {'?',':','\\',0}; + WCHAR root[] = L"?:\\"; hr = IFileSystem3_DriveExists(fs3, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -2175,14 +2174,14 @@ struct getdrivename_test { }; static const struct getdrivename_test getdrivenametestdata[] = { - { {'C',':','\\','1','.','t','s','t',0}, {'C',':',0} }, - { {'O',':','\\','1','.','t','s','t',0}, {'O',':',0} }, - { {'O',':',0}, {'O',':',0} }, - { {'o',':',0}, {'o',':',0} }, - { {'O','O',':',0} }, - { {':',0} }, - { {'O',0} }, - { { 0 } } + { L"C:\\1.tst", L"C:" }, + { L"O:\\1.tst", L"O:" }, + { L"O:", L"O:" }, + { L"o:", L"o:" }, + { L"OO:" }, + { L":" }, + { L"O" }, + { L"" } }; static void test_GetDriveName(void) @@ -2225,7 +2224,7 @@ static void test_GetDrive(void) HRESULT hr; IDrive *drive_fixed, *drive; BSTR dl_fixed, drivespec; - WCHAR root[] = {'?',':','\\',0}; + WCHAR root[] = L"?:\\"; drive = (void*)0xdeadbeef; hr = IFileSystem3_GetDrive(fs3, NULL, NULL); @@ -2266,12 +2265,12 @@ static void test_GetDrive(void) { {dl_upper,':',0}, S_OK, {dl_upper,0} }, { {dl_upper,':','\\',0}, S_OK, {dl_upper,0} }, { {dl_lower,':','\\',0}, S_OK, {dl_upper,0} }, - { {dl_upper,'\\',0}, E_INVALIDARG, { 0 } }, - { {dl_lower,'\\',0}, E_INVALIDARG, { 0 } }, - { {'$',':','\\',0}, E_INVALIDARG, { 0 } }, - { {'\\','h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, - { {'h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, - { { 0 } }, + { {dl_upper,'\\',0 }, E_INVALIDARG, L""}, + { {dl_lower,'\\',0 }, E_INVALIDARG, L""}, + { L"$:\\", E_INVALIDARG, L"" }, + { L"\\host\\share", E_INVALIDARG, L"" }, + { L"host\\share", E_INVALIDARG, L"" }, + { L"" }, }; struct getdrive_test *ptr = &testdata[0]; @@ -2349,10 +2348,10 @@ static const struct extension_test { WCHAR path[20]; WCHAR ext[10]; } extension_tests[] = { - { {'n','o','e','x','t',0}, {0} }, - { {'n','.','o','.','e','x','t',0}, {'e','x','t',0} }, - { {'n','.','o','.','e','X','t',0}, {'e','X','t',0} }, - { { 0 } } + { L"noext", L"" }, + { L"n.o.ext", L"ext" }, + { L"n.o.eXt", L"eXt" }, + { L"" } }; static void test_GetExtensionName(void) -- 2.26.2

1 0