Explicitly default the expected Windows API to 0x0A00 (Windows 10)

* Reject versions before Windows 7 (0x0601)
* Ensure firebird.h is included first to avoid translation units unexpectedly using a different version or other config than defined in firebird.h
* Also raise libcds expected Windows API to Windows 7 (0x601) instead of Windows 2000 (0x0500)/Windows XP (0x501)

Author: mrotteveel

CMakeLists.txt

@@ -204,7 +204,8 @@ if (MINGW)
     set(CMAKE_SHARED_MODULE_PREFIX)
     set(CMAKE_STATIC_LIBRARY_PREFIX)
 
-    add_definitions(-D_WIN32_WINNT=0x0600)
+    # 0x0A00 is Windows 10
+    add_definitions(-D_WIN32_WINNT=0x0A00)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++20")
 endif()
 

extern/libcds/projects/Win/vc141/cds.vcxproj

@@ -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/fb_string.h

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

src/common/classes/locks.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/guid.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/os/win32/mod_loader.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/sha.cpp

@@ -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/common/sha2/sha2.h

@@ -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/dsql/StmtNodes.cpp

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