3.8.0.0

Author: stax76

OpenWithPPGUI/MainForm.vb

@@ -733,12 +733,6 @@ Public Class MainForm
         If Not BlockEvents AndAlso Not SelectedItem Is Nothing Then
             SelectedItem.Path = tbPath.Text
         End If
-
-        If tbPath.Text.Contains(":\") AndAlso Not File.Exists(tbPath.Text) Then
-            tbPath.BackColor = Color.OrangeRed
-        Else
-            tbPath.ResetBackColor()
-        End If
     End Sub
 
     Sub tbArgs_TextChanged(sender As Object, e As EventArgs) Handles tbArguments.TextChanged
@@ -1031,8 +1025,8 @@ Public Class MainForm
                 For Each line In lines
                     If line.Contains("=") Then
                         g.Settings.Macros.Add(New Macro() With {
-                                              .Name = line.Substring(0, line.IndexOf("=")).Trim,
-                                              .Value = line.Substring(line.IndexOf("=") + 1).Trim})
+                            .Name = line.Substring(0, line.IndexOf("=")).Trim,
+                            .Value = line.Substring(line.IndexOf("=") + 1).Trim})
                     End If
                 Next
 
@@ -1085,9 +1079,6 @@ Public Class MainForm
                 tsbInstallUninstall.Text = "   Uninstall   "
             End If
         End Using
-
-        tbPath_TextChanged(Nothing, Nothing)
-        tbIcon_TextChanged(Nothing, Nothing)
     End Sub
 
     Sub bnWorkingDirectory_Click(sender As Object, e As EventArgs) Handles bnWorkingDirectory.Click
@@ -1132,24 +1123,13 @@ Public Class MainForm
                 match = Regex.Match(tbIcon.Text, "^(.+),(\d+)$")
             End If
 
-            If File.Exists(tbIcon.Text) Then
-                SelectedItem.IconFile = tbIcon.Text
-                SelectedItem.IconIndex = 0
-            ElseIf match.Success Then
+            If match.Success Then
                 SelectedItem.IconFile = match.Groups(1).Value
                 SelectedItem.IconIndex = CInt(match.Groups(2).Value)
             Else
-                SelectedItem.IconFile = ""
+                SelectedItem.IconFile = tbIcon.Text
                 SelectedItem.IconIndex = 0
             End If
         End If
-
-        Dim iconFile = If(match.Success, match.Groups(1).Value, tbIcon.Text)
-
-        If iconFile <> "" AndAlso Not File.Exists(iconFile) Then
-            tbIcon.BackColor = Color.OrangeRed
-        Else
-            tbIcon.ResetBackColor()
-        End If
     End Sub
 End Class

OpenWithPPGUI/Misc.vb

@@ -51,7 +51,7 @@ Public Class g
             Next
         Else
             g.Settings = New AppSettings
-            g.Settings.Macros.Add(New Macro() With {.Name = "%video%", .Value = "mpg avi vob mp4 d2v mkv avs 264 mov wmv part flv ifo h264 asf webm dgi mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm ts m4v part"})
+            g.Settings.Macros.Add(New Macro() With {.Name = "%video%", .Value = "mpg avi vob mp4 d2v mkv avs 264 mov wmv part flv ifo h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm ts m4v part"})
             g.Settings.Macros.Add(New Macro() With {.Name = "%audio%", .Value = "mp2 mp3 ac3 wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 ogg mka aac opus flac mpa"})
             g.Settings.Macros.Add(New Macro() With {.Name = "%subtitle%", .Value = "sub sup idx ass aas srt"})
             g.Settings.Macros.Add(New Macro() With {.Name = "%image%", .Value = "png jpg jpeg gif bmp"})

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.7.0.0")>
-<Assembly: AssemblyFileVersion("3.7.0.0")>
+<Assembly: AssemblyVersion("3.8.0.0")>
+<Assembly: AssemblyFileVersion("3.8.0.0")>

OpenWithPPShellExtension/DLL.cpp

@@ -19,6 +19,14 @@ COpenWithPPShellExtensionModule _AtlModule;
 extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
 	g_hmodThis = (HMODULE)hInstance;
+
+	WCHAR szModuleName[500];
+
+	if (!GetModuleFileNameW(g_hmodThis, szModuleName, std::size(szModuleName)))
+		return HRESULT_FROM_WIN32(GetLastError());
+
+	PathRemoveFileSpec(szModuleName);
+	SetEnvironmentVariable(L"OpenWithPPDir", szModuleName);
 	return _AtlModule.DllMain(dwReason, lpReserved); 
 }
 
@@ -150,4 +158,4 @@ STDAPI DllUnregisterServer(void)
     }
 
 	return _AtlModule.DllUnregisterServer(FALSE);
-}
+}

OpenWithPPShellExtension/Main.cpp

@@ -86,13 +86,24 @@ HBITMAP ConvertIconToBitmap(HICON hicon)
 
 HRESULT SetIcon(HMENU menu, UINT position, UINT flags, Item* item)
 {
-	if (!FileExists(item->IconFile))
+	std::wstring path(item->IconFile);
+
+	if (path.find(L"%") != std::string::npos)
+	{
+		WCHAR szPath[500];
+		DWORD result = ExpandEnvironmentStrings(path.c_str(), szPath, std::size(szPath));
+
+		if (result)
+			path = szPath;
+	}
+
+	if (!FileExists(path))
 		return S_OK;
 
 	if (!item->Icon)
 	{
 		HICON iconSmall;
-		int res = ExtractIconEx(item->IconFile.c_str(), item->IconIndex, NULL, &iconSmall, 1);
+		int res = ExtractIconEx(path.c_str(), item->IconIndex, NULL, &iconSmall, 1);
 
 		if (!res)
 			return E_FAIL;
@@ -492,23 +503,6 @@ STDMETHODIMP CMain::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo)
 				args = value.GetBuffer();
 			}
 
-			WCHAR szDir[500];
-
-			if (g_ShellItems.size() > 0)
-			{
-				std::wstring firstItem = *g_ShellItems.begin();
-
-				if (FileExists(firstItem))
-				{
-					wcscpy_s(szDir, firstItem.c_str());
-					PathRemoveFileSpec(szDir);
-				}
-				else if (DirectoryExist(firstItem))
-				{
-					wcscpy_s(szDir, firstItem.c_str());
-				}
-			}
-
 			std::wstring verb;
 
 			if (g_Items[i]->RunAsAdmin || GetKeyState(VK_SHIFT) < 0)
@@ -519,26 +513,20 @@ STDMETHODIMP CMain::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo)
 
 			if (path.find(var) != std::string::npos)
 			{
-				WCHAR szEnvPath[500];
-				DWORD result = ExpandEnvironmentStrings(path.c_str(), szEnvPath, std::size(szEnvPath));
+				WCHAR szPath[500];
+				DWORD result = ExpandEnvironmentStrings(path.c_str(), szPath, std::size(szPath));
 
 				if (result)
-				{
-					std::wstring newPath(szEnvPath);
-					path = newPath;
-				}
+					path = szPath;
 			}
 
 			if (args.find(var) != std::string::npos)
 			{
-				WCHAR szEnvArgs[900];
-				DWORD result = ExpandEnvironmentStrings(args.c_str(), szEnvArgs, std::size(szEnvArgs));
+				WCHAR szArgs[900];
+				DWORD result = ExpandEnvironmentStrings(args.c_str(), szArgs, std::size(szArgs));
 
 				if (result)
-				{
-					std::wstring newArgs(szEnvArgs);
-					args = newArgs;
-				}
+					args = szArgs;
 			}
 
 			std::wstring guiExe(L"OpenWithPPGUI.exe");
@@ -561,9 +549,40 @@ STDMETHODIMP CMain::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo)
 			info.lpParameters = args.c_str();
 
 			if (g_Items[i]->WorkingDirectory.length() == 0)
+			{
+				WCHAR szDir[500];
+
+				if (g_ShellItems.size() > 0)
+				{
+					std::wstring firstItem = *g_ShellItems.begin();
+
+					if (FileExists(firstItem))
+					{
+						wcscpy_s(szDir, firstItem.c_str());
+						PathRemoveFileSpec(szDir);
+					}
+					else if (DirectoryExist(firstItem))
+					{
+						wcscpy_s(szDir, firstItem.c_str());
+					}
+				}
+
 				info.lpDirectory = DirectoryExist(szDir) ? szDir : NULL;
+			}
 			else
+			{
+				if (g_Items[i]->WorkingDirectory.find(var) != std::string::npos)
+				{
+					WCHAR szWorkingDirectory[500];
+					DWORD result = ExpandEnvironmentStrings(
+						g_Items[i]->WorkingDirectory.c_str(), szWorkingDirectory, std::size(szWorkingDirectory));
+
+					if (result)
+						g_Items[i]->WorkingDirectory = szWorkingDirectory;
+				}
+
 				info.lpDirectory = g_Items[i]->WorkingDirectory.c_str();
+			}
 
 			info.nShow = g_Items[i]->HideWindow ? SW_HIDE : SW_NORMAL;
 			info.hInstApp = NULL;

README.md

@@ -61,12 +61,12 @@ txt and md: `txt md`
 The options dialog defines macros for common file types:
 
 ```
-%video% = mpg avi vob mp4 d2v divx mkv avs 264 mov wmv part flv ifo h264 asf webm dgi mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm ts m4v part vpy rar crdownload
+%video% = mpg avi vob mp4 d2v divx mkv avs 264 mov wmv part flv ifo h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm ts m4v part vpy rar crdownload
 %audio% = mp2 mp3 ac3 wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 ogg mka aac opus flac mpa
 %subtitle% = sub sup idx ass aas srt
 %image% = png jpg jpeg gif bmp ico
 ```
-
+W
 Media files: `%audio% %video% %image%`  
 
 Macros are only supported in the File Types property.
@@ -76,21 +76,26 @@ Macros are only supported in the File Types property.
 
 Specifies the program to be used for opening the selected files or folders.
 
+Environment variables get expanded.
 
 ### Arguments
 
 Specifies the arguments that are passed to the program when the command is executed. You can use the predefined variable %paths% which expands to the paths of the selected files or folders. Do not enclose the %paths% macro in quotes as Open with++ adds them automatically when the macro is expanded, each path is enclosed in double quotation marks and separated by a space.
 
+Environment variables get expanded.
 
 ### Working Directory
 
 The working directory the process will use, if not specified the working directory will be set to the directory of the selected files or folders.
 
+Environment variables get expanded.
 
 ### Icon
 
 Supported file types are ICO, EXE and DLL. EXE and DLL files can contain different icons, Open with++ will show a dialog that allows to choose which icon in the EXE or DLL file to use.
 
+Environment variables get expanded.
+
 [IrfanView](https://www.irfanview.com/) can be used to create icons.
 
 [Here is an article](https://www.digitalcitizen.life/where-find-most-windows-10s-native-icons) that shows which Windows DLLs contain icon resources.
@@ -123,8 +128,11 @@ Runs the process with hidden window. Useful to hide terminal tools like PowerShe
 
 ## Tips & Tricks
 
-- Holding down the Shift key while selecting a command from the Open with++ menu will execute the command with elevated privileges.
+Holding down the Shift key while selecting a command from the Open with++ menu will execute the command with elevated privileges.
+
+Path, Arguments, Working Directory and Icon support the usage of environment variables.
 
+The location of Open with++ is available as environment variable %OpenWithPPDir%.
 
 ## Configuration Suggestions
 
@@ -169,7 +177,7 @@ Start CMD at the given folder.
 **Name**: `Command Prompt`  
 **Path**: `cmd.exe`  
 **Show in submenu**: `checked`  
-**Icon**: `C:\Windows\System32\cmd.exe,0`  
+**Icon**: `cmd.exe,0`  
 
 
 ### Windows Terminal