[MSPAINT] use __targv[1] instead of lpszArgument
authorBenedikt Freisen <b.freisen@gmx.net>
Thu, 31 May 2018 18:17:30 +0000 (20:17 +0200)
committerBenedikt Freisen <b.freisen@gmx.net>
Thu, 31 May 2018 18:17:30 +0000 (20:17 +0200)
This should make Paint's handling of command line strings less brittle.

CORE-13293

base/applications/mspaint/main.cpp

index 510688e..8b0bfe7 100644 (file)
@@ -259,15 +259,15 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
     RECT imageAreaPos = {3, 3, 3 + imageModel.GetWidth(), 3 + imageModel.GetHeight()};
     imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE);
 
-    if (lpszArgument[0] != 0)
+    if (__argc >= 2)
     {
         HBITMAP bmNew = NULL;
-        LoadDIBFromFile(&bmNew, lpszArgument, &fileTime, &fileSize, &fileHPPM, &fileVPPM);
+        LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM);
         if (bmNew != NULL)
         {
             TCHAR *temp;
             imageModel.Insert(bmNew);
-            GetFullPathName(lpszArgument, SIZEOF(filepathname), filepathname, &temp);
+            GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, &temp);
             CPath pathFileName(filepathname);
             pathFileName.StripPath();
             CString strTitle;