- IShellFolder_fnParseDisplayName(): return E_INVALIDARG instead of

E_OUTOFMEMORY. - IShellFolder_fnGetUIObjectOf(): preserve return error codes. - IShellFolder_fnGetDisplayNameOf(): don't initialize whole character array with zero.

- IShellFolder_fnParseDisplayName(): return E_INVALIDARG instead of
0e35be60 · Martin Fuchs · Alexandre Julliard · fc69e4cf · 0e35be60
Commit 0e35be60 authored Jan 23, 2004 by Martin Fuchs Committed by Alexandre Julliard Jan 23, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

shfldr_fs.c dlls/shell32/shfldr_fs.c +5 -3

No files found.
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -325,7 +325,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface,
 {
    _ICOM_THIS_From_IShellFolder2 (IGenericSFImpl, iface)

-    HRESULT hr = E_OUTOFMEMORY;
+    HRESULT hr = E_INVALIDARG;
    LPCWSTR szNext = NULL;
    WCHAR szElement[MAX_PATH];
    CHAR szPath[MAX_PATH];
@@ -583,7 +583,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface,
 	    hr = E_NOINTERFACE;
 	}

-	if (!pObj)
+	if (SUCCEEDED(hr) && !pObj)
 	    hr = E_OUTOFMEMORY;

 	*ppvOut = pObj;
@@ -652,10 +652,12 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, DWOR
 {
    _ICOM_THIS_From_IShellFolder2 (IGenericSFImpl, iface)

-    CHAR szPath[MAX_PATH] = "";
+    CHAR szPath[MAX_PATH];
    int len = 0;
    BOOL bSimplePidl;

+    *szPath = '\0';
+
    TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet);
    pdump (pidl);