Remove /a switch and associated code.

Author: daxgames

launcher/CmderLauncher.vcxproj

@@ -188,6 +188,9 @@
   <ItemGroup>
     <ClCompile Include="src\CmderLauncher.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\icons\cmder.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

launcher/src/CmderLauncher.cpp

@@ -105,11 +105,11 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }
 
-void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring title = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"", bool admin = false)
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring title = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 {
-#if USE_TASKBAR_API
-	wchar_t appId[MAX_PATH] = { 0 };
-#endif
+	#if USE_TASKBAR_API
+		wchar_t appId[MAX_PATH] = { 0 };
+	#endif
 	wchar_t exeDir[MAX_PATH] = { 0 };
 	wchar_t icoPath[MAX_PATH] = { 0 };
 	wchar_t cfgPath[MAX_PATH] = { 0 };
@@ -153,9 +153,9 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 
 	GetModuleFileName(NULL, exeDir, sizeof(exeDir));
 
-#if USE_TASKBAR_API
-	wcscpy_s(appId, exeDir);
-#endif
+	#if USE_TASKBAR_API
+		wcscpy_s(appId, exeDir);
+	#endif
 
 	PathRemoveFileSpec(exeDir);
 
@@ -651,44 +651,13 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 	STARTUPINFO si = { 0 };
 
 	si.cb = sizeof(STARTUPINFO);
-#if USE_TASKBAR_API
-	si.lpTitle = appId;
-	si.dwFlags = STARTF_TITLEISAPPID;
-#endif
+	#if USE_TASKBAR_API
+		si.lpTitle = appId;
+		si.dwFlags = STARTF_TITLEISAPPID;
+	#endif
 	PROCESS_INFORMATION pi;
 
-	// MessageBox(NULL, terminalPath, _T("Error"), MB_OK);
-	// MessageBox(NULL, args, _T("Error"), MB_OK);
-	// Let's try to rerun as Administrator
-	SHELLEXECUTEINFO sei = { sizeof(sei) };
-	sei.fMask = SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS;
-	sei.lpVerb = L"runas";
-	sei.lpFile = terminalPath;
-	sei.lpParameters = args;
-	sei.nShow = SW_SHOWNORMAL;
-	
-	if (admin && ShellExecuteEx(&sei))
-	{
-		if (!sei.hProcess)
-		{
-			Sleep(500);
-			_ASSERTE(sei.hProcess != nullptr);
-		}
-
-		if (sei.hProcess)
-		{
-			WaitForSingleObject(sei.hProcess, INFINITE);
-		}
-
-		// int nZone = 0;
-		// if (!HasZoneIdentifier(lsFile, nZone)
-		// 	|| (nZone != 0 /*LocalComputer*/))
-		// {
-		// 	// Assuming that elevated copy has fixed all zone problems
-		// 	break;
-		// }
-	}
-	else if (!CreateProcess(terminalPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi))
+	if (!CreateProcess(terminalPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi))
 	{
 		if (PathFileExists(windowsTerminalDir))
 		{
@@ -819,7 +788,6 @@ struct cmderOptions
 	std::wstring cmderIcon = L"";
 	std::wstring cmderRegScope = L"USER";
 	std::wstring cmderTerminalArgs = L"";
-	bool cmderAdmin = false;
 	bool cmderSingle = false;
 	bool cmderUserCfg = true;
 	bool registerApp = false;
@@ -908,10 +876,6 @@ cmderOptions GetOption()
 			{
 				cmderOptions.cmderUserCfg = false;
 			}
-			else if (_wcsicmp(L"/a", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && !PathFileExists(conEmuDir))
-			{
-				cmderOptions.cmderAdmin = true;
-			}
 			else if (_wcsicmp(L"/register", szArgList[i]) == 0)
 			{
 				cmderOptions.registerApp = true;
@@ -1048,7 +1012,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderTerminalArgs, cmderOptions.cmderAdmin);	}
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderTerminalArgs);
+	}
 
 	return 0;
 }

launcher/src/resource.rc

@@ -1,15 +1,6 @@
-/*                  _
-  ___ _ __ ___   __| | ___ _ __
- / __| '_ ` _ \ / _` |/ _ \ '__|
-| (__| | | | | | (_| |  __/ |
- \___|_| |_| |_|\__,_|\___|_|
-=============================================================================
- The Cmder Console Emulator Project
-*/
-
+// Microsoft Visual C++ generated resource script.
+//
 #include "resource.h"
-#include "version.rc2"
-#include "strings.rc2"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -26,32 +17,34 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
-"resource.h\0"
+    "resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
-"#include ""winres.h""\r\n"
-"\0"
+    "#include ""winres.h""\r\n"
+    "\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
-"\r\n"
-"\0"
+    "\r\n"
+    "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -60,35 +53,38 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_CMDER               ICON                    "..\\..\\icons\\cmder.ico"
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION CMDER_MAJOR_VERSION,CMDER_MINOR_VERSION,CMDER_REVISION_VERSION,CMDER_BUILD_VERSION
- PRODUCTVERSION CMDER_MAJOR_VERSION,CMDER_MINOR_VERSION,CMDER_REVISION_VERSION,CMDER_BUILD_VERSION
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS (CMDER_DEBUGFLAG | CMDER_BUILDFLAGS)
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE VFT2_UNKNOWN
+ FILEVERSION 1,3,6,1
+ PRODUCTVERSION 1,3,6,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "100904b0"
         BEGIN
-            VALUE "CompanyName", CMDER_COMPANY_NAME_STR "\0"
-            VALUE "FileDescription", CMDER_FILE_DESCRIPTION_STR "\0"
-            VALUE "FileVersion", CMDER_VERSION_STR "\0"
-            VALUE "InternalName", CMDER_INTERNAL_NAME_STR "\0"
-            VALUE "LegalCopyright", "Copyright (C) " CMDER_COPYRIGHT_YEAR_STR " " CMDER_COMPANY_NAME_STR "\0"
-            VALUE "OriginalFilename", CMDER_ORIGINAL_FILENAME_STR "\0"
-            VALUE "ProductName", CMDER_PRODUCT_NAME_STR "\0"
-            VALUE "ProductVersion", CMDER_VERSION_STR "\0"
+            VALUE "CompanyName", "Samuel Vasko"
+            VALUE "FileDescription", "Cmder: Lovely Console Emulator."
+            VALUE "FileVersion", "1.3.6-pre1"
+            VALUE "InternalName", "Cmder"
+            VALUE "LegalCopyright", "Copyright (C) 2016 Samuel Vasko"
+            VALUE "OriginalFilename", "Cmder.exe"
+            VALUE "ProductName", "Cmder"
+            VALUE "ProductVersion", "1.3.6-pre1"
         END
     END
     BLOCK "VarFileInfo"
@@ -97,13 +93,34 @@ BEGIN
     END
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_TITLE               "Cmder Launcher"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SWITCHES            "Valid options:\n\n    /c [CMDER User Root Path]\n    /task [Windows Terminal Profile/ConEmu Task Name]\n    /icon [CMDER Icon Path] - ConEmu ONLY!\n    [/start [Start in Path] | [Start in Path]]\n    /single - ConEmu ONLY!\n    /m\n    -- [ConEmu/Windows Terminal extra arguments]\n\nNote: '-- [...]' must be the last argument!\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
+END
+
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+