[ros-diffs] [mf] 14011: remove temporary desktop context menu code from explorer

remove temporary desktop context menu code from explorer
Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
  _____  

Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp
--- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp
2005-03-13 15:29:53 UTC (rev 14010)
+++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp
2005-03-13 15:30:29 UTC (rev 14011)
@@ -526,7 +526,7 @@

 {
 	switch(nmsg) {
 	  case WM_CONTEXTMENU:
-		if (!DoContextMenu(GET_X_LPARAM(lparam),
GET_Y_LPARAM(lparam), _cm_ifs))
+		if (!DoContextMenu(GET_X_LPARAM(lparam),
GET_Y_LPARAM(lparam)))
 			DoDesktopContextMenu(GET_X_LPARAM(lparam),
GET_Y_LPARAM(lparam));
 		break;
 
@@ -558,7 +558,7 @@
 	return super::Notify(id, pnmh);
 }
 
-bool DesktopShellView::DoContextMenu(int x, int y, CtxMenuInterfaces&
cm_ifs)
+bool DesktopShellView::DoContextMenu(int x, int y)
 {
 	IDataObject* selection;
 
@@ -588,7 +588,7 @@
 	for(int i=pida->cidl; i>0; --i)
 		apidl[i-1] = (LPCITEMIDLIST)
((LPBYTE)pida+pida->aoffset[i]);
 
-	hr = ShellFolderContextMenu(ShellFolder(parent_pidl), _hwnd,
pida->cidl, apidl, x, y, cm_ifs);
+	hr = ShellFolderContextMenu(ShellFolder(parent_pidl), _hwnd,
pida->cidl, apidl, x, y, _cm_ifs);
 
 	selection->Release();
 
@@ -612,7 +612,6 @@
 			hr = pcm->QueryContextMenu(hmenu, 0,
FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST-1, CMF_NORMAL|CMF_EXPLORE);
 
 			if (SUCCEEDED(hr)) {
-				AppendMenu(hmenu, 0, FCIDM_SHVIEWLAST-3,
ResString(IDS_PROPERTIES_EXPLORER));
 				AppendMenu(hmenu, MF_SEPARATOR, 0,
NULL);
 				AppendMenu(hmenu, 0, FCIDM_SHVIEWLAST-1,
ResString(IDS_ABOUT_EXPLORER));
 
@@ -620,24 +619,6 @@
 
 				_cm_ifs.reset();
 
-				if (idCmd == FCIDM_SHVIEWLAST-3) {
-					ShellExecute (_hwnd, _T("open"),
_T("c:\\reactos\\system32\\rundll32.exe shell32.dll,Control_RunDLL
desk.cpl,,0"), NULL, NULL, SW_SHOWNORMAL);
-
-
-					//explorer_about(_hwnd);
-
//system("c:\\reactos\\system32\\cmd.exe");
-					
-					//ShellExecute (_hwnd,
_T("open"), _T("%SystemRoot%\\system32\\cmd.exe"), NULL, NULL,
SW_SHOWNORMAL);
-					
-
//ShellExecute(NULL,"open","c:\\windows\\system32\\cmd.exe",NULL,NULL,SW
_SHOWNORMAL);
-					//WCHAR*
pFile="%SystemRoot%\system32\cmd.exe";
-					//int rcode;
-					 //TCHAR pFile[256];
-
//strcopy("%SystemRoot%\\system32\\cmd.exe",pFile);
-					 //ShellExecute(NULL, NULL,
pFile, NULL, "C:\\", SW_SHOW);
-					//HINSTANCE
rcode=ShellExecute(NULL, "open", pFile, NULL, "C:\\", SW_SHOW);
-					//ShellExecute(hwnd,
__TEXT("open"), __TEXT("%SystemRoot%\system32\cmd.exe"),
__TEXT("c:\"),
SH_SHOW); 
-				}
 				if (idCmd == FCIDM_SHVIEWLAST-1) {
 					explorer_about(_hwnd);
 				} else if (idCmd) {
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h
--- trunk/reactos/subsys/system/explorer/explorer_intres.h
2005-03-13 15:29:53 UTC (rev 14010)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.h
2005-03-13 15:30:29 UTC (rev 14011)
@@ -46,7 +46,6 @@

 #define IDS_NOTIFY_AUTOHIDE             42
 #define IDS_SHOW_HIDDEN_ICONS           43
 #define IDS_HIDE_ICONS                  44
-#define IDS_PROPERTIES_EXPLORER         45
 #define IDI_REACTOS                     100
 #define IDI_EXPLORER                    101
 #define IDI_STARTMENU                   102
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
--- trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-03-13 15:29:53 UTC (rev 14010)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-03-13 15:30:29 UTC (rev 14011)
@@ -1103,7 +1103,6 @@

     IDS_ALL_USERS           "All Users\\"
     IDS_SEARCH              "Search"
     IDS_ABOUT_EXPLORER      "&About Explorer..."
-    IDS_PROPERTIES_EXPLORER "&Properties"
     IDS_LAUNCH_MANY_PROGRAMS 
                             "You have selected more than one
program.\nAre you sure you want to launch all of them?"
     IDS_DESKTOPBAR_SETTINGS "Desktop Settings"