[ros-diffs] [janderwald] 29677: - add printer folder - patch by Huw D M Davies (http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html) - register bitbucket context menu extension

Author: janderwald
Date: Fri Oct 19 15:03:05 2007
New Revision: 29677

URL: http://svn.reactos.org/svn/reactos?rev=29677&view=rev
Log:
- add printer folder 
- patch by Huw D M Davies
(http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html)
- register bitbucket context menu extension

Added:
    trunk/reactos/dll/win32/shell32/shfldr_printers.c   (with props)
Modified:
    trunk/reactos/dll/win32/shell32/recyclebin.c
    trunk/reactos/dll/win32/shell32/regsvr.c
    trunk/reactos/dll/win32/shell32/shell32.rbuild
    trunk/reactos/dll/win32/shell32/shell32_main.h
    trunk/reactos/dll/win32/shell32/shellole.c

Modified: trunk/reactos/dll/win32/shell32/recyclebin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb…
==============================================================================
--- trunk/reactos/dll/win32/shell32/recyclebin.c (original)
+++ trunk/reactos/dll/win32/shell32/recyclebin.c Fri Oct 19 15:03:05 2007
@@ -175,7 +175,7 @@
             || IsEqualGUID(riid, &IID_IPersistFolder2))
         *ppvObject = &This->lpPersistFolderVtbl;
 
-    if (IsEqualGUID(riid, &IID_IContextMenu))
+    if (IsEqualIID(riid, &IID_IContextMenu))
         *ppvObject = &This->lpCmt;
 
     if (*ppvObject != NULL)
@@ -586,6 +586,12 @@
     FIXME("stub\n");
     return S_OK;
 }
+
+/*************************************************************************
+ * BitBucket context menu
+ *
+ */
+
 static HRESULT WINAPI
 RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void**
ppvObject )
 {
@@ -622,16 +628,17 @@
         return E_INVALIDARG;
 
     memset( &mii, 0, sizeof(mii) );
-    mii.cbSize = sizeof (mii);
+    mii.cbSize = sizeof(mii);
     mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
     mii.dwTypeData = (LPWSTR)szOpen;
     mii.cch = strlenW( mii.dwTypeData );
     mii.wID = idCmdFirst + id++;
     mii.fState = MFS_ENABLED;
     mii.fType = MFT_STRING;
+
     if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii ))
         return E_FAIL;
-    This->iIdOpen = 0;
+    This->iIdOpen = 1;
 
     mii.fState = MFS_ENABLED;
     mii.dwTypeData = (LPWSTR)szEmpty;
@@ -642,9 +649,7 @@
         TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item
properties");
         return E_FAIL;
     }
-    This->iIdEmpty = 1;
-    id++;
-
+    This->iIdEmpty = 2;
     mii.fState = MFS_ENABLED;
     mii.dwTypeData = (LPWSTR)szProperties;
     mii.cch = strlenW( mii.dwTypeData );
@@ -654,9 +659,7 @@
         TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item
properties");
         return E_FAIL;
     }
-    This->iIdProperties = 2;
-    id++;
-
+    This->iIdProperties = 3;
     return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id );
 }
 
@@ -665,9 +668,16 @@
 {
     RecycleBin * This = impl_from_IContextMenu(iface);
 
-    TRACE("%p %p\n", This, lpici );
-
-    return E_FAIL;
+    TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb);
+
+    if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties))
+    {
+       WCHAR szDrive = 'C';
+       SH_ShowRecycleBinProperties(szDrive);
+       return S_OK;
+    }
+
+    return S_OK;
 }
 
 static HRESULT WINAPI

Modified: trunk/reactos/dll/win32/shell32/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c…
==============================================================================
--- trunk/reactos/dll/win32/shell32/regsvr.c (original)
+++ trunk/reactos/dll/win32/shell32/regsvr.c Fri Oct 19 15:03:05 2007
@@ -75,6 +75,7 @@
     LPCSTR clsid_str;		/* can be NULL to omit */
     LPCSTR progid;		/* can be NULL to omit */
     UINT idDefaultIcon;         /* can be 0 to omit */
+//    CLSID const *clsid_menu; /* can be NULL to omit */
 };
 
 /* flags for regsvr_coclass.flags */
@@ -131,6 +132,7 @@
     'a', 'u', 'l', 't', 'M', 'e',
'n', 'u', 0 };
 static WCHAR const defaulticon_keyname[] = {
    
'D','e','f','a','u','l','t','I','c','o','n',0};
+static WCHAR const contextmenu_keyname[] = { 'C', 'o', 'n',
't', 'e', 'x', 't', 'M', 'e', 'n',
'u', 'H', 'a', 'n', 'd', 'l', 'e',
'r', 's', 0 };
 static char const tmodel_valuename[] = "ThreadingModel";
 static char const wfparsing_valuename[] = "WantsFORPARSING";
 static char const attributes_valuename[] = "Attributes";
@@ -375,6 +377,28 @@
 	    RegCloseKey(progid_key);
 	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
 	}
+    if (IsEqualIID(list->clsid, &CLSID_RecycleBin)) {//if (list->clsid_menu) {
+        HKEY shellex_key, cmenu_key, menuhandler_key;
+	    res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0,
+				  KEY_READ | KEY_WRITE, NULL,
+				  &shellex_key, NULL);
+	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+	    res = RegCreateKeyExW(shellex_key, contextmenu_keyname, 0, NULL, 0,
+				  KEY_READ | KEY_WRITE, NULL,
+				  &cmenu_key, NULL);
+        if (res != ERROR_SUCCESS) {
+            RegCloseKey(shellex_key);
+            goto error_close_clsid_key;
+        }
+
+	    StringFromGUID2(list->clsid, buf, 39); //clsid_menu
+	    res = RegCreateKeyExW(cmenu_key, buf, 0, NULL, 0,
+				  KEY_READ | KEY_WRITE, NULL,
+				  &menuhandler_key, NULL);
+        RegCloseKey(menuhandler_key);
+        RegCloseKey(cmenu_key);
+        RegCloseKey(shellex_key);
+    }
 
     error_close_clsid_key:
 	RegCloseKey(clsid_key);
@@ -555,6 +579,13 @@
         "shell32.dll",
         "Apartment"
     },
+    {   &CLSID_Printers,
+        "Printers & Fax",
+	0,
+        NULL,
+        "shell32.dll",
+        "Apartment"
+    },
     {   &CLSID_MyComputer,
 	"My Computer",
 	IDS_MYCOMPUTER,
@@ -634,6 +665,7 @@
 	NULL,
 	NULL,
 	IDI_SHELL_FULL_RECYCLE_BIN
+//    &CLSID_RecycleBin
     },
     {   &CLSID_ShellFSFolder,
 	"Shell File System Folder",

Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32.rbuild (original)
+++ trunk/reactos/dll/win32/shell32/shell32.rbuild Fri Oct 19 15:03:05 2007
@@ -24,6 +24,7 @@
 	<library>version</library>
 	<library>devmgr</library>
 	<library>rtl</library>
+	<library>winspool</library>
 	<file>authors.c</file>
 	<file>autocomplete.c</file>
 	<file>brsfolder.c</file>
@@ -52,6 +53,7 @@
 	<file>shfldr_desktop.c</file>
 	<file>shfldr_fs.c</file>
 	<file>shfldr_mycomp.c</file>
+	<file>shfldr_printers.c</file>
 	<file>shlexec.c</file>
 	<file>shlfileop.c</file>
 	<file>shlfolder.c</file>

Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Oct 19 15:03:05 2007
@@ -90,6 +90,7 @@
 HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid,
LPCITEMIDLIST pidl, LPVOID * ppv);
 HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
 HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
+HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
 HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);
 HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV);
 HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
ppv);

Modified: trunk/reactos/dll/win32/shell32/shellole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellole.c (original)
+++ trunk/reactos/dll/win32/shell32/shellole.c Fri Oct 19 15:03:05 2007
@@ -75,6 +75,7 @@
 	{&CLSID_FolderShortcut, &FolderShortcut_Constructor},
 	{&CLSID_MyDocuments,    &MyDocuments_Constructor},
 #endif
+    {&CLSID_Printers,       &ISF_Printers_Constructor},
 	{&CLSID_RecycleBin,     &RecycleBin_Constructor},
 	{NULL,NULL}
 };

Added: trunk/reactos/dll/win32/shell32/shfldr_printers.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_printers.c (added)
+++ trunk/reactos/dll/win32/shell32/shfldr_printers.c Fri Oct 19 15:03:05 2007
@@ -1,0 +1,847 @@
+/*
+ *    Virtual Printers Folder
+ *
+ *    Copyright 1997                Marcus Meissner
+ *    Copyright 1998, 1999, 2002    Juergen Schmied
+ *    Copyright 2005                Huw Davies
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winspool.h"
+
+#include "ole2.h"
+#include "shlguid.h"
+
+#include "enumidlist.h"
+#include "pidl.h"
+#include "undocshell.h"
+#include "shell32_main.h"
+#include "shresdef.h"
+#include "shlwapi.h"
+#include "shellfolder.h"
+#include "wine/debug.h"
+#include "debughlp.h"
+#include "shfldr.h"
+#include "shresdef.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL (shell);
+
+/***********************************************************************
+ *   Printers_IExtractIconW implementation
+ */
+typedef struct
+{
+    IExtractIconWVtbl *lpVtbl;
+    IExtractIconAVtbl *lpvtblExtractIconA;	
+    volatile LONG              ref;
+    LPITEMIDLIST       pidl;
+} IExtractIconWImpl;
+
+#define _IExtractIconA_Offset
((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA)))
+#define _ICOM_THIS_From_IExtractIconA(class, name) class* This =
(class*)(((char*)name)-_IExtractIconA_Offset);
+
+/**************************************************************************
+ *  IExtractIconW_QueryInterface
+ */
+static HRESULT WINAPI IEI_Printers_fnQueryInterface(IExtractIconW *iface, REFIID riid,
LPVOID *ppvObj)
+{
+    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
+
+    TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj);
+
+    *ppvObj = NULL;
+
+    if (IsEqualIID(riid, &IID_IUnknown))
+    {
+        *ppvObj = This;
+    }
+    else if (IsEqualIID(riid, &IID_IExtractIconW))
+    {
+        *ppvObj = (IExtractIconW*)This;
+    }
+    else if (IsEqualIID(riid, &IID_IExtractIconA))
+    {
+        *ppvObj = (IExtractIconA*)&(This->lpvtblExtractIconA);
+    }
+
+    if(*ppvObj)
+    {
+        IExtractIconW_AddRef((IExtractIconW*) *ppvObj);
+        TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+        return S_OK;
+    }
+    TRACE("-- Interface: E_NOINTERFACE\n");
+    return E_NOINTERFACE;
+}
+
+/**************************************************************************
+ *  IExtractIconW_AddRef
+ */
+static ULONG WINAPI IEI_Printers_fnAddRef(IExtractIconW * iface)
+{
+    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
+    ULONG refCount = InterlockedIncrement(&This->ref);
+
+    TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
+
+    return refCount;
+}
+
+/**************************************************************************
+ *  IExtractIconW_Release
+ */
+static ULONG WINAPI IEI_Printers_fnRelease(IExtractIconW * iface)
+{
+    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
+    ULONG refCount = InterlockedDecrement(&This->ref);
+
+    TRACE("(%p)->(count=%lu)\n", This, refCount + 1);
+
+    if (!refCount)
+    {
+        TRACE(" destroying IExtractIcon(%p)\n",This);
+        SHFree(This->pidl);
+        HeapFree(GetProcessHeap(),0,This);
+        return 0;
+    }
+    return refCount;
+}
+
+/**************************************************************************
+ *  IExtractIconW_GetIconLocation
+ *
+ * mapping filetype to icon
+ */
+static HRESULT WINAPI IEI_Printers_fnGetIconLocation(
+        IExtractIconW * iface,
+        UINT uFlags,		/* GIL_ flags */
+        LPWSTR szIconFile,
+        UINT cchMax,
+        int *piIndex,
+        UINT *pwFlags)		/* returned GIL_ flags */
+{
+    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
+
+    TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax,
piIndex, pwFlags);
+
+    if (pwFlags)
+        *pwFlags = 0;
+
+    lstrcpynW(szIconFile, swShell32Name, cchMax);
+    *piIndex = -IDI_SHELL_PRINTER; /* FIXME: other icons for default, network, print to
file */
+
+    TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex);
+    return NOERROR;
+}
+
+/**************************************************************************
+ *  IExtractIconW_Extract
+ */
+static HRESULT WINAPI IEI_Printers_fnExtract(IExtractIconW *iface, LPCWSTR pszFile,
+                                             UINT nIconIndex, HICON *phiconLarge,
+                                             HICON *phiconSmall, UINT nIconSize)
+{
+    IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
+    int index;
+
+    FIXME("(%p) (file=%p index=%d %p %p size=%x) semi-stub\n", This,
debugstr_w(pszFile),
+          (signed)nIconIndex, phiconLarge, phiconSmall, nIconSize);
+
+    index = SIC_GetIconIndex(pszFile, nIconIndex, 0);
+
+    if (phiconLarge)
+        *phiconLarge = ImageList_GetIcon(ShellBigIconList, index, ILD_TRANSPARENT);
+
+    if (phiconSmall)
+        *phiconSmall = ImageList_GetIcon(ShellSmallIconList, index, ILD_TRANSPARENT);
+
+    return S_OK;
+}
+
+static struct IExtractIconWVtbl eivt =
+{
+    IEI_Printers_fnQueryInterface,
+    IEI_Printers_fnAddRef,
+    IEI_Printers_fnRelease,
+    IEI_Printers_fnGetIconLocation,
+    IEI_Printers_fnExtract
+};
+
+/**************************************************************************
+ *  IExtractIconA_QueryInterface
+ */
+static HRESULT WINAPI IEIA_Printers_fnQueryInterface(IExtractIconA * iface, REFIID riid,
LPVOID *ppvObj)
+{
+    _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface);
+
+    return IExtractIconW_QueryInterface(This, riid, ppvObj);
+}
+
+/**************************************************************************
+ *  IExtractIconA_AddRef
+ */
+static ULONG WINAPI IEIA_Printers_fnAddRef(IExtractIconA * iface)
+{
+    _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface);
+
+    return IExtractIconW_AddRef(This);
+}
+/**************************************************************************
+ *  IExtractIconA_Release
+ */
+static ULONG WINAPI IEIA_Printers_fnRelease(IExtractIconA * iface)
+{
+    _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface);
+
+    return IExtractIconW_AddRef(This);
+}
+
+/**************************************************************************
+ *  IExtractIconA_GetIconLocation
+ */
+static HRESULT WINAPI IEIA_Printers_fnGetIconLocation(
+	IExtractIconA * iface,
+	UINT uFlags,
+	LPSTR szIconFile,
+	UINT cchMax,
+	int * piIndex,
+	UINT * pwFlags)
+{
+    HRESULT ret;
+    LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR));
+    _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface);
+
+    TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax,
piIndex, pwFlags);
+
+    ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex,
pwFlags);
+    WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL);
+    HeapFree(GetProcessHeap(), 0, lpwstrFile);
+
+    TRACE("-- %s %x\n", szIconFile, *piIndex);
+    return ret;
+}
+/**************************************************************************
+ *  IExtractIconA_Extract
+ */
+static HRESULT WINAPI IEIA_Printers_fnExtract(IExtractIconA *iface, LPCSTR pszFile,
+                                     UINT nIconIndex, HICON *phiconLarge,
+                                     HICON *phiconSmall, UINT nIconSize)
+{
+    HRESULT ret;
+    INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0);
+    LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+    _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface);
+
+    TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex,
phiconLarge, phiconSmall, nIconSize);
+
+    MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len);
+    ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall,
nIconSize);
+    HeapFree(GetProcessHeap(), 0, lpwstrFile);
+    return ret;
+}
+
+static struct IExtractIconAVtbl eiavt =
+{
+    IEIA_Printers_fnQueryInterface,
+    IEIA_Printers_fnAddRef,
+    IEIA_Printers_fnRelease,
+    IEIA_Printers_fnGetIconLocation,
+    IEIA_Printers_fnExtract
+};
+
+/**************************************************************************
+ *  IExtractIcon_Constructor
+ */
+static IUnknown *IEI_Printers_Constructor(LPCITEMIDLIST pidl)
+{
+    IExtractIconWImpl* ei;
+	
+    TRACE("%p\n", pidl);
+
+    ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl));
+    ei->ref = 1;
+    ei->lpVtbl = &eivt;
+    ei->lpvtblExtractIconA = &eiavt;
+    ei->pidl=ILClone(pidl);
+
+    pdump(pidl);
+
+    TRACE("(%p)\n", ei);
+    return (IUnknown *)ei;
+}
+
+/***********************************************************************
+ *     Printers folder implementation
+ */
+
+typedef struct {
+    IShellFolder2Vtbl *lpVtbl;
+    IPersistFolder2Vtbl *lpVtblPersistFolder2;
+
+    DWORD ref;
+
+    CLSID *pclsid;
+
+    LPITEMIDLIST pidlRoot;  /* absolute pidl */
+
+    int dwAttributes;        /* attributes returned by GetAttributesOf FIXME: use it */
+} IGenericSFImpl;
+
+#define _IPersistFolder2_Offset
((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This =
(class*)(((char*)name)-_IPersistFolder2_Offset);
+
+#define _IUnknown_(This)    (IShellFolder*)&(This->lpVtbl)
+#define _IShellFolder_(This)    (IShellFolder*)&(This->lpVtbl)
+
+#define _IPersist_(This)    (IPersist*)&(This->lpVtblPersistFolder2)
+#define _IPersistFolder_(This)    (IPersistFolder*)&(This->lpVtblPersistFolder2)
+#define _IPersistFolder2_(This)   
(IPersistFolder2*)&(This->lpVtblPersistFolder2)
+
+/**************************************************************************
+ *    ISF_Printers_fnQueryInterface
+ *
+ * NOTE does not support IPersist/IPersistFolder
+ */
+static HRESULT WINAPI ISF_Printers_fnQueryInterface(
+                IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
+
+    *ppvObj = NULL;
+
+    if (IsEqualIID (riid, &IID_IUnknown) ||
+        IsEqualIID (riid, &IID_IShellFolder) ||
+        IsEqualIID (riid, &IID_IShellFolder2))
+    {
+        *ppvObj = This;
+    }
+
+    else if (IsEqualIID (riid, &IID_IPersist) ||
+             IsEqualIID (riid, &IID_IPersistFolder) ||
+             IsEqualIID (riid, &IID_IPersistFolder2))
+    {
+        *ppvObj = _IPersistFolder2_ (This);
+    }
+
+    if (*ppvObj)
+    {
+        IUnknown_AddRef ((IUnknown *) (*ppvObj));
+        TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj);
+        return S_OK;
+    }
+    TRACE ("-- Interface: E_NOINTERFACE\n");
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ISF_Printers_fnAddRef (IShellFolder2 * iface)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    ULONG refCount = InterlockedIncrement(&This->ref);
+
+    TRACE ("(%p)->(count=%lu)\n", This, refCount - 1);
+
+    return refCount;
+}
+
+static ULONG WINAPI ISF_Printers_fnRelease (IShellFolder2 * iface)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    ULONG refCount = InterlockedDecrement(&This->ref);
+
+    TRACE ("(%p)->(count=%lu)\n", This, refCount + 1);
+
+    if (!refCount)
+    {
+        TRACE ("-- destroying IShellFolder(%p)\n", This);
+        if (This->pidlRoot)
+            SHFree (This->pidlRoot);
+        LocalFree ((HLOCAL) This);
+        return 0;
+    }
+    return refCount;
+}
+
+/**************************************************************************
+ *    ISF_Printers_fnParseDisplayName
+ *
+ * This is E_NOTIMPL in Windows too.
+ */
+static HRESULT WINAPI ISF_Printers_fnParseDisplayName (IShellFolder2 * iface,
+                HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName,
+                DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    TRACE("(%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;
+
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *  CreatePrintersEnumList()
+ */
+static BOOL CreatePrintersEnumList(IEnumIDList *list, DWORD dwFlags)
+{
+    BOOL ret = TRUE;
+
+    TRACE("(%p)->(flags=0x%08lx) \n",list,dwFlags);
+
+    /* enumerate the folders */
+    if (dwFlags & SHCONTF_NONFOLDERS)
+    {
+        DWORD needed, num, i;
+        PRINTER_INFO_4W *pi;
+        
+        EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, NULL, 0, &needed, &num);
+        pi = HeapAlloc(GetProcessHeap(), 0, needed);
+        if(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, (LPBYTE)pi, needed, &needed,
&num)) {
+            HeapFree(GetProcessHeap(), 0, pi);
+            return FALSE;
+        }
+
+        for(i = 0; i < num; i++) {
+            DWORD len = strlenW(pi[i].pPrinterName);
+            LPITEMIDLIST pidl = _ILAlloc(PT_VALUEW, (len + 1) * sizeof(WCHAR));
+            LPPIDLDATA data = _ILGetDataPointer(pidl);
+            memcpy(data->u.valueW.name, pi[i].pPrinterName, (len + 1) *
sizeof(WCHAR));
+            AddToEnumList(list, pidl);
+        }
+
+        HeapFree(GetProcessHeap(), 0, pi);
+    }
+    return ret;
+}
+
+/**************************************************************************
+ *        ISF_Printers_fnEnumObjects
+ */
+static HRESULT WINAPI ISF_Printers_fnEnumObjects (IShellFolder2 * iface,
+                HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n",
+           This, hwndOwner, dwFlags, ppEnumIDList);
+
+    if(!ppEnumIDList) return E_OUTOFMEMORY;
+    *ppEnumIDList = IEnumIDList_Constructor();
+    if (*ppEnumIDList)
+        CreatePrintersEnumList(*ppEnumIDList, dwFlags);
+
+    TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);
+
+    return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
+}
+
+/**************************************************************************
+ *        ISF_Printers_fnBindToObject
+ */
+static HRESULT WINAPI ISF_Printers_fnBindToObject (IShellFolder2 * iface,
+                LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(pidl=%p,%p,%s,%p)\n",
+           This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
+
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *    ISF_Printers_fnBindToStorage
+ */
+static HRESULT WINAPI ISF_Printers_fnBindToStorage (IShellFolder2 * iface,
+                LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n",
+           This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut);
+
+    *ppvOut = NULL;
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *     ISF_Printers_fnCompareIDs
+ */
+static HRESULT WINAPI ISF_Printers_fnCompareIDs (IShellFolder2 * iface,
+                        LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p): stub\n", This, lParam, pidl1,
pidl2);
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *    ISF_Printers_fnCreateViewObject
+ */
+static HRESULT WINAPI ISF_Printers_fnCreateViewObject (IShellFolder2 * iface,
+                              HWND hwndOwner, REFIID riid, LPVOID * ppvOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(hwnd=%p,%s,%p): stub\n",
+           This, hwndOwner, shdebugstr_guid (riid), ppvOut);
+
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *  ISF_Printers_fnGetAttributesOf
+ */
+static HRESULT WINAPI ISF_Printers_fnGetAttributesOf (IShellFolder2 * iface,
+                UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(cidl=%d apidl=%p mask=0x%08lx): stub\n",
+           This, cidl, apidl, *rgfInOut);
+
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *    ISF_Printers_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_Printers_fnGetUIObjectOf (IShellFolder2 * iface,
+                HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl,
+                REFIID riid, UINT * prgfInOut, LPVOID * ppvOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    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)
+        return hr;
+
+    *ppvOut = NULL;
+
+    if ((IsEqualIID (riid, &IID_IExtractIconA) || IsEqualIID(riid,
&IID_IExtractIconW)) && (cidl == 1))
+    {
+        IUnknown *pUnk = IEI_Printers_Constructor(apidl[0]);
+        hr = IUnknown_QueryInterface(pUnk, riid, (void**)&pObj);
+        IUnknown_Release(pUnk);
+    }
+    else
+        hr = E_NOINTERFACE;
+
+    if (SUCCEEDED(hr) && !pObj)
+        hr = E_OUTOFMEMORY;
+
+    *ppvOut = pObj;
+    TRACE ("(%p)->hr=0x%08lx\n", This, hr);
+    return hr;
+}
+
+/**************************************************************************
+ *    ISF_Printers_fnGetDisplayNameOf
+ *
+ */
+static HRESULT WINAPI ISF_Printers_fnGetDisplayNameOf (IShellFolder2 * iface,
+                LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    WCHAR *name;
+    DWORD len;
+
+    TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet);
+    pdump (pidl);
+
+    if (!strRet)
+        return E_INVALIDARG;
+
+    name = _ILGetDataPointer(pidl)->u.valueW.name;
+    len = strlenW(name);
+
+    strRet->uType = STRRET_WSTR;
+    strRet->u.pOleStr = SHAlloc((len + 1) * sizeof(WCHAR));
+    memcpy(strRet->u.pOleStr, name, (len + 1) * sizeof(WCHAR));
+
+    TRACE("ret %s\n", debugstr_w(strRet->u.pOleStr));
+
+    return S_OK;
+}
+
+/**************************************************************************
+ *  ISF_Printers_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_Printers_fnSetNameOf (IShellFolder2 * iface,
+                HWND hwndOwner, LPCITEMIDLIST pidl,    /* simple pidl */
+                LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl,
+           debugstr_w (lpName), dwFlags, pPidlOut);
+
+    return E_FAIL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnGetDefaultSearchGUID(IShellFolder2 *iface,
+                GUID * pguid)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)\n", This);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnEnumSearches (IShellFolder2 *iface,
+                IEnumExtraSearch ** ppenum)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    FIXME ("(%p)\n", This);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnGetDefaultColumn (IShellFolder2 * iface,
+                DWORD dwRes, ULONG * pSort, ULONG * pDisplay)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p): stub\n", This);
+
+    return E_NOTIMPL;
+}
+static HRESULT WINAPI ISF_Printers_fnGetDefaultColumnState (
+                IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p): stub\n", This);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnGetDetailsEx (IShellFolder2 * iface,
+                LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    FIXME ("(%p): stub\n", This);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnGetDetailsOf (IShellFolder2 * iface,
+                LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+
+    FIXME ("(%p)->(%p %i %p): stub\n", This, pidl, iColumn, psd);
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ISF_Printers_fnMapColumnToSCID (
+                IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid)
+{
+    IGenericSFImpl *This = (IGenericSFImpl *)iface;
+    FIXME ("(%p): stub\n", This);
+    return E_NOTIMPL;
+}
+
+static IShellFolder2Vtbl vt_ShellFolder2 =
+{
+    ISF_Printers_fnQueryInterface,
+    ISF_Printers_fnAddRef,
+    ISF_Printers_fnRelease,
+    ISF_Printers_fnParseDisplayName,
+    ISF_Printers_fnEnumObjects,
+    ISF_Printers_fnBindToObject,
+    ISF_Printers_fnBindToStorage,
+    ISF_Printers_fnCompareIDs,
+    ISF_Printers_fnCreateViewObject,
+    ISF_Printers_fnGetAttributesOf,
+    ISF_Printers_fnGetUIObjectOf,
+    ISF_Printers_fnGetDisplayNameOf,
+    ISF_Printers_fnSetNameOf,
+    /* ShellFolder2 */
+    ISF_Printers_fnGetDefaultSearchGUID,
+    ISF_Printers_fnEnumSearches,
+    ISF_Printers_fnGetDefaultColumn,
+    ISF_Printers_fnGetDefaultColumnState,
+    ISF_Printers_fnGetDetailsEx,
+    ISF_Printers_fnGetDetailsOf,
+    ISF_Printers_fnMapColumnToSCID
+};
+
+/************************************************************************
+ *    IPF_Printers_QueryInterface
+ */
+static HRESULT WINAPI IPF_Printers_QueryInterface (
+               IPersistFolder2 * iface, REFIID iid, LPVOID * ppvObj)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+    TRACE ("(%p)\n", This);
+
+    return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj);
+}
+
+/************************************************************************
+ *    IPF_Printers_AddRef
+ */
+static ULONG WINAPI IPF_Printers_AddRef (IPersistFolder2 * iface)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+    TRACE ("(%p)->(count=%lu)\n", This, This->ref);
+
+    return IUnknown_AddRef (_IUnknown_ (This));
+}
+
+/************************************************************************
+ *    IPF_Printers_Release
+ */
+static ULONG WINAPI IPF_Printers_Release (IPersistFolder2 * iface)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+    TRACE ("(%p)->(count=%lu)\n", This, This->ref);
+
+    return IUnknown_Release (_IUnknown_ (This));
+}
+
+/************************************************************************
+ *    IPF_Printers_GetClassID
+ */
+static HRESULT WINAPI IPF_Printers_GetClassID (
+               IPersistFolder2 * iface, CLSID * lpClassId)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+    TRACE ("(%p)\n", This);
+
+    *lpClassId = CLSID_Printers;
+
+    return S_OK;
+}
+
+/************************************************************************
+ *    IPF_Printers_Initialize
+ *
+ */
+static HRESULT WINAPI IPF_Printers_Initialize (
+               IPersistFolder2 * iface, LPCITEMIDLIST pidl)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+    FIXME ("(%p)->(%p): stub\n", This, pidl);
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+ *    IPF_Printers_fnGetCurFolder
+ */
+static HRESULT WINAPI IPF_Printers_GetCurFolder (
+               IPersistFolder2 * iface, LPITEMIDLIST * pidl)
+{
+    _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface);
+
+    TRACE ("(%p)->(%p)\n", This, pidl);
+
+    *pidl = ILClone (This->pidlRoot);
+    return S_OK;
+}
+
+static IPersistFolder2Vtbl vt_PersistFolder2 =
+{
+    IPF_Printers_QueryInterface,
+    IPF_Printers_AddRef,
+    IPF_Printers_Release,
+    IPF_Printers_GetClassID,
+    IPF_Printers_Initialize,
+    IPF_Printers_GetCurFolder
+};
+
+/**************************************************************************
+ *    ISF_Printers_Constructor
+ */
+HRESULT WINAPI ISF_Printers_Constructor (
+                IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv)
+{
+    IGenericSFImpl *sf;
+    HRESULT hr;
+
+    TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid));
+
+    if (pUnkOuter)
+        return CLASS_E_NOAGGREGATION;
+
+    sf = HeapAlloc( GetProcessHeap(), 0, sizeof(*sf) );
+    if (!sf)
+        return E_OUTOFMEMORY;
+
+    sf->ref = 1;
+    sf->lpVtbl = &vt_ShellFolder2;
+    sf->lpVtblPersistFolder2 = &vt_PersistFolder2;
+
+    sf->pidlRoot = _ILCreatePrinters();    /* my qualified pidl */
+
+    hr = IUnknown_QueryInterface( _IUnknown_(sf), riid, ppv );
+    IUnknown_Release( _IUnknown_(sf) );
+
+    TRACE ("--(%p)\n", *ppv);
+    return hr;
+}

Propchange: trunk/reactos/dll/win32/shell32/shfldr_printers.c
------------------------------------------------------------------------------
    svn:eol-style = native