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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fb45de3f66f0dafd64a101f3f4091f6b94998274
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb45de3f66f0dafd64a101f3f4...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Thu Mar  4 14:22:49 2010 +0300

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

---

 dlls/shell32/pidl.c            |    2 +-
 dlls/shell32/tests/shlfolder.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index ecda891..99bbed8 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1333,7 +1333,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST
 
     *pidlist = NULL;
 
-    if (!name) return E_OUTOFMEMORY;
+    if (!name) return E_INVALIDARG;
 
     hr = SHGetDesktopFolder(&desktop);
     if (hr != S_OK) return hr;
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 85f04a9..bce7c3e 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -2007,7 +2007,8 @@ if (0)
 
     pidl1 = (LPITEMIDLIST)0xdeadbeef;
     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);
 
     /* dummy name */