ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Nikolay Sivov 2010-03-04 14:22:49 +03:00 committed by Alexandre Julliard
parent ba519be60f
commit fb45de3f66
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/pidl.c
View File

@ -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;

3
dlls/shell32/tests/shlfolder.c
View File

@ -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 */