[janderwald] 36904: - Fix bug 3782 take #2 - Apply the fix to right source file and not to code which isnt build anymore

Author: janderwald
Date: Thu Oct 23 01:15:43 2008
New Revision: 36904

URL: http://svn.reactos.org/svn/reactos?rev=36904&view=rev
Log:
- Fix bug 3782 take #2 
- Apply the fix to right source file and not to code which isnt build anymore

Removed:
    trunk/reactos/dll/win32/shell32/cpanelfolder.c
Modified:
    trunk/reactos/dll/win32/shell32/shfldr_cpanel.c

Removed: trunk/reactos/dll/win32/shell32/cpanelfolder.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo…
==============================================================================
--- trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/cpanelfolder.c (removed)
@@ -1,1377 +1,0 @@
-/*
- * Control panel folder
- *
- * Copyright 2003 Martin Fuchs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <precomp.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
-
-/***********************************************************************
-*   control panel implementation in shell namespace
-*/
-
-typedef struct {
-    const IShellFolder2Vtbl      *lpVtbl;
-    LONG                   ref;
-    const IPersistFolder2Vtbl    *lpVtblPersistFolder2;
-    const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
-    const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
-    const IContextMenu2Vtbl       *lpVtblContextMenu;
-    IUnknown *pUnkOuter;	/* used for aggregation */
-
-    /* both paths are parsible from the desktop */
-    LPITEMIDLIST pidlRoot;	/* absolute pidl */
-    int dwAttributes;		/* attributes returned by GetAttributesOf FIXME: use it */
-    LPCITEMIDLIST *apidl;
-    UINT cidl;
-} ICPanelImpl, *LPICPanelImpl;
-
-static const IShellFolder2Vtbl vt_ShellFolder2;
-static const IPersistFolder2Vtbl vt_PersistFolder2;
-static const IShellExecuteHookWVtbl vt_ShellExecuteHookW;
-static const IShellExecuteHookAVtbl vt_ShellExecuteHookA;
-static const IContextMenu2Vtbl vt_ContextMenu;
-
-static LPICPanelImpl __inline impl_from_IPersistFolder2( IPersistFolder2 *iface )
-{
-    return (LPICPanelImpl)((char*)iface - FIELD_OFFSET(ICPanelImpl,
lpVtblPersistFolder2));
-}
-
-static LPICPanelImpl __inline impl_from_IContextMenu( IContextMenu2 *iface )
-{
-    return (LPICPanelImpl)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblContextMenu));
-}
-
-
-static LPICPanelImpl __inline impl_from_IShellExecuteHookW( IShellExecuteHookW *iface )
-{
-    return (LPICPanelImpl)((char*)iface - FIELD_OFFSET(ICPanelImpl,
lpVtblShellExecuteHookW));
-}
-
-static LPICPanelImpl __inline impl_from_IShellExecuteHookA( IShellExecuteHookA *iface )
-{
-    return (LPICPanelImpl)((char*)iface - FIELD_OFFSET(ICPanelImpl,
lpVtblShellExecuteHookA));
-}
-
-
-/*
-  converts This to an interface pointer
-*/
-#define _IUnknown_(This)	   (IUnknown*)&(This->lpVtbl)
-#define _IShellFolder_(This)	   (IShellFolder*)&(This->lpVtbl)
-#define _IShellFolder2_(This)	   (IShellFolder2*)&(This->lpVtbl)
-
-#define _IPersist_(This)	   (IPersist*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder_(This)	   (IPersistFolder*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder2_(This)	  
(IPersistFolder2*)&(This->lpVtblPersistFolder2)
-#define _IShellExecuteHookW_(This)
(IShellExecuteHookW*)&(This->lpVtblShellExecuteHookW)
-#define _IShellExecuteHookA_(This)
(IShellExecuteHookA*)&(This->lpVtblShellExecuteHookA)
-
-
-/***********************************************************************
-*   IShellFolder [ControlPanel] implementation
-*/
-
-static const shvheader ControlPanelSFHeader[] = {
-    {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT,
15},/*FIXME*/
-    {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT,
200},/*FIXME*/
-};
-
-#define CONROLPANELSHELLVIEWCOLUMNS 2
-
-/**************************************************************************
-*	IControlPanel_Constructor
-*/
-HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID * ppv)
-{
-    ICPanelImpl *sf;
-
-    TRACE("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid(riid));
-
-    if (!ppv)
-	return E_POINTER;
-    if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown))
-	return CLASS_E_NOAGGREGATION;
-
-    sf = (ICPanelImpl *) LocalAlloc(LMEM_ZEROINIT, sizeof(ICPanelImpl));
-    if (!sf)
-	return E_OUTOFMEMORY;
-
-    sf->ref = 0;
-    sf->apidl = NULL;
-    sf->cidl = 0;
-    sf->lpVtbl = &vt_ShellFolder2;
-    sf->lpVtblPersistFolder2 = &vt_PersistFolder2;
-    sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW;
-    sf->lpVtblShellExecuteHookA = &vt_ShellExecuteHookA;
-    sf->lpVtblContextMenu = &vt_ContextMenu;
-    sf->pidlRoot = _ILCreateControlPanel();	/* my qualified pidl */
-    sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf);
-
-    if (!SUCCEEDED(IUnknown_QueryInterface(_IUnknown_(sf), riid, ppv))) {
-	IUnknown_Release(_IUnknown_(sf));
-	return E_NOINTERFACE;
-    }
-
-    TRACE("--(%p)\n", sf);
-    return S_OK;
-}
-
-/**************************************************************************
- *	ISF_ControlPanel_fnQueryInterface
- *
- * NOTES supports not IPersist/IPersistFolder
- */
-static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 * iface, REFIID
riid, LPVOID * ppvObject)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObject);
-
-    *ppvObject = NULL;
-
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-	IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2))
-	*ppvObject = This;
-    else if (IsEqualIID(riid, &IID_IPersist) ||
-	       IsEqualIID(riid, &IID_IPersistFolder) || IsEqualIID(riid,
&IID_IPersistFolder2))
-	*ppvObject = _IPersistFolder2_(This);
-    else if (IsEqualIID(riid, &IID_IShellExecuteHookW))
-	*ppvObject = _IShellExecuteHookW_(This);
-    else if (IsEqualIID(riid, &IID_IShellExecuteHookA))
-	*ppvObject = _IShellExecuteHookA_(This);
-
-    if (*ppvObject) {
-	IUnknown_AddRef((IUnknown *)(*ppvObject));
-	TRACE("-- Interface:(%p)->(%p)\n", ppvObject, *ppvObject);
-	return S_OK;
-    }
-    TRACE("-- Interface: E_NOINTERFACE\n");
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    ULONG refCount = InterlockedIncrement(&This->ref);
-
-    TRACE("(%p)->(count=%u)\n", This, refCount - 1);
-
-    return refCount;
-}
-
-static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    ULONG refCount = InterlockedDecrement(&This->ref);
-
-    TRACE("(%p)->(count=%u)\n", This, refCount + 1);
-
-    if (!refCount) {
-        TRACE("-- destroying IShellFolder(%p)\n", This);
-        SHFree(This->pidlRoot);
-        LocalFree((HLOCAL) This);
-    }
-    return refCount;
-}
-
-/**************************************************************************
-*	ISF_ControlPanel_fnParseDisplayName
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface,
-				   HWND hwndOwner,
-				   LPBC pbc,
-				   LPOLESTR lpszDisplayName,
-				   DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    HRESULT hr = E_INVALIDARG;
-
-    FIXME("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n",
-	   This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), pchEaten, ppidl,
pdwAttributes);
-
-    *ppidl = 0;
-    if (pchEaten)
-	*pchEaten = 0;
-
-    TRACE("(%p)->(-- ret=0x%08x)\n", This, hr);
-
-    return hr;
-}
-
-static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName,
- LPCSTR comment, int iconIdx)
-{
-    PIDLCPanelStruct *p;
-    LPITEMIDLIST pidl;
-    PIDLDATA tmp;
-    int size0 = (char*)&tmp.u.cpanel.szName-(char*)&tmp.u.cpanel;
-    int size = size0;
-    int l;
-
-    tmp.type = PT_CPLAPPLET;
-    tmp.u.cpanel.dummy = 0;
-    tmp.u.cpanel.iconIdx = iconIdx;
-
-    l = strlen(name);
-    size += l+1;
-
-    tmp.u.cpanel.offsDispName = l+1;
-    l = strlen(displayName);
-    size += l+1;
-
-    tmp.u.cpanel.offsComment = tmp.u.cpanel.offsDispName+1+l;
-    l = strlen(comment);
-    size += l+1;
-
-    pidl = SHAlloc(size+4);
-    if (!pidl)
-        return NULL;
-
-    pidl->mkid.cb = size+2;
-    memcpy(pidl->mkid.abID, &tmp, 2+size0);
-
-    p = &((PIDLDATA*)pidl->mkid.abID)->u.cpanel;
-    strcpy(p->szName, name);
-    strcpy(p->szName+tmp.u.cpanel.offsDispName, displayName);
-    strcpy(p->szName+tmp.u.cpanel.offsComment, comment);
-
-    *(WORD*)((char*)pidl+(size+2)) = 0;
-
-    pcheck(pidl);
-
-    return pidl;
-}
-
-/**************************************************************************
- *  _ILGetCPanelPointer()
- * gets a pointer to the control panel struct stored in the pidl
- */
-static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl)
-{
-    LPPIDLDATA pdata = _ILGetDataPointer(pidl);
-
-    if (pdata && pdata->type==PT_CPLAPPLET)
-        return (PIDLCPanelStruct*)&(pdata->u.cpanel);
-
-    return NULL;
-}
-
- /**************************************************************************
- *		ISF_ControlPanel_fnEnumObjects
- */
-static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path)
-{
-    LPITEMIDLIST pidl;
-    CPlApplet* applet;
-    CPanel panel;
-    CPLINFO info;
-    unsigned i;
-    int iconIdx;
-
-    char displayName[MAX_PATH];
-    char comment[MAX_PATH];
-
-    WCHAR wpath[MAX_PATH];
-
-    MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH);
-
-    panel.first = NULL;
-    applet = Control_LoadApplet(0, wpath, &panel);
-
-    if (applet)
-    {
-        for(i=0; i<applet->count; ++i)
-        {
-            WideCharToMultiByte(CP_ACP, 0, applet->info[i].szName, -1, displayName,
MAX_PATH, 0, 0);
-            WideCharToMultiByte(CP_ACP, 0, applet->info[i].szInfo, -1, comment,
MAX_PATH, 0, 0);
-
-            applet->proc(0, CPL_INQUIRE, i, (LPARAM)&info);
-
-            if (info.idIcon > 0)
-                iconIdx = -info.idIcon; /* negative icon index instead of icon number */
-            else
-                iconIdx = 0;
-
-            pidl = _ILCreateCPanelApplet(path, displayName, comment, iconIdx);
-
-            if (pidl)
-                AddToEnumList(list, pidl);
-        }
-        Control_UnloadApplet(applet);
-    }
-    return TRUE;
-}
-
-static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, LPCSTR
szRepPath)
-{
-    char name[MAX_PATH];
-    char value[MAX_PATH];
-    HKEY hkey;
-
-    int cnt = 0;
-
-    if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS)
-    {
-        int idx = 0;
-
-        for(;; ++idx)
-        {
-            DWORD nameLen = MAX_PATH;
-            DWORD valueLen = MAX_PATH;
-
-            if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL,
(LPBYTE)&value, &valueLen) != ERROR_SUCCESS)
-                break;
-
-            if (SHELL_RegisterCPanelApp(list, value))
-                ++cnt;
-        }
-        RegCloseKey(hkey);
-    }
-
-    return cnt;
-}
-
-static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR
szRepPath)
-{
-    char name[MAX_PATH];
-    HKEY hkey;
-
-    int cnt = 0;
-
-    if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS)
-    {
-        int idx = 0;
-        for(;; ++idx)
-        {
-            if (RegEnumKeyA(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS)
-                break;
-
-            if (*name == '{')
-            {
-                LPITEMIDLIST pidl = _ILCreateGuidFromStrA(name);
-
-                if (pidl && AddToEnumList(list, pidl))
-                    ++cnt;
-            }
-        }
-
-        RegCloseKey(hkey);
-    }
-
-  return cnt;
-}
-
-/**************************************************************************
- *  CreateCPanelEnumList()
- */
-static BOOL CreateCPanelEnumList(
-    IEnumIDList * iface,
-    DWORD dwFlags)
-{
-    CHAR szPath[MAX_PATH];
-    WIN32_FIND_DATAA wfd;
-    HANDLE hFile;
-
-    TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags);
-
-    /* enumerate control panel folders */
-    if (dwFlags & SHCONTF_FOLDERS)
-        SHELL_RegisterCPanelFolders(iface, HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace");
-
-    /* enumerate the control panel applets */
-    if (dwFlags & SHCONTF_NONFOLDERS)
-    {
-        LPSTR p;
-
-        GetSystemDirectoryA(szPath, MAX_PATH);
-        p = PathAddBackslashA(szPath);
-        strcpy(p, "*.cpl");
-
-        TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of
%s\n",iface,debugstr_a(szPath));
-        hFile = FindFirstFileA(szPath, &wfd);
-
-        if (hFile != INVALID_HANDLE_VALUE)
-        {
-            do
-            {
-                if (!(dwFlags & SHCONTF_INCLUDEHIDDEN) &&
(wfd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN))
-                    continue;
-
-                if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-                    strcpy(p, wfd.cFileName);
-                    SHELL_RegisterCPanelApp((IEnumIDList*)iface, szPath);
-                }
-            } while(FindNextFileA(hFile, &wfd));
-            FindClose(hFile);
-        }
-
-        SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
-        SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_CURRENT_USER,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls");
-    }
-    return TRUE;
-}
-
-/**************************************************************************
-*		ISF_ControlPanel_fnEnumObjects
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags,
LPENUMIDLIST * ppEnumIDList)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner,
dwFlags, ppEnumIDList);
-
-    *ppEnumIDList = IEnumIDList_Constructor();
-    if (*ppEnumIDList)
-        CreateCPanelEnumList(*ppEnumIDList, dwFlags);
-
-    TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList);
-
-    return(*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
-}
-
-/**************************************************************************
-*		ISF_ControlPanel_fnBindToObject
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnBindToObject(IShellFolder2 * iface, LPCITEMIDLIST pidl,
-			       LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", This, pidl, pbcReserved,
shdebugstr_guid(riid), ppvOut);
-
-    return SHELL32_BindToChild(This->pidlRoot, NULL, pidl, riid, ppvOut);
-}
-
-/**************************************************************************
-*	ISF_ControlPanel_fnBindToStorage
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnBindToStorage(IShellFolder2 * iface,
-				LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, pidl, pbcReserved,
shdebugstr_guid(riid), ppvOut);
-
-    *ppvOut = NULL;
-    return E_NOTIMPL;
-}
-
-/**************************************************************************
-* 	ISF_ControlPanel_fnCompareIDs
-*/
-
-static HRESULT WINAPI
-ISF_ControlPanel_fnCompareIDs(IShellFolder2 * iface, LPARAM lParam, LPCITEMIDLIST pidl1,
LPCITEMIDLIST pidl2)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    int nReturn;
-
-    TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1,
pidl2);
-    nReturn = SHELL32_CompareIDs(_IShellFolder_(This), lParam, pidl1, pidl2);
-    TRACE("-- %i\n", nReturn);
-    return nReturn;
-}
-
-/**************************************************************************
-*	ISF_ControlPanel_fnCreateViewObject
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnCreateViewObject(IShellFolder2 * iface, HWND hwndOwner, REFIID riid,
LPVOID * ppvOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    LPSHELLVIEW pShellView;
-    HRESULT hr = E_INVALIDARG;
-
-    TRACE("(%p)->(hwnd=%p,%s,%p)\n", This, hwndOwner, shdebugstr_guid(riid),
ppvOut);
-
-    if (ppvOut) {
-	*ppvOut = NULL;
-
-	if (IsEqualIID(riid, &IID_IDropTarget)) {
-	    WARN("IDropTarget not implemented\n");
-	    hr = E_NOTIMPL;
-	} else if (IsEqualIID(riid, &IID_IContextMenu)) {
-	    WARN("IContextMenu not implemented\n");
-	    hr = E_NOTIMPL;
-	} else if (IsEqualIID(riid, &IID_IShellView)) {
-	    pShellView = IShellView_Constructor((IShellFolder *) iface);
-	    if (pShellView) {
-		hr = IShellView_QueryInterface(pShellView, riid, ppvOut);
-		IShellView_Release(pShellView);
-	    }
-	}
-    }
-    TRACE("--(%p)->(interface=%p)\n", This, ppvOut);
-    return hr;
-}
-
-/**************************************************************************
-*  ISF_ControlPanel_fnGetAttributesOf
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST *
apidl, DWORD * rgfInOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    HRESULT hr = S_OK;
-
-    TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n",
-          This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
-
-    if (!rgfInOut)
-        return E_INVALIDARG;
-    if (cidl && !apidl)
-        return E_INVALIDARG;
-
-    if (*rgfInOut == 0)
-	*rgfInOut = ~0;
-
-    while(cidl > 0 && *apidl) {
-	pdump(*apidl);
-	SHELL32_GetItemAttributes(_IShellFolder_(This), *apidl, rgfInOut);
-	apidl++;
-	cidl--;
-    }
-    /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
-    *rgfInOut &= ~SFGAO_VALIDATE;
-
-    TRACE("-- result=0x%08x\n", *rgfInOut);
-    return hr;
-}
-
-/**************************************************************************
-*	ISF_ControlPanel_fnGetUIObjectOf
-*
-* PARAMETERS
-*  HWND           hwndOwner, //[in ] Parent window for any output
-*  UINT           cidl,      //[in ] array size
-*  LPCITEMIDLIST* apidl,     //[in ] simple pidl array
-*  REFIID         riid,      //[in ] Requested Interface
-*  UINT*          prgfInOut, //[   ] reserved
-*  LPVOID*        ppvObject) //[out] Resulting Interface
-*
-*/
-static HRESULT WINAPI
-ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
-				HWND hwndOwner,
-				UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    LPITEMIDLIST pidl;
-    IUnknown *pObj = NULL;
-    HRESULT hr = E_INVALIDARG;
-
-    TRACE("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n",
-	   This, hwndOwner, cidl, apidl, shdebugstr_guid(riid), prgfInOut, ppvOut);
-
-    if (ppvOut) {
-	*ppvOut = NULL;
-
-	if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) {
-		// TODO
-		// create a seperate item struct
-		//
-		pObj = (IUnknown*)(&This->lpVtblContextMenu);
-		This->apidl = apidl;
-		This->cidl = cidl;
-		IUnknown_AddRef(pObj);
-		hr = S_OK;
-	} else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) {
-	    pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl,
cidl);
-	    hr = S_OK;
-	} else if (IsEqualIID(riid, &IID_IExtractIconA) &&(cidl == 1)) {
-	    pidl = ILCombine(This->pidlRoot, apidl[0]);
-	    pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl);
-	    SHFree(pidl);
-	    hr = S_OK;
-	} else if (IsEqualIID(riid, &IID_IExtractIconW) &&(cidl == 1)) {
-	    pidl = ILCombine(This->pidlRoot, apidl[0]);
-	    pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl);
-	    SHFree(pidl);
-	    hr = S_OK;
-	} else if ((IsEqualIID(riid,&IID_IShellLinkW) ||
IsEqualIID(riid,&IID_IShellLinkA))
-				&& (cidl == 1)) {
-	    pidl = ILCombine(This->pidlRoot, apidl[0]);
-	    hr = IShellLink_ConstructFromFile(NULL, riid, pidl,(LPVOID*)&pObj);
-	    SHFree(pidl);
-	} else {
-	    hr = E_NOINTERFACE;
-	}
-
-	if (SUCCEEDED(hr) && !pObj)
-	    hr = E_OUTOFMEMORY;
-
-	*ppvOut = pObj;
-    }
-    TRACE("(%p)->hr=0x%08x\n", This, hr);
-    return hr;
-}
-
-/**************************************************************************
-*	ISF_ControlPanel_fnGetDisplayNameOf
-*/
-static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface,
LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    CHAR szPath[MAX_PATH];
-    WCHAR wszPath[MAX_PATH+1]; /* +1 for potential backslash */
-    PIDLCPanelStruct* pcpanel;
-
-    *szPath = '\0';
-
-    TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet);
-    pdump(pidl);
-
-    if (!pidl || !strRet)
-	return E_INVALIDARG;
-
-    pcpanel = _ILGetCPanelPointer(pidl);
-
-    if (pcpanel) {
-	lstrcpyA(szPath, pcpanel->szName+pcpanel->offsDispName);
-
-	if (!(dwFlags & SHGDN_FORPARSING))
-	    FIXME("retrieve display name from control panel app\n");
-    }
-    /* take names of special folders only if it's only this folder */
-    else if (_ILIsSpecialFolder(pidl)) {
-	BOOL bSimplePidl = _ILIsPidlSimple(pidl);
-
-	if (bSimplePidl) {
-	    _ILSimpleGetTextW(pidl, wszPath, MAX_PATH);	/* append my own path */
-	} else {
-	    FIXME("special pidl\n");
-	}
-
-	if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) { /* go deeper if needed
*/
-	    int len = 0;
-
-	    PathAddBackslashW(wszPath);
-	    len = wcslen(wszPath);
-
-	    if (!SUCCEEDED
-	      (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, wszPath + len, MAX_PATH + 1 -
len)))
-		return E_OUTOFMEMORY;
-	    if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL))
-		wszPath[0] = '\0';
-    } else {
-        if (bSimplePidl) {
-	        if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL))
-		    wszPath[0] = '\0';
-        }
-    }
-    }
-
-    strRet->uType = STRRET_CSTR;
-    lstrcpynA(strRet->u.cStr, szPath, MAX_PATH);
-
-    TRACE("--(%p)->(%s)\n", This, szPath);
-    return S_OK;
-}
-
-/**************************************************************************
-*  ISF_ControlPanel_fnSetNameOf
-*  Changes the name of a file object or subfolder, possibly changing its item
-*  identifier in the process.
-*
-* PARAMETERS
-*  HWND          hwndOwner,  //[in ] Owner window for output
-*  LPCITEMIDLIST pidl,       //[in ] simple pidl of item to change
-*  LPCOLESTR     lpszName,   //[in ] the items new display name
-*  DWORD         dwFlags,    //[in ] SHGNO formatting flags
-*  LPITEMIDLIST* ppidlOut)   //[out] simple pidl returned
-*/
-static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND hwndOwner,
LPCITEMIDLIST pidl,	/*simple pidl */
-						  LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    FIXME("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl,
debugstr_w(lpName), dwFlags, pPidlOut);
-    return E_FAIL;
-}
-
-static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 * iface, GUID
* pguid)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
-}
-static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 * iface,
IEnumExtraSearch ** ppenum)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
-}
-static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 * iface, DWORD
dwRes, ULONG * pSort, ULONG * pDisplay)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    TRACE("(%p)\n", This);
-
-    if (pSort) *pSort = 0;
-    if (pDisplay) *pDisplay = 0;
-    return S_OK;
-}
-static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 * iface,
UINT iColumn, DWORD * pcsFlags)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    TRACE("(%p)\n", This);
-
-    if (!pcsFlags || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) return E_INVALIDARG;
-    *pcsFlags = ControlPanelSFHeader[iColumn].pcsFlags;
-    return S_OK;
-}
-static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsEx(IShellFolder2 * iface,
LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface,
LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    HRESULT hr;
-
-    TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);
-
-    if (!psd || iColumn >= CONROLPANELSHELLVIEWCOLUMNS)
-	return E_INVALIDARG;
-
-    if (!pidl) {
-	psd->fmt = ControlPanelSFHeader[iColumn].fmt;
-	psd->cxChar = ControlPanelSFHeader[iColumn].cxChar;
-	psd->str.uType = STRRET_CSTR;
-	LoadStringA(shell32_hInstance, ControlPanelSFHeader[iColumn].colnameid,
psd->str.u.cStr, MAX_PATH);
-	return S_OK;
-    } else {
-	psd->str.u.cStr[0] = 0x00;
-	psd->str.uType = STRRET_CSTR;
-	switch(iColumn) {
-	case 0:		/* name */
-	    hr = IShellFolder_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL | SHGDN_INFOLDER,
&psd->str);
-	    break;
-	case 1:		/* comment */
-	    _ILGetFileType(pidl, psd->str.u.cStr, MAX_PATH);
-	    break;
-	}
-	hr = S_OK;
-    }
-
-    return hr;
-}
-static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, UINT
column, SHCOLUMNID * pscid)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
-}
-
-static const IShellFolder2Vtbl vt_ShellFolder2 =
-{
-
-    ISF_ControlPanel_fnQueryInterface,
-    ISF_ControlPanel_fnAddRef,
-    ISF_ControlPanel_fnRelease,
-    ISF_ControlPanel_fnParseDisplayName,
-    ISF_ControlPanel_fnEnumObjects,
-    ISF_ControlPanel_fnBindToObject,
-    ISF_ControlPanel_fnBindToStorage,
-    ISF_ControlPanel_fnCompareIDs,
-    ISF_ControlPanel_fnCreateViewObject,
-    ISF_ControlPanel_fnGetAttributesOf,
-    ISF_ControlPanel_fnGetUIObjectOf,
-    ISF_ControlPanel_fnGetDisplayNameOf,
-    ISF_ControlPanel_fnSetNameOf,
-
-    /* ShellFolder2 */
-    ISF_ControlPanel_fnGetDefaultSearchGUID,
-    ISF_ControlPanel_fnEnumSearches,
-    ISF_ControlPanel_fnGetDefaultColumn,
-    ISF_ControlPanel_fnGetDefaultColumnState,
-    ISF_ControlPanel_fnGetDetailsEx,
-    ISF_ControlPanel_fnGetDetailsOf,
-    ISF_ControlPanel_fnMapColumnToSCID
-};
-
-/************************************************************************
- *	ICPanel_PersistFolder2_QueryInterface
- */
-static HRESULT WINAPI ICPanel_PersistFolder2_QueryInterface(IPersistFolder2 * iface,
REFIID iid, LPVOID * ppvObject)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-
-    TRACE("(%p)\n", This);
-
-    return IUnknown_QueryInterface(_IUnknown_(This), iid, ppvObject);
-}
-
-/************************************************************************
- *	ICPanel_PersistFolder2_AddRef
- */
-static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_AddRef(_IUnknown_(This));
-}
-
-/************************************************************************
- *	ISFPersistFolder_Release
- */
-static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_Release(_IUnknown_(This));
-}
-
-/************************************************************************
- *	ICPanel_PersistFolder2_GetClassID
- */
-static HRESULT WINAPI ICPanel_PersistFolder2_GetClassID(IPersistFolder2 * iface, CLSID *
lpClassId)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-
-    TRACE("(%p)\n", This);
-
-    if (!lpClassId)
-	return E_POINTER;
-    *lpClassId = CLSID_ControlPanel;
-
-    return S_OK;
-}
-
-/************************************************************************
- *	ICPanel_PersistFolder2_Initialize
- *
- * NOTES: it makes no sense to change the pidl
- */
-static HRESULT WINAPI ICPanel_PersistFolder2_Initialize(IPersistFolder2 * iface,
LPCITEMIDLIST pidl)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-    if (This->pidlRoot)
-        SHFree((LPVOID)This->pidlRoot);
-
-    This->pidlRoot = ILClone(pidl);
-    return S_OK;
-}
-
-/**************************************************************************
- *	IPersistFolder2_fnGetCurFolder
- */
-static HRESULT WINAPI ICPanel_PersistFolder2_GetCurFolder(IPersistFolder2 * iface,
LPITEMIDLIST * pidl)
-{
-    ICPanelImpl *This = impl_from_IPersistFolder2(iface);
-
-    TRACE("(%p)->(%p)\n", This, pidl);
-
-    if (!pidl)
-	return E_POINTER;
-    *pidl = ILClone(This->pidlRoot);
-    return S_OK;
-}
-
-static const IPersistFolder2Vtbl vt_PersistFolder2 =
-{
-
-    ICPanel_PersistFolder2_QueryInterface,
-    ICPanel_PersistFolder2_AddRef,
-    ICPanel_PersistFolder2_Release,
-    ICPanel_PersistFolder2_GetClassID,
-    ICPanel_PersistFolder2_Initialize,
-    ICPanel_PersistFolder2_GetCurFolder
-};
-
-HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST pidl,
-               LPWSTR szIconFile, UINT cchMax, int* piIndex)
-{
-    PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl);
-
-    if (!pcpanel)
-	return E_INVALIDARG;
-
-    MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, szIconFile, cchMax);
-    *piIndex = pcpanel->iconIdx!=-1? pcpanel->iconIdx: 0;
-
-    return S_OK;
-}
-
-
-/**************************************************************************
-* IShellExecuteHookW Implementation
-*/
-
-static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface(
-               IShellExecuteHookW* iface, REFIID riid, void** ppvObject)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookW(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject);
-}
-
-static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* iface)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookW(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_AddRef(This->pUnkOuter);
-}
-
-static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnRelease(IShellExecuteHookW* iface)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookW(iface);
-
-    TRACE("(%p)\n", This);
-
-    return IUnknown_Release(This->pUnkOuter);
-}
-
-HRESULT
-ExecuteAppletFromCLSID(LPOLESTR pOleStr)
-{
-    WCHAR szCmd[MAX_PATH];
-    WCHAR szExpCmd[MAX_PATH];
-    PROCESS_INFORMATION pi;
-    STARTUPINFOW si;
-    WCHAR szBuffer[90] = { 'C', 'L', 'S', 'I',
'D', '\\', 0 };
-    DWORD dwType, dwSize;
-
-    wcscpy(&szBuffer[6], pOleStr);
-    wcscat(szBuffer, L"\\shell\\open\\command");
-
-    dwSize = sizeof(szCmd);
-    if (RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, NULL, RRF_RT_REG_SZ, &dwType,
(PVOID)szCmd, &dwSize) != ERROR_SUCCESS)
-    {
-        ERR("RegGetValueW failed with %u\n", GetLastError());
-        return E_FAIL;
-    }
-
-#if 0
-    if (dwType != RRF_RT_REG_SZ && dwType != RRF_RT_REG_EXPAND_SZ)
-        return E_FAIL;
-#endif
-
-    if (!ExpandEnvironmentStringsW(szCmd, szExpCmd, sizeof(szExpCmd)/sizeof(WCHAR)))
-        return E_FAIL;
-
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-    if (!CreateProcessW(NULL, szExpCmd, NULL, NULL, FALSE, 0, NULL,	NULL, &si,
&pi))
-        return E_FAIL;
-
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-    return S_OK;
-}
-
-
-static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface,
LPSHELLEXECUTEINFOW psei)
-{
-    static const WCHAR wCplopen[] =
{'c','p','l','o','p','e','n','\0'};
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    SHELLEXECUTEINFOW sei_tmp;
-    PIDLCPanelStruct* pcpanel;
-    WCHAR path[MAX_PATH];
-    WCHAR params[MAX_PATH];
-    BOOL ret;
-    HRESULT hr;
-    int l;
-
-    TRACE("(%p)->execute(%p)\n", This, psei);
-
-    if (!psei)
-        return E_INVALIDARG;
-
-    pcpanel = _ILGetCPanelPointer(ILFindLastID(psei->lpIDList));
-
-    if (!pcpanel)
-    {
-        LPOLESTR pOleStr;
-
-        IID * iid = _ILGetGUIDPointer(ILFindLastID(psei->lpIDList));
-        if (!iid)
-            return E_INVALIDARG;
-        if (StringFromCLSID(iid, &pOleStr) == S_OK)
-        {
-
-            hr = ExecuteAppletFromCLSID(pOleStr);
-            CoTaskMemFree(pOleStr);
-            return hr;
-        }
-
-        return E_INVALIDARG;
-    }
-    path[0] = '\"';
-    /* Return value from MultiByteToWideChar includes terminating NUL, which
-     * compensates for the starting double quote we just put in */
-    l = MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH);
-
-    /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file
*/
-    path[l++] = '"';
-    path[l] = '\0';
-
-    MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1,
params, MAX_PATH);
-
-    memcpy(&sei_tmp, psei, sizeof(sei_tmp));
-    sei_tmp.lpFile = path;
-    sei_tmp.lpParameters = params;
-    sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
-    sei_tmp.lpVerb = wCplopen;
-
-    ret = ShellExecuteExW(&sei_tmp);
-    if (ret)
-        return S_OK;
-    else
-        return S_FALSE;
-}
-
-static const IShellExecuteHookWVtbl vt_ShellExecuteHookW =
-{
-
-    IShellExecuteHookW_fnQueryInterface,
-    IShellExecuteHookW_fnAddRef,
-    IShellExecuteHookW_fnRelease,
-
-    IShellExecuteHookW_fnExecute
-};
-
-
-/**************************************************************************
-* IShellExecuteHookA Implementation
-*/
-
-static HRESULT WINAPI IShellExecuteHookA_fnQueryInterface(IShellExecuteHookA* iface,
REFIID riid, void** ppvObject)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookA(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject);
-}
-
-static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnAddRef(IShellExecuteHookA* iface)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookA(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_AddRef(This->pUnkOuter);
-}
-
-static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnRelease(IShellExecuteHookA* iface)
-{
-    ICPanelImpl *This = impl_from_IShellExecuteHookA(iface);
-
-    TRACE("(%p)\n", This);
-
-    return IUnknown_Release(This->pUnkOuter);
-}
-
-static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface,
LPSHELLEXECUTEINFOA psei)
-{
-    ICPanelImpl *This = (ICPanelImpl *)iface;
-
-    SHELLEXECUTEINFOA sei_tmp;
-    PIDLCPanelStruct* pcpanel;
-    char path[MAX_PATH];
-    BOOL ret;
-
-    TRACE("(%p)->execute(%p)\n", This, psei);
-
-    if (!psei)
-	return E_INVALIDARG;
-
-    pcpanel = _ILGetCPanelPointer(ILFindLastID(psei->lpIDList));
-
-    if (!pcpanel)
-	return E_INVALIDARG;
-
-    path[0] = '\"';
-    lstrcpyA(path+1, pcpanel->szName);
-
-    /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file
*/
-    lstrcatA(path, "\" ");
-    lstrcatA(path, pcpanel->szName+pcpanel->offsDispName);
-
-    memcpy(&sei_tmp, psei, sizeof(sei_tmp));
-    sei_tmp.lpFile = path;
-    sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
-
-    ret = ShellExecuteExA(&sei_tmp);
-    if (ret)
-	return S_OK;
-    else
-	return S_FALSE;
-}
-
-static const IShellExecuteHookAVtbl vt_ShellExecuteHookA =
-{
-    IShellExecuteHookA_fnQueryInterface,
-    IShellExecuteHookA_fnAddRef,
-    IShellExecuteHookA_fnRelease,
-    IShellExecuteHookA_fnExecute
-};
-
-/**************************************************************************
-* IContextMenu2 Implementation
-*/
-
-/************************************************************************
- * ICPanel_IContextMenu_QueryInterface
- */
-static HRESULT WINAPI ICPanel_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID
iid, LPVOID * ppvObject)
-{
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("(%p)\n", This);
-
-    return IUnknown_QueryInterface(_IUnknown_(This), iid, ppvObject);
-}
-
-/************************************************************************
- * ICPanel_IContextMenu_AddRef
- */
-static ULONG WINAPI ICPanel_IContextMenu2_AddRef(IContextMenu2 * iface)
-{
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_AddRef(_IUnknown_(This));
-}
-
-/************************************************************************
- * ICPanel_IContextMenu_Release
- */
-static ULONG WINAPI ICPanel_IContextMenu2_Release(IContextMenu2  * iface)
-{
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-
-    return IUnknown_Release(_IUnknown_(This));
-}
-
-/**************************************************************************
-* ICPanel_IContextMenu_QueryContextMenu()
-*/
-static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu(
-	IContextMenu2 *iface,
-	HMENU hMenu,
-	UINT indexMenu,
-	UINT idCmdFirst,
-	UINT idCmdLast,
-	UINT uFlags)
-{
-    WCHAR szBuffer[30] = {0};
-    ULONG Count = 1;
-
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x
)\n",
-          This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
-
-    if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
-    {
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-        _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING,
szBuffer, MFS_DEFAULT);
-        Count++;
-    }
-
-    if (LoadStringW(shell32_hInstance, IDS_CREATELINK, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
-    {
-        if (Count)
-        {
-            _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_SEPARATOR,
NULL, MFS_ENABLED);
-        }
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-
-        _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING,
szBuffer, MFS_ENABLED);
-        Count++;
-    }
-    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count);
-}
-
-
-/**************************************************************************
-* ICPanel_IContextMenu_InvokeCommand()
-*/
-static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand(
-	IContextMenu2 *iface,
-	LPCMINVOKECOMMANDINFO lpcmi)
-{
-    SHELLEXECUTEINFOW sei;
-    WCHAR szPath[MAX_PATH];
-    char szTarget[MAX_PATH];
-    STRRET strret;
-    WCHAR* pszPath;
-    INT Length, cLength;
-    PIDLCPanelStruct *pcpanel;
-    IPersistFile * ppf;
-    IShellLinkA * isl;
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb,
lpcmi->hwnd);
-
-    if (lpcmi->lpVerb == MAKEINTRESOURCEA(1))
-    {
-       ZeroMemory(&sei, sizeof(sei));
-       sei.cbSize = sizeof(sei);
-       sei.fMask = SEE_MASK_INVOKEIDLIST;
-       sei.lpIDList = ILCombine(This->pidlRoot, This->apidl[0]);
-       sei.hwnd = lpcmi->hwnd;
-       sei.nShow = SW_SHOWNORMAL;
-       sei.lpVerb = L"open";
-       ShellExecuteExW(&sei);
-       if (sei.hInstApp <= (HINSTANCE)32)
-          return E_FAIL;
-    }
-    else if (lpcmi->lpVerb == MAKEINTRESOURCEA(2))
-    {
-        if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE))
-             return E_FAIL;
-
-        pszPath = PathAddBackslashW(szPath);
-        if (!pszPath)
-             return E_FAIL;
-
-        if (IShellFolder_GetDisplayNameOf((IShellFolder*)This, This->apidl[0],
SHGDN_FORPARSING, &strret) != S_OK)
-            return E_FAIL;
-
-        Length =  MAX_PATH - (pszPath - szPath);
-        cLength = strlen(strret.u.cStr);
-        if (Length < cLength + 5)
-        {
-            FIXME("\n");
-            return E_FAIL;
-        }
-
-        if (MultiByteToWideChar(CP_ACP, 0, strret.u.cStr, cLength +1, pszPath, Length))
-        {
-            pszPath += cLength;
-            Length -= cLength;
-        }
-
-        if (Length > 10)
-        {
-            wcscpy(pszPath, L" - ");
-            cLength = LoadStringW(shell32_hInstance, IDS_LNK_FILE, &pszPath[3],
Length -4) + 3;
-            if (cLength + 5 > Length)
-                cLength = Length - 5;
-            Length -= cLength;
-            pszPath += cLength;
-        }
-        wcscpy(pszPath, L".lnk");
-
-        pcpanel = _ILGetCPanelPointer(ILFindLastID(This->apidl[0]));
-        if (pcpanel)
-        {
-           strncpy(szTarget, pcpanel->szName, MAX_PATH);
-        }
-        else
-        {
-           FIXME("\n");
-           return E_FAIL;
-        }
-        if (SUCCEEDED(IShellLink_Constructor(NULL, &IID_IShellLinkA,
(LPVOID*)&isl)))
-        {
-            IShellLinkA_SetPath(isl, szTarget);
-            if (SUCCEEDED(IShellLinkA_QueryInterface(isl, &IID_IPersistFile,
(LPVOID*)&ppf)))
-            {
-                IPersistFile_Save(ppf, szPath, TRUE);
-                IPersistFile_Release(ppf);
-            }
-            IShellLinkA_Release(isl);
-        }
-        return NOERROR;
-    }
-    return S_OK;
-}
-
-/**************************************************************************
- *  ICPanel_IContextMenu_GetCommandString()
- *
- */
-static HRESULT WINAPI ICPanel_IContextMenu2_GetCommandString(
-	IContextMenu2 *iface,
-	UINT_PTR idCommand,
-	UINT uFlags,
-	UINT* lpReserved,
-	LPSTR lpszName,
-	UINT uMaxNameLen)
-{
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-	TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand,
uFlags, lpReserved, lpszName, uMaxNameLen);
-
-
-	FIXME("unknown command string\n");
-	return E_FAIL;
-}
-
-
-
-/**************************************************************************
-* ICPanel_IContextMenu_HandleMenuMsg()
-*/
-static HRESULT WINAPI ICPanel_IContextMenu2_HandleMenuMsg(
-	IContextMenu2 *iface,
-	UINT uMsg,
-	WPARAM wParam,
-	LPARAM lParam)
-{
-    ICPanelImpl *This = impl_from_IContextMenu(iface);
-
-    TRACE("ICPanel_IContextMenu_HandleMenuMsg (%p)->(msg=%x wp=%lx
lp=%lx)\n",This, uMsg, wParam, lParam);
-
-    return E_NOTIMPL;
-}
-
-static const IContextMenu2Vtbl vt_ContextMenu =
-{
-	ICPanel_IContextMenu2_QueryInterface,
-	ICPanel_IContextMenu2_AddRef,
-	ICPanel_IContextMenu2_Release,
-	ICPanel_IContextMenu2_QueryContextMenu,
-	ICPanel_IContextMenu2_InvokeCommand,
-	ICPanel_IContextMenu2_GetCommandString,
-	ICPanel_IContextMenu2_HandleMenuMsg
-};
-

Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Thu Oct 23 01:15:43 2008
@@ -596,10 +596,14 @@
 	*ppvOut = NULL;
 
 	if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) {
+		// TODO
+		// create a seperate item struct
+		//
 		pObj = (IUnknown*)(&This->lpVtblContextMenu);
 		This->apidl = apidl;
 		This->cidl = cidl;
 		IUnknown_AddRef(pObj);
+		hr = S_OK;
 	} else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) {
 	    pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl,
cidl);
 	    hr = S_OK;