[SHELL32]

- CDesktopFolder: Avoid doing any operation with pidls. Use the internal fs folders instead.

svn path=/trunk/; revision=71242

reactos/dll/win32/shell32/folders/CDesktopFolder.cpp

@@ -266,7 +266,7 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
     pidlRoot = _ILCreateDesktop();
 
     /* Create the inner fs folder */
-    hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_DesktopFSFolder));
+    hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder2, &m_DesktopFSFolder));
     if (FAILED(hr))
         return hr;
 
@@ -280,7 +280,7 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
     hr = ppf3->InitializeEx(NULL, pidlRoot, &info);
 
     /* Create the inner shared fs folder */
-    hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder, &m_SharedDesktopFSFolder));
+    hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IShellFolder2, &m_SharedDesktopFSFolder));
     if (FAILED(hr))
         return hr;
 
@@ -299,6 +299,25 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
     return S_OK;
 }
 
+HRESULT CDesktopFolder::_GetSFFromPidl(LPCITEMIDLIST pidl, IShellFolder2** psf)
+{
+    WCHAR szFileName[MAX_PATH];
+
+    lstrcpynW(szFileName, sPathTarget, MAX_PATH - 1);
+    PathAddBackslashW(szFileName);
+    int cLen = wcslen(szFileName);
+
+    if (!_ILSimpleGetTextW(pidl, szFileName + cLen, MAX_PATH - cLen))
+        return E_FAIL;
+
+    ERR("%S\n", szFileName);
+
+    if (GetFileAttributes(szFileName) == INVALID_FILE_ATTRIBUTES)
+        return m_SharedDesktopFSFolder->QueryInterface(IID_PPV_ARG(IShellFolder2, psf));
+    else
+        return m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(IShellFolder2, psf));
+}
+
 /**************************************************************************
  *    CDesktopFolder::ParseDisplayName
  *
@@ -394,14 +413,7 @@ HRESULT WINAPI CDesktopFolder::ParseDisplayName(
         {
             if (pdwAttributes && *pdwAttributes)
             {
-                if (_ILIsMyComputer(pidlTemp))
+                GetAttributesOf(1, &pidlTemp, pdwAttributes);
-                    *pdwAttributes &= dwMyComputerAttributes;
-                else if (_ILIsNetHood(pidlTemp))
-                    *pdwAttributes &= dwMyNetPlacesAttributes;
-                else if (_ILIsSpecialFolder(pidlTemp))
-                    SHELL32_GetGuidItemAttributes(this, pidlTemp, pdwAttributes);
-                else if(_ILIsFolder(pidlTemp) || _ILIsValue(pidlTemp))
-                    SHELL32_GetFSItemAttributes(this, pidlTemp, pdwAttributes);
             }
         }
     }
@@ -439,7 +451,12 @@ HRESULT WINAPI CDesktopFolder::BindToObject(
     if (_ILIsSpecialFolder(pidl))
         return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut);
 
-    return m_DesktopFSFolder->BindToObject(pidl, pbcReserved, riid, ppvOut );
+    CComPtr<IShellFolder2> psf;
+    HRESULT hr = _GetSFFromPidl(pidl, &psf);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return psf->BindToObject(pidl, pbcReserved, riid, ppvOut);
 }
 
 /**************************************************************************
@@ -555,8 +572,15 @@ HRESULT WINAPI CDesktopFolder::GetAttributesOf(
                 *rgfInOut &= dwMyNetPlacesAttributes;
             else if (_ILIsSpecialFolder(apidl[i]))
                 SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut);
-            else if(_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i]))
+            else if (_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i]))
-                SHELL32_GetFSItemAttributes(this, apidl[i], rgfInOut);
+            {
+                CComPtr<IShellFolder2> psf;
+                HRESULT hr = _GetSFFromPidl(apidl[i], &psf);
+                if (FAILED_UNEXPECTEDLY(hr))
+                    continue;
+
+                psf->GetAttributesOf(1, &apidl[i], rgfInOut);
+            }
             else
                 ERR("Got an unknown pidl type!!!\n");
         }
@@ -600,6 +624,16 @@ HRESULT WINAPI CDesktopFolder::GetUIObjectOf(
 
     *ppvOut = NULL;
 
+    if (cidl == 1 && !_ILIsSpecialFolder(apidl[0]))
+    {
+        CComPtr<IShellFolder2> psf;
+        HRESULT hr = _GetSFFromPidl(apidl[0], &psf);
+        if (FAILED_UNEXPECTEDLY(hr))
+            return hr;
+
+        return psf->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, ppvOut);
+    }
+
     if (IsEqualIID (riid, IID_IContextMenu))
     {
         hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu **)&pObj);
@@ -612,19 +646,6 @@ HRESULT WINAPI CDesktopFolder::GetUIObjectOf(
     {
         hr = GenericExtractIcon_CreateInstance(this, apidl[0], riid, &pObj);
     }
-    else if (IsEqualIID (riid, IID_IDropTarget))
-    {
-        /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */
-        if (cidl > 1)
-        {
-            hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj);
-        }
-    }
-    else if ((IsEqualIID(riid, IID_IShellLinkW) ||
-              IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1))
-    {
-        hr = IShellLink_ConstructFromFile(this, apidl[0], riid, &pObj);
-    }
     else
         hr = E_NOINTERFACE;
 
@@ -644,9 +665,6 @@ HRESULT WINAPI CDesktopFolder::GetUIObjectOf(
  */
 HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet)
 {
-    HRESULT hr = S_OK;
-    LPWSTR pszPath;
-
     TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet);
     pdump (pidl);
 
@@ -661,77 +679,21 @@ HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFl
     {
         return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet);
     }
-
+    else if (_ILIsDesktop(pidl))
-    pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR));
-    if (!pszPath)
-        return E_OUTOFMEMORY;
-
-    if (_ILIsDesktop (pidl))
     {
-        if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) &&
+        if ((GET_SHGDN_RELATION(dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING))
-                (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING))
+            return SHSetStrRet(strRet, sPathTarget);
-            wcscpy(pszPath, sPathTarget);
         else
-            HCR_GetClassNameW(CLSID_ShellDesktop, pszPath, MAX_PATH);
+            return HCR_GetClassName(CLSID_ShellDesktop, strRet);
-    }
-    else
-    {
-        int cLen = 0;
-
-        /* file system folder or file rooted at the desktop */
-        if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) &&
-                (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER))
-        {
-            lstrcpynW(pszPath, sPathTarget, MAX_PATH - 1);
-            PathAddBackslashW(pszPath);
-            cLen = wcslen(pszPath);
-        }
-
-        _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen);
-        if (!_ILIsFolder(pidl))
-            SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags);
-
-        if (GetFileAttributes(pszPath) == INVALID_FILE_ATTRIBUTES)
-        {
-            /* file system folder or file rooted at the AllUsers desktop */
-            if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) &&
-                    (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER))
-            {
-                SHGetSpecialFolderPathW(0, pszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE);
-                PathAddBackslashW(pszPath);
-                cLen = wcslen(pszPath);
-            }
-
-            _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen);
-            if (!_ILIsFolder(pidl))
-                SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags);
-        }
     }
 
-    if (SUCCEEDED(hr))
+    /* file system folder or file rooted at the desktop */
-    {
+    CComPtr<IShellFolder2> psf;
-        /* Win9x always returns ANSI strings, NT always returns Unicode strings */
+    HRESULT hr = _GetSFFromPidl(pidl, &psf);
-        if (GetVersion() & 0x80000000)
+    if (FAILED_UNEXPECTEDLY(hr))
-        {
+        return hr;
-            strRet->uType = STRRET_CSTR;
-            if (!WideCharToMultiByte(CP_ACP, 0, pszPath, -1, strRet->cStr, MAX_PATH,
-                                     NULL, NULL))
-                strRet->cStr[0] = '\0';
-            CoTaskMemFree(pszPath);
-        }
-        else
-        {
-            strRet->uType = STRRET_WSTR;
-            strRet->pOleStr = pszPath;
-        }
-    }
-    else
-        CoTaskMemFree(pszPath);
 
-    TRACE ("-- (%p)->(%s,0x%08x)\n", this,
+    return psf->GetDisplayNameOf(pidl, dwFlags, strRet);
-           strRet->uType == STRRET_CSTR ? strRet->cStr :
-           debugstr_w(strRet->pOleStr), hr);
-    return hr;
 }
 
 /**************************************************************************
@@ -753,65 +715,15 @@ HRESULT WINAPI CDesktopFolder::SetNameOf(
     DWORD dwFlags,
     PITEMID_CHILD *pPidlOut)
 {
-    CComPtr<IShellFolder2>                psf;
-    HRESULT hr;
-    WCHAR szSrc[MAX_PATH + 1], szDest[MAX_PATH + 1];
-    LPWSTR ptr;
-    BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl));
-
-    TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl,
-           debugstr_w (lpName), dwFlags, pPidlOut);
-
     if (_ILGetGUIDPointer(pidl))
         return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut);
 
-    /* build source path */
+    CComPtr<IShellFolder2> psf;
-    lstrcpynW(szSrc, sPathTarget, MAX_PATH);
+    HRESULT hr = _GetSFFromPidl(pidl, &psf);
-    ptr = PathAddBackslashW (szSrc);
+    if (FAILED_UNEXPECTEDLY(hr))
-    if (ptr)
-        _ILSimpleGetTextW (pidl, ptr, MAX_PATH + 1 - (ptr - szSrc));
-
-    /* build destination path */
-    if (dwFlags == SHGDN_NORMAL || dwFlags & SHGDN_INFOLDER) {
-        lstrcpynW(szDest, sPathTarget, MAX_PATH);
-        ptr = PathAddBackslashW (szDest);
-        if (ptr)
-            lstrcpynW(ptr, lpName, MAX_PATH + 1 - (ptr - szDest));
-    } else
-        lstrcpynW(szDest, lpName, MAX_PATH);
-
-    if(!(dwFlags & SHGDN_FORPARSING) && SHELL_FS_HideExtension(szSrc)) {
-        WCHAR *ext = PathFindExtensionW(szSrc);
-        if(*ext != '\0') {
-            INT len = wcslen(szDest);
-            lstrcpynW(szDest + len, ext, MAX_PATH - len);
-        }
-    }
-
-    if (!memcmp(szSrc, szDest, (wcslen(szDest) + 1) * sizeof(WCHAR)))
-    {
-        /* src and destination is the same */
-        hr = S_OK;
-        if (pPidlOut)
-            hr = _ILCreateFromPathW(szDest, pPidlOut);
-
         return hr;
-    }
 
-    TRACE ("src=%s dest=%s\n", debugstr_w(szSrc), debugstr_w(szDest));
+    return psf->SetNameOf(hwndOwner, pidl, lpName, dwFlags, pPidlOut);
-    if (MoveFileW (szSrc, szDest))
-    {
-        hr = S_OK;
-
-        if (pPidlOut)
-            hr = _ILCreateFromPathW(szDest, pPidlOut);
-
-        SHChangeNotify (bIsFolder ? SHCNE_RENAMEFOLDER : SHCNE_RENAMEITEM,
-                        SHCNF_PATHW, szSrc, szDest);
-
-        return hr;
-    }
-    return E_FAIL;
 }
 
 HRESULT WINAPI CDesktopFolder::GetDefaultSearchGUID(GUID *pguid)
@@ -865,10 +777,6 @@ HRESULT WINAPI CDesktopFolder::GetDetailsOf(
     UINT iColumn,
     SHELLDETAILS *psd)
 {
-    HRESULT hr = S_OK;
-
-    TRACE ("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd);
-
     if (!psd || iColumn >= DESKTOPSHELLVIEWCOLUMNS)
         return E_INVALIDARG;
 
@@ -883,27 +791,14 @@ HRESULT WINAPI CDesktopFolder::GetDetailsOf(
         return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd);
     }
 
-    /* the data from the pidl */
+    CComPtr<IShellFolder2> psf;
-    psd->str.uType = STRRET_CSTR;
+    HRESULT hr = _GetSFFromPidl(pidl, &psf);
-    switch (iColumn)
+    if (FAILED_UNEXPECTEDLY(hr))
-    {
+        return hr;
-        case 0:        /* name */
+
-            hr = GetDisplayNameOf(pidl,
+    hr =  psf->GetDetailsOf(pidl, iColumn, psd);
-                                  SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str);
+    if (FAILED_UNEXPECTEDLY(hr))
-            break;
+        return hr;
-        case 1:        /* size */
-            _ILGetFileSize (pidl, psd->str.cStr, MAX_PATH);
-            break;
-        case 2:        /* type */
-            _ILGetFileType (pidl, psd->str.cStr, MAX_PATH);
-            break;
-        case 3:        /* date */
-            _ILGetFileDate (pidl, psd->str.cStr, MAX_PATH);
-            break;
-        case 4:        /* attributes */
-            _ILGetFileAttributes (pidl, psd->str.cStr, MAX_PATH);
-            break;
-    }
 
     return hr;
 }
@@ -942,54 +837,6 @@ HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl)
     return S_OK;
 }
 
-HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) {
-    HRESULT hr;
-
-    TRACE("CFSFolder::_GetDropTarget entered\n");
-
-    if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl))
-        return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut);
-
-    LPITEMIDLIST pidlNext = NULL;
-
-    STRRET strFile;
-    hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile);
-    if (SUCCEEDED(hr))
-    {
-        WCHAR wszPath[MAX_PATH];
-        hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath));
-
-        if (SUCCEEDED(hr))
-        {
-            PathRemoveFileSpecW (wszPath);
-            hr = this->ParseDisplayName(NULL, NULL, wszPath, NULL, &pidlNext, NULL);
-
-            if (SUCCEEDED(hr))
-            {
-                CComPtr<IShellFolder> psf;
-                hr = this->BindToObject(pidlNext, NULL, IID_PPV_ARG(IShellFolder, &psf));
-                CoTaskMemFree(pidlNext);
-                if (SUCCEEDED(hr))
-                {
-                    hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_IDropTarget, NULL, ppvOut);
-                    if (FAILED(hr))
-                        ERR("FS GetUIObjectOf failed: %x\n", hr);
-                }
-                else 
-                    ERR("BindToObject failed: %x\n", hr);
-            }
-            else
-                ERR("ParseDisplayName failed: %x\n", hr);
-        }
-        else
-            ERR("StrRetToBufW failed: %x\n", hr);
-    }    
-    else
-        ERR("GetDisplayNameOf failed: %x\n", hr);
-
-    return hr;
-}
-
 /*************************************************************************
  * SHGetDesktopFolder            [SHELL32.@]
  */

reactos/dll/win32/shell32/folders/CDesktopFolder.h

@@ -31,13 +31,13 @@ class CDesktopFolder :
 {
     private:
         /* both paths are parsible from the desktop */
-        CComPtr<IShellFolder> m_DesktopFSFolder;
+        CComPtr<IShellFolder2> m_DesktopFSFolder;
-        CComPtr<IShellFolder> m_SharedDesktopFSFolder;
+        CComPtr<IShellFolder2> m_SharedDesktopFSFolder;
 
         LPWSTR sPathTarget;     /* complete path to target used for enumeration and ChangeNotify */
         LPITEMIDLIST pidlRoot;  /* absolute pidl */
 
-        virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut);
+        HRESULT _GetSFFromPidl(LPCITEMIDLIST pidl, IShellFolder2** psf);
 
     public:
         CDesktopFolder();

reactos/dll/win32/shell32/folders/CFSFolder.cpp

@@ -1585,7 +1585,7 @@ HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) {
 
     TRACE("CFSFolder::_GetDropTarget entered\n");
 
-    if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl))
+    if (_ILIsFolder (pidl))
         return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut);
 
     STRRET strFile;