[ros-diffs] [janderwald] 30426: - call CDefFolderMenu_Create2 to create the context menus - should ignore cidl account as the implementation should handle this automatically - will be enabled for the background context menus later

[janderwald at svn.reactos.org]

Author: janderwald
Date: Tue Nov 13 22:30:27 2007
New Revision: 30426

URL: http://svn.reactos.org/svn/reactos?rev=30426&view=rev
Log:
- call CDefFolderMenu_Create2 to create the context menus
- should ignore cidl account as the implementation should handle this automatically
- will be enabled for the background context menus later

Modified:
    trunk/reactos/dll/win32/shell32/cpanelfolder.c
    trunk/reactos/dll/win32/shell32/shfldr_desktop.c
    trunk/reactos/dll/win32/shell32/shfldr_fs.c
    trunk/reactos/dll/win32/shell32/shfldr_mycomp.c

Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfolder.c?rev=30426&r1=30425&r2=30426&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/cpanelfolder.c (original)
+++ trunk/reactos/dll/win32/shell32/cpanelfolder.c Tue Nov 13 22:30:27 2007
@@ -611,8 +611,7 @@
 	*ppvOut = NULL;
 
 	if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) {
-	    pObj = (LPUNKNOWN) ISvItemCm_Constructor((IShellFolder *) iface, This->pidlRoot, apidl, cidl);
-	    hr = S_OK;
+        hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj);
 	} else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) {
 	    pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl);
 	    hr = S_OK;

Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_desktop.c?rev=30426&r1=30425&r2=30426&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Tue Nov 13 22:30:27 2007
@@ -487,11 +487,7 @@
 
     if (IsEqualIID (riid, &IID_IContextMenu))
     {
-        if (cidl > 0)
-            pObj = (LPUNKNOWN) ISvItemCm_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl);
-        else
-            pObj = (LPUNKNOWN) ISvBgCm_Constructor( (IShellFolder *) iface, TRUE);
-        hr = S_OK;
+        hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj);
     }
     else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1))
     {

Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_fs.c?rev=30426&r1=30425&r2=30426&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_fs.c (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_fs.c Tue Nov 13 22:30:27 2007
@@ -652,9 +652,7 @@
         *ppvOut = NULL;
 
         if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) {
-            pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface,
-             This->pidlRoot, apidl, cidl);
-            hr = S_OK;
+            hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj);
         } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) {
             pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner,
              This->pidlRoot, apidl, cidl);

Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_mycomp.c?rev=30426&r1=30425&r2=30426&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Tue Nov 13 22:30:27 2007
@@ -519,9 +519,7 @@
 
     if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1))
     {
-        pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface,
-                                              This->pidlRoot, apidl, cidl);
-        hr = S_OK;
+        hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj);
     }
     else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1))
     {