diff --git a/Application/Application.rc b/Application/Application.rc index e18bfb75..c69a0e39 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -2,7 +2,7 @@ // Caution! Do not modify this file without changing \install\UpdateApplicationRC.au3 // #include "resource.h" -#include "..\revision-number.h" +#include "..\Version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/Library/AboutDialog.cpp b/Library/AboutDialog.cpp index 6bac5913..d9196929 100644 --- a/Library/AboutDialog.cpp +++ b/Library/AboutDialog.cpp @@ -23,7 +23,7 @@ #include "Measure.h" #include "resource.h" #include "AboutDialog.h" -#include "../revision-number.h" +#include "../Version.h" #define LOGTIMER 1 @@ -367,7 +367,7 @@ void ScanPlugins() hSearch = FindFirstFile(files.c_str(), &fileData); do { - if(hSearch == INVALID_HANDLE_VALUE) break; // No more files found + if (hSearch == INVALID_HANDLE_VALUE) break; // No more files found PLUGIN_INFO info; info.name = fileData.cFileName; @@ -398,14 +398,14 @@ void ScanPlugins() } else { - LogWithArgs(LOG_WARNING, L"Unable to load library: \"%s\", ErrorCode=%u", tmpSz.c_str(), err); + LogWithArgs(LOG_WARNING, L"Unable to load plugin: \"%s\", ErrorCode=%u", tmpSz.c_str(), err); } g_Plugins.push_back(info); } - while(FindNextFile(hSearch, &fileData)); + while (FindNextFile(hSearch, &fileData)); - FindClose(hSearch); + FindClose(hSearch); } void RepositionControls(HWND hwndDlg) @@ -454,7 +454,7 @@ BOOL OnInitAboutDialog(HWND window) HWND widget; widget = GetDlgItem(window, IDC_VERSION_STRING); - _snwprintf_s(tmpSz, _TRUNCATE, L"%s %s%s rev %i %s", APPNAME, APPVERSION, revision_beta ? L" Beta" : L"", revision_number, APPBITS); + _snwprintf_s(tmpSz, _TRUNCATE, L"%s %s%s rev %i %s", APPNAME, APPVERSION, revision_beta ? L" beta" : L"", revision_number, APPBITS); SetWindowText(widget, tmpSz); widget = GetDlgItem(window, IDC_BUILD_STRING); @@ -467,7 +467,7 @@ BOOL OnInitAboutDialog(HWND window) widget = GetDlgItem(window, IDC_ABOUT_ENTRIES); const std::map& windows = Rainmeter->GetAllMeterWindows(); std::map::const_iterator iter = windows.begin(); - for( ; iter != windows.end(); ++iter) + for ( ; iter != windows.end(); ++iter) { CMeterWindow* meterWindow = (*iter).second; const std::wstring& skinName = meterWindow->GetSkinName(); @@ -530,8 +530,8 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa { WINDOWPOS* pos = (WINDOWPOS*)lParam; - pos->cx = max(280, pos->cx); - pos->cy = max(280, pos->cy); + pos->cx = max(420, pos->cx); + pos->cy = max(340, pos->cy); } break; diff --git a/Library/Library.rc b/Library/Library.rc index fc7f12b1..73132a13 100644 --- a/Library/Library.rc +++ b/Library/Library.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // #include "resource.h" -#include "..\revision-number.h" +#include "..\Version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -191,15 +191,15 @@ EXSTYLE WS_EX_APPWINDOW CAPTION "About Rainmeter" FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 BEGIN - CONTROL "List1",IDC_STATISTICS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,118,80,211,100 - CTEXT "Get the latest version at: http://www.rainmeter.net",IDC_URL_STRING,15,43,300,8 - CTEXT "Rainmeter version 0.0",IDC_VERSION_STRING,15,17,300,8 GROUPBOX "About",IDC_STATIC_ABOUT,7,7,220,69 + CTEXT "Rainmeter version 0.0",IDC_VERSION_STRING,15,17,300,8 CTEXT "(Built on ??? ?? ????)",IDC_BUILD_STRING,15,30,300,8 - DEFPUSHBUTTON "OK",IDOK,91,204,50,14 + CTEXT "Get the latest version at www.rainmeter.net",IDC_URL_STRING,15,43,300,8 CONTROL "Disable check for updates",IDC_DISABLE_VERSION_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,67,56,104,10 LISTBOX IDC_ABOUT_ENTRIES,7,80,130,100,LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "List1",IDC_STATISTICS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,118,80,211,100 + DEFPUSHBUTTON "OK",IDOK,91,204,50,14 END diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h index ef6fee96..152648c0 100644 --- a/Library/Rainmeter.h +++ b/Library/Rainmeter.h @@ -26,19 +26,16 @@ #include "Litestep.h" #include "MeterWindow.h" #include "TrayWindow.h" +#include "../Version.h" #define MAX_LINE_LENGTH 4096 -#define MAKE_VER(major, minor1, minor2) major * 1000000 + minor1 * 1000 + minor2 - #define APPNAME L"Rainmeter" -#define APPVERSION L"1.4" #ifdef _WIN64 #define APPBITS L"(64-bit)" #else #define APPBITS L"(32-bit)" #endif -#define RAINMETER_VERSION MAKE_VER(1, 4, 0) // Callbacks for Litestep void RainmeterRefresh(HWND, const char* arg); diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index 381f38f2..6bb3eb83 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -24,7 +24,7 @@ #include "AboutDialog.h" #include "Error.h" #include "RainmeterQuery.h" -#include "../revision-number.h" +#include "../Version.h" #define TRAYTIMER 3 diff --git a/Library/lua/include/luaconf.h b/Library/lua/include/luaconf.h index d042ba2f..d6414437 100644 --- a/Library/lua/include/luaconf.h +++ b/Library/lua/include/luaconf.h @@ -333,14 +333,14 @@ ** CHANGE it to undefined as soon as your programs use only '...' to ** access vararg parameters (instead of the old 'arg' table). */ -#define LUA_COMPAT_VARARG +#undef LUA_COMPAT_VARARG /* @@ LUA_COMPAT_MOD controls compatibility with old math.mod function. ** CHANGE it to undefined as soon as your programs use 'math.fmod' or ** the new '%' operator instead of 'math.mod'. */ -#define LUA_COMPAT_MOD +#undef LUA_COMPAT_MOD /* @@ LUA_COMPAT_LSTR controls compatibility with old long string nesting @@ -355,7 +355,7 @@ ** CHANGE it to undefined as soon as you rename 'string.gfind' to ** 'string.gmatch'. */ -#define LUA_COMPAT_GFIND +#undef LUA_COMPAT_GFIND /* @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @@ -363,7 +363,7 @@ ** CHANGE it to undefined as soon as you replace to 'luaL_register' ** your uses of 'luaL_openlib' */ -#define LUA_COMPAT_OPENLIB +#undef LUA_COMPAT_OPENLIB diff --git a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp index 548b5e44..d4d992f5 100644 --- a/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp +++ b/Plugins/PluginAdvancedCPU/AdvancedCPU.cpp @@ -23,7 +23,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point //ULONGLONG GetPerfData(PCTSTR ObjectName, PCTSTR InstanceName, PCTSTR CounterName); void UpdateProcesses(); diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc index b94ccce0..39cf91b8 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.cpp b/Plugins/PluginCoreTemp/PluginCoreTemp.cpp index 17ddd4a4..1d2ca1bb 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.cpp +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.cpp @@ -24,7 +24,7 @@ #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point extern "C" { diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.rc b/Plugins/PluginCoreTemp/PluginCoreTemp.rc index afdf3d69..51de4cf6 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.rc +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginExample/ExamplePlugin.c b/Plugins/PluginExample/ExamplePlugin.c index b7960e0e..541989cc 100644 --- a/Plugins/PluginExample/ExamplePlugin.c +++ b/Plugins/PluginExample/ExamplePlugin.c @@ -22,7 +22,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -//#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +//#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ __declspec( dllexport ) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id); diff --git a/Plugins/PluginExample/PluginExample.rc b/Plugins/PluginExample/PluginExample.rc index b9d2ab2a..5766d076 100644 --- a/Plugins/PluginExample/PluginExample.rc +++ b/Plugins/PluginExample/PluginExample.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp index b286f6b9..7fcdc9f4 100644 --- a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp +++ b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp @@ -22,7 +22,7 @@ #include #include "FolderInfo.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point #define UPDATE_TIME_MIN_MS 10000 diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.rc b/Plugins/PluginFolderInfo/PluginFolderInfo.rc index fc7f49fe..51a92345 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.rc +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginMediaKey/PluginMediaKey.cpp b/Plugins/PluginMediaKey/PluginMediaKey.cpp index 6b938418..df801176 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.cpp +++ b/Plugins/PluginMediaKey/PluginMediaKey.cpp @@ -20,7 +20,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginMediaKey/PluginMediaKey.rc b/Plugins/PluginMediaKey/PluginMediaKey.rc index 75820d0c..56fe8c88 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.rc +++ b/Plugins/PluginMediaKey/PluginMediaKey.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginPerfMon/PerfData.cpp b/Plugins/PluginPerfMon/PerfData.cpp index 7def5679..ab29f8f4 100644 --- a/Plugins/PluginPerfMon/PerfData.cpp +++ b/Plugins/PluginPerfMon/PerfData.cpp @@ -23,7 +23,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point ULONGLONG GetPerfData(PCTSTR ObjectName, PCTSTR InstanceName, PCTSTR CounterName); diff --git a/Plugins/PluginPerfMon/PluginPerfMon.rc b/Plugins/PluginPerfMon/PluginPerfMon.rc index 5ead5465..4822c187 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.rc +++ b/Plugins/PluginPerfMon/PluginPerfMon.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginPing/Ping.cpp b/Plugins/PluginPing/Ping.cpp index 0b9bc389..75bb580c 100644 --- a/Plugins/PluginPing/Ping.cpp +++ b/Plugins/PluginPing/Ping.cpp @@ -29,7 +29,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginPing/PluginPing.rc b/Plugins/PluginPing/PluginPing.rc index 1fa02a71..c75ba9bd 100644 --- a/Plugins/PluginPing/PluginPing.rc +++ b/Plugins/PluginPing/PluginPing.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginPower/PluginPower.rc b/Plugins/PluginPower/PluginPower.rc index 950f644f..81254156 100644 --- a/Plugins/PluginPower/PluginPower.rc +++ b/Plugins/PluginPower/PluginPower.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginPower/PowerPlugin.cpp b/Plugins/PluginPower/PowerPlugin.cpp index d25fcdbb..74b4677e 100644 --- a/Plugins/PluginPower/PowerPlugin.cpp +++ b/Plugins/PluginPower/PowerPlugin.cpp @@ -26,7 +26,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point typedef struct _PROCESSOR_POWER_INFORMATION { diff --git a/Plugins/PluginQuote/PluginQuote.rc b/Plugins/PluginQuote/PluginQuote.rc index 7e767bdf..727a2ecd 100644 --- a/Plugins/PluginQuote/PluginQuote.rc +++ b/Plugins/PluginQuote/PluginQuote.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginQuote/Quote.cpp b/Plugins/PluginQuote/Quote.cpp index 104ba032..98f7930e 100644 --- a/Plugins/PluginQuote/Quote.cpp +++ b/Plugins/PluginQuote/Quote.cpp @@ -28,7 +28,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.rc b/Plugins/PluginRecycleManager/PluginRecycleManager.rc index ffa627b2..17973db5 100644 --- a/Plugins/PluginRecycleManager/PluginRecycleManager.rc +++ b/Plugins/PluginRecycleManager/PluginRecycleManager.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginRecycleManager/RecycleManager.cpp b/Plugins/PluginRecycleManager/RecycleManager.cpp index f6424350..d61bedc6 100644 --- a/Plugins/PluginRecycleManager/RecycleManager.cpp +++ b/Plugins/PluginRecycleManager/RecycleManager.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginResMon/PluginResMon.rc b/Plugins/PluginResMon/PluginResMon.rc index 4de688f2..68f112a3 100644 --- a/Plugins/PluginResMon/PluginResMon.rc +++ b/Plugins/PluginResMon/PluginResMon.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginResMon/ResMon.cpp b/Plugins/PluginResMon/ResMon.cpp index abfc06a5..61d6c018 100644 --- a/Plugins/PluginResMon/ResMon.cpp +++ b/Plugins/PluginResMon/ResMon.cpp @@ -34,7 +34,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.rc b/Plugins/PluginSpeedFan/PluginSpeedFan.rc index 42424ac2..8debf38b 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.rc +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp index 2d6d26ec..01d3375e 100644 --- a/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp +++ b/Plugins/PluginSpeedFan/SpeedFanPlugin.cpp @@ -24,7 +24,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginSysInfo/PluginSysInfo.rc b/Plugins/PluginSysInfo/PluginSysInfo.rc index ad1e27c2..348c2058 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.rc +++ b/Plugins/PluginSysInfo/PluginSysInfo.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginSysInfo/SysInfo.cpp b/Plugins/PluginSysInfo/SysInfo.cpp index 925a4b3c..c145d9f2 100644 --- a/Plugins/PluginSysInfo/SysInfo.cpp +++ b/Plugins/PluginSysInfo/SysInfo.cpp @@ -26,7 +26,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc index a4731227..72462d9a 100644 --- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc +++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp b/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp index b24aaf98..2f6b281e 100644 --- a/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp +++ b/Plugins/PluginVirtualDesktops/VirtualDesktops.cpp @@ -72,7 +72,7 @@ #include "../../Library/Export.h" -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point extern "C" { diff --git a/Plugins/PluginWebParser/PluginWebParser.rc b/Plugins/PluginWebParser/PluginWebParser.rc index 3e1010c7..5d2705f9 100644 --- a/Plugins/PluginWebParser/PluginWebParser.rc +++ b/Plugins/PluginWebParser/PluginWebParser.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginWebParser/WebParser.cpp b/Plugins/PluginWebParser/WebParser.cpp index 37a03244..534e237b 100644 --- a/Plugins/PluginWebParser/WebParser.cpp +++ b/Plugins/PluginWebParser/WebParser.cpp @@ -32,7 +32,7 @@ #include "..\..\Library\pcre-8.10/pcre.h" #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.rc b/Plugins/PluginWifiStatus/PluginWifiStatus.rc index 049490dd..01cce545 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.rc +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginWifiStatus/WifiStatus.cpp b/Plugins/PluginWifiStatus/WifiStatus.cpp index 6ddbfcbb..15822814 100644 --- a/Plugins/PluginWifiStatus/WifiStatus.cpp +++ b/Plugins/PluginWifiStatus/WifiStatus.cpp @@ -26,7 +26,7 @@ along with this program. If not, see . #pragma comment( lib, "wlanapi.lib") #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.rc b/Plugins/PluginWin7Audio/PluginWin7Audio.rc index 2bc199c9..8d85529d 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.rc +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp b/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp index 5c537500..5f849434 100644 --- a/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp +++ b/Plugins/PluginWin7Audio/Win7AudioPlugin.cpp @@ -32,7 +32,7 @@ #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point #define SAFE_RELEASE(punk) \ if ((punk) != NULL) { (punk)->Release(); (punk) = NULL; } diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.rc b/Plugins/PluginWindowMessage/PluginWindowMessage.rc index 38e86874..c90f8576 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.rc +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp index 49a8b5e0..a3790ed6 100644 --- a/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp +++ b/Plugins/PluginWindowMessage/WindowMessagePlugin.cpp @@ -26,7 +26,7 @@ #include #include "..\..\Library\Export.h" // Rainmeter's exported functions -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point /* The exported functions */ extern "C" diff --git a/Plugins/PluginiTunes/PluginiTunes.rc b/Plugins/PluginiTunes/PluginiTunes.rc index 9244a11b..4d952e28 100644 --- a/Plugins/PluginiTunes/PluginiTunes.rc +++ b/Plugins/PluginiTunes/PluginiTunes.rc @@ -1,7 +1,7 @@ // Microsoft Developer Studio generated resource script. // -#include "..\..\revision-number.h" +#include "..\..\Version.h" #define APSTUDIO_READONLY_SYMBOLS #include "windows.h" #undef APSTUDIO_READONLY_SYMBOLS diff --git a/Plugins/PluginiTunes/iTunesPlugin.cpp b/Plugins/PluginiTunes/iTunesPlugin.cpp index cc797a08..f67138d8 100644 --- a/Plugins/PluginiTunes/iTunesPlugin.cpp +++ b/Plugins/PluginiTunes/iTunesPlugin.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point +#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point const int VOLUME_STEP = 5; diff --git a/Version.h b/Version.h new file mode 100644 index 00000000..8b96a395 --- /dev/null +++ b/Version.h @@ -0,0 +1,13 @@ +#pragma once +#define MAKE_VER(major, minor1, minor2) major * 1000000 + minor1 * 1000 + minor2 + +#define FILEVER 1,4,0,733 +#define PRODUCTVER 1,4,0,733 +#define STRFILEVER "1.4.0.733" +#define STRPRODUCTVER "1.4.0.733" + +#define APPVERSION L"1.4.0" +#define RAINMETER_VERSION MAKE_VER(1, 4, 0) + +const int revision_number = 733; +const bool revision_beta = true; diff --git a/revision-number.h b/revision-number.h deleted file mode 100644 index 02fbf953..00000000 --- a/revision-number.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#define FILEVER 1,4,0,728 -#define PRODUCTVER 1,4,0,728 -#define STRFILEVER "1.4.0.728" -#define STRPRODUCTVER "1.4.0.728" - -const int revision_number = 728; -const bool revision_beta = true;