[ros-diffs] [janderwald] 30152: - implement IShellExtInit interface for recycle bin - fix a bug in SH_LoadDynamicContextMenuHandlers

Author: janderwald
Date: Mon Nov  5 12:37:09 2007
New Revision: 30152

URL: http://svn.reactos.org/svn/reactos?rev=30152&view=rev
Log:
- implement IShellExtInit interface for recycle bin
- fix a bug in SH_LoadDynamicContextMenuHandlers

Modified:
    trunk/reactos/dll/win32/shell32/recyclebin.c
    trunk/reactos/dll/win32/shell32/shv_item_cmenu.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 Mon Nov  5 12:37:09 2007
@@ -106,6 +106,7 @@
     const IShellFolder2Vtbl *lpVtbl;
     const IPersistFolder2Vtbl *lpPersistFolderVtbl;
     const IContextMenuVtbl *lpCmt;
+	const IShellExtInitVtbl *lpSEI;
     LONG refCount;
 
     INT iIdOpen;
@@ -118,6 +119,7 @@
 static const IContextMenuVtbl recycleBincmVtbl;
 static const IShellFolder2Vtbl recycleBinVtbl;
 static const IPersistFolder2Vtbl recycleBinPersistVtbl;
+static const IShellExtInitVtbl eivt;
 
 static RecycleBin *impl_from_IContextMenu(IContextMenu *iface)
 {
@@ -127,6 +129,11 @@
 static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface)
 {
     return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin,
lpPersistFolderVtbl));
+}
+
+static inline RecycleBin *impl_from_IShellExtInit( IShellExtInit *iface )
+{
+    return (RecycleBin *)((char*)iface - FIELD_OFFSET(RecycleBin, lpSEI));
 }
 
 static void RecycleBin_Destructor(RecycleBin *This);
@@ -143,6 +150,7 @@
         return E_OUTOFMEMORY;
     ZeroMemory(obj, sizeof(RecycleBin));
     obj->lpVtbl = &recycleBinVtbl;
+	obj->lpSEI = &eivt;
     obj->lpPersistFolderVtbl = &recycleBinPersistVtbl;
     obj->lpCmt = &recycleBincmVtbl;
     if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput)))
@@ -177,6 +185,11 @@
 
     if (IsEqualIID(riid, &IID_IContextMenu))
         *ppvObject = &This->lpCmt;
+    
+    if(IsEqualIID(riid, &IID_IShellExtInit))
+    {
+        *ppvObject = &(This->lpSEI);
+    }
 
     if (*ppvObject != NULL)
     {
@@ -588,6 +601,47 @@
     FIXME("stub\n");
     return S_OK;
 }
+/*************************************************************************
+ * BitBucket IShellExtInit interface
+ */
+
+static HRESULT WINAPI
+RecycleBin_ExtInit_QueryInterface( IShellExtInit* iface, REFIID riid, void** ppvObject )
+{
+    return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IShellExtInit(iface),
riid, ppvObject);
+}
+
+static ULONG WINAPI
+RecycleBin_ExtInit_AddRef( IShellExtInit* iface )
+{
+    return RecycleBin_AddRef((IShellFolder2 *)impl_from_IShellExtInit(iface));
+}
+
+static ULONG WINAPI
+RecycleBin_ExtInit_Release( IShellExtInit* iface )
+{
+    return RecycleBin_Release((IShellFolder2 *)impl_from_IShellExtInit(iface));
+}
+
+static HRESULT WINAPI
+RecycleBin_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder,
+                              IDataObject *pdtobj, HKEY hkeyProgID )
+{
+    RecycleBin *This = impl_from_IShellExtInit(iface);
+
+    TRACE("%p %p %p %p\n", This, pidlFolder, pdtobj, hkeyProgID );
+    return S_OK;
+}
+
+
+static const IShellExtInitVtbl eivt =
+{
+    RecycleBin_ExtInit_QueryInterface,
+    RecycleBin_ExtInit_AddRef,
+    RecycleBin_ExtInit_Release,
+    RecycleBin_ExtInit_Initialize
+};
+
 
 /*************************************************************************
  * BitBucket context menu

Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original)
+++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Mon Nov  5 12:37:09 2007
@@ -338,7 +338,8 @@
             hr = StringFromCLSID(guid, &pwszCLSID);
             if (hr == S_OK)
             {
-                memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR));
+                wcscpy(&buffer[6], pwszCLSID);
+                TRACE("buffer %s\n", debugstr_w(buffer));
                 SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj,
bGroupPolicyActive);
             }
         }