3.6.0.0

Author: stax76

License.txt

@@ -0,0 +1,24 @@
+
+MIT License
+
+Copyright (C) 2008-2020 Frank Skare (stax76)
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and ssociated documentation
+files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.

OpenWithPP.sln

@@ -15,8 +15,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Debug|x64.ActiveCfg = Debug|x64
 		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Debug|x64.Build.0 = Debug|x64
-		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Release|x64.ActiveCfg = Release|x64
-		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Release|x64.Build.0 = Release|x64
+		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Release|x64.ActiveCfg = Debug|x64
+		{352818B6-523C-4143-9BB6-9C263E73D0A6}.Release|x64.Build.0 = Debug|x64
 		{D66A39BE-CA8D-4A68-AD8E-10DE640332BA}.Debug|x64.ActiveCfg = Debug|x64
 		{D66A39BE-CA8D-4A68-AD8E-10DE640332BA}.Debug|x64.Build.0 = Debug|x64
 		{D66A39BE-CA8D-4A68-AD8E-10DE640332BA}.Release|x64.ActiveCfg = Release|x64

OpenWithPPGUI/MainForm.vb

@@ -1067,7 +1067,7 @@ Public Class MainForm
 
                 Using proc As New Process
                     proc.StartInfo.Verb = "runas"
-                    proc.StartInfo.FileName = "regsvr32"
+                    proc.StartInfo.FileName = "regsvr32.exe"
                     proc.StartInfo.Arguments = "/u """ + DLLPath + """"
                     proc.Start()
                 End Using

OpenWithPPGUI/My Project/AssemblyInfo.vb

@@ -29,5 +29,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("3.5.0.0")>
-<Assembly: AssemblyFileVersion("3.5.0.0")>
+<Assembly: AssemblyVersion("3.6.0.0")>
+<Assembly: AssemblyFileVersion("3.6.0.0")>

OpenWithPPShellExtension/Common.h

@@ -0,0 +1,4 @@
+
+#pragma once
+
+#define PRODUCT_NAME L"OpenWithPP"

OpenWithPPShellExtension/DLL.cpp

@@ -1,12 +1,13 @@
 
 #include "stdafx.h"
+#include "Common.h"
 #include "Util.h"
 
 
 HMODULE g_hmodThis;
 
 
-class COpenWithPPShellExtensionModule : public CAtlDllModuleT< COpenWithPPShellExtensionModule >
+class COpenWithPPShellExtensionModule : public ATL::CAtlDllModuleT< COpenWithPPShellExtensionModule >
 {
 public :
 };

OpenWithPPShellExtension/DLL.def

@@ -1,3 +1,4 @@
+
 ; OpenWithPPShellExtension.def : Declares the module parameters.
 
 LIBRARY      "OpenWithPPShellExtension.dll"

OpenWithPPShellExtension/Main.cpp

@@ -1,9 +1,6 @@
 
 #include "stdafx.h"
 #include "Main.h"
-#include "Util.h"
-#include "atlstr.h"
-#include "wincodec.h"
 
 
 Item::~Item()
@@ -22,7 +19,7 @@ BOOL FileExist(std::wstring file)
 		return false;
 
 	DWORD dwAttrib = GetFileAttributes(file.c_str());
-	return (dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
+	return dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY);
 }
 
 
@@ -87,16 +84,15 @@ HBITMAP ConvertIconToBitmap(HICON hicon)
 }
 
 
-HRESULT SetIcon(HMENU menu, UINT command, Item* item)
+HRESULT SetIcon(HMENU menu, UINT position, UINT flags, Item* item)
 {
 	if (!FileExist(item->IconFile))
 		return S_OK;
 
 	if (!item->Icon)
 	{
 		HICON iconSmall;
-		HICON iconLarge = NULL;
-		int res = ExtractIconEx(item->IconFile.c_str(), item->IconIndex, &iconLarge, &iconSmall, 1);
+		int res = ExtractIconEx(item->IconFile.c_str(), item->IconIndex, NULL, &iconSmall, 1);
 
 		if (!res)
 			return E_FAIL;
@@ -106,16 +102,13 @@ HRESULT SetIcon(HMENU menu, UINT command, Item* item)
 		if (iconSmall)
 			DestroyIcon(iconSmall);
 
-		if (iconLarge)
-			DestroyIcon(iconLarge);
-
 		if (!bmp)
 			return E_FAIL;
 
 		item->Icon = bmp;
 	}
 
-	int res = SetMenuItemBitmaps(menu, command, MF_BYCOMMAND, item->Icon, item->Icon);
+	int res = SetMenuItemBitmaps(menu, position, flags, item->Icon, item->Icon);
 
 	if (!res)
 		return E_FAIL;
@@ -172,62 +165,61 @@ HRESULT CMain::LoadXML()
 
 	g_Items.clear();
 
-	TCHAR path[MAX_PATH];
-	SHRegGetPath(HKEY_CURRENT_USER, L"Software\\" PRODUCT_NAME,
-		L"SettingsLocation", path, NULL);
+	WCHAR path[MAX_PATH];
+	SHRegGetPath(HKEY_CURRENT_USER, L"Software\\" PRODUCT_NAME, L"SettingsLocation", path, NULL);
 
 	if (!FileExist(path))
 		return E_FAIL;
 
-	CComPtr<IXMLDOMDocument> doc;
+	ATL::CComPtr<IXMLDOMDocument> doc;
 	HRESULT hr = doc.CoCreateInstance(__uuidof(DOMDocument));
 
 	if (FAILED(hr))
 		return hr;
 
 	VARIANT_BOOL success;
-	hr = doc->load(CComVariant(path), &success);
+	hr = doc->load(ATL::CComVariant(path), &success);
 
 	if (FAILED(hr))
 		return hr;
 
-	CComPtr<IXMLDOMNodeList> items;
-	hr = doc->selectNodes(CComBSTR(L"AppSettings/Items/Item"), &items);
+	ATL::CComPtr<IXMLDOMNodeList> items;
+	hr = doc->selectNodes(ATL::CComBSTR(L"AppSettings/Items/Item"), &items);
 
 	if (FAILED(hr))
 		return hr;
 
-	IXMLDOMNode *itemNode;
+	IXMLDOMNode* itemNode;
 
-	while (!items->nextNode(&itemNode))
+	while (S_OK == items->nextNode(&itemNode))
 	{
 		Item* item = new Item();
 
-		CComPtr<IXMLDOMNodeList> itemFields;
+		ATL::CComPtr<IXMLDOMNodeList> itemFields;
 		hr = itemNode->get_childNodes(&itemFields);
 
 		if FAILED(hr)
 			hr;
 
-		IXMLDOMNode *itemField;
+		IXMLDOMNode* itemField;
 
-		while (!itemFields->nextNode(&itemField))
+		while (S_OK == itemFields->nextNode(&itemField))
 		{
 			BSTR nodeName;
 			hr = itemField->get_nodeName(&nodeName);
 
 			if FAILED(hr)
 				return hr;
 
-			CComBSTR cNodeName(nodeName);
+			ATL::CComBSTR cNodeName(nodeName);
 
 			BSTR nodeText;
 			hr = itemField->get_text(&nodeText);
 
 			if FAILED(hr)
 				return hr;
 
-			CComBSTR cNodeText(nodeText);
+			ATL::CComBSTR cNodeText(nodeText);
 
 			if (cNodeName == L"Name")
 				item->Name = cNodeText;
@@ -280,29 +272,29 @@ STDMETHODIMP CMain::Initialize(
 
 		int uNumFiles = DragQueryFile((HDROP)stg.hGlobal, 0xFFFFFFFF, NULL, 0);
 
-		if (0 == uNumFiles)
+		if (!uNumFiles)
 		{
 			ReleaseStgMedium(&stg);
 			return E_INVALIDARG;
 		}
 
 		for (int i = 0; i < uNumFiles; i++)
 		{
-			TCHAR buf[MAX_PATH];
-			DragQueryFile((HDROP)stg.hGlobal, i, buf, MAX_PATH);
-			g_ShellItems.push_back(buf);
+			WCHAR buffer[MAX_PATH];
+			DragQueryFile((HDROP)stg.hGlobal, i, buffer, MAX_PATH);
+			g_ShellItems.push_back(buffer);
 		}
 
 		ReleaseStgMedium(&stg);
 	}
 	else if (pidlFolder)
 	{
-		TCHAR buf[MAX_PATH];
+		WCHAR buffer[MAX_PATH];
 
-		if (!SHGetPathFromIDList(pidlFolder, buf))
+		if (!SHGetPathFromIDList(pidlFolder, buffer))
 			return E_FAIL;
 
-		g_ShellItems.push_back(buf);
+		g_ShellItems.push_back(buffer);
 	}
 	else
 		return E_FAIL;
@@ -314,12 +306,11 @@ STDMETHODIMP CMain::Initialize(
 STDMETHODIMP CMain::QueryContextMenu(
 	HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd, UINT uidLastCmd, UINT uFlags)
 {
-	if (g_Items.size() == 0 || SHRegGetBoolUSValue(
+	if (!g_Items.size() || SHRegGetBoolUSValue(
 		L"Software\\" PRODUCT_NAME, L"Reload", FALSE, TRUE))
 	{
 		REGISTRY_ENTRY re = GetRegEntry(HKEY_CURRENT_USER,
-			L"Software\\" PRODUCT_NAME, L"Reload",
-			NULL, REG_DWORD, 0);
+			L"Software\\" PRODUCT_NAME, L"Reload", NULL, REG_DWORD, 0);
 
 		if (FAILED(CreateRegKeyAndSetValue(&re)))
 			return E_FAIL;
@@ -366,7 +357,7 @@ STDMETHODIMP CMain::QueryContextMenu(
 				if (!res)
 					return E_FAIL;
 
-				SetIcon(hmenu, command, g_Items[i]);
+				SetIcon(hmenu, command, MF_BYCOMMAND, g_Items[i]);
 				addSubSep = true;
 			}
 			else
@@ -376,7 +367,7 @@ STDMETHODIMP CMain::QueryContextMenu(
 				if (!res)
 					return E_FAIL;
 
-				SetIcon(hmenu, command, g_Items[i]);
+				SetIcon(hmenu, uMenuIndex, MF_BYPOSITION, g_Items[i]);
 				uMenuIndex += 1;
 			}
 
@@ -408,7 +399,7 @@ STDMETHODIMP CMain::QueryContextMenu(
 				if (!res)
 					return E_FAIL;
 
-				SetIcon(hmenu, command, g_Items[i]);
+				SetIcon(hmenu, command, MF_BYCOMMAND, g_Items[i]);
 				addSubSep2 = true;
 			}
 			else
@@ -418,7 +409,7 @@ STDMETHODIMP CMain::QueryContextMenu(
 				if (!res)
 					return E_FAIL;
 
-				SetIcon(hmenu, command, g_Items[i]);
+				SetIcon(hmenu, uMenuIndex, MF_BYPOSITION, g_Items[i]);
 				uMenuIndex += 1;
 			}
 
@@ -470,15 +461,15 @@ STDMETHODIMP CMain::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo)
 			if (args.find(L"%items%") != std::wstring::npos)
 			{
 				std::wstring joined = L"\"" + JoinList(&g_ShellItems, L"\" \"") + L"\"";
-				CString argh = args.c_str();
+				ATL::CString argh = args.c_str();
 				argh.Replace(L"%items%", joined.c_str());
 				args = argh.GetBuffer();
 			}
 
 			if (args.find(L"%paths%") != std::wstring::npos)
 			{
 				std::wstring joined = L"\"" + JoinList(&g_ShellItems, L"\" \"") + L"\"";
-				CString argh = args.c_str();
+				ATL::CString argh = args.c_str();
 				argh.Replace(L"%paths%", joined.c_str());
 				args = argh.GetBuffer();
 			}

OpenWithPPShellExtension/Main.h

@@ -1,12 +1,9 @@
 
 #pragma once
 
-#include <initguid.h>
+#include "Util.h"
+#include "Common.h"
 
-#include <list>
-#include <vector>
-#include <algorithm>
-#include <string>
 
 EXTERN_C const CLSID CLSID_Main;
 
@@ -45,8 +42,8 @@ int g_EditCommandIndex;
 // CMain
 
 class ATL_NO_VTABLE CMain :
-	public CComObjectRootEx<CComSingleThreadModel>,
-	public CComCoClass<CMain, &CLSID_Main>,
+	public ATL::CComObjectRootEx<ATL::CComSingleThreadModel>,
+	public ATL::CComCoClass<CMain, &CLSID_Main>,
 	public IShellExtInit,
 	public IContextMenu
 {

OpenWithPPShellExtension/OpenWithPPShellExtension.vcxproj

@@ -142,6 +142,7 @@
     <None Include="DLL.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Common.h" />
     <ClInclude Include="Main.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Util.h" />