Nikolay Sivov : sxs/tests: Use wide string literal constants.
Alexandre Julliard
julliard at winehq.org
Tue Jul 21 15:40:21 CDT 2020
Module: wine
Branch: master
Commit: 077e2a8e70aa2aecc69bd79b03d5e0e3c9f4a967
URL: https://source.winehq.org/git/wine.git/?a=commit;h=077e2a8e70aa2aecc69bd79b03d5e0e3c9f4a967
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Jul 21 15:03:27 2020 +0300
sxs/tests: Use wide string literal constants.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/sxs/tests/sxs.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c
index 6b1a9952f3..4215c5045b 100644
--- a/dlls/sxs/tests/sxs.c
+++ b/dlls/sxs/tests/sxs.c
@@ -85,9 +85,6 @@ static void run_test(void)
SIZE_T buffer_size;
BOOL ret;
SXS_GUID_INFORMATION_CLR *info;
- WCHAR expected_type_name[] = {'D','L','L','.','T','e','s','t',0};
- WCHAR expected_runtime_version[] = {'v','4','.','0','.','0','.','0',0};
- WCHAR expected_assembly_identity[] = {'c','o','m','t','e','s','t',',','t','y','p','e','=','"','w','i','n','3','2','"',',','v','e','r','s','i','o','n','=','"','1','.','0','.','0','.','0','"',0};
ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size);
ok(ret == FALSE, "Got %d\n", ret);
@@ -99,12 +96,11 @@ static void run_test(void)
ok(GetLastError() == 0, "Got %d\n", GetLastError());
ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %d\n", info->dwFlags);
- ok(lstrcmpW(info->pcwszTypeName, expected_type_name) == 0, "Got %s\n",
- wine_dbgstr_w(info->pcwszTypeName));
- ok(lstrcmpW(info->pcwszAssemblyIdentity, expected_assembly_identity) == 0, "Got %s\n",
- wine_dbgstr_w(info->pcwszAssemblyIdentity));
- ok(lstrcmpW(info->pcwszRuntimeVersion, expected_runtime_version) == 0, "Got %s\n",
- wine_dbgstr_w(info->pcwszRuntimeVersion));
+ ok(!lstrcmpW(info->pcwszTypeName, L"DLL.Test"), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName));
+ ok(!lstrcmpW(info->pcwszAssemblyIdentity, L"comtest,type=\"win32\",version=\"1.0.0.0\""),
+ "Unexpected assembly identity %s.\n", wine_dbgstr_w(info->pcwszAssemblyIdentity));
+ ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n",
+ wine_dbgstr_w(info->pcwszRuntimeVersion));
heap_free(info);
}
More information about the wine-cvs
mailing list