[gadamopoulos] 65211: [SHELL32] - Move SHGetDesktopFolder to desktop.cpp

Author: gadamopoulos
Date: Mon Nov  3 10:12:24 2014
New Revision: 65211

URL: http://svn.reactos.org/svn/reactos?rev=65211&view=rev
Log:
[SHELL32]
- Move SHGetDesktopFolder to desktop.cpp

Modified:
    branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
    branches/shell-experiments/dll/win32/shell32/shellole.cpp

Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel...
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp	[iso-8859-1] Mon Nov  3 10:12:24 2014
@@ -1507,4 +1507,20 @@
         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;
 }

Modified: branches/shell-experiments/dll/win32/shell32/shellole.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel...
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shellole.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/shellole.cpp	[iso-8859-1] Mon Nov  3 10:12:24 2014
@@ -274,21 +274,6 @@
     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
  *