From ee9f3746ccb794d3e9efebc203df2ff951b4a91c Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Mon, 3 Nov 2014 10:12:24 +0000 Subject: [PATCH] [SHELL32] - Move SHGetDesktopFolder to desktop.cpp svn path=/branches/shell-experiments/; revision=65211 --- dll/win32/shell32/folders/desktop.cpp | 16 ++++++++++++++++ dll/win32/shell32/shellole.cpp | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dll/win32/shell32/folders/desktop.cpp b/dll/win32/shell32/folders/desktop.cpp index 4311e12f4e5..b25747caf7f 100644 --- a/dll/win32/shell32/folders/desktop.cpp +++ b/dll/win32/shell32/folders/desktop.cpp @@ -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 diff --git a/dll/win32/shell32/shellole.cpp b/dll/win32/shell32/shellole.cpp index 66909969f6c..3d8ce18065c 100644 --- a/dll/win32/shell32/shellole.cpp +++ b/dll/win32/shell32/shellole.cpp @@ -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 *