Explicitly default the expected Windows API to 0x0601 (Windows 7)

CMakeLists.txt

@@ -204,7 +204,8 @@ if (MINGW)
     set(CMAKE_SHARED_MODULE_PREFIX)
     set(CMAKE_STATIC_LIBRARY_PREFIX)
 
-    add_definitions(-D_WIN32_WINNT=0x0600)
+    # 0x0601 is Windows 7 - see also comments in autoconfig_msvc.h
+    add_definitions(-D_WIN32_WINNT=0x0601)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++20")
 endif()
 

builds/win32/msvc15/FirebirdCommon.props

@@ -27,7 +27,7 @@
       <CompileAs>Default</CompileAs>
       <UseFullPaths>false</UseFullPaths>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <TreatSpecificWarningsAsErrors>4715</TreatSpecificWarningsAsErrors>
     </ClCompile>
     <Link>

src/common/classes/fb_string.h

@@ -29,12 +29,13 @@
 #ifndef INCLUDE_FB_STRING_H
 #define INCLUDE_FB_STRING_H
 
+#include "firebird.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <utility>
 
-#include "firebird.h"
 #include "fb_types.h"
 #include "fb_exception.h"
 #include "../common/classes/alloc.h"

src/common/classes/locks.cpp

@@ -25,10 +25,6 @@
  *  Contributor(s): ______________________________________.
  */
 
-#ifndef __MINGW32__
-#define _WIN32_WINNT 0x0403
-#endif
-
 #include "firebird.h"
 
 #include "../../common/classes/locks.h"

src/common/os/win32/guid.cpp

@@ -26,17 +26,12 @@
  *
  */
 
-#ifndef __MINGW32__
-// minimum win32 version: win98 / winnt4 SP3
-#define _WIN32_WINNT 0x0403
-#endif
-
+#include "firebird.h"
 #include <windows.h>
 #include <bcrypt.h>
 #include <objbase.h>
 #include <stdio.h>
 
-#include "firebird.h"
 #include "../common/os/guid.h"
 #include "fb_exception.h"
 

src/common/os/win32/mod_loader.cpp

@@ -3,9 +3,6 @@
  *
  */
 
-// required to use activation context API structures
-#define _WIN32_WINNT 0x0501
-
 #include "firebird.h"
 #include "../../../common/dllinst.h"
 #include "../common/os/mod_loader.h"

src/common/sha.cpp

@@ -9,6 +9,7 @@
 #ifndef SHA_H
 #define SHA_H
 
+#include "firebird.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "../common/sha.h"
@@ -31,8 +32,6 @@ void sha_final(unsigned char [SHA_DIGESTSIZE], SHA_INFO *) noexcept;
 
 #define SHA_VERSION 1
 
-#include "firebird.h"
-
 #ifdef WORDS_BIGENDIAN
 #  if SIZEOF_LONG == 4
 #    define SHA_BYTE_ORDER  4321

src/common/sha2/sha2.h

@@ -49,9 +49,13 @@
 #ifndef _SHA2_H
 #define _SHA2_H
 
-#include <string.h>
 #ifndef NIST_COMPLIANCY_TESTS
 #include "firebird.h"
+#endif
+
+#include <string.h>
+
+#ifndef NIST_COMPLIANCY_TESTS
 #include "../../common/classes/alloc.h"
 #include "../../common/classes/array.h"
 #include "../../common/classes/fb_string.h"

src/dsql/StmtNodes.cpp

@@ -18,8 +18,8 @@
  * Adriano dos Santos Fernandes - refactored from pass1.cpp, gen.cpp, cmp.cpp, par.cpp and exe.cpp
  */
 
-#include <algorithm>
 #include "firebird.h"
+#include <algorithm>
 #include "firebird/impl/blr.h"
 #include "../common/TimeZoneUtil.h"
 #include "../common/classes/BaseStream.h"

src/extlib/ib_util.cpp

@@ -18,8 +18,8 @@
  * Adriano dos Santos Fernandes
  */
 
-#include <stdlib.h>
 #include "firebird.h"
+#include <stdlib.h>
 #include "ibase.h"
 
 

src/include/gen/autoconfig_msvc.h

@@ -1,27 +1,20 @@
-/*
- * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
- *                          - MAC (MAC, MAC_AUX and "MAC_CP" defines)
- *                          - EPSON, DELTA, IMP, NCR3000, NeXT, M88K, Cray
- *                          - OS/2, Apollo
- *
- * 2002-02-23 Sean Leyne - Code Cleanup, removed old Win3.1 port (Windows_Only)
- *
- * 2002.10.27 Sean Leyne - Code Cleanup, removed obsolete "UNIXWARE" port
- * 2002.10.27 Sean Leyne - Code Cleanup, removed obsolete "Ultrix" port
- *
- * 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port
- * 2002.10.28 Sean Leyne - Code cleanup, removed obsolete "MPEXL" port
- * 2002.10.28 Sean Leyne - Code cleanup, removed obsolete "SGI" port
- *
- * 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
- *
- * 2002.10.30 Sean Leyne - Removed support for obsolete "PC_PLATFORM" define
- *
- */
-
 #ifndef AUTOCONFIG_H
 #define AUTOCONFIG_H
 
+// Windows 7 (0x0601) is the baseline version for Firebird 6.
+// NOTE: This does not mean that this version is supported, but that we want to limit Windows API
+// use to this version.
+#define FB_WIN32_WINNT_BASELINE 0x0601
+
+// Normally, _WIN32_WINNT is defined in the PreprocessorDefinitions of Firebird.Common.props.
+#ifndef _WIN32_WINNT
+// Fallback to set _WIN32_WINNT to the baseline.
+#define _WIN32_WINNT FB_WIN32_WINNT_BASELINE
+#elif (_WIN32_WINNT < FB_WIN32_WINNT_BASELINE)
+// Consider Windows versions before the baseline really too old.
+#error The target Windows version (_WIN32_WINNT) is too old
+#endif
+
 //#pragma warning(disable:4099)	// class/struct mixups
 #pragma warning(disable:4251)	// needs to have dll-interface
 #pragma warning(disable:4291)	// no matching op. delete (there are)
@@ -68,7 +61,6 @@
 
 #pragma warning(disable:4996)  // 'identificator' was declared deprecated
 
-
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
 #ifdef _MSC_VER // don't know if this is useful for MinGW