Robert Shearman : shell: GetDetailsOf fix.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: d9d9d7e897245083fad749c395a21ea4343aa86e
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=d9d9d7e897245083fad749c3...

Author: Robert Shearman 
Date:   Mon Jan 16 21:32:06 2006 +0100

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

---

dlls/shell32/shfldr_fs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 394c254..506236f 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -965,6 +965,8 @@ IShellFolder_fnGetDetailsOf (IShellFolde
          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 (IShellFolde
             _ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH);
             break;
         }
-        hr = S_OK;
-        psd->str.uType = STRRET_CSTR;
     }

return hr;