Skip to content

W
wine-winehq
Commit 499fa1d9 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

sxs/tests: Update QueryAssemblyInfo() test for Windows 10.

parent b62d7e7a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 13 deletions
dlls/sxs/tests/cache.c
View file @ 499fa1d9
...@@ -33,7 +33,7 @@ static void test_QueryAssemblyInfo( void ) ...@@ -33,7 +33,7 @@ static void test_QueryAssemblyInfo( void )
ASSEMBLY_INFO info; ASSEMBLY_INFO info;
IAssemblyCache *cache = NULL; IAssemblyCache *cache = NULL;
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH], comctl_path3[MAX_PATH], comctl_path4[MAX_PATH]; char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH];
const WCHAR *comctlW; const WCHAR *comctlW;
hr = CreateAssemblyCache( &cache, 0 ); hr = CreateAssemblyCache( &cache, 0 );
...@@ -65,22 +65,12 @@ static void test_QueryAssemblyInfo( void ) ...@@ -65,22 +65,12 @@ static void test_QueryAssemblyInfo( void )
GetWindowsDirectoryA( comctl_path1, MAX_PATH ); GetWindowsDirectoryA( comctl_path1, MAX_PATH );
lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" );
GetWindowsDirectoryA( comctl_path2, MAX_PATH ); GetWindowsDirectoryA( comctl_path2, MAX_PATH );
lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.3790.4770_x-ww_05fdf087" ); lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.3636_none_a863d714867441db" );
GetWindowsDirectoryA( comctl_path3, MAX_PATH );
lstrcatA( comctl_path3, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.8250.0_none_c119e7cca62b92bd" );
GetWindowsDirectoryA( comctl_path4, MAX_PATH );
lstrcatA( comctl_path4, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.7601.17514_none_41e6975e2bd6f2b2" );
if (GetFileAttributesA( comctl_path1 ) != INVALID_FILE_ATTRIBUTES) if (GetFileAttributesA( comctl_path1 ) != INVALID_FILE_ATTRIBUTES)
comctlW = L"microsoft.windows.common-controls,version=\"6.0.2600.2982\",type=\"win32\",processorArchitecture=\"x86\"," comctlW = L"microsoft.windows.common-controls,version=\"6.0.2600.2982\",type=\"win32\",processorArchitecture=\"x86\","
"publicKeyToken=\"6595b64144ccf1df\""; "publicKeyToken=\"6595b64144ccf1df\"";
else if (GetFileAttributesA( comctl_path2 ) != INVALID_FILE_ATTRIBUTES) else if (GetFileAttributesA( comctl_path2 ) != INVALID_FILE_ATTRIBUTES)
comctlW = L"microsoft.windows.common-controls,version=\"6.0.3790.4770\",type=\"win32\",processorArchitecture=\"x86\"," comctlW = L"microsoft.windows.common-controls,version=\"6.0.19041.3636\",type=\"win32\",processorArchitecture=\"x86\","
"publicKeyToken=\"6595b64144ccf1df\"";
else if (GetFileAttributesA( comctl_path3 ) != INVALID_FILE_ATTRIBUTES)
comctlW = L"microsoft.windows.common-controls,version=\"6.0.8250.0\",type=\"win32\",processorArchitecture=\"x86\","
"publicKeyToken=\"6595b64144ccf1df\"";
else if (GetFileAttributesA( comctl_path4 ) != INVALID_FILE_ATTRIBUTES)
comctlW = L"microsoft.windows.common-controls,version=\"6.0.7601.17514\",type=\"win32\",processorArchitecture=\"x86\","
"publicKeyToken=\"6595b64144ccf1df\""; "publicKeyToken=\"6595b64144ccf1df\"";
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment