Commit 9ff68534 authored by David Hedberg's avatar David Hedberg Committed by Alexandre Julliard

shell32: Return S_OK only if the flags matches the result exactly.

parent 67843453
...@@ -271,6 +271,11 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa ...@@ -271,6 +271,11 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa
ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs);
*psfgaoAttribs &= sfgaoMask; *psfgaoAttribs &= sfgaoMask;
IShellFolder_Release(parent_folder); IShellFolder_Release(parent_folder);
if(sfgaoMask == *psfgaoAttribs)
return S_OK;
else
return S_FALSE;
} }
return ret; return ret;
......
...@@ -3792,7 +3792,7 @@ static void test_ShellItemGetAttributes(void) ...@@ -3792,7 +3792,7 @@ static void test_ShellItemGetAttributes(void)
sfgao = 0xdeadbeef; sfgao = 0xdeadbeef;
hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao);
todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); ok(hr == S_FALSE, "Got 0x%08x\n", hr);
ok(sfgao == 0, "Got 0x%08x\n", sfgao); ok(sfgao == 0, "Got 0x%08x\n", sfgao);
IShellItem_Release(psi_folder1); IShellItem_Release(psi_folder1);
......
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