#define _ATL_ALL_WARNINGS

IRainman · IRainman · commit a9c608443905 · 2024-12-22T19:14:32.000+03:00
#define VC_EXTRALEAN
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN (if it's possible)
diff --git a/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.cpp b/Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.cpp
@@ -2,6 +2,9 @@
 // Open-Shell (c) 2017-2018, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #include <commctrl.h>
 #include <shlwapi.h>
diff --git a/Src/ClassicExplorer/stdafx.h b/Src/ClassicExplorer/stdafx.h
@@ -12,6 +12,9 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_MODULES // compatibility with /permissive-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 
 #include "resource.h"
 #include <atlbase.h>
diff --git a/Src/ClassicIE/ClassicIE.cpp b/Src/ClassicIE/ClassicIE.cpp
@@ -4,6 +4,10 @@
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 #include <windows.h>
 #include <commctrl.h>
 #include <shlwapi.h>
diff --git a/Src/ClassicIE/ClassicIEDLL/stdafx.h b/Src/ClassicIE/ClassicIEDLL/stdafx.h
@@ -15,6 +15,11 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_MODULES // compatibility with /permissive-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
+
 
 #include "resource.h"
 #include <atlbase.h>
diff --git a/Src/Lib/StringUtils.h b/Src/Lib/StringUtils.h
@@ -41,6 +41,8 @@
 #include <stdarg.h>
 
 #if defined(_WIN32) || defined(_WIN64)
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Src/Lib/stdafx.h b/Src/Lib/stdafx.h
@@ -8,6 +8,9 @@
 #include "targetver.h"
 
 #define STRICT_TYPED_ITEMIDS
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 // Windows Header Files:
 #include <windows.h>
 #include <commctrl.h>
diff --git a/Src/Setup/Setup.cpp b/Src/Setup/Setup.cpp
@@ -2,7 +2,9 @@
 // Open-Shell (c) 2017-2018, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
-#define _WIN32_WINNT 0x0600
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 #include <windows.h>
 #include <shlwapi.h>
 #include <stdio.h>
diff --git a/Src/Setup/SetupHelper/SetupHelper.cpp b/Src/Setup/SetupHelper/SetupHelper.cpp
@@ -1,9 +1,12 @@
 // Classic Shell (c) 2009-2017, Ivo Beltchev
-// Open-Shell (c) 2017-2018, The Open-Shell Team
+// Open-Shell (c) 2017-2024, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 #include <windows.h>
 #include <atlstr.h>
 #include "ResourceHelper.h"
diff --git a/Src/Setup/Utility/SaveLogFile.cpp b/Src/Setup/Utility/SaveLogFile.cpp
@@ -4,6 +4,9 @@
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define _ATL_ALL_WARNINGS
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #include <stdio.h>
 #include <atlstr.h>
diff --git a/Src/Setup/Utility/Utility.cpp b/Src/Setup/Utility/Utility.cpp
@@ -1,9 +1,12 @@
 // Classic Shell (c) 2009-2017, Ivo Beltchev
-// Open-Shell (c) 2017-2018, The Open-Shell Team
+// Open-Shell (c) 2017-2024, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 #include <windows.h>
 #include <stdio.h>
 #include <vector>
diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.cpp b/Src/StartMenu/StartMenuDLL/DragDrop.cpp
@@ -722,9 +722,9 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
 
 	int folderIndex=0;
 	if (before>=0)
-		folderIndex=m_Items[min(before,(int)m_Items.size()-1)].priority>1?1:0;
+		folderIndex=m_Items[std::min(before,(int)m_Items.size()-1)].priority>1?1:0;
 
-	if (s_pDragSource==this && !s_bDragFromTree && s_bDragMovable && (*pdwEffect&DROPEFFECT_MOVE) && m_DragIndex!=m_ProgramTreeIndex && m_Items[m_DragIndex].priority==(m_Items[min(before,(int)m_Items.size()-1)].priority&2))
+	if (s_pDragSource==this && !s_bDragFromTree && s_bDragMovable && (*pdwEffect&DROPEFFECT_MOVE) && m_DragIndex!=m_ProgramTreeIndex && m_Items[m_DragIndex].priority==(m_Items[std::min(before,(int)m_Items.size()-1)].priority&2))
 	{
 		if (before==m_DragIndex || before==m_DragIndex+1)
 			return S_OK;
diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
@@ -5989,7 +5989,7 @@ LRESULT CMenuContainer::OnKeyDown( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 						ytop-=m_ScrollOffset;
 						ybottom-=m_ScrollOffset;
 					}
-					int d=min(abs(ytop-y0),abs(ybottom-y0));
+					int d=std::min(abs(ytop-y0),abs(ybottom-y0));
 					if (dist>d)
 					{
 						index=i;
@@ -6056,7 +6056,7 @@ LRESULT CMenuContainer::OnKeyDown( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 								ytop-=m_ScrollOffset;
 								ybottom-=m_ScrollOffset;
 							}
-							int d=min(abs(ytop-y0),abs(ybottom-y0));
+							int d= std::min(abs(ytop-y0),abs(ybottom-y0));
 							if (dist>d)
 							{
 								index=i;
@@ -7517,16 +7517,16 @@ POINT CMenuContainer::CalculateCorner( void )
 
 	POINT corner;
 	if (m_Options&CONTAINER_LEFT)
-		corner.x=max(s_MainMenuLimits.left,s_StartRect.left)+margin.left;
+		corner.x= std::max(s_MainMenuLimits.left,s_StartRect.left)+margin.left;
 	else
-		corner.x=min(s_MainMenuLimits.right,s_StartRect.right)+margin.right;
+		corner.x= std::min(s_MainMenuLimits.right,s_StartRect.right)+margin.right;
 
 	if (m_Options&CONTAINER_TOP)
 	{
 		if (s_bBehindTaskbar)
-			corner.y=max(s_MainMenuLimits.top,s_StartRect.top)+margin.top;
+			corner.y= std::max(s_MainMenuLimits.top,s_StartRect.top)+margin.top;
 		else
-			corner.y=max(s_MainMenuLimits.top,s_StartRect.top);
+			corner.y= std::max(s_MainMenuLimits.top,s_StartRect.top);
 	}
 	else
 		corner.y=s_MainMenuLimits.bottom+margin.bottom;
diff --git a/Src/StartMenu/StartMenuDLL/stdafx.h b/Src/StartMenu/StartMenuDLL/stdafx.h
@@ -8,6 +8,8 @@
 #include "targetver.h"
 
 #define STRICT_TYPED_ITEMIDS
+#define VC_EXTRALEAN
+#define NOMINMAX
 // Windows Header Files:
 #include <windows.h>
 #include <commctrl.h>
@@ -16,6 +18,7 @@
 
 #define _ATL_MODULES // compatibility with /permissive-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors will be explicit
+#define _ATL_ALL_WARNINGS
 
 #include <atlbase.h>
 #include <atltypes.h>
diff --git a/Src/StartMenu/StartMenuHelper/stdafx.h b/Src/StartMenu/StartMenuHelper/stdafx.h
@@ -14,6 +14,9 @@
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 #define _ATL_MODULES // compatibility with /permissive-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 
 #include "resource.h"
 #include <atlbase.h>
diff --git a/Src/StartMenu/stdafx.h b/Src/StartMenu/stdafx.h
@@ -8,6 +8,10 @@
 #include "targetver.h"
 
 #define STRICT_TYPED_ITEMIDS
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
+#define _ATL_ALL_WARNINGS
 // Windows Header Files:
 #include <windows.h>
 #include <commctrl.h>
diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h
@@ -1,7 +1,7 @@
 // ******************************************************************
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// THE CODE IS PROVIDED �AS IS�, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
@@ -13,6 +13,9 @@
 #pragma once
 #include <string>
 #include <memory>
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <Windows.h>
 #include <windows.ui.notifications.h>
 #include <wrl.h>
diff --git a/Src/Update/DesktopToasts/dllmain.cpp b/Src/Update/DesktopToasts/dllmain.cpp
@@ -1,5 +1,7 @@
 // dllmain.cpp : Defines the entry point for the DLL application.
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #include <NotificationActivationCallback.h>
 #include <windows.ui.notifications.h>
diff --git a/Src/Update/Update.cpp b/Src/Update/Update.cpp
@@ -1,9 +1,12 @@
 // Classic Shell (c) 2009-2017, Ivo Beltchev
-// Open-Shell (c) 2017-2018, The Open-Shell Team
+// Open-Shell (c) 2017-2024, The Open-Shell Team
 // Confidential information of Ivo Beltchev. Not for disclosure or distribution without prior written consent from the author
 
 #define STRICT_TYPED_ITEMIDS
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define _ATL_ALL_WARNINGS
+#define VC_EXTRALEAN
+#define NOMINMAX
 #include <windows.h>
 #include <atlbase.h>
 #include <atlwin.h>
