Nikolay Sivov : shell32/tests: Explicitly compare to HRESULT values.
Alexandre Julliard
julliard at wine.codeweavers.com
Sun Jan 3 14:24:16 CST 2016
Module: wine
Branch: master
Commit: ccc6cfc1de88e2723ffbf0215c5fdd57ffcb23fc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc6cfc1de88e2723ffbf0215c5fdd57ffcb23fc
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat Jan 2 14:07:43 2016 +0300
shell32/tests: Explicitly compare to HRESULT values.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/tests/shlfolder.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 7a53621..72aaa02 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -1889,14 +1889,14 @@ static void test_SHGetFolderPathA(void)
if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE;
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 );
if (hr == E_FAIL)
{
win_skip( "Program Files (x86) not supported\n" );
return;
}
- ok( !hr, "SHGetFolderPathA failed %x\n", hr );
+ ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
if (is_win64)
{
ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path );
@@ -1924,14 +1924,14 @@ static void test_SHGetFolderPathA(void)
}
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 );
if (hr == E_FAIL)
{
win_skip( "Common Files (x86) not supported\n" );
return;
}
- ok( !hr, "SHGetFolderPathA failed %x\n", hr );
+ ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr );
if (is_win64)
{
ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path );
More information about the wine-cvs
mailing list