Update contrib/restricted/boost/winapi to 1.79.0

author: robot-contrib <robot-contrib@yandex-team.com> 2022-08-07 12:52:35 +0300
committer: robot-contrib <robot-contrib@yandex-team.com> 2022-08-07 12:52:35 +0300
commit: a89864f26dfb8bf11af76e9b244ccf1f6961d269 (patch)
tree: c860d16dc1fb686040c1e624b1881c3f277c38a9
parent: fcfbfb700bf5a793fdf567904816af30c8261375 (diff)
download: ydb-a89864f26dfb8bf11af76e9b244ccf1f6961d269.tar.gz
44 files changed, 1319 insertions, 749 deletions
diff --git a/contrib/restricted/boost/winapi/README.md b/contrib/restricted/boost/winapi/README.md
index 467082b2ed..c416ead455 100644
--- a/contrib/restricted/boost/winapi/README.md
+++ b/contrib/restricted/boost/winapi/README.md
@@ -5,9 +5,11 @@ Windows API declarations without &lt;windows.h&gt;, for internal Boost use.
 
 ### Build Status
 
-Master: [![AppVeyor](https://ci.appveyor.com/api/projects/status/dkb233de24u30x9a/branch/master?svg=true)](https://ci.appveyor.com/project/Lastique/winapi/branch/master) [![Travis CI](https://travis-ci.org/boostorg/winapi.svg?branch=master)](https://travis-ci.org/boostorg/winapi)
-Develop: [![AppVeyor](https://ci.appveyor.com/api/projects/status/dkb233de24u30x9a/branch/develop?svg=true)](https://ci.appveyor.com/project/Lastique/winapi/branch/develop) [![Travis CI](https://travis-ci.org/boostorg/winapi.svg?branch=develop)](https://travis-ci.org/boostorg/winapi)
+Branch          | AppVeyor | Test Matrix | Dependencies |
+:-------------: | -------- | ----------- | ------------ |
+[`master`](https://github.com/boostorg/winapi/tree/master) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/dkb233de24u30x9a/branch/master?svg=true)](https://ci.appveyor.com/project/Lastique/winapi/branch/master) | [![Tests](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/winapi.html) | [![Dependencies](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/winapi.html)
+[`develop`](https://github.com/boostorg/winapi/tree/develop) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/dkb233de24u30x9a/branch/develop?svg=true)](https://ci.appveyor.com/project/Lastique/winapi/branch/develop) | [![Tests](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/winapi.html) | [![Dependencies](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/winapi.html)
 
 ### License
 
-Distributed under the [Boost Software License, Version 1.0](http://boost.org/LICENSE_1_0.txt).
+Distributed under the [Boost Software License, Version 1.0](https://boost.org/LICENSE_1_0.txt).
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/interlocked.hpp b/contrib/restricted/boost/winapi/include/boost/detail/interlocked.hpp
index e20e3e4671..8084857bbe 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/interlocked.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/interlocked.hpp
@@ -5,6 +5,7 @@
 //  boost/detail/interlocked.hpp
 //
 //  Copyright 2005 Peter Dimov
+//  Copyright 2018, 2019 Andrey Semashev
 //
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
@@ -13,75 +14,150 @@
 
 #include <boost/config.hpp>
 
-// MS compatible compilers support #pragma once
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
-#if defined( BOOST_USE_WINDOWS_H )
+// BOOST_INTERLOCKED_HAS_INTRIN_H
 
-# include <windows.h>
+// VC9 has intrin.h, but it collides with <utility>
+#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1600
 
-# define BOOST_INTERLOCKED_INCREMENT InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD InterlockedExchangeAdd
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER InterlockedCompareExchangePointer
-# define BOOST_INTERLOCKED_EXCHANGE_POINTER InterlockedExchangePointer
+# define BOOST_INTERLOCKED_HAS_INTRIN_H
 
-#elif defined( BOOST_USE_INTRIN_H )
+// Unlike __MINGW64__, __MINGW64_VERSION_MAJOR is defined by MinGW-w64 for both 32 and 64-bit targets.
+#elif defined( __MINGW64_VERSION_MAJOR )
 
-#include <intrin.h>
+// MinGW-w64 provides intrin.h for both 32 and 64-bit targets.
+# define BOOST_INTERLOCKED_HAS_INTRIN_H
+
+#elif defined( __CYGWIN__ )
+
+// Cygwin and Cygwin64 provide intrin.h. On Cygwin64 we have to use intrin.h because it's an LP64 target,
+// where long is 64-bit and therefore _Interlocked* functions have different signatures.
+# define BOOST_INTERLOCKED_HAS_INTRIN_H
+
+// Intel C++ on Windows on VC10+ stdlib
+#elif defined( BOOST_INTEL_WIN ) && defined( _CPPLIB_VER ) && _CPPLIB_VER >= 520
+
+# define BOOST_INTERLOCKED_HAS_INTRIN_H
+
+// clang-cl on Windows on VC10+ stdlib
+#elif defined( __clang__ ) && defined( _MSC_VER ) && defined( _CPPLIB_VER ) && _CPPLIB_VER >= 520
+
+# define BOOST_INTERLOCKED_HAS_INTRIN_H
+
+#endif
+
+#if !defined(__LP64__)
+#define BOOST_INTERLOCKED_LONG32 long
+#else
+#define BOOST_INTERLOCKED_LONG32 int
+#endif
+
+#if defined( BOOST_USE_WINDOWS_H )
+
+# include <windows.h>
 
-# define BOOST_INTERLOCKED_INCREMENT _InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT _InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE _InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+    InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+    InterlockedExchangePointer((void**)(dest), (void*)(exchange))
+
+#elif defined( BOOST_USE_INTRIN_H ) || defined( BOOST_INTERLOCKED_HAS_INTRIN_H )
 
-# if defined(_M_IA64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__x86_64)
+#include <intrin.h>
 
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER _InterlockedCompareExchangePointer
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER _InterlockedExchangePointer
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    _InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    _InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    _InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    _InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    _InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
+
+// Note: Though MSVC-12 defines _InterlockedCompareExchangePointer and _InterlockedExchangePointer in intrin.h, the latter
+//       is actually broken as it conflicts with winnt.h from Windows SDK 8.1.
+# if (defined(_MSC_VER) && _MSC_VER >= 1900) || \
+  (defined(_M_IA64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_ARM64))
+
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+     _InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+     _InterlockedExchangePointer((void**)(dest), (void*)(exchange))
 
 # else
 
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
-    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long volatile*)(dest),(long)(exchange),(long)(compare)))
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
-    ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare)))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+    ((void*)BOOST_INTERLOCKED_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange)))
 
 # endif
 
 #elif defined(_WIN32_WCE)
 
-// under Windows CE we still have old-style Interlocked* functions
+#if _WIN32_WCE >= 0x600
 
-extern "C" long __cdecl InterlockedIncrement( long volatile* );
-extern "C" long __cdecl InterlockedDecrement( long volatile* );
-extern "C" long __cdecl InterlockedCompareExchange( long volatile*, long, long );
-extern "C" long __cdecl InterlockedExchange( long volatile*, long );
-extern "C" long __cdecl InterlockedExchangeAdd( long volatile*, long );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl _InterlockedIncrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl _InterlockedDecrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl _InterlockedCompareExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl _InterlockedExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl _InterlockedExchangeAdd( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
 
-# define BOOST_INTERLOCKED_INCREMENT InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD InterlockedExchangeAdd
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    _InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    _InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    _InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    _InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    _InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
 
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
-    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long*)(dest),(long)(exchange),(long)(compare)))
-# define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
-    ((void*)BOOST_INTERLOCKED_EXCHANGE((long*)(dest),(long)(exchange)))
+#else // _WIN32_WCE >= 0x600
 
-#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
-
-#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1400
+// under Windows CE we still have old-style Interlocked* functions
 
-#include <intrin.h>
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl InterlockedIncrement( BOOST_INTERLOCKED_LONG32 * );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl InterlockedDecrement( BOOST_INTERLOCKED_LONG32 * );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl InterlockedCompareExchange( BOOST_INTERLOCKED_LONG32 *, BOOST_INTERLOCKED_LONG32, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl InterlockedExchange( BOOST_INTERLOCKED_LONG32 *, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 __cdecl InterlockedExchangeAdd( BOOST_INTERLOCKED_LONG32 *, BOOST_INTERLOCKED_LONG32 );
+
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
+
+#endif // _WIN32_WCE >= 0x600
+
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare)))
+# define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+    ((void*)BOOST_INTERLOCKED_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange)))
 
-#else
+#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
 
 # if defined( __CLRCALL_PURE_OR_CDECL )
 #  define BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL __CLRCALL_PURE_OR_CDECL
@@ -89,13 +165,11 @@ extern "C" long __cdecl InterlockedExchangeAdd( long volatile*, long );
 #  define BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL __cdecl
 # endif
 
-extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedIncrement( long volatile * );
-extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedDecrement( long volatile * );
-extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedCompareExchange( long volatile *, long, long );
-extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchange( long volatile *, long );
-extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchangeAdd( long volatile *, long );
-
-# undef BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL
+extern "C" BOOST_INTERLOCKED_LONG32 BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedIncrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_LONG32 BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedDecrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_LONG32 BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedCompareExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_LONG32 BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchangeAdd( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
 
 # if defined( BOOST_MSVC ) && BOOST_MSVC >= 1310
 #  pragma intrinsic( _InterlockedIncrement )
@@ -105,53 +179,44 @@ extern "C" long BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchangeAdd(
 #  pragma intrinsic( _InterlockedExchangeAdd )
 # endif
 
-#endif
+# if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM64)
 
-# if defined(_M_IA64) || defined(_M_AMD64)
+extern "C" void* BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedCompareExchangePointer( void* volatile *, void*, void* );
+extern "C" void* BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL _InterlockedExchangePointer( void* volatile *, void* );
 
-extern "C" void* __cdecl _InterlockedCompareExchangePointer( void* volatile *, void*, void* );
-extern "C" void* __cdecl _InterlockedExchangePointer( void* volatile *, void* );
+#  if defined( BOOST_MSVC ) && BOOST_MSVC >= 1310
+#   pragma intrinsic( _InterlockedCompareExchangePointer )
+#   pragma intrinsic( _InterlockedExchangePointer )
+#  endif
 
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER _InterlockedCompareExchangePointer
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER _InterlockedExchangePointer
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+     _InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+     _InterlockedExchangePointer((void**)(dest), (void*)(exchange))
 
 # else
 
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
-    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long volatile*)(dest),(long)(exchange),(long)(compare)))
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
-    ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare)))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+    ((void*)BOOST_INTERLOCKED_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange)))
 
 # endif
 
-# define BOOST_INTERLOCKED_INCREMENT _InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT _InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE _InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
-
-// Unlike __MINGW64__, __MINGW64_VERSION_MAJOR is defined by MinGW-w64 for both 32 and 64-bit targets.
-#elif defined(__MINGW64_VERSION_MAJOR)
-
-// MinGW-w64 provides intrin.h for both 32 and 64-bit targets.
-#include <intrin.h>
+# undef BOOST_INTERLOCKED_CLRCALL_PURE_OR_CDECL
 
-# define BOOST_INTERLOCKED_INCREMENT _InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT _InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE _InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
-# if defined(__x86_64__) || defined(__x86_64)
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER _InterlockedCompareExchangePointer
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER _InterlockedExchangePointer
-# else
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
-    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long volatile*)(dest),(long)(exchange),(long)(compare)))
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
-    ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
-# endif
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    _InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    _InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    _InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    _InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    _InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
 
-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
 
 #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
 
@@ -161,13 +226,13 @@ namespace boost
 namespace detail
 {
 
-extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedIncrement( long volatile * );
-extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedDecrement( long volatile * );
-extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedCompareExchange( long volatile *, long, long );
-extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchange( long volatile *, long );
-extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchangeAdd( long volatile *, long );
+extern "C" BOOST_INTERLOCKED_IMPORT BOOST_INTERLOCKED_LONG32 __stdcall InterlockedIncrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_IMPORT BOOST_INTERLOCKED_LONG32 __stdcall InterlockedDecrement( BOOST_INTERLOCKED_LONG32 volatile * );
+extern "C" BOOST_INTERLOCKED_IMPORT BOOST_INTERLOCKED_LONG32 __stdcall InterlockedCompareExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_IMPORT BOOST_INTERLOCKED_LONG32 __stdcall InterlockedExchange( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
+extern "C" BOOST_INTERLOCKED_IMPORT BOOST_INTERLOCKED_LONG32 __stdcall InterlockedExchangeAdd( BOOST_INTERLOCKED_LONG32 volatile *, BOOST_INTERLOCKED_LONG32 );
 
-# if defined(_M_IA64) || defined(_M_AMD64)
+# if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM64)
 extern "C" BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedCompareExchangePointer( void* volatile *, void*, void* );
 extern "C" BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedExchangePointer( void* volatile *, void* );
 # endif
@@ -176,20 +241,27 @@ extern "C" BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedExchangePointer(
 
 } // namespace boost
 
-# define BOOST_INTERLOCKED_INCREMENT ::boost::detail::InterlockedIncrement
-# define BOOST_INTERLOCKED_DECREMENT ::boost::detail::InterlockedDecrement
-# define BOOST_INTERLOCKED_COMPARE_EXCHANGE ::boost::detail::InterlockedCompareExchange
-# define BOOST_INTERLOCKED_EXCHANGE ::boost::detail::InterlockedExchange
-# define BOOST_INTERLOCKED_EXCHANGE_ADD ::boost::detail::InterlockedExchangeAdd
-
-# if defined(_M_IA64) || defined(_M_AMD64)
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER ::boost::detail::InterlockedCompareExchangePointer
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER ::boost::detail::InterlockedExchangePointer
+# define BOOST_INTERLOCKED_INCREMENT(dest) \
+    ::boost::detail::InterlockedIncrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_DECREMENT(dest) \
+    ::boost::detail::InterlockedDecrement((BOOST_INTERLOCKED_LONG32*)(dest))
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) \
+    ::boost::detail::InterlockedCompareExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange), (BOOST_INTERLOCKED_LONG32)(compare))
+# define BOOST_INTERLOCKED_EXCHANGE(dest, exchange) \
+    ::boost::detail::InterlockedExchange((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(exchange))
+# define BOOST_INTERLOCKED_EXCHANGE_ADD(dest, add) \
+    ::boost::detail::InterlockedExchangeAdd((BOOST_INTERLOCKED_LONG32*)(dest), (BOOST_INTERLOCKED_LONG32)(add))
+
+# if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM64)
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+     ::boost::detail::InterlockedCompareExchangePointer((void**)(dest), (void*)(exchange), (void*)(compare))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+     ::boost::detail::InterlockedExchangePointer((void**)(dest), (void*)(exchange))
 # else
-#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
-    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long volatile*)(dest),(long)(exchange),(long)(compare)))
-#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
-    ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) \
+    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((BOOST_INTERLOCKED_LONG32 volatile*)(dest),(BOOST_INTERLOCKED_LONG32)(exchange),(BOOST_INTERLOCKED_LONG32)(compare)))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, exchange) \
+    ((void*)BOOST_INTERLOCKED_EXCHANGE((BOOST_INTERLOCKED_LONG32*)(dest),(BOOST_INTERLOCKED_LONG32)(exchange)))
 # endif
 
 #else
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_process.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_process.hpp
index b6a7915028..b516a3480b 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_process.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_process.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_GET_CURRENT_PROCESS_HPP
 #define BOOST_DETAIL_WINAPI_GET_CURRENT_PROCESS_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/get_current_process.hpp>")
+
 #include <boost/winapi/get_current_process.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_thread.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_thread.hpp
index f9a27c3e6e..296386e25a 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_thread.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_current_thread.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_GET_CURRENT_THREAD_HPP
 #define BOOST_DETAIL_WINAPI_GET_CURRENT_THREAD_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/get_current_thread.hpp>")
+
 #include <boost/winapi/get_current_thread.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_last_error.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_last_error.hpp
index f76a008e08..b48aa6a92b 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_last_error.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_last_error.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_GET_LAST_ERROR_HPP
 #define BOOST_DETAIL_WINAPI_GET_LAST_ERROR_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/get_last_error.hpp>")
+
 #include <boost/winapi/get_last_error.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_process_times.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_process_times.hpp
index 6babb3919d..3bd72472ed 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_process_times.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_process_times.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_GET_PROCESS_TIMES_HPP
 #define BOOST_DETAIL_WINAPI_GET_PROCESS_TIMES_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/get_process_times.hpp>")
+
 #include <boost/winapi/get_process_times.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_thread_times.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_thread_times.hpp
index 96f1fac8f3..2301430c4c 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_thread_times.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/get_thread_times.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_GET_THREAD_TIMES_HPP
 #define BOOST_DETAIL_WINAPI_GET_THREAD_TIMES_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/get_thread_times.hpp>")
+
 #include <boost/winapi/get_thread_times.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/time.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/time.hpp
index a6d728a5a0..48cc610021 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/time.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/time.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_TIME_HPP_
 #define BOOST_DETAIL_WINAPI_TIME_HPP_
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/time.hpp>")
+
 #include <boost/winapi/time.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/detail/winapi/timers.hpp b/contrib/restricted/boost/winapi/include/boost/detail/winapi/timers.hpp
index 4b874e249d..4ffa77957b 100644
--- a/contrib/restricted/boost/winapi/include/boost/detail/winapi/timers.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/detail/winapi/timers.hpp
@@ -10,6 +10,10 @@
 #ifndef BOOST_DETAIL_WINAPI_TIMERS_HPP
 #define BOOST_DETAIL_WINAPI_TIMERS_HPP
 
+#include <boost/config/header_deprecated.hpp>
+
+BOOST_HEADER_DEPRECATED("<boost/winapi/timers.hpp>")
+
 #include <boost/winapi/timers.hpp>
 #include <boost/detail/winapi/detail/deprecated_namespace.hpp>
 
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/access_rights.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/access_rights.hpp
index 53e46ad231..a95c01d2d6 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/access_rights.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/access_rights.hpp
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_ACCESS_RIGHTS_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -19,56 +20,56 @@ namespace winapi {
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ DELETE_ = DELETE;
-const DWORD_ READ_CONTROL_ = READ_CONTROL;
-const DWORD_ WRITE_DAC_ = WRITE_DAC;
-const DWORD_ WRITE_OWNER_ = WRITE_OWNER;
-const DWORD_ SYNCHRONIZE_ = SYNCHRONIZE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DELETE_ = DELETE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ READ_CONTROL_ = READ_CONTROL;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WRITE_DAC_ = WRITE_DAC;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WRITE_OWNER_ = WRITE_OWNER;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SYNCHRONIZE_ = SYNCHRONIZE;
 
-const DWORD_ STANDARD_RIGHTS_ALL_ = STANDARD_RIGHTS_ALL;
-const DWORD_ STANDARD_RIGHTS_EXECUTE_ = STANDARD_RIGHTS_EXECUTE;
-const DWORD_ STANDARD_RIGHTS_READ_ = STANDARD_RIGHTS_READ;
-const DWORD_ STANDARD_RIGHTS_REQUIRED_ = STANDARD_RIGHTS_REQUIRED;
-const DWORD_ STANDARD_RIGHTS_WRITE_ = STANDARD_RIGHTS_WRITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_ALL_ = STANDARD_RIGHTS_ALL;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_EXECUTE_ = STANDARD_RIGHTS_EXECUTE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_READ_ = STANDARD_RIGHTS_READ;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_REQUIRED_ = STANDARD_RIGHTS_REQUIRED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_WRITE_ = STANDARD_RIGHTS_WRITE;
 
-const DWORD_ SPECIFIC_RIGHTS_ALL_ = SPECIFIC_RIGHTS_ALL;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SPECIFIC_RIGHTS_ALL_ = SPECIFIC_RIGHTS_ALL;
 
-const DWORD_ ACCESS_SYSTEM_SECURITY_ = ACCESS_SYSTEM_SECURITY;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ACCESS_SYSTEM_SECURITY_ = ACCESS_SYSTEM_SECURITY;
 
-const DWORD_ MAXIMUM_ALLOWED_ = MAXIMUM_ALLOWED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MAXIMUM_ALLOWED_ = MAXIMUM_ALLOWED;
 
-const DWORD_ GENERIC_ALL_ = GENERIC_ALL;
-const DWORD_ GENERIC_EXECUTE_ = GENERIC_EXECUTE;
-const DWORD_ GENERIC_WRITE_ = GENERIC_WRITE;
-const DWORD_ GENERIC_READ_ = GENERIC_READ;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_ALL_ = GENERIC_ALL;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_EXECUTE_ = GENERIC_EXECUTE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_WRITE_ = GENERIC_WRITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_READ_ = GENERIC_READ;
 
 typedef ::ACCESS_MASK ACCESS_MASK_;
 typedef ::PACCESS_MASK PACCESS_MASK_;
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ DELETE_ = 0x00010000;
-const DWORD_ READ_CONTROL_ = 0x00020000;
-const DWORD_ WRITE_DAC_ = 0x00040000;
-const DWORD_ WRITE_OWNER_ = 0x00080000;
-const DWORD_ SYNCHRONIZE_ = 0x00100000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DELETE_ = 0x00010000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ READ_CONTROL_ = 0x00020000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WRITE_DAC_ = 0x00040000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WRITE_OWNER_ = 0x00080000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SYNCHRONIZE_ = 0x00100000;
 
-const DWORD_ STANDARD_RIGHTS_ALL_ = 0x001F0000;
-const DWORD_ STANDARD_RIGHTS_EXECUTE_ = READ_CONTROL_;
-const DWORD_ STANDARD_RIGHTS_READ_ = READ_CONTROL_;
-const DWORD_ STANDARD_RIGHTS_REQUIRED_ = 0x000F0000;
-const DWORD_ STANDARD_RIGHTS_WRITE_ = READ_CONTROL_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_ALL_ = 0x001F0000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_EXECUTE_ = READ_CONTROL_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_READ_ = READ_CONTROL_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_REQUIRED_ = 0x000F0000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ STANDARD_RIGHTS_WRITE_ = READ_CONTROL_;
 
-const DWORD_ SPECIFIC_RIGHTS_ALL_ = 0x0000FFFF;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SPECIFIC_RIGHTS_ALL_ = 0x0000FFFF;
 
-const DWORD_ ACCESS_SYSTEM_SECURITY_ = 0x01000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ACCESS_SYSTEM_SECURITY_ = 0x01000000;
 
-const DWORD_ MAXIMUM_ALLOWED_ = 0x02000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MAXIMUM_ALLOWED_ = 0x02000000;
 
-const DWORD_ GENERIC_ALL_ = 0x10000000;
-const DWORD_ GENERIC_EXECUTE_ = 0x20000000;
-const DWORD_ GENERIC_WRITE_ = 0x40000000;
-const DWORD_ GENERIC_READ_ = 0x80000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_ALL_ = 0x10000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_EXECUTE_ = 0x20000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_WRITE_ = 0x40000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ GENERIC_READ_ = 0x80000000;
 
 typedef DWORD_ ACCESS_MASK_;
 typedef ACCESS_MASK_* PACCESS_MASK_;
@@ -78,4 +79,6 @@ typedef ACCESS_MASK_* PACCESS_MASK_;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_ACCESS_RIGHTS_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/basic_types.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/basic_types.hpp
index 886727f5c0..1b09cd61bf 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/basic_types.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/basic_types.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2010 Vicente J. Botet Escriba
- * Copyright 2015 Andrey Semashev
+ * Copyright 2015-2018 Andrey Semashev
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See http://www.boost.org/LICENSE_1_0.txt
@@ -9,18 +9,15 @@
 #ifndef BOOST_WINAPI_BASIC_TYPES_HPP_INCLUDED_
 #define BOOST_WINAPI_BASIC_TYPES_HPP_INCLUDED_
 
-#include <cstdarg>
-#include <boost/cstdint.hpp>
 #include <boost/winapi/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
-#if defined( BOOST_USE_WINDOWS_H )
+#if defined(BOOST_USE_WINDOWS_H)
 # include <windows.h>
-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) ||  defined(__CYGWIN__)
-# include <winerror.h>
+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 # ifdef UNDER_CE
 #  ifndef WINAPI
 #   ifndef _WIN32_WCE_EMULATION
@@ -33,19 +30,41 @@
 typedef int BOOL;
 typedef unsigned long DWORD;
 typedef void* HANDLE;
+typedef HANDLE HGLOBAL;
+typedef void* LPVOID;
 #  include <kfuncs.h>
-# else
-#  ifndef WINAPI
-#   define WINAPI  __stdcall
-#  endif
-# endif
-# ifndef NTAPI
-#  define NTAPI __stdcall
-# endif
+# endif // UNDER_CE
 #else
 # error "Win32 functions not available"
 #endif
 
+#include <boost/winapi/detail/header.hpp>
+
+#if defined(_M_IX86) || defined(__i386__)
+#define BOOST_WINAPI_DETAIL_STDCALL __stdcall
+#else
+// On architectures other than 32-bit x86 __stdcall is ignored. Clang also issues a warning.
+#define BOOST_WINAPI_DETAIL_STDCALL
+#endif
+
+#if defined(WINAPI)
+#define BOOST_WINAPI_WINAPI_CC WINAPI
+#else
+#define BOOST_WINAPI_WINAPI_CC BOOST_WINAPI_DETAIL_STDCALL
+#endif
+
+#if defined(CALLBACK)
+#define BOOST_WINAPI_CALLBACK_CC CALLBACK
+#else
+#define BOOST_WINAPI_CALLBACK_CC BOOST_WINAPI_DETAIL_STDCALL
+#endif
+
+#if defined(NTAPI)
+#define BOOST_WINAPI_NTAPI_CC NTAPI
+#else
+#define BOOST_WINAPI_NTAPI_CC BOOST_WINAPI_DETAIL_STDCALL
+#endif
+
 #ifndef NO_STRICT
 #ifndef STRICT
 #define STRICT 1
@@ -58,7 +77,7 @@ typedef void* HANDLE;
 #define BOOST_WINAPI_DETAIL_DECLARE_HANDLE(x) typedef void* x
 #endif
 
-#if !defined( BOOST_USE_WINDOWS_H )
+#if !defined(BOOST_USE_WINDOWS_H)
 extern "C" {
 union _LARGE_INTEGER;
 struct _SECURITY_ATTRIBUTES;
@@ -79,7 +98,7 @@ typedef HINSTANCE HMODULE;
 
 namespace boost {
 namespace winapi {
-#if defined( BOOST_USE_WINDOWS_H )
+#if defined(BOOST_USE_WINDOWS_H)
 
 typedef ::BOOL BOOL_;
 typedef ::PBOOL PBOOL_;
@@ -138,10 +157,6 @@ typedef ::WCHAR WCHAR_;
 typedef ::LPWSTR LPWSTR_;
 typedef ::LPCWSTR LPCWSTR_;
 
-// ::NTSTATUS is defined in ntdef.h, which is not included by windows.h by default
-typedef LONG_ NTSTATUS_;
-typedef NTSTATUS_ *PNTSTATUS_;
-
 #else // defined( BOOST_USE_WINDOWS_H )
 
 typedef int BOOL_;
@@ -157,7 +172,11 @@ typedef BOOLEAN_* PBOOLEAN_;
 typedef unsigned short WORD_;
 typedef WORD_* PWORD_;
 typedef WORD_* LPWORD_;
+#if !defined(__LP64__)
 typedef unsigned long DWORD_;
+#else
+typedef unsigned int DWORD_;
+#endif
 typedef DWORD_* PDWORD_;
 typedef DWORD_* LPDWORD_;
 typedef void* HANDLE_;
@@ -172,35 +191,37 @@ typedef INT_* PINT_;
 typedef INT_* LPINT_;
 typedef unsigned int UINT_;
 typedef UINT_* PUINT_;
+#if !defined(__LP64__)
 typedef long LONG_;
+typedef unsigned long ULONG_;
+#else
+typedef int LONG_;
+typedef unsigned int ULONG_;
+#endif
 typedef LONG_* PLONG_;
 typedef LONG_* LPLONG_;
-typedef unsigned long ULONG_;
 typedef ULONG_* PULONG_;
-typedef boost::uint64_t ULONG64_;
-typedef ULONG64_ * PULONG64_;
-
-typedef boost::int64_t LONGLONG_;
-typedef boost::uint64_t ULONGLONG_;
+#if defined(BOOST_HAS_MS_INT64)
+BOOST_WINAPI_DETAIL_EXTENSION typedef __int64 LONGLONG_;
+BOOST_WINAPI_DETAIL_EXTENSION typedef unsigned __int64 ULONGLONG_;
+#else
+BOOST_WINAPI_DETAIL_EXTENSION typedef long long LONGLONG_;
+BOOST_WINAPI_DETAIL_EXTENSION typedef unsigned long long ULONGLONG_;
+#endif
+typedef LONGLONG_ LONG64_, *PLONG64_;
+typedef ULONGLONG_ ULONG64_, *PULONG64_;
 
-# ifdef _WIN64
-#  if defined(__CYGWIN__)
-typedef long INT_PTR_;
-typedef unsigned long UINT_PTR_;
-typedef long LONG_PTR_;
-typedef unsigned long ULONG_PTR_;
-#  else
-typedef __int64 INT_PTR_;
-typedef unsigned __int64 UINT_PTR_;
-typedef __int64 LONG_PTR_;
-typedef unsigned __int64 ULONG_PTR_;
-#  endif
-# else
+#if defined(_WIN64)
+typedef LONGLONG_ INT_PTR_;
+typedef ULONGLONG_ UINT_PTR_;
+typedef LONGLONG_ LONG_PTR_;
+typedef ULONGLONG_ ULONG_PTR_;
+#else
 typedef int INT_PTR_;
 typedef unsigned int UINT_PTR_;
 typedef long LONG_PTR_;
 typedef unsigned long ULONG_PTR_;
-# endif
+#endif
 
 typedef ULONG_PTR_ DWORD_PTR_, *PDWORD_PTR_;
 typedef ULONG_PTR_ SIZE_T_, *PSIZE_T_;
@@ -219,19 +240,19 @@ typedef wchar_t WCHAR_;
 typedef WCHAR_ *LPWSTR_;
 typedef const WCHAR_ *LPCWSTR_;
 
-typedef long NTSTATUS_;
-typedef NTSTATUS_ * PNTSTATUS_;
-
 #endif // defined( BOOST_USE_WINDOWS_H )
 
-typedef ::HMODULE HMODULE_;
+// ::NTSTATUS is defined in ntdef.h or winternl.h in different Windows SDKs, and is not included by windows.h by default, so always use LONG_
+typedef LONG_ NTSTATUS_;
+typedef NTSTATUS_ *PNTSTATUS_;
 
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
-#endif
+typedef ::HMODULE HMODULE_;
 
 typedef union BOOST_MAY_ALIAS _LARGE_INTEGER {
+    BOOST_WINAPI_DETAIL_EXTENSION struct {
+        DWORD_ LowPart;
+        LONG_ HighPart;
+    };
     struct {
         DWORD_ LowPart;
         LONG_ HighPart;
@@ -239,10 +260,6 @@ typedef union BOOST_MAY_ALIAS _LARGE_INTEGER {
     LONGLONG_ QuadPart;
 } LARGE_INTEGER_, *PLARGE_INTEGER_;
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 typedef struct BOOST_MAY_ALIAS _SECURITY_ATTRIBUTES {
     DWORD_  nLength;
     LPVOID_ lpSecurityDescriptor;
@@ -252,4 +269,6 @@ typedef struct BOOST_MAY_ALIAS _SECURITY_ATTRIBUTES {
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_BASIC_TYPES_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/character_code_conversion.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/character_code_conversion.hpp
index c13f873f95..2bd3c1d060 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/character_code_conversion.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/character_code_conversion.hpp
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_CHARACTER_CODE_CONVERSION_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,7 +18,7 @@
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 
-BOOST_SYMBOL_IMPORT int WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM int BOOST_WINAPI_WINAPI_CC
 MultiByteToWideChar(
     boost::winapi::UINT_ CodePage,
     boost::winapi::DWORD_ dwFlags,
@@ -26,7 +27,7 @@ MultiByteToWideChar(
     boost::winapi::LPWSTR_ lpWideCharStr,
     int cchWideChar);
 
-BOOST_SYMBOL_IMPORT int WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM int BOOST_WINAPI_WINAPI_CC
 WideCharToMultiByte(
     boost::winapi::UINT_ CodePage,
     boost::winapi::DWORD_ dwFlags,
@@ -45,55 +46,55 @@ namespace winapi {
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const UINT_ CP_ACP_ = CP_ACP;
-const UINT_ CP_OEMCP_ = CP_OEMCP;
-const UINT_ CP_MACCP_ = CP_MACCP;
-const UINT_ CP_THREAD_ACP_ = CP_THREAD_ACP;
-const UINT_ CP_SYMBOL_ = CP_SYMBOL;
-const UINT_ CP_UTF7_ = CP_UTF7;
-const UINT_ CP_UTF8_ = CP_UTF8;
-
-const DWORD_ MB_PRECOMPOSED_ = MB_PRECOMPOSED;
-const DWORD_ MB_COMPOSITE_ = MB_COMPOSITE;
-const DWORD_ MB_USEGLYPHCHARS_ = MB_USEGLYPHCHARS;
-const DWORD_ MB_ERR_INVALID_CHARS_ = MB_ERR_INVALID_CHARS;
-
-const DWORD_ WC_COMPOSITECHECK_ = WC_COMPOSITECHECK;
-const DWORD_ WC_DISCARDNS_ = WC_DISCARDNS;
-const DWORD_ WC_SEPCHARS_ = WC_SEPCHARS;
-const DWORD_ WC_DEFAULTCHAR_ = WC_DEFAULTCHAR;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_ACP_ = CP_ACP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_OEMCP_ = CP_OEMCP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_MACCP_ = CP_MACCP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_THREAD_ACP_ = CP_THREAD_ACP;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_SYMBOL_ = CP_SYMBOL;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF7_ = CP_UTF7;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF8_ = CP_UTF8;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_PRECOMPOSED_ = MB_PRECOMPOSED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_COMPOSITE_ = MB_COMPOSITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_USEGLYPHCHARS_ = MB_USEGLYPHCHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_ERR_INVALID_CHARS_ = MB_ERR_INVALID_CHARS;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_COMPOSITECHECK_ = WC_COMPOSITECHECK;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DISCARDNS_ = WC_DISCARDNS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_SEPCHARS_ = WC_SEPCHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DEFAULTCHAR_ = WC_DEFAULTCHAR;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
-const DWORD_ WC_NO_BEST_FIT_CHARS_ = WC_NO_BEST_FIT_CHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_NO_BEST_FIT_CHARS_ = WC_NO_BEST_FIT_CHARS;
 #endif
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const UINT_ CP_ACP_ = 0u;
-const UINT_ CP_OEMCP_ = 1u;
-const UINT_ CP_MACCP_ = 2u;
-const UINT_ CP_THREAD_ACP_ = 3u;
-const UINT_ CP_SYMBOL_ = 42u;
-const UINT_ CP_UTF7_ = 65000u;
-const UINT_ CP_UTF8_ = 65001u;
-
-const DWORD_ MB_PRECOMPOSED_ = 0x00000001;
-const DWORD_ MB_COMPOSITE_ = 0x00000002;
-const DWORD_ MB_USEGLYPHCHARS_ = 0x00000004;
-const DWORD_ MB_ERR_INVALID_CHARS_ = 0x00000008;
-
-const DWORD_ WC_COMPOSITECHECK_ = 0x00000200;
-const DWORD_ WC_DISCARDNS_ = 0x00000010;
-const DWORD_ WC_SEPCHARS_ = 0x00000020;
-const DWORD_ WC_DEFAULTCHAR_ = 0x00000040;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_ACP_ = 0u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_OEMCP_ = 1u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_MACCP_ = 2u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_THREAD_ACP_ = 3u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_SYMBOL_ = 42u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF7_ = 65000u;
+BOOST_CONSTEXPR_OR_CONST UINT_ CP_UTF8_ = 65001u;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_PRECOMPOSED_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_COMPOSITE_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_USEGLYPHCHARS_ = 0x00000004;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MB_ERR_INVALID_CHARS_ = 0x00000008;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_COMPOSITECHECK_ = 0x00000200;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DISCARDNS_ = 0x00000010;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_SEPCHARS_ = 0x00000020;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_DEFAULTCHAR_ = 0x00000040;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
-const DWORD_ WC_NO_BEST_FIT_CHARS_ = 0x00000400;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_NO_BEST_FIT_CHARS_ = 0x00000400;
 #endif
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 // This constant is not present in MinGW
-const DWORD_ WC_ERR_INVALID_CHARS_ = 0x00000080;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WC_ERR_INVALID_CHARS_ = 0x00000080;
 #endif
 
 using ::MultiByteToWideChar;
@@ -102,4 +103,6 @@ using ::WideCharToMultiByte;
 } // namespace winapi
 } // namespace boost
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_CHARACTER_CODE_CONVERSION_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/condition_variable.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/condition_variable.hpp
index 38b7052e21..883cd217a3 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/condition_variable.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/condition_variable.hpp
@@ -18,6 +18,7 @@
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
@@ -25,22 +26,22 @@ struct _RTL_CONDITION_VARIABLE;
 struct _RTL_CRITICAL_SECTION;
 struct _RTL_SRWLOCK;
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 InitializeConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 WakeConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 WakeAllConditionVariable(::_RTL_CONDITION_VARIABLE* ConditionVariable);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SleepConditionVariableCS(
     ::_RTL_CONDITION_VARIABLE* ConditionVariable,
     ::_RTL_CRITICAL_SECTION* CriticalSection,
     boost::winapi::DWORD_ dwMilliseconds);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SleepConditionVariableSRW(
     ::_RTL_CONDITION_VARIABLE* ConditionVariable,
     ::_RTL_SRWLOCK* SRWLock,
@@ -105,16 +106,18 @@ BOOST_FORCEINLINE BOOL_ SleepConditionVariableSRW(
 }
 
 #if defined( BOOST_USE_WINDOWS_H )
-const ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = CONDITION_VARIABLE_LOCKMODE_SHARED;
+BOOST_CONSTEXPR_OR_CONST ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = CONDITION_VARIABLE_LOCKMODE_SHARED;
 #else // defined( BOOST_USE_WINDOWS_H )
-const ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST ULONG_ CONDITION_VARIABLE_LOCKMODE_SHARED_ = 0x00000001;
 #endif // defined( BOOST_USE_WINDOWS_H )
 
-const ULONG_ condition_variable_lockmode_shared = CONDITION_VARIABLE_LOCKMODE_SHARED_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ condition_variable_lockmode_shared = CONDITION_VARIABLE_LOCKMODE_SHARED_;
 
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 
 #endif // BOOST_WINAPI_CONDITION_VARIABLE_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
index 2431af57b6..5f61045cc1 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
@@ -11,11 +11,23 @@
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/platform.h>
+#if defined(__CYGWIN__)
+// Cygwin 64 compiler does not define _WIN64 and instead defines it in a private header. We can't define _WIN64 ourselves because
+// the header defines the macro unconditionally and if the user includes both Boost.WinAPI and Cygwin WinAPI headers there will be conflict.
+#error #include <_cygwin.h>
+#endif
+#if defined(__MINGW32__)
+// MinGW and MinGW-w64 define __MINGW32_VERSION_MAJOR/MINOR and __MINGW64_VERSION_MAJOR/MINOR macros in a private header.
+#include <_mingw.h>
+#endif
 
 // BOOST_WINAPI_IS_MINGW indicates that the target Windows SDK is provided by MinGW (http://mingw.org/).
 // BOOST_WINAPI_IS_MINGW_W64 indicates that the target Windows SDK is provided by MinGW-w64 (http://mingw-w64.org).
-#if BOOST_PLAT_MINGW
-#if defined __MINGW64_VERSION_MAJOR
+// BOOST_WINAPI_IS_CYGWIN indicates that the target Windows SDK is provided by MinGW variant from Cygwin (https://cygwin.com/).
+#if defined(__CYGWIN__)
+#define BOOST_WINAPI_IS_CYGWIN
+#elif BOOST_PLAT_MINGW
+#if defined(__MINGW64_VERSION_MAJOR)
 #define BOOST_WINAPI_IS_MINGW_W64
 #else
 #define BOOST_WINAPI_IS_MINGW
@@ -85,6 +97,7 @@
 #define BOOST_WINAPI_NTDDI_WIN10_TH2 0x0A000001
 #define BOOST_WINAPI_NTDDI_WIN10_RS1 0x0A000002
 #define BOOST_WINAPI_NTDDI_WIN10_RS2 0x0A000003
+#define BOOST_WINAPI_NTDDI_WIN10_RS3 0x0A000004
 
 #define BOOST_WINAPI_DETAIL_MAKE_NTDDI_VERSION2(x) x##0000
 #define BOOST_WINAPI_DETAIL_MAKE_NTDDI_VERSION(x) BOOST_WINAPI_DETAIL_MAKE_NTDDI_VERSION2(x)
@@ -95,11 +108,13 @@
 #elif defined(WINVER)
 #define BOOST_USE_WINAPI_VERSION WINVER
 #else
-// By default use Windows Vista API on compilers that support it and XP on the others
+// By default use Windows 7 API on compilers that support it and Vista or XP on the others
 #if (defined(_MSC_VER) && _MSC_VER < 1500) || defined(BOOST_WINAPI_IS_MINGW)
 #define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WINXP
-#else
+#elif (defined(_MSC_VER) && _MSC_VER < 1600)
 #define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN6
+#else
+#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN7
 #endif
 #endif
 #endif
@@ -119,7 +134,7 @@
 #elif BOOST_USE_WINAPI_VERSION == BOOST_WINAPI_VERSION_WIN7
 #define BOOST_USE_NTDDI_VERSION BOOST_WINAPI_NTDDI_WIN7SP1
 #elif BOOST_USE_WINAPI_VERSION == BOOST_WINAPI_VERSION_WIN10
-#define BOOST_USE_NTDDI_VERSION BOOST_WINAPI_NTDDI_WIN10_RS2
+#define BOOST_USE_NTDDI_VERSION BOOST_WINAPI_NTDDI_WIN10_RS3
 #else
 #define BOOST_USE_NTDDI_VERSION BOOST_WINAPI_DETAIL_MAKE_NTDDI_VERSION(BOOST_USE_WINAPI_VERSION)
 #endif
@@ -134,7 +149,8 @@
 #define BOOST_WINAPI_WINDOWS_SDK_8_0 BOOST_VERSION_NUMBER(0, 0, 9200) // Windows SDK 8.0
 #define BOOST_WINAPI_WINDOWS_SDK_8_1 BOOST_VERSION_NUMBER(0, 0, 9600) // Windows SDK 8.1
 #define BOOST_WINAPI_WINDOWS_SDK_10_0 BOOST_VERSION_NUMBER(0, 0, 10011) // Windows SDK 10.0
-// MinGW does not have the ntverp.h header but it defines VER_PRODUCTBUILD in ddk/ntifs.h
+// MinGW does not have the ntverp.h header but it defines VER_PRODUCTBUILD in ddk/ntifs.h.
+// Cygwin MinGW also defines this version.
 #define BOOST_WINAPI_WINDOWS_SDK_MINGW BOOST_VERSION_NUMBER(0, 0, 10000)
 // MinGW-w64 defines the same version as the Windows SDK bundled with MSVC 8
 #define BOOST_WINAPI_WINDOWS_SDK_MINGW_W64 BOOST_VERSION_NUMBER(0, 0, 3790)
@@ -153,7 +169,7 @@
 //
 // UWP Support
 //
-// On platforms without windows family partition support it is assumed one 
+// On platforms without windows family partition support it is assumed one
 // has all APIs and access is controlled by _WIN32_WINNT or similar mechanisms.
 //
 // Leveraging Boost.Predef here
@@ -175,9 +191,9 @@
 #endif // BOOST_PLAT_WINDOWS_UWP
 
 //
-// Windows 8.x SDK defines some items in the DESKTOP partition and then Windows SDK 10.0 defines 
-// the same items to be in APP or SYSTEM partitions, and APP expands to DESKTOP or PC or PHONE.  
-// The definition of BOOST_WINAPI_PARTITION_APP_SYSTEM provides a universal way to get this 
+// Windows 8.x SDK defines some items in the DESKTOP partition and then Windows SDK 10.0 defines
+// the same items to be in APP or SYSTEM partitions, and APP expands to DESKTOP or PC or PHONE.
+// The definition of BOOST_WINAPI_PARTITION_APP_SYSTEM provides a universal way to get this
 // right as it is seen in a number of places in the SDK.
 //
 #define BOOST_WINAPI_PARTITION_APP_SYSTEM \
@@ -209,6 +225,17 @@
 #endif
 #endif
 
+#if defined (WIN32_PLATFORM_PSPC)
+#define BOOST_WINAPI_IMPORT BOOST_SYMBOL_IMPORT
+#define BOOST_WINAPI_IMPORT_EXCEPT_WM
+#elif defined (_WIN32_WCE)
+#define BOOST_WINAPI_IMPORT
+#define BOOST_WINAPI_IMPORT_EXCEPT_WM
+#else
+#define BOOST_WINAPI_IMPORT BOOST_SYMBOL_IMPORT
+#define BOOST_WINAPI_IMPORT_EXCEPT_WM BOOST_SYMBOL_IMPORT
+#endif
+
 #include <boost/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/detail/footer.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/detail/footer.hpp
new file mode 100644
index 0000000000..f5865685c9
--- /dev/null
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/detail/footer.hpp
@@ -0,0 +1,21 @@
+/*
+ *             Copyright Andrey Semashev 2020.
+ * Distributed under the Boost Software License, Version 1.0.
+ *    (See accompanying file LICENSE_1_0.txt or copy at
+ *          http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#if !defined(BOOST_WINAPI_ENABLE_WARNINGS)
+
+#if defined(_MSC_VER) && !(defined(__INTEL_COMPILER) || defined(__clang__))
+
+#pragma warning(pop)
+
+#elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) \
+    && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
+
+#pragma GCC diagnostic pop
+
+#endif
+
+#endif // !defined(BOOST_WINAPI_ENABLE_WARNINGS)
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/detail/header.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/detail/header.hpp
new file mode 100644
index 0000000000..c03c42a269
--- /dev/null
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/detail/header.hpp
@@ -0,0 +1,27 @@
+/*
+ *             Copyright Andrey Semashev 2020.
+ * Distributed under the Boost Software License, Version 1.0.
+ *    (See accompanying file LICENSE_1_0.txt or copy at
+ *          http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#if !defined(BOOST_WINAPI_ENABLE_WARNINGS)
+
+#if defined(_MSC_VER) && !(defined(__INTEL_COMPILER) || defined(__clang__))
+
+#pragma warning(push, 3)
+// nonstandard extension used : nameless struct/union
+#pragma warning(disable: 4201)
+// Inconsistent annotation for 'X'
+#pragma warning(disable: 28251)
+
+#elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) \
+    && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
+
+#pragma GCC diagnostic push
+// ISO C++ 1998 does not support 'long long'
+#pragma GCC diagnostic ignored "-Wlong-long"
+
+#endif
+
+#endif // !defined(BOOST_WINAPI_ENABLE_WARNINGS)
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/dll.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/dll.hpp
index 8b1ecd239c..a4bb8d0f75 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/dll.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/dll.hpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010 Vicente J. Botet Escriba
  * Copyright 2014 Renato Tegon Forti, Antony Polukhin
- * Copyright 2015 Andrey Semashev
+ * Copyright 2015, 2020 Andrey Semashev
  * Copyright 2015 Antony Polukhin
  *
  * Distributed under the Boost Software License, Version 1.0.
@@ -12,6 +12,8 @@
 #define BOOST_WINAPI_DLL_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/get_proc_address.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -21,33 +23,22 @@
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-namespace boost { namespace winapi {
-#ifdef _WIN64
-typedef INT_PTR_ (WINAPI *FARPROC_)();
-typedef INT_PTR_ (WINAPI *NEARPROC_)();
-typedef INT_PTR_ (WINAPI *PROC_)();
-#else
-typedef int (WINAPI *FARPROC_)();
-typedef int (WINAPI *NEARPROC_)();
-typedef int (WINAPI *PROC_)();
-#endif // _WIN64
-}} // namespace boost::winapi
 
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 LoadLibraryA(boost::winapi::LPCSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 LoadLibraryExA(
     boost::winapi::LPCSTR_ lpFileName,
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwFlags
 );
 
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 GetModuleHandleA(boost::winapi::LPCSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetModuleFileNameA(
     boost::winapi::HMODULE_ hModule,
     boost::winapi::LPSTR_ lpFilename,
@@ -55,49 +46,37 @@ GetModuleFileNameA(
 );
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 LoadLibraryW(boost::winapi::LPCWSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 LoadLibraryExW(
     boost::winapi::LPCWSTR_ lpFileName,
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwFlags
 );
 
-BOOST_SYMBOL_IMPORT boost::winapi::HMODULE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HMODULE_ BOOST_WINAPI_WINAPI_CC
 GetModuleHandleW(boost::winapi::LPCWSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetModuleFileNameW(
     boost::winapi::HMODULE_ hModule,
     boost::winapi::LPWSTR_ lpFilename,
     boost::winapi::DWORD_ nSize
 );
 
-#if !defined( UNDER_CE )
-BOOST_SYMBOL_IMPORT boost::winapi::FARPROC_ WINAPI
-GetProcAddress(boost::winapi::HMODULE_ hModule, boost::winapi::LPCSTR_ lpProcName);
-#else
-// On Windows CE there are two functions: GetProcAddressA (since Windows CE 3.0) and GetProcAddressW.
-// GetProcAddress is a macro that is _always_ defined to GetProcAddressW.
-BOOST_SYMBOL_IMPORT boost::winapi::FARPROC_ WINAPI
-GetProcAddressA(boost::winapi::HMODULE_ hModule, boost::winapi::LPCSTR_ lpProcName);
-BOOST_SYMBOL_IMPORT boost::winapi::FARPROC_ WINAPI
-GetProcAddressW(boost::winapi::HMODULE_ hModule, boost::winapi::LPCWSTR_ lpProcName);
-#endif
-
 struct _MEMORY_BASIC_INFORMATION;
 
 #if !defined( BOOST_WINAPI_IS_MINGW )
-BOOST_SYMBOL_IMPORT boost::winapi::SIZE_T_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::SIZE_T_ BOOST_WINAPI_WINAPI_CC
 VirtualQuery(
     boost::winapi::LPCVOID_ lpAddress,
     ::_MEMORY_BASIC_INFORMATION* lpBuffer,
-    boost::winapi::ULONG_PTR_ dwLength
+    boost::winapi::SIZE_T_ dwLength
 );
 #else // !defined( BOOST_WINAPI_IS_MINGW )
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 VirtualQuery(
     boost::winapi::LPCVOID_ lpAddress,
     ::_MEMORY_BASIC_INFORMATION* lpBuffer,
@@ -121,19 +100,15 @@ typedef struct BOOST_MAY_ALIAS MEMORY_BASIC_INFORMATION_ {
 } *PMEMORY_BASIC_INFORMATION_;
 
 #if defined( BOOST_USE_WINDOWS_H )
-typedef ::FARPROC FARPROC_;
-typedef ::NEARPROC NEARPROC_;
-typedef ::PROC PROC_;
-
-const DWORD_ DONT_RESOLVE_DLL_REFERENCES_           = DONT_RESOLVE_DLL_REFERENCES;
-const DWORD_ LOAD_WITH_ALTERED_SEARCH_PATH_         = LOAD_WITH_ALTERED_SEARCH_PATH;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DONT_RESOLVE_DLL_REFERENCES_           = DONT_RESOLVE_DLL_REFERENCES;
+BOOST_CONSTEXPR_OR_CONST DWORD_ LOAD_WITH_ALTERED_SEARCH_PATH_         = LOAD_WITH_ALTERED_SEARCH_PATH;
 #else // defined( BOOST_USE_WINDOWS_H )
-const DWORD_ DONT_RESOLVE_DLL_REFERENCES_           = 0x00000001;
-const DWORD_ LOAD_WITH_ALTERED_SEARCH_PATH_         = 0x00000008;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DONT_RESOLVE_DLL_REFERENCES_           = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ LOAD_WITH_ALTERED_SEARCH_PATH_         = 0x00000008;
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 // This one is not defined by MinGW
-const DWORD_ LOAD_IGNORE_CODE_AUTHZ_LEVEL_          = 0x00000010;
+BOOST_CONSTEXPR_OR_CONST DWORD_ LOAD_IGNORE_CODE_AUTHZ_LEVEL_          = 0x00000010;
 
 #if !defined( BOOST_NO_ANSI_APIS )
 using ::LoadLibraryA;
@@ -146,24 +121,7 @@ using ::LoadLibraryExW;
 using ::GetModuleHandleW;
 using ::GetModuleFileNameW;
 
-#if !defined( UNDER_CE )
-// For backward compatibility, don't use directly. Use get_proc_address instead.
-using ::GetProcAddress;
-#else
-using ::GetProcAddressA;
-using ::GetProcAddressW;
-#endif
-
-BOOST_FORCEINLINE FARPROC_ get_proc_address(HMODULE_ hModule, LPCSTR_ lpProcName)
-{
-#if !defined( UNDER_CE )
-    return ::GetProcAddress(hModule, lpProcName);
-#else
-    return ::GetProcAddressA(hModule, lpProcName);
-#endif
-}
-
-BOOST_FORCEINLINE SIZE_T_ VirtualQuery(LPCVOID_ lpAddress, MEMORY_BASIC_INFORMATION_* lpBuffer, ULONG_PTR_ dwLength)
+BOOST_FORCEINLINE SIZE_T_ VirtualQuery(LPCVOID_ lpAddress, MEMORY_BASIC_INFORMATION_* lpBuffer, SIZE_T_ dwLength)
 {
     return ::VirtualQuery(lpAddress, reinterpret_cast< ::_MEMORY_BASIC_INFORMATION* >(lpBuffer), dwLength);
 }
@@ -223,7 +181,7 @@ BOOST_FORCEINLINE DWORD_ get_module_file_name(HMODULE_ hModule, LPWSTR_ lpFilena
 
 #if !defined(BOOST_USE_WINDOWS_H)
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FreeLibrary(boost::winapi::HMODULE_ hModule);
 }
 #endif
@@ -235,4 +193,7 @@ using ::FreeLibrary;
 }
 
 #endif // BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM
+
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_DLL_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/error_codes.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/error_codes.hpp
index 89a720b8ec..7c6d71ec91 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/error_codes.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/error_codes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Andrey Semashev
+ * Copyright 2016-2018 Andrey Semashev
  *
  * Distributed under the Boost Software License, Version 1.0.
  * See http://www.boost.org/LICENSE_1_0.txt
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_ERROR_CODES_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,133 +18,146 @@
 namespace boost {
 namespace winapi {
 
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_XPS_ = 82;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_XAML_ = 43;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USN_ = 129;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLBUI_ = 128;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SPP_ = 256;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WSB_ONLINE_ = 133;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DLS_ = 153;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLB_CLI_ = 121;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLB_ = 120;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WSBAPP_ = 122;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WPN_ = 62;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WMAAECMA_ = 1996;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINRM_ = 51;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINPE_ = 61;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWSUPDATE_ = 36;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_STORE_ = 63;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_SETUP_ = 48;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_DEFENDER_ = 80;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_CE_ = 24;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NULL_ = 0;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RPC_ = 1;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DISPATCH_ = 2;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_STORAGE_ = 3;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ITF_ = 4;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WIN32_ = 7;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_ = 8;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINCODEC_DWRITE_DWM_ = 2200;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WIA_ = 33;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WER_ = 27;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEP_ = 2049;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEB_SOCKET_ = 886;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEB_ = 885;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VOLSNAP_ = 130;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VOLMGR_ = 56;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_VISUALCPP_ = 109;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VIRTUALIZATION_ = 55;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VHD_ = 58;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SSPI_ = 9;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SECURITY_ = 9;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CONTROL_ = 10;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CERT_ = 11;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_INTERNET_ = 12;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MEDIASERVER_ = 13;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MSMQ_ = 14;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SETUPAPI_ = 15;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SCARD_ = 16;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_COMPLUS_ = 17;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AAF_ = 18;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_URT_ = 19;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACS_ = 20;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DPLAY_ = 21;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_UMI_ = 22;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_UI_ = 42;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TPM_SOFTWARE_ = 41;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TPM_SERVICES_ = 40;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TIERING_ = 131;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SYNCENGINE_ = 2050;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SXS_ = 23;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_STORAGE_ = 3;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_CE_ = 24;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_HTTP_ = 25;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_COMMONLOG_ = 26;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WER_ = 27;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_FILTER_MANAGER_ = 31;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BACKGROUNDCOPY_ = 32;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CONFIGURATION_ = 33;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WIA_ = 33;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_STATE_MANAGEMENT_ = 34;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SSPI_ = 9;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_SPACES_ = 231;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SOS_ = 160;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SCARD_ = 16;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_METADIRECTORY_ = 35;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWSUPDATE_ = 36;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECTORYSERVICE_ = 37;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_GRAPHICS_ = 38;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SHELL_ = 39;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SETUPAPI_ = 15;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SECURITY_ = 9;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NAP_ = 39;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TPM_SERVICES_ = 40;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TPM_SOFTWARE_ = 41;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_UI_ = 42;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_XAML_ = 43;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACTION_QUEUE_ = 44;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PLA_ = 48;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_SETUP_ = 48;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_FVE_ = 49;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_FWP_ = 50;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINRM_ = 51;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NDIS_ = 52;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_HYPERVISOR_ = 53;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CMI_ = 54;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VIRTUALIZATION_ = 55;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VOLMGR_ = 56;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BCD_ = 57;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VHD_ = 58;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_HNS_ = 59;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SDIAG_ = 60;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_SDBUS_ = 2305;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RPC_ = 1;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RESTORE_ = 256;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SCRIPT_ = 112;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PARSE_ = 113;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RAS_ = 83;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEBSERVICES_ = 61;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINPE_ = 61;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WPN_ = 62;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_STORE_ = 63;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_INPUT_ = 64;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_EAP_ = 66;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINDOWS_DEFENDER_ = 80;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_OPC_ = 81;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_XPS_ = 82;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MBN_ = 84;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_POWERSHELL_ = 84;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PLA_ = 48;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PIDGENX_ = 2561;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RAS_ = 83;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_P2P_INT_ = 98;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_P2P_ = 99;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_OPC_ = 81;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DAF_ = 100;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLUETOOTH_ATT_ = 101;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AUDIO_ = 102;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_STATEREPOSITORY_ = 103;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_VISUALCPP_ = 109;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SCRIPT_ = 112;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PARSE_ = 113;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLB_ = 120;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLB_CLI_ = 121;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WSBAPP_ = 122;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLBUI_ = 128;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USN_ = 129;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_VOLSNAP_ = 130;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_TIERING_ = 131;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WSB_ONLINE_ = 133;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ONLINE_ID_ = 134;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WIN32_ = 7;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CONTROL_ = 10;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEBSERVICES_ = 61;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NULL_ = 0;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NDIS_ = 52;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_NAP_ = 39;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MOBILE_ = 1793;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_METADIRECTORY_ = 35;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MSMQ_ = 14;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MEDIASERVER_ = 13;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MBN_ = 84;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_LINGUISTIC_SERVICES_ = 305;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_LEAP_ = 2184;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_JSCRIPT_ = 2306;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_INTERNET_ = 12;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ITF_ = 4;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_INPUT_ = 64;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_HYPERVISOR_ = 53;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACCELERATOR_ = 1536;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_HTTP_ = 25;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_GRAPHICS_ = 38;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_FWP_ = 50;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_FVE_ = 49;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_FILTER_MANAGER_ = 31;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_EAS_ = 85;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_EAP_ = 66;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DXGI_DDI_ = 2171;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DXGI_ = 2170;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DPLAY_ = 21;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEVICE_UPDATE_AGENT_ = 135;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DLS_ = 153;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DELIVERY_OPTIMIZATION_ = 208;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_SPACES_ = 231;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USER_MODE_SECURITY_CORE_ = 232;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_LICENSING_ = 234;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SOS_ = 160;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEBUGGERS_ = 176;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SPP_ = 256;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_RESTORE_ = 256;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DMSERVER_ = 256;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DISPATCH_ = 2;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECTORYSERVICE_ = 37;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECTMUSIC_ = 2168;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D11_ = 2172;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D10_ = 2169;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT2D_ = 2201;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DAF_ = 100;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_SERVER_ = 257;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_IMAGING_ = 258;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_MANAGEMENT_ = 259;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_UTIL_ = 260;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_TRANSPORT_MANAGEMENT_ = 272;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_TFTP_ = 264;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_BINLSVC_ = 261;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_PXE_ = 263;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_TFTP_ = 264;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_TRANSPORT_MANAGEMENT_ = 272;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_DRIVER_PROVISIONING_ = 278;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_MULTICAST_SERVER_ = 289;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_MULTICAST_CLIENT_ = 290;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_MANAGEMENT_ = 259;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_IMAGING_ = 258;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_DRIVER_PROVISIONING_ = 278;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_SERVER_ = 257;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_CONTENT_PROVIDER_ = 293;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEPLOYMENT_SERVICES_BINLSVC_ = 261;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEFRAG_ = 2304;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEBUGGERS_ = 176;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CONFIGURATION_ = 33;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_COMPLUS_ = 17;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_COMMONLOG_ = 26;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CMI_ = 54;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_CERT_ = 11;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BLUETOOTH_ATT_ = 101;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BCD_ = 57;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_BACKGROUNDCOPY_ = 32;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_LINGUISTIC_SERVICES_ = 305;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AUDIOSTREAMING_ = 1094;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACCELERATOR_ = 1536;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WMAAECMA_ = 1996;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECTMUSIC_ = 2168;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D10_ = 2169;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DXGI_ = 2170;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DXGI_DDI_ = 2171;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D11_ = 2172;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D11_DEBUG_ = 2173;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D12_ = 2174;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT3D12_DEBUG_ = 2175;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_LEAP_ = 2184;
 BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AUDCLNT_ = 2185;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AUDIO_ = 102;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACTION_QUEUE_ = 44;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_ACS_ = 20;
-BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_AAF_ = 18;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WINCODEC_DWRITE_DWM_ = 2200;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DIRECT2D_ = 2201;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_DEFRAG_ = 2304;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_USERMODE_SDBUS_ = 2305;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_JSCRIPT_ = 2306;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PIDGENX_ = 2561;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_EAS_ = 85;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEB_ = 885;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEB_SOCKET_ = 886;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_MOBILE_ = 1793;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SQLITE_ = 1967;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_UTC_ = 1989;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_WEP_ = 2049;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_SYNCENGINE_ = 2050;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_XBOX_ = 2339;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FACILITY_PIX_ = 2748;
 
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SUCCESS_ = 0;
 BOOST_CONSTEXPR_OR_CONST DWORD_ NO_ERROR_ = 0;
@@ -330,6 +344,7 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PIPE_BUSY_ = 231;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NO_DATA_ = 232;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PIPE_NOT_CONNECTED_ = 233;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MORE_DATA_ = 234;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NO_WORK_DONE_ = 235;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_VC_DISCONNECTED_ = 240;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_EA_NAME_ = 254;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EA_LIST_INCONSISTENT_ = 255;
@@ -387,16 +402,84 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_KERNEL_INFO_VERSION_ = 340;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_PEP_INFO_VERSION_ = 341;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OBJECT_NOT_EXTERNALLY_BACKED_ = 342;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EXTERNAL_BACKING_PROVIDER_UNKNOWN_ = 343;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_COMPRESSION_NOT_BENEFICIAL_ = 344;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STORAGE_TOPOLOGY_ID_MISMATCH_ = 345;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_BLOCKED_BY_PARENTAL_CONTROLS_ = 346;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_BLOCK_TOO_MANY_REFERENCES_ = 347;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MARKED_TO_DISALLOW_WRITES_ = 348;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ENCLAVE_FAILURE_ = 349;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FAIL_NOACTION_REBOOT_ = 350;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FAIL_SHUTDOWN_ = 351;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FAIL_RESTART_ = 352;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MAX_SESSIONS_REACHED_ = 353;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NETWORK_ACCESS_DENIED_EDP_ = 354;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEVICE_HINT_NAME_BUFFER_TOO_SMALL_ = 355;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EDP_POLICY_DENIES_OPERATION_ = 356;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EDP_DPL_POLICY_CANT_BE_SATISFIED_ = 357;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_SYNC_ROOT_METADATA_CORRUPT_ = 358;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEVICE_IN_MAINTENANCE_ = 359;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NOT_SUPPORTED_ON_DAX_ = 360;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DAX_MAPPING_EXISTS_ = 361;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROVIDER_NOT_RUNNING_ = 362;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_METADATA_CORRUPT_ = 363;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_METADATA_TOO_LARGE_ = 364;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROPERTY_BLOB_TOO_LARGE_ = 365;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROPERTY_BLOB_CHECKSUM_MISMATCH_ = 366;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CHILD_PROCESS_BLOCKED_ = 367;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STORAGE_LOST_DATA_PERSISTENCE_ = 368;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_SYSTEM_VIRTUALIZATION_UNAVAILABLE_ = 369;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_SYSTEM_VIRTUALIZATION_METADATA_CORRUPT_ = 370;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_SYSTEM_VIRTUALIZATION_BUSY_ = 371;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_SYSTEM_VIRTUALIZATION_PROVIDER_UNKNOWN_ = 372;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_GDI_HANDLE_LEAK_ = 373;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_TOO_MANY_PROPERTY_BLOBS_ = 374;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROPERTY_VERSION_NOT_SUPPORTED_ = 375;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NOT_A_CLOUD_FILE_ = 376;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_NOT_IN_SYNC_ = 377;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_ALREADY_CONNECTED_ = 378;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_NOT_SUPPORTED_ = 379;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_INVALID_REQUEST_ = 380;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_READ_ONLY_VOLUME_ = 381;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_CONNECTED_PROVIDER_ONLY_ = 382;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_VALIDATION_FAILED_ = 383;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SMB1_NOT_AVAILABLE_ = 384;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_SYSTEM_VIRTUALIZATION_INVALID_OPERATION_ = 385;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_AUTHENTICATION_FAILED_ = 386;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_INSUFFICIENT_RESOURCES_ = 387;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_NETWORK_UNAVAILABLE_ = 388;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_UNSUCCESSFUL_ = 389;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_NOT_UNDER_SYNC_ROOT_ = 390;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_IN_USE_ = 391;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PINNED_ = 392;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_REQUEST_ABORTED_ = 393;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROPERTY_CORRUPT_ = 394;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_ACCESS_DENIED_ = 395;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_INCOMPATIBLE_HARDLINKS_ = 396;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_PROPERTY_LOCK_CONFLICT_ = 397;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLOUD_FILE_REQUEST_CANCELED_ = 398;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EXTERNAL_SYSKEY_NOT_SUPPORTED_ = 399;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_THREAD_MODE_ALREADY_BACKGROUND_ = 400;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_THREAD_MODE_NOT_BACKGROUND_ = 401;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PROCESS_MODE_ALREADY_BACKGROUND_ = 402;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PROCESS_MODE_NOT_BACKGROUND_ = 403;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_NOT_DEVUNLOCKED_ = 450;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_CHANGE_TYPE_ = 451;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_NOT_PROVISIONED_ = 452;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_NOT_AUTHORIZED_ = 453;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_NO_POLICY_ = 454;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_DB_CORRUPTED_ = 455;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_SCCD_INVALID_CATALOG_ = 456;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_SCCD_NO_AUTH_ENTITY_ = 457;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_SCCD_PARSE_ERROR_ = 458;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_SCCD_DEV_MODE_REQUIRED_ = 459;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CAPAUTHZ_SCCD_NO_CAPABILITY_MATCH_ = 460;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PNP_QUERY_REMOVE_DEVICE_TIMEOUT_ = 480;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PNP_QUERY_REMOVE_RELATED_DEVICE_TIMEOUT_ = 481;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PNP_QUERY_REMOVE_UNRELATED_DEVICE_TIMEOUT_ = 482;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEVICE_HARDWARE_ERROR_ = 483;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_ADDRESS_ = 487;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_VRF_CFG_ENABLED_ = 1183;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PARTITION_TERMINATING_ = 1184;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_USER_PROFILE_LOAD_ = 500;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ARITHMETIC_OVERFLOW_ = 534;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PIPE_CONNECTED_ = 535;
@@ -662,6 +745,12 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_ACE_CONDITION_ = 805;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_HANDLE_REVOKED_ = 806;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_IMAGE_AT_DIFFERENT_BASE_ = 807;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ENCRYPTED_IO_NOT_POSSIBLE_ = 808;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_METADATA_OPTIMIZATION_IN_PROGRESS_ = 809;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_QUOTA_ACTIVITY_ = 810;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_HANDLE_REVOKED_ = 811;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CALLBACK_INVOKE_INLINE_ = 812;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CPU_SET_INVALID_ = 813;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ENCLAVE_NOT_TERMINATED_ = 814;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EA_ACCESS_DENIED_ = 994;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OPERATION_ABORTED_ = 995;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_IO_INCOMPLETE_ = 996;
@@ -860,6 +949,7 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PKINIT_FAILURE_ = 1263;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SMARTCARD_SUBSYSTEM_FAILURE_ = 1264;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DOWNGRADE_DETECTED_ = 1265;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MACHINE_LOCKED_ = 1271;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SMB_GUEST_LOGON_BLOCKED_ = 1272;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CALLBACK_SUPPLIED_INVALID_DATA_ = 1273;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED_ = 1274;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DRIVER_BLOCKED_ = 1275;
@@ -1062,6 +1152,8 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EVENTLOG_FILE_CORRUPT_ = 1500;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EVENTLOG_CANT_START_ = 1501;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_LOG_FILE_FULL_ = 1502;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_EVENTLOG_FILE_CHANGED_ = 1503;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CONTAINER_ASSIGNED_ = 1504;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_JOB_NO_CONTAINER_ = 1505;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_TASK_NAME_ = 1550;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_TASK_INDEX_ = 1551;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_THREAD_ALREADY_IN_TASK_ = 1552;
@@ -1120,6 +1212,10 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_SERVICE_SAFEBOOT_ = 1652;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FAIL_FAST_EXCEPTION_ = 1653;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_REJECTED_ = 1654;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DYNAMIC_CODE_BLOCKED_ = 1655;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NOT_SAME_OBJECT_ = 1656;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STRICT_CFG_VIOLATION_ = 1657;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SET_CONTEXT_DENIED_ = 1660;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CROSS_PARTITION_VIOLATION_ = 1661;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_INVALID_STRING_BINDING_ = 1700;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_WRONG_KIND_OF_BINDING_ = 1701;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_INVALID_BINDING_ = 1702;
@@ -1251,6 +1347,9 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_X_INVALID_PIPE_OBJECT_ = 1830;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_X_WRONG_PIPE_ORDER_ = 1831;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_X_WRONG_PIPE_VERSION_ = 1832;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_COOKIE_AUTH_FAILED_ = 1833;
+BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_DO_NOT_DISTURB_ = 1834;
+BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_SYSTEM_HANDLE_COUNT_EXCEEDED_ = 1835;
+BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_SYSTEM_HANDLE_TYPE_MISMATCH_ = 1836;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_GROUP_MEMBER_NOT_FOUND_ = 1898;
 BOOST_CONSTEXPR_OR_CONST DWORD_ EPT_S_CANT_CREATE_ = 1899;
 BOOST_CONSTEXPR_OR_CONST DWORD_ RPC_S_INVALID_OBJECT_ = 1900;
@@ -1292,6 +1391,7 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_AUTHENTICATION_FIREWALL_FAILED_ = 1935;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED_ = 1936;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NTLM_BLOCKED_ = 1937;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PASSWORD_CHANGE_REQUIRED_ = 1938;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_LOST_MODE_LOGON_RESTRICTION_ = 1939;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_PIXEL_FORMAT_ = 2000;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_BAD_DRIVER_ = 2001;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_WINDOW_STYLE_ = 2002;
@@ -1438,6 +1538,7 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_REPARSE_ATTRIBUTE_CONFLICT_ = 4391;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INVALID_REPARSE_DATA_ = 4392;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_REPARSE_TAG_INVALID_ = 4393;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_REPARSE_TAG_MISMATCH_ = 4394;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_REPARSE_POINT_ENCOUNTERED_ = 4395;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_APP_DATA_NOT_FOUND_ = 4400;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_APP_DATA_EXPIRED_ = 4401;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_APP_DATA_CORRUPT_ = 4402;
@@ -1450,11 +1551,35 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_PUBLISHER_NOT_FOUND_ = 4
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_NOT_SIGNED_ = 4424;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_NOT_ENABLED_ = 4425;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_FILE_REPLACED_ = 4426;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_NOT_AUTHORIZED_ = 4427;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_UNKNOWN_ = 4428;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_MISSING_ANTIROLLBACKVERSION_ = 4429;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_PLATFORM_ID_MISMATCH_ = 4430;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_ROLLBACK_DETECTED_ = 4431;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_POLICY_UPGRADE_MISMATCH_ = 4432;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_REQUIRED_POLICY_FILE_MISSING_ = 4433;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_NOT_BASE_POLICY_ = 4434;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SECUREBOOT_NOT_SUPPLEMENTAL_POLICY_ = 4435;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OFFLOAD_READ_FLT_NOT_SUPPORTED_ = 4440;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OFFLOAD_WRITE_FLT_NOT_SUPPORTED_ = 4441;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OFFLOAD_READ_FILE_NOT_SUPPORTED_ = 4442;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OFFLOAD_WRITE_FILE_NOT_SUPPORTED_ = 4443;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ALREADY_HAS_STREAM_ID_ = 4444;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SMR_GARBAGE_COLLECTION_REQUIRED_ = 4445;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_VOLUME_NOT_SIS_ENABLED_ = 4500;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYSTEM_INTEGRITY_ROLLBACK_DETECTED_ = 4550;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYSTEM_INTEGRITY_POLICY_VIOLATION_ = 4551;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYSTEM_INTEGRITY_INVALID_POLICY_ = 4552;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYSTEM_INTEGRITY_POLICY_NOT_SIGNED_ = 4553;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_VSM_NOT_INITIALIZED_ = 4560;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_VSM_DMA_PROTECTION_NOT_IN_USE_ = 4561;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_NOT_AUTHORIZED_ = 4570;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_INVALID_ = 4571;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_FILE_NOT_AUTHORIZED_ = 4572;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_CATALOG_NOT_AUTHORIZED_ = 4573;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_BINARY_ID_NOT_FOUND_ = 4574;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_NOT_ACTIVE_ = 4575;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PLATFORM_MANIFEST_NOT_SIGNED_ = 4576;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEPENDENT_RESOURCE_EXISTS_ = 5001;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEPENDENCY_NOT_FOUND_ = 5002;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEPENDENCY_ALREADY_EXISTS_ = 5003;
@@ -1627,6 +1752,33 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_CONTAINS_UNSUPPORTED_DIFF
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_IS_IN_MAINTENANCE_MODE_ = 5970;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_AFFINITY_CONFLICT_ = 5971;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_IS_REPLICA_VIRTUAL_MACHINE_ = 5972;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_UPGRADE_INCOMPATIBLE_VERSIONS_ = 5973;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_UPGRADE_FIX_QUORUM_NOT_SUPPORTED_ = 5974;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_UPGRADE_RESTART_REQUIRED_ = 5975;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_UPGRADE_IN_PROGRESS_ = 5976;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_UPGRADE_INCOMPLETE_ = 5977;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_NODE_IN_GRACE_PERIOD_ = 5978;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_CSV_IO_PAUSE_TIMEOUT_ = 5979;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NODE_NOT_ACTIVE_CLUSTER_MEMBER_ = 5980;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_NOT_MONITORED_ = 5981;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_DOES_NOT_SUPPORT_UNMONITORED_ = 5982;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_RESOURCE_IS_REPLICATED_ = 5983;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_NODE_ISOLATED_ = 5984;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_NODE_QUARANTINED_ = 5985;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_DATABASE_UPDATE_CONDITION_FAILED_ = 5986;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_SPACE_DEGRADED_ = 5987;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_TOKEN_DELEGATION_NOT_SUPPORTED_ = 5988;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_CSV_INVALID_HANDLE_ = 5989;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_CSV_SUPPORTED_ONLY_ON_COORDINATOR_ = 5990;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_GROUPSET_NOT_AVAILABLE_ = 5991;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_GROUPSET_NOT_FOUND_ = 5992;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_GROUPSET_CANT_PROVIDE_ = 5993;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_FAULT_DOMAIN_PARENT_NOT_FOUND_ = 5994;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_FAULT_DOMAIN_INVALID_HIERARCHY_ = 5995;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_FAULT_DOMAIN_FAILED_S2D_VALIDATION_ = 5996;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_FAULT_DOMAIN_S2D_CONNECTIVITY_LOSS_ = 5997;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTER_INVALID_INFRASTRUCTURE_FILESERVER_NAME_ = 5998;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_CLUSTERSET_MANAGEMENT_CLUSTER_UNREACHABLE_ = 5999;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_ENCRYPTION_FAILED_ = 6000;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DECRYPTION_FAILED_ = 6001;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_FILE_ENCRYPTED_ = 6002;
@@ -2266,6 +2418,8 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DS_UNDELETE_SAM_VALIDATION_FAILED_ = 8645;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INCORRECT_ACCOUNT_TYPE_ = 8646;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DS_SPN_VALUE_NOT_UNIQUE_IN_FOREST_ = 8647;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DS_UPN_VALUE_NOT_UNIQUE_IN_FOREST_ = 8648;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DS_MISSING_FOREST_TRUST_ = 8649;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DS_VALUE_KEY_NOT_UNIQUE_ = 8650;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RESPONSE_CODES_BASE_ = 9000;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RCODE_NO_ERROR_ = NO_ERROR_;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_MASK_ = 0x00002328;
@@ -2348,6 +2502,7 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_NOT_ALLOWED_ON_RODC_ = 9569;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_NOT_ALLOWED_UNDER_DNAME_ = 9570;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DELEGATION_REQUIRED_ = 9571;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_INVALID_POLICY_TABLE_ = 9572;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ADDRESS_REQUIRED_ = 9573;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ZONE_BASE_ = 9600;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ZONE_DOES_NOT_EXIST_ = 9601;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_NO_ZONE_INFO_ = 9602;
@@ -2416,6 +2571,18 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DP_NOT_ENLISTED_ = 9903;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DP_ALREADY_ENLISTED_ = 9904;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DP_NOT_AVAILABLE_ = 9905;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DP_FSMO_ERROR_ = 9906;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_NOT_ENABLED_ = 9911;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_INVALID_WINDOW_SIZE_ = 9912;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_INVALID_IPV4_PREFIX_ = 9913;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_INVALID_IPV6_PREFIX_ = 9914;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_INVALID_TC_RATE_ = 9915;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_INVALID_LEAK_RATE_ = 9916;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_RRL_LEAK_RATE_LESSTHAN_TC_RATE_ = 9917;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_VIRTUALIZATION_INSTANCE_ALREADY_EXISTS_ = 9921;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_VIRTUALIZATION_INSTANCE_DOES_NOT_EXIST_ = 9922;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_VIRTUALIZATION_TREE_LOCKED_ = 9923;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_INVAILD_VIRTUALIZATION_INSTANCE_NAME_ = 9924;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DEFAULT_VIRTUALIZATION_INSTANCE_ = 9925;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ZONESCOPE_ALREADY_EXISTS_ = 9951;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ZONESCOPE_DOES_NOT_EXIST_ = 9952;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DEFAULT_ZONESCOPE_ = 9953;
@@ -2429,6 +2596,32 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_DEFAULT_SCOPE_ = 9960;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_INVALID_SCOPE_OPERATION_ = 9961;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_SCOPE_LOCKED_ = 9962;
 BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_SCOPE_ALREADY_EXISTS_ = 9963;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_ALREADY_EXISTS_ = 9971;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_DOES_NOT_EXIST_ = 9972;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_ = 9973;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_SETTINGS_ = 9974;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_CLIENT_SUBNET_IS_ACCESSED_ = 9975;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_CLIENT_SUBNET_DOES_NOT_EXIST_ = 9976;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_CLIENT_SUBNET_ALREADY_EXISTS_ = 9977;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_SUBNET_DOES_NOT_EXIST_ = 9978;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_SUBNET_ALREADY_EXISTS_ = 9979;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_LOCKED_ = 9980;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_WEIGHT_ = 9981;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_NAME_ = 9982;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_MISSING_CRITERIA_ = 9983;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_INVALID_CLIENT_SUBNET_NAME_ = 9984;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_PROCESSING_ORDER_INVALID_ = 9985;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_SCOPE_MISSING_ = 9986;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_SCOPE_NOT_ALLOWED_ = 9987;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_SERVERSCOPE_IS_REFERENCED_ = 9988;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_ZONESCOPE_IS_REFERENCED_ = 9989;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_CLIENT_SUBNET_ = 9990;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_TRANSPORT_PROTOCOL_ = 9991;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_NETWORK_PROTOCOL_ = 9992;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_INTERFACE_ = 9993;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_FQDN_ = 9994;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_QUERY_TYPE_ = 9995;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DNS_ERROR_POLICY_INVALID_CRITERIA_TIME_OF_DAY_ = 9996;
 BOOST_CONSTEXPR_OR_CONST DWORD_ WSABASEERR_ = 10000;
 BOOST_CONSTEXPR_OR_CONST DWORD_ WSAEINTR_ = 10004;
 BOOST_CONSTEXPR_OR_CONST DWORD_ WSAEBADF_ = 10009;
@@ -2866,6 +3059,17 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DIFFERENT_PROFILE_RESOURCE_MANAGER_EXIST_
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_OPERATION_NOT_ALLOWED_FROM_SYSTEM_COMPONENT_ = 15145;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MRM_DIRECT_REF_TO_NON_DEFAULT_RESOURCE_ = 15146;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MRM_GENERATION_COUNT_MISMATCH_ = 15147;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_VERSION_MISMATCH_ = 15148;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_MISSING_SCHEMA_ = 15149;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_LOAD_FILE_FAILED_ = 15150;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_ADD_FILE_FAILED_ = 15151;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_WRITE_FILE_FAILED_ = 15152;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_MULTIPLE_PACKAGE_FAMILIES_NOT_ALLOWED_ = 15153;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_MULTIPLE_MAIN_PACKAGES_NOT_ALLOWED_ = 15154;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_BUNDLE_PACKAGES_NOT_ALLOWED_ = 15155;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_MAIN_PACKAGE_REQUIRED_ = 15156;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_RESOURCE_PACKAGE_REQUIRED_ = 15157;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PRI_MERGE_INVALID_FILE_NAME_ = 15158;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MCA_INVALID_CAPABILITIES_STRING_ = 15200;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MCA_INVALID_VCP_VERSION_ = 15201;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION_ = 15202;
@@ -2919,12 +3123,31 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_SYSTEM_NEEDS_REMEDIATION_ = 15623;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN_ = 15624;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_RESILIENCY_FILE_CORRUPT_ = 15625;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING_ = 15626;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGE_MOVE_FAILED_ = 15627;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_VOLUME_NOT_EMPTY_ = 15628;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_VOLUME_OFFLINE_ = 15629;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_VOLUME_CORRUPT_ = 15630;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_NEEDS_REGISTRATION_ = 15631;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_WRONG_PROCESSOR_ARCHITECTURE_ = 15632;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEV_SIDELOAD_LIMIT_EXCEEDED_ = 15633;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_OPTIONAL_PACKAGE_REQUIRES_MAIN_PACKAGE_ = 15634;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGE_NOT_SUPPORTED_ON_FILESYSTEM_ = 15635;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGE_MOVE_BLOCKED_BY_STREAMING_ = 15636;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_OPTIONAL_PACKAGE_APPLICATIONID_NOT_UNIQUE_ = 15637;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGE_STAGING_ONHOLD_ = 15638;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_INVALID_RELATED_SET_UPDATE_ = 15639;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_INSTALL_OPTIONAL_PACKAGE_REQUIRES_MAIN_PACKAGE_FULLTRUST_CAPABILITY_ = 15640;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_DEPLOYMENT_BLOCKED_BY_USER_LOG_OFF_ = 15641;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PROVISION_OPTIONAL_PACKAGE_REQUIRES_MAIN_PACKAGE_PROVISIONED_ = 15642;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGES_REPUTATION_CHECK_FAILED_ = 15643;
+BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_PACKAGES_REPUTATION_CHECK_TIMEDOUT_ = 15644;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_NO_PACKAGE_ = 15700;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT_ = 15701;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT_ = 15702;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_NO_APPLICATION_ = 15703;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_DYNAMIC_PROPERTY_READ_FAILED_ = 15704;
 BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_DYNAMIC_PROPERTY_INVALID_ = 15705;
+BOOST_CONSTEXPR_OR_CONST DWORD_ APPMODEL_ERROR_PACKAGE_NOT_AVAILABLE_ = 15706;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STATE_LOAD_STORE_FAILED_ = 15800;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STATE_GET_VERSION_FAILED_ = 15801;
 BOOST_CONSTEXPR_OR_CONST DWORD_ ERROR_STATE_SET_VERSION_FAILED_ = 15802;
@@ -2953,4 +3176,6 @@ BOOST_CONSTEXPR_OR_CONST DWORD_ STORE_ERROR_LICENSE_REVOKED_ = 15864;
 } // namespace winapi
 } // namespace boost
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_ERROR_CODES_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/error_handling.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/error_handling.hpp
index f6618e3be6..ee157a6503 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/error_handling.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/error_handling.hpp
@@ -13,6 +13,7 @@
 #include <stdarg.h>
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/get_last_error.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -21,7 +22,7 @@
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 FormatMessageA(
     boost::winapi::DWORD_ dwFlags,
     boost::winapi::LPCVOID_ lpSource,
@@ -32,7 +33,7 @@ FormatMessageA(
     va_list *Arguments);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 FormatMessageW(
     boost::winapi::DWORD_ dwFlags,
     boost::winapi::LPCVOID_ lpSource,
@@ -43,7 +44,7 @@ FormatMessageW(
     va_list *Arguments);
 
 #if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::UINT_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::UINT_ BOOST_WINAPI_WINAPI_CC
 SetErrorMode(boost::winapi::UINT_ uMode);
 #endif
 } // extern "C"
@@ -55,60 +56,60 @@ namespace winapi {
 #if defined( BOOST_USE_WINDOWS_H )
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
-const DWORD_ FORMAT_MESSAGE_ALLOCATE_BUFFER_= FORMAT_MESSAGE_ALLOCATE_BUFFER;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_ALLOCATE_BUFFER_= FORMAT_MESSAGE_ALLOCATE_BUFFER;
 #endif
 
-const DWORD_ FORMAT_MESSAGE_IGNORE_INSERTS_=  FORMAT_MESSAGE_IGNORE_INSERTS;
-const DWORD_ FORMAT_MESSAGE_FROM_STRING_=     FORMAT_MESSAGE_FROM_STRING;
-const DWORD_ FORMAT_MESSAGE_FROM_HMODULE_=    FORMAT_MESSAGE_FROM_HMODULE;
-const DWORD_ FORMAT_MESSAGE_FROM_SYSTEM_=     FORMAT_MESSAGE_FROM_SYSTEM;
-const DWORD_ FORMAT_MESSAGE_ARGUMENT_ARRAY_=  FORMAT_MESSAGE_ARGUMENT_ARRAY;
-const DWORD_ FORMAT_MESSAGE_MAX_WIDTH_MASK_=  FORMAT_MESSAGE_MAX_WIDTH_MASK;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_IGNORE_INSERTS_=  FORMAT_MESSAGE_IGNORE_INSERTS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_STRING_=     FORMAT_MESSAGE_FROM_STRING;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_HMODULE_=    FORMAT_MESSAGE_FROM_HMODULE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_SYSTEM_=     FORMAT_MESSAGE_FROM_SYSTEM;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_ARGUMENT_ARRAY_=  FORMAT_MESSAGE_ARGUMENT_ARRAY;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_MAX_WIDTH_MASK_=  FORMAT_MESSAGE_MAX_WIDTH_MASK;
 
-const WORD_ LANG_NEUTRAL_=                  LANG_NEUTRAL;
-const WORD_ LANG_INVARIANT_=                LANG_INVARIANT;
+BOOST_CONSTEXPR_OR_CONST WORD_ LANG_NEUTRAL_=                  LANG_NEUTRAL;
+BOOST_CONSTEXPR_OR_CONST WORD_ LANG_INVARIANT_=                LANG_INVARIANT;
 
-const WORD_ SUBLANG_DEFAULT_=               SUBLANG_DEFAULT;    // user default
+BOOST_CONSTEXPR_OR_CONST WORD_ SUBLANG_DEFAULT_=               SUBLANG_DEFAULT;    // user default
 
 BOOST_FORCEINLINE BOOST_CONSTEXPR WORD_ MAKELANGID_(WORD_ p, WORD_ s) BOOST_NOEXCEPT
 {
-    return MAKELANGID(p,s);
+    return static_cast< WORD_ >(MAKELANGID(p, s));
 }
 
 #if BOOST_WINAPI_PARTITION_DESKTOP
-const DWORD_ SEM_FAILCRITICALERRORS_ =     SEM_FAILCRITICALERRORS;
-const DWORD_ SEM_NOGPFAULTERRORBOX_ =      SEM_NOGPFAULTERRORBOX;
-const DWORD_ SEM_NOALIGNMENTFAULTEXCEPT_ = SEM_NOALIGNMENTFAULTEXCEPT;
-const DWORD_ SEM_NOOPENFILEERRORBOX_ =     SEM_NOOPENFILEERRORBOX;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_FAILCRITICALERRORS_ =     SEM_FAILCRITICALERRORS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOGPFAULTERRORBOX_ =      SEM_NOGPFAULTERRORBOX;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOALIGNMENTFAULTEXCEPT_ = SEM_NOALIGNMENTFAULTEXCEPT;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOOPENFILEERRORBOX_ =     SEM_NOOPENFILEERRORBOX;
 #endif
 
 #else
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
-const DWORD_ FORMAT_MESSAGE_ALLOCATE_BUFFER_= 0x00000100;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_ALLOCATE_BUFFER_= 0x00000100;
 #endif
-const DWORD_ FORMAT_MESSAGE_IGNORE_INSERTS_=  0x00000200;
-const DWORD_ FORMAT_MESSAGE_FROM_STRING_=     0x00000400;
-const DWORD_ FORMAT_MESSAGE_FROM_HMODULE_=    0x00000800;
-const DWORD_ FORMAT_MESSAGE_FROM_SYSTEM_=     0x00001000;
-const DWORD_ FORMAT_MESSAGE_ARGUMENT_ARRAY_=  0x00002000;
-const DWORD_ FORMAT_MESSAGE_MAX_WIDTH_MASK_=  0x000000FF;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_IGNORE_INSERTS_=  0x00000200;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_STRING_=     0x00000400;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_HMODULE_=    0x00000800;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_FROM_SYSTEM_=     0x00001000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_ARGUMENT_ARRAY_=  0x00002000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FORMAT_MESSAGE_MAX_WIDTH_MASK_=  0x000000FF;
 
-const WORD_ LANG_NEUTRAL_=                  0x00;
-const WORD_ LANG_INVARIANT_=                0x7f;
+BOOST_CONSTEXPR_OR_CONST WORD_ LANG_NEUTRAL_=                  0x00;
+BOOST_CONSTEXPR_OR_CONST WORD_ LANG_INVARIANT_=                0x7f;
 
-const WORD_ SUBLANG_DEFAULT_=               0x01;    // user default
+BOOST_CONSTEXPR_OR_CONST WORD_ SUBLANG_DEFAULT_=               0x01;    // user default
 
 BOOST_FORCEINLINE BOOST_CONSTEXPR WORD_ MAKELANGID_(WORD_ p, WORD_ s) BOOST_NOEXCEPT
 {
-    return (WORD_)((((WORD_)(s)) << 10) | (WORD_)(p));
+    return static_cast< WORD_ >((static_cast< DWORD_ >(s) << 10u) | p);
 }
 
 #if BOOST_WINAPI_PARTITION_DESKTOP
-const DWORD_ SEM_FAILCRITICALERRORS_ =     0x0001;
-const DWORD_ SEM_NOGPFAULTERRORBOX_ =      0x0002;
-const DWORD_ SEM_NOALIGNMENTFAULTEXCEPT_ = 0x0004;
-const DWORD_ SEM_NOOPENFILEERRORBOX_ =     0x8000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_FAILCRITICALERRORS_ =     0x0001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOGPFAULTERRORBOX_ =      0x0002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOALIGNMENTFAULTEXCEPT_ = 0x0004;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEM_NOOPENFILEERRORBOX_ =     0x8000;
 #endif
 
 #endif
@@ -150,4 +151,6 @@ BOOST_FORCEINLINE DWORD_ format_message(
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_ERROR_HANDLING_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/event.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/event.hpp
index 039c3b889a..a66f713a0f 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/event.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/event.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_EVENT_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -18,7 +19,7 @@
 #if !defined( BOOST_USE_WINDOWS_H ) && BOOST_WINAPI_PARTITION_APP_SYSTEM
 extern "C" {
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateEventA(
     ::_SECURITY_ATTRIBUTES* lpEventAttributes,
     boost::winapi::BOOL_ bManualReset,
@@ -26,7 +27,7 @@ CreateEventA(
     boost::winapi::LPCSTR_ lpName);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateEventW(
     ::_SECURITY_ATTRIBUTES* lpEventAttributes,
     boost::winapi::BOOL_ bManualReset,
@@ -39,7 +40,7 @@ CreateEventW(
 extern "C" {
 #if !defined( BOOST_NO_ANSI_APIS )
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateEventExA(
     ::_SECURITY_ATTRIBUTES *lpEventAttributes,
     boost::winapi::LPCSTR_ lpName,
@@ -47,7 +48,7 @@ CreateEventExA(
     boost::winapi::DWORD_ dwDesiredAccess);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 OpenEventA(
     boost::winapi::DWORD_ dwDesiredAccess,
     boost::winapi::BOOL_ bInheritHandle,
@@ -55,7 +56,7 @@ OpenEventA(
 #endif // !defined( BOOST_NO_ANSI_APIS )
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateEventExW(
     ::_SECURITY_ATTRIBUTES *lpEventAttributes,
     boost::winapi::LPCWSTR_ lpName,
@@ -63,7 +64,7 @@ CreateEventExW(
     boost::winapi::DWORD_ dwDesiredAccess);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 OpenEventW(
     boost::winapi::DWORD_ dwDesiredAccess,
     boost::winapi::BOOL_ bInheritHandle,
@@ -71,10 +72,10 @@ OpenEventW(
 
 // Windows CE define SetEvent/ResetEvent as inline functions in kfuncs.h
 #if !defined( UNDER_CE )
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SetEvent(boost::winapi::HANDLE_ hEvent);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 ResetEvent(boost::winapi::HANDLE_ hEvent);
 #endif
 } // extern "C"
@@ -92,33 +93,33 @@ using ::ResetEvent;
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ EVENT_ALL_ACCESS_ = EVENT_ALL_ACCESS;
-const DWORD_ EVENT_MODIFY_STATE_ = EVENT_MODIFY_STATE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ EVENT_ALL_ACCESS_ = EVENT_ALL_ACCESS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ EVENT_MODIFY_STATE_ = EVENT_MODIFY_STATE;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-const DWORD_ CREATE_EVENT_INITIAL_SET_ = CREATE_EVENT_INITIAL_SET;
-const DWORD_ CREATE_EVENT_MANUAL_RESET_ = CREATE_EVENT_MANUAL_RESET;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_EVENT_INITIAL_SET_ = CREATE_EVENT_INITIAL_SET;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_EVENT_MANUAL_RESET_ = CREATE_EVENT_MANUAL_RESET;
 #endif
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ EVENT_ALL_ACCESS_ = 0x001F0003;
-const DWORD_ EVENT_MODIFY_STATE_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ EVENT_ALL_ACCESS_ = 0x001F0003;
+BOOST_CONSTEXPR_OR_CONST DWORD_ EVENT_MODIFY_STATE_ = 0x00000002;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-const DWORD_ CREATE_EVENT_INITIAL_SET_ = 0x00000002;
-const DWORD_ CREATE_EVENT_MANUAL_RESET_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_EVENT_INITIAL_SET_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_EVENT_MANUAL_RESET_ = 0x00000001;
 #endif
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 // Undocumented and not present in Windows SDK. Enables NtQueryEvent.
 // http://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumented%20Functions%2FNT%20Objects%2FEvent%2FNtQueryEvent.html
-const DWORD_ EVENT_QUERY_STATE_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ EVENT_QUERY_STATE_ = 0x00000001;
 
-const DWORD_ event_all_access = EVENT_ALL_ACCESS_;
-const DWORD_ event_modify_state = EVENT_MODIFY_STATE_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ event_all_access = EVENT_ALL_ACCESS_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ event_modify_state = EVENT_MODIFY_STATE_;
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-const DWORD_ create_event_initial_set = CREATE_EVENT_INITIAL_SET_;
-const DWORD_ create_event_manual_reset = CREATE_EVENT_MANUAL_RESET_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ create_event_initial_set = CREATE_EVENT_INITIAL_SET_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ create_event_manual_reset = CREATE_EVENT_MANUAL_RESET_;
 #endif
 
 #if !defined( BOOST_NO_ANSI_APIS )
@@ -187,4 +188,6 @@ BOOST_FORCEINLINE HANDLE_ create_anonymous_event(SECURITY_ATTRIBUTES_* lpEventAt
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_EVENT_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/file_management.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/file_management.hpp
index 4fa0c95843..b4da8f8b7c 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/file_management.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/file_management.hpp
@@ -15,6 +15,7 @@
 #include <boost/winapi/limits.hpp>
 #include <boost/winapi/time.hpp>
 #include <boost/winapi/overlapped.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -47,10 +48,10 @@ extern "C" {
 
 #if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 AreFileApisANSI(BOOST_WINAPI_DETAIL_VOID);
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateFileA(
     boost::winapi::LPCSTR_ lpFileName,
     boost::winapi::DWORD_ dwDesiredAccess,
@@ -61,14 +62,14 @@ CreateFileA(
     boost::winapi::HANDLE_ hTemplateFile);
 
 struct _WIN32_FIND_DATAA;
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 FindFirstFileA(boost::winapi::LPCSTR_ lpFileName, ::_WIN32_FIND_DATAA* lpFindFileData);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FindNextFileA(boost::winapi::HANDLE_ hFindFile, ::_WIN32_FIND_DATAA* lpFindFileData);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateFileW(
     boost::winapi::LPCWSTR_ lpFileName,
     boost::winapi::DWORD_ dwDesiredAccess,
@@ -79,19 +80,19 @@ CreateFileW(
     boost::winapi::HANDLE_ hTemplateFile);
 
 struct _WIN32_FIND_DATAW;
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 FindFirstFileW(boost::winapi::LPCWSTR_ lpFileName, ::_WIN32_FIND_DATAW* lpFindFileData);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FindNextFileW(boost::winapi::HANDLE_ hFindFile, ::_WIN32_FIND_DATAW* lpFindFileData);
 
 struct _BY_HANDLE_FILE_INFORMATION;
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 GetFileInformationByHandle(
     boost::winapi::HANDLE_ hFile,
     ::_BY_HANDLE_FILE_INFORMATION* lpFileInformation);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 LockFile(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwFileOffsetLow,
@@ -99,7 +100,7 @@ LockFile(
     boost::winapi::DWORD_ nNumberOfBytesToLockLow,
     boost::winapi::DWORD_ nNumberOfBytesToLockHigh);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 LockFileEx(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwFlags,
@@ -109,13 +110,13 @@ LockFileEx(
     ::_OVERLAPPED* lpOverlapped);
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WINXP
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SetFileValidData(
     boost::winapi::HANDLE_ hFile, 
     boost::winapi::LONGLONG_ ValidDataLength);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 UnlockFile(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwFileOffsetLow,
@@ -123,7 +124,7 @@ UnlockFile(
     boost::winapi::DWORD_ nNumberOfBytesToUnlockLow,
     boost::winapi::DWORD_ nNumberOfBytesToUnlockHigh);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 UnlockFileEx(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::DWORD_ dwReserved,
@@ -134,29 +135,29 @@ UnlockFileEx(
 
 #if BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 DeleteFileA(boost::winapi::LPCSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 MoveFileExA(
     boost::winapi::LPCSTR_ lpExistingFileName,
     boost::winapi::LPCSTR_ lpNewFileName,
     boost::winapi::DWORD_ dwFlags);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 DeleteFileW(boost::winapi::LPCWSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FindClose(boost::winapi::HANDLE_ hFindFile);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 MoveFileExW(
     boost::winapi::LPCWSTR_ lpExistingFileName,
     boost::winapi::LPCWSTR_ lpNewFileName,
     boost::winapi::DWORD_ dwFlags);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 ReadFile(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::LPVOID_ lpBuffer,
@@ -164,10 +165,10 @@ ReadFile(
     boost::winapi::LPDWORD_ lpNumberOfBytesRead,
     ::_OVERLAPPED* lpOverlapped);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SetEndOfFile(boost::winapi::HANDLE_ hFile);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 WriteFile(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::LPCVOID_ lpBuffer,
@@ -178,17 +179,17 @@ WriteFile(
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetFileAttributesA(boost::winapi::LPCSTR_ lpFileName);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetFileAttributesW(boost::winapi::LPCWSTR_ lpFileName);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 GetFileSizeEx(boost::winapi::HANDLE_ hFile, ::_LARGE_INTEGER* lpFileSize);
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 SetFilePointer(
     boost::winapi::HANDLE_ hFile,
     boost::winapi::LONG_ lpDistanceToMove,
@@ -204,104 +205,104 @@ namespace winapi {
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ INVALID_FILE_SIZE_ = INVALID_FILE_SIZE;
-const DWORD_ INVALID_SET_FILE_POINTER_ = INVALID_SET_FILE_POINTER;
-const DWORD_ INVALID_FILE_ATTRIBUTES_ = INVALID_FILE_ATTRIBUTES;
-
-const DWORD_ FILE_ATTRIBUTE_READONLY_ = FILE_ATTRIBUTE_READONLY;
-const DWORD_ FILE_ATTRIBUTE_HIDDEN_ = FILE_ATTRIBUTE_HIDDEN;
-const DWORD_ FILE_ATTRIBUTE_SYSTEM_ = FILE_ATTRIBUTE_SYSTEM;
-const DWORD_ FILE_ATTRIBUTE_DIRECTORY_ = FILE_ATTRIBUTE_DIRECTORY;
-const DWORD_ FILE_ATTRIBUTE_ARCHIVE_ = FILE_ATTRIBUTE_ARCHIVE;
-const DWORD_ FILE_ATTRIBUTE_DEVICE_ = FILE_ATTRIBUTE_DEVICE;
-const DWORD_ FILE_ATTRIBUTE_NORMAL_ = FILE_ATTRIBUTE_NORMAL;
-const DWORD_ FILE_ATTRIBUTE_TEMPORARY_ = FILE_ATTRIBUTE_TEMPORARY;
-const DWORD_ FILE_ATTRIBUTE_SPARSE_FILE_ = FILE_ATTRIBUTE_SPARSE_FILE;
-const DWORD_ FILE_ATTRIBUTE_REPARSE_POINT_ = FILE_ATTRIBUTE_REPARSE_POINT;
-const DWORD_ FILE_ATTRIBUTE_COMPRESSED_ = FILE_ATTRIBUTE_COMPRESSED;
-const DWORD_ FILE_ATTRIBUTE_OFFLINE_ = FILE_ATTRIBUTE_OFFLINE;
-const DWORD_ FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_ = FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
-const DWORD_ FILE_ATTRIBUTE_ENCRYPTED_ = FILE_ATTRIBUTE_ENCRYPTED;
-
-const DWORD_ CREATE_NEW_ = CREATE_NEW;
-const DWORD_ CREATE_ALWAYS_ = CREATE_ALWAYS;
-const DWORD_ OPEN_EXISTING_ = OPEN_EXISTING;
-const DWORD_ OPEN_ALWAYS_ = OPEN_ALWAYS;
-const DWORD_ TRUNCATE_EXISTING_ = TRUNCATE_EXISTING;
-
-const DWORD_ FILE_SHARE_READ_ = FILE_SHARE_READ;
-const DWORD_ FILE_SHARE_WRITE_ = FILE_SHARE_WRITE;
-const DWORD_ FILE_SHARE_DELETE_ = FILE_SHARE_DELETE;
-
-const DWORD_ FILE_BEGIN_ = FILE_BEGIN;
-const DWORD_ FILE_CURRENT_ = FILE_CURRENT;
-const DWORD_ FILE_END_ = FILE_END;
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_FILE_SIZE_ = INVALID_FILE_SIZE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_SET_FILE_POINTER_ = INVALID_SET_FILE_POINTER;
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_FILE_ATTRIBUTES_ = INVALID_FILE_ATTRIBUTES;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_READONLY_ = FILE_ATTRIBUTE_READONLY;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_HIDDEN_ = FILE_ATTRIBUTE_HIDDEN;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_SYSTEM_ = FILE_ATTRIBUTE_SYSTEM;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_DIRECTORY_ = FILE_ATTRIBUTE_DIRECTORY;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_ARCHIVE_ = FILE_ATTRIBUTE_ARCHIVE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_DEVICE_ = FILE_ATTRIBUTE_DEVICE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_NORMAL_ = FILE_ATTRIBUTE_NORMAL;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_TEMPORARY_ = FILE_ATTRIBUTE_TEMPORARY;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_SPARSE_FILE_ = FILE_ATTRIBUTE_SPARSE_FILE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_REPARSE_POINT_ = FILE_ATTRIBUTE_REPARSE_POINT;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_COMPRESSED_ = FILE_ATTRIBUTE_COMPRESSED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_OFFLINE_ = FILE_ATTRIBUTE_OFFLINE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_ = FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_ENCRYPTED_ = FILE_ATTRIBUTE_ENCRYPTED;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_NEW_ = CREATE_NEW;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_ALWAYS_ = CREATE_ALWAYS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ OPEN_EXISTING_ = OPEN_EXISTING;
+BOOST_CONSTEXPR_OR_CONST DWORD_ OPEN_ALWAYS_ = OPEN_ALWAYS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ TRUNCATE_EXISTING_ = TRUNCATE_EXISTING;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_READ_ = FILE_SHARE_READ;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_WRITE_ = FILE_SHARE_WRITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_DELETE_ = FILE_SHARE_DELETE;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_BEGIN_ = FILE_BEGIN;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_CURRENT_ = FILE_CURRENT;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_END_ = FILE_END;
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ INVALID_FILE_SIZE_ = ((DWORD_)0xFFFFFFFF);
-const DWORD_ INVALID_SET_FILE_POINTER_ = ((DWORD_)-1);
-const DWORD_ INVALID_FILE_ATTRIBUTES_ = ((DWORD_)-1);
-
-const DWORD_ FILE_ATTRIBUTE_READONLY_ = 0x00000001;
-const DWORD_ FILE_ATTRIBUTE_HIDDEN_ = 0x00000002;
-const DWORD_ FILE_ATTRIBUTE_SYSTEM_ = 0x00000004;
-const DWORD_ FILE_ATTRIBUTE_DIRECTORY_ = 0x00000010;
-const DWORD_ FILE_ATTRIBUTE_ARCHIVE_ = 0x00000020;
-const DWORD_ FILE_ATTRIBUTE_DEVICE_ = 0x00000040;
-const DWORD_ FILE_ATTRIBUTE_NORMAL_ = 0x00000080;
-const DWORD_ FILE_ATTRIBUTE_TEMPORARY_ = 0x00000100;
-const DWORD_ FILE_ATTRIBUTE_SPARSE_FILE_ = 0x00000200;
-const DWORD_ FILE_ATTRIBUTE_REPARSE_POINT_ = 0x00000400;
-const DWORD_ FILE_ATTRIBUTE_COMPRESSED_ = 0x00000800;
-const DWORD_ FILE_ATTRIBUTE_OFFLINE_ = 0x00001000;
-const DWORD_ FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_ = 0x00002000;
-const DWORD_ FILE_ATTRIBUTE_ENCRYPTED_ = 0x00004000;
-
-const DWORD_ CREATE_NEW_ = 1;
-const DWORD_ CREATE_ALWAYS_ = 2;
-const DWORD_ OPEN_EXISTING_ = 3;
-const DWORD_ OPEN_ALWAYS_ = 4;
-const DWORD_ TRUNCATE_EXISTING_ = 5;
-
-const DWORD_ FILE_SHARE_READ_ = 0x00000001;
-const DWORD_ FILE_SHARE_WRITE_ = 0x00000002;
-const DWORD_ FILE_SHARE_DELETE_ = 0x00000004;
-
-const DWORD_ FILE_BEGIN_ = 0;
-const DWORD_ FILE_CURRENT_ = 1;
-const DWORD_ FILE_END_ = 2;
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_FILE_SIZE_ = ((DWORD_)0xFFFFFFFF);
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_SET_FILE_POINTER_ = ((DWORD_)-1);
+BOOST_CONSTEXPR_OR_CONST DWORD_ INVALID_FILE_ATTRIBUTES_ = ((DWORD_)-1);
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_READONLY_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_HIDDEN_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_SYSTEM_ = 0x00000004;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_DIRECTORY_ = 0x00000010;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_ARCHIVE_ = 0x00000020;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_DEVICE_ = 0x00000040;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_NORMAL_ = 0x00000080;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_TEMPORARY_ = 0x00000100;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_SPARSE_FILE_ = 0x00000200;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_REPARSE_POINT_ = 0x00000400;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_COMPRESSED_ = 0x00000800;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_OFFLINE_ = 0x00001000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_ = 0x00002000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_ENCRYPTED_ = 0x00004000;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_NEW_ = 1;
+BOOST_CONSTEXPR_OR_CONST DWORD_ CREATE_ALWAYS_ = 2;
+BOOST_CONSTEXPR_OR_CONST DWORD_ OPEN_EXISTING_ = 3;
+BOOST_CONSTEXPR_OR_CONST DWORD_ OPEN_ALWAYS_ = 4;
+BOOST_CONSTEXPR_OR_CONST DWORD_ TRUNCATE_EXISTING_ = 5;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_READ_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_WRITE_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_SHARE_DELETE_ = 0x00000004;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_BEGIN_ = 0;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_CURRENT_ = 1;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_END_ = 2;
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 // Some of these constants are not defined by Windows SDK in MinGW or older MSVC
-const DWORD_ FILE_FLAG_WRITE_THROUGH_ = 0x80000000;
-const DWORD_ FILE_FLAG_OVERLAPPED_ = 0x40000000;
-const DWORD_ FILE_FLAG_NO_BUFFERING_ = 0x20000000;
-const DWORD_ FILE_FLAG_RANDOM_ACCESS_ = 0x10000000;
-const DWORD_ FILE_FLAG_SEQUENTIAL_SCAN_ = 0x08000000;
-const DWORD_ FILE_FLAG_DELETE_ON_CLOSE_ = 0x04000000;
-const DWORD_ FILE_FLAG_BACKUP_SEMANTICS_ = 0x02000000;
-const DWORD_ FILE_FLAG_POSIX_SEMANTICS_ = 0x01000000;
-const DWORD_ FILE_FLAG_SESSION_AWARE_ = 0x00800000;
-const DWORD_ FILE_FLAG_OPEN_REPARSE_POINT_ = 0x00200000;
-const DWORD_ FILE_FLAG_OPEN_NO_RECALL_ = 0x00100000;
-const DWORD_ FILE_FLAG_FIRST_PIPE_INSTANCE_ = 0x00080000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_WRITE_THROUGH_ = 0x80000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_OVERLAPPED_ = 0x40000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_NO_BUFFERING_ = 0x20000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_RANDOM_ACCESS_ = 0x10000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_SEQUENTIAL_SCAN_ = 0x08000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_DELETE_ON_CLOSE_ = 0x04000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_BACKUP_SEMANTICS_ = 0x02000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_POSIX_SEMANTICS_ = 0x01000000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_SESSION_AWARE_ = 0x00800000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_OPEN_REPARSE_POINT_ = 0x00200000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_OPEN_NO_RECALL_ = 0x00100000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_FIRST_PIPE_INSTANCE_ = 0x00080000;
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN8
-const DWORD_ FILE_FLAG_OPEN_REQUIRING_OPLOCK_ = 0x00040000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_FLAG_OPEN_REQUIRING_OPLOCK_ = 0x00040000;
 #endif
 
 // This constant is not defined in Windows SDK up until 6.0A
-const DWORD_ FILE_ATTRIBUTE_VIRTUAL_ = 0x00010000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_VIRTUAL_ = 0x00010000;
 
 // These constants are not defined in Windows SDK up until 8.0 and MinGW/MinGW-w64 (as of 2016-02-14).
 // They are documented to be supported only since Windows 8/Windows Server 2012
 // but defined unconditionally.
-const DWORD_ FILE_ATTRIBUTE_INTEGRITY_STREAM_ = 0x00008000;
-const DWORD_ FILE_ATTRIBUTE_NO_SCRUB_DATA_ = 0x00020000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_INTEGRITY_STREAM_ = 0x00008000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_NO_SCRUB_DATA_ = 0x00020000;
 // Undocumented
-const DWORD_ FILE_ATTRIBUTE_EA_ = 0x00040000;
+BOOST_CONSTEXPR_OR_CONST DWORD_ FILE_ATTRIBUTE_EA_ = 0x00040000;
 
 #if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
 #if !defined( BOOST_NO_ANSI_APIS )
@@ -591,4 +592,6 @@ using ::SetFilePointer;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_FILE_MANAGEMENT_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process.hpp
index f9b5251c23..15052ef38c 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_GET_CURRENT_PROCESS_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -18,7 +19,7 @@
 // Windows CE define GetCurrentProcess as an inline function in kfuncs.h
 #if !defined( BOOST_USE_WINDOWS_H ) && !defined( UNDER_CE )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI GetCurrentProcess(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC GetCurrentProcess(BOOST_WINAPI_DETAIL_VOID);
 }
 #endif
 
@@ -28,4 +29,6 @@ using ::GetCurrentProcess;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_GET_CURRENT_PROCESS_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process_id.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process_id.hpp
index 5848fdf478..b1a3ea124c 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process_id.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_process_id.hpp
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_GET_CURRENT_PROCESS_ID_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,7 +18,7 @@
 // Windows CE define GetCurrentProcessId as an inline function in kfuncs.h
 #if !defined( BOOST_USE_WINDOWS_H ) && !defined( UNDER_CE )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI GetCurrentProcessId(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC GetCurrentProcessId(BOOST_WINAPI_DETAIL_VOID);
 }
 #endif
 
@@ -27,4 +28,6 @@ using ::GetCurrentProcessId;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_GET_CURRENT_PROCESS_ID_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread.hpp
index 334f9e52d6..b00f8660f2 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_GET_CURRENT_THREAD_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -18,7 +19,7 @@
 // Windows CE define GetCurrentThread as an inline function in kfuncs.h
 #if !defined( BOOST_USE_WINDOWS_H ) && !defined( UNDER_CE )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI GetCurrentThread(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC GetCurrentThread(BOOST_WINAPI_DETAIL_VOID);
 }
 #endif
 
@@ -28,4 +29,6 @@ using ::GetCurrentThread;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_GET_CURRENT_THREAD_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread_id.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread_id.hpp
index 4cd1f01230..6f78f551ae 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread_id.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_current_thread_id.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_GET_CURRENT_THREAD_ID_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -18,7 +19,7 @@
 // Windows CE define GetCurrentThreadId as an inline function in kfuncs.h
 #if !defined( BOOST_USE_WINDOWS_H ) && !defined( UNDER_CE )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI GetCurrentThreadId(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC GetCurrentThreadId(BOOST_WINAPI_DETAIL_VOID);
 }
 #endif
 
@@ -28,4 +29,6 @@ using ::GetCurrentThreadId;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_GET_CURRENT_THREAD_ID_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_last_error.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_last_error.hpp
index e44736deed..a809c8465a 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_last_error.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_last_error.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_GET_LAST_ERROR_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,7 +18,7 @@
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI GetLastError(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC GetLastError(BOOST_WINAPI_DETAIL_VOID);
 }
 #endif
 
@@ -27,4 +28,6 @@ using ::GetLastError;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_GET_LAST_ERROR_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_proc_address.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_proc_address.hpp
new file mode 100644
index 0000000000..2240930cd6
--- /dev/null
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_proc_address.hpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2020 Andrey Semashev
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef BOOST_WINAPI_GET_PROC_ADDRESS_HPP_INCLUDED_
+#define BOOST_WINAPI_GET_PROC_ADDRESS_HPP_INCLUDED_
+
+#include <boost/winapi/basic_types.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+
+#include <boost/winapi/detail/header.hpp>
+
+#if !defined(BOOST_USE_WINDOWS_H)
+namespace boost { namespace winapi {
+#ifdef _WIN64
+typedef INT_PTR_ (BOOST_WINAPI_WINAPI_CC *FARPROC_)();
+typedef INT_PTR_ (BOOST_WINAPI_WINAPI_CC *NEARPROC_)();
+typedef INT_PTR_ (BOOST_WINAPI_WINAPI_CC *PROC_)();
+#else
+typedef int (BOOST_WINAPI_WINAPI_CC *FARPROC_)();
+typedef int (BOOST_WINAPI_WINAPI_CC *NEARPROC_)();
+typedef int (BOOST_WINAPI_WINAPI_CC *PROC_)();
+#endif // _WIN64
+}} // namespace boost::winapi
+
+extern "C" {
+#if !defined(UNDER_CE)
+BOOST_WINAPI_IMPORT boost::winapi::FARPROC_ BOOST_WINAPI_WINAPI_CC
+GetProcAddress(boost::winapi::HMODULE_ hModule, boost::winapi::LPCSTR_ lpProcName);
+#else
+// On Windows CE there are two functions: GetProcAddressA (since Windows CE 3.0) and GetProcAddressW.
+// GetProcAddress is a macro that is _always_ defined to GetProcAddressW.
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::FARPROC_ BOOST_WINAPI_WINAPI_CC
+GetProcAddressA(boost::winapi::HMODULE_ hModule, boost::winapi::LPCSTR_ lpProcName);
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::FARPROC_ BOOST_WINAPI_WINAPI_CC
+GetProcAddressW(boost::winapi::HMODULE_ hModule, boost::winapi::LPCWSTR_ lpProcName);
+#endif
+} // extern "C"
+#endif // !defined(BOOST_USE_WINDOWS_H)
+
+namespace boost {
+namespace winapi {
+
+#if defined(BOOST_USE_WINDOWS_H)
+typedef ::FARPROC FARPROC_;
+typedef ::NEARPROC NEARPROC_;
+typedef ::PROC PROC_;
+#endif // defined(BOOST_USE_WINDOWS_H)
+
+#if !defined(UNDER_CE)
+// For backward compatibility, don't use directly. Use get_proc_address instead.
+using ::GetProcAddress;
+#else
+using ::GetProcAddressA;
+using ::GetProcAddressW;
+#endif
+
+BOOST_FORCEINLINE FARPROC_ get_proc_address(HMODULE_ hModule, LPCSTR_ lpProcName)
+{
+#if !defined(UNDER_CE)
+    return ::GetProcAddress(hModule, lpProcName);
+#else
+    return ::GetProcAddressA(hModule, lpProcName);
+#endif
+}
+
+} // namespace winapi
+} // namespace boost
+
+#include <boost/winapi/detail/footer.hpp>
+
+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
+#endif // BOOST_WINAPI_GET_PROC_ADDRESS_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_process_times.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_process_times.hpp
index d476df475f..91de1451f7 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_process_times.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_process_times.hpp
@@ -21,10 +21,11 @@
 
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/time.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 GetProcessTimes(
     boost::winapi::HANDLE_ hProcess,
     ::_FILETIME* lpCreationTime,
@@ -55,6 +56,8 @@ BOOST_FORCEINLINE BOOL_ GetProcessTimes(
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 #endif // !defined( UNDER_CE )
 #endif // BOOST_WINAPI_GET_PROCESS_TIMES_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/get_thread_times.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/get_thread_times.hpp
index 7e7aebcc66..1cfec01831 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/get_thread_times.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/get_thread_times.hpp
@@ -18,9 +18,11 @@
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 
+#include <boost/winapi/detail/header.hpp>
+
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 GetThreadTimes(
     boost::winapi::HANDLE_ hThread,
     ::_FILETIME* lpCreationTime,
@@ -51,5 +53,7 @@ BOOST_FORCEINLINE BOOL_ GetThreadTimes(
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 #endif // BOOST_WINAPI_GET_THREAD_TIMES_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
index f7b7aa7131..d3db4f7339 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_HANDLES_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,10 +18,10 @@
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 CloseHandle(boost::winapi::HANDLE_ handle);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 DuplicateHandle(
     boost::winapi::HANDLE_ hSourceProcessHandle,
     boost::winapi::HANDLE_ hSourceHandle,
@@ -31,7 +32,7 @@ DuplicateHandle(
     boost::winapi::DWORD_ dwOptions);
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 CompareObjectHandles(
     boost::winapi::HANDLE_ hFirstObjectHandle,
     boost::winapi::HANDLE_ hSecondObjectHandle);
@@ -49,21 +50,26 @@ using ::DuplicateHandle;
 using ::CompareObjectHandles;
 #endif
 
+// Note: MSVC-14.1 does not interpret INVALID_HANDLE_VALUE_ initializer as a constant expression
 #if defined( BOOST_USE_WINDOWS_H )
-const DWORD_ DUPLICATE_CLOSE_SOURCE_ = DUPLICATE_CLOSE_SOURCE;
-const DWORD_ DUPLICATE_SAME_ACCESS_ = DUPLICATE_SAME_ACCESS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_CLOSE_SOURCE_ = DUPLICATE_CLOSE_SOURCE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_SAME_ACCESS_ = DUPLICATE_SAME_ACCESS;
 const HANDLE_ INVALID_HANDLE_VALUE_ = INVALID_HANDLE_VALUE;
 #else
-const DWORD_ DUPLICATE_CLOSE_SOURCE_ = 1;
-const DWORD_ DUPLICATE_SAME_ACCESS_ = 2;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_CLOSE_SOURCE_ = 1;
+BOOST_CONSTEXPR_OR_CONST DWORD_ DUPLICATE_SAME_ACCESS_ = 2;
 const HANDLE_ INVALID_HANDLE_VALUE_ = (HANDLE_)(-1);
 #endif
 
-const DWORD_ duplicate_close_source = DUPLICATE_CLOSE_SOURCE_;
-const DWORD_ duplicate_same_access = DUPLICATE_SAME_ACCESS_;
-const HANDLE_ invalid_handle_value = INVALID_HANDLE_VALUE_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ duplicate_close_source = DUPLICATE_CLOSE_SOURCE_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ duplicate_same_access = DUPLICATE_SAME_ACCESS_;
+// Note: The "unused" attribute here should not be necessary because the variable is a constant.
+//       However, MinGW gcc 5.3 spams warnings about this particular constant.
+const HANDLE_ invalid_handle_value BOOST_ATTRIBUTE_UNUSED = INVALID_HANDLE_VALUE_;
 
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_HANDLES_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/heap_memory.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/heap_memory.hpp
index d95b5a6e9d..cf412bd456 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/heap_memory.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/heap_memory.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_HEAP_MEMORY_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -20,26 +21,26 @@
 extern "C" {
 
 #if BOOST_WINAPI_PARTITION_DESKTOP_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetProcessHeaps(boost::winapi::DWORD_ NumberOfHeaps, boost::winapi::PHANDLE_ ProcessHeaps);
 #endif // BOOST_WINAPI_PARTITION_DESKTOP_SYSTEM
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 GetProcessHeap(BOOST_WINAPI_DETAIL_VOID);
 
-BOOST_SYMBOL_IMPORT boost::winapi::LPVOID_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::LPVOID_ BOOST_WINAPI_WINAPI_CC
 HeapAlloc(
     boost::winapi::HANDLE_ hHeap,
     boost::winapi::DWORD_ dwFlags,
     boost::winapi::SIZE_T_ dwBytes);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 HeapFree(
     boost::winapi::HANDLE_ hHeap,
     boost::winapi::DWORD_ dwFlags,
     boost::winapi::LPVOID_ lpMem);
 
-BOOST_SYMBOL_IMPORT boost::winapi::LPVOID_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::LPVOID_ BOOST_WINAPI_WINAPI_CC
 HeapReAlloc(
     boost::winapi::HANDLE_ hHeap,
     boost::winapi::DWORD_ dwFlags,
@@ -47,13 +48,13 @@ HeapReAlloc(
     boost::winapi::SIZE_T_ dwBytes);
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 HeapCreate(
     boost::winapi::DWORD_ flOptions,
     boost::winapi::SIZE_T_ dwInitialSize,
     boost::winapi::SIZE_T_ dwMaximumSize);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 HeapDestroy(boost::winapi::HANDLE_ hHeap);
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 
@@ -80,4 +81,6 @@ using ::HeapDestroy;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_HEAP_MEMORY_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/limits.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/limits.hpp
index 1d0a589ab3..0a628d705f 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/limits.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/limits.hpp
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_LIMITS_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -19,31 +20,33 @@ namespace winapi {
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ MAX_PATH_ = MAX_PATH;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MAX_PATH_ = MAX_PATH;
 
 #else
 
-const DWORD_ MAX_PATH_ = 260;
+BOOST_CONSTEXPR_OR_CONST DWORD_ MAX_PATH_ = 260;
 
 #endif
 
 #if defined( BOOST_USE_WINDOWS_H ) && !defined( BOOST_WINAPI_IS_MINGW )
 
-const DWORD_ UNICODE_STRING_MAX_BYTES_ = UNICODE_STRING_MAX_BYTES;
-const DWORD_ UNICODE_STRING_MAX_CHARS_ = UNICODE_STRING_MAX_CHARS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ UNICODE_STRING_MAX_BYTES_ = UNICODE_STRING_MAX_BYTES;
+BOOST_CONSTEXPR_OR_CONST DWORD_ UNICODE_STRING_MAX_CHARS_ = UNICODE_STRING_MAX_CHARS;
 
 #else
 
-const DWORD_ UNICODE_STRING_MAX_BYTES_ = 65534;
-const DWORD_ UNICODE_STRING_MAX_CHARS_ = 32767;
+BOOST_CONSTEXPR_OR_CONST DWORD_ UNICODE_STRING_MAX_BYTES_ = 65534;
+BOOST_CONSTEXPR_OR_CONST DWORD_ UNICODE_STRING_MAX_CHARS_ = 32767;
 
 #endif
 
-const DWORD_ max_path = MAX_PATH_;
-const DWORD_ unicode_string_max_bytes = UNICODE_STRING_MAX_BYTES_;
-const DWORD_ unicode_string_max_chars = UNICODE_STRING_MAX_CHARS_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ max_path = MAX_PATH_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ unicode_string_max_bytes = UNICODE_STRING_MAX_BYTES_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ unicode_string_max_chars = UNICODE_STRING_MAX_CHARS_;
 
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_LIMITS_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/local_memory.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/local_memory.hpp
index 32b9c691a6..baa5552c4e 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/local_memory.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/local_memory.hpp
@@ -17,24 +17,40 @@
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 
+#include <boost/winapi/detail/header.hpp>
+
 #if !defined( BOOST_USE_WINDOWS_H )
 namespace boost { namespace winapi {
 typedef HANDLE_ HLOCAL_;
 }}
 
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::HLOCAL_ WINAPI
+
+#if defined (_WIN32_WCE )
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HLOCAL_ BOOST_WINAPI_WINAPI_CC
+LocalAlloc(
+    boost::winapi::UINT_ uFlags,
+    boost::winapi::UINT_ uBytes);
+
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HLOCAL_ BOOST_WINAPI_WINAPI_CC
+LocalReAlloc(
+    boost::winapi::HLOCAL_ hMem,
+    boost::winapi::UINT_ uBytes,
+    boost::winapi::UINT_ uFlags);
+#else
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HLOCAL_ BOOST_WINAPI_WINAPI_CC
 LocalAlloc(
     boost::winapi::UINT_ uFlags,
     boost::winapi::SIZE_T_ uBytes);
 
-BOOST_SYMBOL_IMPORT boost::winapi::HLOCAL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HLOCAL_ BOOST_WINAPI_WINAPI_CC
 LocalReAlloc(
     boost::winapi::HLOCAL_ hMem,
     boost::winapi::SIZE_T_ uBytes,
     boost::winapi::UINT_ uFlags);
+#endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::HLOCAL_ WINAPI LocalFree(boost::winapi::HLOCAL_ hMem);
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HLOCAL_ BOOST_WINAPI_WINAPI_CC LocalFree(boost::winapi::HLOCAL_ hMem);
 } // extern "C"
 #endif
 
@@ -49,5 +65,7 @@ using ::LocalFree;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 #endif // BOOST_WINAPI_LOCAL_MEMORY_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/overlapped.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/overlapped.hpp
index 482699508a..8027b356d4 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/overlapped.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/overlapped.hpp
@@ -9,6 +9,7 @@
 #define BOOST_WINAPI_OVERLAPPED_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -23,16 +24,11 @@ struct _OVERLAPPED;
 namespace boost {
 namespace winapi {
 
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
-#endif
-
 typedef struct BOOST_MAY_ALIAS _OVERLAPPED {
     ULONG_PTR_ Internal;
     ULONG_PTR_ InternalHigh;
     union {
-        struct {
+        BOOST_WINAPI_DETAIL_EXTENSION struct {
             DWORD_ Offset;
             DWORD_ OffsetHigh;
         };
@@ -41,11 +37,9 @@ typedef struct BOOST_MAY_ALIAS _OVERLAPPED {
     HANDLE_    hEvent;
 } OVERLAPPED_, *LPOVERLAPPED_;
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace winapi
 } // namespace boost
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_OVERLAPPED_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/semaphore.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/semaphore.hpp
index 4c6ec3b0c3..0071f7173e 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/semaphore.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/semaphore.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_SEMAPHORE_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -21,7 +22,7 @@ extern "C" {
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 #if !defined( BOOST_NO_ANSI_APIS )
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateSemaphoreA(
     ::_SECURITY_ATTRIBUTES* lpSemaphoreAttributes,
     boost::winapi::LONG_ lInitialCount,
@@ -29,7 +30,7 @@ CreateSemaphoreA(
     boost::winapi::LPCSTR_ lpName);
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateSemaphoreExA(
     ::_SECURITY_ATTRIBUTES* lpSemaphoreAttributes,
     boost::winapi::LONG_ lInitialCount,
@@ -41,7 +42,7 @@ CreateSemaphoreExA(
 
 #endif // !defined( BOOST_NO_ANSI_APIS )
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateSemaphoreW(
     ::_SECURITY_ATTRIBUTES* lpSemaphoreAttributes,
     boost::winapi::LONG_ lInitialCount,
@@ -49,7 +50,7 @@ CreateSemaphoreW(
     boost::winapi::LPCWSTR_ lpName);
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 CreateSemaphoreExW(
     ::_SECURITY_ATTRIBUTES* lpSemaphoreAttributes,
     boost::winapi::LONG_ lInitialCount,
@@ -59,7 +60,7 @@ CreateSemaphoreExW(
     boost::winapi::DWORD_ dwDesiredAccess);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 ReleaseSemaphore(
     boost::winapi::HANDLE_ hSemaphore,
     boost::winapi::LONG_ lReleaseCount,
@@ -70,14 +71,14 @@ ReleaseSemaphore(
 #if BOOST_WINAPI_PARTITION_DESKTOP_SYSTEM
 
 #if !defined( BOOST_NO_ANSI_APIS )
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 OpenSemaphoreA(
     boost::winapi::DWORD_ dwDesiredAccess,
     boost::winapi::BOOL_ bInheritHandle,
     boost::winapi::LPCSTR_ lpName);
 #endif // !defined( BOOST_NO_ANSI_APIS )
 
-BOOST_SYMBOL_IMPORT boost::winapi::HANDLE_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::HANDLE_ BOOST_WINAPI_WINAPI_CC
 OpenSemaphoreW(
     boost::winapi::DWORD_ dwDesiredAccess,
     boost::winapi::BOOL_ bInheritHandle,
@@ -97,22 +98,22 @@ using ::ReleaseSemaphore;
 
 #if defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ SEMAPHORE_ALL_ACCESS_ = SEMAPHORE_ALL_ACCESS;
-const DWORD_ SEMAPHORE_MODIFY_STATE_ = SEMAPHORE_MODIFY_STATE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEMAPHORE_ALL_ACCESS_ = SEMAPHORE_ALL_ACCESS;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEMAPHORE_MODIFY_STATE_ = SEMAPHORE_MODIFY_STATE;
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const DWORD_ SEMAPHORE_ALL_ACCESS_ = 0x001F0003;
-const DWORD_ SEMAPHORE_MODIFY_STATE_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEMAPHORE_ALL_ACCESS_ = 0x001F0003;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEMAPHORE_MODIFY_STATE_ = 0x00000002;
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
 // Undocumented and not present in Windows SDK. Enables NtQuerySemaphore.
 // http://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumented%20Functions%2FNT%20Objects%2FEvent%2FNtQueryEvent.html
-const DWORD_ SEMAPHORE_QUERY_STATE_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST DWORD_ SEMAPHORE_QUERY_STATE_ = 0x00000001;
 
-const DWORD_ semaphore_all_access = SEMAPHORE_ALL_ACCESS_;
-const DWORD_ semaphore_modify_state = SEMAPHORE_MODIFY_STATE_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ semaphore_all_access = SEMAPHORE_ALL_ACCESS_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ semaphore_modify_state = SEMAPHORE_MODIFY_STATE_;
 
 
 #if !defined( BOOST_NO_ANSI_APIS )
@@ -183,4 +184,6 @@ BOOST_FORCEINLINE HANDLE_ open_semaphore(DWORD_ dwDesiredAccess, BOOL_ bInheritH
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_SEMAPHORE_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/srw_lock.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/srw_lock.hpp
index 4bbf70ecea..d8a0e9110c 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/srw_lock.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/srw_lock.hpp
@@ -25,31 +25,32 @@
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 struct _RTL_SRWLOCK;
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 InitializeSRWLock(::_RTL_SRWLOCK* SRWLock);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 ReleaseSRWLockExclusive(::_RTL_SRWLOCK* SRWLock);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 ReleaseSRWLockShared(::_RTL_SRWLOCK* SRWLock);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 AcquireSRWLockExclusive(::_RTL_SRWLOCK* SRWLock);
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 AcquireSRWLockShared(::_RTL_SRWLOCK* SRWLock);
 
 #if !defined( BOOST_WINAPI_NO_TRY_ACQUIRE_SRWLOCK )
-BOOST_SYMBOL_IMPORT boost::winapi::BOOLEAN_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOLEAN_ BOOST_WINAPI_WINAPI_CC
 TryAcquireSRWLockExclusive(::_RTL_SRWLOCK* SRWLock);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOLEAN_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOLEAN_ BOOST_WINAPI_WINAPI_CC
 TryAcquireSRWLockShared(::_RTL_SRWLOCK* SRWLock);
 #endif
 } // extern "C"
@@ -108,6 +109,8 @@ BOOST_FORCEINLINE BOOLEAN_ TryAcquireSRWLockShared(PSRWLOCK_ SRWLock)
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
 
 #endif // BOOST_WINAPI_SRW_LOCK_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/stack_backtrace.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/stack_backtrace.hpp
index a9d47be838..e5e295a922 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/stack_backtrace.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/stack_backtrace.hpp
@@ -23,19 +23,18 @@
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 
+#include <boost/winapi/detail/header.hpp>
+
 // Windows SDK shipped with MSVC 7.1 and 8 does not declare RtlCaptureStackBackTrace in headers but allows to link with it
 #if !defined( BOOST_USE_WINDOWS_H ) || (defined(_MSC_VER) && (_MSC_VER+0) < 1500)
 extern "C" {
 
-BOOST_SYMBOL_IMPORT
-boost::winapi::WORD_
-NTAPI
-RtlCaptureStackBackTrace(
+BOOST_WINAPI_IMPORT boost::winapi::WORD_
+BOOST_WINAPI_NTAPI_CC RtlCaptureStackBackTrace(
     boost::winapi::DWORD_ FramesToSkip,
     boost::winapi::DWORD_ FramesToCapture,
     boost::winapi::PVOID_* BackTrace,
-    boost::winapi::PDWORD_ BackTraceHash
-    );
+    boost::winapi::PDWORD_ BackTraceHash);
 
 } // extern "C"
 #endif
@@ -48,7 +47,9 @@ using ::RtlCaptureStackBackTrace;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
-#endif // (NTDDI_VERSION > 0x05010000)
+#endif // (BOOST_USE_NTDDI_VERSION > BOOST_WINAPI_NTDDI_WINXP)
 #endif // !defined( BOOST_WINAPI_IS_MINGW )
 #endif // BOOST_WINAPI_STACK_BACKTRACE_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/system.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/system.hpp
index 316deed432..9f8bddf5cd 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/system.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/system.hpp
@@ -11,29 +11,24 @@
 #define BOOST_WINAPI_SYSTEM_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-// nonstandard extension used : nameless struct/union
-#pragma warning(disable: 4201)
-#endif
-
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 struct _SYSTEM_INFO;
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 GetSystemInfo(::_SYSTEM_INFO* lpSystemInfo);
 #endif
 
 #if BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WINXP
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 GetNativeSystemInfo(::_SYSTEM_INFO* lpSystemInfo);
 #endif
 #endif
@@ -80,8 +75,6 @@ BOOST_FORCEINLINE VOID_ GetNativeSystemInfo(LPSYSTEM_INFO_ lpSystemInfo)
 }
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
+#include <boost/winapi/detail/footer.hpp>
 
 #endif // BOOST_WINAPI_SYSTEM_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/thread.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/thread.hpp
index dab3c2cc3e..45ceb9c908 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/thread.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/thread.hpp
@@ -19,14 +19,16 @@
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 
+#include <boost/winapi/detail/header.hpp>
+
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 SleepEx(
     boost::winapi::DWORD_ dwMilliseconds,
     boost::winapi::BOOL_ bAlertable);
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI Sleep(boost::winapi::DWORD_ dwMilliseconds);
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI SwitchToThread(BOOST_WINAPI_DETAIL_VOID);
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC Sleep(boost::winapi::DWORD_ dwMilliseconds);
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC SwitchToThread(BOOST_WINAPI_DETAIL_VOID);
 } // extern "C"
 #endif
 
@@ -38,5 +40,7 @@ using ::SwitchToThread;
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 #endif // BOOST_WINAPI_THREAD_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/thread_pool.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/thread_pool.hpp
index b92c73cb48..546a68579d 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/thread_pool.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/thread_pool.hpp
@@ -17,15 +17,16 @@
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
 #if BOOST_WINAPI_PARTITION_DESKTOP
-typedef boost::winapi::VOID_ (NTAPI *WAITORTIMERCALLBACKFUNC)
+typedef boost::winapi::VOID_ (BOOST_WINAPI_NTAPI_CC *WAITORTIMERCALLBACKFUNC)
     (boost::winapi::PVOID_, boost::winapi::BOOLEAN_);
 typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 RegisterWaitForSingleObject(
     boost::winapi::PHANDLE_ phNewWaitObject,
     boost::winapi::HANDLE_ hObject,
@@ -41,12 +42,12 @@ RegisterWaitForSingleObject(
 #if !defined( BOOST_USE_WINDOWS_H ) || (defined(BOOST_WINAPI_IS_MINGW) && BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP)
 extern "C" {
 #if BOOST_WINAPI_PARTITION_DESKTOP
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 UnregisterWait(boost::winapi::HANDLE_ WaitHandle);
 #endif
 
 #if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 UnregisterWaitEx(
     boost::winapi::HANDLE_ WaitHandle,
     boost::winapi::HANDLE_ CompletionEvent);
@@ -70,37 +71,37 @@ using ::UnregisterWaitEx;
 #endif
 #if defined( BOOST_USE_WINDOWS_H )
 
-const ULONG_ WT_EXECUTEDEFAULT_ = WT_EXECUTEDEFAULT;
-const ULONG_ WT_EXECUTEINIOTHREAD_ = WT_EXECUTEINIOTHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEDEFAULT_ = WT_EXECUTEDEFAULT;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINIOTHREAD_ = WT_EXECUTEINIOTHREAD;
 #if defined( BOOST_WINAPI_IS_MINGW )
-const ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
 #else
-const ULONG_ WT_EXECUTEINUITHREAD_ = WT_EXECUTEINUITHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINUITHREAD_ = WT_EXECUTEINUITHREAD;
 #endif
-const ULONG_ WT_EXECUTEINWAITTHREAD_ = WT_EXECUTEINWAITTHREAD;
-const ULONG_ WT_EXECUTEONLYONCE_ = WT_EXECUTEONLYONCE;
-const ULONG_ WT_EXECUTEINTIMERTHREAD_ = WT_EXECUTEINTIMERTHREAD;
-const ULONG_ WT_EXECUTELONGFUNCTION_ = WT_EXECUTELONGFUNCTION;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINWAITTHREAD_ = WT_EXECUTEINWAITTHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEONLYONCE_ = WT_EXECUTEONLYONCE;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINTIMERTHREAD_ = WT_EXECUTEINTIMERTHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTELONGFUNCTION_ = WT_EXECUTELONGFUNCTION;
 #if defined( BOOST_WINAPI_IS_MINGW )
-const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
 #else
-const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = WT_EXECUTEINPERSISTENTIOTHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = WT_EXECUTEINPERSISTENTIOTHREAD;
 #endif
-const ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = WT_EXECUTEINPERSISTENTTHREAD;
-const ULONG_ WT_TRANSFER_IMPERSONATION_ = WT_TRANSFER_IMPERSONATION;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = WT_EXECUTEINPERSISTENTTHREAD;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_TRANSFER_IMPERSONATION_ = WT_TRANSFER_IMPERSONATION;
 
 #else // defined( BOOST_USE_WINDOWS_H )
 
-const ULONG_ WT_EXECUTEDEFAULT_ = 0x00000000;
-const ULONG_ WT_EXECUTEINIOTHREAD_ = 0x00000001;
-const ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
-const ULONG_ WT_EXECUTEINWAITTHREAD_ = 0x00000004;
-const ULONG_ WT_EXECUTEONLYONCE_ = 0x00000008;
-const ULONG_ WT_EXECUTEINTIMERTHREAD_ = 0x00000020;
-const ULONG_ WT_EXECUTELONGFUNCTION_ = 0x00000010;
-const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
-const ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = 0x00000080;
-const ULONG_ WT_TRANSFER_IMPERSONATION_ = 0x00000100;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEDEFAULT_ = 0x00000000;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINIOTHREAD_ = 0x00000001;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINWAITTHREAD_ = 0x00000004;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEONLYONCE_ = 0x00000008;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINTIMERTHREAD_ = 0x00000020;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTELONGFUNCTION_ = 0x00000010;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = 0x00000080;
+BOOST_CONSTEXPR_OR_CONST ULONG_ WT_TRANSFER_IMPERSONATION_ = 0x00000100;
 
 #endif // defined( BOOST_USE_WINDOWS_H )
 
@@ -111,19 +112,21 @@ BOOST_FORCEINLINE BOOST_CONSTEXPR ULONG_ wt_set_max_threadpool_threads(ULONG_ fl
     return flags | (limit << 16);
 }
 
-const ULONG_ wt_execute_default = WT_EXECUTEDEFAULT_;
-const ULONG_ wt_execute_in_io_thread = WT_EXECUTEINIOTHREAD_;
-const ULONG_ wt_execute_in_ui_thread = WT_EXECUTEINUITHREAD_;
-const ULONG_ wt_execute_in_wait_thread = WT_EXECUTEINWAITTHREAD_;
-const ULONG_ wt_execute_only_once = WT_EXECUTEONLYONCE_;
-const ULONG_ wt_execute_in_timer_thread = WT_EXECUTEINTIMERTHREAD_;
-const ULONG_ wt_execute_long_function = WT_EXECUTELONGFUNCTION_;
-const ULONG_ wt_execute_in_persistent_io_thread = WT_EXECUTEINPERSISTENTIOTHREAD_;
-const ULONG_ wt_execute_in_persistent_thread = WT_EXECUTEINPERSISTENTTHREAD_;
-const ULONG_ wt_transfer_impersonation = WT_TRANSFER_IMPERSONATION_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_default = WT_EXECUTEDEFAULT_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_io_thread = WT_EXECUTEINIOTHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_ui_thread = WT_EXECUTEINUITHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_wait_thread = WT_EXECUTEINWAITTHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_only_once = WT_EXECUTEONLYONCE_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_timer_thread = WT_EXECUTEINTIMERTHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_long_function = WT_EXECUTELONGFUNCTION_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_persistent_io_thread = WT_EXECUTEINPERSISTENTIOTHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_execute_in_persistent_thread = WT_EXECUTEINPERSISTENTTHREAD_;
+BOOST_CONSTEXPR_OR_CONST ULONG_ wt_transfer_impersonation = WT_TRANSFER_IMPERSONATION_;
 
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
 #endif // BOOST_WINAPI_THREAD_POOL_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/time.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/time.hpp
index 9b11cad42a..59e969bfb9 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/time.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/time.hpp
@@ -11,6 +11,7 @@
 #define BOOST_WINAPI_TIME_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -21,32 +22,32 @@ extern "C" {
 struct _FILETIME;
 struct _SYSTEMTIME;
 
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 GetSystemTime(::_SYSTEMTIME* lpSystemTime);
 
 #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME  // Windows CE does not define GetSystemTimeAsFileTime
-BOOST_SYMBOL_IMPORT boost::winapi::VOID_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::VOID_ BOOST_WINAPI_WINAPI_CC
 GetSystemTimeAsFileTime(::_FILETIME* lpSystemTimeAsFileTime);
 #endif
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 SystemTimeToFileTime(
     const ::_SYSTEMTIME* lpSystemTime,
     ::_FILETIME* lpFileTime);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FileTimeToSystemTime(
     const ::_FILETIME* lpFileTime,
     ::_SYSTEMTIME* lpSystemTime);
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 FileTimeToLocalFileTime(
     const ::_FILETIME* lpFileTime,
     ::_FILETIME* lpLocalFileTime);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 LocalFileTimeToFileTime(
     const ::_FILETIME* lpLocalFileTime,
     ::_FILETIME* lpFileTime);
@@ -54,12 +55,12 @@ LocalFileTimeToFileTime(
 #endif // BOOST_WINAPI_PARTITION_APP_SYSTEM
 
 #if BOOST_WINAPI_PARTITION_DESKTOP_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 GetTickCount(BOOST_WINAPI_DETAIL_VOID);
 #endif // BOOST_WINAPI_PARTITION_DESKTOP_SYSTEM
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
-BOOST_SYMBOL_IMPORT boost::winapi::ULONGLONG_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::ULONGLONG_ BOOST_WINAPI_WINAPI_CC
 GetTickCount64(BOOST_WINAPI_DETAIL_VOID);
 #endif
 
@@ -137,4 +138,6 @@ BOOST_FORCEINLINE VOID_ GetSystemTimeAsFileTime(FILETIME_* lpFileTime)
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_TIME_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/timers.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/timers.hpp
index e288105df1..146c870b68 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/timers.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/timers.hpp
@@ -10,6 +10,7 @@
 #define BOOST_WINAPI_TIMERS_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,10 +18,10 @@
 
 #if !defined( BOOST_USE_WINDOWS_H )
 extern "C" {
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 QueryPerformanceCounter(::_LARGE_INTEGER* lpPerformanceCount);
 
-BOOST_SYMBOL_IMPORT boost::winapi::BOOL_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 QueryPerformanceFrequency(::_LARGE_INTEGER* lpFrequency);
 } // extern "C"
 #endif
@@ -42,4 +43,6 @@ BOOST_FORCEINLINE BOOL_ QueryPerformanceFrequency(LARGE_INTEGER_* lpFrequency)
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_TIMERS_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/wait.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/wait.hpp
index 5619e1c914..23409b1db9 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/wait.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/wait.hpp
@@ -11,6 +11,8 @@
 #define BOOST_WINAPI_WAIT_HPP_INCLUDED_
 
 #include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/wait_constants.hpp>
+#include <boost/winapi/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -20,7 +22,7 @@
 extern "C" {
 
 #if BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 WaitForSingleObjectEx(
     boost::winapi::HANDLE_ hHandle,
     boost::winapi::DWORD_ dwMilliseconds,
@@ -29,7 +31,7 @@ WaitForSingleObjectEx(
 
 #if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_NT4
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 SignalObjectAndWait(
     boost::winapi::HANDLE_ hObjectToSignal,
     boost::winapi::HANDLE_ hObjectToWaitOn,
@@ -39,19 +41,19 @@ SignalObjectAndWait(
 #endif
 
 #if BOOST_WINAPI_PARTITION_APP_SYSTEM
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 WaitForSingleObject(
     boost::winapi::HANDLE_ hHandle,
     boost::winapi::DWORD_ dwMilliseconds);
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT_EXCEPT_WM boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 WaitForMultipleObjects(
     boost::winapi::DWORD_ nCount,
     boost::winapi::HANDLE_ const* lpHandles,
     boost::winapi::BOOL_ bWaitAll,
     boost::winapi::DWORD_ dwMilliseconds);
 
-BOOST_SYMBOL_IMPORT boost::winapi::DWORD_ WINAPI
+BOOST_WINAPI_IMPORT boost::winapi::DWORD_ BOOST_WINAPI_WINAPI_CC
 WaitForMultipleObjectsEx(
     boost::winapi::DWORD_ nCount,
     boost::winapi::HANDLE_ const* lpHandles,
@@ -81,33 +83,9 @@ using ::WaitForMultipleObjectsEx;
 using ::WaitForSingleObject;
 #endif
 
-#if defined( BOOST_USE_WINDOWS_H )
-
-const DWORD_ INFINITE_ = INFINITE;
-const DWORD_ WAIT_ABANDONED_ = WAIT_ABANDONED;
-const DWORD_ WAIT_OBJECT_0_ = WAIT_OBJECT_0;
-const DWORD_ WAIT_TIMEOUT_ = WAIT_TIMEOUT;
-const DWORD_ WAIT_FAILED_ = WAIT_FAILED;
-
-#else // defined( BOOST_USE_WINDOWS_H )
-
-const DWORD_ INFINITE_ = (DWORD_)0xFFFFFFFF;
-const DWORD_ WAIT_ABANDONED_ = 0x00000080L;
-const DWORD_ WAIT_OBJECT_0_ = 0x00000000L;
-const DWORD_ WAIT_TIMEOUT_ = 0x00000102L;
-const DWORD_ WAIT_FAILED_ = (DWORD_)0xFFFFFFFF;
-
-#endif // defined( BOOST_USE_WINDOWS_H )
-
-const DWORD_ infinite = INFINITE_;
-const DWORD_ wait_abandoned = WAIT_ABANDONED_;
-const DWORD_ wait_object_0 = WAIT_OBJECT_0_;
-const DWORD_ wait_timeout = WAIT_TIMEOUT_;
-const DWORD_ wait_failed = WAIT_FAILED_;
-
-const DWORD_ max_non_infinite_wait = (DWORD_)0xFFFFFFFE;
-
 }
 }
 
+#include <boost/winapi/detail/footer.hpp>
+
 #endif // BOOST_WINAPI_WAIT_HPP_INCLUDED_
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/wait_constants.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/wait_constants.hpp
new file mode 100644
index 0000000000..867b74fead
--- /dev/null
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/wait_constants.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 Andrey Semashev
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef BOOST_WINAPI_WAIT_CONSTANTS_HPP_INCLUDED_
+#define BOOST_WINAPI_WAIT_CONSTANTS_HPP_INCLUDED_
+
+#include <boost/winapi/basic_types.hpp>
+#include <boost/winapi/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+namespace winapi {
+
+#if defined( BOOST_USE_WINDOWS_H )
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ INFINITE_ = INFINITE;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_ABANDONED_ = WAIT_ABANDONED;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_OBJECT_0_ = WAIT_OBJECT_0;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_TIMEOUT_ = WAIT_TIMEOUT;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_FAILED_ = WAIT_FAILED;
+
+#else // defined( BOOST_USE_WINDOWS_H )
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ INFINITE_ = (DWORD_)0xFFFFFFFF;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_ABANDONED_ = 0x00000080L;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_OBJECT_0_ = 0x00000000L;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_TIMEOUT_ = 0x00000102L;
+BOOST_CONSTEXPR_OR_CONST DWORD_ WAIT_FAILED_ = (DWORD_)0xFFFFFFFF;
+
+#endif // defined( BOOST_USE_WINDOWS_H )
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ infinite = INFINITE_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ wait_abandoned = WAIT_ABANDONED_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ wait_object_0 = WAIT_OBJECT_0_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ wait_timeout = WAIT_TIMEOUT_;
+BOOST_CONSTEXPR_OR_CONST DWORD_ wait_failed = WAIT_FAILED_;
+
+BOOST_CONSTEXPR_OR_CONST DWORD_ max_non_infinite_wait = (DWORD_)0xFFFFFFFE;
+
+}
+}
+
+#include <boost/winapi/detail/footer.hpp>
+
+#endif // BOOST_WINAPI_WAIT_CONSTANTS_HPP_INCLUDED_
author	robot-contrib <robot-contrib@yandex-team.com>	2022-08-07 12:52:35 +0300
committer	robot-contrib <robot-contrib@yandex-team.com>	2022-08-07 12:52:35 +0300
commit	a89864f26dfb8bf11af76e9b244ccf1f6961d269 (patch)
tree	c860d16dc1fb686040c1e624b1881c3f277c38a9
parent	fcfbfb700bf5a793fdf567904816af30c8261375 (diff)
download	ydb-a89864f26dfb8bf11af76e9b244ccf1f6961d269.tar.gz