Define WIN32_LEAN_AND_MEAN globally

osamz · Dec 24, 2013 · da92def · da92def
1 parent c196396
commit da92def
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 14 deletions.
diff --git a/Application/Application.cpp b/Application/Application.cpp
@@ -17,7 +17,6 @@
 */
 
 #define _CRTDBG_MAP_ALLOC
-#define WIN32_LEAN_AND_MEAN
 #include <crtdbg.h>
 #include <Windows.h>
 #include <ShellAPI.h>

diff --git a/Build/VS/Rainmeter.Cpp.props b/Build/VS/Rainmeter.Cpp.props
@@ -58,7 +58,7 @@
       <DisableSpecificWarnings>4351;4530</DisableSpecificWarnings>
 
       <!-- Set the version macros to 0x0601 (Win7) to avoid using Win8 specific features in the Win8 SDK. -->
-      <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0601;PSAPI_VERSION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0601;PSAPI_VERSION=1;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>

diff --git a/Common/Gfx/Canvas.h b/Common/Gfx/Canvas.h
@@ -22,6 +22,7 @@
 #include "FontCollection.h"
 #include "TextFormat.h"
 #include <Windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 
 namespace Gfx {

diff --git a/Common/Gfx/CanvasD2D.h b/Common/Gfx/CanvasD2D.h
@@ -25,6 +25,7 @@
 #include "Util/WICBitmapDIB.h"
 #include <memory>
 #include <string>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 #include <d2d1_1.h>
 #include <d2d1helper.h>

diff --git a/Common/Gfx/CanvasGDIP.h b/Common/Gfx/CanvasGDIP.h
@@ -24,6 +24,7 @@
 #include "TextFormatGDIP.h"
 #include <memory>
 #include <string>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 
 namespace Gfx {

diff --git a/Common/Gfx/FontCollectionD2D.cpp b/Common/Gfx/FontCollectionD2D.cpp
@@ -19,6 +19,7 @@
 #include "FontCollectionD2D.h"
 #include "CanvasD2D.h"
 #include "Util/DWriteFontCollectionLoader.h"
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 
 namespace Gfx {

diff --git a/Common/Gfx/FontCollectionGDIP.cpp b/Common/Gfx/FontCollectionGDIP.cpp
@@ -17,6 +17,7 @@
 */
 
 #include "FontCollectionGDIP.h"
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 
 namespace Gfx {

diff --git a/Common/Gfx/TextFormatGDIP.h b/Common/Gfx/TextFormatGDIP.h
@@ -21,6 +21,7 @@
 
 #include "TextFormat.h"
 #include <memory>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 
 namespace Gfx {

diff --git a/Common/Gfx/Util/WICBitmapDIB.h b/Common/Gfx/Util/WICBitmapDIB.h
@@ -20,6 +20,7 @@
 #define RM_GFX_UTIL_WICBITMAPDIB_H_
 
 #include <Windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 #include <wincodec.h>
 

diff --git a/Common/Gfx/Util/WICBitmapLockDIB.h b/Common/Gfx/Util/WICBitmapLockDIB.h
@@ -20,6 +20,7 @@
 #define RM_GFX_UTIL_WICBITMAPLOCKDIB_H_
 
 #include <Windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 #include <wincodec.h>
 #include "WICBitmapDIB.h"

diff --git a/Common/Gfx/Util/WICBitmapLockGDIP.h b/Common/Gfx/Util/WICBitmapLockGDIP.h
@@ -20,6 +20,7 @@
 #define RM_GFX_UTIL_WICBITMAPLOCKGDIP_H_
 
 #include <Windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <GdiPlus.h>
 #include <wincodec.h>
 

diff --git a/Common/RawString.h b/Common/RawString.h
@@ -19,7 +19,7 @@
 #ifndef RM_COMMON_RAWSTRING_H_
 #define RM_COMMON_RAWSTRING_H_
 
-#include <windows.h>
+#include <malloc.h>
 
 class RawString
 {
@@ -29,7 +29,7 @@ class RawString
 	{
 	}
 
-	RawString(const WCHAR* str) :
+	RawString(const wchar_t* str) :
 		m_String(str_alloc(str))
 	{
 	}
@@ -44,7 +44,7 @@ class RawString
 		clear();
 	}
 
-	RawString& operator=(const WCHAR* rhs)
+	RawString& operator=(const wchar_t* rhs)
 	{
 		clear();
 		m_String = str_alloc(rhs);
@@ -61,7 +61,7 @@ class RawString
 		return *this;
 	}
 
-	const WCHAR* c_str() const
+	const wchar_t* c_str() const
 	{
 		return m_String ? m_String : L"";
 	}
@@ -81,12 +81,12 @@ class RawString
 	}
 
 private:
-	WCHAR* str_alloc(const WCHAR* str)
+	wchar_t* str_alloc(const wchar_t* str)
 	{
 		return str ? _wcsdup(str) : nullptr;
 	}
 
-	WCHAR* m_String;
+	wchar_t* m_String;
 };
 
 #endif
diff --git a/Library/ConfigParser.h b/Library/ConfigParser.h
@@ -28,6 +28,7 @@
 #include <unordered_map>
 #include <algorithm>
 #include <cstdint>
+#include <ole2.h>  // For Gdiplus.h.
 #include <gdiplus.h>
 
 class Rainmeter;

diff --git a/Library/Meter.h b/Library/Meter.h
@@ -20,6 +20,7 @@
 #define __METER_H__
 
 #include <windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <gdiplus.h>
 #include <vector>
 #include <string>

diff --git a/Library/StdAfx.h b/Library/StdAfx.h
@@ -23,11 +23,10 @@
 #include <crtdbg.h>
 
 // WINAPI
-#define WIN32_LEAN_AND_MEAN
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <windowsx.h>
-#include <ole2.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <gdiplus.h>
 #include <dwmapi.h>
 #include <comdef.h>

diff --git a/Library/TintedImage.h b/Library/TintedImage.h
@@ -20,6 +20,7 @@
 #define __TINTEDIMAGE_H__
 
 #include <windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <gdiplus.h>
 #include <string>
 #include "MeterWindow.h"

diff --git a/Library/TrayWindow.h b/Library/TrayWindow.h
@@ -20,6 +20,7 @@
 #define __TRAYWINDOW_H__
 
 #include <windows.h>
+#include <ole2.h>  // For Gdiplus.h.
 #include <gdiplus.h>
 #include <vector>
 

diff --git a/Plugins/PluginFileView/StdAfx.h b/Plugins/PluginFileView/StdAfx.h
@@ -24,6 +24,7 @@
 #include <commctrl.h>
 #include <commoncontrols.h>
 #include <process.h>
+#include <Shellapi.h>
 #include <Shlwapi.h>
 
 // STL

diff --git a/Plugins/PluginNowPlaying/StdAfx.h b/Plugins/PluginNowPlaying/StdAfx.h
@@ -24,6 +24,7 @@
 #include <WinInet.h>
 #include <Psapi.h>
 #include <comutil.h>
+#include <ShellAPI.h>
 
 // STL
 #include <string>

diff --git a/Plugins/PluginPing/Ping.cpp b/Plugins/PluginPing/Ping.cpp
@@ -17,6 +17,7 @@
 */
 
 #include <windows.h>
+#include <Winsock2.h>
 #include <string>
 #include <Ipexport.h>
 #include <Icmpapi.h>

diff --git a/Plugins/PluginPower/PowerPlugin.cpp b/Plugins/PluginPower/PowerPlugin.cpp
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <errno.h>
 #include <crtdbg.h>
+#include <stdlib.h>
 #include "../../Common/RawString.h"
 #include "../../Library/Export.h"	// Rainmeter's exported functions
 

diff --git a/Plugins/PluginRecycleManager/RecycleManager.cpp b/Plugins/PluginRecycleManager/RecycleManager.cpp
@@ -16,7 +16,6 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <ShellAPI.h>
 #include <process.h>

diff --git a/Plugins/PluginSysInfo/SysInfo.cpp b/Plugins/PluginSysInfo/SysInfo.cpp
@@ -16,7 +16,6 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <Iphlpapi.h>
 #include <Netlistmgr.h>

diff --git a/Plugins/PluginWin7Audio/PolicyConfig.h b/Plugins/PluginWin7Audio/PolicyConfig.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <Mmreg.h>
+
 // ----------------------------------------------------------------------------
 // class CPolicyConfigClient
 // {294935CE-F637-4E7C-A41B-AB255460B862}

diff --git a/SkinInstaller/SkinInstallerLauncher.cpp b/SkinInstaller/SkinInstallerLauncher.cpp
@@ -16,7 +16,6 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <Shlwapi.h>
 

diff --git a/SkinInstaller/StdAfx.h b/SkinInstaller/StdAfx.h
@@ -20,7 +20,6 @@
 #define __STDAFX_H__
 
 // WINAPI
-#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <Windowsx.h>
 #include <Commdlg.h>