Commit ccc6cfc1 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

shell32/tests: Explicitly compare to HRESULT values.

parent ed65fc7c
...@@ -1889,14 +1889,14 @@ static void test_SHGetFolderPathA(void) ...@@ -1889,14 +1889,14 @@ static void test_SHGetFolderPathA(void)
if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE;
hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path );
ok( !hr, "SHGetFolderPathA failed %x\n", hr ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 );
if (hr == E_FAIL) if (hr == E_FAIL)
{ {
win_skip( "Program Files (x86) not supported\n" ); win_skip( "Program Files (x86) not supported\n" );
return; return;
} }
ok( !hr, "SHGetFolderPathA failed %x\n", hr ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
if (is_win64) if (is_win64)
{ {
ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path );
...@@ -1924,14 +1924,14 @@ static void test_SHGetFolderPathA(void) ...@@ -1924,14 +1924,14 @@ static void test_SHGetFolderPathA(void)
} }
hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path );
ok( !hr, "SHGetFolderPathA failed %x\n", hr ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 );
if (hr == E_FAIL) if (hr == E_FAIL)
{ {
win_skip( "Common Files (x86) not supported\n" ); win_skip( "Common Files (x86) not supported\n" );
return; return;
} }
ok( !hr, "SHGetFolderPathA failed %x\n", hr ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
if (is_win64) if (is_win64)
{ {
ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path );
......
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