Launcher improvements

launcher/CmderLauncher.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0

launcher/CmderLauncher.vcxproj

@@ -14,21 +14,20 @@
     <ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CmderLauncher</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -60,6 +59,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <!-- <AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> -->
     </Link>
     <Manifest>
       <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -86,6 +86,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <!-- <AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> -->
     </Link>
     <Manifest>
       <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -95,7 +96,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\Resource.rc">
+    <ResourceCompile Include="src\resource.rc">
       <FileType>RC</FileType>
     </ResourceCompile>
   </ItemGroup>

launcher/src/CmderLauncher.cpp

@@ -9,6 +9,7 @@
 #include <iostream>
 
 #pragma comment(lib, "Shlwapi.lib")
+#pragma comment(lib, "comctl32.lib")
 #pragma warning( disable : 4091 )
 
 #ifndef UNICODE
@@ -29,6 +30,39 @@
 
 #define FAIL_ON_ERROR(x) { DWORD ec; if ((ec = (x)) != ERROR_SUCCESS) { ShowErrorAndExit(ec, __WFUNCTION__, __LINE__); } }
 
+void TaskDialogOpen( PCWSTR mainStr, PCWSTR contentStr )
+{
+
+	HRESULT hr = NULL;
+
+	TASKDIALOGCONFIG tsk = {sizeof(tsk)};
+
+	HWND hOwner = NULL;
+	HINSTANCE hInstance = GetModuleHandle(NULL);
+	PCWSTR tskTitle = MAKEINTRESOURCE(IDS_TITLE);
+
+	tsk.hInstance = hInstance;
+	tsk.pszMainIcon = MAKEINTRESOURCE(IDI_CMDER);
+	tsk.pszWindowTitle = tskTitle;
+	tsk.pszMainInstruction = mainStr; 
+	tsk.pszContent = contentStr;
+
+	TASKDIALOG_BUTTON btns[1] = {
+		{ IDOK,     L"OK" }
+	};
+
+	tsk.dwFlags        = TDF_ALLOW_DIALOG_CANCELLATION|TDF_ENABLE_HYPERLINKS;
+	tsk.pButtons       = btns;
+	tsk.cButtons       = _countof(btns);
+
+	tsk.hwndParent     = hOwner;
+
+	int selectedButtonId = IDOK;
+
+	hr = TaskDialogIndirect( &tsk, &selectedButtonId, NULL, NULL );
+
+}
+
 void ShowErrorAndExit(DWORD ec, const wchar_t * func, int line)
 {
 	wchar_t * buffer;
@@ -460,7 +494,12 @@ cmderOptions GetOption()
 			cmderOptions.cmderStart = szArgList[i];
 		}
 		else {
-			MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+			wchar_t validOptions[512];
+			HMODULE hMod = GetModuleHandle(NULL);
+			LoadString(hMod, IDS_SWITCHES, validOptions, 512);
+
+			// display list of valid options on unrecognized parameter
+			TaskDialogOpen( L"Unrecognized parameter.", validOptions );
 			cmderOptions.error = true;
 		}
 	}

launcher/src/Resource.rc → launcher/src/resource.rc

@@ -9,6 +9,7 @@
 
 #include "resource.h"
 #include "version.rc2"
+#include "strings.rc2"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

launcher/src/strings.rc2

@@ -0,0 +1,12 @@
+
+/////////////////////////////////////////////////////////////////////////////
+// Corresponding ids should be defined in `resource.h` file.
+
+STRINGTABLE
+{
+	IDS_TITLE             "Cmder Launcher"
+
+	IDS_SWITCHES          L"Valid options:\n\n    /c [CMDER User Root Path]\n    /task [ConEmu Task Name]\n    [/start [Start in Path] | [Start in Path]]\n    /single\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
+}
+
+/////////////////////////////////////////////////////////////////////////////