From dc07162956c28008c42a5572402a56609f83ca5f Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Mon, 11 Jun 2012 16:15:03 +0300 Subject: [PATCH] Improved 83f1b1a --- Application/Application.cpp | 31 ++- Application/Application.vcxproj | 4 + Application/Launcher/Launcher.cpp | 46 ----- Application/Launcher/Launcher.vcxproj | 190 ------------------ Application/Launcher/Launcher.vcxproj.filters | 22 -- Build/Installer/Installer.nsi | 7 +- Library/Rainmeter.cpp | 29 ++- .../PluginAdvancedCPU.vcxproj | 1 - Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj | 1 - .../PluginFolderInfo/PluginFolderInfo.vcxproj | 1 - Plugins/PluginMediaKey/PluginMediaKey.vcxproj | 1 - .../PluginNowPlaying/PluginNowPlaying.vcxproj | 1 - Plugins/PluginPerfMon/PluginPerfMon.vcxproj | 1 - Plugins/PluginPing/PluginPing.vcxproj | 1 - Plugins/PluginPower/PluginPower.vcxproj | 1 - Plugins/PluginProcess/PluginProcess.vcxproj | 1 - Plugins/PluginQuote/PluginQuote.vcxproj | 1 - .../PluginRecycleManager.vcxproj | 1 - Plugins/PluginResMon/PluginResMon.vcxproj | 1 - Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj | 1 - Plugins/PluginSysInfo/PluginSysInfo.vcxproj | 1 - .../PluginVirtualDesktops.vcxproj | 1 - .../PluginWebParser/PluginWebParser.vcxproj | 1 - .../PluginWifiStatus/PluginWifiStatus.vcxproj | 1 - .../PluginWin7Audio/PluginWin7Audio.vcxproj | 1 - .../PluginWindowMessage.vcxproj | 1 - Plugins/PluginiTunes/PluginiTunes.vcxproj | 1 - Rainmeter.sln | 10 - RainmeterCPP.sln | 10 - 29 files changed, 58 insertions(+), 311 deletions(-) delete mode 100644 Application/Launcher/Launcher.cpp delete mode 100644 Application/Launcher/Launcher.vcxproj delete mode 100644 Application/Launcher/Launcher.vcxproj.filters diff --git a/Application/Application.cpp b/Application/Application.cpp index 3bcecffb..5060e287 100644 --- a/Application/Application.cpp +++ b/Application/Application.cpp @@ -20,6 +20,7 @@ #define WIN32_LEAN_AND_MEAN #include #include +#include #include "../Library/Rainmeter.h" #if defined _M_IX86 @@ -41,5 +42,33 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); //_CrtSetBreakAlloc(000); - return RainmeterMain(lpCmdLine); + HRSRC iconResource = FindResource(hInstance, MAKEINTRESOURCE(1), RT_ICON); + if (iconResource) + { + // Call RainmeterMain from Rainmeter.dll. Since Rainmeter.dll is delay-loaded, this will cause + // crash if Rainmeter.dll is not found. + return RainmeterMain(lpCmdLine); + } + else + { + // Stub prodecure. If icon resources have been removed, try to launch the actual Rainmeter.exe. + HKEY hKey; + const REGSAM desiredSam = KEY_QUERY_VALUE | KEY_WOW64_32KEY; + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Rainmeter", 0, desiredSam, &hKey) == ERROR_SUCCESS) + { + const DWORD size = MAX_PATH; + WCHAR buffer[size]; + DWORD type = 0; + if (RegQueryValueEx(hKey, NULL , NULL, &type, (LPBYTE)buffer, (LPDWORD)&size) == ERROR_SUCCESS && + type == REG_SZ) + { + SetCurrentDirectory(buffer); + wcscat(buffer, L"\\Rainmeter.exe"); + ShellExecute(NULL, L"open", buffer, lpCmdLine, NULL, SW_SHOWNORMAL); + } + RegCloseKey(hKey); + } + + return 0; + } } diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj index bfa4aae7..dda8218b 100644 --- a/Application/Application.vcxproj +++ b/Application/Application.vcxproj @@ -101,6 +101,7 @@ wWinMainCRTStartup MachineX86 $(IntDir)$(TargetName).pdb + Rainmeter.dll if exist ..\testbench\x32\debug\skins goto skip @@ -135,6 +136,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\themes wWinMainCRTStartup MachineX64 $(IntDir)$(TargetName).pdb + Rainmeter.dll if exist ..\testbench\x64\debug\skins goto skip @@ -172,6 +174,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\themes true true $(IntDir)$(TargetName).pdb + Rainmeter.dll if exist ..\testbench\x32\release\skins goto skip @@ -208,6 +211,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\themes true true $(IntDir)$(TargetName).pdb + Rainmeter.dll if exist ..\testbench\x64\release\skins goto skip diff --git a/Application/Launcher/Launcher.cpp b/Application/Launcher/Launcher.cpp deleted file mode 100644 index 307bb078..00000000 --- a/Application/Launcher/Launcher.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - Copyright (C) 2012 Birunthan Mohanathas - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#define WIN32_LEAN_AND_MEAN -#include -#include -#include "../../Library/Rainmeter.h" - -/* -** Entry point. -** -*/ -int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) -{ - HKEY hKey; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Rainmeter", 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hKey) == ERROR_SUCCESS) - { - const DWORD size = MAX_PATH; - WCHAR buffer[size]; - DWORD type = 0; - if (RegQueryValueEx(hKey, NULL , NULL, &type, (LPBYTE)buffer, (LPDWORD)&size) == ERROR_SUCCESS && type == REG_SZ) - { - SetCurrentDirectory(buffer); - wcscat(buffer, L"\\Rainmeter.exe"); - ShellExecute(NULL, L"open", buffer, lpCmdLine, NULL, SW_SHOWNORMAL); - } - RegCloseKey(hKey); - } - - return 0; -} diff --git a/Application/Launcher/Launcher.vcxproj b/Application/Launcher/Launcher.vcxproj deleted file mode 100644 index d2c85fea..00000000 --- a/Application/Launcher/Launcher.vcxproj +++ /dev/null @@ -1,190 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F} - - - - - Application - Unicode - true - - - Application - true - Unicode - - - Application - Unicode - $(COMPILER64) - true - - - Application - true - Unicode - $(COMPILER64) - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)TestBench\x32\$(Configuration)\ - .\x32\$(Configuration)\ - true - $(SolutionDir)TestBench\x64\$(Configuration)\ - .\x64\$(Configuration)\ - true - $(SolutionDir)TestBench\x32\$(Configuration)\ - .\x32\$(Configuration)\ - $(SolutionDir)TestBench\x64\$(Configuration)\ - .\x64\$(Configuration)\ - Launcher - Launcher - Launcher - Launcher - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - - - Level3 - EditAndContinue - 4018;4090;4114;4267;4351;4786;4800;4996 - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x32/Debug/Launcher.exe - true - Windows - wWinMainCRTStartup - MachineX86 - $(IntDir)$(TargetName).pdb - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - - - Level3 - ProgramDatabase - 4018;4090;4114;4267;4351;4786;4800;4996 - false - - - _DEBUG;_WIN64;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x64/Debug/Launcher.exe - true - Windows - wWinMainCRTStartup - MachineX64 - $(IntDir)$(TargetName).pdb - - - - - MaxSpeed - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - Level3 - ProgramDatabase - 4018;4090;4114;4267;4351;4786;4800;4996 - false - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x32/Release/Launcher.exe - ..\Library\x32\Release;%(AdditionalLibraryDirectories) - Windows - wWinMainCRTStartup - MachineX86 - .rdata=.text - true - true - $(IntDir)$(TargetName).pdb - - - - - /GA %(AdditionalOptions) - MaxSpeed - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - Level3 - ProgramDatabase - 4018;4090;4114;4267;4351;4786;4800;4996 - false - - - NDEBUG;_WIN64;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x64/Release/Launcher.exe - ..\Library\x64\Release;%(AdditionalLibraryDirectories) - Windows - wWinMainCRTStartup - MachineX64 - .rdata=.text - true - true - $(IntDir)$(TargetName).pdb - - - - - - - - - \ No newline at end of file diff --git a/Application/Launcher/Launcher.vcxproj.filters b/Application/Launcher/Launcher.vcxproj.filters deleted file mode 100644 index 2810dc83..00000000 --- a/Application/Launcher/Launcher.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {22670730-eb79-4df9-bed9-27fff1350132} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {774a1827-ac91-40b9-ad18-8a3d68983c64} - h;hpp;hxx;hm;inl - - - {a4963a10-e359-400f-86fa-bdce98dd5dc2} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - \ No newline at end of file diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi index 29e33a66..4a6ed52b 100644 --- a/Build/Installer/Installer.nsi +++ b/Build/Installer/Installer.nsi @@ -506,11 +506,6 @@ FunctionEnd File "..\..\TestBench\${DIR}\Release\Rainmeter.dll" File "..\..\TestBench\${DIR}\Release\SkinInstaller.exe" - ${If} $InstallPortable != 1 - File "..\..\TestBench\${DIR}\Release\Launcher.exe" - SetFileAttributes "$INSTDIR\Launcher.exe" HIDDEN - ${EndIf} - SetOutPath "$INSTDIR\Plugins" File /x *Example*.dll "..\..\TestBench\${DIR}\Release\Plugins\*.dll" !macroend @@ -706,6 +701,7 @@ SkipIniMove: Delete "$INSTDIR\Rainmeter.exe.config" Delete "$INSTDIR\Rainmeter.chm" Delete "$INSTDIR\Default.ini" + Delete "$INSTDIR\Launcher.exe" RMDir /r "$INSTDIR\Addons\Rainstaller" RMDir /r "$INSTDIR\Addons\RainBackup" @@ -951,7 +947,6 @@ Section Uninstall Delete "$INSTDIR\Rainmeter.dll" Delete "$INSTDIR\Rainmeter.exe" Delete "$INSTDIR\SkinInstaller.exe" - Delete "$INSTDIR\Launcher.exe" RMDir "$INSTDIR" ${If} $un.DeleteAll == 1 diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index 31bbe58f..106fc0a9 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -721,6 +721,8 @@ int CRainmeter::Initialize(LPCWSTR iniPath) { InitalizeLitestep(); + m_Instance = GetModuleHandle(L"Rainmeter"); + WCHAR* buffer = new WCHAR[MAX_LINE_LENGTH]; GetModuleFileName(m_Instance, buffer, MAX_LINE_LENGTH); @@ -773,8 +775,6 @@ int CRainmeter::Initialize(LPCWSTR iniPath) return 1; } - m_Instance = GetModuleHandle(L"Rainmeter"); - WNDCLASS wc = {0}; wc.lpfnWndProc = (WNDPROC)MainWndProc; wc.hInstance = m_Instance; @@ -1215,13 +1215,30 @@ void CRainmeter::CreateComponentFolders(bool defaultIniLocation) path = m_SettingsPath; path += L"Rainmeter.exe"; - if (_waccess(path.c_str(), 0) == -1) + const WCHAR* pathSz = path.c_str(); + if (_waccess(pathSz, 0) == -1) { - // Create a hidden dummy Rainmeter.exe into SettingsPath for old addon + // Create a hidden stub Rainmeter.exe into SettingsPath for old addon // using relative path to Rainmeter.exe - std::wstring from = m_Path + L"Launcher.exe"; + std::wstring from = m_Path + L"Rainmeter.exe"; CSystem::CopyFiles(from, path); - SetFileAttributes(path.c_str(), FILE_ATTRIBUTE_HIDDEN); + + // Get rid of all resources from the stub executable + HANDLE stub = BeginUpdateResource(pathSz, TRUE); + + // Add the manifest of Rainmeter.dll to the stub + HRSRC manifest = FindResource(m_Instance, MAKEINTRESOURCE(2), RT_MANIFEST); + DWORD manifestSize = SizeofResource(m_Instance, manifest); + HGLOBAL manifestLoad = LoadResource(m_Instance, manifest); + void* manifestLoadData = LockResource(manifestLoad); + if (manifestLoadData) + { + LANGID langID = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); + UpdateResource(stub, RT_MANIFEST, MAKEINTRESOURCE(1), langID, manifestLoadData, manifestSize); + } + + EndUpdateResource(stub, FALSE); + SetFileAttributes(pathSz, FILE_ATTRIBUTE_HIDDEN); } } } diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj index 0ee39790..2d5d3a6d 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj @@ -77,7 +77,6 @@ AdvancedCPU AdvancedCPU AdvancedCPU - false diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj index 0b9e8259..a7fbb245 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj @@ -78,7 +78,6 @@ CoreTemp CoreTemp CoreTemp - false diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj index 97452601..3de49e76 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj @@ -77,7 +77,6 @@ FolderInfo FolderInfo FolderInfo - false diff --git a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj index 7df6cbb9..03739af9 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj +++ b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj @@ -78,7 +78,6 @@ MediaKey MediaKey MediaKey - false diff --git a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj index 2a4a2308..8a23065b 100644 --- a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj +++ b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj @@ -78,7 +78,6 @@ NowPlaying NowPlaying NowPlaying - false diff --git a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj index 035838ac..1458b4c7 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj +++ b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj @@ -77,7 +77,6 @@ PerfMon PerfMon PerfMon - false diff --git a/Plugins/PluginPing/PluginPing.vcxproj b/Plugins/PluginPing/PluginPing.vcxproj index 6d953be9..0aeba4d3 100644 --- a/Plugins/PluginPing/PluginPing.vcxproj +++ b/Plugins/PluginPing/PluginPing.vcxproj @@ -77,7 +77,6 @@ PingPlugin PingPlugin PingPlugin - false diff --git a/Plugins/PluginPower/PluginPower.vcxproj b/Plugins/PluginPower/PluginPower.vcxproj index adb38a48..aed79076 100644 --- a/Plugins/PluginPower/PluginPower.vcxproj +++ b/Plugins/PluginPower/PluginPower.vcxproj @@ -77,7 +77,6 @@ PowerPlugin PowerPlugin PowerPlugin - false diff --git a/Plugins/PluginProcess/PluginProcess.vcxproj b/Plugins/PluginProcess/PluginProcess.vcxproj index be9b34ef..d53ac8f7 100644 --- a/Plugins/PluginProcess/PluginProcess.vcxproj +++ b/Plugins/PluginProcess/PluginProcess.vcxproj @@ -77,7 +77,6 @@ Process Process Process - false diff --git a/Plugins/PluginQuote/PluginQuote.vcxproj b/Plugins/PluginQuote/PluginQuote.vcxproj index f3dd3287..5917a956 100644 --- a/Plugins/PluginQuote/PluginQuote.vcxproj +++ b/Plugins/PluginQuote/PluginQuote.vcxproj @@ -77,7 +77,6 @@ QuotePlugin QuotePlugin QuotePlugin - false diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj index cf1343de..4c420188 100644 --- a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj +++ b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj @@ -77,7 +77,6 @@ RecycleManager RecycleManager RecycleManager - false diff --git a/Plugins/PluginResMon/PluginResMon.vcxproj b/Plugins/PluginResMon/PluginResMon.vcxproj index c0399a31..17c79cd0 100644 --- a/Plugins/PluginResMon/PluginResMon.vcxproj +++ b/Plugins/PluginResMon/PluginResMon.vcxproj @@ -77,7 +77,6 @@ ResMon ResMon ResMon - false diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj index 52f3f491..96214312 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj @@ -77,7 +77,6 @@ SpeedFanPlugin SpeedFanPlugin SpeedFanPlugin - false diff --git a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj index 60f68488..a7b34429 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj +++ b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj @@ -77,7 +77,6 @@ SysInfo SysInfo SysInfo - false diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj index 63bd241a..6cb12bee 100644 --- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj +++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj @@ -77,7 +77,6 @@ VirtualDesktops VirtualDesktops VirtualDesktops - false diff --git a/Plugins/PluginWebParser/PluginWebParser.vcxproj b/Plugins/PluginWebParser/PluginWebParser.vcxproj index 7e6b7c06..72aaa0b4 100644 --- a/Plugins/PluginWebParser/PluginWebParser.vcxproj +++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj @@ -77,7 +77,6 @@ WebParser WebParser WebParser - false diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj index 3bd48310..83f55653 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj @@ -79,7 +79,6 @@ WifiStatus WifiStatus WifiStatus - false diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj index 55c3886d..3373c1a7 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj @@ -78,7 +78,6 @@ Win7AudioPlugin Win7AudioPlugin Win7AudioPlugin - false diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj index 012bb365..055dc645 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj @@ -77,7 +77,6 @@ WindowMessagePlugin WindowMessagePlugin WindowMessagePlugin - false diff --git a/Plugins/PluginiTunes/PluginiTunes.vcxproj b/Plugins/PluginiTunes/PluginiTunes.vcxproj index f41fffc5..5e3646ce 100644 --- a/Plugins/PluginiTunes/PluginiTunes.vcxproj +++ b/Plugins/PluginiTunes/PluginiTunes.vcxproj @@ -78,7 +78,6 @@ iTunesPlugin iTunesPlugin iTunesPlugin - false diff --git a/Rainmeter.sln b/Rainmeter.sln index 83472d0c..c3f28afd 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Launcher", "Application\Launcher\Launcher.vcxproj", "{A50FCF58-CDEA-41A9-B885-4C31E9E2859F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.vcxproj", "{BE9D2400-7F1C-49D6-8498-5CE495491AD6}" ProjectSection(ProjectDependencies) = postProject {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} @@ -82,14 +80,6 @@ Global {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.Build.0 = Release|Win32 {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.ActiveCfg = Release|x64 {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.Build.0 = Release|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|Win32.ActiveCfg = Debug|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|Win32.Build.0 = Debug|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|x64.ActiveCfg = Debug|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|x64.Build.0 = Debug|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|Win32.ActiveCfg = Release|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|Win32.Build.0 = Release|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|x64.ActiveCfg = Release|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|x64.Build.0 = Release|x64 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.ActiveCfg = Debug|Win32 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.Build.0 = Debug|Win32 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/RainmeterCPP.sln b/RainmeterCPP.sln index 19551d62..1bb0857d 100644 --- a/RainmeterCPP.sln +++ b/RainmeterCPP.sln @@ -4,8 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Launcher", "Application\Launcher\Launcher.vcxproj", "{A50FCF58-CDEA-41A9-B885-4C31E9E2859F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.vcxproj", "{BE9D2400-7F1C-49D6-8498-5CE495491AD6}" ProjectSection(ProjectDependencies) = postProject {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} @@ -77,14 +75,6 @@ Global {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.Build.0 = Release|Win32 {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.ActiveCfg = Release|x64 {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.Build.0 = Release|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|Win32.ActiveCfg = Debug|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|Win32.Build.0 = Debug|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|x64.ActiveCfg = Debug|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Debug|x64.Build.0 = Debug|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|Win32.ActiveCfg = Release|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|Win32.Build.0 = Release|Win32 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|x64.ActiveCfg = Release|x64 - {A50FCF58-CDEA-41A9-B885-4C31E9E2859F}.Release|x64.Build.0 = Release|x64 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.ActiveCfg = Debug|Win32 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.Build.0 = Debug|Win32 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|x64.ActiveCfg = Debug|x64