[SHELL32]
authorGiannis Adamopoulos <gadamopoulos@reactos.org>
Mon, 3 Nov 2014 10:12:24 +0000 (10:12 +0000)
committerGiannis Adamopoulos <gadamopoulos@reactos.org>
Mon, 3 Nov 2014 10:12:24 +0000 (10:12 +0000)
- Move SHGetDesktopFolder to desktop.cpp

svn path=/branches/shell-experiments/; revision=65211

dll/win32/shell32/folders/desktop.cpp
dll/win32/shell32/shellole.cpp

index 4311e12..b25747c 100644 (file)
@@ -1507,4 +1507,20 @@ HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut
         ERR("GetDisplayNameOf failed: %x\n", hr);
 
     return hr;
+}
+
+/*************************************************************************
+ * SHGetDesktopFolder            [SHELL32.@]
+ */
+HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
+{
+    HRESULT    hres = S_OK;
+    TRACE("\n");
+
+    if(!psf) return E_INVALIDARG;
+    *psf = NULL;
+    hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellFolder, psf));
+
+    TRACE("-- %p->(%p)\n",psf, *psf);
+    return hres;
 }
\ No newline at end of file
index 6690996..3d8ce18 100644 (file)
@@ -274,21 +274,6 @@ void WINAPI SHFree(LPVOID pv)
     CoTaskMemFree(pv);
 }
 
-/*************************************************************************
- * SHGetDesktopFolder            [SHELL32.@]
- */
-HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
-{
-    HRESULT    hres = S_OK;
-    TRACE("\n");
-
-    if(!psf) return E_INVALIDARG;
-    *psf = NULL;
-    hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellFolder, psf));
-
-    TRACE("-- %p->(%p)\n",psf, *psf);
-    return hres;
-}
 /**************************************************************************
  * Default ClassFactory Implementation
  *