shell: GetDetailsOf fix.

Initialise hr and psd->str.uType before the call to IShellFolder_GetDisplayNameOf so that whatever it returns is preserved.

shell: GetDetailsOf fix.
d9d9d7e8 · Robert Shearman · Alexandre Julliard · f8782733 · d9d9d7e8
Commit d9d9d7e8 authored Jan 16, 2006 by Robert Shearman Committed by Alexandre Julliard Jan 16, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shfldr_fs.c dlls/shell32/shfldr_fs.c +2 -2

No files found.
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -965,6 +965,8 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
         psd->str.u.cStr, MAX_PATH);
        return S_OK;
    } else {
+        hr = S_OK;
+        psd->str.uType = STRRET_CSTR;
        /* the data from the pidl */
        switch (iColumn) {
        case 0:                /* name */
@@ -984,8 +986,6 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
            _ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH);
            break;
        }
-        hr = S_OK;
-        psd->str.uType = STRRET_CSTR;
    }

    return hr;