diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj index 9cb609d2..4d53ad75 100644 --- a/Application/Application.vcxproj +++ b/Application/Application.vcxproj @@ -88,6 +88,7 @@ Level3 EditAndContinue 4018;4090;4114;4267;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -120,6 +121,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\themes Level3 ProgramDatabase 4018;4090;4114;4267;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -151,6 +153,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\themes Level3 ProgramDatabase 4018;4090;4114;4267;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -185,6 +188,7 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\themes Level3 ProgramDatabase 4018;4090;4114;4267;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index c110939e..ac44c0c9 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4267;4334;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -116,6 +117,7 @@ Level3 ProgramDatabase 4018;4090;4114;4267;4334;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -143,6 +145,7 @@ Level3 ProgramDatabase 4018;4090;4114;4267;4334;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -169,6 +172,7 @@ Level3 ProgramDatabase 4018;4090;4114;4267;4334;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Library/Litestep.cpp b/Library/Litestep.cpp index 70da10f2..6497979f 100644 --- a/Library/Litestep.cpp +++ b/Library/Litestep.cpp @@ -39,6 +39,12 @@ void FinalizeLitestep() DeleteCriticalSection(&g_CsLogDelay); } +UINT GetUniqueID() +{ + static UINT id = 0; + return id++; +} + HRGN BitmapToRegion(HBITMAP hbm, COLORREF clrTransp, COLORREF clrTolerance) { HRGN hRgn = NULL; diff --git a/Library/Litestep.h b/Library/Litestep.h index 01a85e28..a4760df8 100644 --- a/Library/Litestep.h +++ b/Library/Litestep.h @@ -35,6 +35,11 @@ enum LOGLEVEL void InitalizeLitestep(); void FinalizeLitestep(); +UINT GetUniqueID(); + +template +UINT TypeID() { static UINT id = GetUniqueID(); return id; } + HRGN BitmapToRegion(HBITMAP hBmp, COLORREF cTransparentColor, COLORREF cTolerance); std::string ConvertToAscii(LPCTSTR str); diff --git a/Library/Measure.h b/Library/Measure.h index 0f335190..054cb1b6 100644 --- a/Library/Measure.h +++ b/Library/Measure.h @@ -47,6 +47,8 @@ public: CMeasure(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasure(); + virtual UINT GetTypeID() = 0; + void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); } virtual void Initialize(); diff --git a/Library/MeasureCPU.h b/Library/MeasureCPU.h index 8da6e45d..5292b79a 100644 --- a/Library/MeasureCPU.h +++ b/Library/MeasureCPU.h @@ -29,6 +29,8 @@ public: CMeasureCPU(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureCPU(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); protected: diff --git a/Library/MeasureCalc.h b/Library/MeasureCalc.h index d5079a7e..5f28ec20 100644 --- a/Library/MeasureCalc.h +++ b/Library/MeasureCalc.h @@ -27,6 +27,8 @@ public: CMeasureCalc(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureCalc(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); bool GetMeasureValue(const WCHAR* str, int len, double* value); diff --git a/Library/MeasureDiskSpace.h b/Library/MeasureDiskSpace.h index 6c8d8ae7..d6d52380 100644 --- a/Library/MeasureDiskSpace.h +++ b/Library/MeasureDiskSpace.h @@ -27,6 +27,8 @@ public: CMeasureDiskSpace(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureDiskSpace(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); diff --git a/Library/MeasureMemory.h b/Library/MeasureMemory.h index 6e33a0a5..130bd796 100644 --- a/Library/MeasureMemory.h +++ b/Library/MeasureMemory.h @@ -27,6 +27,8 @@ public: CMeasureMemory(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureMemory(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); protected: diff --git a/Library/MeasureNet.h b/Library/MeasureNet.h index 9d7ea6c2..8be4fd56 100644 --- a/Library/MeasureNet.h +++ b/Library/MeasureNet.h @@ -39,6 +39,8 @@ public: CMeasureNet(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureNet(); + + virtual UINT GetTypeID() { return TypeID(); } virtual bool Update(); diff --git a/Library/MeasurePhysicalMemory.h b/Library/MeasurePhysicalMemory.h index d2adf504..20dcf60d 100644 --- a/Library/MeasurePhysicalMemory.h +++ b/Library/MeasurePhysicalMemory.h @@ -27,6 +27,8 @@ public: CMeasurePhysicalMemory(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasurePhysicalMemory(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); protected: diff --git a/Library/MeasurePlugin.h b/Library/MeasurePlugin.h index 51a8554b..b24ea070 100644 --- a/Library/MeasurePlugin.h +++ b/Library/MeasurePlugin.h @@ -42,6 +42,8 @@ public: CMeasurePlugin(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasurePlugin(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); virtual void Command(const std::wstring& command); diff --git a/Library/MeasureRegistry.h b/Library/MeasureRegistry.h index 1d83c060..75ab8659 100644 --- a/Library/MeasureRegistry.h +++ b/Library/MeasureRegistry.h @@ -27,6 +27,8 @@ public: CMeasureRegistry(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureRegistry(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); diff --git a/Library/MeasureScript.h b/Library/MeasureScript.h index 59d5924e..6560026b 100644 --- a/Library/MeasureScript.h +++ b/Library/MeasureScript.h @@ -27,6 +27,8 @@ public: CMeasureScript(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureScript(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); diff --git a/Library/MeasureTime.h b/Library/MeasureTime.h index c7942186..317ff1a1 100644 --- a/Library/MeasureTime.h +++ b/Library/MeasureTime.h @@ -27,6 +27,8 @@ public: CMeasureTime(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureTime(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); diff --git a/Library/MeasureUptime.h b/Library/MeasureUptime.h index b3f0b735..a8a67880 100644 --- a/Library/MeasureUptime.h +++ b/Library/MeasureUptime.h @@ -27,6 +27,8 @@ public: CMeasureUptime(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureUptime(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual); diff --git a/Library/MeasureVirtualMemory.h b/Library/MeasureVirtualMemory.h index 30302fc2..3b0adae1 100644 --- a/Library/MeasureVirtualMemory.h +++ b/Library/MeasureVirtualMemory.h @@ -27,6 +27,8 @@ public: CMeasureVirtualMemory(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeasureVirtualMemory(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); protected: diff --git a/Library/Meter.h b/Library/Meter.h index f13b7591..53666a0d 100644 --- a/Library/Meter.h +++ b/Library/Meter.h @@ -36,6 +36,8 @@ public: CMeter(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeter(); + virtual UINT GetTypeID() = 0; + void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); parser.ClearStyleTemplate(); } virtual void Initialize(); diff --git a/Library/MeterBar.h b/Library/MeterBar.h index ab5ffc80..99a57138 100644 --- a/Library/MeterBar.h +++ b/Library/MeterBar.h @@ -28,6 +28,8 @@ public: CMeterBar(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterBar(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterBitmap.h b/Library/MeterBitmap.h index 33ec5526..1d8f7ec6 100644 --- a/Library/MeterBitmap.h +++ b/Library/MeterBitmap.h @@ -28,6 +28,8 @@ public: CMeterBitmap(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterBitmap(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool HitTest(int x, int y); virtual void Initialize(); diff --git a/Library/MeterButton.h b/Library/MeterButton.h index 40707685..2559cd53 100644 --- a/Library/MeterButton.h +++ b/Library/MeterButton.h @@ -30,6 +30,8 @@ public: CMeterButton(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterButton(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterHistogram.h b/Library/MeterHistogram.h index 7ffe56bd..37b714ec 100644 --- a/Library/MeterHistogram.h +++ b/Library/MeterHistogram.h @@ -28,6 +28,8 @@ public: CMeterHistogram(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterHistogram(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterImage.h b/Library/MeterImage.h index 5fa015fc..a88db5cd 100644 --- a/Library/MeterImage.h +++ b/Library/MeterImage.h @@ -28,6 +28,8 @@ public: CMeterImage(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterImage(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterLine.h b/Library/MeterLine.h index 58a3564c..4bd52d83 100644 --- a/Library/MeterLine.h +++ b/Library/MeterLine.h @@ -27,6 +27,8 @@ public: CMeterLine(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterLine(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterRotator.h b/Library/MeterRotator.h index 69fab492..27e624eb 100644 --- a/Library/MeterRotator.h +++ b/Library/MeterRotator.h @@ -28,6 +28,8 @@ public: CMeterRotator(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterRotator(); + virtual UINT GetTypeID() { return TypeID(); } + virtual void Initialize(); virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterRoundLine.h b/Library/MeterRoundLine.h index 4b5b2e97..2c1ec052 100644 --- a/Library/MeterRoundLine.h +++ b/Library/MeterRoundLine.h @@ -27,6 +27,8 @@ public: CMeterRoundLine(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterRoundLine(); + virtual UINT GetTypeID() { return TypeID(); } + virtual bool Update(); virtual bool Draw(Gdiplus::Graphics& graphics); diff --git a/Library/MeterString.h b/Library/MeterString.h index 4672df3f..17bb0099 100644 --- a/Library/MeterString.h +++ b/Library/MeterString.h @@ -29,6 +29,8 @@ public: CMeterString(CMeterWindow* meterWindow, const WCHAR* name); virtual ~CMeterString(); + virtual UINT GetTypeID() { return TypeID(); } + virtual int GetX(bool abs = false); virtual void Initialize(); diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 4bd81ee1..17cb0b96 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -1313,7 +1313,7 @@ void CMeterWindow::UpdateMeasure(const std::wstring& name, bool group) { if (CompareName((*i), measure, group)) { - if (bNetStats && dynamic_cast(*i) != NULL) + if (bNetStats && (*i)->GetTypeID() && TypeID()) { CMeasureNet::UpdateIFTable(); CMeasureNet::UpdateStats(); @@ -1942,6 +1942,8 @@ void CMeterWindow::WriteConfig(INT setting) } } +#include "Timer.h" + /* ** Reads the skin config, creates the meters and measures and does the bindings. ** @@ -2155,7 +2157,7 @@ bool CMeterWindow::ReadSkin() m_Measures.push_back(measure); m_Parser.AddMeasure(measure); - if (!m_HasNetMeasures && dynamic_cast(measure)) + if (measure->GetTypeID() == TypeID()) { m_HasNetMeasures = true; } @@ -2186,7 +2188,7 @@ bool CMeterWindow::ReadSkin() m_Meters.push_back(meter); - if (!m_HasButtons && dynamic_cast(meter)) + if (!m_HasButtons && meter->GetTypeID() == TypeID()) { m_HasButtons = true; } @@ -3235,9 +3237,9 @@ void CMeterWindow::HandleButtons(POINT pos, BUTTONPROC proc, bool execute) if ((*j)->IsHidden()) continue; CMeterButton* button = NULL; - if (m_HasButtons) + if (m_HasButtons && (*j)->GetTypeID() == TypeID()) { - button = dynamic_cast(*j); + button = (CMeterButton*)(*j); if (button) { switch (proc) @@ -4449,9 +4451,9 @@ bool CMeterWindow::DoMoveAction(int x, int y, MOUSE mouse) // Handle button CMeterButton* button = NULL; - if (m_HasButtons) + if (m_HasButtons && (*j)->GetTypeID() == TypeID()) { - button = dynamic_cast(*j); + button = (CMeterButton*)(*j); if (button) { if (!buttonFound) @@ -4492,13 +4494,10 @@ bool CMeterWindow::DoMoveAction(int x, int y, MOUSE mouse) if ((*j)->IsMouseOver()) { // Handle button - if (m_HasButtons) + if (m_HasButtons && (*j)->GetTypeID() == TypeID()) { - CMeterButton* button = dynamic_cast(*j); - if (button) - { - button->SetFocus(false); - } + CMeterButton* button = (CMeterButton*)(*j); + button->SetFocus(false); } //LogWithArgs(LOG_DEBUG, L"MeterLeave: %s - [%s]", m_SkinName.c_str(), (*j)->GetName()); diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index 71ad4fc7..90d622df 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -108,7 +108,7 @@ int RainmeterMain(LPWSTR cmdLine) if (ret == 0) { - ret = Rainmeter->MessagePump(); + ret = Rainmeter->MessagePump(); } delete Rainmeter; diff --git a/Library/lua/glue/LuaMeter.cpp b/Library/lua/glue/LuaMeter.cpp index 41cd53bf..dd7d0e8b 100644 --- a/Library/lua/glue/LuaMeter.cpp +++ b/Library/lua/glue/LuaMeter.cpp @@ -137,10 +137,11 @@ static int Show(lua_State* L) static int SetText(lua_State* L) { CMeter* self = GetSelf(L); - if (CMeterString* stringMeter = dynamic_cast(self)) + if (self->GetTypeID() == TypeID()) { + CMeterString* string = (CMeterString*)self; std::wstring str = LuaManager::ToWide(L, 2); - stringMeter->SetText(str.c_str()); + string->SetText(str.c_str()); } return 0; diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj index 2dbfca53..4672cd72 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -161,6 +164,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj index 98910380..cb84efb9 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj @@ -90,6 +90,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -114,6 +115,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -136,6 +138,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -159,6 +162,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj index f1db00bb..e804032a 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -113,6 +114,7 @@ Level3 ProgramDatabase 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -135,6 +137,7 @@ Level3 ProgramDatabase 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -158,6 +161,7 @@ Level3 ProgramDatabase 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj index 1122963a..9be77855 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj +++ b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj @@ -90,6 +90,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -114,6 +115,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -136,6 +138,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -159,6 +162,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj index c4ae367c..7d98b0f1 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj +++ b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -161,6 +164,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginPing/PluginPing.vcxproj b/Plugins/PluginPing/PluginPing.vcxproj index db1a2cf9..2c030d56 100644 --- a/Plugins/PluginPing/PluginPing.vcxproj +++ b/Plugins/PluginPing/PluginPing.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -162,6 +165,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginPower/PluginPower.vcxproj b/Plugins/PluginPower/PluginPower.vcxproj index f25e1807..77ad62af 100644 --- a/Plugins/PluginPower/PluginPower.vcxproj +++ b/Plugins/PluginPower/PluginPower.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -115,6 +116,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -139,6 +141,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -163,6 +166,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginProcess/PluginProcess.vcxproj b/Plugins/PluginProcess/PluginProcess.vcxproj index d3b13bec..dd06f53d 100644 --- a/Plugins/PluginProcess/PluginProcess.vcxproj +++ b/Plugins/PluginProcess/PluginProcess.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -114,6 +115,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -160,6 +163,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginQuote/PluginQuote.vcxproj b/Plugins/PluginQuote/PluginQuote.vcxproj index f080f084..329466d5 100644 --- a/Plugins/PluginQuote/PluginQuote.vcxproj +++ b/Plugins/PluginQuote/PluginQuote.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -162,6 +165,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj index 0576e50c..513e491f 100644 --- a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj +++ b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -113,6 +114,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -143,6 +145,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -170,6 +173,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginResMon/PluginResMon.vcxproj b/Plugins/PluginResMon/PluginResMon.vcxproj index 94a27069..a3d6ff42 100644 --- a/Plugins/PluginResMon/PluginResMon.vcxproj +++ b/Plugins/PluginResMon/PluginResMon.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -162,6 +165,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj index 2f078963..ea768623 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -161,6 +164,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj index e8e9b9b4..bdee37aa 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj +++ b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -162,6 +165,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj index f42e21d4..96455fac 100644 --- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj +++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj @@ -87,6 +87,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -110,6 +111,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -161,6 +164,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginWebParser/PluginWebParser.vcxproj b/Plugins/PluginWebParser/PluginWebParser.vcxproj index 0a9f1f1d..93dc2866 100644 --- a/Plugins/PluginWebParser/PluginWebParser.vcxproj +++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -114,6 +115,7 @@ Level3 ProgramDatabase 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -137,6 +139,7 @@ Level3 ProgramDatabase 4018;4090;4114;4217;4244;4267;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -160,6 +163,7 @@ Level3 ProgramDatabase 4018;4090;4114;4244;4267;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj index 8ec5deb6..d4d1b12d 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj @@ -92,6 +92,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false ../../TestBench/x32/Debug/Plugins/WifiStatus.dll @@ -117,6 +118,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -143,6 +145,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -171,6 +174,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj index bac02bac..2097a72e 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -112,6 +113,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -134,6 +136,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -157,6 +160,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj index 3e2533a3..ee36faee 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj @@ -89,6 +89,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -113,6 +114,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -135,6 +137,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -158,6 +161,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/Plugins/PluginiTunes/PluginiTunes.vcxproj b/Plugins/PluginiTunes/PluginiTunes.vcxproj index d41d7e6d..9004265a 100644 --- a/Plugins/PluginiTunes/PluginiTunes.vcxproj +++ b/Plugins/PluginiTunes/PluginiTunes.vcxproj @@ -91,6 +91,7 @@ Level3 EditAndContinue 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -116,6 +117,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions) @@ -139,6 +141,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;%(PreprocessorDefinitions) @@ -163,6 +166,7 @@ Level3 ProgramDatabase 4018;4090;4114;4351;4786;4800;4996 + false NDEBUG;_WIN64;%(PreprocessorDefinitions) diff --git a/SkinInstaller/SkinInstaller.vcxproj b/SkinInstaller/SkinInstaller.vcxproj index 433e49a7..8acf1fba 100644 --- a/SkinInstaller/SkinInstaller.vcxproj +++ b/SkinInstaller/SkinInstaller.vcxproj @@ -89,6 +89,7 @@ 4530;4996 ./zlib;./zlib/minizip false + false NDEBUG;%(PreprocessorDefinitions) @@ -124,6 +125,7 @@ 4244;4267;4530;4996 ./zlib;./zlib/minizip false + false NDEBUG;_WIN64;%(PreprocessorDefinitions) @@ -160,6 +162,7 @@ EditAndContinue ./zlib;./zlib/minizip 4244;4267;4530;4996 + false _DEBUG;%(PreprocessorDefinitions) @@ -191,6 +194,7 @@ ProgramDatabase ./zlib;./zlib/minizip 4244;4267;4530;4996 + false _DEBUG;_WIN64;%(PreprocessorDefinitions)