add vmconnectex application launcher

.github/workflows/build-package.yml

@@ -155,7 +155,7 @@ jobs:
           cmake -G "Visual Studio 17 2022" -A $MsvcArch -DWITH_DOTNET=OFF -B $BuildDir
           cmake --build $BuildDir --config Release
           New-Item -ItemType Directory -Path "dependencies/MsRdpEx/$Arch" | Out-Null
-          @('MsRdpEx.dll','MsRdpEx.pdb','mstscex.exe','msrdcex.exe') | % {
+          @('MsRdpEx.dll','MsRdpEx.pdb','mstscex.exe','msrdcex.exe', 'vmconnectex.exe') | % {
             Copy-Item "$BuildDir/Release/$_" "dependencies/MsRdpEx/$Arch"
           }
           Compress-Archive "dependencies\MsRdpEx\$Arch\*.pdb" ".\symbols\MsRdpEx-$PackageVersion-$Arch.symbols.zip" -CompressionLevel Optimal

dll/Paths.c

@@ -25,6 +25,8 @@ static char g_DEFAULT_RDP_PATH[MSRDPEX_MAX_PATH] = { 0 };
 
 static char g_XMF_DLL_PATH[MSRDPEX_MAX_PATH] = { 0 };
 
+static char g_VMCONNECT_EXE_PATH[MSRDPEX_MAX_PATH] = { 0 };
+
 bool MsRdpEx_PathCchRenameExtension(char* pszPath, size_t cchPath, const char* pszExt)
 {
     size_t length = strlen(pszPath);
@@ -273,6 +275,10 @@ bool MsRdpEx_InitPaths(uint32_t pathIds)
         }
     }
 
+    if (pathIds & MSRDPEX_VMCONNECT_EXE_PATH) {
+        MsRdpEx_ExpandEnvironmentStrings("%SystemRoot%\\System32\\vmconnect.exe", g_VMCONNECT_EXE_PATH, MSRDPEX_MAX_PATH);
+    }
+
     return true;
 }
 
@@ -333,6 +339,10 @@ const char* MsRdpEx_GetPath(uint32_t pathId)
         case MSRDPEX_XMF_DLL_PATH:
             path = (const char*) g_XMF_DLL_PATH;
             break;
+
+        case MSRDPEX_VMCONNECT_EXE_PATH:
+            path = (const char*) g_VMCONNECT_EXE_PATH;
+            break;
     }
 
     return path;

dll/RdpProcess.cpp

@@ -327,6 +327,9 @@ class CMsRdpExProcess : public IMsRdpExProcess
             else if (MsRdpEx_StringIEquals(appName, "msrdc") || MsRdpEx_StringIEquals(appName, "msrdc.exe")) {
                 appPathId = MSRDPEX_MSRDC_EXE_PATH;
             }
+            else if (MsRdpEx_StringIEquals(appName, "vmconnect") || MsRdpEx_StringIEquals(appName, "vmconnect.exe")) {
+                appPathId = MSRDPEX_VMCONNECT_EXE_PATH;
+            }
         }
 
         const char* lpApplicationName = appName;

exe/CMakeLists.txt

@@ -1,3 +1,4 @@
 
 add_subdirectory(mstscex)
 add_subdirectory(msrdcex)
+add_subdirectory(vmconnectex)

exe/vmconnectex/CMakeLists.txt

@@ -0,0 +1,17 @@
+# vmconnectex launcher executable
+
+windows_rc_generate_version_info(
+    NAME "vmconnectex" TYPE "EXE"
+    VERSION "${MSRDPEX_VERSION}"
+    FILENAME "vmconnectex.exe"
+    VENDOR "${MSRDPEX_VENDOR}"
+    COPYRIGHT "${MSRDPEX_COPYRIGHT}"
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+
+source_group("Resources" FILES vmconnectex.rc)
+
+add_executable(vmconnectex WIN32
+	vmconnectex.cpp
+	vmconnectex.rc)
+
+target_link_libraries(vmconnectex MsRdpEx_Dll)

exe/vmconnectex/vmconnectex.cpp

@@ -0,0 +1,11 @@
+
+#include "../dll/AxHost/RdpWinMain.h"
+
+int WINAPI wWinMain(
+    _In_ HINSTANCE hInstance,
+    _In_opt_ HINSTANCE hPrevInstance,
+    _In_ LPWSTR lpCmdLine,
+    _In_ int nShowCmd)
+{
+    return MsRdpEx_WinMain(hInstance, hPrevInstance, lpCmdLine, nShowCmd, "vmconnect");
+}

exe/vmconnectex/vmconnectex.rc

@@ -0,0 +1,4 @@
+
+IDI_APP_ICON ICON "vmconnectex.ico"
+
+#include "version.rc"

include/MsRdpEx/MsRdpEx.h

@@ -70,6 +70,7 @@ HMODULE MsRdpEx_LoadLibrary(const char* filename);
 #define MSRDPEX_MODULE_DIR_PATH         0x00002000
 #define MSRDPEX_LIBRARY_DIR_PATH        0x00004000
 #define MSRDPEX_XMF_DLL_PATH            0x00008000
+#define MSRDPEX_VMCONNECT_EXE_PATH      0x00010000
 #define MSRDPEX_ALL_PATHS               0xFFFFFFFF
 
 bool MsRdpEx_InitPaths(uint32_t pathIds);

installer/MsRdpEx.wxs

@@ -25,6 +25,11 @@
 					</Extension>
 				</ProgId>
 			</Component>
+			<Component Guid="beb220dc-b822-49bf-90c7-62153f6980f2">
+				<File Id="vmconnectex.exe" Source="$(var.BinDir)\vmconnectex.exe" KeyPath="yes">
+					<Shortcut Name="vmconnectex" Directory="ProgramMenuFolder" WorkingDirectory="INSTALLDIR" Icon="vmconnectex.ico" Advertise="yes" />
+				</File>
+			</Component>
 			<Component Guid="17d5f23d-df19-42e2-bd40-7db9306fac2b">
 				<File Source="$(var.BinDir)\MsRdpEx.dll"></File>
 			</Component>

installer/Package.wxs

@@ -7,6 +7,7 @@
 		<MajorUpgrade AllowSameVersionUpgrades="no" DowngradeErrorMessage="!(loc.DowngradeError)" />
 		<Icon Id="mstscex.ico" SourceFile="..\exe\mstscex\mstscex.ico" />
 		<Icon Id="msrdcex.ico" SourceFile="..\exe\msrdcex\msrdcex.ico" />
+		<Icon Id="vmconnectex.ico" SourceFile="..\exe\vmconnectex\vmconnectex.ico" />
 		<Property Id="ARPPRODUCTICON" Value="mstscex.ico" />
 		<Property Id="ARPHELPLINK" Value="$(var.InfoURL)" />
 		<MediaTemplate EmbedCab="yes" CabinetTemplate="MsRdpEx{0}.cab" />