[gadamopoulos] 68892: [SHELL32] - Fix a hack that broke copying files after recent fixes.

Author: gadamopoulos
Date: Tue Sep  1 10:18:40 2015
New Revision: 68892

URL: http://svn.reactos.org/svn/reactos?rev=68892&view=rev
Log:
[SHELL32]
- Fix a hack that broke copying files after recent fixes.

Modified:
    trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp

Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/C...
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp	[iso-8859-1] Tue Sep  1 10:18:40 2015
@@ -1034,7 +1034,6 @@
     LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName;
     int res, length;
     HRESULT hr;
-    STRRET strRet;

TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl);

@@ -1047,20 +1046,11 @@
             return hr;
         }

-        hr = pSFFrom->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strRet);
+        hr = SHGetPathFromIDListW(pidl, szSrcPath);
+        SHFree(pidl);
+
         if (FAILED(hr))
-        {
-            SHFree(pidl);
             return hr;
-        }
-
-        hr = StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH);
-        if (FAILED(hr))
-        {
-            SHFree(pidl);
-            return hr;
-        }
-        SHFree(pidl);

pszSrc = PathAddBackslashW(szSrcPath);