diff --git a/Source/Clock/Win32/Win32.Clock.vcxproj b/Source/Clock/Win32/Win32.Clock.vcxproj index 9df8bfb2..d481f1af 100644 --- a/Source/Clock/Win32/Win32.Clock.vcxproj +++ b/Source/Clock/Win32/Win32.Clock.vcxproj @@ -187,6 +187,7 @@ + diff --git a/Source/Clock/main.c b/Source/Clock/main.c index f089b8c2..264a6562 100644 --- a/Source/Clock/main.c +++ b/Source/Clock/main.c @@ -483,7 +483,7 @@ BOOL CheckTCDLL(void) //------------------------------------------------------ } //================================================================================================ //----------------------------//--------+++--> Verify the Correct Version of tClock.dll is Present: -BOOL CheckDLL(char* fname) //-----------------------------{ 2.0.2.99 }--------------------+++--> +BOOL CheckDLL(char* fname) //-------------------------------------------------------------+++--> { DWORD size; char szVersion[32] = {0}; @@ -496,10 +496,10 @@ BOOL CheckDLL(char* fname) //-----------------------------{ 2.0.2.99 }-------- VS_FIXEDFILEINFO* pffi; UINT uLen; if(VerQueryValue(pBlock, "\\\0", (LPVOID*)&pffi, &uLen)) { - if(HIWORD(pffi->dwFileVersionMS) == 2 && - LOWORD(pffi->dwFileVersionMS) == 0 && - HIWORD(pffi->dwFileVersionLS) == 2 && - LOWORD(pffi->dwFileVersionLS) == 99) { + if(HIWORD(pffi->dwFileVersionMS) == VER_MAJOR && + LOWORD(pffi->dwFileVersionMS) == VER_MINOR && + HIWORD(pffi->dwFileVersionLS) == VER_BUILD && + LOWORD(pffi->dwFileVersionLS) == VER_REVISION) { br = TRUE; //--+++--> Correct tClock.dll File Version Found! } else { wsprintf(szVersion, "Version: %d.%d.%d.%d", diff --git a/Source/Clock/pageabout.c b/Source/Clock/pageabout.c index 24f6411a..6bf8983a 100644 --- a/Source/Clock/pageabout.c +++ b/Source/Clock/pageabout.c @@ -100,7 +100,7 @@ void OnLinkClicked(HWND hDlg, UINT id) if(id==IDC_ABT_MAILuri) { strcpy(str, "mailto:"); GetDlgItemText(hDlg, id, str+strlen(str), 64); - strcat(str, "?subject=About "); strcat(str, CONF_START); + strcat(str, "?subject=About "); strcat(str, ABT_TITLE); }else GetDlgItemText(hDlg, id, str, 64); ShellExecute(hDlg, NULL, str, NULL, "", SW_SHOWNORMAL); diff --git a/Source/Clock/tclock.h b/Source/Clock/tclock.h index 1efec0d7..9c838ab8 100644 --- a/Source/Clock/tclock.h +++ b/Source/Clock/tclock.h @@ -23,7 +23,7 @@ #else # define TCLOCK_SUFFIX "" #endif -#define ABT_TITLE "T-Clock Redux" TCLOCK_SUFFIX " - 2.0.2 build 99" +#define ABT_TITLE "T-Clock Redux" TCLOCK_SUFFIX " - " VER_SHORT2 " build " STR(VER_REVISION) #define ABT_TCLOCK "T-Clock 2010 is Stoic Joker's rewrite of their code which allows it to run on Windows XP and up. While he removed some of T-Clock's previous functionality. He felt this makes it a more \"Administrator Friendly\" application as it no longer required elevated privileges to run.\n\nT-Clock Redux continues what Stoic Joker's T-Clock 2010 started and will be further improved and kept up-to-date." #define CONF_START "T-Clock Redux" TCLOCK_SUFFIX #define CONF_START_OLD "Stoic Joker's T-Clock 2010" TCLOCK_SUFFIX @@ -36,6 +36,7 @@ #include //PathFileExists #include //EmptyWorkingSet #include "resource.h" +#include "../common/version.h" #ifndef GWL_WNDPROC #define GWL_WNDPROC GWLP_WNDPROC diff --git a/Source/Clock/version.rc b/Source/Clock/version.rc index 8333dfc2..26ce2d98 100644 --- a/Source/Clock/version.rc +++ b/Source/Clock/version.rc @@ -1,6 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +#include "../common/version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -30,8 +31,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,2,99 - PRODUCTVERSION 2,0,2,99 + FILEVERSION VER_RC + PRODUCTVERSION VER_RC FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -49,11 +50,11 @@ BEGIN VALUE "Comments", "SystemTray Clock Utility" VALUE "CompanyName", "-" VALUE "FileDescription", "T-Clock Redux" - VALUE "FileVersion", "2.0.2 #99" + VALUE "FileVersion", VER_SHORT " #" STR(VER_REVISION) VALUE "InternalName", "Clock.exe" VALUE "OriginalFilename", "Clock.exe" VALUE "ProductName", "T-Clock Redux" - VALUE "ProductVersion", "2.0.2 #99" + VALUE "ProductVersion", VER_SHORT " #" STR(VER_REVISION) END END BLOCK "VarFileInfo" diff --git a/Source/DLL/Win32/Win32.DLL.vcxproj b/Source/DLL/Win32/Win32.DLL.vcxproj index f77e472d..92bdff63 100644 --- a/Source/DLL/Win32/Win32.DLL.vcxproj +++ b/Source/DLL/Win32/Win32.DLL.vcxproj @@ -174,7 +174,8 @@ - + + diff --git a/Source/DLL/version.rc b/Source/DLL/version.rc index dc617792..8a738505 100644 --- a/Source/DLL/version.rc +++ b/Source/DLL/version.rc @@ -1,5 +1,6 @@ // Microsoft Visual C++ generated resource script. // +#include "../common/version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -28,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,2,99 - PRODUCTVERSION 2,0,2,99 + FILEVERSION VER_RC + PRODUCTVERSION VER_RC FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,14 +45,14 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "Used by T-Clock to ""Hook"" into the tray clock" + VALUE "Comments", "T-Clock tray-""Hook""" VALUE "CompanyName", "-" VALUE "FileDescription", "T-Clock Redux DLL" - VALUE "FileVersion", "2.0.2 #99" + VALUE "FileVersion", VER_SHORT " #" STR(VER_REVISION) VALUE "InternalName", "Clock.dll" VALUE "OriginalFilename", "Clock.dll" VALUE "ProductName", "T-Clock Redux" - VALUE "ProductVersion", "2.0.2 #99" + VALUE "ProductVersion", VER_SHORT "#" STR(VER_REVISION) END END BLOCK "VarFileInfo" diff --git a/Source/T-Clock.cbp b/Source/T-Clock.cbp index e1d79895..b87fecea 100644 --- a/Source/T-Clock.cbp +++ b/Source/T-Clock.cbp @@ -274,10 +274,6 @@