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

shell32: Use return value on failure updated in Vista+.

parent ba519be6
...@@ -1333,7 +1333,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST ...@@ -1333,7 +1333,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST
*pidlist = NULL; *pidlist = NULL;
if (!name) return E_OUTOFMEMORY; if (!name) return E_INVALIDARG;
hr = SHGetDesktopFolder(&desktop); hr = SHGetDesktopFolder(&desktop);
if (hr != S_OK) return hr; if (hr != S_OK) return hr;
......
...@@ -2007,7 +2007,8 @@ if (0) ...@@ -2007,7 +2007,8 @@ if (0)
pidl1 = (LPITEMIDLIST)0xdeadbeef; pidl1 = (LPITEMIDLIST)0xdeadbeef;
hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL);
ok(hr == E_OUTOFMEMORY, "failed %08x\n", hr); ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ ||
hr == E_INVALIDARG, "failed %08x\n", hr);
ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1);
/* dummy name */ /* dummy name */
......
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