Make "Never" button mandatory in update dialog

donho · donho · commit 9c86a33b2aca · 2022-09-17T03:42:51.000+02:00
And make dialog always modal.
diff --git a/src/gup.rc b/src/gup.rc
@@ -69,16 +69,16 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,134,66,50,14
 END
 
-IDD_YESNONEVERDLG DIALOGEX 0, 0, 285, 94
+IDD_YESNONEVERDLG DIALOGEX 0, 0, 270, 94
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
 CAPTION "Update available"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LTEXT           "An update package is available, do you want to download it?",IDC_YESNONEVERMSG,13,20,259,16
-    PUSHBUTTON   "Yes",IDYES,50,60,50,14
-    PUSHBUTTON   "No",IDNO,110,60,50,14
-    PUSHBUTTON   "Never",IDCANCEL,170,60,50,14
+    LTEXT "An update package is available, do you want to download it?",IDC_YESNONEVERMSG,15,15,250,64
+    PUSHBUTTON   "Yes",IDYES,50,70,50,14
+    PUSHBUTTON   "No",IDNO,110,70,50,14
+    PUSHBUTTON   "Never",IDCANCEL,170,70,50,14
 END
 
 IDD_UPDATE_DLG DIALOGEX 0, 0, 200, 110
diff --git a/src/winmain.cpp b/src/winmain.cpp
@@ -591,7 +591,7 @@ LRESULT CALLBACK progressBarDlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARA
 }
 
 
-LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM)
+LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	switch (message)
 	{
@@ -600,6 +600,11 @@ LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 			if (thirdDoUpdateDlgButtonLabel != L"")
 				::SetDlgItemText(hWndDlg, IDCANCEL, thirdDoUpdateDlgButtonLabel.c_str());
 
+			if (lParam)
+			{
+				::SetDlgItemText(hWndDlg, IDC_YESNONEVERMSG, (LPCWSTR)lParam);
+			}
+
 			goToScreenCenter(hWndDlg);
 			return TRUE;
 		}
@@ -1063,13 +1068,16 @@ std::wstring productVersionToFileVersion(const std::wstring& productVersion)
 	return fileVersion;
 }
 
-
 #ifdef _DEBUG
 #define WRITE_LOG(fn, suffix, log) writeLog(fn, suffix, log);
 #else
 #define WRITE_LOG(fn, suffix, log)
 #endif
 
+// Definition from Notepad++
+#define NPPMSG  (WM_USER + 1000)
+#define NPPM_DISABLEAUTOUPDATE (NPPMSG + 95) // 2119 in decimal
+
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)
 {
 	/*
@@ -1368,15 +1376,10 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)
 		updateAvailable += L"\n\n" + versionCurrent;
 		updateAvailable += L"\n" + versionNew;
 		
-		int thirdButtonCmd = gupParams.get3rdButtonCmd();
 		thirdDoUpdateDlgButtonLabel = gupParams.get3rdButtonLabel();
 
 		int dlAnswer = 0;
-
-		if (!thirdButtonCmd)
-			dlAnswer = ::MessageBox(isModal ? hApp : NULL, updateAvailable.c_str(), gupParams.getMessageBoxTitle().c_str(), MB_YESNO);
-		else
-			dlAnswer = static_cast<int32_t>(::DialogBox(hInst, MAKEINTRESOURCE(IDD_YESNONEVERDLG), isModal ? hApp : NULL, reinterpret_cast<DLGPROC>(yesNoNeverDlgProc)));
+		dlAnswer = static_cast<int32_t>(::DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_YESNONEVERDLG), hApp, reinterpret_cast<DLGPROC>(yesNoNeverDlgProc), (LPARAM)updateAvailable.c_str()));
 
 		if (dlAnswer == IDNO)
 		{
@@ -1385,12 +1388,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)
 		
 		if (dlAnswer == IDCANCEL)
 		{
-			if (gupParams.getClassName() != L"")
+			if (hApp)
 			{
-				if (hApp)
-				{
-					::SendMessage(hApp, thirdButtonCmd, gupParams.get3rdButtonWparam(), gupParams.get3rdButtonLparam());
-				}
+				::SendMessage(hApp, NPPM_DISABLEAUTOUPDATE, 0, 0);
 			}
 			return 0;
 		}

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ LRESULT CALLBACK progressBarDlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARA`
`591`	`591`	`}`
`592`	`592`
`593`	`593`
`594`		`-LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM)`
	`594`	`+LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM lParam)`
`595`	`595`	`{`
`596`	`596`	`switch (message)`
`597`	`597`	`{`
`@@ -600,6 +600,11 @@ LRESULT CALLBACK yesNoNeverDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP`
`600`	`600`	`if (thirdDoUpdateDlgButtonLabel != L"")`
`601`	`601`	`::SetDlgItemText(hWndDlg, IDCANCEL, thirdDoUpdateDlgButtonLabel.c_str());`
`602`	`602`
	`603`	`+ if (lParam)`
	`604`	`+ {`
	`605`	`+ ::SetDlgItemText(hWndDlg, IDC_YESNONEVERMSG, (LPCWSTR)lParam);`
	`606`	`+ }`
	`607`	`+`
`603`	`608`	`goToScreenCenter(hWndDlg);`
`604`	`609`	`return TRUE;`
`605`	`610`	`}`
`@@ -1063,13 +1068,16 @@ std::wstring productVersionToFileVersion(const std::wstring& productVersion)`
`1063`	`1068`	`return fileVersion;`
`1064`	`1069`	`}`
`1065`	`1070`
`1066`		`-`
`1067`	`1071`	`#ifdef _DEBUG`
`1068`	`1072`	`#define WRITE_LOG(fn, suffix, log) writeLog(fn, suffix, log);`
`1069`	`1073`	`#else`
`1070`	`1074`	`#define WRITE_LOG(fn, suffix, log)`
`1071`	`1075`	`#endif`
`1072`	`1076`
	`1077`	`+// Definition from Notepad++`
	`1078`	`+#define NPPMSG (WM_USER + 1000)`
	`1079`	`+#define NPPM_DISABLEAUTOUPDATE (NPPMSG + 95) // 2119 in decimal`
	`1080`	`+`
`1073`	`1081`	`int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)`
`1074`	`1082`	`{`
`1075`	`1083`	`/*`
`@@ -1368,15 +1376,10 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)`
`1368`	`1376`	`updateAvailable += L"\n\n" + versionCurrent;`
`1369`	`1377`	`updateAvailable += L"\n" + versionNew;`
`1370`	`1378`
`1371`		`- int thirdButtonCmd = gupParams.get3rdButtonCmd();`
`1372`	`1379`	`thirdDoUpdateDlgButtonLabel = gupParams.get3rdButtonLabel();`
`1373`	`1380`
`1374`	`1381`	`int dlAnswer = 0;`
`1375`		`-`
`1376`		`- if (!thirdButtonCmd)`
`1377`		`- dlAnswer = ::MessageBox(isModal ? hApp : NULL, updateAvailable.c_str(), gupParams.getMessageBoxTitle().c_str(), MB_YESNO);`
`1378`		`- else`
`1379`		`- dlAnswer = static_cast<int32_t>(::DialogBox(hInst, MAKEINTRESOURCE(IDD_YESNONEVERDLG), isModal ? hApp : NULL, reinterpret_cast<DLGPROC>(yesNoNeverDlgProc)));`
	`1382`	`+ dlAnswer = static_cast<int32_t>(::DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_YESNONEVERDLG), hApp, reinterpret_cast<DLGPROC>(yesNoNeverDlgProc), (LPARAM)updateAvailable.c_str()));`
`1380`	`1383`
`1381`	`1384`	`if (dlAnswer == IDNO)`
`1382`	`1385`	`{`
`@@ -1385,12 +1388,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR lpszCmdLine, int)`
`1385`	`1388`
`1386`	`1389`	`if (dlAnswer == IDCANCEL)`
`1387`	`1390`	`{`
`1388`		`- if (gupParams.getClassName() != L"")`
	`1391`	`+ if (hApp)`
`1389`	`1392`	`{`
`1390`		`- if (hApp)`
`1391`		`- {`
`1392`		`- ::SendMessage(hApp, thirdButtonCmd, gupParams.get3rdButtonWparam(), gupParams.get3rdButtonLparam());`
`1393`		`- }`
	`1393`	`+ ::SendMessage(hApp, NPPM_DISABLEAUTOUPDATE, 0, 0);`
`1394`	`1394`	`}`
`1395`	`1395`	`return 0;`
`1396`	`1396`	`}`