From e7777fcfe5a5065aa49948c3dda2e35d61205cd0 Mon Sep 17 00:00:00 2001 From: brianferguson Date: Mon, 2 Dec 2019 01:24:18 -0700 Subject: [PATCH] Partially revert 6eb1c31 --- Application/Application.vcxproj | 2 +- Build/DllExporter/DllExporter.csproj | 2 +- Build/VS/Rainmeter.Cpp.Default.props | 2 +- Build/VS/Rainmeter.Cpp.props | 2 +- Build/VS/RainmeterPlugin.Cpp.props | 2 +- Common/Common.vcxproj | 2 +- Common/Common_Test.vcxproj | 2 +- Language/Language.vcxproj | 2 +- Library/Library.vcxproj | 2 +- Library/Library_Lua.vcxproj | 2 +- Library/Library_PCRE.vcxproj | 2 +- Library/Library_Taglib.vcxproj | 2 +- Library/Library_Zlib.vcxproj | 2 +- Library/NowPlaying/PluginNowPlaying.vcxproj | 2 +- Plugins/PluginActionTimer/PluginActionTimer.vcxproj | 2 +- Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj | 2 +- Plugins/PluginAudioLevel/PluginAudioLevel.vcxproj | 2 +- Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj | 2 +- Plugins/PluginFileView/PluginFileView.vcxproj | 2 +- Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj | 2 +- Plugins/PluginInputText/PluginInputText.csproj | 2 +- Plugins/PluginPerfMon/PluginPerfMon.vcxproj | 2 +- Plugins/PluginPing/PluginPing.vcxproj | 2 +- Plugins/PluginPower/PluginPower.vcxproj | 2 +- Plugins/PluginProcess/PluginProcess.vcxproj | 2 +- Plugins/PluginQuote/PluginQuote.vcxproj | 2 +- Plugins/PluginResMon/PluginResMon.vcxproj | 2 +- Plugins/PluginRunCommand/PluginRunCommand.vcxproj | 2 +- Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj | 2 +- Plugins/PluginSysInfo/PluginSysInfo.vcxproj | 2 +- Plugins/PluginUsageMonitor/PluginUsageMonitor.csproj | 2 +- Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj | 2 +- Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj | 2 +- Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj | 2 +- Plugins/PluginiTunes/PluginiTunes.vcxproj | 2 +- SkinInstaller/SkinInstaller.vcxproj | 2 +- SkinInstaller/SkinInstallerLauncher.vcxproj | 2 +- Version.cs | 4 ++-- Version.h | 8 +++----- 39 files changed, 42 insertions(+), 44 deletions(-) diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj index ee2c91537..51ad9dd89 100644 --- a/Application/Application.vcxproj +++ b/Application/Application.vcxproj @@ -1,5 +1,5 @@  - + {D2A0903C-E760-4134-AE61-3D55BF8F760C} diff --git a/Build/DllExporter/DllExporter.csproj b/Build/DllExporter/DllExporter.csproj index ba1037f9b..2e976462e 100644 --- a/Build/DllExporter/DllExporter.csproj +++ b/Build/DllExporter/DllExporter.csproj @@ -1,5 +1,5 @@  - + Debug x86 diff --git a/Build/VS/Rainmeter.Cpp.Default.props b/Build/VS/Rainmeter.Cpp.Default.props index de8ad1a5f..cac844b88 100644 --- a/Build/VS/Rainmeter.Cpp.Default.props +++ b/Build/VS/Rainmeter.Cpp.Default.props @@ -1,6 +1,6 @@ - + $(SolutionDir)..\WinDDK\7600.16385.1\ diff --git a/Build/VS/Rainmeter.Cpp.props b/Build/VS/Rainmeter.Cpp.props index 7d52befc7..112ef0fc5 100644 --- a/Build/VS/Rainmeter.Cpp.props +++ b/Build/VS/Rainmeter.Cpp.props @@ -1,6 +1,6 @@ - + true true diff --git a/Build/VS/RainmeterPlugin.Cpp.props b/Build/VS/RainmeterPlugin.Cpp.props index 2a0ef78ed..59c8eb95b 100644 --- a/Build/VS/RainmeterPlugin.Cpp.props +++ b/Build/VS/RainmeterPlugin.Cpp.props @@ -1,5 +1,5 @@ - + false $(OutDir)Plugins\ diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index d85c28694..402450494 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -1,5 +1,5 @@  - + {19312085-AA51-4BD6-BE92-4B6098CCA539} diff --git a/Common/Common_Test.vcxproj b/Common/Common_Test.vcxproj index 9d2f51d55..5e153be99 100644 --- a/Common/Common_Test.vcxproj +++ b/Common/Common_Test.vcxproj @@ -1,5 +1,5 @@  - + {442084A6-2069-4927-B0C9-51525A720CB2} diff --git a/Language/Language.vcxproj b/Language/Language.vcxproj index 3c316f40c..2f8d5547e 100644 --- a/Language/Language.vcxproj +++ b/Language/Language.vcxproj @@ -1,5 +1,5 @@  - + {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index 4a9de5ea4..8d2071f53 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -1,5 +1,5 @@  - + {BE9D2400-7F1C-49D6-8498-5CE495491AD6} diff --git a/Library/Library_Lua.vcxproj b/Library/Library_Lua.vcxproj index df4d40d65..b64854728 100644 --- a/Library/Library_Lua.vcxproj +++ b/Library/Library_Lua.vcxproj @@ -1,5 +1,5 @@  - + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} diff --git a/Library/Library_PCRE.vcxproj b/Library/Library_PCRE.vcxproj index 15c54b289..233a93452 100644 --- a/Library/Library_PCRE.vcxproj +++ b/Library/Library_PCRE.vcxproj @@ -1,5 +1,5 @@  - + {6D61FBE9-6913-4885-A95D-1A8C0C223D82} diff --git a/Library/Library_Taglib.vcxproj b/Library/Library_Taglib.vcxproj index fb20dc044..8e610c2b6 100644 --- a/Library/Library_Taglib.vcxproj +++ b/Library/Library_Taglib.vcxproj @@ -1,5 +1,5 @@  - + {0F414430-65C7-4A35-B878-7E6350D6D976} diff --git a/Library/Library_Zlib.vcxproj b/Library/Library_Zlib.vcxproj index 810bae66d..44f0c3039 100644 --- a/Library/Library_Zlib.vcxproj +++ b/Library/Library_Zlib.vcxproj @@ -1,5 +1,5 @@  - + {5D164F45-CEED-47A3-8A5D-B752D09B09DB} diff --git a/Library/NowPlaying/PluginNowPlaying.vcxproj b/Library/NowPlaying/PluginNowPlaying.vcxproj index 2c9bef748..d0822ed99 100644 --- a/Library/NowPlaying/PluginNowPlaying.vcxproj +++ b/Library/NowPlaying/PluginNowPlaying.vcxproj @@ -1,5 +1,5 @@  - + {C7FECFCD-E6C6-4F95-BB9A-E1762B043969} diff --git a/Plugins/PluginActionTimer/PluginActionTimer.vcxproj b/Plugins/PluginActionTimer/PluginActionTimer.vcxproj index 8cc86d83c..5fc8381f6 100644 --- a/Plugins/PluginActionTimer/PluginActionTimer.vcxproj +++ b/Plugins/PluginActionTimer/PluginActionTimer.vcxproj @@ -1,5 +1,5 @@  - + {1EC81ACD-9FAC-4A2C-B798-D397397D5E2E} diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj index 50dd8a051..3475966c5 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj @@ -1,5 +1,5 @@  - + {EE8EC522-8430-4B46-86A3-D943D77F9E4B} diff --git a/Plugins/PluginAudioLevel/PluginAudioLevel.vcxproj b/Plugins/PluginAudioLevel/PluginAudioLevel.vcxproj index e26d68ae2..b1fa2f1c1 100644 --- a/Plugins/PluginAudioLevel/PluginAudioLevel.vcxproj +++ b/Plugins/PluginAudioLevel/PluginAudioLevel.vcxproj @@ -1,5 +1,5 @@  - + {7FB00A1C-F0C0-49FD-A15C-392F69FDF645} diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj index 7a409228c..fb29ca434 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj @@ -1,5 +1,5 @@  - + {F32FA418-8DF4-4E94-B92B-EBD502F5DC07} diff --git a/Plugins/PluginFileView/PluginFileView.vcxproj b/Plugins/PluginFileView/PluginFileView.vcxproj index c8990e7b2..171a07bc1 100644 --- a/Plugins/PluginFileView/PluginFileView.vcxproj +++ b/Plugins/PluginFileView/PluginFileView.vcxproj @@ -1,5 +1,5 @@  - + {64FDEE97-6B7E-40E5-A489-ECA322825BC8} diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj index 694ed05e9..92e6aa343 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj @@ -1,5 +1,5 @@  - + {A221819D-4263-42AA-B22A-C022924842A7} diff --git a/Plugins/PluginInputText/PluginInputText.csproj b/Plugins/PluginInputText/PluginInputText.csproj index 37c157c04..93d0affbc 100644 --- a/Plugins/PluginInputText/PluginInputText.csproj +++ b/Plugins/PluginInputText/PluginInputText.csproj @@ -1,5 +1,5 @@  - + Debug x86 diff --git a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj index e1cadd1db..0171ae013 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj +++ b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj @@ -1,5 +1,5 @@  - + {5344B52B-BAC3-479C-B41D-D465B8BDA1AD} diff --git a/Plugins/PluginPing/PluginPing.vcxproj b/Plugins/PluginPing/PluginPing.vcxproj index 59c73d342..c6a76294e 100644 --- a/Plugins/PluginPing/PluginPing.vcxproj +++ b/Plugins/PluginPing/PluginPing.vcxproj @@ -1,5 +1,5 @@  - + {C862B662-5CC6-4E79-B1B3-905E0B98D627} diff --git a/Plugins/PluginPower/PluginPower.vcxproj b/Plugins/PluginPower/PluginPower.vcxproj index 47698441f..0fa0b13ee 100644 --- a/Plugins/PluginPower/PluginPower.vcxproj +++ b/Plugins/PluginPower/PluginPower.vcxproj @@ -1,5 +1,5 @@  - + {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF} diff --git a/Plugins/PluginProcess/PluginProcess.vcxproj b/Plugins/PluginProcess/PluginProcess.vcxproj index dcc21e557..bacf80960 100644 --- a/Plugins/PluginProcess/PluginProcess.vcxproj +++ b/Plugins/PluginProcess/PluginProcess.vcxproj @@ -1,5 +1,5 @@  - + {05203741-CD80-4060-8218-EC5D1120FE3E} diff --git a/Plugins/PluginQuote/PluginQuote.vcxproj b/Plugins/PluginQuote/PluginQuote.vcxproj index 0f24cd9ba..22a33913f 100644 --- a/Plugins/PluginQuote/PluginQuote.vcxproj +++ b/Plugins/PluginQuote/PluginQuote.vcxproj @@ -1,5 +1,5 @@  - + {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F} diff --git a/Plugins/PluginResMon/PluginResMon.vcxproj b/Plugins/PluginResMon/PluginResMon.vcxproj index d7c74328f..c0cef83aa 100644 --- a/Plugins/PluginResMon/PluginResMon.vcxproj +++ b/Plugins/PluginResMon/PluginResMon.vcxproj @@ -1,5 +1,5 @@  - + {17D3BD92-6F5D-438C-A89B-88F4CE06DB94} diff --git a/Plugins/PluginRunCommand/PluginRunCommand.vcxproj b/Plugins/PluginRunCommand/PluginRunCommand.vcxproj index 98eff80b5..9ff278dd6 100644 --- a/Plugins/PluginRunCommand/PluginRunCommand.vcxproj +++ b/Plugins/PluginRunCommand/PluginRunCommand.vcxproj @@ -1,5 +1,5 @@  - + {4ABFBA48-C1DF-44B5-992F-3CFAEDE48974} diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj index b8afc0663..6c354aba5 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj @@ -1,5 +1,5 @@  - + {D10AB316-0F7A-4551-BE4F-385E04CCF1E8} diff --git a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj index 8708ad507..6afb691d1 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj +++ b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj @@ -1,5 +1,5 @@  - + {6EBCA4DA-8CC7-42FE-8F45-878ABE165078} diff --git a/Plugins/PluginUsageMonitor/PluginUsageMonitor.csproj b/Plugins/PluginUsageMonitor/PluginUsageMonitor.csproj index 48b33d339..50fbfce3a 100644 --- a/Plugins/PluginUsageMonitor/PluginUsageMonitor.csproj +++ b/Plugins/PluginUsageMonitor/PluginUsageMonitor.csproj @@ -1,5 +1,5 @@  - + Debug x86 diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj index 5cfd3ede1..7d1fad8f4 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj @@ -1,5 +1,5 @@  - + {45A34285-56DD-4521-912B-3F884D36FA35} diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj index 5c806af6b..bd43e76f8 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj @@ -1,5 +1,5 @@  - + {6D032D6B-7656-4743-B454-3388E2921EB0} diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj index 71b014d33..839da4b3a 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj @@ -1,5 +1,5 @@  - + {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4} diff --git a/Plugins/PluginiTunes/PluginiTunes.vcxproj b/Plugins/PluginiTunes/PluginiTunes.vcxproj index 376d305bf..53f47030f 100644 --- a/Plugins/PluginiTunes/PluginiTunes.vcxproj +++ b/Plugins/PluginiTunes/PluginiTunes.vcxproj @@ -1,5 +1,5 @@  - + {A2DD3CBE-B140-4892-A875-24107FA52518} diff --git a/SkinInstaller/SkinInstaller.vcxproj b/SkinInstaller/SkinInstaller.vcxproj index bc7bd7191..ee95cdd18 100644 --- a/SkinInstaller/SkinInstaller.vcxproj +++ b/SkinInstaller/SkinInstaller.vcxproj @@ -1,5 +1,5 @@  - + {6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA} diff --git a/SkinInstaller/SkinInstallerLauncher.vcxproj b/SkinInstaller/SkinInstallerLauncher.vcxproj index 83c443a21..c65fdea4e 100644 --- a/SkinInstaller/SkinInstallerLauncher.vcxproj +++ b/SkinInstaller/SkinInstallerLauncher.vcxproj @@ -1,5 +1,5 @@  - + {2D8F1DDB-6470-45A1-B95A-3E2960641314} diff --git a/Version.cs b/Version.cs index 9801aef30..003736f51 100644 --- a/Version.cs +++ b/Version.cs @@ -3,9 +3,9 @@ namespace Rainmeter public class Version { #if X64 - public const string Informational = "4.4.0.3338 (64-bit^)"; + public const string Informational = "4.4.0.3321 (64-bit)"; #else - public const string Informational = "4.4.0.3338 (32-bit^)"; + public const string Informational = "4.4.0.3321 (32-bit)"; #endif } } diff --git a/Version.h b/Version.h index 0f6c4bd3d..10f8c8182 100644 --- a/Version.h +++ b/Version.h @@ -1,11 +1,9 @@ #pragma once -#define FILEVER 4,4,0,3338 +#define FILEVER 4,4,0,3321 #define PRODUCTVER FILEVER -#define STRFILEVER "4.4.0.3338" +#define STRFILEVER "4.4.0.3321" #define STRPRODUCTVER STRFILEVER #define APPVERSION L"4.4.0" #define RAINMETER_VERSION ((4 * 1000000) + (4 * 1000) + 0) -#define COMMIT_HASH L"ab72019a" -#define BUILD_TIME L"2019-11-27 17:01:26" -const int revision_number = 3338; +const int revision_number = 3321; const bool revision_beta = true;