From 1210e47df257bf465ccdb39943280f86b05049f4 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 20 Nov 2014 22:57:22 +0000
Subject: [PATCH] [ui] add Alpha/Beta title marquers (and extra popup)

* Closes #404
---
 src/rufus.c  | 32 ++++++++++++++++++++++++++++----
 src/rufus.rc | 16 ++++++++--------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 3ef53d01..f291f5d4 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -42,6 +42,10 @@
 #include "registry.h"
 #include "localization.h"
 
+// These should be commented out for release
+//#define IS_ALPHA
+#define IS_BETA
+
 /* Redefinitions for WDK and MinGW */
 // TODO: these would be better in a 'missing.h' file
 #ifndef PBM_SETSTATE
@@ -1330,6 +1334,16 @@ static BOOL BootCheck(void)
 	return TRUE;
 }
 
+static __inline const char* IsAlphaOrBeta(void)
+{
+#if defined(IS_ALPHA)
+	return " (Alpha) ";
+#elif defined(IS_BETA)
+	return " (Beta) ";
+#else
+	return " ";
+#endif
+}
 
 void InitDialog(HWND hDlg)
 {
@@ -1382,11 +1396,15 @@ void InitDialog(HWND hDlg)
 	token = strtok(tmp, " ");
 	for (i=0; (i<4) && ((token = strtok(NULL, ".")) != NULL); i++)
 		rufus_version[i] = (uint16_t)atoi(token);
-	if (right_to_left_mode) {
-		static_sprintf(tmp, "%d.%d.%d.%d " APPLICATION_NAME, rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
-		SetWindowTextU(hDlg, tmp);
+
+	// Redefine the title to be able to add "Alpha" or "Beta" and get the version in the right order for RTL
+	if (!right_to_left_mode) {
+		static_sprintf(tmp, APPLICATION_NAME " %d.%d.%d.%d%s", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3], IsAlphaOrBeta());
+	} else {
+		static_sprintf(tmp, "%s%d.%d.%d.%d " APPLICATION_NAME, IsAlphaOrBeta(), rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
 	}
-	uprintf(APPLICATION_NAME " version: %d.%d.%d.%d\n", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
+	SetWindowTextU(hDlg, tmp);
+	uprintf(APPLICATION_NAME " version: %d.%d.%d.%d%s\n", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3], IsAlphaOrBeta());
 	for (i=0; i<ARRAYSIZE(resource); i++) {
 		buf = (char*)GetResource(hMainInstance, resource[i], _RT_RCDATA, "ldlinux_sys", &len, TRUE);
 		if (buf == NULL) {
@@ -1672,6 +1690,12 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 		SetWindowPos(hMainDialog, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE);
 		SetWindowPos(hMainDialog, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE);
 		SetWindowPos(hMainDialog, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE);
+
+#if defined(IS_ALPHA)
+		// Add a VERY ANNOYING popup for Alpha releases, so that people don't start redistributing them
+		Notification(MSG_INFO, NULL, "ALPHA VERSION", "This is an Alpha version of " APPLICATION_NAME
+			" - It is meant to be used for testing ONLY and should NOT be distributed as a release.");
+#endif
 		return (INT_PTR)TRUE;
 
 	// The things one must do to get an ellipsis on the status bar...
diff --git a/src/rufus.rc b/src/rufus.rc
index 8ef536ba..927cb16d 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 1.5.0.545"
+CAPTION "Rufus 1.5.0.546"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,291,50,14
@@ -164,7 +164,7 @@ END
 
 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 1.5.0.545"
+CAPTION "Rufus 1.5.0.546"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,291,50,14
@@ -297,7 +297,7 @@ END
 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 1.5.0.545"
+CAPTION "Rufus 1.5.0.546"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,291,50,14
@@ -437,7 +437,7 @@ END
 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 1.5.0.545"
+CAPTION "Rufus 1.5.0.546"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,291,50,14
@@ -701,8 +701,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,545
- PRODUCTVERSION 1,5,0,545
+ FILEVERSION 1,5,0,546
+ PRODUCTVERSION 1,5,0,546
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -719,13 +719,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.5.0.545"
+            VALUE "FileVersion", "1.5.0.546"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.5.0.545"
+            VALUE "ProductVersion", "1.5.0.546"
         END
     END
     BLOCK "VarFileInfo"