diff options
Diffstat (limited to 'plugins')
64 files changed, 3 insertions, 293 deletions
diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h index 2f4869e65c..7027783b64 100644 --- a/plugins/AVS/src/commonheaders.h +++ b/plugins/AVS/src/commonheaders.h @@ -22,8 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define _WIN32_WINNT 0x0501
-
#include <windows.h>
#include <commctrl.h>
#include <time.h>
diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h index 32d0eab2d1..ca28dbf879 100644 --- a/plugins/Alarms/src/stdafx.h +++ b/plugins/Alarms/src/stdafx.h @@ -1,9 +1,6 @@ #ifndef _COMMON_INC
#define _COMMON_INC
-
-#define _WIN32_IE 0x0400
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define VC_EXTRALEAN
diff --git a/plugins/AutoShutdown/src/common.h b/plugins/AutoShutdown/src/common.h index 3f46f175fa..03a39e306d 100644 --- a/plugins/AutoShutdown/src/common.h +++ b/plugins/AutoShutdown/src/common.h @@ -36,8 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif
/* RAS */
-#undef WINVER
-#define WINVER 0x400 /* prevent INVALID_BUFFER error */
#include <ras.h> /* for RasEnumConnections(), RasHangUp() */
#include <raserror.h> /* error codes for RAS */
diff --git a/plugins/BossKeyPlus/src/BossKey.h b/plugins/BossKeyPlus/src/BossKey.h index f7b71b3db5..293c028078 100644 --- a/plugins/BossKeyPlus/src/BossKey.h +++ b/plugins/BossKeyPlus/src/BossKey.h @@ -22,10 +22,6 @@ #define WIN32_LEAN_AND_MEAN
#define _CRT_SECURE_NO_DEPRECATE
-#define WINVER 0x0700
-#define _WIN32_WINNT 0x0700
-#define _WIN32_IE 0x0601
-
#define BOSSKEY_LISTEN_INFO _T("MY6BossKey_Param")
#include <windows.h>
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index c50e995702..3c1a3d8ebb 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -535,7 +535,6 @@ void CSAMWindow::checkFieldLimit(WORD action, WORD item) if (_tcslen(ptszInputText) > limit) { -#if ( WINVER >= 0x501 ) TCHAR tszPopupTip[MAX_PATH]; EDITBALLOONTIP ebt = { 0 }; ebt.cbStruct = sizeof(ebt); @@ -544,7 +543,7 @@ void CSAMWindow::checkFieldLimit(WORD action, WORD item) ebt.pszText = tszPopupTip; ebt.ttiIcon = TTI_WARNING; SendDlgItemMessage(m_handle, item, EM_SHOWBALLOONTIP, 0, (LPARAM)&ebt); -#endif + TCHAR* ptszOutputText = (TCHAR*)mir_alloc((limit + 1) * sizeof(TCHAR)); GetDlgItemText(m_handle, item, ptszOutputText, limit + 1); SetDlgItemText(m_handle, item, ptszOutputText); @@ -591,7 +590,6 @@ CSListView::CSListView(HWND hwnd, CSWindow* parent) m_handle = hwnd; m_parent = parent; -#if (_WIN32_WINNT >= 0x501) LVGROUP lg = { 0 }; lg.cbSize = sizeof(LVGROUP); lg.mask = LVGF_HEADER | LVGF_GROUPID; @@ -604,7 +602,6 @@ CSListView::CSListView(HWND hwnd, CSWindow* parent) lg.iGroupId = 1; ListView_InsertGroup(m_handle, -1, &lg); ListView_EnableGroupView(m_handle, TRUE); -#endif LVCOLUMN lvc = { 0 }; lvc.mask = LVCF_TEXT | LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM; @@ -620,9 +617,7 @@ CSListView::CSListView(HWND hwnd, CSWindow* parent) lvc.cx = 0xa8; SendMessage(m_handle, LVM_INSERTCOLUMN, 2, (LPARAM)&lvc); -#if (_WIN32_IE >= 0x0400) ListView_SetExtendedListViewStyleEx(m_handle, 0, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_HEADERDRAGDROP | LVS_EX_INFOTIP); -#endif ListView_SetImageList(m_handle, m_parent->m_icons, LVSIL_SMALL); } diff --git a/plugins/CSList/src/cslist.h b/plugins/CSList/src/cslist.h index 8e0ec67f86..219a63771a 100644 --- a/plugins/CSList/src/cslist.h +++ b/plugins/CSList/src/cslist.h @@ -33,10 +33,6 @@ #ifndef __CSLIST_H
#define __CSLIST_H 1
-#define WINVER 0x501
-#define _WIN32_WINNT 0x501
-#define _WIN32_IE 0x600
-
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
diff --git a/plugins/Clist_blind/src/commonheaders.h b/plugins/Clist_blind/src/commonheaders.h index 304c330d33..122cd16ca1 100644 --- a/plugins/Clist_blind/src/commonheaders.h +++ b/plugins/Clist_blind/src/commonheaders.h @@ -22,9 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define _WIN32_WINNT 0x0600
-#define _WIN32_IE 0x0501
-
#include <windows.h>
#include <vssym32.h>
#include <Uxtheme.h>
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index 15600f4354..f0fecba5fe 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -26,11 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#pragma once
-#define _WIN32_WINNT 0x0501
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
#ifndef DB_USEHELPERFUNCTIONS // to supress static inline db helpers
#define DB_NOHELPERFUNCTIONS
diff --git a/plugins/Clist_nicer/skineditor/src/commonheaders.h b/plugins/Clist_nicer/skineditor/src/commonheaders.h index eafbd9bfbb..1563e24d18 100644 --- a/plugins/Clist_nicer/skineditor/src/commonheaders.h +++ b/plugins/Clist_nicer/skineditor/src/commonheaders.h @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp b/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp index b0a4136ea0..d2c0e15e54 100644 --- a/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp +++ b/plugins/Clist_nicer/src/Coolsb/coolsblib.cpp @@ -26,9 +26,6 @@ */
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#include <commonheaders.h>
#include "coolscroll.h"
#include "userdefs.h"
diff --git a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp b/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp index b70587874c..80b0cd12c4 100644 --- a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp +++ b/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp @@ -43,9 +43,6 @@ with careful thought.
*/
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#include <commonheaders.h>
#include "coolscroll.h"
#include "userdefs.h"
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h index 417f2986a2..fd0d4fda8a 100644 --- a/plugins/Clist_nicer/src/Include/commonheaders.h +++ b/plugins/Clist_nicer/src/Include/commonheaders.h @@ -22,9 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#define _CRT_SECURE_NO_WARNINGS
#undef FASTCALL
diff --git a/plugins/Clist_nicer/src/clnplus.cpp b/plugins/Clist_nicer/src/clnplus.cpp index 24c5fdddff..158f9cac3e 100644 --- a/plugins/Clist_nicer/src/clnplus.cpp +++ b/plugins/Clist_nicer/src/clnplus.cpp @@ -5,9 +5,6 @@ #include <commonheaders.h>
#include <shobjidl.h>
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#define _CLN_GDIP
diff --git a/plugins/Console/src/commonheaders.h b/plugins/Console/src/commonheaders.h index a3f8ad2bbe..8b623050a8 100644 --- a/plugins/Console/src/commonheaders.h +++ b/plugins/Console/src/commonheaders.h @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/CryptoPP/crypto/src/fipstest.cpp b/plugins/CryptoPP/crypto/src/fipstest.cpp index f1a8b8e1f0..d65730b010 100644 --- a/plugins/CryptoPP/crypto/src/fipstest.cpp +++ b/plugins/CryptoPP/crypto/src/fipstest.cpp @@ -8,7 +8,6 @@ #include "dll.h"
#ifdef CRYPTOPP_WIN32_AVAILABLE
-#define _WIN32_WINNT 0x0400
#include <windows.h>
#if defined(_MSC_VER) && _MSC_VER >= 1400
diff --git a/plugins/CryptoPP/crypto/src/osrng.cpp b/plugins/CryptoPP/crypto/src/osrng.cpp index ff7f034de7..22f13e65d1 100644 --- a/plugins/CryptoPP/crypto/src/osrng.cpp +++ b/plugins/CryptoPP/crypto/src/osrng.cpp @@ -13,9 +13,6 @@ #include "rng.h"
#ifdef CRYPTOPP_WIN32_AVAILABLE
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
#include <windows.h>
#include <wincrypt.h>
#endif
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h index c1dfa05234..2d9723616e 100644 --- a/plugins/CryptoPP/src/commonheaders.h +++ b/plugins/CryptoPP/src/commonheaders.h @@ -14,14 +14,6 @@ #endif
#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
#include <limits>
#include <windows.h>
diff --git a/plugins/Db3x_mmap/src/commonheaders.h b/plugins/Db3x_mmap/src/commonheaders.h index a236c7bb5b..4dec1ac8d7 100644 --- a/plugins/Db3x_mmap/src/commonheaders.h +++ b/plugins/Db3x_mmap/src/commonheaders.h @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
#pragma warning(disable:4509)
diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 1dbf4f640c..4e428e0940 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -7,8 +7,6 @@ #define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_DEPRECATE
-#define _WIN32_WINNT 0x0501
-
#include <tchar.h>
#include <Windows.h>
diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/common.h index c8b4d645a4..74a23391d3 100644 --- a/plugins/FTPFileYM/src/common.h +++ b/plugins/FTPFileYM/src/common.h @@ -18,24 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
#define WIN32_LEAN_AND_MEAN
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h index bf6bda4158..998412d18b 100644 --- a/plugins/FavContacts/src/headers.h +++ b/plugins/FavContacts/src/headers.h @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define _CRT_SECURE_NO_DEPRECATE
-#define _WIN32_WINNT 0x0501
#include <winsock2.h>
#include <windows.h>
diff --git a/plugins/FileAsMessage/src/main.h b/plugins/FileAsMessage/src/main.h index 001b24de2e..e0e6c01114 100644 --- a/plugins/FileAsMessage/src/main.h +++ b/plugins/FileAsMessage/src/main.h @@ -1,6 +1,5 @@ #define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_DEPRECATE
-#define _WIN32_WINNT 0x0501
#include <windows.h>
#include <io.h>
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index ba641741f5..de6185786b 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -18,24 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
#define _CRT_SECURE_NO_DEPRECATE
//Start of header
diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h index 3bb3138f86..1093cfff3e 100644 --- a/plugins/FloatingContacts/src/fltcont.h +++ b/plugins/FloatingContacts/src/fltcont.h @@ -27,14 +27,6 @@ #define TIMERID_TOTOP_T 3
#define TIMERID_LEAVE_T 4
-
-#if WINVER < 0x0500
- #define SM_XVIRTUALSCREEN 76
- #define SM_YVIRTUALSCREEN 77
- #define SM_CXVIRTUALSCREEN 78
- #define SM_CYVIRTUALSCREEN 79
-#endif
-
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/IEHistory/src/stdafx.h b/plugins/IEHistory/src/stdafx.h index cb61a2c186..cfc7fc60d1 100644 --- a/plugins/IEHistory/src/stdafx.h +++ b/plugins/IEHistory/src/stdafx.h @@ -23,11 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define EVENTTYPE_STATUS 25368 //tabsrmm status events -#define WINVER 0x0501 -#define _WIN32_WINNT 0x0501 -#define _WIN32_WINDOWS 0x0410 -#define _WIN32_IE 0x0600 - // Windows Header Files: #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/plugins/IEView/src/ieview_common.h b/plugins/IEView/src/ieview_common.h index 0e648ccfda..0edf01a964 100644 --- a/plugins/IEView/src/ieview_common.h +++ b/plugins/IEView/src/ieview_common.h @@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_DEPRECATE
-#define _WIN32_WINNT 0x0601
-
#include <windows.h>
#include <commctrl.h>
#include <time.h>
diff --git a/plugins/IgnoreState/src/commonheaders.h b/plugins/IgnoreState/src/commonheaders.h index 5367d0828e..e0abfe1972 100644 --- a/plugins/IgnoreState/src/commonheaders.h +++ b/plugins/IgnoreState/src/commonheaders.h @@ -23,11 +23,6 @@ #define COMMHEADERS_H
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h index 246226db47..b940e9e3fa 100644 --- a/plugins/Import/src/import.h +++ b/plugins/Import/src/import.h @@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_DEPRECATE
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#include <windows.h>
#include <commctrl.h> // datetimepicker
diff --git a/plugins/KeyboardNotify/src/Common.h b/plugins/KeyboardNotify/src/Common.h index 71719a513f..9e41225be3 100644 --- a/plugins/KeyboardNotify/src/Common.h +++ b/plugins/KeyboardNotify/src/Common.h @@ -17,7 +17,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0500
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h index a67c5a40f4..ce52cb5ff7 100644 --- a/plugins/MirOTR/src/stdafx.h +++ b/plugins/MirOTR/src/stdafx.h @@ -9,18 +9,6 @@ #define _CRT_SECURE_NO_WARNINGS #define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden. -#ifndef WINVER // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist. -#define WINVER 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen. -#endif - -#ifndef _WIN32_WINNT // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist. -#define _WIN32_WINNT 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen. -#endif - -#ifndef _WIN32_IE // Gibt an, dass Internet Explorer 7.0 die mindestens erforderliche Plattform ist. -#define _WIN32_IE 0x0700 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von IE abzuzielen. -#endif - #include <windows.h> #include <commctrl.h> #include <process.h> diff --git a/plugins/MirandaG15/src/LCDFramework/stdafx.h b/plugins/MirandaG15/src/LCDFramework/stdafx.h index 8830f34250..0ff159a86f 100644 --- a/plugins/MirandaG15/src/LCDFramework/stdafx.h +++ b/plugins/MirandaG15/src/LCDFramework/stdafx.h @@ -5,7 +5,6 @@ #define ASSERT assert
-#define _WIN32_WINNT 0x0500 // Needed for waitable timers
#include <Windows.h>
#include <tchar.h>
#include <string>
diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h index cffc743a0c..3c2e1eb790 100644 --- a/plugins/MirandaG15/src/StdAfx.h +++ b/plugins/MirandaG15/src/StdAfx.h @@ -6,7 +6,6 @@ /* Common header files */
#include <assert.h>
-#define _WIN32_WINNT 0x0500 // Needed for waitable timers
#include <Windows.h>
#include <CommCtrl.h>
#include <tchar.h>
diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h index 186bc8226b..839233870d 100644 --- a/plugins/ModernOpt/src/commonheaders.h +++ b/plugins/ModernOpt/src/commonheaders.h @@ -22,10 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h index b18b58c210..f01193972d 100644 --- a/plugins/MyDetails/src/commons.h +++ b/plugins/MyDetails/src/commons.h @@ -23,8 +23,6 @@ Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
-
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/NewAwaySysMod/src/Common.h b/plugins/NewAwaySysMod/src/Common.h index 77da4837d3..2c47901ef1 100644 --- a/plugins/NewAwaySysMod/src/Common.h +++ b/plugins/NewAwaySysMod/src/Common.h @@ -22,7 +22,6 @@ #pragma once
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0500
#define MIRANDA_VER 0x0A00
diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h index d481072d6a..503fb31cb2 100644 --- a/plugins/NewXstatusNotify/src/common.h +++ b/plugins/NewXstatusNotify/src/common.h @@ -27,9 +27,6 @@ #define STRICT
#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0500
-#define WINVER 0x0600
-
#include <windows.h>
#include <mmsystem.h>
#include <commctrl.h>
diff --git a/plugins/NoHistory/src/common.h b/plugins/NoHistory/src/common.h index 549eaaddb0..5f2476a8aa 100644 --- a/plugins/NoHistory/src/common.h +++ b/plugins/NoHistory/src/common.h @@ -1,9 +1,6 @@ #ifndef _COMMON_INC
#define _COMMON_INC
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0500
-
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp index 1a5adc0dc1..e01f83ad91 100644 --- a/plugins/NotesAndReminders/src/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp @@ -463,11 +463,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar TCHAR s[MAX_PATH];
OPENFILENAME ofn = {0};
-#if defined(WINVER) && _WIN32_WINNT >= 0x0500
ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-#else
- ofn.lStructSize = sizeof(ofn);
-#endif
ofn.hwndOwner = hdlg;
ofn.lpstrFilter = TranslateT("Executable Files\0*.exe\0All Files\0*.*\0\0");
ofn.lpstrFile = s;
diff --git a/plugins/Nudge/src/headers.h b/plugins/Nudge/src/headers.h index 3260969903..26e9bb388c 100644 --- a/plugins/Nudge/src/headers.h +++ b/plugins/Nudge/src/headers.h @@ -5,24 +5,6 @@ #define _CRT_SECURE_NO_WARNINGS
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
diff --git a/plugins/OpenSSL/src/commonheaders.h b/plugins/OpenSSL/src/commonheaders.h index ccbecc9d21..149c1e85b7 100644 --- a/plugins/OpenSSL/src/commonheaders.h +++ b/plugins/OpenSSL/src/commonheaders.h @@ -22,10 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define WINVER 0x0700 -#define _WIN32_WINNT 0x0700 -#define _WIN32_IE 0x0601 - #include <tchar.h> #include <winsock2.h> #include <shlobj.h> diff --git a/plugins/Ping/src/common.h b/plugins/Ping/src/common.h index 8e4398b4b9..3d46b2b2c6 100644 --- a/plugins/Ping/src/common.h +++ b/plugins/Ping/src/common.h @@ -4,10 +4,6 @@ #define _CRT_SECURE_NO_DEPRECATE
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define WINVER 0x0500
-#define _WIN32_WINNT 0x0500
-#define _WIN32_IE 0x0300
-
#include <windows.h>
#include <winsock.h>
#include <shellapi.h>
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h index 267d6cbaa5..91935af8c6 100644 --- a/plugins/Popup/src/headers.h +++ b/plugins/Popup/src/headers.h @@ -49,8 +49,6 @@ http://miranda-ng.org/distr/ // disable security warnings about "*_s" functions
#define _CRT_SECURE_NO_DEPRECATE
-#define _WIN32_WINNT 0x0501
-#define WINVER 0x0500
#define OEMRESOURCE
#include <windows.h>
diff --git a/plugins/QuickContacts/src/commons.h b/plugins/QuickContacts/src/commons.h index ab0397762f..98e8b0d5dd 100644 --- a/plugins/QuickContacts/src/commons.h +++ b/plugins/QuickContacts/src/commons.h @@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA. #ifndef __COMMONS_H__
# define __COMMONS_H__
-#define WINVER 0x0500
-
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 3e77ddff60..fc5f7b9bc7 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -480,7 +480,7 @@ int CheckText(HWND hdlg, TCHAR *sztext, BOOL only_enable = FALSE) if(sztext == NULL || sztext[0] == _T('\0'))
return 0;
- int len = mir_tstrlen(sztext);
+ size_t len = mir_tstrlen(sztext);
if (only_enable)
{
diff --git a/plugins/SMS/src/AdditionalFunctions/ListMT.h b/plugins/SMS/src/AdditionalFunctions/ListMT.h index 04f2552aaf..15c4b1d8b2 100644 --- a/plugins/SMS/src/AdditionalFunctions/ListMT.h +++ b/plugins/SMS/src/AdditionalFunctions/ListMT.h @@ -43,12 +43,7 @@ __inline DWORD ListMTInitialize(PCLIST_MT pclmtListMT,DWORD dwSpinCount) {
DWORD dwRetErrorCode;
-#if (_WIN32_WINNT >= 0x0403)
if (InitializeCriticalSectionAndSpinCount(&pclmtListMT->cs,((dwSpinCount)? (dwSpinCount | 0x80000000):0L)))
-#else
- InitializeCriticalSection(&pclmtListMT->cs);
- if (TRUE)
-#endif
{
InterlockedExchangePointer((volatile PVOID*)&pclmtListMT->nCount,NULL);
pclmtListMT->plmtiFirst=NULL;
@@ -72,11 +67,7 @@ __inline void ListMTDestroy(PCLIST_MT pclmtListMT) __inline BOOL ListMTTryLock(PCLIST_MT pclmtListMT)
{
-#if (_WIN32_WINNT >= 0x0400)
return(TryEnterCriticalSection(&pclmtListMT->cs));
-#else
- return(FALSE);
-#endif
}
diff --git a/plugins/SMS/src/common.h b/plugins/SMS/src/common.h index 2b3f917afa..a83c711a42 100644 --- a/plugins/SMS/src/common.h +++ b/plugins/SMS/src/common.h @@ -1,9 +1,6 @@ #ifndef _COMMON_H
#define _COMMON_H
-#define _WIN32_WINNT 0x0500
-#define _WIN32_IE 0x0400
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define VC_EXTRALEAN
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h index bbcc134e9b..10df66ad5a 100644 --- a/plugins/Scriver/src/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -27,9 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS
#define COMPILE_MULTIMON_STUBS
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0501
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 6fc637373c..7d5d182983 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -5,18 +5,6 @@ #define mir_itoa _itoa
#define mir_unlink _unlink
-#ifndef WINVER
-#define WINVER 0x0501
-#endif
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
#ifndef M_SIM_COMMONHEADERS_H
#define M_SIM_COMMONHEADERS_H
diff --git a/plugins/SeenPlugin/src/seen.h b/plugins/SeenPlugin/src/seen.h index a6597936fb..8bfc453336 100644 --- a/plugins/SeenPlugin/src/seen.h +++ b/plugins/SeenPlugin/src/seen.h @@ -18,9 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0300
-#endif
#define ETDT_ENABLE 0x00000002
#define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index 41e4fec0dd..339166e774 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -28,10 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _GLOBAL_H_ #define _GLOBAL_H_ -#define WINVER 0x0700 -#define _WIN32_WINNT 0x0700 -#define _WIN32_IE 0x0601 - #define _CRT_SECURE_NO_WARNINGS #define OEMRESOURCE diff --git a/plugins/Sessions/Src/Sessions.h b/plugins/Sessions/Src/Sessions.h index abc6a27bf2..f76831d72e 100644 --- a/plugins/Sessions/Src/Sessions.h +++ b/plugins/Sessions/Src/Sessions.h @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define _CRT_SECURE_NO_DEPRECATE
-#define _WIN32_WINNT 0x0501
-
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/SimpleStatusMsg/src/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h index 26b6c9355e..150982a42f 100644 --- a/plugins/SimpleStatusMsg/src/commonheaders.h +++ b/plugins/SimpleStatusMsg/src/commonheaders.h @@ -18,8 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _WIN32_IE 0x0501
-
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
diff --git a/plugins/SplashScreen/src/headers.h b/plugins/SplashScreen/src/headers.h index 489c0d5acd..ffb47ae14c 100644 --- a/plugins/SplashScreen/src/headers.h +++ b/plugins/SplashScreen/src/headers.h @@ -20,8 +20,6 @@ #ifndef HEADERS_H
#define HEADERS_H
-#define _WIN32_WINNT 0x0500
-#define WINVER 0x0400
#define _CRT_SECURE_NO_DEPRECATE
#include <windows.h>
diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h index 7efb5977bc..7904b56774 100644 --- a/plugins/StatusPlugins/commonstatus.h +++ b/plugins/StatusPlugins/commonstatus.h @@ -24,7 +24,6 @@ #define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0501
#include <windows.h>
#include <shlobj.h>
#include <uxtheme.h>
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index 25ad68af2f..3e8d8e1724 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -29,10 +29,6 @@ #ifndef __COMMONHEADERS_H
#define __COMMONHEADERS_H
-#define WINVER 0x0600
-#define _WIN32_WINNT 0x0600
-#define _WIN32_IE 0x0501
-
#include <windows.h>
#include <windowsx.h>
#include <commdlg.h>
diff --git a/plugins/TipperYM/src/common.h b/plugins/TipperYM/src/common.h index 398d4111fa..75ad8e55d1 100644 --- a/plugins/TipperYM/src/common.h +++ b/plugins/TipperYM/src/common.h @@ -18,24 +18,6 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
#define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h index 2f007caefa..263b18c785 100644 --- a/plugins/TooltipNotify/src/stdafx.h +++ b/plugins/TooltipNotify/src/stdafx.h @@ -5,7 +5,6 @@ #define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _WIN32_WINNT 0x0500
#include <windows.h>
#include <commctrl.h>
diff --git a/plugins/TrafficCounter/src/commonheaders.h b/plugins/TrafficCounter/src/commonheaders.h index 55d5af287b..cbdc585e94 100644 --- a/plugins/TrafficCounter/src/commonheaders.h +++ b/plugins/TrafficCounter/src/commonheaders.h @@ -22,10 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500
-#endif
-
#include <windows.h>
#include <windowsx.h>
#include <commctrl.h>
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index ca2de3e7a8..dc8b7b2f66 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -25,10 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * some compiler definitions
***********************************************************************************************************/
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0500
-#define WIN32_LEAN_AND_MEAN
-
#define _CRT_SECURE_NO_DEPRECATE 1
#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0
#define _CRT_SECURE_NO_WARNINGS
diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index ab94f0dca0..7551ecab15 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -37,7 +37,6 @@ static TCHAR *parseComputerName(ARGUMENTSINFO *ai) return res;
}
-#if _WIN32_WINNT>=0x0500
#include <pdh.h>
#include <pdhmsg.h>
@@ -113,7 +112,6 @@ static TCHAR *parseCpuLoad(ARGUMENTSINFO *ai) return mir_tstrdup(szVal);
}
-#endif
static TCHAR *parseCurrentDate(ARGUMENTSINFO *ai)
{
@@ -789,7 +787,6 @@ static TCHAR *parseTextFile(ARGUMENTSINFO *ai) return NULL;
}
-#if _WIN32_WINNT>=0x0500
static TCHAR *parseUpTime(ARGUMENTSINFO *ai)
{
if (ai->argc != 1)
@@ -827,7 +824,6 @@ static TCHAR *parseUpTime(ARGUMENTSINFO *ai) PdhCloseQuery(hQuery);
return mir_tstrdup(szVal);
}
-#endif
static TCHAR *parseUserName(ARGUMENTSINFO *ai)
{
@@ -879,9 +875,7 @@ static TCHAR *parseClipboard(ARGUMENTSINFO *ai) void registerSystemTokens()
{
registerIntToken(COMPUTERNAME, parseComputerName, TRF_FIELD, LPGEN("System Functions")"\t"LPGEN("computer name"));
-#if _WIN32_WINNT>=0x0500
registerIntToken(CPULOAD, parseCpuLoad, TRF_FUNCTION, LPGEN("System Functions")"\t(x)\t"LPGEN("CPU load of process x (without extension) (x is optional)"));
-#endif
registerIntToken(CDATE, parseCurrentDate, TRF_FUNCTION, LPGEN("System Functions")"\t(y)\t"LPGEN("current date in format y (y is optional)"));
registerIntToken(CTIME, parseCurrentTime, TRF_FUNCTION, LPGEN("System Functions")"\t(y)\t"LPGEN("current time in format y (y is optional)"));
registerIntToken(DIRECTORY, parseDirectory, TRF_FUNCTION, LPGEN("System Functions")"\t(x,y)\t"LPGEN("the directory y directories above x"));
@@ -898,9 +892,8 @@ void registerSystemTokens() registerIntToken(TIMESTAMP2DATE, parseTimestamp2Date, TRF_FUNCTION, LPGEN("System Functions")"\t(x,y)\t"LPGEN("formats timestamp x (seconds since 1/1/1970) in date format y"));
registerIntToken(TIMESTAMP2TIME, parseTimestamp2Time, TRF_FUNCTION, LPGEN("System Functions")"\t(x,y)\t"LPGEN("formats timestamp x (seconds since 1/1/1970) in time format y"));
registerIntToken(TXTFILE, parseTextFile, TRF_FUNCTION, LPGEN("System Functions")"\t(x,y)\t"LPGEN("y > 0: line number y from file x, y = 0: the whole file, y < 0: line y counted from the end, y = r: random line"));
-#if _WIN32_WINNT>=0x0500
registerIntToken(UPTIME, parseUpTime, TRF_FIELD, LPGEN("System Functions")"\t"LPGEN("uptime in seconds"));
-#endif
+
if (!ServiceExists(MS_UTILS_REPLACEVARS))
registerIntToken(ENVIRONMENTVARIABLE, parseEnvironmentVariable, TRF_FUNCTION, LPGEN("Miranda Core OS")"\t(%xxxxxxx%)\t"LPGEN("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"));
else {
diff --git a/plugins/YAMN/src/yamn.h b/plugins/YAMN/src/yamn.h index 77bdb713c5..047f31696b 100644 --- a/plugins/YAMN/src/yamn.h +++ b/plugins/YAMN/src/yamn.h @@ -2,14 +2,6 @@ #ifndef __YAMN_H
#define __YAMN_H
-#ifndef _WIN32_IE
- #define _WIN32_IE 0x0400
-#endif
-
-#ifndef _WIN32_WINNT
- #define _WIN32_WINNT 0x0501
-#endif
-
#define _CRT_SECURE_NO_WARNINGS
#define VC_EXTRALEAN
diff --git a/plugins/YAPP/src/common.h b/plugins/YAPP/src/common.h index 6262d36a51..fa72b992d5 100644 --- a/plugins/YAPP/src/common.h +++ b/plugins/YAPP/src/common.h @@ -7,25 +7,6 @@ #define _CRT_SECURE_NO_WARNINGS
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h index 3d81d9245e..e46827e586 100644 --- a/plugins/mTextControl/src/headers.h +++ b/plugins/mTextControl/src/headers.h @@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define _CRT_SECURE_NO_DEPRECATE
-#define _WIN32_WINNT 0x0500
-#define WINVER 0x0500
#define OEMRESOURCE
#include <windows.h>
diff --git a/plugins/wbOSD/src/wbOSD.h b/plugins/wbOSD/src/wbOSD.h index ba8658f809..5804c73281 100644 --- a/plugins/wbOSD/src/wbOSD.h +++ b/plugins/wbOSD/src/wbOSD.h @@ -7,7 +7,6 @@ This plugin tries to become miranda's standard OSD ;-) Distributed under GNU's GPL 2 or later
*/
-#define _WIN32_WINNT 0x0500
#define _CRT_SECURE_NO_WARNINGS
#include <windows.h>
|