Changeset 2216

Timestamp:

6/27/2010 1:10:26 PM (2 years ago)

Author:

lowjoel

Message:

Forward-port from Eraser 6.0: Don't display the Eraser context menu for the Start Button. Fixes #365: Blank context menu item: Windows XP

Location:

trunk/eraser

Files:

• . (modified) (1 prop)
• Eraser.Shell/CtxMenu.cpp (modified) (1 diff)
• Eraser.Shell/ShellExt.vcproj (modified) (4 diffs)

trunk/eraser/Eraser.Shell/CtxMenu.cpp

@@ -173 +173 @@
         SelectedFiles = GetHDropPaths(hDrop);
 
+        //Check if the selected files is only one item long and if that item is the
+        //Start button (for Windows XP)
+        if (SelectedFiles.size() == 1)
+        {
+            wchar_t startMenuPath[MAX_PATH];
+            if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_STARTMENU, NULL,
+                SHGFP_TYPE_CURRENT, startMenuPath)))
+            {
+                if (SelectedFiles.front() == startMenuPath)
+                    //Yes, it is. Don't display the Eraser context menu for this.
+                    return E_INVALIDARG;
+            }
+        }
+
         //Clean up.
         GlobalUnlock(stg.hGlobal);

trunk/eraser/Eraser.Shell/ShellExt.vcproj

@@ -83 +83 @@
                 Name="VCLinkerTool"
                 IgnoreImportLibrary="true"
-                AdditionalDependencies="shlwapi.lib comsvcs.lib"
+                AdditionalDependencies="shell32.lib shlwapi.lib comsvcs.lib"
                 LinkIncremental="2"
                 ModuleDefinitionFile="$(ProjectDir)DllMain.def"
@@ -174 +174 @@
                 Name="VCLinkerTool"
                 IgnoreImportLibrary="true"
-                AdditionalDependencies="shlwapi.lib comsvcs.lib"
+                AdditionalDependencies="shell32.lib shlwapi.lib comsvcs.lib"
                 LinkIncremental="2"
                 ModuleDefinitionFile="$(ProjectDir)DllMain.def"
@@ -266 +266 @@
                 Name="VCLinkerTool"
                 IgnoreImportLibrary="true"
-                AdditionalDependencies="shlwapi.lib comsvcs.lib"
+                AdditionalDependencies="shell32.lib shlwapi.lib comsvcs.lib"
                 LinkIncremental="1"
                 ModuleDefinitionFile="$(ProjectDir)DllMain.def"
@@ -359 +359 @@
                 Name="VCLinkerTool"
                 IgnoreImportLibrary="true"
-                AdditionalDependencies="shlwapi.lib comsvcs.lib"
+                AdditionalDependencies="shell32.lib shlwapi.lib comsvcs.lib"
                 LinkIncremental="1"
                 ModuleDefinitionFile="$(ProjectDir)DllMain.def"