Fixed command line for Message Box

Author: leadedge

SPOUTPANEL/SpoutPanel.exe

@@ -102,6 +102,8 @@
 //	16.01.17 - Rebuild VS2012
 //	21.01.17 - include zero char in command line checks
 //	22.01.17 - rebuild VS2012 /MD to avoid virus false postive
+//	10.02.17 - Fixed command line for Message Box
+//			 - Version 2.20
 //
 #include <windows.h>
 #include <vector>
@@ -182,14 +184,16 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	FILE* pCout; // should really be freed on exit
 	AllocConsole();
 	freopen_s(&pCout, "CONOUT$", "w", stdout); 
-	printf("SpoutPanel 2.19\n");
+	printf("SpoutPanel 2.20\n");
 	*/
 
+
 	// Find the current active window to restore to the top when SpoutPanel quits
 	hWnd = GetForegroundWindow();
 
 	// Check for arguments
 	// printf("CmdLine [%s]\n", lpCmdLine);
+
 	UserMessage[0] = 0;
 	bFileOpen = false;
 	bFontOpen = false;
@@ -198,10 +202,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	argc = ParseCommandline();
 	if( argc > 1) { // 0 = "SpoutPanel"
+
+		// printf("Argc = %d\n", argc);
+
 		hWnd = GetActiveWindow();
 		EnableWindow(hWnd, FALSE);
 		for( i=1; i <argc; i++ ) {
+			
 			// printf("Arg[%d] = [%s]\n", i, argv[i]);
+
 			// Argument /DX9 or default
 			if(strcmp(argv[i], "/DX9") == 0) {
 				// printf("DX9 mode\n");
@@ -236,12 +245,21 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				bFileOpen = false;
 				bFontOpen = false;
 				bMemoryMode = false;
+				if(lpCmdLine && lpCmdLine[0]) {
+					// No listed args, but a command line so send a user message
+					// printf("text arg [%s]\n", lpCmdLine);
+					strcpy_s(UserMessage, 512, (char *)lpCmdLine); // Message to be shown instead of sender list
+				}
+				else {
+					// printf("No text arg\n");
+					UserMessage[0] = 0; // make sure this is not an un-initialized string
+				}
 			}
 		}
 		EnableWindow(hWnd, TRUE);
 	}
 	else {
-		// printf("Argc is zero\n");
+		printf("Argc is zero\n");
 		if(lpCmdLine && lpCmdLine[0]) {
 			// No listed args, but a command line so send a user message
 			// printf("text arg [%s]\n", lpCmdLine);

SPOUTPANEL/SpoutPanel/src/main.cpp

@@ -23,7 +23,7 @@ FONT 8, "Ms Shell Dlg"
     PUSHBUTTON      "Cancel", IDCANCEL, 91, 105, 32, 14, 0, WS_EX_LEFT
     LISTBOX         IDC_LIST1, 13, 18, 145, 72, WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY, WS_EX_LEFT
 	PUSHBUTTON      "", IDC_INFO, 13, 91, 145, 13, BS_FLAT, WS_EX_LEFT
-	LTEXT           "Vers 2.19", IDC_VERS, 13, 108, 30, 13, SS_LEFT, WS_EX_LEFT // change version here
+	LTEXT           "Vers 2.20", IDC_VERS, 13, 108, 30, 13, SS_LEFT, WS_EX_LEFT // change version here
 
 }
 
@@ -41,8 +41,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
 }
 
 VS_VERSION_INFO  VERSIONINFO
-  FILEVERSION 2,00,1,9                     // change version here       
-  PRODUCTVERSION 2,00,1,9                  // change version here 
+  FILEVERSION 2,00,2,0                     // change version here       
+  PRODUCTVERSION 2,00,2,0                  // change version here 
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0x1l
   FILEOS 0x10004L
@@ -55,12 +55,12 @@ VS_VERSION_INFO  VERSIONINFO
       BEGIN
         VALUE "CompanyName", "Leading Edge Pty Ltd\r\n\r\[email protected]\0"
         VALUE "FileDescription", "SpoutPanel\0"
-        VALUE "FileVersion", "2.019\0"            // change version here 
+        VALUE "FileVersion", "2.020\0"            // change version here 
         VALUE "InternalName", "SpoutPanel\0"
         VALUE "LegalCopyright", "Copyright \251 Leading Edge Pty Ltd 2015-2017\0" 
         VALUE "OriginalFilename", "SpoutPanel.exe\0"
         VALUE "ProductName", "SpoutPanel\0"
-        VALUE "ProductVersion", "2.019\0"         // change version here 
+        VALUE "ProductVersion", "2.020\0"         // change version here 
         VALUE "Comments", ""
       END
     END