Commit d9d9d7e8 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard

shell: GetDetailsOf fix.

Initialise hr and psd->str.uType before the call to IShellFolder_GetDisplayNameOf so that whatever it returns is preserved.
parent f8782733
...@@ -965,6 +965,8 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, ...@@ -965,6 +965,8 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
psd->str.u.cStr, MAX_PATH); psd->str.u.cStr, MAX_PATH);
return S_OK; return S_OK;
} else { } else {
hr = S_OK;
psd->str.uType = STRRET_CSTR;
/* the data from the pidl */ /* the data from the pidl */
switch (iColumn) { switch (iColumn) {
case 0: /* name */ case 0: /* name */
...@@ -984,8 +986,6 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, ...@@ -984,8 +986,6 @@ IShellFolder_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
_ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH); _ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH);
break; break;
} }
hr = S_OK;
psd->str.uType = STRRET_CSTR;
} }
return hr; return hr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment