Major gcm emulation improvements

Improved RSX DMA support (WIP)
OpenGL: improved vertex textures support
2016-07-08 21:15:27 +03:00 · 2016-07-04 21:17:23 +03:00
892 changed files with 66751 additions and 132425 deletions
@@ -1,33 +0,0 @@
-Standard: Cpp11
-UseTab: ForIndentation
-TabWidth: 1
-IndentWidth: 1
-AccessModifierOffset: -1
-PointerAlignment: Left
-NamespaceIndentation: All
-ColumnLimit: 200
-BreakBeforeBraces: Allman
-BreakConstructorInitializersBeforeComma: true
-BreakBeforeBinaryOperators: false
-BreakBeforeTernaryOperators: false
-AlwaysBreakTemplateDeclarations: true
-AllowShortIfStatementsOnASingleLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: false
-AllowShortLoopsOnASingleLine: true
-Cpp11BracedListStyle: true
-IndentCaseLabels: false
-SortIncludes: false
-ReflowComments: true
-AlignConsecutiveAssignments: true
-AlignTrailingComments: true
-AlignAfterOpenBracket: DontAlign
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-BinPackArguments: true
-BinPackParameters: true
-AlwaysBreakAfterReturnType: None
-KeepEmptyLinesAtTheStartOfBlocks: true
-IndentWrappedFunctionNames: false
-
-#SpaceAfterTemplateKeyword: false
@@ -1,7 +0,0 @@
-root = true
-
-[*.{h,cpp,hpp}]
-charset = utf-8
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
@@ -1,24 +0,0 @@
-<!---
-
-THIS IS NOT A SUPPORT FORUM, FOR SUPPORT GO TO:
-https://forums.rpcs3.net
-or our discord:
-https://discord.me/RPCS3
-
-PLEASE READ THE GUIDELINES BEFORE OPENING AN ISSUE:
-https://github.com/RPCS3/rpcs3/blob/master/CONTRIBUTING.md
-
-====================================================
-
-When submitting an issue, please check the following:
-
- You have read the above.
- You have provided the version (commit hash) of RPCS3 you are using.
- You have provided sufficient detail for the issue to be reproduced.
- You have provided system specs.
- Please also provide:
-  - For crashes, a backtrace.
-  - For graphical issues, comparison screenshots with real hardware.
-
-Remember that the GitHub Issue Tracker is not the place to ask for support or to submit Game Compatibility reports. You must use our forums for that.
--->
@@ -41,10 +41,7 @@
 /Vulkan/Vulkan-build
 /Vulkan/glslang-build

-# Themes
-!/bin/GuiConfigs/
-/bin/GuiConfigs/*.ini
-
+/wxWidgets/lib
 /bin/rpcs3.ini
 /bin/rpcs3.ipdb
 /bin/rpcs3.iobj
@@ -58,12 +55,9 @@
 rpcs3/git-version.h

 # Visual Studio Files
-.vs/*
-*.ipch
 *.vspx
 *.psess
 *.VC.*
-*.vcxproj.user

 # Copyrighted files
 /bin/data/
@@ -75,7 +69,6 @@ rpcs3/git-version.h
 !/bin/dev_hdd0/game/
 /bin/dev_hdd0/game/*
 !/bin/dev_hdd0/game/TEST12345/
-/bin/dev_hdd0/disc/*

 # Ignore other system generated files
 bin/dev_hdd0/*.txt
@@ -92,9 +85,3 @@ CMakeCache.txt
 # cotire
 rpcs3/cotire/*
 rpcs3/rpcs3_*_cotire.cmake
-
-# Qt
-moc_*.cpp
-qrc_resources.cpp
-rpcs3_automoc.cpp
-ui_*.h
@@ -1,3 +1,7 @@
+[submodule "wxWidgets"]
+	path = wxWidgets
+	url = https://github.com/wxWidgets/wxWidgets
+	ignore = dirty
 [submodule "rpcs3-ffmpeg"]
 	path = 3rdparty/ffmpeg
 	url = https://github.com/hrydgard/ppsspp-ffmpeg
@@ -8,13 +12,16 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_50
+	branch = release_36
+[submodule "rsx_program_decompiler"]
+	path = rsx_program_decompiler
+	url = https://github.com/RPCS3/rsx_program_decompiler
 [submodule "GSL"]
 	path = 3rdparty/GSL
 	url = https://github.com/Microsoft/GSL.git
 [submodule "libpng"]
 	path = 3rdparty/libpng
-	url = https://github.com/Zangetsu38/libpng
+	url = https://github.com/RPCS3/libpng
 	ignore = dirty
 [submodule "Vulkan/glslang"]
 	path = Vulkan/glslang
@@ -28,13 +35,3 @@
 [submodule "3rdparty/pugixml"]
 	path = 3rdparty/pugixml
 	url = https://github.com/RPCS3/pugixml
-[submodule "3rdparty/cereal"]
-	path = 3rdparty/cereal
-	url = https://github.com/USCiLab/cereal.git
-[submodule "3rdparty/zlib"]
-	path = 3rdparty/zlib
-	url = https://github.com/madler/zlib
-[submodule "3rdparty/hidapi"]
-	path = 3rdparty/hidapi
-	url = https://github.com/Zangetsu38/hidapi
-	branch = master
@@ -1,3 +1,3 @@
 {
-  "userBlacklist": ["AlexAltea", "tambry", "DHrpcs3"]
+  "userBlacklist": ["AlexAltea", "tambry"]
 }
@@ -1,122 +1,90 @@
 language: cpp
 sudo: required
+dist: trusty

 os:
-  - linux
-  #- osx
+ - linux
+ - osx

-# osx_image: xcode6.4
+osx_image: xcode6.4

 compiler:
-  - clang
-  - gcc
+ - clang
+ - gcc

-cache:
-  ccache: true
-  directories:
-    - $HOME/hombebrew_cache
+env:
+  global:
+   - secure: "Vf+FY48nip9JppMnq11105NealdErSWsoUhHo63/V3V+LKfA9guenxCp93/qoSIdSGC/sJwb0yIIMGvkTT/rxDJNh6Z+BWUTb2E0WEIIQbvTJNOSUzoq7dfF1LT61XjVjByFzcbC2xjtaBowmcAYEs1jGUUuEjYVCMmD5lY8hUg="
+   # Which Travis environment to run Coverity on
+   - coverity_scan_run_condition='"$TRAVIS_OS_NAME" = linux -a "$CC" = gcc'
+   # Test mode is for testing if it's working with Coverity. Change to true if testing, to avoid reaching the quota.
+   - coverity_scan_script_test_mode=false

 matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
+ exclude:
+  - os: osx
+    compiler: gcc

 git:
  submodules: false

 before_install:
-  - if [ "$CC" = "clang" ]; then
-      export CXX="clang++-4.0" CC="clang-4.0";
-    fi;    
+# shutdown services on Travis, which may have a memory impact
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get install -y libwxgtk3.0-dev;
+    fi;
  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
      export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
+      export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01';
    fi;
+# Add coverall for C++ so coverall.io could be triggered. Even it should be --coverage and gcov.
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      wget http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run ;
-      chmod a+x ./qt-unified-linux-x64-online.run ;
-      export QT_QPA_PLATFORM=minimal ;
-      ./qt-unified-linux-x64-online.run --script qt-installer-noninteractive.qs --no-force-installations ;
-    fi;
-
-  # Install updated libglew-dev since the version provided by trusty is outdated
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_amd64.deb;
-      wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_amd64.deb;
-      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
-      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
-      sudo dpkg -i libglew1.13_1.13.0-2_amd64.deb libglew-dev_1.13.0-2_amd64.deb libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
+      sudo pip install cpp-coveralls requests[security];
    else
-      brew update;
-      brew install ccache glew llvm40;
+      brew update; brew update;
+      brew install glew wxwidgets llvm36;
    fi;

 before_script:
-  - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
-  - mkdir build
-  - cd build
-  - export CMAKE_PREFIX_PATH=~/Qt/5.9.1/gcc_64/lib/cmake
-  - if [ "$TRAVIS_PULL_REQUEST" = false ]; then
-      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH";
-    else
-      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST";
-    fi;
-  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr;
-  - make -j 3
-  - # AppImage generation
-  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
-      export LD_LIBRARY_PATH=~/Qt/5.9.1/gcc_64/lib;
-      make DESTDIR=appdir install ; find appdir/ ;
-      find ../bin ;
-      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; 
-      chmod a+x linuxdeployqt*.AppImage ;
-      export PATH=~/Qt/5.9.1/gcc_64/bin/:${PATH} ;
-      ./linuxdeployqt*.AppImage --appimage-extract ;
-      ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs ;
-      mkdir ./appdir/usr/plugins/xcbglintegrations/ ; 
-      mkdir ./appdir/usr/plugins/imageformats/ ;
-      cp ~/Qt/5.9.1/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ;
-      cp ~/Qt/5.9.1/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ;
-      cp ~/Qt/5.9.1/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ;
-      cp ~/Qt/5.9.1/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ;
-      export PATH=${TRAVIS_BUILD_DIR}/build/squashfs-root/usr/bin/:${PATH} ;
-      ./squashfs-root/usr/bin/appimagetool ${TRAVIS_BUILD_DIR}/build/appdir ;
-      find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
-      curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}_linux64 --upload-file ./RPCS3*.AppImage;
-   fi;
+ - git submodule update --init rsx_program_decompiler asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
+ - mkdir build
+ - cd build
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi

 script:
-  # Add a command to show all the variables. May be useful for debugging Travis.
-  #- echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
-  # And to ensure the versions of toolchain
-  - echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
+# Add a command to show all the variables. May be useful for debugging Travis.
+# - echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
+# And to ensure the versions of toolchain
+- echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
+- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 4; fi

 addons:
  apt:
    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-4.0
-      - sourceline: 'ppa:jonathonf/binutils' # We need to update binutils to a newer version to link against the ffmpeg libs on.
+    - ubuntu-toolchain-r-test
+#    - llvm-toolchain-trusty-3.6 temporarily disabled
    packages:
-      - binutils
-      - cmake
-      - libasound2-dev
-      - libopenal-dev
-      - freeglut3-dev
-      #- libglew-dev
-      #- libvulkan1
-      #- libvulkan-dev
-      - libc6-dev
-      - llvm-4.0
-      - llvm-4.0-dev
-      - clang-4.0
-      - libedit-dev
-      - g++-5
-      - gcc-5
-      - libstdc++-5-dev
-      - lib32stdc++6
-      - zlib1g-dev
-      # We need to install qt 5.9.1 manually because the version trusty provides is too old.
-      #- qtbase5-dev
-      - libudev-dev
-      - libevdev-dev
-      - libpulse-dev
+    - cmake
+    - libopenal-dev
+    - freeglut3-dev
+    - libglew-dev
+    - libc6-dev
+#    - llvm-3.6
+#    - llvm-3.6-dev
+    - libedit-dev
+    - g++-5
+    - gcc-5
+#    - clang-3.6
+    - libstdc++-5-dev
+    - lib32stdc++6
+    - zlib1g-dev
+  coverity_scan:
+    project:
+      name: $TRAVIS_REPO_SLUG
+      description: "PS3 emulator/debugger"
+    notification_email: raul.tambre@gmail.com
+    build_command: "make -j 4"
+    branch_pattern: coverity_scan
+
+after_success:
+- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi
@@ -6,7 +6,7 @@ extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2017 The Khronos Group Inc.
+** Copyright (c) 2013-2014 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -31,7 +31,9 @@ extern "C" {
 ** This header is generated from the Khronos OpenGL / OpenGL ES XML
 ** API Registry. The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
-**   https://github.com/KhronosGroup/OpenGL-Registry
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 31191 $ on $Date: 2015-05-14 06:31:39 -0400 (Thu, 14 May 2015) $
 */

 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
@@ -51,7 +53,7 @@ extern "C" {
 #define GLAPI extern
 #endif

-#define GL_GLEXT_VERSION 20170305
+#define GL_GLEXT_VERSION 20150514

 /* Generated C header for:
 * API: gl
@@ -2652,7 +2654,7 @@ typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint fram
 typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
 typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
 typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil);
 typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target);
 typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param);
@@ -2775,7 +2777,7 @@ GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLs
 GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
 GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
 GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
-GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, const GLfloat depth, GLint stencil);
 GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target);
 GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param);
@@ -2873,17 +2875,6 @@ GLAPI void APIENTRY glTextureBarrier (void);
 #define GL_ARB_ES3_1_compatibility 1
 #endif /* GL_ARB_ES3_1_compatibility */

-#ifndef GL_ARB_ES3_2_compatibility
-#define GL_ARB_ES3_2_compatibility 1
-#define GL_PRIMITIVE_BOUNDING_BOX_ARB     0x92BE
-#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381
-#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382
-typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveBoundingBoxARB (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-#endif
-#endif /* GL_ARB_ES3_2_compatibility */
-
 #ifndef GL_ARB_ES3_compatibility
 #define GL_ARB_ES3_compatibility 1
 #endif /* GL_ARB_ES3_compatibility */
@@ -3297,10 +3288,6 @@ GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
 #define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
 #endif /* GL_ARB_fragment_shader */

-#ifndef GL_ARB_fragment_shader_interlock
-#define GL_ARB_fragment_shader_interlock 1
-#endif /* GL_ARB_fragment_shader_interlock */
-
 #ifndef GL_ARB_framebuffer_no_attachments
 #define GL_ARB_framebuffer_no_attachments 1
 #endif /* GL_ARB_framebuffer_no_attachments */
@@ -3353,16 +3340,6 @@ GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachmen
 #define GL_ARB_get_texture_sub_image 1
 #endif /* GL_ARB_get_texture_sub_image */

-#ifndef GL_ARB_gl_spirv
-#define GL_ARB_gl_spirv 1
-#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551
-#define GL_SPIR_V_BINARY_ARB              0x9552
-typedef void (APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpecializeShaderARB (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
-#endif
-#endif /* GL_ARB_gl_spirv */
-
 #ifndef GL_ARB_gpu_shader5
 #define GL_ARB_gpu_shader5 1
 #endif /* GL_ARB_gpu_shader5 */
@@ -3371,91 +3348,6 @@ GLAPI void APIENTRY glSpecializeShaderARB (GLuint shader, const GLchar *pEntryPo
 #define GL_ARB_gpu_shader_fp64 1
 #endif /* GL_ARB_gpu_shader_fp64 */

-#ifndef GL_ARB_gpu_shader_int64
-#define GL_ARB_gpu_shader_int64 1
-#define GL_INT64_ARB                      0x140E
-#define GL_INT64_VEC2_ARB                 0x8FE9
-#define GL_INT64_VEC3_ARB                 0x8FEA
-#define GL_INT64_VEC4_ARB                 0x8FEB
-#define GL_UNSIGNED_INT64_VEC2_ARB        0x8FF5
-#define GL_UNSIGNED_INT64_VEC3_ARB        0x8FF6
-#define GL_UNSIGNED_INT64_VEC4_ARB        0x8FF7
-typedef void (APIENTRYP PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x);
-typedef void (APIENTRYP PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y);
-typedef void (APIENTRYP PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z);
-typedef void (APIENTRYP PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
-typedef void (APIENTRYP PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x);
-typedef void (APIENTRYP PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y);
-typedef void (APIENTRYP PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
-typedef void (APIENTRYP PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
-typedef void (APIENTRYP PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64 *params);
-typedef void (APIENTRYP PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
-typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniform1i64ARB (GLint location, GLint64 x);
-GLAPI void APIENTRY glUniform2i64ARB (GLint location, GLint64 x, GLint64 y);
-GLAPI void APIENTRY glUniform3i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z);
-GLAPI void APIENTRY glUniform4i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
-GLAPI void APIENTRY glUniform1i64vARB (GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glUniform2i64vARB (GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glUniform3i64vARB (GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glUniform4i64vARB (GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glUniform1ui64ARB (GLint location, GLuint64 x);
-GLAPI void APIENTRY glUniform2ui64ARB (GLint location, GLuint64 x, GLuint64 y);
-GLAPI void APIENTRY glUniform3ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
-GLAPI void APIENTRY glUniform4ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
-GLAPI void APIENTRY glUniform1ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glUniform2ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glUniform3ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glUniform4ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glGetUniformi64vARB (GLuint program, GLint location, GLint64 *params);
-GLAPI void APIENTRY glGetUniformui64vARB (GLuint program, GLint location, GLuint64 *params);
-GLAPI void APIENTRY glGetnUniformi64vARB (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
-GLAPI void APIENTRY glGetnUniformui64vARB (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
-GLAPI void APIENTRY glProgramUniform1i64ARB (GLuint program, GLint location, GLint64 x);
-GLAPI void APIENTRY glProgramUniform2i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y);
-GLAPI void APIENTRY glProgramUniform3i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
-GLAPI void APIENTRY glProgramUniform4i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
-GLAPI void APIENTRY glProgramUniform1i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glProgramUniform2i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glProgramUniform3i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glProgramUniform4i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
-GLAPI void APIENTRY glProgramUniform1ui64ARB (GLuint program, GLint location, GLuint64 x);
-GLAPI void APIENTRY glProgramUniform2ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y);
-GLAPI void APIENTRY glProgramUniform3ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
-GLAPI void APIENTRY glProgramUniform4ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
-GLAPI void APIENTRY glProgramUniform1ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glProgramUniform2ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glProgramUniform3ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-GLAPI void APIENTRY glProgramUniform4ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
-#endif
-#endif /* GL_ARB_gpu_shader_int64 */
-
 #ifndef GL_ARB_half_float_pixel
 #define GL_ARB_half_float_pixel 1
 typedef unsigned short GLhalfARB;
@@ -3835,16 +3727,6 @@ GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *par
 #define GL_ARB_occlusion_query2 1
 #endif /* GL_ARB_occlusion_query2 */

-#ifndef GL_ARB_parallel_shader_compile
-#define GL_ARB_parallel_shader_compile 1
-#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0
-#define GL_COMPLETION_STATUS_ARB          0x91B1
-typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMaxShaderCompilerThreadsARB (GLuint count);
-#endif
-#endif /* GL_ARB_parallel_shader_compile */
-
 #ifndef GL_ARB_pipeline_statistics_query
 #define GL_ARB_pipeline_statistics_query 1
 #define GL_VERTICES_SUBMITTED_ARB         0x82EE
@@ -3887,10 +3769,6 @@ GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
 #define GL_COORD_REPLACE_ARB              0x8862
 #endif /* GL_ARB_point_sprite */

-#ifndef GL_ARB_post_depth_coverage
-#define GL_ARB_post_depth_coverage 1
-#endif /* GL_ARB_post_depth_coverage */
-
 #ifndef GL_ARB_program_interface_query
 #define GL_ARB_program_interface_query 1
 #endif /* GL_ARB_program_interface_query */
@@ -3964,26 +3842,6 @@ GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum form
 #define GL_ARB_robustness_isolation 1
 #endif /* GL_ARB_robustness_isolation */

-#ifndef GL_ARB_sample_locations
-#define GL_ARB_sample_locations 1
-#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D
-#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E
-#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F
-#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340
-#define GL_SAMPLE_LOCATION_ARB            0x8E50
-#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341
-#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342
-#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343
-typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESARBPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFramebufferSampleLocationsfvARB (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvARB (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glEvaluateDepthValuesARB (void);
-#endif
-#endif /* GL_ARB_sample_locations */
-
 #ifndef GL_ARB_sample_shading
 #define GL_ARB_sample_shading 1
 #define GL_SAMPLE_SHADING_ARB             0x8C36
@@ -4010,26 +3868,14 @@ GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
 #define GL_ARB_separate_shader_objects 1
 #endif /* GL_ARB_separate_shader_objects */

-#ifndef GL_ARB_shader_atomic_counter_ops
-#define GL_ARB_shader_atomic_counter_ops 1
-#endif /* GL_ARB_shader_atomic_counter_ops */
-
 #ifndef GL_ARB_shader_atomic_counters
 #define GL_ARB_shader_atomic_counters 1
 #endif /* GL_ARB_shader_atomic_counters */

-#ifndef GL_ARB_shader_ballot
-#define GL_ARB_shader_ballot 1
-#endif /* GL_ARB_shader_ballot */
-
 #ifndef GL_ARB_shader_bit_encoding
 #define GL_ARB_shader_bit_encoding 1
 #endif /* GL_ARB_shader_bit_encoding */

-#ifndef GL_ARB_shader_clock
-#define GL_ARB_shader_clock 1
-#endif /* GL_ARB_shader_clock */
-
 #ifndef GL_ARB_shader_draw_parameters
 #define GL_ARB_shader_draw_parameters 1
 #endif /* GL_ARB_shader_draw_parameters */
@@ -4194,10 +4040,6 @@ GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GL
 #define GL_ARB_shader_texture_lod 1
 #endif /* GL_ARB_shader_texture_lod */

-#ifndef GL_ARB_shader_viewport_layer_array
-#define GL_ARB_shader_viewport_layer_array 1
-#endif /* GL_ARB_shader_viewport_layer_array */
-
 #ifndef GL_ARB_shading_language_100
 #define GL_ARB_shading_language_100 1
 #define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
@@ -4277,14 +4119,6 @@ GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xo
 #endif
 #endif /* GL_ARB_sparse_texture */

-#ifndef GL_ARB_sparse_texture2
-#define GL_ARB_sparse_texture2 1
-#endif /* GL_ARB_sparse_texture2 */
-
-#ifndef GL_ARB_sparse_texture_clamp
-#define GL_ARB_sparse_texture_clamp 1
-#endif /* GL_ARB_sparse_texture_clamp */
-
 #ifndef GL_ARB_stencil_texturing
 #define GL_ARB_stencil_texturing 1
 #endif /* GL_ARB_stencil_texturing */
@@ -4437,12 +4271,6 @@ GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void
 #define GL_DOT3_RGBA_ARB                  0x86AF
 #endif /* GL_ARB_texture_env_dot3 */

-#ifndef GL_ARB_texture_filter_minmax
-#define GL_ARB_texture_filter_minmax 1
-#define GL_TEXTURE_REDUCTION_MODE_ARB     0x9366
-#define GL_WEIGHTED_AVERAGE_ARB           0x9367
-#endif /* GL_ARB_texture_filter_minmax */
-
 #ifndef GL_ARB_texture_float
 #define GL_ARB_texture_float 1
 #define GL_TEXTURE_RED_TYPE_ARB           0x8C10
@@ -4987,10 +4815,6 @@ GLAPI void APIENTRY glBlendBarrierKHR (void);
 #define GL_KHR_texture_compression_astc_ldr 1
 #endif /* GL_KHR_texture_compression_astc_ldr */

-#ifndef GL_KHR_texture_compression_astc_sliced_3d
-#define GL_KHR_texture_compression_astc_sliced_3d 1
-#endif /* GL_KHR_texture_compression_astc_sliced_3d */
-
 #ifndef GL_OES_byte_coordinates
 #define GL_OES_byte_coordinates 1
 typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
@@ -5382,45 +5206,10 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG
 #endif
 #endif /* GL_AMD_draw_buffers_blend */

-#ifndef GL_AMD_framebuffer_sample_positions
-#define GL_AMD_framebuffer_sample_positions 1
-#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
-#define GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD 0x91AE
-#define GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD 0x91AF
-#define GL_ALL_PIXELS_AMD                 0xFFFFFFFF
-typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC) (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
-typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC) (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFramebufferSamplePositionsfvAMD (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
-GLAPI void APIENTRY glNamedFramebufferSamplePositionsfvAMD (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
-GLAPI void APIENTRY glGetFramebufferParameterfvAMD (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
-GLAPI void APIENTRY glGetNamedFramebufferParameterfvAMD (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
-#endif
-#endif /* GL_AMD_framebuffer_sample_positions */
-
 #ifndef GL_AMD_gcn_shader
 #define GL_AMD_gcn_shader 1
 #endif /* GL_AMD_gcn_shader */

-#ifndef GL_AMD_gpu_shader_half_float
-#define GL_AMD_gpu_shader_half_float 1
-#define GL_FLOAT16_NV                     0x8FF8
-#define GL_FLOAT16_VEC2_NV                0x8FF9
-#define GL_FLOAT16_VEC3_NV                0x8FFA
-#define GL_FLOAT16_VEC4_NV                0x8FFB
-#define GL_FLOAT16_MAT2_AMD               0x91C5
-#define GL_FLOAT16_MAT3_AMD               0x91C6
-#define GL_FLOAT16_MAT4_AMD               0x91C7
-#define GL_FLOAT16_MAT2x3_AMD             0x91C8
-#define GL_FLOAT16_MAT2x4_AMD             0x91C9
-#define GL_FLOAT16_MAT3x2_AMD             0x91CA
-#define GL_FLOAT16_MAT3x4_AMD             0x91CB
-#define GL_FLOAT16_MAT4x2_AMD             0x91CC
-#define GL_FLOAT16_MAT4x3_AMD             0x91CD
-#endif /* GL_AMD_gpu_shader_half_float */
-
 #ifndef GL_AMD_gpu_shader_int64
 #define GL_AMD_gpu_shader_int64 1
 typedef int64_t GLint64EXT;
@@ -5448,6 +5237,10 @@ typedef int64_t GLint64EXT;
 #define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
 #define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
 #define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
 typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
 typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
 typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
@@ -5620,6 +5413,7 @@ GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname

 #ifndef GL_AMD_sample_positions
 #define GL_AMD_sample_positions 1
+#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
 typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
@@ -5634,14 +5428,6 @@ GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLf
 #define GL_AMD_shader_atomic_counter_ops 1
 #endif /* GL_AMD_shader_atomic_counter_ops */

-#ifndef GL_AMD_shader_ballot
-#define GL_AMD_shader_ballot 1
-#endif /* GL_AMD_shader_ballot */
-
-#ifndef GL_AMD_shader_explicit_vertex_parameter
-#define GL_AMD_shader_explicit_vertex_parameter 1
-#endif /* GL_AMD_shader_explicit_vertex_parameter */
-
 #ifndef GL_AMD_shader_stencil_export
 #define GL_AMD_shader_stencil_export 1
 #endif /* GL_AMD_shader_stencil_export */
@@ -8682,20 +8468,6 @@ GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei s
 #endif
 #endif /* GL_EXT_vertex_weighting */

-#ifndef GL_EXT_window_rectangles
-#define GL_EXT_window_rectangles 1
-#define GL_INCLUSIVE_EXT                  0x8F10
-#define GL_EXCLUSIVE_EXT                  0x8F11
-#define GL_WINDOW_RECTANGLE_EXT           0x8F12
-#define GL_WINDOW_RECTANGLE_MODE_EXT      0x8F13
-#define GL_MAX_WINDOW_RECTANGLES_EXT      0x8F14
-#define GL_NUM_WINDOW_RECTANGLES_EXT      0x8F15
-typedef void (APIENTRYP PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLint *box);
-#endif
-#endif /* GL_EXT_window_rectangles */
-
 #ifndef GL_EXT_x11_sync_object
 #define GL_EXT_x11_sync_object 1
 #define GL_SYNC_X11_FENCE_EXT             0x90E1
@@ -8873,23 +8645,10 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG
 #define GL_INTERLACE_READ_INGR            0x8568
 #endif /* GL_INGR_interlace_read */

-#ifndef GL_INTEL_conservative_rasterization
-#define GL_INTEL_conservative_rasterization 1
-#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
-#endif /* GL_INTEL_conservative_rasterization */
-
 #ifndef GL_INTEL_fragment_shader_ordering
 #define GL_INTEL_fragment_shader_ordering 1
 #endif /* GL_INTEL_fragment_shader_ordering */

-#ifndef GL_INTEL_framebuffer_CMAA
-#define GL_INTEL_framebuffer_CMAA 1
-typedef void (APIENTRYP PFNGLAPPLYFRAMEBUFFERATTACHMENTCMAAINTELPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyFramebufferAttachmentCMAAINTEL (void);
-#endif
-#endif /* GL_INTEL_framebuffer_CMAA */
-
 #ifndef GL_INTEL_map_texture
 #define GL_INTEL_map_texture 1
 #define GL_TEXTURE_MEMORY_LAYOUT_INTEL    0x83FF
@@ -8994,10 +8753,6 @@ GLAPI void APIENTRY glResizeBuffersMESA (void);
 #endif
 #endif /* GL_MESA_resize_buffers */

-#ifndef GL_MESA_shader_integer_functions
-#define GL_MESA_shader_integer_functions 1
-#endif /* GL_MESA_shader_integer_functions */
-
 #ifndef GL_MESA_window_pos
 #define GL_MESA_window_pos 1
 typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
@@ -9059,10 +8814,6 @@ GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
 #define GL_YCBCR_MESA                     0x8757
 #endif /* GL_MESA_ycbcr_texture */

-#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers
-#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1
-#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */
-
 #ifndef GL_NVX_conditional_render
 #define GL_NVX_conditional_render 1
 typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
@@ -9082,32 +8833,6 @@ GLAPI void APIENTRY glEndConditionalRenderNVX (void);
 #define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
 #endif /* GL_NVX_gpu_memory_info */

-#ifndef GL_NVX_linked_gpu_multicast
-#define GL_NVX_linked_gpu_multicast 1
-#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX  0x0800
-#define GL_MAX_LGPU_GPUS_NVX              0x92BA
-typedef void (APIENTRYP PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
-typedef void (APIENTRYP PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (APIENTRYP PFNGLLGPUINTERLOCKNVXPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLGPUNamedBufferSubDataNVX (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
-GLAPI void APIENTRY glLGPUCopyImageSubDataNVX (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
-GLAPI void APIENTRY glLGPUInterlockNVX (void);
-#endif
-#endif /* GL_NVX_linked_gpu_multicast */
-
-#ifndef GL_NV_alpha_to_coverage_dither_control
-#define GL_NV_alpha_to_coverage_dither_control 1
-#define GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV 0x934D
-#define GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV 0x934E
-#define GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV 0x934F
-#define GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV 0x92BF
-typedef void (APIENTRYP PFNGLALPHATOCOVERAGEDITHERCONTROLNVPROC) (GLenum mode);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAlphaToCoverageDitherControlNV (GLenum mode);
-#endif
-#endif /* GL_NV_alpha_to_coverage_dither_control */
-
 #ifndef GL_NV_bindless_multi_draw_indirect
 #define GL_NV_bindless_multi_draw_indirect 1
 typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
@@ -9228,17 +8953,6 @@ GLAPI void APIENTRY glBlendBarrierNV (void);
 #define GL_NV_blend_square 1
 #endif /* GL_NV_blend_square */

-#ifndef GL_NV_clip_space_w_scaling
-#define GL_NV_clip_space_w_scaling 1
-#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
-#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
-#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
-typedef void (APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
-#endif
-#endif /* GL_NV_clip_space_w_scaling */
-
 #ifndef GL_NV_command_list
 #define GL_NV_command_list 1
 #define GL_TERMINATE_SEQUENCE_COMMAND_NV  0x0000
@@ -9330,28 +9044,6 @@ GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits);
 #endif
 #endif /* GL_NV_conservative_raster */

-#ifndef GL_NV_conservative_raster_dilate
-#define GL_NV_conservative_raster_dilate 1
-#define GL_CONSERVATIVE_RASTER_DILATE_NV  0x9379
-#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A
-#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B
-typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat value);
-#endif
-#endif /* GL_NV_conservative_raster_dilate */
-
-#ifndef GL_NV_conservative_raster_pre_snap_triangles
-#define GL_NV_conservative_raster_pre_snap_triangles 1
-#define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
-#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E
-#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F
-typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param);
-#endif
-#endif /* GL_NV_conservative_raster_pre_snap_triangles */
-
 #ifndef GL_NV_copy_depth_to_color
 #define GL_NV_copy_depth_to_color 1
 #define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
@@ -9401,23 +9093,6 @@ GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0,
 #endif
 #endif /* GL_NV_draw_texture */

-#ifndef GL_NV_draw_vulkan_image
-#define GL_NV_draw_vulkan_image 1
-typedef void (APIENTRY  *GLVULKANPROCNV)(void);
-typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
-typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
-typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
-typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
-GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
-GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore);
-GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore);
-GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence);
-#endif
-#endif /* GL_NV_draw_vulkan_image */
-
 #ifndef GL_NV_evaluators
 #define GL_NV_evaluators 1
 #define GL_EVAL_2D_NV                     0x86C0
@@ -9652,41 +9327,6 @@ GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachmen
 #define GL_NV_geometry_shader_passthrough 1
 #endif /* GL_NV_geometry_shader_passthrough */

-#ifndef GL_NV_gpu_multicast
-#define GL_NV_gpu_multicast 1
-#define GL_PER_GPU_STORAGE_BIT_NV         0x0800
-#define GL_MULTICAST_GPUS_NV              0x92BA
-#define GL_RENDER_GPU_MASK_NV             0x9558
-#define GL_PER_GPU_STORAGE_NV             0x9548
-#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
-typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTICASTBARRIERNVPROC) (void);
-typedef void (APIENTRYP PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask);
-typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask);
-GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glMulticastFramebufferSampleLocationsfvNV (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
-GLAPI void APIENTRY glMulticastBarrierNV (void);
-GLAPI void APIENTRY glMulticastWaitSyncNV (GLuint signalGpu, GLbitfield waitGpuMask);
-GLAPI void APIENTRY glMulticastGetQueryObjectivNV (GLuint gpu, GLuint id, GLenum pname, GLint *params);
-GLAPI void APIENTRY glMulticastGetQueryObjectuivNV (GLuint gpu, GLuint id, GLenum pname, GLuint *params);
-GLAPI void APIENTRY glMulticastGetQueryObjecti64vNV (GLuint gpu, GLuint id, GLenum pname, GLint64 *params);
-GLAPI void APIENTRY glMulticastGetQueryObjectui64vNV (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
-#endif
-#endif /* GL_NV_gpu_multicast */
-
 #ifndef GL_NV_gpu_program4
 #define GL_NV_gpu_program4 1
 #define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
@@ -10396,11 +10036,6 @@ GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname,
 #endif
 #endif /* GL_NV_register_combiners2 */

-#ifndef GL_NV_robustness_video_memory_purge
-#define GL_NV_robustness_video_memory_purge 1
-#define GL_PURGED_CONTEXT_RESET_NV        0x92BB
-#endif /* GL_NV_robustness_video_memory_purge */
-
 #ifndef GL_NV_sample_locations
 #define GL_NV_sample_locations 1
 #define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D
@@ -10433,10 +10068,6 @@ GLAPI void APIENTRY glResolveDepthValuesNV (void);
 #define GL_NV_shader_atomic_float 1
 #endif /* GL_NV_shader_atomic_float */

-#ifndef GL_NV_shader_atomic_float64
-#define GL_NV_shader_atomic_float64 1
-#endif /* GL_NV_shader_atomic_float64 */
-
 #ifndef GL_NV_shader_atomic_fp16_vector
 #define GL_NV_shader_atomic_fp16_vector 1
 #endif /* GL_NV_shader_atomic_fp16_vector */
@@ -10500,10 +10131,6 @@ GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLs
 #define GL_NV_shader_thread_shuffle 1
 #endif /* GL_NV_shader_thread_shuffle */

-#ifndef GL_NV_stereo_view_rendering
-#define GL_NV_stereo_view_rendering 1
-#endif /* GL_NV_stereo_view_rendering */
-
 #ifndef GL_NV_tessellation_program5
 #define GL_NV_tessellation_program5 1
 #define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
@@ -11274,26 +10901,6 @@ GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot
 #define GL_NV_viewport_array2 1
 #endif /* GL_NV_viewport_array2 */

-#ifndef GL_NV_viewport_swizzle
-#define GL_NV_viewport_swizzle 1
-#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350
-#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351
-#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352
-#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353
-#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354
-#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355
-#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356
-#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357
-#define GL_VIEWPORT_SWIZZLE_X_NV          0x9358
-#define GL_VIEWPORT_SWIZZLE_Y_NV          0x9359
-#define GL_VIEWPORT_SWIZZLE_Z_NV          0x935A
-#define GL_VIEWPORT_SWIZZLE_W_NV          0x935B
-typedef void (APIENTRYP PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
-#endif
-#endif /* GL_NV_viewport_swizzle */
-
 #ifndef GL_OML_interlace
 #define GL_OML_interlace 1
 #define GL_INTERLACE_OML                  0x8980
@@ -11321,7 +10928,6 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
 #define GL_MAX_VIEWS_OVR                  0x9631
-#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
@@ -1,25 +0,0 @@
-//---------------------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//
-// This file is automatically generated.  Please do not edit it directly.
-//
-// File name: D2DBaseTypes.h
-//---------------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma once
-#endif // #ifdef _MSC_VER
-
-#ifndef _D2DBASETYPES_INCLUDED
-#define _D2DBASETYPES_INCLUDED
-
-#ifndef COM_NO_WINDOWS_H
-#include <windows.h>
-#endif // #ifndef COM_NO_WINDOWS_H
-#ifndef __dxgitype_h__
-#include <dxgitype.h>
-#endif // #ifndef __dxgitype_h__
-#ifndef DCOMMON_H_INCLUDED
-#include <dcommon.h>
-#endif // #ifndef DCOMMON_H_INCLUDED
-typedef D3DCOLORVALUE D2D_COLOR_F;
-#endif // #ifndef _D2DBASETYPES_INCLUDED
@@ -33,47 +33,53 @@ typedef interface ID2D1Device1 ID2D1Device1;

 #endif

-/// <summary>
-/// Specifies the extent to which D2D will throttle work sent to the GPU.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_RENDERING_PRIORITY
+//
+//  Synopsis:
+//      Specifies the extent to which D2D will throttle work sent to the GPU.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_RENDERING_PRIORITY
 {
-    D2D1_RENDERING_PRIORITY_NORMAL = 0,
-    D2D1_RENDERING_PRIORITY_LOW = 1,
-    D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff
+        D2D1_RENDERING_PRIORITY_NORMAL = 0,
+        D2D1_RENDERING_PRIORITY_LOW = 1,
+        D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff

 } D2D1_RENDERING_PRIORITY;


-EXTERN_C CONST IID IID_ID2D1GeometryRealization;
-EXTERN_C CONST IID IID_ID2D1DeviceContext1;
-EXTERN_C CONST IID IID_ID2D1Device1;
-EXTERN_C CONST IID IID_ID2D1Factory2;
-EXTERN_C CONST IID IID_ID2D1CommandSink1;
-
-
 #ifndef D2D_USE_C_DEFINITIONS


-/// <summary>
-/// Encapsulates a device- and transform-dependent representation of a filled or
-/// stroked geometry.
-/// </summary>
+
+//+-----------------------------------------------------------------------------
+//
+//  Interface:
+//      ID2D1GeometryRealization
+//
+//------------------------------------------------------------------------------
 interface DX_DECLARE_INTERFACE("a16907d7-bc02-4801-99e8-8cf7f485f774") ID2D1GeometryRealization  : public ID2D1Resource
 {
 }; // interface ID2D1GeometryRealization


-/// <summary>
-/// Enables creation and drawing of geometry realization objects.
-/// </summary>
+
+//+-----------------------------------------------------------------------------
+//
+//  Interface:
+//      ID2D1DeviceContext1
+//
+//------------------------------------------------------------------------------
 interface DX_DECLARE_INTERFACE("d37f57e4-6908-459f-a199-e72f24f79987") ID2D1DeviceContext1  : public ID2D1DeviceContext
 {
    
    STDMETHOD(CreateFilledGeometryRealization)(
        _In_ ID2D1Geometry *geometry,
        FLOAT flatteningTolerance,
-        _COM_Outptr_ ID2D1GeometryRealization **geometryRealization 
+        _Outptr_ ID2D1GeometryRealization **geometryRealization 
        ) PURE;
    
    STDMETHOD(CreateStrokedGeometryRealization)(
@@ -81,7 +87,7 @@ interface DX_DECLARE_INTERFACE("d37f57e4-6908-459f-a199-e72f24f79987") ID2D1Devi
        FLOAT flatteningTolerance,
        FLOAT strokeWidth,
        _In_opt_ ID2D1StrokeStyle *strokeStyle,
-        _COM_Outptr_ ID2D1GeometryRealization **geometryRealization 
+        _Outptr_ ID2D1GeometryRealization **geometryRealization 
        ) PURE;
    
    STDMETHOD_(void, DrawGeometryRealization)(
@@ -91,69 +97,82 @@ interface DX_DECLARE_INTERFACE("d37f57e4-6908-459f-a199-e72f24f79987") ID2D1Devi
 }; // interface ID2D1DeviceContext1


-/// <summary>
-/// Represents a resource domain whose objects and device contexts can be used
-/// together.
-/// </summary>
+
+//+-----------------------------------------------------------------------------
+//
+//  Interface:
+//      ID2D1Device1
+//
+//------------------------------------------------------------------------------
 interface DX_DECLARE_INTERFACE("d21768e1-23a4-4823-a14b-7c3eba85d658") ID2D1Device1  : public ID2D1Device
 {
    
-    /// <summary>
-    /// Retrieves the rendering priority currently set on the device.
-    /// </summary>
+    
+    //
+    // Retrieves the rendering priority currently set on the device.
+    //
    STDMETHOD_(D2D1_RENDERING_PRIORITY, GetRenderingPriority)(
        ) PURE;
    
-    /// <summary>
-    /// Sets the rendering priority of the device.
-    /// </summary>
+    
+    //
+    // Sets the rendering priority of the device.
+    //
    STDMETHOD_(void, SetRenderingPriority)(
        D2D1_RENDERING_PRIORITY renderingPriority 
        ) PURE;
    
-    /// <summary>
-    /// Creates a new device context with no initially assigned target.
-    /// </summary>
+    
+    //
+    // Creates a new device context with no initially assigned target.
+    //
    STDMETHOD(CreateDeviceContext)(
        D2D1_DEVICE_CONTEXT_OPTIONS options,
-        _COM_Outptr_ ID2D1DeviceContext1 **deviceContext1 
+        _Outptr_ ID2D1DeviceContext1 **deviceContext1 
        ) PURE;
    
    using ID2D1Device::CreateDeviceContext;
 }; // interface ID2D1Device1


-/// <summary>
-/// Creates Direct2D resources. This interface also enables the creation of
-/// ID2D1Device1 objects.
-/// </summary>
+
+//+-----------------------------------------------------------------------------
+//
+//  Interface:
+//      ID2D1Factory2
+//
+//------------------------------------------------------------------------------
 interface DX_DECLARE_INTERFACE("94f81a73-9212-4376-9c58-b16a3a0d3992") ID2D1Factory2  : public ID2D1Factory1
 {
    
-    /// <summary>
-    /// This creates a new Direct2D device from the given IDXGIDevice.
-    /// </summary>
+    
+    //
+    // This creates a new Direct2D device from the given IDXGIDevice.
+    //
    STDMETHOD(CreateDevice)(
        _In_ IDXGIDevice *dxgiDevice,
-        _COM_Outptr_ ID2D1Device1 **d2dDevice1 
+        _Outptr_ ID2D1Device1 **d2dDevice1 
        ) PURE;
    
    using ID2D1Factory1::CreateDevice;
 }; // interface ID2D1Factory2


-/// <summary>
-/// This interface performs all the same functions as the existing ID2D1CommandSink
-/// interface. It also enables access to the new primitive blend modes, MIN and ADD,
-/// through its SetPrimitiveBlend1 method.
-/// </summary>
+
+//+-----------------------------------------------------------------------------
+//
+//  Interface:
+//      ID2D1CommandSink1
+//
+//------------------------------------------------------------------------------
 interface DX_DECLARE_INTERFACE("9eb767fd-4269-4467-b8c2-eb30cb305743") ID2D1CommandSink1  : public ID2D1CommandSink
 {
    
-    /// <summary>
-    /// This method is called if primitiveBlend value was added after Windows 8.
-    /// SetPrimitiveBlend method is used for Win8 values (_SOURCE_OVER and _COPY).
-    /// </summary>
+    
+    //
+    // This method is called if primitiveBlend value was added after Windows 8.
+    // SetPrimitiveBlend method is used for Win8 values (_SOURCE_OVER and _COPY).
+    //
    STDMETHOD(SetPrimitiveBlend1)(
        D2D1_PRIMITIVE_BLEND primitiveBlend 
        ) PURE;
@@ -164,19 +183,605 @@ interface DX_DECLARE_INTERFACE("9eb767fd-4269-4467-b8c2-eb30cb305743") ID2D1Comm
 #endif


+EXTERN_C CONST IID IID_ID2D1GeometryRealization;
+EXTERN_C CONST IID IID_ID2D1DeviceContext1;
+EXTERN_C CONST IID IID_ID2D1Device1;
+EXTERN_C CONST IID IID_ID2D1Factory2;
+EXTERN_C CONST IID IID_ID2D1CommandSink1;
+
+
 #ifdef D2D_USE_C_DEFINITIONS


 typedef interface ID2D1GeometryRealization ID2D1GeometryRealization;

+typedef struct ID2D1GeometryRealizationVtbl
+{
+    
+    ID2D1ResourceVtbl Base;
+    
+} ID2D1GeometryRealizationVtbl;
+
+interface ID2D1GeometryRealization
+{
+    CONST struct ID2D1GeometryRealizationVtbl *lpVtbl;
+};
+
+
+#define ID2D1GeometryRealization_QueryInterface(This, riid, ppv) \
+    ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv))
+
+#define ID2D1GeometryRealization_AddRef(This) \
+    ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This))
+
+#define ID2D1GeometryRealization_Release(This) \
+    ((This)->lpVtbl->Base.Base.Release((IUnknown *)This))
+
+#define ID2D1GeometryRealization_GetFactory(This, factory) \
+    ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory))
+
 typedef interface ID2D1DeviceContext1 ID2D1DeviceContext1;

+typedef struct ID2D1DeviceContext1Vtbl
+{
+    
+    ID2D1DeviceContextVtbl Base;
+    
+    
+    STDMETHOD(CreateFilledGeometryRealization)(
+        ID2D1DeviceContext1 *This,
+        _In_ ID2D1Geometry *geometry,
+        FLOAT flatteningTolerance,
+        _Outptr_ ID2D1GeometryRealization **geometryRealization 
+        ) PURE;
+    
+    STDMETHOD(CreateStrokedGeometryRealization)(
+        ID2D1DeviceContext1 *This,
+        _In_ ID2D1Geometry *geometry,
+        FLOAT flatteningTolerance,
+        FLOAT strokeWidth,
+        _In_opt_ ID2D1StrokeStyle *strokeStyle,
+        _Outptr_ ID2D1GeometryRealization **geometryRealization 
+        ) PURE;
+    
+    STDMETHOD_(void, DrawGeometryRealization)(
+        ID2D1DeviceContext1 *This,
+        _In_ ID2D1GeometryRealization *geometryRealization,
+        _In_ ID2D1Brush *brush 
+        ) PURE;
+} ID2D1DeviceContext1Vtbl;
+
+interface ID2D1DeviceContext1
+{
+    CONST struct ID2D1DeviceContext1Vtbl *lpVtbl;
+};
+
+
+#define ID2D1DeviceContext1_QueryInterface(This, riid, ppv) \
+    ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv))
+
+#define ID2D1DeviceContext1_AddRef(This) \
+    ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This))
+
+#define ID2D1DeviceContext1_Release(This) \
+    ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This))
+
+#define ID2D1DeviceContext1_GetFactory(This, factory) \
+    ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory))
+
+#define ID2D1DeviceContext1_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \
+    ((This)->lpVtbl->Base.Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap))
+
+#define ID2D1DeviceContext1_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \
+    ((This)->lpVtbl->Base.Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush))
+
+#define ID2D1DeviceContext1_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \
+    ((This)->lpVtbl->Base.Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush))
+
+#define ID2D1DeviceContext1_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \
+    ((This)->lpVtbl->Base.Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush))
+
+#define ID2D1DeviceContext1_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \
+    ((This)->lpVtbl->Base.Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget))
+
+#define ID2D1DeviceContext1_CreateLayer(This, size, layer) \
+    ((This)->lpVtbl->Base.Base.CreateLayer((ID2D1RenderTarget *)This, size, layer))
+
+#define ID2D1DeviceContext1_CreateMesh(This, mesh) \
+    ((This)->lpVtbl->Base.Base.CreateMesh((ID2D1RenderTarget *)This, mesh))
+
+#define ID2D1DeviceContext1_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle))
+
+#define ID2D1DeviceContext1_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle))
+
+#define ID2D1DeviceContext1_FillRectangle(This, rect, brush) \
+    ((This)->lpVtbl->Base.Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush))
+
+#define ID2D1DeviceContext1_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle))
+
+#define ID2D1DeviceContext1_FillRoundedRectangle(This, roundedRect, brush) \
+    ((This)->lpVtbl->Base.Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush))
+
+#define ID2D1DeviceContext1_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle))
+
+#define ID2D1DeviceContext1_FillEllipse(This, ellipse, brush) \
+    ((This)->lpVtbl->Base.Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush))
+
+#define ID2D1DeviceContext1_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle))
+
+#define ID2D1DeviceContext1_FillGeometry(This, geometry, brush, opacityBrush) \
+    ((This)->lpVtbl->Base.Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush))
+
+#define ID2D1DeviceContext1_FillMesh(This, mesh, brush) \
+    ((This)->lpVtbl->Base.Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush))
+
+#define ID2D1DeviceContext1_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \
+    ((This)->lpVtbl->Base.Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode))
+
+#define ID2D1DeviceContext1_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \
+    ((This)->lpVtbl->Base.Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options))
+
+#define ID2D1DeviceContext1_SetTransform(This, transform) \
+    ((This)->lpVtbl->Base.Base.SetTransform((ID2D1RenderTarget *)This, transform))
+
+#define ID2D1DeviceContext1_GetTransform(This, transform) \
+    ((This)->lpVtbl->Base.Base.GetTransform((ID2D1RenderTarget *)This, transform))
+
+#define ID2D1DeviceContext1_SetAntialiasMode(This, antialiasMode) \
+    ((This)->lpVtbl->Base.Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode))
+
+#define ID2D1DeviceContext1_GetAntialiasMode(This) \
+    ((This)->lpVtbl->Base.Base.GetAntialiasMode((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_SetTextAntialiasMode(This, textAntialiasMode) \
+    ((This)->lpVtbl->Base.Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode))
+
+#define ID2D1DeviceContext1_GetTextAntialiasMode(This) \
+    ((This)->lpVtbl->Base.Base.GetTextAntialiasMode((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_SetTextRenderingParams(This, textRenderingParams) \
+    ((This)->lpVtbl->Base.Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams))
+
+#define ID2D1DeviceContext1_GetTextRenderingParams(This, textRenderingParams) \
+    ((This)->lpVtbl->Base.Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams))
+
+#define ID2D1DeviceContext1_SetTags(This, tag1, tag2) \
+    ((This)->lpVtbl->Base.Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2))
+
+#define ID2D1DeviceContext1_GetTags(This, tag1, tag2) \
+    ((This)->lpVtbl->Base.Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2))
+
+#define ID2D1DeviceContext1_PopLayer(This) \
+    ((This)->lpVtbl->Base.Base.PopLayer((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_Flush(This, tag1, tag2) \
+    ((This)->lpVtbl->Base.Base.Flush((ID2D1RenderTarget *)This, tag1, tag2))
+
+#define ID2D1DeviceContext1_SaveDrawingState(This, drawingStateBlock) \
+    ((This)->lpVtbl->Base.Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock))
+
+#define ID2D1DeviceContext1_RestoreDrawingState(This, drawingStateBlock) \
+    ((This)->lpVtbl->Base.Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock))
+
+#define ID2D1DeviceContext1_PushAxisAlignedClip(This, clipRect, antialiasMode) \
+    ((This)->lpVtbl->Base.Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode))
+
+#define ID2D1DeviceContext1_PopAxisAlignedClip(This) \
+    ((This)->lpVtbl->Base.Base.PopAxisAlignedClip((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_Clear(This, clearColor) \
+    ((This)->lpVtbl->Base.Base.Clear((ID2D1RenderTarget *)This, clearColor))
+
+#define ID2D1DeviceContext1_BeginDraw(This) \
+    ((This)->lpVtbl->Base.Base.BeginDraw((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_EndDraw(This, tag1, tag2) \
+    ((This)->lpVtbl->Base.Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2))
+
+#define ID2D1DeviceContext1_GetPixelFormat(This) \
+    ((This)->lpVtbl->Base.Base.GetPixelFormat((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_SetDpi(This, dpiX, dpiY) \
+    ((This)->lpVtbl->Base.Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY))
+
+#define ID2D1DeviceContext1_GetDpi(This, dpiX, dpiY) \
+    ((This)->lpVtbl->Base.Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY))
+
+#define ID2D1DeviceContext1_GetSize(This) \
+    ((This)->lpVtbl->Base.Base.GetSize((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_GetPixelSize(This) \
+    ((This)->lpVtbl->Base.Base.GetPixelSize((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_GetMaximumBitmapSize(This) \
+    ((This)->lpVtbl->Base.Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This))
+
+#define ID2D1DeviceContext1_IsSupported(This, renderTargetProperties) \
+    ((This)->lpVtbl->Base.Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties))
+
+#define ID2D1DeviceContext1_CreateBitmap(This, size, sourceData, pitch, bitmapProperties, bitmap) \
+    ((This)->lpVtbl->Base.CreateBitmap((ID2D1DeviceContext *)This, size, sourceData, pitch, bitmapProperties, bitmap))
+
+#define ID2D1DeviceContext1_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \
+    ((This)->lpVtbl->Base.CreateBitmapFromWicBitmap((ID2D1DeviceContext *)This, wicBitmapSource, bitmapProperties, bitmap))
+
+#define ID2D1DeviceContext1_CreateColorContext(This, space, profile, profileSize, colorContext) \
+    ((This)->lpVtbl->Base.CreateColorContext((ID2D1DeviceContext *)This, space, profile, profileSize, colorContext))
+
+#define ID2D1DeviceContext1_CreateColorContextFromFilename(This, filename, colorContext) \
+    ((This)->lpVtbl->Base.CreateColorContextFromFilename((ID2D1DeviceContext *)This, filename, colorContext))
+
+#define ID2D1DeviceContext1_CreateColorContextFromWicColorContext(This, wicColorContext, colorContext) \
+    ((This)->lpVtbl->Base.CreateColorContextFromWicColorContext((ID2D1DeviceContext *)This, wicColorContext, colorContext))
+
+#define ID2D1DeviceContext1_CreateBitmapFromDxgiSurface(This, surface, bitmapProperties, bitmap) \
+    ((This)->lpVtbl->Base.CreateBitmapFromDxgiSurface((ID2D1DeviceContext *)This, surface, bitmapProperties, bitmap))
+
+#define ID2D1DeviceContext1_CreateEffect(This, effectId, effect) \
+    ((This)->lpVtbl->Base.CreateEffect((ID2D1DeviceContext *)This, effectId, effect))
+
+#define ID2D1DeviceContext1_CreateGradientStopCollection(This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1) \
+    ((This)->lpVtbl->Base.CreateGradientStopCollection((ID2D1DeviceContext *)This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1))
+
+#define ID2D1DeviceContext1_CreateImageBrush(This, image, imageBrushProperties, brushProperties, imageBrush) \
+    ((This)->lpVtbl->Base.CreateImageBrush((ID2D1DeviceContext *)This, image, imageBrushProperties, brushProperties, imageBrush))
+
+#define ID2D1DeviceContext1_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \
+    ((This)->lpVtbl->Base.CreateBitmapBrush((ID2D1DeviceContext *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush))
+
+#define ID2D1DeviceContext1_CreateCommandList(This, commandList) \
+    ((This)->lpVtbl->Base.CreateCommandList((ID2D1DeviceContext *)This, commandList))
+
+#define ID2D1DeviceContext1_IsDxgiFormatSupported(This, format) \
+    ((This)->lpVtbl->Base.IsDxgiFormatSupported((ID2D1DeviceContext *)This, format))
+
+#define ID2D1DeviceContext1_IsBufferPrecisionSupported(This, bufferPrecision) \
+    ((This)->lpVtbl->Base.IsBufferPrecisionSupported((ID2D1DeviceContext *)This, bufferPrecision))
+
+#define ID2D1DeviceContext1_GetImageLocalBounds(This, image, localBounds) \
+    ((This)->lpVtbl->Base.GetImageLocalBounds((ID2D1DeviceContext *)This, image, localBounds))
+
+#define ID2D1DeviceContext1_GetImageWorldBounds(This, image, worldBounds) \
+    ((This)->lpVtbl->Base.GetImageWorldBounds((ID2D1DeviceContext *)This, image, worldBounds))
+
+#define ID2D1DeviceContext1_GetGlyphRunWorldBounds(This, baselineOrigin, glyphRun, measuringMode, bounds) \
+    ((This)->lpVtbl->Base.GetGlyphRunWorldBounds((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, measuringMode, bounds))
+
+#define ID2D1DeviceContext1_GetDevice(This, device) \
+    ((This)->lpVtbl->Base.GetDevice((ID2D1DeviceContext *)This, device))
+
+#define ID2D1DeviceContext1_SetTarget(This, image) \
+    ((This)->lpVtbl->Base.SetTarget((ID2D1DeviceContext *)This, image))
+
+#define ID2D1DeviceContext1_GetTarget(This, image) \
+    ((This)->lpVtbl->Base.GetTarget((ID2D1DeviceContext *)This, image))
+
+#define ID2D1DeviceContext1_SetRenderingControls(This, renderingControls) \
+    ((This)->lpVtbl->Base.SetRenderingControls((ID2D1DeviceContext *)This, renderingControls))
+
+#define ID2D1DeviceContext1_GetRenderingControls(This, renderingControls) \
+    ((This)->lpVtbl->Base.GetRenderingControls((ID2D1DeviceContext *)This, renderingControls))
+
+#define ID2D1DeviceContext1_SetPrimitiveBlend(This, primitiveBlend) \
+    ((This)->lpVtbl->Base.SetPrimitiveBlend((ID2D1DeviceContext *)This, primitiveBlend))
+
+#define ID2D1DeviceContext1_GetPrimitiveBlend(This) \
+    ((This)->lpVtbl->Base.GetPrimitiveBlend((ID2D1DeviceContext *)This))
+
+#define ID2D1DeviceContext1_SetUnitMode(This, unitMode) \
+    ((This)->lpVtbl->Base.SetUnitMode((ID2D1DeviceContext *)This, unitMode))
+
+#define ID2D1DeviceContext1_GetUnitMode(This) \
+    ((This)->lpVtbl->Base.GetUnitMode((ID2D1DeviceContext *)This))
+
+#define ID2D1DeviceContext1_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \
+    ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode))
+
+#define ID2D1DeviceContext1_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \
+    ((This)->lpVtbl->Base.DrawImage((ID2D1DeviceContext *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode))
+
+#define ID2D1DeviceContext1_DrawGdiMetafile(This, gdiMetafile, targetOffset) \
+    ((This)->lpVtbl->Base.DrawGdiMetafile((ID2D1DeviceContext *)This, gdiMetafile, targetOffset))
+
+#define ID2D1DeviceContext1_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \
+    ((This)->lpVtbl->Base.DrawBitmap((ID2D1DeviceContext *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform))
+
+#define ID2D1DeviceContext1_PushLayer(This, layerParameters, layer) \
+    ((This)->lpVtbl->Base.PushLayer((ID2D1DeviceContext *)This, layerParameters, layer))
+
+#define ID2D1DeviceContext1_InvalidateEffectInputRectangle(This, effect, input, inputRectangle) \
+    ((This)->lpVtbl->Base.InvalidateEffectInputRectangle((ID2D1DeviceContext *)This, effect, input, inputRectangle))
+
+#define ID2D1DeviceContext1_GetEffectInvalidRectangleCount(This, effect, rectangleCount) \
+    ((This)->lpVtbl->Base.GetEffectInvalidRectangleCount((ID2D1DeviceContext *)This, effect, rectangleCount))
+
+#define ID2D1DeviceContext1_GetEffectInvalidRectangles(This, effect, rectangles, rectanglesCount) \
+    ((This)->lpVtbl->Base.GetEffectInvalidRectangles((ID2D1DeviceContext *)This, effect, rectangles, rectanglesCount))
+
+#define ID2D1DeviceContext1_GetEffectRequiredInputRectangles(This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount) \
+    ((This)->lpVtbl->Base.GetEffectRequiredInputRectangles((ID2D1DeviceContext *)This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount))
+
+#define ID2D1DeviceContext1_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \
+    ((This)->lpVtbl->Base.FillOpacityMask((ID2D1DeviceContext *)This, opacityMask, brush, destinationRectangle, sourceRectangle))
+
+#define ID2D1DeviceContext1_CreateFilledGeometryRealization(This, geometry, flatteningTolerance, geometryRealization) \
+    ((This)->lpVtbl->CreateFilledGeometryRealization(This, geometry, flatteningTolerance, geometryRealization))
+
+#define ID2D1DeviceContext1_CreateStrokedGeometryRealization(This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization) \
+    ((This)->lpVtbl->CreateStrokedGeometryRealization(This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization))
+
+#define ID2D1DeviceContext1_DrawGeometryRealization(This, geometryRealization, brush) \
+    ((This)->lpVtbl->DrawGeometryRealization(This, geometryRealization, brush))
+
 typedef interface ID2D1Device1 ID2D1Device1;

+typedef struct ID2D1Device1Vtbl
+{
+    
+    ID2D1DeviceVtbl Base;
+    
+    
+    STDMETHOD_(D2D1_RENDERING_PRIORITY, GetRenderingPriority)(
+        ID2D1Device1 *This 
+        ) PURE;
+    
+    STDMETHOD_(void, SetRenderingPriority)(
+        ID2D1Device1 *This,
+        D2D1_RENDERING_PRIORITY renderingPriority 
+        ) PURE;
+    
+    STDMETHOD(CreateDeviceContext)(
+        ID2D1Device1 *This,
+        D2D1_DEVICE_CONTEXT_OPTIONS options,
+        _Outptr_ ID2D1DeviceContext1 **deviceContext1 
+        ) PURE;
+} ID2D1Device1Vtbl;
+
+interface ID2D1Device1
+{
+    CONST struct ID2D1Device1Vtbl *lpVtbl;
+};
+
+
+#define ID2D1Device1_QueryInterface(This, riid, ppv) \
+    ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv))
+
+#define ID2D1Device1_AddRef(This) \
+    ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This))
+
+#define ID2D1Device1_Release(This) \
+    ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This))
+
+#define ID2D1Device1_GetFactory(This, factory) \
+    ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory))
+
+#define ID2D1Device1_CreatePrintControl(This, wicFactory, documentTarget, printControlProperties, printControl) \
+    ((This)->lpVtbl->Base.CreatePrintControl((ID2D1Device *)This, wicFactory, documentTarget, printControlProperties, printControl))
+
+#define ID2D1Device1_SetMaximumTextureMemory(This, maximumInBytes) \
+    ((This)->lpVtbl->Base.SetMaximumTextureMemory((ID2D1Device *)This, maximumInBytes))
+
+#define ID2D1Device1_GetMaximumTextureMemory(This) \
+    ((This)->lpVtbl->Base.GetMaximumTextureMemory((ID2D1Device *)This))
+
+#define ID2D1Device1_ClearResources(This, millisecondsSinceUse) \
+    ((This)->lpVtbl->Base.ClearResources((ID2D1Device *)This, millisecondsSinceUse))
+
+#define ID2D1Device1_GetRenderingPriority(This) \
+    ((This)->lpVtbl->GetRenderingPriority(This))
+
+#define ID2D1Device1_SetRenderingPriority(This, renderingPriority) \
+    ((This)->lpVtbl->SetRenderingPriority(This, renderingPriority))
+
+#define ID2D1Device1_CreateDeviceContext(This, options, deviceContext1) \
+    ((This)->lpVtbl->CreateDeviceContext(This, options, deviceContext1))
+
 typedef interface ID2D1Factory2 ID2D1Factory2;

+typedef struct ID2D1Factory2Vtbl
+{
+    
+    ID2D1Factory1Vtbl Base;
+    
+    
+    STDMETHOD(CreateDevice)(
+        ID2D1Factory2 *This,
+        _In_ IDXGIDevice *dxgiDevice,
+        _Outptr_ ID2D1Device1 **d2dDevice1 
+        ) PURE;
+} ID2D1Factory2Vtbl;
+
+interface ID2D1Factory2
+{
+    CONST struct ID2D1Factory2Vtbl *lpVtbl;
+};
+
+
+#define ID2D1Factory2_QueryInterface(This, riid, ppv) \
+    ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv))
+
+#define ID2D1Factory2_AddRef(This) \
+    ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This))
+
+#define ID2D1Factory2_Release(This) \
+    ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This))
+
+#define ID2D1Factory2_ReloadSystemMetrics(This) \
+    ((This)->lpVtbl->Base.Base.ReloadSystemMetrics((ID2D1Factory *)This))
+
+#define ID2D1Factory2_GetDesktopDpi(This, dpiX, dpiY) \
+    ((This)->lpVtbl->Base.Base.GetDesktopDpi((ID2D1Factory *)This, dpiX, dpiY))
+
+#define ID2D1Factory2_CreateRectangleGeometry(This, rectangle, rectangleGeometry) \
+    ((This)->lpVtbl->Base.Base.CreateRectangleGeometry((ID2D1Factory *)This, rectangle, rectangleGeometry))
+
+#define ID2D1Factory2_CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry) \
+    ((This)->lpVtbl->Base.Base.CreateRoundedRectangleGeometry((ID2D1Factory *)This, roundedRectangle, roundedRectangleGeometry))
+
+#define ID2D1Factory2_CreateEllipseGeometry(This, ellipse, ellipseGeometry) \
+    ((This)->lpVtbl->Base.Base.CreateEllipseGeometry((ID2D1Factory *)This, ellipse, ellipseGeometry))
+
+#define ID2D1Factory2_CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup) \
+    ((This)->lpVtbl->Base.Base.CreateGeometryGroup((ID2D1Factory *)This, fillMode, geometries, geometriesCount, geometryGroup))
+
+#define ID2D1Factory2_CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry) \
+    ((This)->lpVtbl->Base.Base.CreateTransformedGeometry((ID2D1Factory *)This, sourceGeometry, transform, transformedGeometry))
+
+#define ID2D1Factory2_CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget) \
+    ((This)->lpVtbl->Base.Base.CreateWicBitmapRenderTarget((ID2D1Factory *)This, target, renderTargetProperties, renderTarget))
+
+#define ID2D1Factory2_CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget) \
+    ((This)->lpVtbl->Base.Base.CreateHwndRenderTarget((ID2D1Factory *)This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget))
+
+#define ID2D1Factory2_CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget) \
+    ((This)->lpVtbl->Base.Base.CreateDxgiSurfaceRenderTarget((ID2D1Factory *)This, dxgiSurface, renderTargetProperties, renderTarget))
+
+#define ID2D1Factory2_CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget) \
+    ((This)->lpVtbl->Base.Base.CreateDCRenderTarget((ID2D1Factory *)This, renderTargetProperties, dcRenderTarget))
+
+#define ID2D1Factory2_CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle) \
+    ((This)->lpVtbl->Base.CreateStrokeStyle((ID2D1Factory1 *)This, strokeStyleProperties, dashes, dashesCount, strokeStyle))
+
+#define ID2D1Factory2_CreatePathGeometry(This, pathGeometry) \
+    ((This)->lpVtbl->Base.CreatePathGeometry((ID2D1Factory1 *)This, pathGeometry))
+
+#define ID2D1Factory2_CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock) \
+    ((This)->lpVtbl->Base.CreateDrawingStateBlock((ID2D1Factory1 *)This, drawingStateDescription, textRenderingParams, drawingStateBlock))
+
+#define ID2D1Factory2_CreateGdiMetafile(This, metafileStream, metafile) \
+    ((This)->lpVtbl->Base.CreateGdiMetafile((ID2D1Factory1 *)This, metafileStream, metafile))
+
+#define ID2D1Factory2_RegisterEffectFromStream(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \
+    ((This)->lpVtbl->Base.RegisterEffectFromStream((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory))
+
+#define ID2D1Factory2_RegisterEffectFromString(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \
+    ((This)->lpVtbl->Base.RegisterEffectFromString((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory))
+
+#define ID2D1Factory2_UnregisterEffect(This, classId) \
+    ((This)->lpVtbl->Base.UnregisterEffect((ID2D1Factory1 *)This, classId))
+
+#define ID2D1Factory2_GetRegisteredEffects(This, effects, effectsCount, effectsReturned, effectsRegistered) \
+    ((This)->lpVtbl->Base.GetRegisteredEffects((ID2D1Factory1 *)This, effects, effectsCount, effectsReturned, effectsRegistered))
+
+#define ID2D1Factory2_GetEffectProperties(This, effectId, properties) \
+    ((This)->lpVtbl->Base.GetEffectProperties((ID2D1Factory1 *)This, effectId, properties))
+
+#define ID2D1Factory2_CreateDevice(This, dxgiDevice, d2dDevice1) \
+    ((This)->lpVtbl->CreateDevice(This, dxgiDevice, d2dDevice1))
+
 typedef interface ID2D1CommandSink1 ID2D1CommandSink1;

+typedef struct ID2D1CommandSink1Vtbl
+{
+    
+    ID2D1CommandSinkVtbl Base;
+    
+    
+    STDMETHOD(SetPrimitiveBlend1)(
+        ID2D1CommandSink1 *This,
+        D2D1_PRIMITIVE_BLEND primitiveBlend 
+        ) PURE;
+} ID2D1CommandSink1Vtbl;
+
+interface ID2D1CommandSink1
+{
+    CONST struct ID2D1CommandSink1Vtbl *lpVtbl;
+};
+
+
+#define ID2D1CommandSink1_QueryInterface(This, riid, ppv) \
+    ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv))
+
+#define ID2D1CommandSink1_AddRef(This) \
+    ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This))
+
+#define ID2D1CommandSink1_Release(This) \
+    ((This)->lpVtbl->Base.Base.Release((IUnknown *)This))
+
+#define ID2D1CommandSink1_BeginDraw(This) \
+    ((This)->lpVtbl->Base.BeginDraw((ID2D1CommandSink *)This))
+
+#define ID2D1CommandSink1_EndDraw(This) \
+    ((This)->lpVtbl->Base.EndDraw((ID2D1CommandSink *)This))
+
+#define ID2D1CommandSink1_SetAntialiasMode(This, antialiasMode) \
+    ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1CommandSink *)This, antialiasMode))
+
+#define ID2D1CommandSink1_SetTags(This, tag1, tag2) \
+    ((This)->lpVtbl->Base.SetTags((ID2D1CommandSink *)This, tag1, tag2))
+
+#define ID2D1CommandSink1_SetTextAntialiasMode(This, textAntialiasMode) \
+    ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1CommandSink *)This, textAntialiasMode))
+
+#define ID2D1CommandSink1_SetTextRenderingParams(This, textRenderingParams) \
+    ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1CommandSink *)This, textRenderingParams))
+
+#define ID2D1CommandSink1_SetTransform(This, transform) \
+    ((This)->lpVtbl->Base.SetTransform((ID2D1CommandSink *)This, transform))
+
+#define ID2D1CommandSink1_SetPrimitiveBlend(This, primitiveBlend) \
+    ((This)->lpVtbl->Base.SetPrimitiveBlend((ID2D1CommandSink *)This, primitiveBlend))
+
+#define ID2D1CommandSink1_SetUnitMode(This, unitMode) \
+    ((This)->lpVtbl->Base.SetUnitMode((ID2D1CommandSink *)This, unitMode))
+
+#define ID2D1CommandSink1_Clear(This, color) \
+    ((This)->lpVtbl->Base.Clear((ID2D1CommandSink *)This, color))
+
+#define ID2D1CommandSink1_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \
+    ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1CommandSink *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode))
+
+#define ID2D1CommandSink1_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.DrawLine((ID2D1CommandSink *)This, point0, point1, brush, strokeWidth, strokeStyle))
+
+#define ID2D1CommandSink1_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.DrawGeometry((ID2D1CommandSink *)This, geometry, brush, strokeWidth, strokeStyle))
+
+#define ID2D1CommandSink1_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \
+    ((This)->lpVtbl->Base.DrawRectangle((ID2D1CommandSink *)This, rect, brush, strokeWidth, strokeStyle))
+
+#define ID2D1CommandSink1_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \
+    ((This)->lpVtbl->Base.DrawBitmap((ID2D1CommandSink *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform))
+
+#define ID2D1CommandSink1_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \
+    ((This)->lpVtbl->Base.DrawImage((ID2D1CommandSink *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode))
+
+#define ID2D1CommandSink1_DrawGdiMetafile(This, gdiMetafile, targetOffset) \
+    ((This)->lpVtbl->Base.DrawGdiMetafile((ID2D1CommandSink *)This, gdiMetafile, targetOffset))
+
+#define ID2D1CommandSink1_FillMesh(This, mesh, brush) \
+    ((This)->lpVtbl->Base.FillMesh((ID2D1CommandSink *)This, mesh, brush))
+
+#define ID2D1CommandSink1_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \
+    ((This)->lpVtbl->Base.FillOpacityMask((ID2D1CommandSink *)This, opacityMask, brush, destinationRectangle, sourceRectangle))
+
+#define ID2D1CommandSink1_FillGeometry(This, geometry, brush, opacityBrush) \
+    ((This)->lpVtbl->Base.FillGeometry((ID2D1CommandSink *)This, geometry, brush, opacityBrush))
+
+#define ID2D1CommandSink1_FillRectangle(This, rect, brush) \
+    ((This)->lpVtbl->Base.FillRectangle((ID2D1CommandSink *)This, rect, brush))
+
+#define ID2D1CommandSink1_PushAxisAlignedClip(This, clipRect, antialiasMode) \
+    ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1CommandSink *)This, clipRect, antialiasMode))
+
+#define ID2D1CommandSink1_PushLayer(This, layerParameters1, layer) \
+    ((This)->lpVtbl->Base.PushLayer((ID2D1CommandSink *)This, layerParameters1, layer))
+
+#define ID2D1CommandSink1_PopAxisAlignedClip(This) \
+    ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1CommandSink *)This))
+
+#define ID2D1CommandSink1_PopLayer(This) \
+    ((This)->lpVtbl->Base.PopLayer((ID2D1CommandSink *)This))
+
+#define ID2D1CommandSink1_SetPrimitiveBlend1(This, primitiveBlend) \
+    ((This)->lpVtbl->SetPrimitiveBlend1(This, primitiveBlend))
+
+
 #endif

           
@@ -215,38 +215,6 @@ namespace D2D1

        return inkStyleProperties;
    }
-
-    COM_DECLSPEC_NOTHROW
-    D2D1FORCEINLINE
-    D2D1_RECT_U
-    InfiniteRectU()
-    {
-        D2D1_RECT_U rect = { 0u, 0u, UINT_MAX, UINT_MAX };
-
-        return rect;
-    }
-
-    COM_DECLSPEC_NOTHROW
-    D2D1FORCEINLINE
-    D2D1_SIMPLE_COLOR_PROFILE
-    SimpleColorProfile(
-        const D2D1_POINT_2F &redPrimary,
-        const D2D1_POINT_2F &greenPrimary,
-        const D2D1_POINT_2F &bluePrimary,
-        const D2D1_GAMMA1 gamma,
-        const D2D1_POINT_2F &whitePointXZ
-        )
-    {
-        D2D1_SIMPLE_COLOR_PROFILE simpleColorProfile;
-
-        simpleColorProfile.redPrimary = redPrimary;
-        simpleColorProfile.greenPrimary = greenPrimary;
-        simpleColorProfile.bluePrimary = bluePrimary;
-        simpleColorProfile.gamma = gamma;
-        simpleColorProfile.whitePointXZ = whitePointXZ;
-
-        return simpleColorProfile;
-    }
 } // namespace D2D1

 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
@@ -25,53 +25,73 @@
 // Built in effect CLSIDs
 DEFINE_GUID(CLSID_D2D1YCbCr,                    0x99503cc1, 0x66c7, 0x45c9, 0xa8, 0x75, 0x8a, 0xd8, 0xa7, 0x91, 0x44, 0x01);

-/// <summary>
-/// The enumeration of the YCbCr effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_YCBCR_PROP
+//
+//  Synopsis:
+//      The enumeration of the YCbCr effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_YCBCR_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "ChromaSubsampling"
-    /// Property Type: D2D1_YCBCR_CHROMA_SUBSAMPLING
-    /// </summary>
-    D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0,
-    
-    /// <summary>
-    /// Property Name: "TransformMatrix"
-    /// Property Type: D2D1_MATRIX_3X2_F
-    /// </summary>
-    D2D1_YCBCR_PROP_TRANSFORM_MATRIX = 1,
-    
-    /// <summary>
-    /// Property Name: "InterpolationMode"
-    /// Property Type: D2D1_YCBCR_INTERPOLATION_MODE
-    /// </summary>
-    D2D1_YCBCR_PROP_INTERPOLATION_MODE = 2,
-    D2D1_YCBCR_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "ChromaSubsampling"
+        // Property Type: D2D1_YCBCR_CHROMA_SUBSAMPLING
+        //
+        D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0,
+        
+        //
+        // Property Name: "TransformMatrix"
+        // Property Type: D2D1_MATRIX_3X2_F
+        //
+        D2D1_YCBCR_PROP_TRANSFORM_MATRIX = 1,
+        
+        //
+        // Property Name: "InterpolationMode"
+        // Property Type: D2D1_YCBCR_INTERPOLATION_MODE
+        //
+        D2D1_YCBCR_PROP_INTERPOLATION_MODE = 2,
+        D2D1_YCBCR_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_YCBCR_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_YCBCR_CHROMA_SUBSAMPLING
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_YCBCR_CHROMA_SUBSAMPLING
 {
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_AUTO = 0,
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_420 = 1,
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_422 = 2,
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_444 = 3,
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_440 = 4,
-    D2D1_YCBCR_CHROMA_SUBSAMPLING_FORCE_DWORD = 0xffffffff
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_AUTO = 0,
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_420 = 1,
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_422 = 2,
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_444 = 3,
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_440 = 4,
+        D2D1_YCBCR_CHROMA_SUBSAMPLING_FORCE_DWORD = 0xffffffff

 } D2D1_YCBCR_CHROMA_SUBSAMPLING;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_YCBCR_INTERPOLATION_MODE
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_YCBCR_INTERPOLATION_MODE
 {
-    D2D1_YCBCR_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0,
-    D2D1_YCBCR_INTERPOLATION_MODE_LINEAR = 1,
-    D2D1_YCBCR_INTERPOLATION_MODE_CUBIC = 2,
-    D2D1_YCBCR_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 3,
-    D2D1_YCBCR_INTERPOLATION_MODE_ANISOTROPIC = 4,
-    D2D1_YCBCR_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 5,
-    D2D1_YCBCR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff
+        D2D1_YCBCR_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0,
+        D2D1_YCBCR_INTERPOLATION_MODE_LINEAR = 1,
+        D2D1_YCBCR_INTERPOLATION_MODE_CUBIC = 2,
+        D2D1_YCBCR_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 3,
+        D2D1_YCBCR_INTERPOLATION_MODE_ANISOTROPIC = 4,
+        D2D1_YCBCR_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 5,
+        D2D1_YCBCR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff

 } D2D1_YCBCR_INTERPOLATION_MODE;

@@ -41,494 +41,553 @@ DEFINE_GUID(CLSID_D2D1EdgeDetection,            0xEFF583CA, 0xCB07, 0x4AA9, 0xAC
 DEFINE_GUID(CLSID_D2D1HighlightsShadows,        0xCADC8384, 0x323F, 0x4C7E, 0xA3, 0x61, 0x2E, 0x2B, 0x24, 0xDF, 0x6E, 0xE4);
 DEFINE_GUID(CLSID_D2D1LookupTable3D,            0x349E0EDA, 0x0088, 0x4A79, 0x9C, 0xA3, 0xC7, 0xE3, 0x00, 0x20, 0x20, 0x20);

-#if NTDDI_VERSION >= NTDDI_WIN10_RS1

-DEFINE_GUID(CLSID_D2D1Opacity,                  0x811d79a4, 0xde28, 0x4454, 0x80, 0x94, 0xc6, 0x46, 0x85, 0xf8, 0xbd, 0x4c);
-DEFINE_GUID(CLSID_D2D1AlphaMask,                0xc80ecff0, 0x3fd5, 0x4f05, 0x83, 0x28, 0xc5, 0xd1, 0x72, 0x4b, 0x4f, 0x0a);
-DEFINE_GUID(CLSID_D2D1CrossFade,                0x12f575e8, 0x4db1, 0x485f, 0x9a, 0x84, 0x03, 0xa0, 0x7d, 0xd3, 0x82, 0x9f);
-DEFINE_GUID(CLSID_D2D1Tint,                     0x36312b17, 0xf7dd, 0x4014, 0x91, 0x5d, 0xff, 0xca, 0x76, 0x8c, 0xf2, 0x11);
-
-#endif // #if NTDDI_VERSION >= NTDDI_WIN10_RS1
-
-/// <summary>
-/// The enumeration of the Contrast effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_CONTRAST_PROP
+//
+//  Synopsis:
+//      The enumeration of the Contrast effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_CONTRAST_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Contrast"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_CONTRAST_PROP_CONTRAST = 0,
-    
-    /// <summary>
-    /// Property Name: "ClampInput"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_CONTRAST_PROP_CLAMP_INPUT = 1,
-    D2D1_CONTRAST_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Contrast"
+        // Property Type: FLOAT
+        //
+        D2D1_CONTRAST_PROP_CONTRAST = 0,
+        
+        //
+        // Property Name: "ClampInput"
+        // Property Type: BOOL
+        //
+        D2D1_CONTRAST_PROP_CLAMP_INPUT = 1,
+        D2D1_CONTRAST_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_CONTRAST_PROP;


-/// <summary>
-/// The enumeration of the RgbToHue effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_RGBTOHUE_PROP
+//
+//  Synopsis:
+//      The enumeration of the RgbToHue effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_RGBTOHUE_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "OutputColorSpace"
-    /// Property Type: D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE
-    /// </summary>
-    D2D1_RGBTOHUE_PROP_OUTPUT_COLOR_SPACE = 0,
-    D2D1_RGBTOHUE_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "OutputColorSpace"
+        // Property Type: D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE
+        //
+        D2D1_RGBTOHUE_PROP_OUTPUT_COLOR_SPACE = 0,
+        D2D1_RGBTOHUE_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_RGBTOHUE_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE
 {
-    D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_HUE_SATURATION_VALUE = 0,
-    D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_HUE_SATURATION_LIGHTNESS = 1,
-    D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_FORCE_DWORD = 0xffffffff
+        D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_HUE_SATURATION_VALUE = 0,
+        D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_HUE_SATURATION_LIGHTNESS = 1,
+        D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_FORCE_DWORD = 0xffffffff

 } D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE;


-/// <summary>
-/// The enumeration of the HueToRgb effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_HUETORGB_PROP
+//
+//  Synopsis:
+//      The enumeration of the HueToRgb effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_HUETORGB_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "InputColorSpace"
-    /// Property Type: D2D1_HUETORGB_INPUT_COLOR_SPACE
-    /// </summary>
-    D2D1_HUETORGB_PROP_INPUT_COLOR_SPACE = 0,
-    D2D1_HUETORGB_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "InputColorSpace"
+        // Property Type: D2D1_HUETORGB_INPUT_COLOR_SPACE
+        //
+        D2D1_HUETORGB_PROP_INPUT_COLOR_SPACE = 0,
+        D2D1_HUETORGB_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_HUETORGB_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_HUETORGB_INPUT_COLOR_SPACE
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_HUETORGB_INPUT_COLOR_SPACE
 {
-    D2D1_HUETORGB_INPUT_COLOR_SPACE_HUE_SATURATION_VALUE = 0,
-    D2D1_HUETORGB_INPUT_COLOR_SPACE_HUE_SATURATION_LIGHTNESS = 1,
-    D2D1_HUETORGB_INPUT_COLOR_SPACE_FORCE_DWORD = 0xffffffff
+        D2D1_HUETORGB_INPUT_COLOR_SPACE_HUE_SATURATION_VALUE = 0,
+        D2D1_HUETORGB_INPUT_COLOR_SPACE_HUE_SATURATION_LIGHTNESS = 1,
+        D2D1_HUETORGB_INPUT_COLOR_SPACE_FORCE_DWORD = 0xffffffff

 } D2D1_HUETORGB_INPUT_COLOR_SPACE;


-/// <summary>
-/// The enumeration of the Chroma Key effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_CHROMAKEY_PROP
+//
+//  Synopsis:
+//      The enumeration of the Chroma Key effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_CHROMAKEY_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Color"
-    /// Property Type: D2D1_VECTOR_3F
-    /// </summary>
-    D2D1_CHROMAKEY_PROP_COLOR = 0,
-    
-    /// <summary>
-    /// Property Name: "Tolerance"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_CHROMAKEY_PROP_TOLERANCE = 1,
-    
-    /// <summary>
-    /// Property Name: "InvertAlpha"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_CHROMAKEY_PROP_INVERT_ALPHA = 2,
-    
-    /// <summary>
-    /// Property Name: "Feather"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_CHROMAKEY_PROP_FEATHER = 3,
-    D2D1_CHROMAKEY_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Color"
+        // Property Type: D2D1_VECTOR_3F
+        //
+        D2D1_CHROMAKEY_PROP_COLOR = 0,
+        
+        //
+        // Property Name: "Tolerance"
+        // Property Type: FLOAT
+        //
+        D2D1_CHROMAKEY_PROP_TOLERANCE = 1,
+        
+        //
+        // Property Name: "InvertAlpha"
+        // Property Type: BOOL
+        //
+        D2D1_CHROMAKEY_PROP_INVERT_ALPHA = 2,
+        
+        //
+        // Property Name: "Feather"
+        // Property Type: BOOL
+        //
+        D2D1_CHROMAKEY_PROP_FEATHER = 3,
+        D2D1_CHROMAKEY_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_CHROMAKEY_PROP;


-/// <summary>
-/// The enumeration of the Emboss effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_EMBOSS_PROP
+//
+//  Synopsis:
+//      The enumeration of the Emboss effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_EMBOSS_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Height"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_EMBOSS_PROP_HEIGHT = 0,
-    
-    /// <summary>
-    /// Property Name: "Direction"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_EMBOSS_PROP_DIRECTION = 1,
-    D2D1_EMBOSS_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Height"
+        // Property Type: FLOAT
+        //
+        D2D1_EMBOSS_PROP_HEIGHT = 0,
+        
+        //
+        // Property Name: "Direction"
+        // Property Type: FLOAT
+        //
+        D2D1_EMBOSS_PROP_DIRECTION = 1,
+        D2D1_EMBOSS_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_EMBOSS_PROP;


-/// <summary>
-/// The enumeration of the Exposure effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_EXPOSURE_PROP
+//
+//  Synopsis:
+//      The enumeration of the Exposure effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_EXPOSURE_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "ExposureValue"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_EXPOSURE_PROP_EXPOSURE_VALUE = 0,
-    D2D1_EXPOSURE_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "ExposureValue"
+        // Property Type: FLOAT
+        //
+        D2D1_EXPOSURE_PROP_EXPOSURE_VALUE = 0,
+        D2D1_EXPOSURE_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_EXPOSURE_PROP;


-/// <summary>
-/// The enumeration of the Posterize effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_POSTERIZE_PROP
+//
+//  Synopsis:
+//      The enumeration of the Posterize effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_POSTERIZE_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "RedValueCount"
-    /// Property Type: UINT32
-    /// </summary>
-    D2D1_POSTERIZE_PROP_RED_VALUE_COUNT = 0,
-    
-    /// <summary>
-    /// Property Name: "GreenValueCount"
-    /// Property Type: UINT32
-    /// </summary>
-    D2D1_POSTERIZE_PROP_GREEN_VALUE_COUNT = 1,
-    
-    /// <summary>
-    /// Property Name: "BlueValueCount"
-    /// Property Type: UINT32
-    /// </summary>
-    D2D1_POSTERIZE_PROP_BLUE_VALUE_COUNT = 2,
-    D2D1_POSTERIZE_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "RedValueCount"
+        // Property Type: UINT32
+        //
+        D2D1_POSTERIZE_PROP_RED_VALUE_COUNT = 0,
+        
+        //
+        // Property Name: "GreenValueCount"
+        // Property Type: UINT32
+        //
+        D2D1_POSTERIZE_PROP_GREEN_VALUE_COUNT = 1,
+        
+        //
+        // Property Name: "BlueValueCount"
+        // Property Type: UINT32
+        //
+        D2D1_POSTERIZE_PROP_BLUE_VALUE_COUNT = 2,
+        D2D1_POSTERIZE_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_POSTERIZE_PROP;


-/// <summary>
-/// The enumeration of the Sepia effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_SEPIA_PROP
+//
+//  Synopsis:
+//      The enumeration of the Sepia effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_SEPIA_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Intensity"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_SEPIA_PROP_INTENSITY = 0,
-    
-    /// <summary>
-    /// Property Name: "AlphaMode"
-    /// Property Type: D2D1_ALPHA_MODE
-    /// </summary>
-    D2D1_SEPIA_PROP_ALPHA_MODE = 1,
-    D2D1_SEPIA_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Intensity"
+        // Property Type: FLOAT
+        //
+        D2D1_SEPIA_PROP_INTENSITY = 0,
+        
+        //
+        // Property Name: "AlphaMode"
+        // Property Type: D2D1_ALPHA_MODE
+        //
+        D2D1_SEPIA_PROP_ALPHA_MODE = 1,
+        D2D1_SEPIA_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_SEPIA_PROP;


-/// <summary>
-/// The enumeration of the Sharpen effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_SHARPEN_PROP
+//
+//  Synopsis:
+//      The enumeration of the Sharpen effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_SHARPEN_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Sharpness"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_SHARPEN_PROP_SHARPNESS = 0,
-    
-    /// <summary>
-    /// Property Name: "Threshold"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_SHARPEN_PROP_THRESHOLD = 1,
-    D2D1_SHARPEN_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Sharpness"
+        // Property Type: FLOAT
+        //
+        D2D1_SHARPEN_PROP_SHARPNESS = 0,
+        
+        //
+        // Property Name: "Threshold"
+        // Property Type: FLOAT
+        //
+        D2D1_SHARPEN_PROP_THRESHOLD = 1,
+        D2D1_SHARPEN_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_SHARPEN_PROP;


-/// <summary>
-/// The enumeration of the Straighten effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_STRAIGHTEN_PROP
+//
+//  Synopsis:
+//      The enumeration of the Straighten effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_STRAIGHTEN_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Angle"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_STRAIGHTEN_PROP_ANGLE = 0,
-    
-    /// <summary>
-    /// Property Name: "MaintainSize"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_STRAIGHTEN_PROP_MAINTAIN_SIZE = 1,
-    
-    /// <summary>
-    /// Property Name: "ScaleMode"
-    /// Property Type: D2D1_STRAIGHTEN_SCALE_MODE
-    /// </summary>
-    D2D1_STRAIGHTEN_PROP_SCALE_MODE = 2,
-    D2D1_STRAIGHTEN_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Angle"
+        // Property Type: FLOAT
+        //
+        D2D1_STRAIGHTEN_PROP_ANGLE = 0,
+        
+        //
+        // Property Name: "MaintainSize"
+        // Property Type: BOOL
+        //
+        D2D1_STRAIGHTEN_PROP_MAINTAIN_SIZE = 1,
+        
+        //
+        // Property Name: "ScaleMode"
+        // Property Type: D2D1_STRAIGHTEN_SCALE_MODE
+        //
+        D2D1_STRAIGHTEN_PROP_SCALE_MODE = 2,
+        D2D1_STRAIGHTEN_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_STRAIGHTEN_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_STRAIGHTEN_SCALE_MODE
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_STRAIGHTEN_SCALE_MODE
 {
-    D2D1_STRAIGHTEN_SCALE_MODE_NEAREST_NEIGHBOR = 0,
-    D2D1_STRAIGHTEN_SCALE_MODE_LINEAR = 1,
-    D2D1_STRAIGHTEN_SCALE_MODE_CUBIC = 2,
-    D2D1_STRAIGHTEN_SCALE_MODE_MULTI_SAMPLE_LINEAR = 3,
-    D2D1_STRAIGHTEN_SCALE_MODE_ANISOTROPIC = 4,
-    D2D1_STRAIGHTEN_SCALE_MODE_FORCE_DWORD = 0xffffffff
+        D2D1_STRAIGHTEN_SCALE_MODE_NEAREST_NEIGHBOR = 0,
+        D2D1_STRAIGHTEN_SCALE_MODE_LINEAR = 1,
+        D2D1_STRAIGHTEN_SCALE_MODE_CUBIC = 2,
+        D2D1_STRAIGHTEN_SCALE_MODE_MULTI_SAMPLE_LINEAR = 3,
+        D2D1_STRAIGHTEN_SCALE_MODE_ANISOTROPIC = 4,
+        D2D1_STRAIGHTEN_SCALE_MODE_FORCE_DWORD = 0xffffffff

 } D2D1_STRAIGHTEN_SCALE_MODE;


-/// <summary>
-/// The enumeration of the Temperature And Tint effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_TEMPERATUREANDTINT_PROP
+//
+//  Synopsis:
+//      The enumeration of the Temperature And Tint effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_TEMPERATUREANDTINT_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Temperature"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_TEMPERATUREANDTINT_PROP_TEMPERATURE = 0,
-    
-    /// <summary>
-    /// Property Name: "Tint"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_TEMPERATUREANDTINT_PROP_TINT = 1,
-    D2D1_TEMPERATUREANDTINT_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Temperature"
+        // Property Type: FLOAT
+        //
+        D2D1_TEMPERATUREANDTINT_PROP_TEMPERATURE = 0,
+        
+        //
+        // Property Name: "Tint"
+        // Property Type: FLOAT
+        //
+        D2D1_TEMPERATUREANDTINT_PROP_TINT = 1,
+        D2D1_TEMPERATUREANDTINT_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_TEMPERATUREANDTINT_PROP;


-/// <summary>
-/// The enumeration of the Vignette effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_VIGNETTE_PROP
+//
+//  Synopsis:
+//      The enumeration of the Vignette effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_VIGNETTE_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Color"
-    /// Property Type: D2D1_VECTOR_4F
-    /// </summary>
-    D2D1_VIGNETTE_PROP_COLOR = 0,
-    
-    /// <summary>
-    /// Property Name: "TransitionSize"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_VIGNETTE_PROP_TRANSITION_SIZE = 1,
-    
-    /// <summary>
-    /// Property Name: "Strength"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_VIGNETTE_PROP_STRENGTH = 2,
-    D2D1_VIGNETTE_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Color"
+        // Property Type: D2D1_VECTOR_4F
+        //
+        D2D1_VIGNETTE_PROP_COLOR = 0,
+        
+        //
+        // Property Name: "TransitionSize"
+        // Property Type: FLOAT
+        //
+        D2D1_VIGNETTE_PROP_TRANSITION_SIZE = 1,
+        
+        //
+        // Property Name: "Strength"
+        // Property Type: FLOAT
+        //
+        D2D1_VIGNETTE_PROP_STRENGTH = 2,
+        D2D1_VIGNETTE_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_VIGNETTE_PROP;


-/// <summary>
-/// The enumeration of the Edge Detection effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_EDGEDETECTION_PROP
+//
+//  Synopsis:
+//      The enumeration of the Edge Detection effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_EDGEDETECTION_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Strength"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_EDGEDETECTION_PROP_STRENGTH = 0,
-    
-    /// <summary>
-    /// Property Name: "BlurRadius"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_EDGEDETECTION_PROP_BLUR_RADIUS = 1,
-    
-    /// <summary>
-    /// Property Name: "Mode"
-    /// Property Type: D2D1_EDGEDETECTION_MODE
-    /// </summary>
-    D2D1_EDGEDETECTION_PROP_MODE = 2,
-    
-    /// <summary>
-    /// Property Name: "OverlayEdges"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_EDGEDETECTION_PROP_OVERLAY_EDGES = 3,
-    
-    /// <summary>
-    /// Property Name: "AlphaMode"
-    /// Property Type: D2D1_ALPHA_MODE
-    /// </summary>
-    D2D1_EDGEDETECTION_PROP_ALPHA_MODE = 4,
-    D2D1_EDGEDETECTION_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Strength"
+        // Property Type: FLOAT
+        //
+        D2D1_EDGEDETECTION_PROP_STRENGTH = 0,
+        
+        //
+        // Property Name: "BlurRadius"
+        // Property Type: FLOAT
+        //
+        D2D1_EDGEDETECTION_PROP_BLUR_RADIUS = 1,
+        
+        //
+        // Property Name: "Mode"
+        // Property Type: D2D1_EDGEDETECTION_MODE
+        //
+        D2D1_EDGEDETECTION_PROP_MODE = 2,
+        
+        //
+        // Property Name: "OverlayEdges"
+        // Property Type: BOOL
+        //
+        D2D1_EDGEDETECTION_PROP_OVERLAY_EDGES = 3,
+        
+        //
+        // Property Name: "AlphaMode"
+        // Property Type: D2D1_ALPHA_MODE
+        //
+        D2D1_EDGEDETECTION_PROP_ALPHA_MODE = 4,
+        D2D1_EDGEDETECTION_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_EDGEDETECTION_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_EDGEDETECTION_MODE
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_EDGEDETECTION_MODE
 {
-    D2D1_EDGEDETECTION_MODE_SOBEL = 0,
-    D2D1_EDGEDETECTION_MODE_PREWITT = 1,
-    D2D1_EDGEDETECTION_MODE_FORCE_DWORD = 0xffffffff
+        D2D1_EDGEDETECTION_MODE_SOBEL = 0,
+        D2D1_EDGEDETECTION_MODE_PREWITT = 1,
+        D2D1_EDGEDETECTION_MODE_FORCE_DWORD = 0xffffffff

 } D2D1_EDGEDETECTION_MODE;


-/// <summary>
-/// The enumeration of the Highlights and Shadows effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_HIGHLIGHTSANDSHADOWS_PROP
+//
+//  Synopsis:
+//      The enumeration of the Highlights and Shadows effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Highlights"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS = 0,
-    
-    /// <summary>
-    /// Property Name: "Shadows"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS = 1,
-    
-    /// <summary>
-    /// Property Name: "Clarity"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY = 2,
-    
-    /// <summary>
-    /// Property Name: "InputGamma"
-    /// Property Type: D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA
-    /// </summary>
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA = 3,
-    
-    /// <summary>
-    /// Property Name: "MaskBlurRadius"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS = 4,
-    D2D1_HIGHLIGHTSANDSHADOWS_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Highlights"
+        // Property Type: FLOAT
+        //
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS = 0,
+        
+        //
+        // Property Name: "Shadows"
+        // Property Type: FLOAT
+        //
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS = 1,
+        
+        //
+        // Property Name: "Clarity"
+        // Property Type: FLOAT
+        //
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY = 2,
+        
+        //
+        // Property Name: "InputGamma"
+        // Property Type: D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA
+        //
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA = 3,
+        
+        //
+        // Property Name: "MaskBlurRadius"
+        // Property Type: FLOAT
+        //
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_MASK_BLUR_RADIUS = 4,
+        D2D1_HIGHLIGHTSANDSHADOWS_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_HIGHLIGHTSANDSHADOWS_PROP;

+
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA
 {
-    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR = 0,
-    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_SRGB = 1,
-    D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_FORCE_DWORD = 0xffffffff
+        D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR = 0,
+        D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_SRGB = 1,
+        D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_FORCE_DWORD = 0xffffffff

 } D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA;


-/// <summary>
-/// The enumeration of the Lookup Table 3D effect's top level properties.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_LOOKUPTABLE3D_PROP
+//
+//  Synopsis:
+//      The enumeration of the Lookup Table 3D effect's top level properties.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_LOOKUPTABLE3D_PROP
 {
-    
-    /// <summary>
-    /// Property Name: "Lut"
-    /// Property Type: IUnknown *
-    /// </summary>
-    D2D1_LOOKUPTABLE3D_PROP_LUT = 0,
-    
-    /// <summary>
-    /// Property Name: "AlphaMode"
-    /// Property Type: D2D1_ALPHA_MODE
-    /// </summary>
-    D2D1_LOOKUPTABLE3D_PROP_ALPHA_MODE = 1,
-    D2D1_LOOKUPTABLE3D_PROP_FORCE_DWORD = 0xffffffff
+        
+        //
+        // Property Name: "Lut"
+        // Property Type: IUnknown *
+        //
+        D2D1_LOOKUPTABLE3D_PROP_LUT = 0,
+        
+        //
+        // Property Name: "AlphaMode"
+        // Property Type: D2D1_ALPHA_MODE
+        //
+        D2D1_LOOKUPTABLE3D_PROP_ALPHA_MODE = 1,
+        D2D1_LOOKUPTABLE3D_PROP_FORCE_DWORD = 0xffffffff

 } D2D1_LOOKUPTABLE3D_PROP;


-#if NTDDI_VERSION >= NTDDI_WIN10_RS1
-
-/// <summary>
-/// The enumeration of the Opacity effect's top level properties.
-/// </summary>
-typedef enum D2D1_OPACITY_PROP
-{
-    
-    /// <summary>
-    /// Property Name: "Opacity"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_OPACITY_PROP_OPACITY = 0,
-    D2D1_OPACITY_PROP_FORCE_DWORD = 0xffffffff
-
-} D2D1_OPACITY_PROP;
-
-
-/// <summary>
-/// The enumeration of the Cross Fade effect's top level properties.
-/// </summary>
-typedef enum D2D1_CROSSFADE_PROP
-{
-    
-    /// <summary>
-    /// Property Name: "Weight"
-    /// Property Type: FLOAT
-    /// </summary>
-    D2D1_CROSSFADE_PROP_WEIGHT = 0,
-    D2D1_CROSSFADE_PROP_FORCE_DWORD = 0xffffffff
-
-} D2D1_CROSSFADE_PROP;
-
-
-/// <summary>
-/// The enumeration of the Tint effect's top level properties.
-/// </summary>
-typedef enum D2D1_TINT_PROP
-{
-    
-    /// <summary>
-    /// Property Name: "Color"
-    /// Property Type: D2D1_VECTOR_4F
-    /// </summary>
-    D2D1_TINT_PROP_COLOR = 0,
-    
-    /// <summary>
-    /// Property Name: "ClampOutput"
-    /// Property Type: BOOL
-    /// </summary>
-    D2D1_TINT_PROP_CLAMP_OUTPUT = 1,
-    D2D1_TINT_PROP_FORCE_DWORD = 0xffffffff
-
-} D2D1_TINT_PROP;
-
-
-#endif // #if NTDDI_VERSION >= NTDDI_WIN10_RS1
-
 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
 #pragma endregion

@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -7306,9 +7306,7 @@ enum D3D11_FEATURE
        D3D11_FEATURE_D3D9_OPTIONS1	= ( D3D11_FEATURE_MARKER_SUPPORT + 1 ) ,
        D3D11_FEATURE_D3D11_OPTIONS2	= ( D3D11_FEATURE_D3D9_OPTIONS1 + 1 ) ,
        D3D11_FEATURE_D3D11_OPTIONS3	= ( D3D11_FEATURE_D3D11_OPTIONS2 + 1 ) ,
-        D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT	= ( D3D11_FEATURE_D3D11_OPTIONS3 + 1 ) ,
-        D3D11_FEATURE_D3D11_OPTIONS4	= ( D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1 ) ,
-        D3D11_FEATURE_SHADER_CACHE	= ( D3D11_FEATURE_D3D11_OPTIONS4 + 1 ) 
+        D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT	= ( D3D11_FEATURE_D3D11_OPTIONS3 + 1 ) 
    } 	D3D11_FEATURE;

 typedef struct D3D11_FEATURE_DATA_THREADING
@@ -7465,19 +7463,6 @@ typedef struct D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT
    UINT MaxGPUVirtualAddressBitsPerProcess;
    } 	D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT;

-typedef 
-enum D3D11_SHADER_CACHE_SUPPORT_FLAGS
-    {
-        D3D11_SHADER_CACHE_SUPPORT_NONE	= 0,
-        D3D11_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE	= 0x1,
-        D3D11_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE	= 0x2
-    } 	D3D11_SHADER_CACHE_SUPPORT_FLAGS;
-
-typedef struct D3D11_FEATURE_DATA_SHADER_CACHE
-    {
-    UINT SupportFlags;
-    } 	D3D11_FEATURE_DATA_SHADER_CACHE;
-


 extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0029_v0_0_c_ifspec;
@@ -9676,9 +9661,6 @@ DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_NOGMC,  0xed418a9f, 0x0
 DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_GMC,    0xab998b5b, 0x4258,0x44a9,0x9f,0xeb,0x94,0xe5,0x97,0xa6,0xba,0xae);
 DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN,     0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
 DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10,   0x107af0e0, 0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
-DEFINE_GUID(D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0,       0x463707f8, 0xa1d0, 0x4585, 0x87, 0x6d, 0x83, 0xaa, 0x6d, 0x60, 0xb8, 0x9e);
-DEFINE_GUID(D3D11_DECODER_PROFILE_VP9_VLD_10BIT_PROFILE2, 0xa4c749ef, 0x6ecf, 0x48aa, 0x84, 0x48, 0x50, 0xa7, 0xa1, 0x16, 0x5f, 0xf7);
-DEFINE_GUID(D3D11_DECODER_PROFILE_VP8_VLD,                0x90b899ea, 0x3a62, 0x4705, 0x88, 0xb3, 0x8d, 0xf0, 0x4b, 0x27, 0x44, 0xe7);
 typedef struct D3D11_VIDEO_DECODER_DESC
    {
    GUID Guid;
@@ -9947,8 +9929,7 @@ enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS
        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM	= 0x80,
        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_PIXEL_ASPECT_RATIO	= 0x100,
        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR	= 0x200,
-        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE	= 0x400,
-        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_METADATA_HDR10	= 0x800
+        D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE	= 0x400
    } 	D3D11_VIDEO_PROCESSOR_FEATURE_CAPS;

 typedef 
@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */



@@ -8,7 +8,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */



@@ -50,27 +50,6 @@ typedef interface ID3D12Debug ID3D12Debug;
 #endif 	/* __ID3D12Debug_FWD_DEFINED__ */


-#ifndef __ID3D12Debug1_FWD_DEFINED__
-#define __ID3D12Debug1_FWD_DEFINED__
-typedef interface ID3D12Debug1 ID3D12Debug1;
-
-#endif 	/* __ID3D12Debug1_FWD_DEFINED__ */
-
-
-#ifndef __ID3D12Debug2_FWD_DEFINED__
-#define __ID3D12Debug2_FWD_DEFINED__
-typedef interface ID3D12Debug2 ID3D12Debug2;
-
-#endif 	/* __ID3D12Debug2_FWD_DEFINED__ */
-
-
-#ifndef __ID3D12DebugDevice1_FWD_DEFINED__
-#define __ID3D12DebugDevice1_FWD_DEFINED__
-typedef interface ID3D12DebugDevice1 ID3D12DebugDevice1;
-
-#endif 	/* __ID3D12DebugDevice1_FWD_DEFINED__ */
-
-
 #ifndef __ID3D12DebugDevice_FWD_DEFINED__
 #define __ID3D12DebugDevice_FWD_DEFINED__
 typedef interface ID3D12DebugDevice ID3D12DebugDevice;
@@ -85,13 +64,6 @@ typedef interface ID3D12DebugCommandQueue ID3D12DebugCommandQueue;
 #endif 	/* __ID3D12DebugCommandQueue_FWD_DEFINED__ */


-#ifndef __ID3D12DebugCommandList1_FWD_DEFINED__
-#define __ID3D12DebugCommandList1_FWD_DEFINED__
-typedef interface ID3D12DebugCommandList1 ID3D12DebugCommandList1;
-
-#endif 	/* __ID3D12DebugCommandList1_FWD_DEFINED__ */
-
-
 #ifndef __ID3D12DebugCommandList_FWD_DEFINED__
 #define __ID3D12DebugCommandList_FWD_DEFINED__
 typedef interface ID3D12DebugCommandList ID3D12DebugCommandList;
@@ -204,201 +176,18 @@ EXTERN_C const IID IID_ID3D12Debug;
 #endif 	/* __ID3D12Debug_INTERFACE_DEFINED__ */


-#ifndef __ID3D12Debug1_INTERFACE_DEFINED__
-#define __ID3D12Debug1_INTERFACE_DEFINED__
-
-/* interface ID3D12Debug1 */
-/* [unique][local][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ID3D12Debug1;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("affaa4ca-63fe-4d8e-b8ad-159000af4304")
-    ID3D12Debug1 : public IUnknown
-    {
-    public:
-        virtual void STDMETHODCALLTYPE EnableDebugLayer( void) = 0;
-        
-        virtual void STDMETHODCALLTYPE SetEnableGPUBasedValidation( 
-            BOOL Enable) = 0;
-        
-        virtual void STDMETHODCALLTYPE SetEnableSynchronizedCommandQueueValidation( 
-            BOOL Enable) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct ID3D12Debug1Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ID3D12Debug1 * This,
-            REFIID riid,
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ID3D12Debug1 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ID3D12Debug1 * This);
-        
-        void ( STDMETHODCALLTYPE *EnableDebugLayer )( 
-            ID3D12Debug1 * This);
-        
-        void ( STDMETHODCALLTYPE *SetEnableGPUBasedValidation )( 
-            ID3D12Debug1 * This,
-            BOOL Enable);
-        
-        void ( STDMETHODCALLTYPE *SetEnableSynchronizedCommandQueueValidation )( 
-            ID3D12Debug1 * This,
-            BOOL Enable);
-        
-        END_INTERFACE
-    } ID3D12Debug1Vtbl;
-
-    interface ID3D12Debug1
-    {
-        CONST_VTBL struct ID3D12Debug1Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ID3D12Debug1_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define ID3D12Debug1_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define ID3D12Debug1_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define ID3D12Debug1_EnableDebugLayer(This)	\
-    ( (This)->lpVtbl -> EnableDebugLayer(This) ) 
-
-#define ID3D12Debug1_SetEnableGPUBasedValidation(This,Enable)	\
-    ( (This)->lpVtbl -> SetEnableGPUBasedValidation(This,Enable) ) 
-
-#define ID3D12Debug1_SetEnableSynchronizedCommandQueueValidation(This,Enable)	\
-    ( (This)->lpVtbl -> SetEnableSynchronizedCommandQueueValidation(This,Enable) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __ID3D12Debug1_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_d3d12sdklayers_0000_0002 */
+/* interface __MIDL_itf_d3d12sdklayers_0000_0001 */
 /* [local] */ 

 typedef 
-enum D3D12_GPU_BASED_VALIDATION_FLAGS
+enum D3D12_DEBUG_FEATURE
    {
-        D3D12_GPU_BASED_VALIDATION_FLAGS_NONE	= 0,
-        D3D12_GPU_BASED_VALIDATION_FLAGS_DISABLE_STATE_TRACKING	= 0x1
-    } 	D3D12_GPU_BASED_VALIDATION_FLAGS;
-
-DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_FLAGS)
-
-
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0002_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0002_v0_0_s_ifspec;
-
-#ifndef __ID3D12Debug2_INTERFACE_DEFINED__
-#define __ID3D12Debug2_INTERFACE_DEFINED__
-
-/* interface ID3D12Debug2 */
-/* [unique][local][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ID3D12Debug2;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("93a665c4-a3b2-4e5d-b692-a26ae14e3374")
-    ID3D12Debug2 : public IUnknown
-    {
-    public:
-        virtual void STDMETHODCALLTYPE SetGPUBasedValidationFlags( 
-            D3D12_GPU_BASED_VALIDATION_FLAGS Flags) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct ID3D12Debug2Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ID3D12Debug2 * This,
-            REFIID riid,
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ID3D12Debug2 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ID3D12Debug2 * This);
-        
-        void ( STDMETHODCALLTYPE *SetGPUBasedValidationFlags )( 
-            ID3D12Debug2 * This,
-            D3D12_GPU_BASED_VALIDATION_FLAGS Flags);
-        
-        END_INTERFACE
-    } ID3D12Debug2Vtbl;
-
-    interface ID3D12Debug2
-    {
-        CONST_VTBL struct ID3D12Debug2Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ID3D12Debug2_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define ID3D12Debug2_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define ID3D12Debug2_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define ID3D12Debug2_SetGPUBasedValidationFlags(This,Flags)	\
-    ( (This)->lpVtbl -> SetGPUBasedValidationFlags(This,Flags) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __ID3D12Debug2_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_d3d12sdklayers_0000_0003 */
-/* [local] */ 
+        D3D12_DEBUG_FEATURE_NONE	= 0,
+        D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DRAW	= 0x1,
+        D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DISPATCH	= 0x2
+    } 	D3D12_DEBUG_FEATURE;

+DEFINE_ENUM_FLAG_OPERATORS( D3D12_DEBUG_FEATURE );
 typedef 
 enum D3D12_RLDO_FLAGS
    {
@@ -409,169 +198,10 @@ enum D3D12_RLDO_FLAGS
    } 	D3D12_RLDO_FLAGS;

 DEFINE_ENUM_FLAG_OPERATORS(D3D12_RLDO_FLAGS)
-typedef 
-enum D3D12_DEBUG_DEVICE_PARAMETER_TYPE
-    {
-        D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS	= 0,
-        D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS	= ( D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS + 1 ) ,
-        D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR	= ( D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS + 1 ) 
-    } 	D3D12_DEBUG_DEVICE_PARAMETER_TYPE;
-
-typedef 
-enum D3D12_DEBUG_FEATURE
-    {
-        D3D12_DEBUG_FEATURE_NONE	= 0,
-        D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS	= 0x1,
-        D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING	= 0x2,
-        D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION	= 0x4,
-        D3D12_DEBUG_FEATURE_VALID_MASK	= ( ( D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS | D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING )  | D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION ) 
-    } 	D3D12_DEBUG_FEATURE;
-
-DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEBUG_FEATURE)
-typedef 
-enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE
-    {
-        D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE	= 0,
-        D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY	= ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE + 1 ) ,
-        D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION	= ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY + 1 ) ,
-        D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION	= ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION + 1 ) ,
-        NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES	= ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION + 1 ) 
-    } 	D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE;
-
-typedef 
-enum D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS
-    {
-        D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_NONE	= 0,
-        D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_TRACKING_ONLY_SHADERS	= 0x1,
-        D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_UNGUARDED_VALIDATION_SHADERS	= 0x2,
-        D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_GUARDED_VALIDATION_SHADERS	= 0x4,
-        D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS_VALID_MASK	= 0x7
-    } 	D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS;
-
-DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS)
-typedef struct D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS
-    {
-    UINT MaxMessagesPerCommandList;
-    D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE DefaultShaderPatchMode;
-    D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS PipelineStateCreateFlags;
-    } 	D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS;
-
-typedef struct D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR
-    {
-    FLOAT SlowdownFactor;
-    } 	D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR;


-
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0003_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0003_v0_0_s_ifspec;
-
-#ifndef __ID3D12DebugDevice1_INTERFACE_DEFINED__
-#define __ID3D12DebugDevice1_INTERFACE_DEFINED__
-
-/* interface ID3D12DebugDevice1 */
-/* [unique][local][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ID3D12DebugDevice1;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("a9b71770-d099-4a65-a698-3dee10020f88")
-    ID3D12DebugDevice1 : public IUnknown
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( 
-            D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type,
-            _In_reads_bytes_(DataSize)  const void *pData,
-            UINT DataSize) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( 
-            D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type,
-            _Out_writes_bytes_(DataSize)  void *pData,
-            UINT DataSize) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( 
-            D3D12_RLDO_FLAGS Flags) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct ID3D12DebugDevice1Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ID3D12DebugDevice1 * This,
-            REFIID riid,
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ID3D12DebugDevice1 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ID3D12DebugDevice1 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( 
-            ID3D12DebugDevice1 * This,
-            D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type,
-            _In_reads_bytes_(DataSize)  const void *pData,
-            UINT DataSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( 
-            ID3D12DebugDevice1 * This,
-            D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type,
-            _Out_writes_bytes_(DataSize)  void *pData,
-            UINT DataSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( 
-            ID3D12DebugDevice1 * This,
-            D3D12_RLDO_FLAGS Flags);
-        
-        END_INTERFACE
-    } ID3D12DebugDevice1Vtbl;
-
-    interface ID3D12DebugDevice1
-    {
-        CONST_VTBL struct ID3D12DebugDevice1Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ID3D12DebugDevice1_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define ID3D12DebugDevice1_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define ID3D12DebugDevice1_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define ID3D12DebugDevice1_SetDebugParameter(This,Type,pData,DataSize)	\
-    ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) 
-
-#define ID3D12DebugDevice1_GetDebugParameter(This,Type,pData,DataSize)	\
-    ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) 
-
-#define ID3D12DebugDevice1_ReportLiveDeviceObjects(This,Flags)	\
-    ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __ID3D12DebugDevice1_INTERFACE_DEFINED__ */
-
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0001_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0001_v0_0_s_ifspec;

 #ifndef __ID3D12DebugDevice_INTERFACE_DEFINED__
 #define __ID3D12DebugDevice_INTERFACE_DEFINED__
@@ -670,14 +300,14 @@ EXTERN_C const IID IID_ID3D12DebugDevice;
 #endif 	/* __ID3D12DebugDevice_INTERFACE_DEFINED__ */


-/* interface __MIDL_itf_d3d12sdklayers_0000_0005 */
+/* interface __MIDL_itf_d3d12sdklayers_0000_0002 */
 /* [local] */ 

 DEFINE_GUID(DXGI_DEBUG_D3D12, 0xcf59a98c, 0xa950, 0x4326, 0x91, 0xef, 0x9b, 0xba, 0xa1, 0x7b, 0xfd, 0x95);


-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0005_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0005_v0_0_s_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0002_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0002_v0_0_s_ifspec;

 #ifndef __ID3D12DebugCommandQueue_INTERFACE_DEFINED__
 #define __ID3D12DebugCommandQueue_INTERFACE_DEFINED__
@@ -762,136 +392,6 @@ EXTERN_C const IID IID_ID3D12DebugCommandQueue;
 #endif 	/* __ID3D12DebugCommandQueue_INTERFACE_DEFINED__ */


-/* interface __MIDL_itf_d3d12sdklayers_0000_0006 */
-/* [local] */ 
-
-typedef 
-enum D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE
-    {
-        D3D12_DEBUG_COMMAND_LIST_PARAMETER_GPU_BASED_VALIDATION_SETTINGS	= 0
-    } 	D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE;
-
-typedef struct D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS
-    {
-    D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE ShaderPatchMode;
-    } 	D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS;
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0006_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0006_v0_0_s_ifspec;
-
-#ifndef __ID3D12DebugCommandList1_INTERFACE_DEFINED__
-#define __ID3D12DebugCommandList1_INTERFACE_DEFINED__
-
-/* interface ID3D12DebugCommandList1 */
-/* [unique][local][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ID3D12DebugCommandList1;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("102ca951-311b-4b01-b11f-ecb83e061b37")
-    ID3D12DebugCommandList1 : public IUnknown
-    {
-    public:
-        virtual BOOL STDMETHODCALLTYPE AssertResourceState( 
-            _In_  ID3D12Resource *pResource,
-            UINT Subresource,
-            UINT State) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( 
-            D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type,
-            _In_reads_bytes_(DataSize)  const void *pData,
-            UINT DataSize) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( 
-            D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type,
-            _Out_writes_bytes_(DataSize)  void *pData,
-            UINT DataSize) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct ID3D12DebugCommandList1Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ID3D12DebugCommandList1 * This,
-            REFIID riid,
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ID3D12DebugCommandList1 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ID3D12DebugCommandList1 * This);
-        
-        BOOL ( STDMETHODCALLTYPE *AssertResourceState )( 
-            ID3D12DebugCommandList1 * This,
-            _In_  ID3D12Resource *pResource,
-            UINT Subresource,
-            UINT State);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( 
-            ID3D12DebugCommandList1 * This,
-            D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type,
-            _In_reads_bytes_(DataSize)  const void *pData,
-            UINT DataSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( 
-            ID3D12DebugCommandList1 * This,
-            D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type,
-            _Out_writes_bytes_(DataSize)  void *pData,
-            UINT DataSize);
-        
-        END_INTERFACE
-    } ID3D12DebugCommandList1Vtbl;
-
-    interface ID3D12DebugCommandList1
-    {
-        CONST_VTBL struct ID3D12DebugCommandList1Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ID3D12DebugCommandList1_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define ID3D12DebugCommandList1_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define ID3D12DebugCommandList1_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define ID3D12DebugCommandList1_AssertResourceState(This,pResource,Subresource,State)	\
-    ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) 
-
-#define ID3D12DebugCommandList1_SetDebugParameter(This,Type,pData,DataSize)	\
-    ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) 
-
-#define ID3D12DebugCommandList1_GetDebugParameter(This,Type,pData,DataSize)	\
-    ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __ID3D12DebugCommandList1_INTERFACE_DEFINED__ */
-
-
 #ifndef __ID3D12DebugCommandList_INTERFACE_DEFINED__
 #define __ID3D12DebugCommandList_INTERFACE_DEFINED__

@@ -993,7 +493,7 @@ EXTERN_C const IID IID_ID3D12DebugCommandList;
 #endif 	/* __ID3D12DebugCommandList_INTERFACE_DEFINED__ */


-/* interface __MIDL_itf_d3d12sdklayers_0000_0008 */
+/* interface __MIDL_itf_d3d12sdklayers_0000_0004 */
 /* [local] */ 

 typedef 
@@ -1429,10 +929,10 @@ enum D3D12_MESSAGE_ID
        D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT	= ( D3D12_MESSAGE_ID_ENQUEUESETEVENT_ACCESSDENIED_RETURN + 1 ) ,
        D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_FORCED_SAMPLE_COUNT	= ( D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT + 1 ) ,
        D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS	= ( D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_FORCED_SAMPLE_COUNT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDARRAYWITHDECODER + 1 ) ,
-        D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDARRAYWITHDECODER + 1 ) ,
-        D3D12_MESSAGE_ID_DEVICE_LOCKEDOUT_INTERFACE	= ( D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDARRAYWITHDECODER + 1 ) ,
+        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS + 1 ) ,
+        D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDARRAYWITHDECODER + 1 ) ,
+        D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDARRAYWITHDECODER	= ( D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDARRAYWITHDECODER + 1 ) ,
+        D3D12_MESSAGE_ID_DEVICE_LOCKEDOUT_INTERFACE	= ( D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDARRAYWITHDECODER + 1 ) ,
        D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDPRIORITY	= ( D3D12_MESSAGE_ID_DEVICE_LOCKEDOUT_INTERFACE + 1 ) ,
        D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDVIEW	= ( D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDPRIORITY + 1 ) ,
        D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEEXTENSIONSNOTSUPPORTED	= ( D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDVIEW + 1 ) ,
@@ -1771,7 +1271,10 @@ enum D3D12_MESSAGE_ID
        D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID	= ( D3D12_MESSAGE_ID_CREATE_SAMPLER_INVALID + 1 ) ,
        D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS	= ( D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID + 1 ) ,
        D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION	= ( D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANEINDEX	= ( D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION + 4 ) ,
+        D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_INVALIDCONTEXTTYPE	= ( D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION + 1 ) ,
+        D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_DECODENOTSUPPORTED	= ( D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_INVALIDCONTEXTTYPE + 1 ) ,
+        D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_ENCODENOTSUPPORTED	= ( D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_DECODENOTSUPPORTED + 1 ) ,
+        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANEINDEX	= ( D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_ENCODENOTSUPPORTED + 1 ) ,
        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANEINDEX	= ( D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANEINDEX + 1 ) ,
        D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_AMBIGUOUSVIDEOPLANEINDEX	= ( D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANEINDEX + 1 ) ,
        D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANEINDEX	= ( D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_AMBIGUOUSVIDEOPLANEINDEX + 1 ) ,
@@ -1816,8 +1319,8 @@ enum D3D12_MESSAGE_ID
        D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERMISCFLAGS	= ( D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERUSAGE + 1 ) ,
        D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDDSTTEXTUREUSAGE	= ( D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERMISCFLAGS + 1 ) ,
        D3D12_MESSAGE_ID_JPEGDECODE_BACKBUFFERNOTSUPPORTED	= ( D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDDSTTEXTUREUSAGE + 1 ) ,
-        D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDCOPYFLAGS	= ( D3D12_MESSAGE_ID_JPEGDECODE_BACKBUFFERNOTSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_JPEGENCODE_NOTSUPPORTED	= ( D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDCOPYFLAGS + 1 ) ,
+        D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPRTEDCOPYFLAGS	= ( D3D12_MESSAGE_ID_JPEGDECODE_BACKBUFFERNOTSUPPORTED + 1 ) ,
+        D3D12_MESSAGE_ID_JPEGENCODE_NOTSUPPORTED	= ( D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPRTEDCOPYFLAGS + 1 ) ,
        D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSCANDATAOFFSET	= ( D3D12_MESSAGE_ID_JPEGENCODE_NOTSUPPORTED + 1 ) ,
        D3D12_MESSAGE_ID_JPEGENCODE_INVALIDCOMPONENTS	= ( D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSCANDATAOFFSET + 1 ) ,
        D3D12_MESSAGE_ID_JPEGENCODE_SOURCENOT2D	= ( D3D12_MESSAGE_ID_JPEGENCODE_INVALIDCOMPONENTS + 1 ) ,
@@ -1835,8 +1338,8 @@ enum D3D12_MESSAGE_ID
        D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERMISCFLAGS	= ( D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERUSAGE + 1 ) ,
        D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDSRCTEXTUREUSAGE	= ( D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERMISCFLAGS + 1 ) ,
        D3D12_MESSAGE_ID_JPEGENCODE_BACKBUFFERNOTSUPPORTED	= ( D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDSRCTEXTUREUSAGE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTYPEFORQUERY	= ( D3D12_MESSAGE_ID_JPEGENCODE_BACKBUFFERNOTSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_FLUSH1_INVALIDCONTEXTTYPE	= ( D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTYPEFORQUERY + 1 ) ,
+        D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTTYPEFORQUERY	= ( D3D12_MESSAGE_ID_JPEGENCODE_BACKBUFFERNOTSUPPORTED + 1 ) ,
+        D3D12_MESSAGE_ID_FLUSH1_INVALIDCONTEXTTYPE	= ( D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTTYPEFORQUERY + 1 ) ,
        D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE	= ( D3D12_MESSAGE_ID_FLUSH1_INVALIDCONTEXTTYPE + 1 ) ,
        D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT	= ( D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE + 1 ) ,
        D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUEFORMAT	= ( D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT + 1 ) ,
@@ -1956,145 +1459,9 @@ enum D3D12_MESSAGE_ID
        D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE	= ( D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE + 1 ) ,
        D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT	= ( D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE + 1 ) ,
        D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT	= ( D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED	= ( D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE + 1 ) ,
-        D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE	= ( D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST + 1 ) ,
-        D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC	= ( D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE	= ( D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST	= ( D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC + 1 ) ,
-        D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET	= ( D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH	= ( D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_RESOURCE_BARRIER_ZERO_BARRIERS	= ( D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_BEGIN_END_EVENT_MISMATCH	= ( D3D12_MESSAGE_ID_RESOURCE_BARRIER_ZERO_BARRIERS + 1 ) ,
-        D3D12_MESSAGE_ID_RESOURCE_BARRIER_POSSIBLE_BEFORE_AFTER_MISMATCH	= ( D3D12_MESSAGE_ID_BEGIN_END_EVENT_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_BEGIN_END	= ( D3D12_MESSAGE_ID_RESOURCE_BARRIER_POSSIBLE_BEFORE_AFTER_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INVALID_RESOURCE	= ( D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_BEGIN_END + 1 ) ,
-        D3D12_MESSAGE_ID_USE_OF_ZERO_REFCOUNT_OBJECT	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_INVALID_RESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_OBJECT_EVICTED_WHILE_STILL_IN_USE	= ( D3D12_MESSAGE_ID_USE_OF_ZERO_REFCOUNT_OBJECT + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_DESCRIPTOR_ACCESS_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_OBJECT_EVICTED_WHILE_STILL_IN_USE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_INVALIDLIBRARYBLOB	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_ROOT_DESCRIPTOR_ACCESS_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_DRIVERVERSIONMISMATCH	= ( D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_INVALIDLIBRARYBLOB + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_ADAPTERVERSIONMISMATCH	= ( D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_DRIVERVERSIONMISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_UNSUPPORTED	= ( D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_ADAPTERVERSIONMISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_PIPELINELIBRARY	= ( D3D12_MESSAGE_ID_CREATEPIPELINELIBRARY_UNSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_PIPELINELIBRARY	= ( D3D12_MESSAGE_ID_CREATE_PIPELINELIBRARY + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_PIPELINELIBRARY	= ( D3D12_MESSAGE_ID_LIVE_PIPELINELIBRARY + 1 ) ,
-        D3D12_MESSAGE_ID_STOREPIPELINE_NONAME	= ( D3D12_MESSAGE_ID_DESTROY_PIPELINELIBRARY + 1 ) ,
-        D3D12_MESSAGE_ID_STOREPIPELINE_DUPLICATENAME	= ( D3D12_MESSAGE_ID_STOREPIPELINE_NONAME + 1 ) ,
-        D3D12_MESSAGE_ID_LOADPIPELINE_NAMENOTFOUND	= ( D3D12_MESSAGE_ID_STOREPIPELINE_DUPLICATENAME + 1 ) ,
-        D3D12_MESSAGE_ID_LOADPIPELINE_INVALIDDESC	= ( D3D12_MESSAGE_ID_LOADPIPELINE_NAMENOTFOUND + 1 ) ,
-        D3D12_MESSAGE_ID_PIPELINELIBRARY_SERIALIZE_NOTENOUGHMEMORY	= ( D3D12_MESSAGE_ID_LOADPIPELINE_INVALIDDESC + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_RT_OUTPUT_MISMATCH	= ( D3D12_MESSAGE_ID_PIPELINELIBRARY_SERIALIZE_NOTENOUGHMEMORY + 1 ) ,
-        D3D12_MESSAGE_ID_SETEVENTONMULTIPLEFENCECOMPLETION_INVALIDFLAGS	= ( D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_RT_OUTPUT_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_QUEUE_VIDEO_NOT_SUPPORTED	= ( D3D12_MESSAGE_ID_SETEVENTONMULTIPLEFENCECOMPLETION_INVALIDFLAGS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_VIDEO_NOT_SUPPORTED	= ( D3D12_MESSAGE_ID_CREATE_QUEUE_VIDEO_NOT_SUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEQUERY_HEAP_VIDEO_DECODE_STATISTICS_NOT_SUPPORTED	= ( D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_VIDEO_NOT_SUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDLIST	= ( D3D12_MESSAGE_ID_CREATEQUERY_HEAP_VIDEO_DECODE_STATISTICS_NOT_SUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEODECODER	= ( D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEODECODESTREAM	= ( D3D12_MESSAGE_ID_CREATE_VIDEODECODER + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDLIST	= ( D3D12_MESSAGE_ID_CREATE_VIDEODECODESTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEODECODER	= ( D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEODECODESTREAM	= ( D3D12_MESSAGE_ID_LIVE_VIDEODECODER + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDLIST	= ( D3D12_MESSAGE_ID_LIVE_VIDEODECODESTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEODECODER	= ( D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEODECODESTREAM	= ( D3D12_MESSAGE_ID_DESTROY_VIDEODECODER + 1 ) ,
-        D3D12_MESSAGE_ID_DECODE_FRAME_INVALID_PARAMETERS	= ( D3D12_MESSAGE_ID_DESTROY_VIDEODECODESTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_DEPRECATED_API	= ( D3D12_MESSAGE_ID_DECODE_FRAME_INVALID_PARAMETERS + 1 ) ,
-        D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_COMMAND_LIST_TYPE	= ( D3D12_MESSAGE_ID_DEPRECATED_API + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_DESCRIPTOR_TABLE_NOT_SET	= ( D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_COMMAND_LIST_TYPE + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_CONSTANT_BUFFER_VIEW_NOT_SET	= ( D3D12_MESSAGE_ID_COMMAND_LIST_DESCRIPTOR_TABLE_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_SHADER_RESOURCE_VIEW_NOT_SET	= ( D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_CONSTANT_BUFFER_VIEW_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_UNORDERED_ACCESS_VIEW_NOT_SET	= ( D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_SHADER_RESOURCE_VIEW_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_DISCARD_INVALID_SUBRESOURCE_RANGE	= ( D3D12_MESSAGE_ID_COMMAND_LIST_ROOT_UNORDERED_ACCESS_VIEW_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_DISCARD_ONE_SUBRESOURCE_FOR_MIPS_WITH_RECTS	= ( D3D12_MESSAGE_ID_DISCARD_INVALID_SUBRESOURCE_RANGE + 1 ) ,
-        D3D12_MESSAGE_ID_DISCARD_NO_RECTS_FOR_NON_TEXTURE2D	= ( D3D12_MESSAGE_ID_DISCARD_ONE_SUBRESOURCE_FOR_MIPS_WITH_RECTS + 1 ) ,
-        D3D12_MESSAGE_ID_COPY_ON_SAME_SUBRESOURCE	= ( D3D12_MESSAGE_ID_DISCARD_NO_RECTS_FOR_NON_TEXTURE2D + 1 ) ,
-        D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PAGEABLE	= ( D3D12_MESSAGE_ID_COPY_ON_SAME_SUBRESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UNSUPPORTED	= ( D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PAGEABLE + 1 ) ,
-        D3D12_MESSAGE_ID_STATIC_DESCRIPTOR_INVALID_DESCRIPTOR_CHANGE	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UNSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_DATA_STATIC_DESCRIPTOR_INVALID_DATA_CHANGE	= ( D3D12_MESSAGE_ID_STATIC_DESCRIPTOR_INVALID_DESCRIPTOR_CHANGE + 1 ) ,
-        D3D12_MESSAGE_ID_DATA_STATIC_WHILE_SET_AT_EXECUTE_DESCRIPTOR_INVALID_DATA_CHANGE	= ( D3D12_MESSAGE_ID_DATA_STATIC_DESCRIPTOR_INVALID_DATA_CHANGE + 1 ) ,
-        D3D12_MESSAGE_ID_EXECUTE_BUNDLE_STATIC_DESCRIPTOR_DATA_STATIC_NOT_SET	= ( D3D12_MESSAGE_ID_DATA_STATIC_WHILE_SET_AT_EXECUTE_DESCRIPTOR_INVALID_DATA_CHANGE + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_ACCESS_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_EXECUTE_BUNDLE_STATIC_DESCRIPTOR_DATA_STATIC_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SAMPLER_MODE_MISMATCH	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_ACCESS_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_FENCE_INVALID_FLAGS	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_SAMPLER_MODE_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_RESOURCE_BARRIER_DUPLICATE_SUBRESOURCE_TRANSITIONS	= ( D3D12_MESSAGE_ID_CREATE_FENCE_INVALID_FLAGS + 1 ) ,
-        D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PRIORITY	= ( D3D12_MESSAGE_ID_RESOURCE_BARRIER_DUPLICATE_SUBRESOURCE_TRANSITIONS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_PASS	= ( D3D12_MESSAGE_ID_SETRESIDENCYPRIORITY_INVALID_PRIORITY + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_PASS	= ( D3D12_MESSAGE_ID_CREATE_PASS + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_PASS	= ( D3D12_MESSAGE_ID_DESTROY_PASS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_LARGE_NUM_DESCRIPTORS	= ( D3D12_MESSAGE_ID_LIVE_PASS + 1 ) ,
-        D3D12_MESSAGE_ID_BEGIN_EVENT	= ( D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_LARGE_NUM_DESCRIPTORS + 1 ) ,
-        D3D12_MESSAGE_ID_END_EVENT	= ( D3D12_MESSAGE_ID_BEGIN_EVENT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEDEVICE_DEBUG_LAYER_STARTUP_OPTIONS	= ( D3D12_MESSAGE_ID_END_EVENT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_DEPTHBOUNDSTEST_UNSUPPORTED	= ( D3D12_MESSAGE_ID_CREATEDEVICE_DEBUG_LAYER_STARTUP_OPTIONS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINESTATE_DUPLICATE_SUBOBJECT	= ( D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_DEPTHBOUNDSTEST_UNSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINESTATE_UNKNOWN_SUBOBJECT	= ( D3D12_MESSAGE_ID_CREATEPIPELINESTATE_DUPLICATE_SUBOBJECT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINESTATE_ZERO_SIZE_STREAM	= ( D3D12_MESSAGE_ID_CREATEPIPELINESTATE_UNKNOWN_SUBOBJECT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_STREAM	= ( D3D12_MESSAGE_ID_CREATEPIPELINESTATE_ZERO_SIZE_STREAM + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CANNOT_DEDUCE_TYPE	= ( D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_STREAM + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_STATIC_DESCRIPTOR_RESOURCE_DIMENSION_MISMATCH	= ( D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CANNOT_DEDUCE_TYPE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_PRIVILEGE_FOR_GLOBAL_REALTIME	= ( D3D12_MESSAGE_ID_COMMAND_LIST_STATIC_DESCRIPTOR_RESOURCE_DIMENSION_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_HARDWARE_SUPPORT_FOR_GLOBAL_REALTIME	= ( D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_PRIVILEGE_FOR_GLOBAL_REALTIME + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_ARCHITECTURE	= ( D3D12_MESSAGE_ID_CREATE_COMMAND_QUEUE_INSUFFICIENT_HARDWARE_SUPPORT_FOR_GLOBAL_REALTIME + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DST	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_ARCHITECTURE + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE_DIMENSION	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DST + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DST_RANGE_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DST_RESOURCE_DIMENSION + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_SRC	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DST_RANGE_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE_DIMENSION	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_SRC + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_SRC_RANGE_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_SRC_RESOURCE_DIMENSION + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_OFFSET_ALIGNMENT	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_SRC_RANGE_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_RESOURCES	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_OFFSET_ALIGNMENT + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_SUBRESOURCE_RANGES	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_RESOURCES + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_RESOURCE	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_NULL_DEPENDENT_SUBRESOURCE_RANGES + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_SUBRESOURCE_RANGE	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_RESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_SUBRESOURCE_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_INVALID_DEPENDENT_SUBRESOURCE_RANGE + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_RANGE_OUT_OF_BOUNDS	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_SUBRESOURCE_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_ZERO_DEPENDENCIES	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_DEPENDENT_RANGE_OUT_OF_BOUNDS + 1 ) ,
-        D3D12_MESSAGE_ID_DEVICE_CREATE_SHARED_HANDLE_INVALIDARG	= ( D3D12_MESSAGE_ID_ATOMICCOPYBUFFER_ZERO_DEPENDENCIES + 1 ) ,
-        D3D12_MESSAGE_ID_DESCRIPTOR_HANDLE_WITH_INVALID_RESOURCE	= ( D3D12_MESSAGE_ID_DEVICE_CREATE_SHARED_HANDLE_INVALIDARG + 1 ) ,
-        D3D12_MESSAGE_ID_SETDEPTHBOUNDS_INVALIDARGS	= ( D3D12_MESSAGE_ID_DESCRIPTOR_HANDLE_WITH_INVALID_RESOURCE + 1 ) ,
-        D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_STATE_IMPRECISE	= ( D3D12_MESSAGE_ID_SETDEPTHBOUNDS_INVALIDARGS + 1 ) ,
-        D3D12_MESSAGE_ID_COMMAND_LIST_PIPELINE_STATE_NOT_SET	= ( D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_RESOURCE_STATE_IMPRECISE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_MODEL_MISMATCH	= ( D3D12_MESSAGE_ID_COMMAND_LIST_PIPELINE_STATE_NOT_SET + 1 ) ,
-        D3D12_MESSAGE_ID_OBJECT_ACCESSED_WHILE_STILL_IN_USE	= ( D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_MODEL_MISMATCH + 1 ) ,
-        D3D12_MESSAGE_ID_PROGRAMMABLE_MSAA_UNSUPPORTED	= ( D3D12_MESSAGE_ID_OBJECT_ACCESSED_WHILE_STILL_IN_USE + 1 ) ,
-        D3D12_MESSAGE_ID_SETSAMPLEPOSITIONS_INVALIDARGS	= ( D3D12_MESSAGE_ID_PROGRAMMABLE_MSAA_UNSUPPORTED + 1 ) ,
-        D3D12_MESSAGE_ID_RESOLVESUBRESOURCEREGION_INVALID_RECT	= ( D3D12_MESSAGE_ID_SETSAMPLEPOSITIONS_INVALIDARGS + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDQUEUE	= ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCEREGION_INVALID_RECT + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDLIST	= ( D3D12_MESSAGE_ID_CREATE_VIDEODECODECOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDQUEUE	= ( D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDQUEUE	= ( D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSCOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDLIST	= ( D3D12_MESSAGE_ID_LIVE_VIDEODECODECOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDQUEUE	= ( D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDQUEUE	= ( D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSCOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDLIST	= ( D3D12_MESSAGE_ID_DESTROY_VIDEODECODECOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDQUEUE	= ( D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDLIST + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSOR	= ( D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSCOMMANDQUEUE + 1 ) ,
-        D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSSTREAM	= ( D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSOR + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSOR	= ( D3D12_MESSAGE_ID_CREATE_VIDEOPROCESSSTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSSTREAM	= ( D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSOR + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSOR	= ( D3D12_MESSAGE_ID_LIVE_VIDEOPROCESSSTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSSTREAM	= ( D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSOR + 1 ) ,
-        D3D12_MESSAGE_ID_PROCESS_FRAME_INVALID_PARAMETERS	= ( D3D12_MESSAGE_ID_DESTROY_VIDEOPROCESSSTREAM + 1 ) ,
-        D3D12_MESSAGE_ID_COPY_INVALIDLAYOUT	= ( D3D12_MESSAGE_ID_PROCESS_FRAME_INVALID_PARAMETERS + 1 ) ,
-        D3D12_MESSAGE_ID_D3D12_MESSAGES_END	= ( D3D12_MESSAGE_ID_COPY_INVALIDLAYOUT + 1 ) 
+        D3D12_MESSAGE_ID_D3D12_MESSAGES_END	= ( D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT + 1 ) 
    } 	D3D12_MESSAGE_ID;

-static_assert(D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_UNSUPPORTED == 1000, "Publicly released SDK D3D12_MESSAGE_ID enum values must not be changed. New enum values must be added to the end of the list.");
-static_assert(D3D12_MESSAGE_ID_COPY_INVALIDLAYOUT == 1067, "Publicly released SDK D3D12_MESSAGE_ID enum values must not be changed. New enum values must be added to the end of the list.");
 typedef struct D3D12_MESSAGE
    {
    D3D12_MESSAGE_CATEGORY Category;
@@ -2123,8 +1490,8 @@ typedef struct D3D12_INFO_QUEUE_FILTER
 #define D3D12_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT 1024


-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0008_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0008_v0_0_s_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0004_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0004_v0_0_s_ifspec;

 #ifndef __ID3D12InfoQueue_INTERFACE_DEFINED__
 #define __ID3D12InfoQueue_INTERFACE_DEFINED__
@@ -2531,24 +1898,20 @@ EXTERN_C const IID IID_ID3D12InfoQueue;
 #endif 	/* __ID3D12InfoQueue_INTERFACE_DEFINED__ */


-/* interface __MIDL_itf_d3d12sdklayers_0000_0009 */
+/* interface __MIDL_itf_d3d12sdklayers_0000_0005 */
 /* [local] */ 

 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
 #pragma endregion
 DEFINE_GUID(IID_ID3D12Debug,0x344488b7,0x6846,0x474b,0xb9,0x89,0xf0,0x27,0x44,0x82,0x45,0xe0);
-DEFINE_GUID(IID_ID3D12Debug1,0xaffaa4ca,0x63fe,0x4d8e,0xb8,0xad,0x15,0x90,0x00,0xaf,0x43,0x04);
-DEFINE_GUID(IID_ID3D12Debug2,0x93a665c4,0xa3b2,0x4e5d,0xb6,0x92,0xa2,0x6a,0xe1,0x4e,0x33,0x74);
-DEFINE_GUID(IID_ID3D12DebugDevice1,0xa9b71770,0xd099,0x4a65,0xa6,0x98,0x3d,0xee,0x10,0x02,0x0f,0x88);
 DEFINE_GUID(IID_ID3D12DebugDevice,0x3febd6dd,0x4973,0x4787,0x81,0x94,0xe4,0x5f,0x9e,0x28,0x92,0x3e);
 DEFINE_GUID(IID_ID3D12DebugCommandQueue,0x09e0bf36,0x54ac,0x484f,0x88,0x47,0x4b,0xae,0xea,0xb6,0x05,0x3a);
-DEFINE_GUID(IID_ID3D12DebugCommandList1,0x102ca951,0x311b,0x4b01,0xb1,0x1f,0xec,0xb8,0x3e,0x06,0x1b,0x37);
 DEFINE_GUID(IID_ID3D12DebugCommandList,0x09e0bf36,0x54ac,0x484f,0x88,0x47,0x4b,0xae,0xea,0xb6,0x05,0x3f);
 DEFINE_GUID(IID_ID3D12InfoQueue,0x0742a90b,0xc387,0x483f,0xb9,0x46,0x30,0xa7,0xe4,0xe6,0x14,0x58);


-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0009_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0009_v0_0_s_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0005_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0005_v0_0_s_ifspec;

 /* Additional Prototypes for ALL interfaces */

@@ -3,7 +3,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -46,13 +46,6 @@ typedef interface ID3D10Blob ID3D10Blob;
 #endif 	/* __ID3D10Blob_FWD_DEFINED__ */


-#ifndef __ID3DDestructionNotifier_FWD_DEFINED__
-#define __ID3DDestructionNotifier_FWD_DEFINED__
-typedef interface ID3DDestructionNotifier ID3DDestructionNotifier;
-
-#endif 	/* __ID3DDestructionNotifier_FWD_DEFINED__ */
-
-
 /* header files for imported files */
 #include "oaidl.h"
 #include "ocidl.h"
@@ -449,119 +442,6 @@ typedef ID3D10Blob ID3DBlob;

 typedef ID3DBlob* LPD3DBLOB;
 #define IID_ID3DBlob IID_ID3D10Blob
-typedef void ( __stdcall *PFN_DESTRUCTION_CALLBACK )( 
-    void *pData);
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_s_ifspec;
-
-#ifndef __ID3DDestructionNotifier_INTERFACE_DEFINED__
-#define __ID3DDestructionNotifier_INTERFACE_DEFINED__
-
-/* interface ID3DDestructionNotifier */
-/* [unique][local][object][uuid] */ 
-
-
-EXTERN_C const IID IID_ID3DDestructionNotifier;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("a06eb39a-50da-425b-8c31-4eecd6c270f3")
-    ID3DDestructionNotifier : public IUnknown
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE RegisterDestructionCallback( 
-            /* [annotation] */ 
-            _In_  PFN_DESTRUCTION_CALLBACK callbackFn,
-            /* [annotation] */ 
-            _In_  void *pData,
-            /* [annotation] */ 
-            _Out_  UINT *pCallbackID) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE UnregisterDestructionCallback( 
-            /* [annotation] */ 
-            _In_  UINT callbackID) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct ID3DDestructionNotifierVtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            ID3DDestructionNotifier * This,
-            /* [in] */ REFIID riid,
-            /* [annotation][iid_is][out] */ 
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            ID3DDestructionNotifier * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            ID3DDestructionNotifier * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterDestructionCallback )( 
-            ID3DDestructionNotifier * This,
-            /* [annotation] */ 
-            _In_  PFN_DESTRUCTION_CALLBACK callbackFn,
-            /* [annotation] */ 
-            _In_  void *pData,
-            /* [annotation] */ 
-            _Out_  UINT *pCallbackID);
-        
-        HRESULT ( STDMETHODCALLTYPE *UnregisterDestructionCallback )( 
-            ID3DDestructionNotifier * This,
-            /* [annotation] */ 
-            _In_  UINT callbackID);
-        
-        END_INTERFACE
-    } ID3DDestructionNotifierVtbl;
-
-    interface ID3DDestructionNotifier
-    {
-        CONST_VTBL struct ID3DDestructionNotifierVtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define ID3DDestructionNotifier_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define ID3DDestructionNotifier_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define ID3DDestructionNotifier_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define ID3DDestructionNotifier_RegisterDestructionCallback(This,callbackFn,pData,pCallbackID)	\
-    ( (This)->lpVtbl -> RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) ) 
-
-#define ID3DDestructionNotifier_UnregisterDestructionCallback(This,callbackID)	\
-    ( (This)->lpVtbl -> UnregisterDestructionCallback(This,callbackID) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __ID3DDestructionNotifier_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_d3dcommon_0000_0002 */
-/* [local] */ 
-
 typedef 
 enum _D3D_INCLUDE_TYPE
    {
@@ -986,8 +866,8 @@ DEFINE_GUID(WKPDID_CommentStringW,0xd0149dc0,0x90e8,0x4ec8,0x81, 0x44, 0xe9, 0x0
 #define D3D_COMPONENT_MASK_W   8


-extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0002_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0002_v0_0_s_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_s_ifspec;

 /* Additional Prototypes for ALL interfaces */

@@ -3,7 +3,7 @@
 //  Copyright (c) Microsoft Corporation.  All rights reserved.
 //
 //  Abstract:
-//     Public API definitions shared by DWrite, D2D, and DImage.
+//     Public API definitions for DWrite, D2D and DImage.
 //
 //----------------------------------------------------------------------------
 #pragma once
@@ -21,72 +21,84 @@
 #define CHECKMETHOD(method) virtual DECLSPEC_NOTHROW _Must_inspect_result_ HRESULT STDMETHODCALLTYPE method
 #endif

-#pragma warning(push)
-#pragma warning(disable:4201) // anonymous unions warning
-
 //
 // Forward declarations
 //
-struct IDXGISurface;
+interface IDXGISurface;

-/// <summary>
-/// The measuring method used for text layout.
-/// </summary>
+//+----------------------------------------------------------------------------
+//
+//  Enum:
+//      DWRITE_MEASURING_MODE
+//
+//  Synopsis:
+//      The measuring method used for text layout.
+//
+//-------------------------------------------------------------------------------
 typedef enum DWRITE_MEASURING_MODE
 {
-    /// <summary>
-    /// Text is measured using glyph ideal metrics whose values are independent to the current display resolution.
-    /// </summary>
+    //
+    // Text is measured using glyph ideal metrics whose values are independent to the current display resolution.
+    //
    DWRITE_MEASURING_MODE_NATURAL,

-    /// <summary>
-    /// Text is measured using glyph display compatible metrics whose values tuned for the current display resolution.
-    /// </summary>
+    //
+    // Text is measured using glyph display compatible metrics whose values tuned for the current display resolution.
+    //
    DWRITE_MEASURING_MODE_GDI_CLASSIC,

-    /// <summary>
+    //
    // Text is measured using the same glyph display metrics as text measured by GDI using a font
    // created with CLEARTYPE_NATURAL_QUALITY.
-    /// </summary>
+    //
    DWRITE_MEASURING_MODE_GDI_NATURAL

 } DWRITE_MEASURING_MODE;

-/// <summary>
-/// Qualifies how alpha is to be treated in a bitmap or render target containing
-/// alpha.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Enum:
+//      D2D1_ALPHA_MODE
+//
+//  Synopsis:
+//      Qualifies how alpha is to be treated in a bitmap or render target containing
+//      alpha.
+//
+//------------------------------------------------------------------------------
 typedef enum D2D1_ALPHA_MODE
 {
        
-        /// <summary>
-        /// Alpha mode should be determined implicitly. Some target surfaces do not supply
-        /// or imply this information in which case alpha must be specified.
-        /// </summary>
+        //
+        // Alpha mode should be determined implicitly. Some target surfaces do not supply
+        // or imply this information in which case alpha must be specified.
+        //
        D2D1_ALPHA_MODE_UNKNOWN = 0,
        
-        /// <summary>
-        /// Treat the alpha as premultipled.
-        /// </summary>
+        //
+        // Treat the alpha as premultipled.
+        //
        D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
        
-        /// <summary>
-        /// Opacity is in the 'A' component only.
-        /// </summary>
+        //
+        // Opacity is in the 'A' component only.
+        //
        D2D1_ALPHA_MODE_STRAIGHT = 2,
        
-        /// <summary>
-        /// Ignore any alpha channel information.
-        /// </summary>
+        //
+        // Ignore any alpha channel information.
+        //
        D2D1_ALPHA_MODE_IGNORE = 3,

        D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff

 } D2D1_ALPHA_MODE;

-/// <summary>
-/// Description of a pixel format.
-/// </summary>
+//+-----------------------------------------------------------------------------
+//
+//  Struct:
+//      D2D1_PIXEL_FORMAT
+//
+//------------------------------------------------------------------------------
 typedef struct D2D1_PIXEL_FORMAT
 {
    DXGI_FORMAT format;
@@ -94,245 +106,4 @@ typedef struct D2D1_PIXEL_FORMAT

 } D2D1_PIXEL_FORMAT;

-/// <summary>
-/// Represents an x-coordinate and y-coordinate pair in two-dimensional space.
-/// </summary>
-typedef struct D2D_POINT_2U
-{
-    UINT32 x;
-    UINT32 y;
-
-} D2D_POINT_2U;
-
-/// <summary>
-/// Represents an x-coordinate and y-coordinate pair in two-dimensional space.
-/// </summary>
-typedef struct D2D_POINT_2F
-{
-    FLOAT x;
-    FLOAT y;
-
-} D2D_POINT_2F;
-
-typedef POINT D2D_POINT_2L;
-
-/// <summary>
-/// A vector of 2 FLOAT values (x, y).
-/// </summary>
-typedef struct D2D_VECTOR_2F
-{
-    FLOAT x;
-    FLOAT y;
-
-} D2D_VECTOR_2F;
-
-
-/// <summary>
-/// A vector of 3 FLOAT values (x, y, z).
-/// </summary>
-typedef struct D2D_VECTOR_3F
-{
-    FLOAT x;
-    FLOAT y;
-    FLOAT z;
-
-} D2D_VECTOR_3F;
-
-
-/// <summary>
-/// A vector of 4 FLOAT values (x, y, z, w).
-/// </summary>
-typedef struct D2D_VECTOR_4F
-{
-    FLOAT x;
-    FLOAT y;
-    FLOAT z;
-    FLOAT w;
-
-} D2D_VECTOR_4F;
-
-
-/// <summary>
-/// Represents a rectangle defined by the coordinates of the upper-left corner
-/// (left, top) and the coordinates of the lower-right corner (right, bottom).
-/// </summary>
-typedef struct D2D_RECT_F
-{
-    FLOAT left;
-    FLOAT top;
-    FLOAT right;
-    FLOAT bottom;
-
-} D2D_RECT_F;
-
-
-/// <summary>
-/// Represents a rectangle defined by the coordinates of the upper-left corner
-/// (left, top) and the coordinates of the lower-right corner (right, bottom).
-/// </summary>
-typedef struct D2D_RECT_U
-{
-    UINT32 left;
-    UINT32 top;
-    UINT32 right;
-    UINT32 bottom;
-
-} D2D_RECT_U;
-
-typedef RECT D2D_RECT_L;
-
-/// <summary>
-/// Stores an ordered pair of floats, typically the width and height of a rectangle.
-/// </summary>
-typedef struct D2D_SIZE_F
-{
-    FLOAT width;
-    FLOAT height;
-
-} D2D_SIZE_F;
-
-
-/// <summary>
-/// Stores an ordered pair of integers, typically the width and height of a
-/// rectangle.
-/// </summary>
-typedef struct D2D_SIZE_U
-{
-    UINT32 width;
-    UINT32 height;
-
-} D2D_SIZE_U;
-
-
-/// <summary>
-/// Represents a 3-by-2 matrix.
-/// </summary>
-typedef struct D2D_MATRIX_3X2_F
-{
-    union
-    {
-        struct
-        {
-            /// <summary>
-            /// Horizontal scaling / cosine of rotation
-            /// </summary>
-            FLOAT m11;
-
-            /// <summary>
-            /// Vertical shear / sine of rotation
-            /// </summary>
-            FLOAT m12;
-
-            /// <summary>
-            /// Horizontal shear / negative sine of rotation
-            /// </summary>
-            FLOAT m21;
-
-            /// <summary>
-            /// Vertical scaling / cosine of rotation
-            /// </summary>
-            FLOAT m22;
-
-            /// <summary>
-            /// Horizontal shift (always orthogonal regardless of rotation)
-            /// </summary>
-            FLOAT dx;
-
-            /// <summary>
-            /// Vertical shift (always orthogonal regardless of rotation)
-            /// </summary>
-            FLOAT dy;
-        };
-
-        struct
-        {
-            FLOAT _11, _12;
-            FLOAT _21, _22;
-            FLOAT _31, _32;
-        };
-
-        FLOAT m[3][2];
-    };
-
-} D2D_MATRIX_3X2_F;
-
-
-
-/// <summary>
-/// Represents a 4-by-3 matrix.
-/// </summary>
-typedef struct D2D_MATRIX_4X3_F
-{
-    union
-    {
-        struct
-        {
-            FLOAT _11, _12, _13;
-            FLOAT _21, _22, _23;
-            FLOAT _31, _32, _33;
-            FLOAT _41, _42, _43;
-        };
-
-        FLOAT m[4][3];
-    };
-
-} D2D_MATRIX_4X3_F;
-
-
-/// <summary>
-/// Represents a 4-by-4 matrix.
-/// </summary>
-typedef struct D2D_MATRIX_4X4_F
-{
-    union
-    {
-        struct 
-        {
-            FLOAT _11, _12, _13, _14;
-            FLOAT _21, _22, _23, _24;
-            FLOAT _31, _32, _33, _34;
-            FLOAT _41, _42, _43, _44;
-        };
-
-        FLOAT m[4][4];
-    };
-
-} D2D_MATRIX_4X4_F;
-
-
-/// <summary>
-/// Represents a 5-by-4 matrix.
-/// </summary>
-typedef struct D2D_MATRIX_5X4_F
-{
-    union
-    {
-        struct 
-        {
-            FLOAT _11, _12, _13, _14;
-            FLOAT _21, _22, _23, _24;
-            FLOAT _31, _32, _33, _34;
-            FLOAT _41, _42, _43, _44;
-            FLOAT _51, _52, _53, _54;
-        };
-
-        FLOAT m[5][4];
-    };
-
-} D2D_MATRIX_5X4_F;
-
-
-typedef D2D_POINT_2F D2D1_POINT_2F;
-typedef D2D_POINT_2U D2D1_POINT_2U;
-typedef D2D_POINT_2L D2D1_POINT_2L;
-typedef D2D_RECT_F D2D1_RECT_F;
-typedef D2D_RECT_U D2D1_RECT_U;
-typedef D2D_RECT_L D2D1_RECT_L;
-typedef D2D_SIZE_F D2D1_SIZE_F;
-typedef D2D_SIZE_U D2D1_SIZE_U;
-typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
-
-
-#pragma warning(pop)
-
 #endif /* DCOMMON_H_INCLUDED */
@@ -10,7 +10,9 @@
 #ifndef DWRITE_H_INCLUDED
 #define DWRITE_H_INCLUDED

+#if _MSC_VER > 1000
 #pragma once
+#endif

 #ifndef DWRITE_NO_WINDOWS_H

@@ -54,7 +56,7 @@ enum DWRITE_FONT_FILE_TYPE
    /// <summary>
    /// OpenType font that contains a TrueType collection.
    /// </summary>
-    DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION,
+    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION,

    /// <summary>
    /// Type 1 PFM font.
@@ -74,10 +76,7 @@ enum DWRITE_FONT_FILE_TYPE
    /// <summary>
    /// Bitmap .FON font.
    /// </summary>
-    DWRITE_FONT_FILE_TYPE_BITMAP,
-
-    // The following name is obsolete, but kept as an alias to avoid breaking existing code.
-    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION,
+    DWRITE_FONT_FILE_TYPE_BITMAP
 };

 /// <summary>
@@ -98,9 +97,9 @@ enum DWRITE_FONT_FACE_TYPE
    DWRITE_FONT_FACE_TYPE_TRUETYPE,

    /// <summary>
-    /// OpenType font face that is a part of a TrueType or CFF collection.
+    /// OpenType font face that is a part of a TrueType collection.
    /// </summary>
-    DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION,
+    DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION,

    /// <summary>
    /// A Type 1 font face.
@@ -128,10 +127,7 @@ enum DWRITE_FONT_FACE_TYPE
    /// font file loaders) and the resulting font face object supports only the
    /// minimum functionality necessary to render glyphs.
    /// </summary>
-    DWRITE_FONT_FACE_TYPE_RAW_CFF,
-
-    // The following name is obsolete, but kept as an alias to avoid breaking existing code.
-    DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION,
+    DWRITE_FONT_FACE_TYPE_RAW_CFF
 };

 /// <summary>
@@ -2450,7 +2446,7 @@ enum DWRITE_NUMBER_SUBSTITUTION_METHOD
 /// <summary>
 /// Holds the appropriate digits and numeric punctuation for a given locale.
 /// </summary>
-interface DWRITE_DECLARE_INTERFACE("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") IDWriteNumberSubstitution : public IUnknown
+interface DECLSPEC_UUID("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") DECLSPEC_NOVTABLE IDWriteNumberSubstitution : public IUnknown
 {
 };

@@ -2515,7 +2511,7 @@ struct DWRITE_SHAPING_GLYPH_PROPERTIES
 /// stop prematurely and return a callback error. Rather than return E_NOTIMPL,
 /// an application should stub the method and return a constant/null and S_OK.
 /// </summary>
-interface DWRITE_DECLARE_INTERFACE("688e1a58-5094-47c8-adc8-fbcea60ae92b") IDWriteTextAnalysisSource : public IUnknown
+interface DECLSPEC_UUID("688e1a58-5094-47c8-adc8-fbcea60ae92b") DECLSPEC_NOVTABLE IDWriteTextAnalysisSource : public IUnknown
 {
    /// <summary>
    /// Get a block of text starting at the specified text position.
@@ -2624,7 +2620,7 @@ interface DWRITE_DECLARE_INTERFACE("688e1a58-5094-47c8-adc8-fbcea60ae92b") IDWri
 /// state of the analysis sink, therefore a Set method call on a range
 /// overwrites the previously set analysis result of the same range. 
 /// </summary>
-interface DWRITE_DECLARE_INTERFACE("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") IDWriteTextAnalysisSink : public IUnknown
+interface DECLSPEC_UUID("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") DECLSPEC_NOVTABLE IDWriteTextAnalysisSink : public IUnknown
 {
    /// <summary>
    /// Report script analysis for the text range.
@@ -2922,7 +2918,7 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri
        _In_reads_(glyphCount) UINT16 const* glyphIndices,
        _In_reads_(glyphCount) DWRITE_SHAPING_GLYPH_PROPERTIES const* glyphProps,
        UINT32 glyphCount,
-        _In_ IDWriteFontFace* fontFace,
+        _In_ IDWriteFontFace * fontFace,
        FLOAT fontEmSize,
        BOOL isSideways,
        BOOL isRightToLeft,
@@ -4375,16 +4371,6 @@ interface DWRITE_DECLARE_INTERFACE("53737037-6d14-410b-9bfe-0b182bb70961") IDWri
        UINT32 maxHitTestMetricsCount,
        _Out_ UINT32* actualHitTestMetricsCount
        ) PURE;
-
-    using IDWriteTextFormat::GetFontCollection;
-    using IDWriteTextFormat::GetFontFamilyNameLength;
-    using IDWriteTextFormat::GetFontFamilyName;
-    using IDWriteTextFormat::GetFontWeight;
-    using IDWriteTextFormat::GetFontStyle;
-    using IDWriteTextFormat::GetFontStretch;
-    using IDWriteTextFormat::GetFontSize;
-    using IDWriteTextFormat::GetLocaleNameLength;
-    using IDWriteTextFormat::GetLocaleName;
 };


@@ -10,7 +10,9 @@
 #ifndef DWRITE_1_H_INCLUDED
 #define DWRITE_1_H_INCLUDED

+#if _MSC_VER > 1000
 #pragma once
+#endif

 #include <DWrite.h>

@@ -1335,10 +1337,6 @@ interface DWRITE_DECLARE_INTERFACE("a71efdb4-9fdb-4838-ad90-cfc3be8c3daf") IDWri
    /// True if the font contains vertical glyph variants.
    /// </returns>
    STDMETHOD_(BOOL, HasVerticalGlyphVariants)() PURE;
-
-    using IDWriteFontFace::GetMetrics;
-    using IDWriteFontFace::GetGdiCompatibleMetrics;
-    using IDWriteFontFace::GetRecommendedRenderingMode;
 };


@@ -1357,8 +1355,6 @@ interface DWRITE_DECLARE_INTERFACE("acd16696-8c14-4f5d-877e-fe3fc1d32738") IDWri
        _Out_ DWRITE_FONT_METRICS1* fontMetrics
        ) PURE;

-    using IDWriteFont::GetMetrics;
-
    /// <summary>
    /// Gets the PANOSE values from the font, used for font selection and
    /// matching.
@@ -1718,7 +1714,7 @@ interface DWRITE_DECLARE_INTERFACE("80DAD800-E21F-4E83-96CE-BFCCE500DB7C") IDWri
 /// If any of these callbacks returns an error, the analysis functions will
 /// stop prematurely and return a callback error.
 /// </summary>
-interface DWRITE_DECLARE_INTERFACE("639CFAD8-0FB4-4B21-A58A-067920120009") IDWriteTextAnalysisSource1 : public IDWriteTextAnalysisSource
+interface DECLSPEC_UUID("{639CFAD8-0FB4-4B21-A58A-067920120009}") DECLSPEC_NOVTABLE IDWriteTextAnalysisSource1 : public IDWriteTextAnalysisSource
 {
    /// <summary>
    /// The text analyzer calls back to this to get the desired glyph
@@ -1757,7 +1753,7 @@ interface DWRITE_DECLARE_INTERFACE("639CFAD8-0FB4-4B21-A58A-067920120009") IDWri
 /// The interface implemented by the client to receive the
 /// output of the text analyzers.
 /// </summary>
-interface DWRITE_DECLARE_INTERFACE("B0D941A0-85E7-4D8B-9FD3-5CED9934482A") IDWriteTextAnalysisSink1 : public IDWriteTextAnalysisSink
+interface DECLSPEC_UUID("B0D941A0-85E7-4D8B-9FD3-5CED9934482A") DECLSPEC_NOVTABLE IDWriteTextAnalysisSink1 : public IDWriteTextAnalysisSink
 {
    /// <summary>
    /// The text analyzer calls back to this to report the actual orientation
@@ -10,7 +10,9 @@
 #ifndef DWRITE_2_H_INCLUDED
 #define DWRITE_2_H_INCLUDED

+#if _MSC_VER > 1000
 #pragma once
+#endif

 #include <DWrite_1.h>

@@ -236,11 +238,6 @@ interface DWRITE_DECLARE_INTERFACE("D3E0E934-22A0-427E-AAE4-7D9574B59DB1") IDWri
        BOOL isRightToLeft,
        _In_opt_ IUnknown* clientDrawingEffect
        ) PURE;
-
-    using IDWriteTextRenderer::DrawGlyphRun;
-    using IDWriteTextRenderer::DrawUnderline;
-    using IDWriteTextRenderer::DrawStrikethrough;
-    using IDWriteTextRenderer::DrawInlineObject;
 };


@@ -513,8 +510,6 @@ interface DWRITE_DECLARE_INTERFACE("553A9FF3-5693-4DF7-B52B-74806F7F2EB9") IDWri
        _In_reads_(glyphCount) UINT16 const* glyphIndices,
        _Out_writes_(glyphCount) UINT8* featureApplies
        ) PURE;
-
-    using IDWriteTextAnalyzer1::GetGlyphOrientationTransform;
 };


@@ -559,8 +554,8 @@ interface DWRITE_DECLARE_INTERFACE("EFA008F9-F7A1-48BF-B05C-F224713CC0FF") IDWri
        DWRITE_FONT_WEIGHT baseWeight,
        DWRITE_FONT_STYLE baseStyle,
        DWRITE_FONT_STRETCH baseStretch,
-        _Out_range_(0, textLength) UINT32* mappedLength,
-        _COM_Outptr_result_maybenull_ IDWriteFont** mappedFont,
+        _Deref_out_range_(0, textLength) UINT32* mappedLength,
+        _COM_Outptr_ IDWriteFont** mappedFont,
        _Out_ FLOAT* scale
        ) PURE;
 };
@@ -648,7 +643,7 @@ typedef struct _D3DCOLORVALUE {
 } D3DCOLORVALUE;

 #define D3DCOLORVALUE_DEFINED
-#endif // D3DCOLORVALUE_DEFINED
+#endif D3DCOLORVALUE_DEFINED

 typedef D3DCOLORVALUE DWRITE_COLOR_F;

@@ -658,10 +653,8 @@ typedef D3DCOLORVALUE DWRITE_COLOR_F;
 interface DWRITE_DECLARE_INTERFACE("29748ed6-8c9c-4a6a-be0b-d912e8538944") IDWriteFont2 : public IDWriteFont1
 {
    /// <summary>
-    /// Returns TRUE if the font contains tables that can provide color information
-    /// (including COLR, CPAL, SVG, CBDT, sbix  tables), or FALSE if not. Note that
-    /// TRUE is returned even in the case when the font tables contain only grayscale
-    /// images.
+    /// Returns TRUE if the font contains color information (COLR and CPAL tables), 
+    /// or FALSE if not.
    /// </summary>
    STDMETHOD_(BOOL, IsColorFont)() PURE;
 };
@@ -674,10 +667,8 @@ interface DWRITE_DECLARE_INTERFACE("29748ed6-8c9c-4a6a-be0b-d912e8538944") IDWri
 interface DWRITE_DECLARE_INTERFACE("d8b768ff-64bc-4e66-982b-ec8e87f693f7") IDWriteFontFace2 : public IDWriteFontFace1
 {
    /// <summary>
-    /// Returns TRUE if the font contains tables that can provide color information
-    /// (including COLR, CPAL, SVG, CBDT, sbix  tables), or FALSE if not. Note that
-    /// TRUE is returned even in the case when the font tables contain only grayscale
-    /// images.
+    /// Returns TRUE if the font contains color information (COLR and CPAL tables), 
+    /// or FALSE if not.
    /// </summary>
    STDMETHOD_(BOOL, IsColorFont)() PURE;

@@ -756,8 +747,6 @@ interface DWRITE_DECLARE_INTERFACE("d8b768ff-64bc-4e66-982b-ec8e87f693f7") IDWri
        _Out_ DWRITE_RENDERING_MODE* renderingMode,
        _Out_ DWRITE_GRID_FIT_MODE* gridFitMode
        ) PURE;
-
-    using IDWriteFontFace1::GetRecommendedRenderingMode;
 };

 /// <summary>
@@ -10,7 +10,9 @@
 #ifndef DWRITE_3_H_INCLUDED
 #define DWRITE_3_H_INCLUDED

+#if _MSC_VER > 1000
 #pragma once
+#endif

 #include <DWrite_2.h>

@@ -1245,8 +1247,6 @@ interface DWRITE_DECLARE_INTERFACE("D37D7598-09BE-4222-A236-2081341CC1F2") IDWri
        _Out_ DWRITE_GRID_FIT_MODE* gridFitMode
        ) PURE;

-    using IDWriteFontFace2::GetRecommendedRenderingMode;
-
    /// <summary>
    /// Determines whether the character is locally downloaded from the font.
    /// </summary>
@@ -1578,8 +1578,6 @@ interface DWRITE_DECLARE_INTERFACE("4556BE70-3ABD-4F70-90BE-421780A6F515") IDWri
        _In_ IDWriteFontSet* fontSet,
        _COM_Outptr_ IDWriteFontSet** filteredSet
        ) PURE;
-
-    using IDWriteGdiInterop::CreateFontFromLOGFONT;
 };

 /// <summary>
@@ -1686,9 +1684,6 @@ interface DWRITE_DECLARE_INTERFACE("F67E0EDD-9E3D-4ECC-8C32-4183253DFE70") IDWri
    /// Standard HRESULT error code.
    /// </returns>
    STDMETHOD(GetLineSpacing)(_Out_ DWRITE_LINE_SPACING* lineSpacingOptions) PURE;
-
-    using IDWriteTextFormat1::SetLineSpacing;
-    using IDWriteTextFormat1::GetLineSpacing;
 };

 interface DWRITE_DECLARE_INTERFACE("07DDCD52-020E-4DE8-AC33-6C953D83F92D") IDWriteTextLayout3 : public IDWriteTextLayout2
@@ -1743,682 +1738,6 @@ interface DWRITE_DECLARE_INTERFACE("07DDCD52-020E-4DE8-AC33-6C953D83F92D") IDWri
        UINT32 maxLineCount,
        _Out_ UINT32* actualLineCount
        ) PURE;
-
-    using IDWriteTextLayout2::SetLineSpacing;
-    using IDWriteTextLayout2::GetLineSpacing;
-    using IDWriteTextLayout2::GetLineMetrics;
 };

-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-#if NTDDI_VERSION >= NTDDI_WIN10_RS1
-
-
-/// <summary>
-/// Fonts may contain multiple drawable data formats for glyphs. These flags specify which formats
-/// are supported in the font, either at a font-wide level or per glyph, and the app may use them
-/// to tell DWrite which formats to return when splitting a color glyph run.
-/// </summary>
-enum DWRITE_GLYPH_IMAGE_FORMATS
-{
-    /// <summary>
-    /// Indicates no data is available for this glyph.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0x00000000,
-
-    /// <summary>
-    /// The glyph has TrueType outlines.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 0x00000001,
-
-    /// <summary>
-    /// The glyph has CFF outlines.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_CFF = 0x00000002,
-
-    /// <summary>
-    /// The glyph has multilayered COLR data.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_COLR = 0x00000004,
-
-    /// <summary>
-    /// The glyph has SVG outlines as standard XML.
-    /// </summary>
-    /// <remarks>
-    /// Fonts may store the content gzip'd rather than plain text,
-    /// indicated by the first two bytes as gzip header {0x1F 0x8B}.
-    /// </remarks>
-    DWRITE_GLYPH_IMAGE_FORMATS_SVG = 0x00000008,
-
-    /// <summary>
-    /// The glyph has PNG image data, with standard PNG IHDR.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_PNG = 0x00000010,
-
-    /// <summary>
-    /// The glyph has JPEG image data, with standard JIFF SOI header.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 0x00000020,
-
-    /// <summary>
-    /// The glyph has TIFF image data.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 0x00000040,
-
-    /// <summary>
-    /// The glyph has raw 32-bit premultiplied BGRA data.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 0x00000080,
-};
-
-#ifdef DEFINE_ENUM_FLAG_OPERATORS
-DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS);
-#endif
-
-
-/// <summary>
-/// Represents a color glyph run. The IDWriteFactory4::TranslateColorGlyphRun
-/// method returns an ordered collection of color glyph runs of varying types
-/// depending on what the font supports.
-/// </summary>
-/// <summary>
-/// For runs without any specific color, such as PNG data, the runColor field will be zero.
-/// </summary>
-struct DWRITE_COLOR_GLYPH_RUN1 : DWRITE_COLOR_GLYPH_RUN
-{
-    /// <summary>
-    /// Type of glyph image format for this color run. Exactly one type will be set since
-    /// TranslateColorGlyphRun has already broken down the run into separate parts.
-    /// </summary>
-    DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat;
-
-    /// <summary>
-    /// Measuring mode to use for this glyph run.
-    /// </summary>
-    DWRITE_MEASURING_MODE measuringMode;
-};
-
-
-/// <summary>
-/// Data for a single glyph from GetGlyphImageData.
-/// </summary>
-struct DWRITE_GLYPH_IMAGE_DATA
-{
-    /// <summary>
-    /// Pointer to the glyph data, be it SVG, PNG, JPEG, TIFF.
-    /// </summary>
-    _Field_size_bytes_(imageDataSize) void const* imageData;
-
-    /// <summary>
-    /// Size of glyph data in bytes.
-    /// </summary>
-    UINT32 imageDataSize;
-
-    /// <summary>
-    /// Unique identifier for the glyph data. Clients may use this to cache a parsed/decompressed
-    /// version and tell whether a repeated call to the same font returns the same data.
-    /// </summary>
-    UINT32 uniqueDataId;
-
-    /// <summary>
-    /// Pixels per em of the returned data. For non-scalable raster data (PNG/TIFF/JPG), this can be larger
-    /// or smaller than requested from GetGlyphImageData when there isn't an exact match.
-    /// For scaling intermediate sizes, use: desired pixels per em * font em size / actual pixels per em.
-    /// </summary>
-    UINT32 pixelsPerEm;
-
-    /// <summary>
-    /// Size of image when the format is pixel data.
-    /// </summary>
-    D2D1_SIZE_U pixelSize;
-
-    /// <summary>
-    /// Left origin along the horizontal Roman baseline.
-    /// </summary>
-    D2D1_POINT_2L horizontalLeftOrigin;
-
-    /// <summary>
-    /// Right origin along the horizontal Roman baseline.
-    /// </summary>
-    D2D1_POINT_2L horizontalRightOrigin;
-
-    /// <summary>
-    /// Top origin along the vertical central baseline.
-    /// </summary>
-    D2D1_POINT_2L verticalTopOrigin;
-
-    /// <summary>
-    /// Bottom origin along vertical central baseline.
-    /// </summary>
-    D2D1_POINT_2L verticalBottomOrigin;
-};
-
-
-/// <summary>
-/// Enumerator for an ordered collection of color glyph runs.
-/// </summary>
-interface DWRITE_DECLARE_INTERFACE("7C5F86DA-C7A1-4F05-B8E1-55A179FE5A35") IDWriteColorGlyphRunEnumerator1 : public IDWriteColorGlyphRunEnumerator
-{
-    /// <summary>
-    /// Gets the current color glyph run.
-    /// </summary>
-    /// <param name="colorGlyphRun">Receives a pointer to the color
-    /// glyph run. The pointer remains valid until the next call to
-    /// MoveNext or until the interface is released.</param>
-    /// <returns>
-    /// Standard HRESULT error code. An error is returned if there is
-    /// no current glyph run, i.e., if MoveNext has not yet been called
-    /// or if the end of the sequence has been reached.
-    /// </returns>
-    STDMETHOD(GetCurrentRun)(
-        _Outptr_ DWRITE_COLOR_GLYPH_RUN1 const** colorGlyphRun
-        ) PURE;
-
-    using IDWriteColorGlyphRunEnumerator::GetCurrentRun;
-};
-
-
-/// <summary>
-/// The interface that represents an absolute reference to a font face.
-/// It contains font face type, appropriate file references and face identification data.
-/// Various font data such as metrics, names and glyph outlines is obtained from IDWriteFontFace.
-/// </summary>
-interface DWRITE_DECLARE_INTERFACE("27F2A904-4EB8-441D-9678-0563F53E3E2F") IDWriteFontFace4 : public IDWriteFontFace3
-{
-    /// <summary>
-    /// Gets all the glyph image formats supported by the entire font (SVG, PNG, JPEG, ...).
-    /// </summary>
-    STDMETHOD_(DWRITE_GLYPH_IMAGE_FORMATS, GetGlyphImageFormats)() PURE;
-
-    /// <summary>
-    /// Gets the available image formats of a specific glyph and ppem. Glyphs often have at least TrueType
-    /// or CFF outlines, but they may also have SVG outlines, or they may have only bitmaps
-    /// with no TrueType/CFF outlines. Some image formats, notably the PNG/JPEG ones, are size
-    /// specific and will return no match when there isn't an entry in that size range.
-    /// </summary>
-    /// <remarks>
-    /// Glyph ids beyond the glyph count return DWRITE_GLYPH_IMAGE_FORMATS_NONE.
-    /// </remarks>
-    STDMETHOD(GetGlyphImageFormats)(
-        UINT16 glyphId,
-        UINT32 pixelsPerEmFirst,
-        UINT32 pixelsPerEmLast,
-        _Out_ DWRITE_GLYPH_IMAGE_FORMATS* glyphImageFormats
-        ) PURE;
-
-    /// <summary>
-    /// Gets a pointer to the glyph data based on the desired image format.
-    /// </summary>
-    /// <remarks>
-    /// The glyphDataContext must be released via ReleaseGlyphImageData when done if the data is not empty,
-    /// similar to IDWriteFontFileStream::ReadFileFragment and IDWriteFontFileStream::ReleaseFileFragment.
-    /// The data pointer is valid so long as the IDWriteFontFace exists and ReleaseGlyphImageData has not
-    /// been called.
-    /// </remarks>
-    /// <remarks>
-    /// The DWRITE_GLYPH_IMAGE_DATA::uniqueDataId is valuable for caching purposes so that if the same
-    /// resource is returned more than once, an existing resource can be quickly retrieved rather than
-    /// needing to reparse or decompress the data.
-    /// </remarks>
-    /// <remarks>
-    /// The function only returns SVG or raster data - requesting TrueType/CFF/COLR data returns
-    /// DWRITE_E_INVALIDARG. Those must be drawn via DrawGlyphRun or queried using GetGlyphOutline instead.
-    /// Exactly one format may be requested or else the function returns DWRITE_E_INVALIDARG.
-    /// If the glyph does not have that format, the call is not an error, but the function returns empty data. 
-    /// </remarks>
-    STDMETHOD(GetGlyphImageData)(
-        _In_ UINT16 glyphId,
-        UINT32 pixelsPerEm,
-        DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat,
-        _Out_ DWRITE_GLYPH_IMAGE_DATA* glyphData,
-        _Outptr_result_maybenull_ void** glyphDataContext
-        ) PURE;
-
-    /// <summary>
-    /// Releases the table data obtained earlier from ReadGlyphData.
-    /// </summary>
-    /// <param name="glyphDataContext">Opaque context from ReadGlyphData.</param>
-    STDMETHOD_(void, ReleaseGlyphImageData)(
-        void* glyphDataContext
-        ) PURE;
-};
-
-
-interface DWRITE_DECLARE_INTERFACE("4B0B5BD3-0797-4549-8AC5-FE915CC53856") IDWriteFactory4 : public IDWriteFactory3
-{
-    /// <summary>
-    /// Translates a glyph run to a sequence of color glyph runs, which can be
-    /// rendered to produce a color representation of the original "base" run.
-    /// </summary>
-    /// <param name="baselineOriginX">Horizontal and vertical origin of the base glyph run in
-    /// pre-transform coordinates.</param>
-    /// <param name="glyphRun">Pointer to the original "base" glyph run.</param>
-    /// <param name="glyphRunDescription">Optional glyph run description.</param>
-    /// <param name="glyphImageFormats">Which data formats TranslateColorGlyphRun
-    /// should split the runs into.</param>
-    /// <param name="measuringMode">Measuring mode, needed to compute the origins
-    /// of each glyph.</param>
-    /// <param name="worldToDeviceTransform">Matrix converting from the client's
-    /// coordinate space to device coordinates (pixels), i.e., the world transform
-    /// multiplied by any DPI scaling.</param>
-    /// <param name="colorPaletteIndex">Zero-based index of the color palette to use.
-    /// Valid indices are less than the number of palettes in the font, as returned
-    /// by IDWriteFontFace2::GetColorPaletteCount.</param>
-    /// <param name="colorLayers">If the function succeeds, receives a pointer
-    /// to an enumerator object that can be used to obtain the color glyph runs.
-    /// If the base run has no color glyphs, then the output pointer is NULL
-    /// and the method returns DWRITE_E_NOCOLOR.</param>
-    /// <returns>
-    /// Returns DWRITE_E_NOCOLOR if the font has no color information, the glyph run
-    /// does not contain any color glyphs, or the specified color palette index
-    /// is out of range. In this case, the client should render the original glyph 
-    /// run. Otherwise, returns a standard HRESULT error code.
-    /// </returns>
-    /// <remarks>
-    /// The old IDWriteFactory2::TranslateColorGlyphRun is equivalent to passing
-    /// DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE|CFF|COLR.
-    /// </remarks>
-    STDMETHOD(TranslateColorGlyphRun)(
-        D2D1_POINT_2F baselineOrigin,
-        _In_ DWRITE_GLYPH_RUN const* glyphRun,
-        _In_opt_ DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
-        DWRITE_GLYPH_IMAGE_FORMATS desiredGlyphImageFormats,
-        DWRITE_MEASURING_MODE measuringMode,
-        _In_opt_ DWRITE_MATRIX const* worldAndDpiTransform,
-        UINT32 colorPaletteIndex,
-        _COM_Outptr_ IDWriteColorGlyphRunEnumerator1** colorLayers
-        ) PURE;
-
-    using IDWriteFactory2::TranslateColorGlyphRun;
-
-    /// <summary>
-    /// Converts glyph run placements to glyph origins.
-    /// </summary>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    /// <remarks>
-    /// The transform and DPI have no affect on the origin scaling.
-    /// They are solely used to compute glyph advances when not supplied
-    /// and align glyphs in pixel aligned measuring modes.
-    /// </remarks>
-    STDMETHOD(ComputeGlyphOrigins)(
-        DWRITE_GLYPH_RUN const* glyphRun,
-        DWRITE_MEASURING_MODE measuringMode,
-        D2D1_POINT_2F baselineOrigin,
-        _In_opt_ DWRITE_MATRIX const* worldAndDpiTransform,
-        _Out_writes_(glyphRun->glyphCount) D2D1_POINT_2F* glyphOrigins
-        ) PURE;
-
-    /// <summary>
-    /// Converts glyph run placements to glyph origins. This overload is for natural metrics, which
-    /// includes SVG, TrueType natural modes, and bitmap placement.
-    /// </summary>
-    STDMETHOD(ComputeGlyphOrigins)(
-        DWRITE_GLYPH_RUN const* glyphRun,
-        D2D1_POINT_2F baselineOrigin,
-        _Out_writes_(glyphRun->glyphCount) D2D1_POINT_2F* glyphOrigins
-        ) PURE;
-};
-
-#endif // NTDDI_VERSION >= NTDDI_WIN10_RS1
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-#if NTDDI_VERSION >= NTDDI_WIN10_RS2
-
-interface DWRITE_DECLARE_INTERFACE("3FF7715F-3CDC-4DC6-9B72-EC5621DCCAFD") IDWriteFontSetBuilder1 : public IDWriteFontSetBuilder
-{
-    /// <summary>
-    /// Adds references to all the fonts in the specified font file. The method
-    /// parses the font file to determine the fonts and their properties.
-    /// </summary>
-    /// <param name="fontFile">Font file reference object to add to the set.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(AddFontFile)(
-        _In_ IDWriteFontFile* fontFile
-        ) throw();
-};
-
-/// <summary>
-/// The IDWriteAsyncResult interface represents the result of an asynchronous
-/// operation. A client can use the interface to wait for the operation to
-/// complete and to get the result.
-/// </summary>
-interface DWRITE_DECLARE_INTERFACE("CE25F8FD-863B-4D13-9651-C1F88DC73FE2") IDWriteAsyncResult : public IUnknown
-{
-    /// <summary>
-    /// The GetWaitHandleMethod method returns a handle that can be used to wait 
-    /// for the asynchronous operation to complete. The handle remains valid
-    /// until the interface is released.
-    /// </summary>
-    STDMETHOD_(HANDLE, GetWaitHandle)() PURE;
-
-    /// <summary>
-    /// The GetResult method returns the result of the asynchronous operation.
-    /// The return value is E_PENDING if the operation has not yet completed.
-    /// </summary>
-    STDMETHOD(GetResult)() PURE;
-};
-
-
-/// <summary>
-/// DWRITE_FILE_FRAGMENT represents a range of bytes in a font file.
-/// </summary>
-struct DWRITE_FILE_FRAGMENT
-{
-    /// <summary>
-    /// Starting offset of the fragment from the beginning of the file.
-    /// </summary>
-    UINT64 fileOffset;
-
-    /// <summary>
-    /// Size of the file fragment, in bytes.
-    /// </summary>
-    UINT64 fragmentSize;
-};
-
-
-/// <summary>
-/// IDWriteRemoteFontFileStream represents a font file stream parts of which may be 
-/// non-local. Non-local data must be downloaded before it can be accessed using 
-/// ReadFragment. The interface exposes methods to download font data and query the 
-/// locality of font data.
-/// </summary>
-/// <remarks>
-/// For more information, see the description of IDWriteRemoteFontFileLoader.
-/// </remarks>
-interface DWRITE_DECLARE_INTERFACE("4DB3757A-2C72-4ED9-B2B6-1ABABE1AFF9C") IDWriteRemoteFontFileStream : public IDWriteFontFileStream
-{
-    /// <summary>
-    /// GetLocalFileSize returns the number of bytes of the font file that are
-    /// currently local, which should always be less than or equal to the full
-    /// file size returned by GetFileSize. If the locality is remote, the return
-    /// value is zero. If the file is fully local, the return value must be the
-    /// same as GetFileSize.
-    /// </summary>
-    /// <param name="localFileSize">Receives the local size of the file.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(GetLocalFileSize)(
-        _Out_ UINT64* localFileSize
-        ) PURE;
-
-    /// <summary>
-    /// GetFileFragmentLocality returns information about the locality of a byte range (i.e.,
-    /// font fragment) within the font file stream.
-    /// </summary>
-    /// <param name="fileOffset">Offset of the fragment from the beginning of the font file.</param>
-    /// <param name="fragmentSize">Size of the fragment in bytes.</param>
-    /// <param name="isLocal">Receives TRUE if the first byte of the fragment is local, FALSE if not.</param>
-    /// <param name="partialSize">Receives the number of contiguous bytes from the start of the
-    /// fragment that have the same locality as the first byte.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(GetFileFragmentLocality)(
-        UINT64 fileOffset,
-        UINT64 fragmentSize,
-        _Out_ BOOL* isLocal,
-        _Out_range_(0, fragmentSize) UINT64* partialSize
-        ) PURE;
-
-    /// <summary>
-    /// Gets the current locality of the file.
-    /// </summary>
-    /// <returns>
-    /// Returns the locality enumeration (i.e., remote, partial, or local).
-    /// </returns>
-    STDMETHOD_(DWRITE_LOCALITY, GetLocality)() PURE;
-
-    /// <summary>
-    /// BeginDownload begins downloading all or part of the font file.
-    /// </summary>
-    /// <param name="fileFragments">Array of structures, each specifying a byte
-    /// range to download.</param>
-    /// <param name="fragmentCount">Number of elements in the fileFragments array.
-    /// This can be zero to just download file information, such as the size.</param>
-    /// <param name="asyncResult">Receives an object that can be used to wait for
-    /// the asynchronous download to complete and to get the download result upon 
-    /// completion. The result may be NULL if the download completes synchronously.
-    /// For example, this can happen if method determines that the requested data
-    /// is already local.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(BeginDownload)(
-        _In_ UUID const* downloadOperationID,
-        _In_reads_(fragmentCount) DWRITE_FILE_FRAGMENT const* fileFragments,
-        UINT32 fragmentCount,
-        _COM_Outptr_result_maybenull_ IDWriteAsyncResult** asyncResult
-        ) PURE;
-};
-
-
-/// <summary>
-/// Specifies the container format of a font resource. A container format is distinct from
-/// a font file format (DWRITE_FONT_FILE_TYPE) because the container describes the container
-/// in which the underlying font file is packaged.
-/// </summary>
-enum DWRITE_CONTAINER_TYPE
-{
-    DWRITE_CONTAINER_TYPE_UNKNOWN,
-    DWRITE_CONTAINER_TYPE_WOFF,
-    DWRITE_CONTAINER_TYPE_WOFF2
-};
-
-
-/// <summary>
-/// The IDWriteRemoteFontFileLoader interface represents a font file loader that can access 
-/// remote (i.e., downloadable) fonts. The IDWriteFactory5::CreateHttpFontFileLoader method
-/// returns an instance of this interface, or a client can create its own implementation.
-/// </summary>
-/// <remarks>
-/// Calls to a remote file loader or stream should never block waiting for network operations.
-/// Any call that cannot succeeded immediately using local (e.g., cached) must should return
-/// DWRITE_E_REMOTEFONT. This error signifies to DWrite that it should add requests to the 
-/// font download queue.
-/// </remarks>
-interface DWRITE_DECLARE_INTERFACE("68648C83-6EDE-46C0-AB46-20083A887FDE") IDWriteRemoteFontFileLoader : public IDWriteFontFileLoader
-{
-    /// <summary>
-    /// Creates a remote font file stream object that encapsulates an open file resource
-    /// and can be used to download remote file data.
-    /// </summary>
-    /// <param name="fontFileReferenceKey">Font file reference key that uniquely identifies the font file resource
-    /// within the scope of the font loader being used.</param>
-    /// <param name="fontFileReferenceKeySize">Size of font file reference key in bytes.</param>
-    /// <param name="fontFileStream">Pointer to the newly created font file stream.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    /// <remarks>
-    /// Unlike CreateStreamFromKey, this method can be used to create a stream for a remote file.
-    /// If the file is remote, the client must call IDWriteRemoteFontFileStream::DownloadFileInformation
-    /// before the stream can be used to get the file size or access data.
-    /// </remarks>
-    STDMETHOD(CreateRemoteStreamFromKey)(
-        _In_reads_bytes_(fontFileReferenceKeySize) void const* fontFileReferenceKey,
-        UINT32 fontFileReferenceKeySize,
-        _COM_Outptr_ IDWriteRemoteFontFileStream** fontFileStream
-        ) PURE;
-
-    /// <summary>
-    /// Gets the locality of the file resource identified by the unique key.
-    /// </summary>
-    /// <param name="fontFileReferenceKey">Font file reference key that uniquely identifies the font file resource
-    /// within the scope of the font loader being used.</param>
-    /// <param name="fontFileReferenceKeySize">Size of font file reference key in bytes.</param>
-    /// <param name="locality">Locality of the file.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(GetLocalityFromKey)(
-        _In_reads_bytes_(fontFileReferenceKeySize) void const* fontFileReferenceKey,
-        UINT32 fontFileReferenceKeySize,
-        _Out_ DWRITE_LOCALITY* locality
-        ) PURE;
-
-    /// <summary>
-    /// Creates a font file reference from a URL if the loader supports this capability.
-    /// </summary>
-    /// <param name="factory">Factory used to create the font file reference.</param>
-    /// <param name="baseUrl">Optional base URL. The base URL is used to resolve the fontFileUrl
-    /// if it is relative. For example, the baseUrl might be the URL of the referring document
-    /// that contained the fontFileUrl.</param>
-    /// <param name="fontFileUrl">URL of the font resource.</param>
-    /// <param name="fontFile">Receives a pointer to the newly created font file reference.</param>
-    /// <returns>
-    /// Standard HRESULT error code, or E_NOTIMPL if the loader does not implement this method.
-    /// </returns>
-    STDMETHOD(CreateFontFileReferenceFromUrl)(
-        IDWriteFactory* factory,
-        _In_opt_z_ WCHAR const* baseUrl,
-        _In_z_ WCHAR const* fontFileUrl,
-        _COM_Outptr_ IDWriteFontFile** fontFile
-        ) PURE;
-};
-
-
-/// <summary>
-/// The IDWriteInMemoryFontFileLoader interface enables clients to reference
-/// in-memory fonts without having to implement a custom loader. The 
-/// IDWriteFactory5::CreateInMemoryFontFileLoader method returns an instance
-/// of this interface, which the client is responsible for registering and
-/// unregistering using IDWriteFactory::RegisterFontFileLoader and 
-/// IDWriteFactory::UnregisterFontFileLoader.
-/// </summary>
-interface DWRITE_DECLARE_INTERFACE("DC102F47-A12D-4B1C-822D-9E117E33043F") IDWriteInMemoryFontFileLoader : public IDWriteFontFileLoader
-{
-    /// <summary>
-    /// The CreateInMemoryFontFileReference method creates a font file reference
-    /// (IDWriteFontFile object) from an array of bytes. The font file reference
-    /// is bound to the IDWRiteInMemoryFontFileLoader instance with which it was
-    /// created and remains valid for as long as that loader is registered with
-    /// the factory.
-    /// </summary>
-    /// <param name="factory">Factory object used to create the font file reference.</param>
-    /// <param name="fontData">Pointer to a memory block containing the font data.</param>
-    /// <param name="fontDataSize">Size of the font data.</param>
-    /// <param name="ownerObject">Optional object that owns the memory specified by
-    /// the fontData parameter. If this parameter is not NULL, the method stores a
-    /// pointer to the font data and adds a reference to the owner object. The
-    /// fontData pointer must remain valid until the owner object is released. If
-    /// this parameter is NULL, the method makes a copy of the font data.</param>
-    /// <param name="fontFile">Receives a pointer to the newly-created font file
-    /// reference.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(CreateInMemoryFontFileReference)(
-        IDWriteFactory* factory,
-        _In_reads_bytes_(fontDataSize) void const* fontData,
-        UINT32 fontDataSize,
-        _In_opt_ IUnknown* ownerObject,
-        _COM_Outptr_ IDWriteFontFile** fontFile
-        ) PURE;
-
-    /// <summary>
-    /// The GetFileCount method returns the number of font file references that
-    /// have been created using this loader instance.
-    /// </summary>
-    STDMETHOD_(UINT32, GetFileCount)() PURE;
-};
-
-
-/// <summary>
-/// The root factory interface for all DWrite objects.
-/// </summary>
-interface DWRITE_DECLARE_INTERFACE("958DB99A-BE2A-4F09-AF7D-65189803D1D3") IDWriteFactory5 : public IDWriteFactory4
-{
-    /// <summary>
-    /// Creates an empty font set builder to add font face references
-    /// and create a custom font set.
-    /// </summary>
-    /// <param name="fontSetBuilder">Holds the newly created font set builder object, or NULL in case of failure.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(CreateFontSetBuilder)(
-        _COM_Outptr_ IDWriteFontSetBuilder1** fontSetBuilder
-        ) PURE;
-
-    using IDWriteFactory3::CreateFontSetBuilder;
-
-    /// <summary>
-    /// The CreateInMemoryFontFileLoader method creates a loader object that can
-    /// be used to create font file references to in-memory fonts. The caller is 
-    /// responsible for registering and unregistering the loader.
-    /// </summary>
-    /// <param name="newLoader">Receives a pointer to the newly-created loader object.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(CreateInMemoryFontFileLoader)(
-        _COM_Outptr_ IDWriteInMemoryFontFileLoader** newLoader
-        ) PURE;
-
-    /// <summary>
-    /// The CreateHttpFontFileLoader function creates a remote font file loader 
-    /// that can create font file references from HTTP or HTTPS URLs. The caller
-    /// is responsible for registering and unregistering the loader.
-    /// </summary>
-    /// <param name="referrerUrl">Optional referrer URL for HTTP requests.</param>
-    /// <param name="extraHeaders">Optional additional header fields to include 
-    /// in HTTP requests. Each header field consists of a name followed by a colon
-    /// (":") and the field value, as specified by RFC 2616. Multiple header fields 
-    /// may be separated by newlines.</param>
-    /// <param name="newLoader">Receives a pointer to the newly-created loader object.</param>
-    /// <returns>
-    /// Standard HRESULT error code.
-    /// </returns>
-    STDMETHOD(CreateHttpFontFileLoader)(
-        _In_opt_z_ wchar_t const* referrerUrl,
-        _In_opt_z_ wchar_t const* extraHeaders,
-        _COM_Outptr_ IDWriteRemoteFontFileLoader** newLoader
-        );
-
-    /// <summary>
-    /// The AnalyzeContainerType method analyzes the specified file data to determine
-    /// whether it is a known font container format (e.g., WOFF or WOFF2).
-    /// </summary>
-    /// <returns>
-    /// Returns the container type if recognized. DWRITE_CONTAINER_TYPE_UNKOWNN is
-    /// returned for all other files, including uncompressed font files.
-    /// </returns>
-    STDMETHOD_(DWRITE_CONTAINER_TYPE, AnalyzeContainerType)(
-        _In_reads_bytes_(fileDataSize) void const* fileData,
-        UINT32 fileDataSize
-        ) PURE;
-
-    /// <summary>
-    /// The UnpackFontFile method unpacks font data from a container file (WOFF or
-    /// WOFF2) and returns the unpacked font data in the form of a font file stream.
-    /// </summary>
-    /// <param name="containerType">Container type returned by AnalyzeContainerType.</param>
-    /// <param name="fileData">Pointer to the compressed data.</param>
-    /// <param name="fileDataSize">Size of the compressed data, in bytes.</param>
-    /// <param name="unpackedFontStream">Receives a pointer to a newly created font
-    /// file stream containing the uncompressed data.</param>
-    /// <returns>
-    /// Standard HRESULT error code. The return value is E_INVALIDARG if the container
-    /// type is DWRITE_CONTAINER_TYPE_UNKNOWN.
-    /// </returns>
-    STDMETHOD(UnpackFontFile)(
-        DWRITE_CONTAINER_TYPE containerType,
-        _In_reads_bytes_(fileDataSize) void const* fileData,
-        UINT32 fileDataSize,
-        _COM_Outptr_ IDWriteFontFileStream** unpackedFontStream
-        ) PURE;
-};
-
-#endif // NTDDI_VERSION >= NTDDI_WIN10_RS2
-
-#endif // DWRITE_3_H_INCLUDED
+#endif /* DWRITE_3_H_INCLUDED */
@@ -1,9 +1,9 @@
-
+

 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -140,7 +140,6 @@ typedef interface IDXGIDevice1 IDXGIDevice1;
 /* header files for imported files */
 #include "oaidl.h"
 #include "ocidl.h"
-#include "dxgicommon.h"
 #include "dxgitype.h"

 #ifdef __cplusplus
@@ -182,8 +181,6 @@ typedef struct DXGI_MAPPED_RECT
    } 	DXGI_MAPPED_RECT;

 #ifdef __midl
-#ifndef LUID_DEFINED
-#define LUID_DEFINED 1
 typedef struct _LUID
    {
    DWORD LowPart;
@@ -192,7 +189,6 @@ typedef struct _LUID

 typedef struct _LUID *PLUID;

-#endif
 #endif
 typedef struct DXGI_ADAPTER_DESC
    {
@@ -277,9 +273,7 @@ enum DXGI_SWAP_CHAIN_FLAG
        DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER	= 128,
        DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO	= 256,
        DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO	= 512,
-        DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED	= 1024,
-        DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING	= 2048,
-        DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS	= 4096
+        DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED	= 1024
    } 	DXGI_SWAP_CHAIN_FLAG;

 typedef struct DXGI_SWAP_CHAIN_DESC
@@ -325,7 +319,7 @@ EXTERN_C const IID IID_IDXGIObject;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown) = 0;
+            _In_  const IUnknown *pUnknown) = 0;
        
        virtual HRESULT STDMETHODCALLTYPE GetPrivateData( 
            /* [annotation][in] */ 
@@ -375,7 +369,7 @@ EXTERN_C const IID IID_IDXGIObject;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIObject * This,
@@ -494,7 +488,7 @@ EXTERN_C const IID IID_IDXGIDeviceSubObject;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIDeviceSubObject * This,
@@ -632,7 +626,7 @@ EXTERN_C const IID IID_IDXGIResource;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIResource * This,
@@ -794,7 +788,7 @@ EXTERN_C const IID IID_IDXGIKeyedMutex;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIKeyedMutex * This,
@@ -959,7 +953,7 @@ EXTERN_C const IID IID_IDXGISurface;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISurface * This,
@@ -1116,7 +1110,7 @@ EXTERN_C const IID IID_IDXGISurface1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISurface1 * This,
@@ -1306,7 +1300,7 @@ EXTERN_C const IID IID_IDXGIAdapter;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIAdapter * This,
@@ -1512,7 +1506,7 @@ EXTERN_C const IID IID_IDXGIOutput;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutput * This,
@@ -1690,7 +1684,6 @@ EXTERN_C const IID IID_IDXGIOutput;
 #define DXGI_PRESENT_STEREO_TEMPORARY_MONO     0x00000020UL
 #define DXGI_PRESENT_RESTRICT_TO_OUTPUT        0x00000040UL
 #define DXGI_PRESENT_USE_DURATION              0x00000100UL
-#define DXGI_PRESENT_ALLOW_TEARING             0x00000200UL


 extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0008_v0_0_c_ifspec;
@@ -1794,7 +1787,7 @@ EXTERN_C const IID IID_IDXGISwapChain;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISwapChain * This,
@@ -2046,7 +2039,7 @@ EXTERN_C const IID IID_IDXGIFactory;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIFactory * This,
@@ -2248,7 +2241,7 @@ EXTERN_C const IID IID_IDXGIDevice;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIDevice * This,
@@ -2455,7 +2448,7 @@ EXTERN_C const IID IID_IDXGIFactory1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIFactory1 * This,
@@ -2635,7 +2628,7 @@ EXTERN_C const IID IID_IDXGIAdapter1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIAdapter1 * This,
@@ -2792,7 +2785,7 @@ EXTERN_C const IID IID_IDXGIDevice1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIDevice1 * This,
@@ -3,7 +3,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -360,7 +360,7 @@ EXTERN_C const IID IID_IDXGIOutputDuplication;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutputDuplication * This,
@@ -582,7 +582,7 @@ EXTERN_C const IID IID_IDXGISurface2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISurface2 * This,
@@ -776,7 +776,7 @@ EXTERN_C const IID IID_IDXGIResource1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIResource1 * This,
@@ -991,7 +991,7 @@ EXTERN_C const IID IID_IDXGIDevice2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIDevice2 * This,
@@ -1209,8 +1209,7 @@ typedef struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC
 typedef struct DXGI_PRESENT_PARAMETERS
    {
    UINT DirtyRectsCount;
-    /* [annotation] */ 
-    _Field_size_full_opt_(DirtyRectsCount)  RECT *pDirtyRects;
+    RECT *pDirtyRects;
    RECT *pScrollRect;
    POINT *pScrollOffset;
    } 	DXGI_PRESENT_PARAMETERS;
@@ -1315,7 +1314,7 @@ EXTERN_C const IID IID_IDXGISwapChain1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISwapChain1 * This,
@@ -1700,7 +1699,7 @@ EXTERN_C const IID IID_IDXGIFactory2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIFactory2 * This,
@@ -2049,7 +2048,7 @@ EXTERN_C const IID IID_IDXGIAdapter2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIAdapter2 * This,
@@ -2234,7 +2233,7 @@ EXTERN_C const IID IID_IDXGIOutput1;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutput1 * This,
@@ -3,7 +3,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -168,7 +168,7 @@ EXTERN_C const IID IID_IDXGIDevice3;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIDevice3 * This,
@@ -430,7 +430,7 @@ EXTERN_C const IID IID_IDXGISwapChain2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISwapChain2 * This,
@@ -792,7 +792,7 @@ EXTERN_C const IID IID_IDXGIOutput2;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutput2 * This,
@@ -1059,7 +1059,7 @@ EXTERN_C const IID IID_IDXGIFactory3;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIFactory3 * This,
@@ -1861,7 +1861,7 @@ EXTERN_C const IID IID_IDXGIOutput3;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutput3 * This,
@@ -3,7 +3,7 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */


- /* File created by MIDL compiler version 8.01.0622 */
+ /* File created by MIDL compiler version 8.00.0613 */
 /* @@MIDL_FILE_HEADING(  ) */


@@ -170,7 +170,7 @@ EXTERN_C const IID IID_IDXGISwapChain3;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGISwapChain3 * This,
@@ -599,7 +599,7 @@ EXTERN_C const IID IID_IDXGIOutput4;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIOutput4 * This,
@@ -906,7 +906,7 @@ EXTERN_C const IID IID_IDXGIFactory4;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIFactory4 * This,
@@ -1296,7 +1296,7 @@ EXTERN_C const IID IID_IDXGIAdapter3;
            /* [annotation][in] */ 
            _In_  REFGUID Name,
            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
+            _In_  const IUnknown *pUnknown);
        
        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
            IDXGIAdapter3 * This,
@@ -1,727 +0,0 @@
-
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-
- /* File created by MIDL compiler version 8.01.0622 */
-/* @@MIDL_FILE_HEADING(  ) */
-
-
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 500
-#endif
-
-/* verify that the <rpcsal.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCSAL_H_VERSION__
-#define __REQUIRED_RPCSAL_H_VERSION__ 100
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error this stub requires an updated version of <rpcndr.h>
-#endif /* __RPCNDR_H_VERSION__ */
-
-#ifndef COM_NO_WINDOWS_H
-#include "windows.h"
-#include "ole2.h"
-#endif /*COM_NO_WINDOWS_H*/
-
-#ifndef __dxgi1_6_h__
-#define __dxgi1_6_h__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-#pragma once
-#endif
-
-/* Forward Declarations */ 
-
-#ifndef __IDXGIAdapter4_FWD_DEFINED__
-#define __IDXGIAdapter4_FWD_DEFINED__
-typedef interface IDXGIAdapter4 IDXGIAdapter4;
-
-#endif 	/* __IDXGIAdapter4_FWD_DEFINED__ */
-
-
-#ifndef __IDXGIOutput6_FWD_DEFINED__
-#define __IDXGIOutput6_FWD_DEFINED__
-typedef interface IDXGIOutput6 IDXGIOutput6;
-
-#endif 	/* __IDXGIOutput6_FWD_DEFINED__ */
-
-
-/* header files for imported files */
-#include "dxgi1_5.h"
-
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-
-/* interface __MIDL_itf_dxgi1_6_0000_0000 */
-/* [local] */ 
-
-// Copyright (c) Microsoft Corporation.  All Rights Reserved
-#include <winapifamily.h>
-#pragma region App Family
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-typedef 
-enum DXGI_ADAPTER_FLAG3
-    {
-        DXGI_ADAPTER_FLAG3_NONE	= 0,
-        DXGI_ADAPTER_FLAG3_REMOTE	= 1,
-        DXGI_ADAPTER_FLAG3_SOFTWARE	= 2,
-        DXGI_ADAPTER_FLAG3_ACG_COMPATIBLE	= 4,
-        DXGI_ADAPTER_FLAG3_FORCE_DWORD	= 0xffffffff
-    } 	DXGI_ADAPTER_FLAG3;
-
-DEFINE_ENUM_FLAG_OPERATORS( DXGI_ADAPTER_FLAG3 );
-typedef struct DXGI_ADAPTER_DESC3
-    {
-    WCHAR Description[ 128 ];
-    UINT VendorId;
-    UINT DeviceId;
-    UINT SubSysId;
-    UINT Revision;
-    SIZE_T DedicatedVideoMemory;
-    SIZE_T DedicatedSystemMemory;
-    SIZE_T SharedSystemMemory;
-    LUID AdapterLuid;
-    DXGI_ADAPTER_FLAG3 Flags;
-    DXGI_GRAPHICS_PREEMPTION_GRANULARITY GraphicsPreemptionGranularity;
-    DXGI_COMPUTE_PREEMPTION_GRANULARITY ComputePreemptionGranularity;
-    } 	DXGI_ADAPTER_DESC3;
-
-
-
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0000_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0000_v0_0_s_ifspec;
-
-#ifndef __IDXGIAdapter4_INTERFACE_DEFINED__
-#define __IDXGIAdapter4_INTERFACE_DEFINED__
-
-/* interface IDXGIAdapter4 */
-/* [unique][local][uuid][object] */ 
-
-
-EXTERN_C const IID IID_IDXGIAdapter4;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("3c8d99d1-4fbf-4181-a82c-af66bf7bd24e")
-    IDXGIAdapter4 : public IDXGIAdapter3
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE GetDesc3( 
-            /* [annotation][out] */ 
-            _Out_  DXGI_ADAPTER_DESC3 *pDesc) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct IDXGIAdapter4Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IDXGIAdapter4 * This,
-            /* [in] */ REFIID riid,
-            /* [annotation][iid_is][out] */ 
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IDXGIAdapter4 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IDXGIAdapter4 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [in] */ UINT DataSize,
-            /* [annotation][in] */ 
-            _In_reads_bytes_(DataSize)  const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [annotation][out][in] */ 
-            _Inout_  UINT *pDataSize,
-            /* [annotation][out] */ 
-            _Out_writes_bytes_(*pDataSize)  void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  REFIID riid,
-            /* [annotation][retval][out] */ 
-            _COM_Outptr_  void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( 
-            IDXGIAdapter4 * This,
-            /* [in] */ UINT Output,
-            /* [annotation][out][in] */ 
-            _COM_Outptr_  IDXGIOutput **ppOutput);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_ADAPTER_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID InterfaceName,
-            /* [annotation][out] */ 
-            _Out_  LARGE_INTEGER *pUMDVersion);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_ADAPTER_DESC1 *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_ADAPTER_DESC2 *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterHardwareContentProtectionTeardownStatusEvent )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  HANDLE hEvent,
-            /* [annotation][out] */ 
-            _Out_  DWORD *pdwCookie);
-        
-        void ( STDMETHODCALLTYPE *UnregisterHardwareContentProtectionTeardownStatus )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  DWORD dwCookie);
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryVideoMemoryInfo )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  UINT NodeIndex,
-            /* [annotation][in] */ 
-            _In_  DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup,
-            /* [annotation][out] */ 
-            _Out_  DXGI_QUERY_VIDEO_MEMORY_INFO *pVideoMemoryInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetVideoMemoryReservation )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  UINT NodeIndex,
-            /* [annotation][in] */ 
-            _In_  DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup,
-            /* [annotation][in] */ 
-            _In_  UINT64 Reservation);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterVideoMemoryBudgetChangeNotificationEvent )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  HANDLE hEvent,
-            /* [annotation][out] */ 
-            _Out_  DWORD *pdwCookie);
-        
-        void ( STDMETHODCALLTYPE *UnregisterVideoMemoryBudgetChangeNotification )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][in] */ 
-            _In_  DWORD dwCookie);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc3 )( 
-            IDXGIAdapter4 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_ADAPTER_DESC3 *pDesc);
-        
-        END_INTERFACE
-    } IDXGIAdapter4Vtbl;
-
-    interface IDXGIAdapter4
-    {
-        CONST_VTBL struct IDXGIAdapter4Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IDXGIAdapter4_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define IDXGIAdapter4_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define IDXGIAdapter4_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define IDXGIAdapter4_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
-
-#define IDXGIAdapter4_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
-
-#define IDXGIAdapter4_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
-
-#define IDXGIAdapter4_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
-
-
-#define IDXGIAdapter4_EnumOutputs(This,Output,ppOutput)	\
-    ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) 
-
-#define IDXGIAdapter4_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
-
-#define IDXGIAdapter4_CheckInterfaceSupport(This,InterfaceName,pUMDVersion)	\
-    ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) 
-
-
-#define IDXGIAdapter4_GetDesc1(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) 
-
-
-#define IDXGIAdapter4_GetDesc2(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) 
-
-
-#define IDXGIAdapter4_RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie)	\
-    ( (This)->lpVtbl -> RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) ) 
-
-#define IDXGIAdapter4_UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie)	\
-    ( (This)->lpVtbl -> UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) ) 
-
-#define IDXGIAdapter4_QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo)	\
-    ( (This)->lpVtbl -> QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) ) 
-
-#define IDXGIAdapter4_SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation)	\
-    ( (This)->lpVtbl -> SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) ) 
-
-#define IDXGIAdapter4_RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie)	\
-    ( (This)->lpVtbl -> RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) ) 
-
-#define IDXGIAdapter4_UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie)	\
-    ( (This)->lpVtbl -> UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) ) 
-
-
-#define IDXGIAdapter4_GetDesc3(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc3(This,pDesc) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __IDXGIAdapter4_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_dxgi1_6_0000_0001 */
-/* [local] */ 
-
-typedef struct DXGI_OUTPUT_DESC1
-    {
-    WCHAR DeviceName[ 32 ];
-    RECT DesktopCoordinates;
-    BOOL AttachedToDesktop;
-    DXGI_MODE_ROTATION Rotation;
-    HMONITOR Monitor;
-    UINT BitsPerColor;
-    DXGI_COLOR_SPACE_TYPE ColorSpace;
-    FLOAT RedPrimary[ 2 ];
-    FLOAT GreenPrimary[ 2 ];
-    FLOAT BluePrimary[ 2 ];
-    FLOAT WhitePoint[ 2 ];
-    FLOAT MinLuminance;
-    FLOAT MaxLuminance;
-    FLOAT MaxFullFrameLuminance;
-    } 	DXGI_OUTPUT_DESC1;
-
-typedef 
-enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS
-    {
-        DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_FULLSCREEN	= 1,
-        DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_WINDOWED	= 2,
-        DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED	= 4
-    } 	DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS;
-
-DEFINE_ENUM_FLAG_OPERATORS( DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS );
-
-
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0001_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0001_v0_0_s_ifspec;
-
-#ifndef __IDXGIOutput6_INTERFACE_DEFINED__
-#define __IDXGIOutput6_INTERFACE_DEFINED__
-
-/* interface IDXGIOutput6 */
-/* [unique][local][uuid][object] */ 
-
-
-EXTERN_C const IID IID_IDXGIOutput6;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-    
-    MIDL_INTERFACE("068346e8-aaec-4b84-add7-137f513f77a1")
-    IDXGIOutput6 : public IDXGIOutput5
-    {
-    public:
-        virtual HRESULT STDMETHODCALLTYPE GetDesc1( 
-            /* [annotation][out] */ 
-            _Out_  DXGI_OUTPUT_DESC1 *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckHardwareCompositionSupport( 
-            /* [annotation][out] */ 
-            _Out_  UINT *pFlags) = 0;
-        
-    };
-    
-    
-#else 	/* C style interface */
-
-    typedef struct IDXGIOutput6Vtbl
-    {
-        BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
-            IDXGIOutput6 * This,
-            /* [in] */ REFIID riid,
-            /* [annotation][iid_is][out] */ 
-            _COM_Outptr_  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
-            IDXGIOutput6 * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
-            IDXGIOutput6 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [in] */ UINT DataSize,
-            /* [annotation][in] */ 
-            _In_reads_bytes_(DataSize)  const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [annotation][in] */ 
-            _In_opt_  const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  REFGUID Name,
-            /* [annotation][out][in] */ 
-            _Inout_  UINT *pDataSize,
-            /* [annotation][out] */ 
-            _Out_writes_bytes_(*pDataSize)  void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  REFIID riid,
-            /* [annotation][retval][out] */ 
-            _COM_Outptr_  void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_OUTPUT_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( 
-            IDXGIOutput6 * This,
-            /* [in] */ DXGI_FORMAT EnumFormat,
-            /* [in] */ UINT Flags,
-            /* [annotation][out][in] */ 
-            _Inout_  UINT *pNumModes,
-            /* [annotation][out] */ 
-            _Out_writes_to_opt_(*pNumModes,*pNumModes)  DXGI_MODE_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  const DXGI_MODE_DESC *pModeToMatch,
-            /* [annotation][out] */ 
-            _Out_  DXGI_MODE_DESC *pClosestMatch,
-            /* [annotation][in] */ 
-            _In_opt_  IUnknown *pConcernedDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( 
-            IDXGIOutput6 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IUnknown *pDevice,
-            BOOL Exclusive);
-        
-        void ( STDMETHODCALLTYPE *ReleaseOwnership )( 
-            IDXGIOutput6 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  const DXGI_GAMMA_CONTROL *pArray);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_GAMMA_CONTROL *pArray);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IDXGISurface *pScanoutSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IDXGISurface *pDestination);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_FRAME_STATISTICS *pStats);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( 
-            IDXGIOutput6 * This,
-            /* [in] */ DXGI_FORMAT EnumFormat,
-            /* [in] */ UINT Flags,
-            /* [annotation][out][in] */ 
-            _Inout_  UINT *pNumModes,
-            /* [annotation][out] */ 
-            _Out_writes_to_opt_(*pNumModes,*pNumModes)  DXGI_MODE_DESC1 *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  const DXGI_MODE_DESC1 *pModeToMatch,
-            /* [annotation][out] */ 
-            _Out_  DXGI_MODE_DESC1 *pClosestMatch,
-            /* [annotation][in] */ 
-            _In_opt_  IUnknown *pConcernedDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IDXGIResource *pDestination);
-        
-        HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IUnknown *pDevice,
-            /* [annotation][out] */ 
-            _COM_Outptr_  IDXGIOutputDuplication **ppOutputDuplication);
-        
-        BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( 
-            IDXGIOutput6 * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  DXGI_FORMAT EnumFormat,
-            /* [annotation][out] */ 
-            _In_  IUnknown *pConcernedDevice,
-            /* [annotation][out] */ 
-            _Out_  UINT *pFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  DXGI_FORMAT Format,
-            /* [annotation][in] */ 
-            _In_  DXGI_COLOR_SPACE_TYPE ColorSpace,
-            /* [annotation][in] */ 
-            _In_  IUnknown *pConcernedDevice,
-            /* [annotation][out] */ 
-            _Out_  UINT *pFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *DuplicateOutput1 )( 
-            IDXGIOutput6 * This,
-            /* [annotation][in] */ 
-            _In_  IUnknown *pDevice,
-            /* [in] */ UINT Flags,
-            /* [annotation][in] */ 
-            _In_  UINT SupportedFormatsCount,
-            /* [annotation][in] */ 
-            _In_reads_(SupportedFormatsCount)  const DXGI_FORMAT *pSupportedFormats,
-            /* [annotation][out] */ 
-            _COM_Outptr_  IDXGIOutputDuplication **ppOutputDuplication);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  DXGI_OUTPUT_DESC1 *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckHardwareCompositionSupport )( 
-            IDXGIOutput6 * This,
-            /* [annotation][out] */ 
-            _Out_  UINT *pFlags);
-        
-        END_INTERFACE
-    } IDXGIOutput6Vtbl;
-
-    interface IDXGIOutput6
-    {
-        CONST_VTBL struct IDXGIOutput6Vtbl *lpVtbl;
-    };
-
-    
-
-#ifdef COBJMACROS
-
-
-#define IDXGIOutput6_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
-
-#define IDXGIOutput6_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
-
-#define IDXGIOutput6_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
-
-
-#define IDXGIOutput6_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
-
-#define IDXGIOutput6_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
-
-#define IDXGIOutput6_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
-
-#define IDXGIOutput6_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
-
-
-#define IDXGIOutput6_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
-
-#define IDXGIOutput6_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc)	\
-    ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) 
-
-#define IDXGIOutput6_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice)	\
-    ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) 
-
-#define IDXGIOutput6_WaitForVBlank(This)	\
-    ( (This)->lpVtbl -> WaitForVBlank(This) ) 
-
-#define IDXGIOutput6_TakeOwnership(This,pDevice,Exclusive)	\
-    ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) 
-
-#define IDXGIOutput6_ReleaseOwnership(This)	\
-    ( (This)->lpVtbl -> ReleaseOwnership(This) ) 
-
-#define IDXGIOutput6_GetGammaControlCapabilities(This,pGammaCaps)	\
-    ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) 
-
-#define IDXGIOutput6_SetGammaControl(This,pArray)	\
-    ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) 
-
-#define IDXGIOutput6_GetGammaControl(This,pArray)	\
-    ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) 
-
-#define IDXGIOutput6_SetDisplaySurface(This,pScanoutSurface)	\
-    ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) 
-
-#define IDXGIOutput6_GetDisplaySurfaceData(This,pDestination)	\
-    ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) 
-
-#define IDXGIOutput6_GetFrameStatistics(This,pStats)	\
-    ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) 
-
-
-#define IDXGIOutput6_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc)	\
-    ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) 
-
-#define IDXGIOutput6_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice)	\
-    ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) 
-
-#define IDXGIOutput6_GetDisplaySurfaceData1(This,pDestination)	\
-    ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) 
-
-#define IDXGIOutput6_DuplicateOutput(This,pDevice,ppOutputDuplication)	\
-    ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) 
-
-
-#define IDXGIOutput6_SupportsOverlays(This)	\
-    ( (This)->lpVtbl -> SupportsOverlays(This) ) 
-
-
-#define IDXGIOutput6_CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags)	\
-    ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) 
-
-
-#define IDXGIOutput6_CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags)	\
-    ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) 
-
-
-#define IDXGIOutput6_DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication)	\
-    ( (This)->lpVtbl -> DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) ) 
-
-
-#define IDXGIOutput6_GetDesc1(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) 
-
-#define IDXGIOutput6_CheckHardwareCompositionSupport(This,pFlags)	\
-    ( (This)->lpVtbl -> CheckHardwareCompositionSupport(This,pFlags) ) 
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-
-#endif 	/* __IDXGIOutput6_INTERFACE_DEFINED__ */
-
-
-/* interface __MIDL_itf_dxgi1_6_0000_0002 */
-/* [local] */ 
-
-#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
-#pragma endregion
-DEFINE_GUID(IID_IDXGIAdapter4,0x3c8d99d1,0x4fbf,0x4181,0xa8,0x2c,0xaf,0x66,0xbf,0x7b,0xd2,0x4e);
-DEFINE_GUID(IID_IDXGIOutput6,0x068346e8,0xaaec,0x4b84,0xad,0xd7,0x13,0x7f,0x51,0x3f,0x77,0xa1);
-
-
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0002_v0_0_c_ifspec;
-extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0002_v0_0_s_ifspec;
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
@@ -1,51 +0,0 @@
-//
-//    Copyright (C) Microsoft.  All rights reserved.
-//
-
-#ifndef __dxgicommon_h__
-#define __dxgicommon_h__
-
-
-typedef struct DXGI_RATIONAL
-{
-    UINT Numerator;
-    UINT Denominator;
-} DXGI_RATIONAL;
-
-// The following values are used with DXGI_SAMPLE_DESC::Quality:
-#define DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN 0xffffffff
-#define DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN 0xfffffffe
-
-typedef struct DXGI_SAMPLE_DESC
-{
-    UINT Count;
-    UINT Quality;
-} DXGI_SAMPLE_DESC;
-
-typedef enum DXGI_COLOR_SPACE_TYPE
-{
-    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709             = 0,
-    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709             = 1,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709           = 2,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020          = 3,
-    DXGI_COLOR_SPACE_RESERVED                           = 4,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601      = 5,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601         = 6,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601           = 7,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709         = 8,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709           = 9,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020        = 10,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020          = 11,
-    DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020          = 12,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020      = 13,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020        = 14,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020     = 15,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020   = 16,
-    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020            = 17,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020    = 18,
-    DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020      = 19,
-    DXGI_COLOR_SPACE_CUSTOM                             = 0xFFFFFFFF
-} DXGI_COLOR_SPACE_TYPE;
-
-#endif // __dxgicommon_h__
-
@@ -1,10 +1,9 @@
-//
+//
 //    Copyright (C) Microsoft.  All rights reserved.
 //
 #ifndef __dxgitype_h__
 #define __dxgitype_h__

-#include "dxgicommon.h"
 #include "dxgiformat.h"

 #define _FACDXGI    0x87a
@@ -56,6 +55,12 @@ typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES
    float ControlPointPositions[1025];
 } DXGI_GAMMA_CONTROL_CAPABILITIES;

+typedef struct DXGI_RATIONAL
+{
+    UINT Numerator;
+    UINT Denominator;
+} DXGI_RATIONAL;
+
 typedef enum DXGI_MODE_SCANLINE_ORDER
 {
    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED        = 0,
@@ -90,6 +95,33 @@ typedef struct DXGI_MODE_DESC
    DXGI_MODE_SCALING Scaling;
 } DXGI_MODE_DESC;

+// The following values are used with DXGI_SAMPLE_DESC::Quality:
+#define DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN 0xffffffff
+#define DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN 0xfffffffe
+
+typedef struct DXGI_SAMPLE_DESC
+{
+    UINT Count;
+    UINT Quality;
+} DXGI_SAMPLE_DESC;
+
+typedef enum DXGI_COLOR_SPACE_TYPE
+{
+    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709             = 0,
+    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709             = 1,
+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709           = 2,
+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020          = 3,
+    DXGI_COLOR_SPACE_RESERVED                           = 4,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601      = 5,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601         = 6,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601           = 7,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709         = 8,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709           = 9,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020        = 10,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020          = 11,
+    DXGI_COLOR_SPACE_CUSTOM                             = 0xFFFFFFFF
+} DXGI_COLOR_SPACE_TYPE;
+
 typedef struct DXGI_JPEG_DC_HUFFMAN_TABLE
 {
    BYTE CodeCounts[12];
@@ -1,305 +0,0 @@
-/*
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Module Name:
-
-    sdkddkver.h
-
-Abstract:
-
-    Master include file for versioning windows SDK/DDK.
-
-*/
-
-#ifndef _INC_SDKDDKVER
-#define _INC_SDKDDKVER
-
-#if (_MSC_VER >= 800)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#pragma warning(disable:4668) /* #if not_defined treated as #if 0 */
-#endif
-#pragma warning(disable:4001) /* nonstandard extension : single line comment */
-#endif
-
-#pragma once
-
-//
-// _WIN32_WINNT version constants
-//
-#define _WIN32_WINNT_NT4                    0x0400
-#define _WIN32_WINNT_WIN2K                  0x0500
-#define _WIN32_WINNT_WINXP                  0x0501
-#define _WIN32_WINNT_WS03                   0x0502
-#define _WIN32_WINNT_WIN6                   0x0600
-#define _WIN32_WINNT_VISTA                  0x0600
-#define _WIN32_WINNT_WS08                   0x0600
-#define _WIN32_WINNT_LONGHORN               0x0600
-#define _WIN32_WINNT_WIN7                   0x0601
-#define _WIN32_WINNT_WIN8                   0x0602
-#define _WIN32_WINNT_WINBLUE                0x0603
-#define _WIN32_WINNT_WINTHRESHOLD           0x0A00 /* ABRACADABRA_THRESHOLD*/
-#define _WIN32_WINNT_WIN10                  0x0A00 /* ABRACADABRA_THRESHOLD*/
-
-//
-// _WIN32_IE_ version constants
-//
-#define _WIN32_IE_IE20                      0x0200
-#define _WIN32_IE_IE30                      0x0300
-#define _WIN32_IE_IE302                     0x0302
-#define _WIN32_IE_IE40                      0x0400
-#define _WIN32_IE_IE401                     0x0401
-#define _WIN32_IE_IE50                      0x0500
-#define _WIN32_IE_IE501                     0x0501
-#define _WIN32_IE_IE55                      0x0550
-#define _WIN32_IE_IE60                      0x0600
-#define _WIN32_IE_IE60SP1                   0x0601
-#define _WIN32_IE_IE60SP2                   0x0603
-#define _WIN32_IE_IE70                      0x0700
-#define _WIN32_IE_IE80                      0x0800
-#define _WIN32_IE_IE90                      0x0900
-#define _WIN32_IE_IE100                     0x0A00
-#define _WIN32_IE_IE110                     0x0A00  /* ABRACADABRA_THRESHOLD */
-
-//
-// IE <-> OS version mapping
-//
-// NT4 supports IE versions 2.0 -> 6.0 SP1
-#define _WIN32_IE_NT4                       _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP1                    _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP2                    _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP3                    _WIN32_IE_IE302
-#define _WIN32_IE_NT4SP4                    _WIN32_IE_IE401
-#define _WIN32_IE_NT4SP5                    _WIN32_IE_IE401
-#define _WIN32_IE_NT4SP6                    _WIN32_IE_IE50
-// Win98 supports IE versions 4.01 -> 6.0 SP1
-#define _WIN32_IE_WIN98                     _WIN32_IE_IE401
-// Win98SE supports IE versions 5.0 -> 6.0 SP1
-#define _WIN32_IE_WIN98SE                   _WIN32_IE_IE50
-// WinME supports IE versions 5.5 -> 6.0 SP1
-#define _WIN32_IE_WINME                     _WIN32_IE_IE55
-// Win2k supports IE versions 5.01 -> 6.0 SP1
-#define _WIN32_IE_WIN2K                     _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP1                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP2                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP3                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP4                  _WIN32_IE_IE501
-#define _WIN32_IE_XP                        _WIN32_IE_IE60
-#define _WIN32_IE_XPSP1                     _WIN32_IE_IE60SP1
-#define _WIN32_IE_XPSP2                     _WIN32_IE_IE60SP2
-#define _WIN32_IE_WS03                      0x0602
-#define _WIN32_IE_WS03SP1                   _WIN32_IE_IE60SP2
-#define _WIN32_IE_WIN6                      _WIN32_IE_IE70
-#define _WIN32_IE_LONGHORN                  _WIN32_IE_IE70
-#define _WIN32_IE_WIN7                      _WIN32_IE_IE80
-#define _WIN32_IE_WIN8                      _WIN32_IE_IE100
-#define _WIN32_IE_WINBLUE                   _WIN32_IE_IE100
-#define _WIN32_IE_WINTHRESHOLD              _WIN32_IE_IE110  /* ABRACADABRA_THRESHOLD */
-#define _WIN32_IE_WIN10                     _WIN32_IE_IE110  /* ABRACADABRA_THRESHOLD */
-
-
-//
-// NTDDI version constants
-//
-#define NTDDI_WIN2K                         0x05000000
-#define NTDDI_WIN2KSP1                      0x05000100
-#define NTDDI_WIN2KSP2                      0x05000200
-#define NTDDI_WIN2KSP3                      0x05000300
-#define NTDDI_WIN2KSP4                      0x05000400
-
-#define NTDDI_WINXP                         0x05010000
-#define NTDDI_WINXPSP1                      0x05010100
-#define NTDDI_WINXPSP2                      0x05010200
-#define NTDDI_WINXPSP3                      0x05010300
-#define NTDDI_WINXPSP4                      0x05010400
-
-#define NTDDI_WS03                          0x05020000
-#define NTDDI_WS03SP1                       0x05020100
-#define NTDDI_WS03SP2                       0x05020200
-#define NTDDI_WS03SP3                       0x05020300
-#define NTDDI_WS03SP4                       0x05020400
-
-#define NTDDI_WIN6                          0x06000000
-#define NTDDI_WIN6SP1                       0x06000100
-#define NTDDI_WIN6SP2                       0x06000200
-#define NTDDI_WIN6SP3                       0x06000300
-#define NTDDI_WIN6SP4                       0x06000400
-
-#define NTDDI_VISTA                         NTDDI_WIN6
-#define NTDDI_VISTASP1                      NTDDI_WIN6SP1
-#define NTDDI_VISTASP2                      NTDDI_WIN6SP2
-#define NTDDI_VISTASP3                      NTDDI_WIN6SP3
-#define NTDDI_VISTASP4                      NTDDI_WIN6SP4
-
-#define NTDDI_LONGHORN  NTDDI_VISTA
-
-#define NTDDI_WS08                          NTDDI_WIN6SP1
-#define NTDDI_WS08SP2                       NTDDI_WIN6SP2
-#define NTDDI_WS08SP3                       NTDDI_WIN6SP3
-#define NTDDI_WS08SP4                       NTDDI_WIN6SP4
-
-#define NTDDI_WIN7                          0x06010000
-#define NTDDI_WIN8                          0x06020000
-#define NTDDI_WINBLUE                       0x06030000
-#define NTDDI_WINTHRESHOLD                  0x0A000000  /* ABRACADABRA_THRESHOLD */
-#define NTDDI_WIN10                         0x0A000000  /* ABRACADABRA_THRESHOLD */
-#define NTDDI_WIN10_TH2                     0x0A000001  /* ABRACADABRA_WIN10_TH2 */
-#define NTDDI_WIN10_RS1                     0x0A000002  /* ABRACADABRA_WIN10_RS1 */
-#define NTDDI_WIN10_RS2                     0x0A000003  /* ABRACADABRA_WIN10_RS2 */
-
-
-#define WDK_NTDDI_VERSION                   NTDDI_WIN10_RS2
-
-//
-// masks for version macros
-//
-#define OSVERSION_MASK      0xFFFF0000
-#define SPVERSION_MASK      0x0000FF00
-#define SUBVERSION_MASK     0x000000FF
-
-
-//
-// macros to extract various version fields from the NTDDI version
-//
-#define OSVER(Version)  ((Version) & OSVERSION_MASK)
-#define SPVER(Version)  (((Version) & SPVERSION_MASK) >> 8)
-#define SUBVER(Version) (((Version) & SUBVERSION_MASK) )
-
-
-#if defined(DECLSPEC_DEPRECATED_DDK)
-
-// deprecate in 2k or later
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
-#define DECLSPEC_DEPRECATED_DDK_WIN2K DECLSPEC_DEPRECATED_DDK
-#else
-#define DECLSPEC_DEPRECATED_DDK_WIN2K
-#endif
-
-// deprecate in XP or later
-#if (NTDDI_VERSION >= NTDDI_WINXP)
-#define DECLSPEC_DEPRECATED_DDK_WINXP DECLSPEC_DEPRECATED_DDK
-#else
-#define DECLSPEC_DEPRECATED_DDK_WINXP
-#endif
-
-// deprecate in WS03 or later
-#if (NTDDI_VERSION >= NTDDI_WS03)
-#define DECLSPEC_DEPRECATED_DDK_WIN2003 DECLSPEC_DEPRECATED_DDK
-#else
-#define DECLSPEC_DEPRECATED_DDK_WIN2003
-#endif
-
-// deprecate in WIN6 or later
-#if (NTDDI_VERSION >= NTDDI_WIN6)
-#define DECLSPEC_DEPRECATED_DDK_WIN6 DECLSPEC_DEPRECATED_DDK
-#else
-#define DECLSPEC_DEPRECATED_DDK_WIN6
-#endif
-
-#define DECLSPEC_DEPRECATED_DDK_LONGHORN DECLSPEC_DEPRECATED_DDK_WIN6
-
-#endif // defined(DECLSPEC_DEPRECATED_DDK)
-
-
-//
-// if versions aren't already defined, default to most current
-//
-
-#define NTDDI_VERSION_FROM_WIN32_WINNT2(ver)    ver##0000
-#define NTDDI_VERSION_FROM_WIN32_WINNT(ver)     NTDDI_VERSION_FROM_WIN32_WINNT2(ver)
-
-#if !defined(_WIN32_WINNT) && !defined(_CHICAGO_)
-#define  _WIN32_WINNT   0x0A00
-#endif
-
-#ifndef NTDDI_VERSION
-#ifdef _WIN32_WINNT
-#if (_WIN32_WINNT <= _WIN32_WINNT_WINBLUE)
-// set NTDDI_VERSION based on _WIN32_WINNT
-#define NTDDI_VERSION   NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
-#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
-// set NTDDI_VERSION to default to WDK_NTDDI_VERSION
-#define NTDDI_VERSION   WDK_NTDDI_VERSION 
-#endif // (_WIN32_WINNT <= _WIN32_WINNT_WINBLUE)
-#else
-// set NTDDI_VERSION to default to latest if _WIN32_WINNT isn't set
-#define NTDDI_VERSION   0x0A000003
-#endif // _WIN32_WINNT
-#endif // NTDDI_VERSION
-
-#ifndef WINVER
-#ifdef _WIN32_WINNT
-// set WINVER based on _WIN32_WINNT
-#define WINVER          _WIN32_WINNT
-#else
-#define WINVER          0x0A00
-#endif
-#endif
-
-#ifndef _WIN32_IE
-#ifdef _WIN32_WINNT
-// set _WIN32_IE based on _WIN32_WINNT
-#if (_WIN32_WINNT <= _WIN32_WINNT_NT4)
-#define _WIN32_IE       _WIN32_IE_IE50
-#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
-#define _WIN32_IE       _WIN32_IE_IE501
-#elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP)
-#define _WIN32_IE       _WIN32_IE_IE60
-#elif (_WIN32_WINNT <= _WIN32_WINNT_WS03)
-#define _WIN32_IE       _WIN32_IE_WS03
-#elif (_WIN32_WINNT <= _WIN32_WINNT_VISTA)
-#define _WIN32_IE       _WIN32_IE_LONGHORN
-#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN7)
-#define _WIN32_IE       _WIN32_IE_WIN7
-#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN8)
-#define _WIN32_IE       _WIN32_IE_WIN8
-#else
-#define _WIN32_IE       0x0A00
-#endif
-#else
-#define _WIN32_IE       0x0A00
-#endif
-#endif
-
-//
-// Sanity check for compatible versions
-//
-#if defined(_WIN32_WINNT) && !defined(MIDL_PASS) && !defined(RC_INVOKED)
-
-#if (defined(WINVER) && (WINVER < 0x0400) && (_WIN32_WINNT > 0x0400))
-#error WINVER setting conflicts with _WIN32_WINNT setting
-#endif
-
-#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K))
-#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
-#endif
-
-#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP))
-#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
-#endif
-
-#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03))
-#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
-#endif
-
-#if (((OSVERSION_MASK & NTDDI_VERSION) == NTDDI_VISTA) && (_WIN32_WINNT != _WIN32_WINNT_VISTA))
-#error NTDDI_VERSION setting conflicts with _WIN32_WINNT setting
-#endif
-
-#if ((_WIN32_WINNT < _WIN32_WINNT_WIN2K) && (_WIN32_IE > _WIN32_IE_IE60SP1))
-#error _WIN32_WINNT settings conflicts with _WIN32_IE setting
-#endif
-
-#endif  // defined(_WIN32_WINNT) && !defined(MIDL_PASS) && !defined(_WINRESRC_)
-
-#if (_MSC_VER >= 800)
-#if (_MSC_VER >= 1200)
-#pragma warning(pop)
-#else
-#pragma warning(default:4001) /* nonstandard extension : single line comment */
-#endif
-#endif
-
-#endif  /* !_INC_SDKDDKVER */
-
@@ -1,240 +0,0 @@
-/*
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Module Name:
-
-    winapifamily.h
-
-Abstract:
-
-    Master include file for API family partitioning.
-
-*/
-
-#ifndef _INC_WINAPIFAMILY
-#define _INC_WINAPIFAMILY
-
-#if defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-#if _MSC_VER >= 1200
-#pragma warning(push)
-#pragma warning(disable:4001) /* nonstandard extension 'single line comment' was used */
-#endif
-#pragma once
-#endif // defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-
-#include <winpackagefamily.h>
-
-/*
- * When compiling C and C++ code using SDK header files, the development
- * environment can specify a target platform by #define-ing the
- * pre-processor symbol WINAPI_FAMILY to one of the following values.
- * Each FAMILY value denotes an application family for which a different
- * subset of the total set of header-file-defined APIs are available.
- * Setting the WINAPI_FAMILY value will effectively hide from the
- * editing and compilation environments the existence of APIs that
- * are not applicable to the family of applications targeting a
- * specific platform.
- */
-
-/* In Windows 10, WINAPI_PARTITIONs will be used to add additional  
- * device specific APIs to a particular WINAPI_FAMILY.  
- * For example, when writing Windows Universal apps, specifying 
- * WINAPI_FAMILY_APP will hide phone APIs from compilation.  
- * However, specifying WINAPI_PARTITION_PHONE_APP=1 additionally, will         
- * unhide any API hidden behind the partition, to the compiler.
-
- * The following partitions are currently defined:
- * WINAPI_PARTITION_DESKTOP            // usable for Desktop Win32 apps (but not store apps)
- * WINAPI_PARTITION_APP                // usable for Windows Universal store apps
- * WINAPI_PARTITION_PC_APP             // specific to Desktop-only store apps
- * WINAPI_PARTITION_PHONE_APP          // specific to Phone-only store apps
- * WINAPI_PARTITION_SYSTEM             // specific to System applications
-
- * The following partitions are indirect partitions and defined in 
- * winpackagefamily.h. These partitions are related to package based 
- * partitions. For example, specifying WINAPI_PARTITION_SERVER=1 will light up
- * any API hidden behind the package based partitions that are bound to 
- * WINAPI_PARTITION_SERVER, to the compiler.
- * WINAPI_PARTITION_SERVER             // specific to Server applications
-*/
-
-/*
- * The WINAPI_FAMILY values of 0 and 1 are reserved to ensure that
- * an error will occur if WINAPI_FAMILY is set to any
- * WINAPI_PARTITION value (which must be 0 or 1, see below).
- */
-#define WINAPI_FAMILY_PC_APP               2   /* Windows Store Applications */
-#define WINAPI_FAMILY_PHONE_APP            3   /* Windows Phone Applications */
-#define WINAPI_FAMILY_SYSTEM               4   /* Windows Drivers and Tools */
-#define WINAPI_FAMILY_SERVER               5   /* Windows Server Applications */
-#define WINAPI_FAMILY_DESKTOP_APP          100   /* Windows Desktop Applications */
-/* The value of WINAPI_FAMILY_DESKTOP_APP may change in future SDKs. */
-/* Additional WINAPI_FAMILY values may be defined in future SDKs. */
-
-/*
- * For compatibility with Windows 8 header files, the following
- * synonym for WINAPI_FAMILY_PC_APP is temporarily #define'd.
- * Use of this symbol should be considered deprecated.
- */
-#define WINAPI_FAMILY_APP  WINAPI_FAMILY_PC_APP
-
-/*
- * If no WINAPI_FAMILY value is specified, then all APIs available to
- * Windows desktop applications are exposed.
- */
-#ifndef WINAPI_FAMILY
-#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
-#endif
-
-/*
- * API PARTITONs are part of an indirection mechanism for mapping between
- * individual APIs and the FAMILYs to which they apply.
- * Each PARTITION is a category or subset of named APIs.  PARTITIONs
- * are permitted to have overlapping membership -- some single API
- * might be part of more than one PARTITION.  PARTITIONS are each #define-ed 
- * to be either 1 or 0 or depending on the platform at which the app is targeted.
- */
-
-/*
- * The mapping between families and partitions is summarized here.
- * An X indicates that the given partition is active for the given
- * platform/family.
- *
- *                                +-------------------+---+
- *                                |      *Partition*  |   |
- *                                +---+---+---+---+---+---+
- *                                |   |   |   |   |   |   |
- *                                |   |   |   |   |   |   |
- *                                |   |   |   | P |   |   |
- *                                |   |   |   | H |   |   |
- *                                | D |   |   | O |   |   |
- *                                | E |   | P | N | S | S |
- *                                | S |   | C | E | Y | E |
- *                                | K |   | _ | _ | S | R |
- *                                | T | A | A | A | T | V |
- * +-------------------------+----+ O | P | P | P | E | E |
- * |     *Platform/Family*       \| P | P | P | P | M | R |
- * +------------------------------+---+---+---+---+---+---+
- * | WINAPI_FAMILY_DESKTOP_APP    | X | X | X |   |   |   |
- * +------------------------------+---+---+---+---+---+---+
- * |      WINAPI_FAMILY_PC_APP    |   | X | X |   |   |   |
- * +------------------------------+---+---+---+---+---+---+
- * |   WINAPI_FAMILY_PHONE_APP    |   | X |   | X |   |   |
- * +----------------------------- +---+---+---+---+---+---+
- * |      WINAPI_FAMILY_SYSTEM    |   |   |   |   | X |   |
- * +----------------------------- +---+---+---+---+---+---+
- * |      WINAPI_FAMILY_SERVER    |   |   |   |   | X | X |
- * +------------------------------+---+---+---+---+---+---+
- *
- * The table above is encoded in the following expressions,
- * each of which evaluates to 1 or 0.
- *
- * Whenever a new family is added, all of these expressions
- * need to be reconsidered.
- */
-#if WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP &&                              \
-    WINAPI_FAMILY != WINAPI_FAMILY_PC_APP &&                                   \
-    WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP &&                                \
-    WINAPI_FAMILY != WINAPI_FAMILY_SYSTEM &&                                   \
-    WINAPI_FAMILY != WINAPI_FAMILY_SERVER
-#error Unknown WINAPI_FAMILY value. Was it defined in terms of a WINAPI_PARTITION_* value?
-#endif
-
-#ifndef WINAPI_PARTITION_DESKTOP
-#define WINAPI_PARTITION_DESKTOP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
-#endif 
-
-#ifndef WINAPI_PARTITION_APP
-#define WINAPI_PARTITION_APP                                                   \
-  (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP ||                               \
-   WINAPI_FAMILY == WINAPI_FAMILY_PC_APP ||                                    \
-   WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
-#endif 
-
-#ifndef WINAPI_PARTITION_PC_APP
-#define WINAPI_PARTITION_PC_APP                                                \
-  (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP ||                               \
-   WINAPI_FAMILY == WINAPI_FAMILY_PC_APP)
-#endif 
-
-#ifndef WINAPI_PARTITION_PHONE_APP
-#define WINAPI_PARTITION_PHONE_APP (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
-#endif 
-
-/*
- * SYSTEM is the only partition defined here.
- * All other System based editions are defined as packages
- * on top of the System partition.
- * See winpackagefamily.h for packages level partitions
- */
-#ifndef WINAPI_PARTITION_SYSTEM
-#define WINAPI_PARTITION_SYSTEM                                                \
-  (WINAPI_FAMILY == WINAPI_FAMILY_SYSTEM ||                                    \
-   WINAPI_FAMILY == WINAPI_FAMILY_SERVER)
-#endif 
-
-/*
- * For compatibility with Windows Phone 8 header files, the following
- * synonym for WINAPI_PARTITION_PHONE_APP is temporarily #define'd.
- * Use of this symbol should be regarded as deprecated.
- */
-#define WINAPI_PARTITION_PHONE  WINAPI_PARTITION_PHONE_APP
-
-/*
- * Header files use the WINAPI_FAMILY_PARTITION macro to assign one or
- * more declarations to some group of partitions.  The macro chooses
- * whether the preprocessor will emit or omit a sequence of declarations
- * bracketed by an #if/#endif pair.  All header file references to the
- * WINAPI_PARTITION_* values should be in the form of occurrences of
- * WINAPI_FAMILY_PARTITION(...).
- *
- * For example, the following usage of WINAPI_FAMILY_PARTITION identifies
- * a sequence of declarations that are part of both the Windows Desktop
- * Partition and the Windows-Phone-Specific Store Partition:
- *
- *     #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PHONE_APP)
- *     ...
- *     #endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PHONE_APP)
- *
- * The comment on the closing #endif allow tools as well as people to find the
- * matching #ifdef properly.
- *
- * Usages of WINAPI_FAMILY_PARTITION may be combined, when the partitition definitions are
- * related.  In particular one might use declarations like
- * 
- *     #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- *
- * or
- *
- *     #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
- *
- * Direct references to WINAPI_PARTITION_ values (eg #if !WINAPI_FAMILY_PARTITION_...)
- * should not be used.
- */ 
-#define WINAPI_FAMILY_PARTITION(Partitions)     (Partitions)
-
-/*
- * Macro used to #define or typedef a symbol used for selective deprecation
- * of individual methods of a COM interfaces that are otherwise available
- * for a given set of partitions.
- */
-#define _WINAPI_DEPRECATED_DECLARATION  __declspec(deprecated("This API cannot be used in the context of the caller's application type."))
-
-/*
- * For compatibility with Windows 8 header files, the following
- * symbol is temporarily conditionally #define'd.  Additional symbols
- * like this should be not defined in winapifamily.h, but rather should be
- * introduced locally to the header files of the component that needs them.
- */
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#   define APP_DEPRECATED_HRESULT    HRESULT _WINAPI_DEPRECATED_DECLARATION
-#endif // WINAPIFAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-
-#if defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-#if _MSC_VER >= 1200
-#pragma warning(pop)
-#endif
-#endif
-
-#endif  /* !_INC_WINAPIFAMILY */
@@ -1,91 +0,0 @@
-/*
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Module Name:
-
-    winpackagefamily.h
-
-Abstract:
-
-    API family partitioning based on packages.
-
-*/
-
-#ifndef _INC_WINPACKAGEFAMILY
-#define _INC_WINPACKAGEFAMILY
-
-#if defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-#if _MSC_VER >= 1200
-#pragma warning(push)
-#pragma warning(disable:4001) /* nonstandard extension 'single line comment' was used */
-#endif
-#pragma once
-#endif // defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-
-#ifndef WINAPI_PARTITION_SERVER
-#define WINAPI_PARTITION_SERVER (WINAPI_FAMILY == WINAPI_FAMILY_SERVER)
-#endif
-
-/*
- * PARTITIONS based on packages are each #undef'ed below, and then will be #define-ed
- * to be either 1 or 0 or depending on the active WINAPI_FAMILY.
- */
-#undef WINAPI_PARTITION_PKG_WINTRUST
-#undef WINAPI_PARTITION_PKG_WEBSERVICES
-#undef WINAPI_PARTITION_PKG_EVENTLOGSERVICE
-#undef WINAPI_PARTITION_PKG_VHD
-#undef WINAPI_PARTITION_PKG_PERFCOUNTER
-#undef WINAPI_PARTITION_PKG_SECURESTARTUP
-#undef WINAPI_PARTITION_PKG_REMOTEFS
-#undef WINAPI_PARTITION_PKG_BOOTABLESKU
-#undef WINAPI_PARTITION_PKG_CMDTOOLS
-#undef WINAPI_PARTITION_PKG_DISM
-#undef WINAPI_PARTITION_PKG_CORESETUP
-#undef WINAPI_PARTITION_PKG_APPRUNTIME
-#undef WINAPI_PARTITION_PKG_ESENT
-#undef WINAPI_PARTITION_PKG_WINMGMT
-#undef WINAPI_PARTITION_PKG_WNV
-#undef WINAPI_PARTITION_PKG_CLUSTER
-#undef WINAPI_PARTITION_PKG_VSS
-#undef WINAPI_PARTITION_PKG_TRAFFIC
-#undef WINAPI_PARTITION_PKG_ISCSI
-#undef WINAPI_PARTITION_PKG_STORAGE
-#undef WINAPI_PARTITION_PKG_MPSSVC
-#undef WINAPI_PARTITION_PKG_APPXDEPLOYMENT
-#undef WINAPI_PARTITION_PKG_WER
-
-/* 
- * PARTITIONS for feature packages. Each package might be active for one or more editions
- */
-#define WINAPI_PARTITION_PKG_WINTRUST         (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_WEBSERVICES      (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_EVENTLOGSERVICE  (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_VHD              (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_PERFCOUNTER      (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_SECURESTARTUP    (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_REMOTEFS         (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_BOOTABLESKU      (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_CMDTOOLS         (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_DISM             (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_CORESETUP        (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_APPRUNTIME       (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_ESENT            (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_WINMGMT          (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_WNV              (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_CLUSTER          (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_VSS              (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_TRAFFIC          (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_ISCSI            (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_STORAGE          (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_MPSSVC           (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_APPXDEPLOYMENT   (WINAPI_PARTITION_SERVER == 1)
-#define WINAPI_PARTITION_PKG_WER              (WINAPI_PARTITION_SERVER == 1)
-
-#if defined(_MSC_VER) && !defined(MOFCOMP_PASS)
-#if _MSC_VER >= 1200
-#pragma warning(pop)
-#endif
-#endif
-
-#endif  /* !_INC_WINPACKAGEFAMILY */
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
-
-option(WITH_GDB "WITH_GDB" OFF)
-option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
-
-if (WITH_GDB)
-	add_definitions(-DWITH_GDB_DEBUGGER)
-endif()
+cmake_minimum_required(VERSION 2.8.12)

 set(ASMJIT_STATIC TRUE)

@@ -18,12 +11,6 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
 	message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
 endif()

-find_program(CCACHE_FOUND ccache)
-if (CCACHE_FOUND)
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif()
-
 add_definitions(-DCMAKE_BUILD)

 # We use libpng's static library and don't need to build the shared library and run the tests
@@ -35,25 +22,9 @@ if (NOT USE_SYSTEM_LIBPNG)
 	add_subdirectory( 3rdparty/libpng )
 endif()

-option(VULKAN_PREBUILT "" OFF)
-
 # TODO: do real installation, including copying directory structure
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin")
-
 add_subdirectory( Vulkan )
 add_subdirectory( rpcs3 )
-
-include_directories(3rdparty/hidapi/hidapi)
-if(APPLE)
-	add_subdirectory(3rdparty/hidapi/mac)
-	#list(APPEND LIBS hidapi)
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	add_subdirectory(3rdparty/hidapi/linux)
-elseif(MSVC)
-	add_subdirectory(3rdparty/hidapi/windows)
-else()
-	add_subdirectory(3rdparty/hidapi/libusb)
-	#list(APPEND LIBS hidapi-libusb)
-endif()
+add_subdirectory( rsx_program_decompiler )
@@ -1,20 +0,0 @@
-# Getting Started
-
-Before getting started using the emulator, read the [Quickstart Guide](https://rpcs3.net/quickstart) and the [FAQ](https://rpcs3.net/faq). After reading those, if you need support, visit our [Forums](https://forums.rpcs3.net). 
-
-# Issue Reporting
-
-**The GitHub Issue Tracker is not the place to ask for support or to submit [Game Compatibility](https://rpcs3.net/compatibility) reports.** Requests for support or incorrect reports will be closed. If you are not sure whether the issue you want to report is an actual issue that is not yet known, please use the forums to submit such report.
-
-**Before reporting an issue:**
- Check if your system matches all the minimum requirements listed in the [Quickstart Guide](https://rpcs3.net/quickstart);
- Check if the issue is meaningful for the team (e.g. The Last of Us doesn't work is obvious and therefore useless);
- Search older issues/forum threads to see if your issue was already submitted.
- Use understandable English. It doesn't need to be perfect, but clear enough to understand your message.
- While reporting issues, don't forget to include details about your system (OS, CPU, GPU, etc.), as well as the RPCS3.log file.
-
-Submitting your test results for Commercial Games must be done on our forums. Please read the [Game Compatibility](https://github.com/RPCS3/rpcs3/wiki/Game-Compatibility) wiki page before doing so.
-
-# Contributing
-
-Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/RPCS3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.me/RPCS3) in the **#development** channel.
@@ -3,94 +3,58 @@ RPCS3

 [![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
 [![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master)
+[![Coverity Status](https://img.shields.io/coverity/scan/3960.svg)](https://scan.coverity.com/projects/3960)
+[![Coverage Status](https://coveralls.io/repos/RPCS3/rpcs3/badge.svg)](https://coveralls.io/r/RPCS3/rpcs3)

-The world's first open-source PlayStation 3 emulator/debugger written in C++ for Windows and Linux.
+An open-source PlayStation 3 emulator/debugger written in C++.

-You can find some basic information in our [**website**](https://rpcs3.net/). 
-For discussion about this emulator and PS3 emulation please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.me/RPCS3).
-
-[**Support Lead Developers Nekotekina and kd-11 on Patreon**](https://www.patreon.com/Nekotekina)
+You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).


-## Development
+### Development

-If you want to contribute please take a look at the [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/RPCS3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forums or in Discord in order to know more about the current situation of the emulator.
+If you want to contribute please take a look at the [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/RPCS3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator.


-## Dependencies
+### Dependencies

-### Windows
-* [Visual Studio 2017](https://www.visualstudio.com/en/downloads/)
-* [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572)
-* [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH)
+__Windows__
+* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
+* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* [Cmake 3.1.0+](http://www.cmake.org/download/) (required; add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH)
-* [Qt 5.9+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.9.1\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
-* [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above)

-### Linux
-* [Qt 5.9+](https://www.qt.io/download-open-source/)
-* GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691))
-* Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default`
-* Arch: `sudo pacman -S glew openal cmake llvm qt5-base`
-* Fedora: `sudo dnf install cmake qt5-devel vulkan-devel glew glew-devel`
-**If you have a NVIDIA GPU, you may need to install the libglvnd package.**
+__Linux__
+* GCC 5.1+ or Clang 3.5.0+
+* Debian & Ubuntu: `sudo apt-get install cmake build-essential libopenal-dev libwxgtk3.0-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev`
+* Arch: `sudo pacman -S glew openal wxgtk cmake llvm`

-### MacOS
-MacOS is not supported at this moment because it doesn't meet system requirements (OpenGL 4.3)
+__Mac OSX__
 * Xcode 6+ (tested with Xcode 6.4)
-* Install with Homebrew: `brew install glew llvm qt cmake`
+* Install with Homebrew: `brew install glew wxwidgets`
+* Remove '-framework QuickTime' from '_ldflags' in /usr/local/bin/wx-config


-## Building on Windows:
+### Building
+
 To initialize the repository don't forget to execute `git submodule update --init` to pull the submodules.
-
-### Configuring Qt
-
-*If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* 
-1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.9.1\msvc2017_64\` </br>
-
-*If you wish to use the Visual Studio plugin for Qt:* </br>
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.9.1\msvc2015_64`. </br>
-2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. 
-
-### Building the projects
-1) Build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*. </br>
-2) Press *BUILD* > *Build Solution* or *Rebuild Solution*. </br>
-
-
-## Building on Linux & Mac OS:
-
-1) `git clone https://github.com/RPCS3/rpcs3.git` </br>
-2) `cd rpcs3/` </br>
-3) `git submodule update --init` </br>
-4) `cmake CMakeLists.txt && make GitVersion && make` </br>
-5) Run RPCS3 with `./bin/rpcs3` </br>
-
-If you are on MacOS and want to build with brew llvm and qt don't forget to add the following environment variables
-
- * `LLVM_DIR=/usr/local/opt/llvm/` (or wherever llvm was installed).
- * `Qt5_DIR=/usr/local/opt/qt/lib/cmake/Qt5` (or wherever qt was installed).
-
+* __Windows__:
+1) Open the *.SLN* file.
+2) Build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
+3) Press *BUILD* > *Build Solution* or *Rebuild Solution*.
+* __Linux & Mac OSX__:
+If you want to build with LLVM, then LLVM 3.8 is required.
+`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` then run with `cd bin && ./rpcs3`.
+If you are on OSX and want to build with llvm don't forget to add `-DLLVM_DIR=...` (or wherever llvm brew was installed) to cmake invocation.
 When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`).

+##### CMake Build Options (Linux & Mac OSX)

-## CMake Build Options (Linux & Mac OS)
-
- ```-DUSE_SYSTEM_LIBPNG=ON/OFF``` (default = *OFF*)  
+- ```-DUSE_SYSTEM_LIBPNG=ON/OFF``` (default = *OFF*) </br>
 Build against the shared libpng instead of using the builtin one. libpng 1.6+ highly recommended. Try this option if you get version conflict errors or only see black game icons.

- ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*)  
+- ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*) </br>
 Build against the shared ffmpeg libraries instead of using the builtin patched version. Try this if the builtin version breaks the OpenGL renderer for you.

- ```-DWITHOUT_LLVM=ON/OFF``` (default = *OFF*)  
-This forces RPCS3 to build without LLVM, not recommended.
-
- ```-DWITH_GDB=ON/OFF``` (default = *OFF*)  
-This Builds RPCS3 with support for debugging PS3 games using gdb.
-
- ```-DUSE_VULKAN=ON/OFF``` (default = *ON*)  
-This builds RPCS3 with Vulkan support.
-
-## License
-
-Most files are licensed under the terms of GNU GPLv2 License, see LICENSE file for details. Some files may be licensed differently, check appropriate file headers for details.
+### Support
+* [Donate by PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MPJ3S9XQXCE3G)
@@ -1,6 +1,7 @@
 #pragma once

 #include "types.h"
+#include "Platform.h"

 // Helper class, provides access to compiler-specific atomic intrinsics
 template<typename T, std::size_t Size>
@@ -142,38 +143,26 @@ struct atomic_storage
 		return atomic_storage<T>::sub_fetch(dest, 1);
 	}

-	static inline bool test_and_set(T& dest, T mask)
-	{
-		return (atomic_storage<T>::fetch_or(dest, mask) & mask) != 0;
-	}
-
-	static inline bool test_and_reset(T& dest, T mask)
-	{
-		return (atomic_storage<T>::fetch_and(dest, ~mask) & mask) != 0;
-	}
-
-	static inline bool test_and_complement(T& dest, T mask)
-	{
-		return (atomic_storage<T>::fetch_xor(dest, mask) & mask) != 0;
-	}
-
 	static inline bool bts(T& dest, uint bit)
 	{
-		return atomic_storage<T>::test_and_set(dest, static_cast<T>(1) << bit);
+		const T mask = static_cast<T>(1) << bit;
+		return (atomic_storage<T>::fetch_or(dest, mask) & mask) != 0;
 	}

 	static inline bool btr(T& dest, uint bit)
 	{
-		return atomic_storage<T>::test_and_reset(dest, static_cast<T>(1) << bit);
+		const T mask = static_cast<T>(1) << bit;
+		return (atomic_storage<T>::fetch_and(dest, ~mask) & mask) != 0;
 	}

 	static inline bool btc(T& dest, uint bit)
 	{
-		return atomic_storage<T>::test_and_complement(dest, static_cast<T>(1) << bit);
+		const T mask = static_cast<T>(1) << bit;
+		return (atomic_storage<T>::fetch_xor(dest, mask) & mask) != 0;
 	}
 };

-/* The rest: ugly MSVC intrinsics + inline asm implementations */
+/* The rest: ugly MSVC intrinsics + possibly __asm__ implementations (TODO) */

 template<typename T>
 struct atomic_storage<T, 1> : atomic_storage<T, 0>
@@ -296,30 +285,6 @@ struct atomic_storage<T, 2> : atomic_storage<T, 0>
 		short r = _InterlockedDecrement16((volatile short*)&dest);
 		return (T&)r;
 	}
-#else
-	static inline bool bts(T& dest, uint bit)
-	{
-		bool result;
-		ushort _bit = (ushort)bit;
-		__asm__("lock btsw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
-
-	static inline bool btr(T& dest, uint bit)
-	{
-		bool result;
-		ushort _bit = (ushort)bit;
-		__asm__("lock btrw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
-
-	static inline bool btc(T& dest, uint bit)
-	{
-		bool result;
-		ushort _bit = (ushort)bit;
-		__asm__("lock btcw %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
 #endif
 };

@@ -398,27 +363,6 @@ struct atomic_storage<T, 4> : atomic_storage<T, 0>
 	{
 		return _interlockedbittestandreset((volatile long*)&dest, bit) != 0;
 	}
-#else
-	static inline bool bts(T& dest, uint bit)
-	{
-		bool result;
-		__asm__("lock btsl %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
-		return result;
-	}
-
-	static inline bool btr(T& dest, uint bit)
-	{
-		bool result;
-		__asm__("lock btrl %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
-		return result;
-	}
-
-	static inline bool btc(T& dest, uint bit)
-	{
-		bool result;
-		__asm__("lock btcl %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (bit) : "cc");
-		return result;
-	}
 #endif
 };

@@ -497,30 +441,6 @@ struct atomic_storage<T, 8> : atomic_storage<T, 0>
 	{
 		return _interlockedbittestandreset64((volatile llong*)&dest, bit) != 0;
 	}
-#else
-	static inline bool bts(T& dest, uint bit)
-	{
-		bool result;
-		ullong _bit = bit;
-		__asm__("lock btsq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
-
-	static inline bool btr(T& dest, uint bit)
-	{
-		bool result;
-		ullong _bit = bit;
-		__asm__("lock btrq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
-
-	static inline bool btc(T& dest, uint bit)
-	{
-		bool result;
-		ullong _bit = bit;
-		__asm__("lock btcq %2, %0\n" "setc %1" : "+m" (dest), "=r" (result) : "Ir" (_bit) : "cc");
-		return result;
-	}
 #endif
 };

@@ -536,7 +456,7 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>

 	static inline T load(const T& dest)
 	{
-		llong result[2]{0, 0};
+		llong result[2];
 		_InterlockedCompareExchange128((volatile llong*)&dest, 0, 0, result);
 		return *(T*)+result;
 	}
@@ -558,8 +478,6 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>
 		return *(T*)+cmp;
 	}
 #endif
-
-	// TODO
 };

 template<typename T1, typename T2, typename>
@@ -712,16 +630,21 @@ struct atomic_test_and_set
 {
 	bool operator()(T1& lhs, const T2& rhs) const
 	{
-		return test_and_set(lhs, rhs);
+		return lhs.test_and_set(rhs);
 	}
 };

 template<typename T1, typename T2>
 struct atomic_test_and_set<T1, T2, std::enable_if_t<std::is_integral<T1>::value && std::is_convertible<T2, T1>::value>>
 {
-	static constexpr auto fetch_op = &atomic_storage<T1>::test_and_set;
-	static constexpr auto op_fetch = &atomic_storage<T1>::test_and_set;
-	static constexpr auto atomic_op = &atomic_storage<T1>::test_and_set;
+	static inline bool op(T1& lhs, const T2& rhs)
+	{
+		return (atomic_storage<T1>::fetch_or(lhs, rhs) & rhs) != 0;
+	}
+
+	static constexpr auto fetch_op = &op;
+	static constexpr auto op_fetch = &op;
+	static constexpr auto atomic_op = &op;
 };

 template<typename T1, typename T2, typename>
@@ -729,16 +652,21 @@ struct atomic_test_and_reset
 {
 	bool operator()(T1& lhs, const T2& rhs) const
 	{
-		return test_and_reset(lhs, rhs);
+		return lhs.test_and_reset(rhs);
 	}
 };

 template<typename T1, typename T2>
 struct atomic_test_and_reset<T1, T2, std::enable_if_t<std::is_integral<T1>::value && std::is_convertible<T2, T1>::value>>
 {
-	static constexpr auto fetch_op = &atomic_storage<T1>::test_and_reset;
-	static constexpr auto op_fetch = &atomic_storage<T1>::test_and_reset;
-	static constexpr auto atomic_op = &atomic_storage<T1>::test_and_reset;
+	static inline bool op(T1& lhs, const T2& rhs)
+	{
+		return (atomic_storage<T1>::fetch_and(lhs, ~rhs) & rhs) != 0;
+	}
+
+	static constexpr auto fetch_op = &op;
+	static constexpr auto op_fetch = &op;
+	static constexpr auto atomic_op = &op;
 };

 template<typename T1, typename T2, typename>
@@ -746,16 +674,21 @@ struct atomic_test_and_complement
 {
 	bool operator()(T1& lhs, const T2& rhs) const
 	{
-		return test_and_complement(lhs, rhs);
+		return lhs.test_and_complement(rhs);
 	}
 };

 template<typename T1, typename T2>
 struct atomic_test_and_complement<T1, T2, std::enable_if_t<std::is_integral<T1>::value && std::is_convertible<T2, T1>::value>>
 {
-	static constexpr auto fetch_op = &atomic_storage<T1>::test_and_complement;
-	static constexpr auto op_fetch = &atomic_storage<T1>::test_and_complement;
-	static constexpr auto atomic_op = &atomic_storage<T1>::test_and_complement;
+	static inline bool op(T1& lhs, const T2& rhs)
+	{
+		return (atomic_storage<T1>::fetch_xor(lhs, rhs) & rhs) != 0;
+	}
+
+	static constexpr auto fetch_op = &op;
+	static constexpr auto op_fetch = &op;
+	static constexpr auto atomic_op = &op;
 };

 // Atomic type with lock-free and standard layout guarantees (and appropriate limitations)
@@ -1021,6 +954,12 @@ public:
 		return atomic_op(atomic_post_dec<type>{});
 	}

+	template<typename T2 = T>
+	auto test(const T2& rhs) const
+	{
+		return load().test(rhs);
+	}
+
 	template<typename T2 = T>
 	auto test_and_set(const T2& rhs)
 	{
@@ -0,0 +1,73 @@
+#include "stdafx.h"
+#include "Config.h"
+#include "Emu/System.h"
+#include "AutoPause.h"
+
+cfg::bool_entry g_cfg_debug_autopause_syscall(cfg::root.misc, "Auto Pause at System Call");
+cfg::bool_entry g_cfg_debug_autopause_func_call(cfg::root.misc, "Auto Pause at Function Call");
+
+debug::autopause& debug::autopause::get_instance()
+{
+	// Use magic static
+	static autopause instance;
+	return instance;
+}
+
+// Load Auto Pause Configuration from file "pause.bin"
+void debug::autopause::reload(void)
+{
+	auto& instance = get_instance();
+
+	instance.m_pause_function.clear();
+	instance.m_pause_syscall.clear();
+
+	// TODO: better format, possibly a config entry
+	if (fs::file list{ fs::get_config_dir() + "pause.bin" })
+	{
+		u32 num;
+		size_t fmax = list.size();
+		size_t fcur = 0;
+		list.seek(0);
+		while (fcur <= fmax - sizeof(u32))
+		{
+			list.read(&num, sizeof(u32));
+			fcur += sizeof(u32);
+			if (num == 0xFFFFFFFF) break;
+			
+			if (num < 1024)
+			{
+				instance.m_pause_syscall.emplace(num);
+				LOG_WARNING(HLE, "Set autopause at syscall %lld", num);
+			}
+			else
+			{
+				instance.m_pause_function.emplace(num);
+				LOG_WARNING(HLE, "Set autopause at function 0x%08x", num);
+			}
+		}
+	}
+}
+
+bool debug::autopause::pause_syscall(u64 code)
+{
+	if (g_cfg_debug_autopause_syscall && get_instance().m_pause_syscall.count(code) != 0)
+	{
+		Emu.Pause();
+		LOG_SUCCESS(HLE, "Autopause triggered at syscall %lld", code);
+		return true;
+	}
+
+	return false;
+}
+
+bool debug::autopause::pause_function(u32 code)
+{
+	if (g_cfg_debug_autopause_func_call && get_instance().m_pause_function.count(code) != 0)
+	{
+		Emu.Pause();
+		LOG_SUCCESS(HLE, "Autopause triggered at function 0x%08x", code);
+		return true;
+	}
+
+	return false;
+}
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <unordered_set>
+
+// Regarded as a Debugger Enchantment
+namespace debug
+{
+	// To store the pause function/call id, and let those pause there.
+	// Would be with a GUI to configure those.
+	class autopause
+	{
+		std::unordered_set<u64> m_pause_syscall;
+		std::unordered_set<u32> m_pause_function;
+
+		static autopause& get_instance();
+	public:
+
+		static void reload();
+		static bool pause_syscall(u64 code);
+		static bool pause_function(u32 code);
+	};
+}
@@ -1,58 +1,56 @@
 #pragma once

 #include "types.h"
+#include "Platform.h"

-// 128-bit vector type and also se_storage<> storage type
 union alignas(16) v128
 {
 	char _bytes[16];

-	template <typename T, std::size_t N, std::size_t M>
+	template<typename T, std::size_t N, std::size_t M>
 	struct masked_array_t // array type accessed as (index ^ M)
 	{
 		T m_data[N];

 	public:
-		T& operator[](std::size_t index)
+		T& operator [](std::size_t index)
 		{
 			return m_data[index ^ M];
 		}

-		const T& operator[](std::size_t index) const
+		const T& operator [](std::size_t index) const
 		{
 			return m_data[index ^ M];
 		}
 	};

 #if IS_LE_MACHINE == 1
-	template <typename T, std::size_t N = 16 / sizeof(T)>
-	using normal_array_t = masked_array_t<T, N, 0>;
-	template <typename T, std::size_t N = 16 / sizeof(T)>
-	using reversed_array_t = masked_array_t<T, N, N - 1>;
+	template<typename T, std::size_t N = 16 / sizeof(T)> using normal_array_t = masked_array_t<T, N, 0>;
+	template<typename T, std::size_t N = 16 / sizeof(T)> using reversed_array_t = masked_array_t<T, N, N - 1>;
 #endif

-	normal_array_t<u64> _u64;
-	normal_array_t<s64> _s64;
+	normal_array_t<u64>   _u64;
+	normal_array_t<s64>   _s64;
 	reversed_array_t<u64> u64r;
 	reversed_array_t<s64> s64r;

-	normal_array_t<u32> _u32;
-	normal_array_t<s32> _s32;
+	normal_array_t<u32>   _u32;
+	normal_array_t<s32>   _s32;
 	reversed_array_t<u32> u32r;
 	reversed_array_t<s32> s32r;

-	normal_array_t<u16> _u16;
-	normal_array_t<s16> _s16;
+	normal_array_t<u16>   _u16;
+	normal_array_t<s16>   _s16;
 	reversed_array_t<u16> u16r;
 	reversed_array_t<s16> s16r;

-	normal_array_t<u8> _u8;
-	normal_array_t<s8> _s8;
-	reversed_array_t<u8> u8r;
-	reversed_array_t<s8> s8r;
+	normal_array_t<u8>    _u8;
+	normal_array_t<s8>    _s8;
+	reversed_array_t<u8>  u8r;
+	reversed_array_t<s8>  s8r;

-	normal_array_t<f32> _f;
-	normal_array_t<f64> _d;
+	normal_array_t<f32>   _f;
+	normal_array_t<f64>   _d;
 	reversed_array_t<f32> fr;
 	reversed_array_t<f64> dr;

@@ -82,7 +80,7 @@ union alignas(16) v128
 				return (data & mask) != 0;
 			}

-			bit_element& operator=(const bool right)
+			bit_element& operator =(const bool right)
 			{
 				if (right)
 				{
@@ -95,7 +93,7 @@ union alignas(16) v128
 				return *this;
 			}

-			bit_element& operator=(const bit_element& right)
+			bit_element& operator =(const bit_element& right)
 			{
 				if (right)
 				{
@@ -110,7 +108,7 @@ union alignas(16) v128
 		};

 		// Index 0 returns the MSB and index 127 returns the LSB
-		bit_element operator[](u32 index)
+		bit_element operator [](u32 index)
 		{
 #if IS_LE_MACHINE == 1
 			return bit_element(m_data[1 - (index >> 6)], 0x8000000000000000ull >> (index & 0x3F));
@@ -118,13 +116,14 @@ union alignas(16) v128
 		}

 		// Index 0 returns the MSB and index 127 returns the LSB
-		bool operator[](u32 index) const
+		bool operator [](u32 index) const
 		{
 #if IS_LE_MACHINE == 1
 			return (m_data[1 - (index >> 6)] & (0x8000000000000000ull >> (index & 0x3F))) != 0;
 #endif
 		}
-	} _bit;
+	}
+	_bit;

 	static v128 from64(u64 _0, u64 _1 = 0)
 	{
@@ -278,12 +277,12 @@ union alignas(16) v128
 		return fromV(_mm_cmpeq_epi32(left.vi, right.vi));
 	}

-	bool operator==(const v128& right) const
+	bool operator ==(const v128& right) const
 	{
 		return _u64[0] == right._u64[0] && _u64[1] == right._u64[1];
 	}

-	bool operator!=(const v128& right) const
+	bool operator !=(const v128& right) const
 	{
 		return _u64[0] != right._u64[0] || _u64[1] != right._u64[1];
 	}
@@ -299,79 +298,43 @@ union alignas(16) v128
 		_u64[0] = 0;
 		_u64[1] = 0;
 	}
+
+	std::string to_hex() const;
+
+	std::string to_xyzw() const;
 };

-template <typename T, std::size_t N, std::size_t M>
-struct offset32_array<v128::masked_array_t<T, N, M>>
-{
-	template <typename Arg>
-	static inline u32 index32(const Arg& arg)
-	{
-		return SIZE_32(T) * (static_cast<u32>(arg) ^ static_cast<u32>(M));
-	}
-};
-
-inline v128 operator|(const v128& left, const v128& right)
+inline v128 operator |(const v128& left, const v128& right)
 {
 	return v128::fromV(_mm_or_si128(left.vi, right.vi));
 }

-inline v128 operator&(const v128& left, const v128& right)
+inline v128 operator &(const v128& left, const v128& right)
 {
 	return v128::fromV(_mm_and_si128(left.vi, right.vi));
 }

-inline v128 operator^(const v128& left, const v128& right)
+inline v128 operator ^(const v128& left, const v128& right)
 {
 	return v128::fromV(_mm_xor_si128(left.vi, right.vi));
 }

-inline v128 operator~(const v128& other)
+inline v128 operator ~(const v128& other)
 {
 	return v128::from64(~other._u64[0], ~other._u64[1]);
 }

-template <typename T, std::size_t Align, std::size_t Size>
+#define IS_INTEGER(t) (std::is_integral<t>::value || std::is_enum<t>::value)
+#define IS_BINARY_COMPARABLE(t1, t2) (IS_INTEGER(t1) && IS_INTEGER(t2) && sizeof(t1) == sizeof(t2))
+
+template<typename T, std::size_t Size = sizeof(T)>
 struct se_storage
 {
-	using type = std::aligned_storage_t<Size, Align>;
-
-	// Unoptimized generic byteswap for unaligned data
-	static void reverse(u8* dst, const u8* src)
-	{
-		for (std::size_t i = 0; i < Size; i++)
-		{
-			dst[i] = src[Size - 1 - i];
-		}
-	}
-
-	static type to(const T& src)
-	{
-		type result;
-		reverse(reinterpret_cast<u8*>(&result), reinterpret_cast<const u8*>(&src));
-		return result;
-	}
-
-	static T from(const type& src)
-	{
-		T result;
-		reverse(reinterpret_cast<u8*>(&result), reinterpret_cast<const u8*>(&src));
-		return result;
-	}
-
-	static type copy(const type& src)
-	{
-		type result;
-		for (std::size_t i = 0; i < Size; i++)
-		{
-			reinterpret_cast<u8*>(&result)[i] = reinterpret_cast<const u8*>(&src)[i];
-		}
-		return result;
-	}
+	static_assert(!Size, "Bad se_storage<> type");
 };

-template <typename T>
-struct se_storage<T, 2, 2>
+template<typename T>
+struct se_storage<T, 2>
 {
 	using type = u16;

@@ -394,15 +357,10 @@ struct se_storage<T, 2, 2>
 		const u16 result = swap(src);
 		return reinterpret_cast<const T&>(result);
 	}
-
-	static inline T copy(const T& src)
-	{
-		return src;
-	}
 };

-template <typename T>
-struct se_storage<T, 4, 4>
+template<typename T>
+struct se_storage<T, 4>
 {
 	using type = u32;

@@ -425,15 +383,10 @@ struct se_storage<T, 4, 4>
 		const u32 result = swap(src);
 		return reinterpret_cast<const T&>(result);
 	}
-
-	static inline T copy(const T& src)
-	{
-		return src;
-	}
 };

-template <typename T>
-struct se_storage<T, 8, 8>
+template<typename T>
+struct se_storage<T, 8>
 {
 	using type = u64;

@@ -456,15 +409,10 @@ struct se_storage<T, 8, 8>
 		const u64 result = swap(src);
 		return reinterpret_cast<const T&>(result);
 	}
-
-	static inline T copy(const T& src)
-	{
-		return src;
-	}
 };

-template <typename T>
-struct se_storage<T, 16, 16>
+template<typename T>
+struct se_storage<T, 16>
 {
 	using type = v128;

@@ -483,20 +431,43 @@ struct se_storage<T, 16, 16>
 		const v128 result = swap(src);
 		return reinterpret_cast<const T&>(result);
 	}
+};

-	static inline T copy(const T& src)
+template<typename T> using se_storage_t = typename se_storage<T>::type;
+
+template<typename T1, typename T2>
+struct se_convert
+{
+	using type_from = std::remove_cv_t<T1>;
+	using type_to = std::remove_cv_t<T2>;
+	using stype_from = se_storage_t<std::remove_cv_t<T1>>;
+	using stype_to = se_storage_t<std::remove_cv_t<T2>>;
+	using storage_from = se_storage<std::remove_cv_t<T1>>;
+	using storage_to = se_storage<std::remove_cv_t<T2>>;
+
+	static inline std::enable_if_t<std::is_same<type_from, type_to>::value, stype_to> convert(const stype_from& data)
 	{
-		return src;
+		return data;
+	}
+
+	static inline stype_to convert(const stype_from& data, ...)
+	{
+		return storage_to::to(storage_from::from(data));
 	}
 };

+static struct se_raw_tag_t {} constexpr se_raw{};
+
+template<typename T, bool Se = true>
+class se_t;
+
 // Switched endianness
-template <typename T, std::size_t Align>
-class se_t<T, true, Align>
+template<typename T>
+class se_t<T, true>
 {
 	using type = typename std::remove_cv<T>::type;
-	using stype = typename se_storage<type, Align>::type;
-	using storage = se_storage<type, Align>;
+	using stype = se_storage_t<type>;
+	using storage = se_storage<type>;

 	stype m_data;

@@ -505,6 +476,24 @@ class se_t<T, true, Align>
 	static_assert(!std::is_array<type>::value, "se_t<> error: invalid type (array)");
 	static_assert(sizeof(type) == alignof(type), "se_t<> error: unexpected alignment");

+	template<typename T2, typename = void>
+	struct bool_converter
+	{
+		static inline bool to_bool(const se_t<T2>& value)
+		{
+			return static_cast<bool>(value.value());
+		}
+	};
+
+	template<typename T2>
+	struct bool_converter<T2, std::enable_if_t<std::is_integral<T2>::value>>
+	{
+		static inline bool to_bool(const se_t<T2>& value)
+		{
+			return value.m_data != 0;
+		}
+	};
+
 public:
 	se_t() = default;

@@ -514,15 +503,27 @@ public:
 		: m_data(storage::to(value))
 	{
 	}
+	
+	// Construct directly from raw data (don't use)
+	constexpr se_t(const stype& raw_value, const se_raw_tag_t&)
+		: m_data(raw_value)
+	{
+	}

 	type value() const
 	{
 		return storage::from(m_data);
 	}

-	se_t& operator=(const se_t&) = default;
+	// Access underlying raw data (don't use)
+	constexpr const stype& raw_data() const noexcept
+	{
+		return m_data;
+	}
+	
+	se_t& operator =(const se_t&) = default;

-	se_t& operator=(type value)
+	se_t& operator =(type value)
 	{
 		return m_data = storage::to(value), *this;
 	}
@@ -533,127 +534,181 @@ public:
 	{
 		return storage::from(m_data);
 	}
+
+	// Optimization
+	explicit operator bool() const
+	{
+		return bool_converter<type>::to_bool(*this);
+	}
+
+	// Optimization
+	template<typename T2>
+	std::enable_if_t<IS_BINARY_COMPARABLE(T, T2), se_t&> operator &=(const se_t<T2>& right)
+	{
+		return m_data &= right.raw_data(), *this;
+	}
+
+	// Optimization
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator &=(CT right)
+	{
+		return m_data &= storage::to(right), *this;
+	}
+
+	// Optimization
+	template<typename T2>
+	std::enable_if_t<IS_BINARY_COMPARABLE(T, T2), se_t&> operator |=(const se_t<T2>& right)
+	{
+		return m_data |= right.raw_data(), *this;
+	}
+
+	// Optimization
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator |=(CT right)
+	{
+		return m_data |= storage::to(right), *this;
+	}
+
+	// Optimization
+	template<typename T2>
+	std::enable_if_t<IS_BINARY_COMPARABLE(T, T2), se_t&> operator ^=(const se_t<T2>& right)
+	{
+		return m_data ^= right.raw_data(), *this;
+	}
+
+	// Optimization
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator ^=(CT right)
+	{
+		return m_data ^= storage::to(right), *this;
+	}
 };

 // Native endianness
-template <typename T, std::size_t Align>
-class se_t<T, false, Align>
+template<typename T>
+class se_t<T, false>
 {
 	using type = typename std::remove_cv<T>::type;
-	using stype = typename se_storage<type, Align>::type;
-	using storage = se_storage<type, Align>;

 	static_assert(!std::is_pointer<type>::value, "se_t<> error: invalid type (pointer)");
 	static_assert(!std::is_reference<type>::value, "se_t<> error: invalid type (reference)");
 	static_assert(!std::is_array<type>::value, "se_t<> error: invalid type (array)");
 	static_assert(sizeof(type) == alignof(type), "se_t<> error: unexpected alignment");

-	stype m_data;
+	type m_data;

 public:
 	se_t() = default;

-	se_t(type value)
-		: m_data(reinterpret_cast<const stype&>(value))
+	constexpr se_t(type value)
+		: m_data(value)
 	{
 	}

-	type value() const
+	// Construct directly from raw data (don't use)
+	constexpr se_t(const type& raw_value, const se_raw_tag_t&)
+		: m_data(raw_value)
 	{
-		return storage::copy(reinterpret_cast<const type&>(m_data));
 	}

-	se_t& operator=(const se_t& value) = default;
-
-	se_t& operator=(type value)
+	constexpr type value() const
 	{
-		return m_data = reinterpret_cast<const stype&>(value), *this;
+		return m_data;
+	}
+
+	// Access underlying raw data (don't use)
+	constexpr const type& raw_data() const noexcept
+	{
+		return m_data;
+	}
+
+	se_t& operator =(const se_t& value) = default;
+
+	se_t& operator =(type value)
+	{
+		return m_data = value, *this;
 	}

 	using simple_type = simple_t<T>;

-	operator type() const
+	constexpr operator type() const
 	{
-		return storage::copy(reinterpret_cast<const type&>(m_data));
+		return m_data;
+	}
+
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator &=(const CT& right)
+	{
+		return m_data &= right, *this;
+	}
+
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator |=(const CT& right)
+	{
+		return m_data |= right, *this;
+	}
+
+	template<typename CT>
+	std::enable_if_t<std::is_integral<T>::value && std::is_convertible<CT, T>::value, se_t&> operator ^=(const CT& right)
+	{
+		return m_data ^= right, *this;
 	}
 };

-// se_t<> with native endianness
-template <typename T, std::size_t Align = alignof(T)>
-using nse_t = se_t<T, false, Align>;
+// se_t with native endianness (alias)
+template<typename T> using nse_t = se_t<T, false>;

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator+=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator +=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value += right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator-=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator -=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value -= right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator*=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator *=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value *= right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator/=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator /=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value /= right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator%=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator %=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value %= right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator&=(se_t<T, Se, Align>& left, const T1& right)
-{
-	auto value = left.value();
-	return left = (value &= right);
-}
-
-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator|=(se_t<T, Se, Align>& left, const T1& right)
-{
-	auto value = left.value();
-	return left = (value |= right);
-}
-
-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator^=(se_t<T, Se, Align>& left, const T1& right)
-{
-	auto value = left.value();
-	return left = (value ^= right);
-}
-
-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator<<=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator <<=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value <<= right);
 }

-template <typename T, bool Se, std::size_t Align, typename T1>
-inline se_t<T, Se, Align>& operator>>=(se_t<T, Se, Align>& left, const T1& right)
+template<typename T, bool Se, typename T1>
+inline se_t<T, Se>& operator >>=(se_t<T, Se>& left, const T1& right)
 {
 	auto value = left.value();
 	return left = (value >>= right);
 }

-template <typename T, bool Se, std::size_t Align>
-inline se_t<T, Se, Align> operator++(se_t<T, Se, Align>& left, int)
+template<typename T, bool Se>
+inline se_t<T, Se> operator ++(se_t<T, Se>& left, int)
 {
 	auto value = left.value();
 	auto result = value++;
@@ -661,8 +716,8 @@ inline se_t<T, Se, Align> operator++(se_t<T, Se, Align>& left, int)
 	return result;
 }

-template <typename T, bool Se, std::size_t Align>
-inline se_t<T, Se, Align> operator--(se_t<T, Se, Align>& left, int)
+template<typename T, bool Se>
+inline se_t<T, Se> operator --(se_t<T, Se>& left, int)
 {
 	auto value = left.value();
 	auto result = value--;
@@ -670,111 +725,173 @@ inline se_t<T, Se, Align> operator--(se_t<T, Se, Align>& left, int)
 	return result;
 }

-template <typename T, bool Se, std::size_t Align>
-inline se_t<T, Se, Align>& operator++(se_t<T, Se, Align>& right)
+template<typename T, bool Se>
+inline se_t<T, Se>& operator ++(se_t<T, Se>& right)
 {
 	auto value = right.value();
 	return right = ++value;
 }

-template <typename T, bool Se, std::size_t Align>
-inline se_t<T, Se, Align>& operator--(se_t<T, Se, Align>& right)
+template<typename T, bool Se>
+inline se_t<T, Se>& operator --(se_t<T, Se>& right)
 {
 	auto value = right.value();
 	return right = --value;
 }

+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_BINARY_COMPARABLE(T1, T2), bool> operator ==(const se_t<T1>& left, const se_t<T2>& right)
+{
+	return left.raw_data() == right.raw_data();
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<std::is_integral<T1>::value && IS_INTEGER(T2) && sizeof(T1) >= sizeof(T2), bool> operator ==(const se_t<T1>& left, T2 right)
+{
+	return left.raw_data() == se_storage<T1>::to(right);
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_INTEGER(T1) && std::is_integral<T2>::value && sizeof(T1) <= sizeof(T2), bool> operator ==(T1 left, const se_t<T2>& right)
+{
+	return se_storage<T2>::to(left) == right.raw_data();
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_BINARY_COMPARABLE(T1, T2), bool> operator !=(const se_t<T1>& left, const se_t<T2>& right)
+{
+	return left.raw_data() != right.raw_data();
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<std::is_integral<T1>::value && IS_INTEGER(T2) && sizeof(T1) >= sizeof(T2), bool> operator !=(const se_t<T1>& left, T2 right)
+{
+	return left.raw_data() != se_storage<T1>::to(right);
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_INTEGER(T1) && std::is_integral<T2>::value && sizeof(T1) <= sizeof(T2), bool> operator !=(T1 left, const se_t<T2>& right)
+{
+	return se_storage<T2>::to(left) != right.raw_data();
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_BINARY_COMPARABLE(T1, T2) && sizeof(T1) >= 4, se_t<decltype(T1() & T2())>> operator &(const se_t<T1>& left, const se_t<T2>& right)
+{
+	return{ left.raw_data() & right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<std::is_integral<T1>::value && IS_INTEGER(T2) && sizeof(T1) >= sizeof(T2) && sizeof(T1) >= 4, se_t<decltype(T1() & T2())>> operator &(const se_t<T1>& left, T2 right)
+{
+	return{ left.raw_data() & se_storage<T1>::to(right), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_INTEGER(T1) && std::is_integral<T2>::value && sizeof(T1) <= sizeof(T2) && sizeof(T2) >= 4, se_t<decltype(T1() & T2())>> operator &(T1 left, const se_t<T2>& right)
+{
+	return{ se_storage<T2>::to(left) & right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_BINARY_COMPARABLE(T1, T2) && sizeof(T1) >= 4, se_t<decltype(T1() | T2())>> operator |(const se_t<T1>& left, const se_t<T2>& right)
+{
+	return{ left.raw_data() | right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<std::is_integral<T1>::value && IS_INTEGER(T2) && sizeof(T1) >= sizeof(T2) && sizeof(T1) >= 4, se_t<decltype(T1() | T2())>> operator |(const se_t<T1>& left, T2 right)
+{
+	return{ left.raw_data() | se_storage<T1>::to(right), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_INTEGER(T1) && std::is_integral<T2>::value && sizeof(T1) <= sizeof(T2) && sizeof(T2) >= 4, se_t<decltype(T1() | T2())>> operator |(T1 left, const se_t<T2>& right)
+{
+	return{ se_storage<T2>::to(left) | right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_BINARY_COMPARABLE(T1, T2) && sizeof(T1) >= 4, se_t<decltype(T1() ^ T2())>> operator ^(const se_t<T1>& left, const se_t<T2>& right)
+{
+	return{ left.raw_data() ^ right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<std::is_integral<T1>::value && IS_INTEGER(T2) && sizeof(T1) >= sizeof(T2) && sizeof(T1) >= 4, se_t<decltype(T1() ^ T2())>> operator ^(const se_t<T1>& left, T2 right)
+{
+	return{ left.raw_data() ^ se_storage<T1>::to(right), se_raw };
+}
+
+// Optimization
+template<typename T1, typename T2>
+inline std::enable_if_t<IS_INTEGER(T1) && std::is_integral<T2>::value && sizeof(T1) <= sizeof(T2) && sizeof(T2) >= 4, se_t<decltype(T1() ^ T2())>> operator ^(T1 left, const se_t<T2>& right)
+{
+	return{ se_storage<T2>::to(left) ^ right.raw_data(), se_raw };
+}
+
+// Optimization
+template<typename T>
+inline std::enable_if_t<std::is_integral<T>::value && sizeof(T) >= 4, se_t<decltype(~T())>> operator ~(const se_t<T>& right)
+{
+	return{ ~right.raw_data(), se_raw };
+}
+
 #if IS_LE_MACHINE == 1
-template <typename T, std::size_t Align = alignof(T)>
-using be_t = se_t<T, true, Align>;
-template <typename T, std::size_t Align = alignof(T)>
-using le_t = se_t<T, false, Align>;
+template<typename T> using be_t = se_t<T, true>;
+template<typename T> using le_t = se_t<T, false>;
 #endif

 // Type converter: converts native endianness arithmetic/enum types to appropriate se_t<> type
-template <typename T, bool Se, typename = void>
+template<typename T, bool Se, typename = void>
 struct to_se
 {
-	template <typename T2, typename = void>
-	struct to_se_
-	{
-		using type = T2;
-	};
-
-	template <typename T2>
-	struct to_se_<T2, std::enable_if_t<std::is_arithmetic<T2>::value || std::is_enum<T2>::value>>
-	{
-		using type = se_t<T2, Se>;
-	};
-
 	// Convert arithmetic and enum types
-	using type = typename to_se_<T>::type;
+	using type = typename std::conditional<std::is_arithmetic<T>::value || std::is_enum<T>::value, se_t<T, Se>, T>::type;
 };

-template <bool Se>
-struct to_se<v128, Se>
-{
-	using type = se_t<v128, Se>;
-};
+template<bool Se> struct to_se<v128, Se> { using type = se_t<v128, Se>; };
+template<bool Se> struct to_se<bool, Se> { using type = bool; };
+template<bool Se> struct to_se<char, Se> { using type = char; };
+template<bool Se> struct to_se<u8, Se>   { using type = u8; };
+template<bool Se> struct to_se<s8, Se>   { using type = s8; };

-template <bool Se>
-struct to_se<u128, Se>
-{
-	using type = se_t<u128, Se>;
-};
-
-template <bool Se>
-struct to_se<s128, Se>
-{
-	using type = se_t<s128, Se>;
-};
-
-template <bool Se>
-struct to_se<bool, Se>
-{
-	using type = bool;
-};
-
-template <bool Se>
-struct to_se<char, Se>
-{
-	using type = char;
-};
-
-template <bool Se>
-struct to_se<u8, Se>
-{
-	using type = u8;
-};
-
-template <bool Se>
-struct to_se<s8, Se>
-{
-	using type = s8;
-};
-
-template <typename T, bool Se>
-struct to_se<const T, Se, std::enable_if_t<!std::is_array<T>::value>>
+template<typename T, bool Se>
+struct to_se<const T, Se, std::enable_if_t<!std::is_array<T>::value>> 
 {
 	// Move const qualifier
 	using type = const typename to_se<T, Se>::type;
 };

-template <typename T, bool Se>
+template<typename T, bool Se>
 struct to_se<volatile T, Se, std::enable_if_t<!std::is_array<T>::value && !std::is_const<T>::value>>
 {
 	// Move volatile qualifier
 	using type = volatile typename to_se<T, Se>::type;
 };

-template <typename T, bool Se>
+template<typename T, bool Se>
 struct to_se<T[], Se>
 {
 	// Move array qualifier
 	using type = typename to_se<T, Se>::type[];
 };

-template <typename T, bool Se, std::size_t N>
+template<typename T, bool Se, std::size_t N>
 struct to_se<T[N], Se>
 {
 	// Move array qualifier
@@ -783,27 +900,25 @@ struct to_se<T[N], Se>

 // BE/LE aliases for to_se<>
 #if IS_LE_MACHINE == 1
-template <typename T>
-using to_be_t = typename to_se<T, true>::type;
-template <typename T>
-using to_le_t = typename to_se<T, false>::type;
+template<typename T> using to_be_t = typename to_se<T, true>::type;
+template<typename T> using to_le_t = typename to_se<T, false>::type;
 #endif

 // BE/LE aliases for atomic_t
 #if IS_LE_MACHINE == 1
-template <typename T>
-using atomic_be_t = atomic_t<be_t<T>>;
-template <typename T>
-using atomic_le_t = atomic_t<le_t<T>>;
+template<typename T> using atomic_be_t = atomic_t<be_t<T>>;
+template<typename T> using atomic_le_t = atomic_t<le_t<T>>;
 #endif

-template <typename T, bool Se, std::size_t Align>
-struct fmt_unveil<se_t<T, Se, Align>, void>
+// Formatting for BE/LE data
+template<typename T, bool Se>
+struct unveil<se_t<T, Se>, void>
 {
-	using type = typename fmt_unveil<T>::type;
-
-	static inline auto get(const se_t<T, Se, Align>& arg)
+	static inline auto get(const se_t<T, Se>& arg)
 	{
-		return fmt_unveil<T>::get(arg);
+		return unveil<T>::get(arg);
 	}
 };
+
+#undef IS_BINARY_COMPARABLE
+#undef IS_INTEGER
@@ -7,19 +7,15 @@ struct bf_base
 {
 	using type = T;
 	using vtype = simple_t<type>;
-	using utype = typename std::make_unsigned<vtype>::type;

 	// Datatype bitsize
-	static constexpr uint bitmax = sizeof(T) * 8; static_assert(N - 1 < bitmax, "bf_base<> error: N out of bounds");
+	static constexpr uint bitmax = sizeof(T) * CHAR_BIT; static_assert(N - 1 < bitmax, "bf_base<> error: N out of bounds");
 	
 	// Field bitsize
 	static constexpr uint bitsize = N;

 	// Value mask
-	static constexpr utype vmask = static_cast<utype>(~utype{} >> (bitmax - bitsize));
-
-	// All ones mask
-	static constexpr utype mask1 = static_cast<utype>(~utype{});
+	static constexpr vtype vmask = static_cast<vtype>(~std::make_unsigned_t<vtype>{} >> (bitmax - bitsize));

 protected:
 	type m_data;
@@ -31,15 +27,14 @@ struct bf_t : bf_base<T, N>
 {
 	using type = typename bf_t::type;
 	using vtype = typename bf_t::vtype;
-	using utype = typename bf_t::utype;

 	// Field offset
 	static constexpr uint bitpos = I; static_assert(bitpos + N <= bf_t::bitmax, "bf_t<> error: I out of bounds");

 	// Get bitmask of size N, at I pos
-	static constexpr utype data_mask()
+	static constexpr vtype data_mask()
 	{
-		return static_cast<utype>(static_cast<utype>(bf_t::mask1 >> (bf_t::bitmax - bf_t::bitsize)) << bitpos);
+		return bf_t::vmask << bitpos;
 	}

 	// Bitfield extraction helper
@@ -55,7 +50,7 @@ struct bf_t : bf_base<T, N>
 		// Load unsigned value
 		static constexpr T2 extract(const T& data)
 		{
-			return static_cast<T2>((static_cast<utype>(data) >> bitpos) & bf_t::vmask);
+			return (data >> bitpos) & bf_t::vmask;
 		}
 	};

@@ -65,7 +60,7 @@ struct bf_t : bf_base<T, N>
 		// Load signed value (sign-extended)
 		static constexpr T2 extract(const T& data)
 		{
-			return static_cast<T2>(static_cast<vtype>(static_cast<utype>(data) << (bf_t::bitmax - bitpos - N)) >> (bf_t::bitmax - N));
+			return data << (bf_t::bitmax - bitpos - N) >> (bf_t::bitmax - N);
 		}
 	};

@@ -78,7 +73,7 @@ struct bf_t : bf_base<T, N>
 	// Bitfield insertion
 	static constexpr vtype insert(vtype value)
 	{
-		return static_cast<vtype>((value & bf_t::vmask) << bitpos);
+		return (value & bf_t::vmask) << bitpos;
 	}

 	// Load bitfield value
@@ -90,7 +85,7 @@ struct bf_t : bf_base<T, N>
 	// Load raw data with mask applied
 	constexpr T unshifted() const
 	{
-		return static_cast<T>(this->m_data & data_mask());
+		return this->m_data & data_mask();
 	}

 	// Optimized bool conversion (must be removed if inappropriate)
@@ -102,14 +97,14 @@ struct bf_t : bf_base<T, N>
 	// Store bitfield value
 	bf_t& operator =(vtype value)
 	{
-		this->m_data = static_cast<vtype>((this->m_data & ~data_mask()) | insert(value));
+		this->m_data = (this->m_data & ~data_mask()) | insert(value);
 		return *this;
 	}

 	vtype operator ++(int)
 	{
-		utype result = *this;
-		*this = static_cast<vtype>(result + 1);
+		vtype result = *this;
+		*this = result + 1;
 		return result;
 	}

@@ -120,8 +115,8 @@ struct bf_t : bf_base<T, N>

 	vtype operator --(int)
 	{
-		utype result = *this;
-		*this = static_cast<vtype>(result - 1);
+		vtype result = *this;
+		*this = result - 1;
 		return result;
 	}

@@ -147,19 +142,19 @@ struct bf_t : bf_base<T, N>

 	bf_t& operator &=(vtype right)
 	{
-		this->m_data &= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
+		this->m_data &= (right & bf_t::vmask) << bitpos;
 		return *this;
 	}

 	bf_t& operator |=(vtype right)
 	{
-		this->m_data |= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
+		this->m_data |= (right & bf_t::vmask) << bitpos;
 		return *this;
 	}

 	bf_t& operator ^=(vtype right)
 	{
-		this->m_data ^= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
+		this->m_data ^= (right & bf_t::vmask) << bitpos;
 		return *this;
 	}
 };
@@ -170,24 +165,23 @@ struct cf_t : bf_base<typename F::type, F::bitsize + cf_t<Fields...>::bitsize>
 {
 	using type = typename cf_t::type;
 	using vtype = typename cf_t::vtype;
-	using utype = typename cf_t::utype;

 	// Get disjunction of all "data" masks of concatenated values
 	static constexpr vtype data_mask()
 	{
-		return static_cast<vtype>(F::data_mask() | cf_t<Fields...>::data_mask());
+		return F::data_mask() | cf_t<Fields...>::data_mask();
 	}

 	// Extract all bitfields and concatenate
 	static constexpr vtype extract(const type& data)
 	{
-		return static_cast<vtype>(static_cast<utype>(F::extract(data)) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data));
+		return F::extract(data) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data);
 	}

 	// Split bitfields and insert them
 	static constexpr vtype insert(vtype value)
 	{
-		return static_cast<vtype>(F::insert(value >> cf_t<Fields...>::bitsize) | cf_t<Fields...>::insert(value));
+		return F::insert(value >> cf_t<Fields...>::bitsize) | cf_t<Fields...>::insert(value);
 	}

 	// Load value
@@ -248,36 +242,3 @@ struct ff_t : bf_base<T, N>
 		return V;
 	}
 };
-
-template<typename T, uint I, uint N>
-struct fmt_unveil<bf_t<T, I, N>, void>
-{
-	using type = typename fmt_unveil<simple_t<T>>::type;
-
-	static inline auto get(const bf_t<T, I, N>& bf)
-	{
-		return fmt_unveil<type>::get(bf);
-	}
-};
-
-template<typename F, typename... Fields>
-struct fmt_unveil<cf_t<F, Fields...>, void>
-{
-	using type = typename fmt_unveil<simple_t<typename F::type>>::type;
-
-	static inline auto get(const cf_t<F, Fields...>& cf)
-	{
-		return fmt_unveil<type>::get(cf);
-	}
-};
-
-template<typename T, T V, uint N>
-struct fmt_unveil<ff_t<T, V, N>, void>
-{
-	using type = typename fmt_unveil<simple_t<T>>::type;
-
-	static inline auto get(const ff_t<T, V, N>& ff)
-	{
-		return fmt_unveil<type>::get(ff);
-	}
-};
@@ -0,0 +1,258 @@
+#pragma once
+
+#include "types.h"
+
+// Small bitset for enum class types with available values [0, BitSize).
+// T must be either enum type or convertible to (registered with via simple_t<T>).
+// Internal representation is single value of type T.
+template<typename T, std::size_t BitSize = sizeof(T) * CHAR_BIT>
+struct bitset_t
+{
+	using type = simple_t<T>;
+	using under = std::underlying_type_t<type>;
+	enum class raw_type : under {};
+
+	static constexpr auto bitsize = BitSize;
+
+	bitset_t() = default;
+
+	constexpr bitset_t(type _enum_const)
+		: m_value(static_cast<type>(shift(_enum_const)))
+	{
+	}
+
+	constexpr bitset_t(raw_type raw_value)
+		: m_value(static_cast<T>(static_cast<under>(raw_value)))
+	{
+	}
+
+	// Get underlying value
+	constexpr under _value() const
+	{
+		return static_cast<under>(m_value);
+	}
+
+	explicit constexpr operator bool() const
+	{
+		return _value() ? true : false;
+	}
+
+	bitset_t& operator +=(bitset_t rhs)
+	{
+		return *this = static_cast<raw_type>(_value() | rhs._value());
+	}
+
+	bitset_t& operator -=(bitset_t rhs)
+	{
+		return *this = static_cast<raw_type>(_value() & ~rhs._value());
+	}
+
+	bitset_t& operator &=(bitset_t rhs)
+	{
+		return *this = static_cast<raw_type>(_value() & rhs._value());
+	}
+
+	bitset_t& operator ^=(bitset_t rhs)
+	{
+		return *this = static_cast<raw_type>(_value() ^ rhs._value());
+	}
+
+	friend constexpr bitset_t operator +(bitset_t lhs, bitset_t rhs)
+	{
+		return static_cast<raw_type>(lhs._value() | rhs._value());
+	}
+
+	friend constexpr bitset_t operator -(bitset_t lhs, bitset_t rhs)
+	{
+		return static_cast<raw_type>(lhs._value() & ~rhs._value());
+	}
+
+	friend constexpr bitset_t operator &(bitset_t lhs, bitset_t rhs)
+	{
+		return static_cast<raw_type>(lhs._value() & rhs._value());
+	}
+
+	friend constexpr bitset_t operator ^(bitset_t lhs, bitset_t rhs)
+	{
+		return static_cast<raw_type>(lhs._value() ^ rhs._value());
+	}
+
+	bool test(bitset_t rhs) const
+	{
+		const under v = _value();
+		const under s = rhs._value();
+		return (v & s) != 0;
+	}
+
+	bool test_and_set(bitset_t rhs)
+	{
+		const under v = _value();
+		const under s = rhs._value();
+		*this = static_cast<raw_type>(v | s);
+		return (v & s) != 0;
+	}
+
+	bool test_and_reset(bitset_t rhs)
+	{
+		const under v = _value();
+		const under s = rhs._value();
+		*this = static_cast<raw_type>(v & ~s);
+		return (v & s) != 0;
+	}
+
+	bool test_and_complement(bitset_t rhs)
+	{
+		const under v = _value();
+		const under s = rhs._value();
+		*this = static_cast<raw_type>(v ^ s);
+		return (v & s) != 0;
+	}
+
+private:
+	static constexpr under shift(const T& value)
+	{
+		return static_cast<under>(value) < BitSize ? static_cast<under>(1) << static_cast<under>(value) : throw value;
+	}
+
+	T m_value;
+};
+
+template<typename T, typename RT = T>
+constexpr RT make_bitset()
+{
+	return RT{};
+}
+
+// Fold enum constants into bitset_t<> (must be implemented with constexpr initializer_list constructor instead)
+template<typename T = void, typename Arg, typename... Args, typename RT = std::conditional_t<std::is_void<T>::value, bitset_t<Arg>, T>>
+constexpr RT make_bitset(Arg&& _enum_const, Args&&... args)
+{
+	return RT{ std::forward<Arg>(_enum_const) } + make_bitset<RT>(std::forward<Args>(args)...);
+}
+
+template<typename T, typename CT>
+struct atomic_add<bitset_t<T>, CT, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+	using raw_type = typename bitset_t<T>::raw_type;
+
+	static inline bitset_t<T> op1(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::fetch_or(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto fetch_op = &op1;
+
+	static inline bitset_t<T> op2(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::or_fetch(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto op_fetch = &op2;
+	static constexpr auto atomic_op = &op2;
+};
+
+template<typename T, typename CT>
+struct atomic_sub<bitset_t<T>, CT, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+	using raw_type = typename bitset_t<T>::raw_type;
+
+	static inline bitset_t<T> op1(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), ~right._value()));
+	}
+
+	static constexpr auto fetch_op = &op1;
+
+	static inline bitset_t<T> op2(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), ~right._value()));
+	}
+
+	static constexpr auto op_fetch = &op2;
+	static constexpr auto atomic_op = &op2;
+};
+
+template<typename T, typename CT>
+struct atomic_and<bitset_t<T>, CT, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+	using raw_type = typename bitset_t<T>::raw_type;
+
+	static inline bitset_t<T> op1(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto fetch_op = &op1;
+
+	static inline bitset_t<T> op2(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto op_fetch = &op2;
+	static constexpr auto atomic_op = &op2;
+};
+
+template<typename T, typename CT>
+struct atomic_xor<bitset_t<T>, CT, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+	using raw_type = typename bitset_t<T>::raw_type;
+
+	static inline bitset_t<T> op1(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::fetch_xor(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto fetch_op = &op1;
+
+	static inline bitset_t<T> op2(bitset_t<T>& left, bitset_t<T> right)
+	{
+		return static_cast<raw_type>(atomic_storage<under>::xor_fetch(reinterpret_cast<under&>(left), right._value()));
+	}
+
+	static constexpr auto op_fetch = &op2;
+	static constexpr auto atomic_op = &op2;
+};
+
+template<typename T>
+struct atomic_test_and_set<bitset_t<T>, T, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+
+	static inline bool _op(bitset_t<T>& left, const T& value)
+	{
+		return atomic_storage<under>::bts(reinterpret_cast<under&>(left), static_cast<uint>(value));
+	}
+
+	static constexpr auto atomic_op = &_op;
+};
+
+template<typename T>
+struct atomic_test_and_reset<bitset_t<T>, T, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+
+	static inline bool _op(bitset_t<T>& left, const T& value)
+	{
+		return atomic_storage<under>::btr(reinterpret_cast<under&>(left), static_cast<uint>(value));
+	}
+
+	static constexpr auto atomic_op = &_op;
+};
+
+template<typename T>
+struct atomic_test_and_complement<bitset_t<T>, T, std::enable_if_t<std::is_enum<T>::value>>
+{
+	using under = typename bitset_t<T>::under;
+
+	static inline bool _op(bitset_t<T>& left, const T& value)
+	{
+		return atomic_storage<under>::btc(reinterpret_cast<under&>(left), static_cast<uint>(value));
+	}
+
+	static constexpr auto atomic_op = &_op;
+};
@@ -3,56 +3,54 @@

 #include "yaml-cpp/yaml.h"

-#include <typeinfo>
-
 namespace cfg
 {
-	logs::channel cfg("CFG");
+	logs::channel cfg("CFG", logs::level::notice);

-	_base::_base(type _type)
+	entry_base::entry_base(type _type)
 		: m_type(_type)
 	{
 		if (_type != type::node)
 		{
-			fmt::throw_exception<std::logic_error>("Invalid root node" HERE);
+			throw std::logic_error("Invalid root node");
 		}
 	}

-	_base::_base(type _type, node* owner, const std::string& name)
+	entry_base::entry_base(type _type, node& owner, const std::string& name)
 		: m_type(_type)
 	{
-		for (const auto& pair : owner->m_nodes)
+		if (!owner.m_nodes.emplace(name, this).second)
 		{
-			if (pair.first == name)
-			{
-				fmt::throw_exception<std::logic_error>("Node already exists: %s" HERE, name);
-			}
+			throw std::logic_error("Node already exists");
+		}
+	}
+
+	entry_base& entry_base::operator[](const std::string& name) const
+	{
+		if (m_type == type::node)
+		{
+			return *static_cast<const node&>(*this).m_nodes.at(name);
 		}

-		owner->m_nodes.emplace_back(name, this);
+		throw std::logic_error("Invalid node type");
 	}

-	bool _base::from_string(const std::string&)
+	entry_base& entry_base::operator[](const char* name) const
 	{
-		fmt::throw_exception<std::logic_error>("from_string() purecall" HERE);
-	}
+		if (m_type == type::node)
+		{
+			return *static_cast<const node&>(*this).m_nodes.at(name);
+		}

-	bool _base::from_list(std::vector<std::string>&&)
-	{
-		fmt::throw_exception<std::logic_error>("from_list() purecall" HERE);
+		throw std::logic_error("Invalid node type");
 	}

 	// Emit YAML
-	static void encode(YAML::Emitter& out, const class _base& rhs);
+	static void encode(YAML::Emitter& out, const class entry_base& rhs);

 	// Incrementally load config entries from YAML::Node.
 	// The config value is preserved if the corresponding YAML node doesn't exist.
-	static void decode(const YAML::Node& data, class _base& rhs);
-}
-
-std::vector<std::string> cfg::make_int_range(s64 min, s64 max)
-{
-	return {std::to_string(min), std::to_string(max)};
+	static void decode(const YAML::Node& data, class entry_base& rhs);
 }

 bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
@@ -87,81 +85,7 @@ bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
 	return true;
 }

-bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string& value)
-{
-	u64 max = -1;
-
-	for (u64 i = 0;; i++)
-	{
-		std::string var;
-		func(var, i);
-
-		if (var == value)
-		{
-			if (out) *out = i;
-			return true;
-		}
-
-		std::string hex;
-		fmt_class_string<u64>::format(hex, i);
-		if (var == hex)
-		{
-			break;
-		}
-
-		max = i;
-	}
-
-	try
-	{
-		std::size_t pos;
-		const auto val = std::stoull(value, &pos, 0);
-
-		if (pos != value.size())
-		{
-			if (out) cfg.error("cfg::try_to_enum_value('%s'): unexpected characters (pos=%zu)", value, pos);
-			return false;
-		}
-
-		if (val > max)
-		{
-			if (out) cfg.error("cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max);
-			return false;
-		}
-
-		if (out) *out = val;
-		return true;
-	}
-	catch (const std::exception& e)
-	{
-		if (out) cfg.error("cfg::try_to_enum_value('%s'): invalid enum value: %s", value, e.what());
-		return false;
-	}
-}
-
-std::vector<std::string> cfg::try_to_enum_list(decltype(&fmt_class_string<int>::format) func)
-{
-	std::vector<std::string> result;
-
-	for (u64 i = 0;; i++)
-	{
-		std::string var;
-		func(var, i);
-
-		std::string hex;
-		fmt_class_string<u64>::format(hex, i);
-		if (var == hex)
-		{
-			break;
-		}
-
-		result.emplace_back(std::move(var));
-	}
-
-	return result;
-}
-
-void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
+void cfg::encode(YAML::Emitter& out, const cfg::entry_base& rhs)
 {
 	switch (rhs.get_type())
 	{
@@ -171,8 +95,7 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		for (const auto& np : static_cast<const node&>(rhs).get_nodes())
 		{
 			out << YAML::Key << np.first;
-			out << YAML::Value;
-			encode(out, *np.second);
+			out << YAML::Value; encode(out, *np.second);
 		}

 		out << YAML::EndMap;
@@ -189,25 +112,12 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndSeq;
 		return;
 	}
-	case type::log:
-	{
-		out << YAML::BeginMap;
-		for (const auto& np : static_cast<const log_entry&>(rhs).get_map())
-		{
-			if (np.second == logs::level::notice) continue;
-			out << YAML::Key << np.first;
-			out << YAML::Value << fmt::format("%s", np.second);
-		}
-
-		out << YAML::EndMap;
-		return;
-	}
 	}

 	out << rhs.to_string();
 }

-void cfg::decode(const YAML::Node& data, cfg::_base& rhs)
+void cfg::decode(const YAML::Node& data, cfg::entry_base& rhs)
 {
 	switch (rhs.get_type())
 	{
@@ -223,12 +133,16 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs)
 			if (!pair.first.IsScalar()) continue;

 			// Find the key among existing nodes
-			for (const auto& _pair : static_cast<node&>(rhs).get_nodes())
+			const auto name = pair.first.Scalar();
+			const auto found = static_cast<node&>(rhs).get_nodes().find(name);
+
+			if (found != static_cast<node&>(rhs).get_nodes().cend())
 			{
-				if (_pair.first == pair.first.Scalar())
-				{
-					decode(pair.second, *_pair.second);
-				}
+				decode(pair.second, *found->second);
+			}
+			else
+			{
+				// ???
 			}
 		}

@@ -245,29 +159,6 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs)

 		break;
 	}
-	case type::log:
-	{
-		if (data.IsScalar() || data.IsSequence())
-		{
-			return; // ???
-		}
-
-		std::map<std::string, logs::level> values;
-
-		for (const auto& pair : data)
-		{
-			if (!pair.first.IsScalar() || !pair.second.IsScalar()) continue;
-
-			u64 value;
-			if (cfg::try_to_enum_value(&value, &fmt_class_string<logs::level>::format, pair.second.Scalar()))
-			{
-				values.emplace(pair.first.Scalar(), static_cast<logs::level>(static_cast<int>(value)));
-			}
-		}
-
-		static_cast<log_entry&>(rhs).set_map(std::move(values));
-		break;
-	}
 	default:
 	{
 		std::string value;
@@ -287,19 +178,14 @@ std::string cfg::node::to_string() const
 	YAML::Emitter out;
 	cfg::encode(out, *this);

-	return {out.c_str(), out.size()};
+	return{ out.c_str(), out.size() };
 }

-bool cfg::node::from_string(const std::string& value) try
+bool cfg::node::from_string(const std::string& value)
 {
 	cfg::decode(YAML::Load(value), *this);
 	return true;
 }
-catch (const std::exception& e)
-{
-	cfg.fatal("%s thrown: %s", typeid(e).name(), e.what());
-	return false;
-}

 void cfg::node::from_default()
 {
@@ -309,32 +195,9 @@ void cfg::node::from_default()
 	}
 }

-void cfg::_bool::from_default()
+cfg::root_node& cfg::get_root()
 {
-	m_value = def;
-}
-
-void cfg::string::from_default()
-{
-	m_value = def;
-}
-
-void cfg::set_entry::from_default()
-{
-	m_set = {};
-}
-
-void cfg::log_entry::set_map(std::map<std::string, logs::level>&& map)
-{
-	logs::reset();
-
-	for (auto&& pair : (m_map = std::move(map)))
-	{
-		logs::set_level(pair.first, pair.second);
-	}
-}
-
-void cfg::log_entry::from_default()
-{
-	set_map({});
+	// Magic static
+	static root_node root;
+	return root;
 }
@@ -1,60 +1,57 @@
 #pragma once

 #include "Utilities/types.h"
-#include "Utilities/StrFmt.h"
-#include "Utilities/Log.h"
+#include "Utilities/Atomic.h"

+#include <initializer_list>
+#include <exception>
 #include <utility>
 #include <string>
 #include <vector>
 #include <set>
+#include <unordered_map>
 #include <map>
+#include <mutex>

 namespace cfg
 {
-	// Format min and max values
-	std::vector<std::string> make_int_range(s64 min, s64 max);
-
 	// Convert string to signed integer
 	bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);

-	// Internal hack
-	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string&);
-
-	// Internal hack
-	std::vector<std::string> try_to_enum_list(decltype(&fmt_class_string<int>::format) func);
-
 	// Config tree entry type.
 	enum class type : uint
 	{
 		node = 0, // cfg::node type
-		_bool, // cfg::_bool type
-		_enum, // cfg::_enum type
-		_int, // cfg::_int type
-		string, // cfg::string type
+		boolean, // cfg::bool_entry type
+		fixed_map, // cfg::map_entry type
+		enumeration, // cfg::enum_entry type
+		integer, // cfg::int_entry type
+		string, // cfg::string_entry type
 		set, // cfg::set_entry type
-		log,
 	};

 	// Config tree entry abstract base class
-	class _base
+	class entry_base
 	{
 		const type m_type;

 	protected:
 		// Ownerless entry constructor
-		_base(type _type);
+		entry_base(type _type);

 		// Owned entry constructor
-		_base(type _type, class node* owner, const std::string& name);
+		entry_base(type _type, class node& owner, const std::string& name);

 	public:
 		// Disallow copy/move constructors and assignments
-		_base(const _base&) = delete;
+		entry_base(const entry_base&) = delete;

 		// Get type
 		type get_type() const { return m_type; }

+		// Access child node (must exist)
+		entry_base& operator [](const std::string& name) const; entry_base& operator [](const char* name) const;
+
 		// Reset defaults
 		virtual void from_default() = 0;

@@ -65,7 +62,10 @@ namespace cfg
 		}

 		// Try to convert from string (optional)
-		virtual bool from_string(const std::string&);
+		virtual bool from_string(const std::string&)
+		{
+			throw std::logic_error("from_string() not specified");
+		}

 		// Get string list (optional)
 		virtual std::vector<std::string> to_list() const
@@ -74,31 +74,34 @@ namespace cfg
 		}

 		// Set multiple values. Implementation-specific, optional.
-		virtual bool from_list(std::vector<std::string>&&);
+		virtual bool from_list(std::vector<std::string>&&)
+		{
+			throw std::logic_error("from_list() not specified");
+		}
 	};

 	// Config tree node which contains another nodes
-	class node : public _base
+	class node : public entry_base
 	{
-		std::vector<std::pair<std::string, _base*>> m_nodes;
+		std::map<std::string, entry_base*> m_nodes;

-		friend class _base;
+		friend class entry_base;

 	public:
 		// Root node constructor
 		node()
-			: _base(type::node)
+			: entry_base(type::node)
 		{
 		}

 		// Registered node constructor
-		node(node* owner, const std::string& name)
-			: _base(type::node, owner, name)
+		node(node& owner, const std::string& name)
+			: entry_base(type::node, owner, name)
 		{
 		}

 		// Get child nodes
-		const auto& get_nodes() const
+		const std::map<std::string, entry_base*>& get_nodes() const
 		{
 			return m_nodes;
 		}
@@ -113,38 +116,46 @@ namespace cfg
 		void from_default() override;
 	};

-	class _bool final : public _base
+	struct bool_entry final : public entry_base
 	{
-		bool m_value;
+		atomic_t<bool> value;

-	public:
 		const bool def;

-		_bool(node* owner, const std::string& name, bool def = false)
-			: _base(type::_bool, owner, name)
-			, m_value(def)
+		bool_entry(node& owner, const std::string& name, bool def = false)
+			: entry_base(type::boolean, owner, name)
+			, value(def)
 			, def(def)
 		{
 		}

 		explicit operator bool() const
 		{
-			return m_value;
+			return value.load();
 		}

-		void from_default() override;
+		bool_entry& operator =(bool value)
+		{
+			value = value;
+			return *this;
+		}
+
+		void from_default() override
+		{
+			value = def;
+		}

 		std::string to_string() const override
 		{
-			return m_value ? "true" : "false";
+			return value.load() ? "true" : "false";
 		}

 		bool from_string(const std::string& value) override
 		{
 			if (value == "false")
-				m_value = false;
+				this->value = false;
 			else if (value == "true")
-				m_value = true;
+				this->value = true;
 			else
 				return false;

@@ -152,17 +163,116 @@ namespace cfg
 		}
 	};

-	// Value node with fixed set of possible values, each maps to an enum value of type T.
-	template <typename T>
-	class _enum final : public _base
+	// Value node with fixed set of possible values, each maps to a value of type T.
+	template<typename T>
+	struct map_entry final : public entry_base
 	{
-		T m_value;
+		using init_type  = std::initializer_list<std::pair<std::string, T>>;
+		using map_type   = std::unordered_map<std::string, T>;
+		using list_type  = std::vector<std::string>;
+		using value_type = typename map_type::value_type;
+
+		static map_type make_map(init_type init)
+		{
+			map_type map(init.size());
+
+			for (const auto& v : init)
+			{
+				// Ensure elements are unique
+				VERIFY(map.emplace(v.first, v.second).second);
+			}
+
+			return map;
+		}
+
+		static list_type make_list(init_type init)
+		{
+			list_type list; list.reserve(init.size());
+
+			for (const auto& v : init)
+			{
+				list.emplace_back(v.first);
+			}
+
+			return list;
+		}
+
+	public:
+		const map_type map;
+		const list_type list; // Element list sorted in original order
+		const value_type& def; // Pointer to the default value
+
+	private:
+		atomic_t<const value_type*> m_value;
+
+	public:
+		map_entry(node& owner, const std::string& name, const std::string& def, init_type init)
+			: entry_base(type::fixed_map, owner, name)
+			, map(make_map(init))
+			, list(make_list(init))
+			, def(*map.find(def))
+			, m_value(&this->def)
+		{
+		}
+
+		map_entry(node& owner, const std::string& name, std::size_t def_index, init_type init)
+			: map_entry(owner, name, def_index < init.size() ? (init.begin() + def_index)->first : throw std::logic_error("Invalid default value index"), init)
+		{
+		}
+
+		map_entry(node& owner, const std::string& name, init_type init)
+			: map_entry(owner, name, 0, init)
+		{
+		}
+
+		const T& get() const
+		{
+			return m_value.load()->second;
+		}
+
+		void from_default() override
+		{
+			m_value = &def;
+		}
+
+		std::string to_string() const override
+		{
+			return m_value.load()->first;
+		}
+
+		bool from_string(const std::string& value) override
+		{
+			const auto found = map.find(value);
+
+			if (found == map.end())
+			{
+				return false;
+			}
+			else
+			{
+				m_value = &*found;
+				return true;
+			}
+		}
+
+		std::vector<std::string> to_list() const override
+		{
+			return list;
+		}
+	};
+
+	// Value node with fixed set of possible values, each maps to an enum value of type T.
+	template<typename T, bool External = false>
+	class enum_entry final : public entry_base
+	{
+		// Value or reference
+		std::conditional_t<External, atomic_t<T>&, atomic_t<T>> m_value;

 	public:
 		const T def;

-		_enum(node* owner, const std::string& name, T value = {})
-			: _base(type::_enum, owner, name)
+		enum_entry(node& owner, const std::string& name, std::conditional_t<External, atomic_t<T>&, T> value)
+			: entry_base(type::enumeration, owner, name)
 			, m_value(value)
 			, def(value)
 		{
@@ -170,7 +280,13 @@ namespace cfg

 		operator T() const
 		{
-			return m_value;
+			return m_value.load();
+		}
+
+		enum_entry& operator =(T value)
+		{
+			m_value = value;
+			return *this;
 		}

 		void from_default() override
@@ -180,20 +296,26 @@ namespace cfg

 		std::string to_string() const override
 		{
-			std::string result;
-			fmt_class_string<T>::format(result, fmt_unveil<T>::get(m_value));
-			return result; // TODO: ???
+			for (std::size_t i = 0; i < sizeof(bijective<T, const char*>::map) / sizeof(bijective_pair<T, const char*>); i++)
+			{
+				if (bijective<T, const char*>::map[i].v1 == m_value)
+				{
+					return bijective<T, const char*>::map[i].v2;
+				}
+			}
+
+			return{}; // TODO: ???
 		}

 		bool from_string(const std::string& value) override
 		{
-			u64 result;
-
-			if (try_to_enum_value(&result, &fmt_class_string<T>::format, value))
+			for (std::size_t i = 0; i < sizeof(bijective<T, const char*>::map) / sizeof(bijective_pair<T, const char*>); i++)
 			{
-				// No narrowing check, it's hard to do right there
-				m_value = static_cast<T>(static_cast<std::underlying_type_t<T>>(result));
-				return true;
+				if (bijective<T, const char*>::map[i].v2 == value)
+				{
+					m_value = bijective<T, const char*>::map[i].v1;
+					return true;
+				}
 			}

 			return false;
@@ -201,26 +323,33 @@ namespace cfg

 		std::vector<std::string> to_list() const override
 		{
-			return try_to_enum_list(&fmt_class_string<T>::format);
+			std::vector<std::string> result;
+
+			for (std::size_t i = 0; i < sizeof(bijective<T, const char*>::map) / sizeof(bijective_pair<T, const char*>); i++)
+			{
+				result.emplace_back(bijective<T, const char*>::map[i].v2);
+			}
+
+			return result;
 		}
 	};

 	// Signed 32/64-bit integer entry with custom Min/Max range.
-	template <s64 Min, s64 Max>
-	class _int final : public _base
+	template<s64 Min, s64 Max>
+	class int_entry final : public entry_base
 	{
-		static_assert(Min < Max, "Invalid cfg::_int range");
+		static_assert(Min < Max, "Invalid cfg::int_entry range");

 		// Prefer 32 bit type if possible
 		using int_type = std::conditional_t<Min >= INT32_MIN && Max <= INT32_MAX, s32, s64>;

-		int_type m_value;
+		atomic_t<int_type> m_value;

 	public:
 		const int_type def;

-		_int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)))
-			: _base(type::_int, owner, name)
+		int_entry(node& owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)))
+			: entry_base(type::integer, owner, name)
 			, m_value(def)
 			, def(def)
 		{
@@ -228,7 +357,18 @@ namespace cfg

 		operator int_type() const
 		{
-			return m_value;
+			return m_value.load();
+		}
+
+		int_entry& operator =(int_type value)
+		{
+			if (value < Min || value > Max)
+			{
+				throw fmt::exception("Value out of the valid range: %lld" HERE, s64{ value });
+			}
+
+			m_value = value;
+			return *this;
 		}

 		void from_default() override
@@ -238,7 +378,7 @@ namespace cfg

 		std::string to_string() const override
 		{
-			return std::to_string(m_value);
+			return std::to_string(m_value.load());
 		}

 		bool from_string(const std::string& value) override
@@ -252,29 +392,25 @@ namespace cfg

 			return false;
 		}
-
-		std::vector<std::string> to_list() const override
-		{
-			return make_int_range(Min, Max);
-		}
 	};

 	// Alias for 32 bit int
-	using int32 = _int<INT32_MIN, INT32_MAX>;
+	using int32_entry = int_entry<INT32_MIN, INT32_MAX>;

 	// Alias for 64 bit int
-	using int64 = _int<INT64_MIN, INT64_MAX>;
+	using int64_entry = int_entry<INT64_MIN, INT64_MAX>;

 	// Simple string entry with mutex
-	class string final : public _base
+	class string_entry final : public entry_base
 	{
+		mutable std::mutex m_mutex;
 		std::string m_value;

 	public:
 		const std::string def;

-		string(node* owner, const std::string& name, const std::string& def = {})
-			: _base(type::string, owner, name)
+		string_entry(node& owner, const std::string& name, const std::string& def = {})
+			: entry_base(type::string, owner, name)
 			, m_value(def)
 			, def(def)
 		{
@@ -282,87 +418,115 @@ namespace cfg

 		operator std::string() const
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
 			return m_value;
 		}

-		const std::string& get() const
+		std::string get() const
 		{
-			return m_value;
+			return *this;
+		}
+
+		string_entry& operator =(const std::string& value)
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_value = value;
+			return *this;
 		}

 		std::size_t size() const
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
 			return m_value.size();
 		}

-		void from_default() override;
+		void from_default() override
+		{
+			*this = def;
+		}

 		std::string to_string() const override
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
 			return m_value;
 		}

 		bool from_string(const std::string& value) override
 		{
-			m_value = value;
+			*this = value;
 			return true;
 		}
 	};

 	// Simple set entry with mutex (TODO: template for various types)
-	class set_entry final : public _base
+	class set_entry final : public entry_base
 	{
+		mutable std::mutex m_mutex;
+
 		std::set<std::string> m_set;

 	public:
 		// Default value is empty list in current implementation
-		set_entry(node* owner, const std::string& name)
-			: _base(type::set, owner, name)
+		set_entry(node& owner, const std::string& name)
+			: entry_base(type::set, owner, name)
 		{
 		}

 		std::set<std::string> get_set() const
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+
 			return m_set;
 		}

 		void set_set(std::set<std::string>&& set)
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
 			m_set = std::move(set);
 		}

-		void from_default() override;
+		void from_default() override
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_set = {};
+		}

 		std::vector<std::string> to_list() const override
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+
 			return{ m_set.begin(), m_set.end() };
 		}

 		bool from_list(std::vector<std::string>&& list) override
 		{
+			std::lock_guard<std::mutex> lock(m_mutex);
 			m_set = { std::make_move_iterator(list.begin()), std::make_move_iterator(list.end()) };

 			return true;
 		}
 	};

-	class log_entry final : public _base
+	// Root type with some predefined nodes. Don't change it, this is not mandatory for adding nodes.
+	struct root_node : node
 	{
-		std::map<std::string, logs::level> m_map;
-
-	public:
-		log_entry(node* owner, const std::string& name)
-			: _base(type::log, owner, name)
-		{
-		}
-
-		std::map<std::string, logs::level> get_map() const
-		{
-			return m_map;
-		}
-
-		void set_map(std::map<std::string, logs::level>&& map);
-
-		void from_default() override;
+		node core  { *this, "Core" };
+		node vfs   { *this, "VFS" };
+		node log   { *this, "Log" };
+		node video { *this, "Video" };
+		node audio { *this, "Audio" };
+		node io    { *this, "Input/Output" };
+		node sys   { *this, "System" };
+		node net   { *this, "Net" };
+		node misc  { *this, "Miscellaneous" };
 	};
+
+	// Get global configuration root instance
+	extern root_node& get_root();
+
+	// Global configuration root instance (cached reference)
+	static root_node& root = get_root();
 }
+
+// Registered log channel
+#define LOG_CHANNEL(name) extern logs::channel name; namespace logs { static cfg::enum_entry<logs::level, true> name(cfg::root.log, #name, ::name.enabled); }
@@ -1,23 +1,17 @@
 #pragma once

-#include "types.h"
-#include "bit_set.h"
-
 #include <memory>
 #include <string>
 #include <vector>
-#include <algorithm>
+#include <type_traits>
+
+#include "types.h"
+#include "BitSet.h"

 namespace fs
 {
-#ifdef _WIN32
-	using native_handle = void*;
-#else
-	using native_handle = int;
-#endif
-
 	// File open mode flags
-	enum class open_mode : u32
+	enum struct open_mode : u32
 	{
 		read,
 		write,
@@ -25,20 +19,16 @@ namespace fs
 		create,
 		trunc,
 		excl,
-		unshare,
-
-		__bitset_enum_max
 	};

-	constexpr auto read    = +open_mode::read; // Enable reading
-	constexpr auto write   = +open_mode::write; // Enable writing
-	constexpr auto append  = +open_mode::append; // Always append to the end of the file
-	constexpr auto create  = +open_mode::create; // Create file if it doesn't exist
-	constexpr auto trunc   = +open_mode::trunc; // Clear opened file if it's not empty
-	constexpr auto excl    = +open_mode::excl; // Failure if the file already exists (used with `create`)
-	constexpr auto unshare = +open_mode::unshare; // Prevent opening the file twice
+	constexpr bitset_t<open_mode> read    = open_mode::read; // Enable reading
+	constexpr bitset_t<open_mode> write   = open_mode::write; // Enable writing
+	constexpr bitset_t<open_mode> append  = open_mode::append; // Always append to the end of the file
+	constexpr bitset_t<open_mode> create  = open_mode::create; // Create file if it doesn't exist
+	constexpr bitset_t<open_mode> trunc   = open_mode::trunc; // Clear opened file if it's not empty
+	constexpr bitset_t<open_mode> excl    = open_mode::excl; // Failure if the file already exists (used with `create`)

-	constexpr auto rewrite = open_mode::write + open_mode::create + open_mode::trunc;
+	constexpr bitset_t<open_mode> rewrite = write + create + trunc;

 	// File seek mode
 	enum class seek_mode : u32
@@ -63,19 +53,12 @@ namespace fs
 		s64 ctime;
 	};

-	// Native handle getter
-	struct get_native_handle
-	{
-		virtual native_handle get() = 0;
-	};
-
 	// File handle base
 	struct file_base
 	{
-		virtual ~file_base();
+		virtual ~file_base() = default;

-		virtual stat_t stat();
-		virtual void sync();
+		virtual stat_t stat() = 0;
 		virtual bool trunc(u64 length) = 0;
 		virtual u64 read(void* buffer, u64 size) = 0;
 		virtual u64 write(const void* buffer, u64 size) = 0;
@@ -92,36 +75,25 @@ namespace fs
 	// Directory handle base
 	struct dir_base
 	{
-		virtual ~dir_base();
+		virtual ~dir_base() = default;

 		virtual bool read(dir_entry&) = 0;
 		virtual void rewind() = 0;
 	};

-	// Device information
-	struct device_stat
-	{
-		u64 block_size;
-		u64 total_size;
-		u64 total_free; // Total size of free space
-		u64 avail_free; // Free space available to unprivileged user
-	};
-
 	// Virtual device
 	struct device_base
 	{
-		virtual ~device_base();
+		virtual ~device_base() = default;

 		virtual bool stat(const std::string& path, stat_t& info) = 0;
-		virtual bool statfs(const std::string& path, device_stat& info) = 0;
 		virtual bool remove_dir(const std::string& path) = 0;
 		virtual bool create_dir(const std::string& path) = 0;
 		virtual bool rename(const std::string& from, const std::string& to) = 0;
 		virtual bool remove(const std::string& path) = 0;
 		virtual bool trunc(const std::string& path, u64 length) = 0;
-		virtual bool utime(const std::string& path, s64 atime, s64 mtime) = 0;

-		virtual std::unique_ptr<file_base> open(const std::string& path, bs_t<open_mode> mode) = 0;
+		virtual std::unique_ptr<file_base> open(const std::string& path, bitset_t<open_mode> mode) = 0;
 		virtual std::unique_ptr<dir_base> open_dir(const std::string& path) = 0;
 	};

@@ -146,9 +118,6 @@ namespace fs
 	// Check whether the directory exists and is NOT a file
 	bool is_dir(const std::string& path);

-	// Get filesystem information
-	bool statfs(const std::string& path, device_stat& info);
-
 	// Delete empty directory
 	bool remove_dir(const std::string& path);

@@ -159,7 +128,7 @@ namespace fs
 	bool create_path(const std::string& path);

 	// Rename (move) file or directory
-	bool rename(const std::string& from, const std::string& to, bool overwrite);
+	bool rename(const std::string& from, const std::string& to);

 	// Copy file contents
 	bool copy_file(const std::string& from, const std::string& to, bool overwrite);
@@ -170,9 +139,6 @@ namespace fs
 	// Change file size (possibly appending zeros)
 	bool truncate_file(const std::string& path, u64 length);

-	// Set file access/modification time
-	bool utime(const std::string& path, s64 atime, s64 mtime);
-
 	class file final
 	{
 		std::unique_ptr<file_base> m_file;
@@ -185,19 +151,17 @@ namespace fs
 		file() = default;

 		// Open file with specified mode
-		explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read);		
+		explicit file(const std::string& path, bitset_t<open_mode> mode = ::fs::read)
+		{
+			open(path, mode);
+		}
+
+		// Open file with specified mode
+		bool open(const std::string& path, bitset_t<open_mode> mode = ::fs::read);

 		// Open memory for read
 		explicit file(const void* ptr, std::size_t size);

-		// Open file with specified args (forward to constructor)
-		template <typename... Args>
-		bool open(Args&&... args)
-		{
-			*this = fs::file(std::forward<Args>(args)...);
-			return m_file.operator bool();
-		}
-
 		// Check whether the handle is valid (opened file)
 		explicit operator bool() const
 		{
@@ -234,13 +198,6 @@ namespace fs
 			return m_file->stat();
 		}

-		// Sync file buffers
-		void sync() const
-		{
-			if (!m_file) xnull();
-			return m_file->sync();
-		}
-
 		// Read the data from the file and return the amount of data written in buffer
 		u64 read(void* buffer, u64 count) const
 		{
@@ -361,9 +318,6 @@ namespace fs
 			if (seek(0), !read(result)) xfail();
 			return result;
 		}
-
-		// Get native handle if available
-		native_handle get_handle() const;
 	};

 	class dir final
@@ -482,11 +436,8 @@ namespace fs
 	// Get configuration directory
 	const std::string& get_config_dir();

-	// Get data/cache directory for specified prefix and suffix
-	std::string get_data_dir(const std::string& prefix, const std::string& location, const std::string& suffix);
-
-	// Get data/cache directory for specified prefix and path (suffix will be filename)
-	std::string get_data_dir(const std::string& prefix, const std::string& path);
+	// Get executable directory
+	const std::string& get_executable_dir();

 	// Delete directory and all its contents recursively
 	void remove_all(const std::string& path, bool remove_root = true);
@@ -501,126 +452,8 @@ namespace fs
 		inval,
 		noent,
 		exist,
-		acces,
-		notempty,
 	};

 	// Error code returned
 	extern thread_local error g_tls_error;
-
-	template <typename T>
-	struct container_stream final : file_base
-	{
-		// T can be a reference, but this is not recommended
-		using value_type = typename std::remove_reference_t<T>::value_type;
-
-		T obj;
-		u64 pos;
-
-		container_stream(T&& obj)
-			: obj(std::forward<T>(obj))
-			, pos(0)
-		{
-		}
-
-		~container_stream() override
-		{
-		}
-
-		bool trunc(u64 length) override
-		{
-			obj.resize(length);
-			return true;
-		}
-
-		u64 read(void* buffer, u64 size) override
-		{
-			const u64 end = obj.size();
-
-			if (pos < end)
-			{
-				// Get readable size
-				if (const u64 max = std::min<u64>(size, end - pos))
-				{
-					std::copy(obj.cbegin() + pos, obj.cbegin() + pos + max, static_cast<value_type*>(buffer));
-					pos = pos + max;
-					return max;
-				}
-			}
-
-			return 0;
-		}
-
-		u64 write(const void* buffer, u64 size) override
-		{
-			const u64 old_size = obj.size();
-
-			if (old_size + size < old_size)
-			{
-				fmt::raw_error("fs::container_stream<>::write(): overflow");
-			}
-
-			if (pos > old_size)
-			{
-				// Fill gap if necessary (default-initialized)
-				obj.resize(pos);
-			}
-
-			const auto src = static_cast<const value_type*>(buffer);
-
-			// Overwrite existing part
-			const u64 overlap = std::min<u64>(obj.size() - pos, size);
-			std::copy(src, src + overlap, obj.begin() + pos);
-
-			// Append new data
-			obj.insert(obj.end(), src + overlap, src + size);
-			pos += size;
-
-			return size;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			const s64 new_pos =
-				whence == fs::seek_set ? offset :
-				whence == fs::seek_cur ? offset + pos :
-				whence == fs::seek_end ? offset + size() :
-				(fmt::raw_error("fs::container_stream<>::seek(): invalid whence"), 0);
-
-			if (new_pos < 0)
-			{
-				fs::g_tls_error = fs::error::inval;
-				return -1;
-			}
-
-			pos = new_pos;
-			return pos;
-		}
-
-		u64 size() override
-		{
-			return obj.size();
-		}
-	};
-
-	template <typename T>
-	file make_stream(T&& container = T{})
-	{
-		file result;
-		result.reset(std::make_unique<container_stream<T>>(std::forward<T>(container)));
-		return result;
-	}
-
-	template <typename... Args>
-	bool write_file(const std::string& path, bs_t<fs::open_mode> mode, const Args&... args)
-	{
-		if (fs::file f{path, mode})
-		{
-			// Write args sequentially
-			int seq[]{ (f.write(args), 0)... };
-			return true;
-		}
-
-		return false;
-	}
 }
@@ -1,817 +0,0 @@
-#include "stdafx.h"
-#ifdef WITH_GDB_DEBUGGER
-
-#include "GDBDebugServer.h"
-#include "Log.h"
-#include <algorithm>
-#include "Emu/Memory/Memory.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/RawSPUThread.h"
-#include "Emu/Cell/SPUThread.h"
-
-#ifndef _WIN32
-#include"fcntl.h"
-#endif
-
-extern void ppu_set_breakpoint(u32 addr);
-extern void ppu_remove_breakpoint(u32 addr);
-
-logs::channel gdbDebugServer("gdbDebugServer");
-
-int sock_init(void)
-{
-#ifdef _WIN32
-	WSADATA wsa_data;
-	return WSAStartup(MAKEWORD(1, 1), &wsa_data);
-#else
-	return 0;
-#endif
-}
-
-int sock_quit(void)
-{
-#ifdef _WIN32
-	return WSACleanup();
-#else
-	return 0;
-#endif
-}
-
-#ifndef _WIN32
-int closesocket(socket_t s) {
-	return close(s);
-}
-const int SOCKET_ERROR = -1;
-const socket_t INVALID_SOCKET = -1;
-#define sscanf_s sscanf
-#define HEX_U32 "x"
-#define HEX_U64 "lx"
-#else
-#define HEX_U32 "lx"
-#define HEX_U64 "llx"
-#endif
-
-bool check_errno_again() {
-#ifdef _WIN32
-	int err = GetLastError();
-	return (err == WSAEWOULDBLOCK);
-#else
-	int err = errno;
-	return (err == EAGAIN) || (err == EWOULDBLOCK);
-#endif
-}
-
-std::string u32_to_hex(u32 i) {
-	return fmt::format("%" HEX_U32, i);
-}
-
-std::string u64_to_padded_hex(u64 value) {
-	return fmt::format("%.16" HEX_U64, value);
-}
-
-std::string u32_to_padded_hex(u32 value) {
-	return fmt::format("%.8" HEX_U32, value);
-}
-
-u8 hex_to_u8(std::string val) {
-	u8 result;
-	sscanf_s(val.c_str(), "%02hhX", &result);
-	return result;
-}
-
-u32 hex_to_u32(std::string val) {
-	u32 result;
-	sscanf_s(val.c_str(), "%" HEX_U32, &result);
-	return result;
-}
-
-u64 hex_to_u64(std::string val) {
-	u64 result;
-	sscanf_s(val.c_str(), "%" HEX_U64, &result);
-	return result;
-}
-
-void GDBDebugServer::start_server()
-{
-	server_socket = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (server_socket == INVALID_SOCKET) {
-		gdbDebugServer.error("Error creating server socket");
-		return;
-	}
-
-#ifdef WIN32
-	{
-		int mode = 1;
-		ioctlsocket(server_socket, FIONBIO, (u_long FAR *)&mode);
-	}
-#else
-	fcntl(server_socket, F_SETFL, fcntl(server_socket, F_GETFL) | O_NONBLOCK);
-#endif
-
-	int err;
-
-	sockaddr_in server_saddr;
-	server_saddr.sin_family = AF_INET;
-	int port = g_cfg.misc.gdb_server_port;
-	server_saddr.sin_port = htons(port);
-	server_saddr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-	err = bind(server_socket, (struct sockaddr *) &server_saddr, sizeof(server_saddr));
-	if (err == SOCKET_ERROR) {
-		gdbDebugServer.error("Error binding to port %d", port);
-		return;
-	}
-
-	err = listen(server_socket, 1);
-	if (err == SOCKET_ERROR) {
-		gdbDebugServer.error("Error listening on port %d", port);
-		return;
-	}
-
-	gdbDebugServer.success("GDB Debug Server listening on port %d", port);
-}
-
-int GDBDebugServer::read(void * buf, int cnt)
-{
-	while (!stop) {
-		int result = recv(client_socket, reinterpret_cast<char*>(buf), cnt, 0);
-
-		if (result == SOCKET_ERROR) {
-			if (check_errno_again()) {
-				thread_ctrl::wait_for(50);
-				continue;
-			}
-
-			gdbDebugServer.error("Error during socket read");
-			fmt::throw_exception("Error during socket read" HERE);
-		}
-		return result;
-	}
-	return 0;
-}
-
-char GDBDebugServer::read_char()
-{
-	char result;
-	int cnt = read(&result, 1);
-	if (!cnt) {
-		fmt::throw_exception("Tried to read char, but no data was available" HERE);
-	}
-	return result;
-}
-
-u8 GDBDebugServer::read_hexbyte()
-{
-	char buf[2];
-	read(buf, 2);
-	return static_cast<u8>(strtol(buf, nullptr, 16));
-}
-
-void GDBDebugServer::try_read_cmd(gdb_cmd & out_cmd)
-{
-	char c = read_char();
-	//interrupt
-	if (UNLIKELY(c == 0x03)) {
-		out_cmd.cmd = "\0x03";
-		out_cmd.data = "";
-		out_cmd.checksum = 0;
-		return;
-	}
-	if (UNLIKELY(c != '$')) {
-		//gdb starts conversation with + for some reason
-		if (c == '+') {
-			c = read_char();
-		}
-		if (c != '$') {
-			fmt::throw_exception("Expected start of packet character '$', got '%c' instead" HERE, c);
-		}
-	}
-	//clear packet data
-	out_cmd.cmd = "";
-	out_cmd.data = "";
-	out_cmd.checksum = 0;
-	bool cmd_part = true;
-	u8 checksum = 0;
-	while(true) {
-		c = read_char();
-		if (c == '#') {
-			break;
-		}
-		checksum = (checksum + reinterpret_cast<u8&>(c)) % 256;
-		//escaped char
-		if (c == '}') {
-			c = read_char() ^ 0x20;
-			checksum = (checksum + reinterpret_cast<u8&>(c)) % 256;
-		}
-		//cmd-data splitters
-		if (cmd_part && ((c == ':') || (c == '.') || (c == ';'))) {
-			cmd_part = false;
-		}
-		if (cmd_part) {
-			out_cmd.cmd += c;
-			//only q and v commands can have multi-char command
-			if ((out_cmd.cmd.length() == 1) && (c != 'q') && (c != 'v')) {
-				cmd_part = false;
-			}
-		} else {
-			out_cmd.data += c;
-		}
-	}
-	out_cmd.checksum = read_hexbyte();
-	if (out_cmd.checksum != checksum) {
-		throw new wrong_checksum_exception("Wrong checksum for packet" HERE);
-	}
-}
-
-bool GDBDebugServer::read_cmd(gdb_cmd & out_cmd)
-{
-	while (true) {
-		try {
-			try_read_cmd(out_cmd);
-			ack(true);
-			return true;
-		}
-		catch (wrong_checksum_exception) {
-			ack(false);
-		}
-		catch (std::runtime_error e) {
-			gdbDebugServer.error(e.what());
-			return false;
-		}
-	}
-}
-
-void GDBDebugServer::send(const char * buf, int cnt)
-{
-	gdbDebugServer.trace("Sending %s (%d bytes)", buf, cnt);
-	while (!stop) {
-		int res = ::send(client_socket, buf, cnt, 0);
-		if (res == SOCKET_ERROR) {
-			if (check_errno_again()) {
-				thread_ctrl::wait_for(50);
-				continue;
-			}
-			gdbDebugServer.error("Failed sending %d bytes", cnt);
-			return;
-		}
-		return;
-	}
-}
-
-void GDBDebugServer::send_char(char c)
-{
-	send(&c, 1);
-}
-
-void GDBDebugServer::ack(bool accepted)
-{
-	send_char(accepted ? '+' : '-');
-}
-
-void GDBDebugServer::send_cmd(const std::string & cmd)
-{
-	u8 checksum = 0;
-	std::string buf;
-	buf.reserve(cmd.length() + 4);
-	buf += "$";
-	for (int i = 0; i < cmd.length(); ++i) {
-		checksum = (checksum + append_encoded_char(cmd[i], buf)) % 256;
-	}
-	buf += "#";
-	buf += to_hexbyte(checksum);
-	send(buf.c_str(), static_cast<int>(buf.length()));
-}
-
-bool GDBDebugServer::send_cmd_ack(const std::string & cmd)
-{
-	while (true) {
-		send_cmd(cmd);
-		char c = read_char();
-		if (LIKELY(c == '+')) {
-			return true;
-		}
-		if (UNLIKELY(c != '-')) {
-			gdbDebugServer.error("Wrong acknowledge character received %c", c);
-			return false;
-		}
-		gdbDebugServer.warning("Client rejected our cmd");
-	}
-}
-
-u8 GDBDebugServer::append_encoded_char(char c, std::string & str)
-{
-	u8 checksum = 0;
-	if (UNLIKELY((c == '#') || (c == '$') || (c == '}'))) {
-		str += '}';
-		c ^= 0x20;
-		checksum = '}';
-	}
-	checksum = (checksum + reinterpret_cast<u8&>(c)) % 256;
-	str += c;
-	return checksum;
-}
-
-std::string GDBDebugServer::to_hexbyte(u8 i)
-{
-	std::string result = "00";
-	u8 i1 = i & 0xF;
-	u8 i2 = i >> 4;
-	result[0] = i2 > 9 ? 'a' + i2 - 10 : '0' + i2;
-	result[1] = i1 > 9 ? 'a' + i1 - 10 : '0' + i1;
-	return result;
-}
-
-bool GDBDebugServer::select_thread(u64 id)
-{
-	//in case we have none at all
-	selected_thread.reset();
-	const auto on_select = [&](u32, cpu_thread& cpu)
-	{
-		return (id == ALL_THREADS) || (id == ANY_THREAD) || (cpu.id == id);
-	};
-	if (auto ppu = idm::select<ppu_thread>(on_select)) {
-		selected_thread = ppu.ptr;
-		return true;
-	}
-	return false;
-}
-
-std::string GDBDebugServer::get_reg(std::shared_ptr<ppu_thread> thread, u32 rid)
-{
-	std::string result;
-	//ids from gdb/features/rs6000/powerpc-64.c
-	//pc
-	switch (rid) {
-	case 64:
-		return u64_to_padded_hex(thread->cia);
-	//msr?
-	case 65:
-		return std::string(16, 'x');
-	case 66:
-		return u32_to_padded_hex(thread->cr_pack());
-	case 67:
-		return u64_to_padded_hex(thread->lr);
-	case 68:
-		return u64_to_padded_hex(thread->ctr);
-	//xer
-	case 69:
-		return std::string(8, 'x');
-	//fpscr
-	case 70:
-		return std::string(8, 'x');
-	default:
-		if (rid > 70) return "";
-		return (rid > 31) 
-			? u64_to_padded_hex(reinterpret_cast<u64&>(thread->fpr[rid - 32])) //fpr
-			: u64_to_padded_hex(thread->gpr[rid]); //gpr
-	}
-}
-
-bool GDBDebugServer::set_reg(std::shared_ptr<ppu_thread> thread, u32 rid, std::string value)
-{
-	switch (rid) {
-	case 64:
-		thread->cia = static_cast<u32>(hex_to_u64(value));
-		return true;
-		//msr?
-	case 65:
-		return true;
-	case 66:
-		thread->cr_unpack(hex_to_u32(value));
-		return true;
-	case 67:
-		thread->lr = hex_to_u64(value);
-		return true;
-	case 68:
-		thread->ctr = hex_to_u64(value);
-		return true;
-		//xer
-	case 69:
-		return true;
-		//fpscr
-	case 70:
-		return true;
-	default:
-		if (rid > 70) return false;
-		if (rid > 31) {
-			u64 val = hex_to_u64(value);
-			thread->fpr[rid - 32] = reinterpret_cast<f64&>(val);
-		} else {
-			thread->gpr[rid] = hex_to_u64(value);
-		}
-		return true;
-	}
-}
-
-u32 GDBDebugServer::get_reg_size(std::shared_ptr<ppu_thread> thread, u32 rid)
-{
-	switch (rid) {
-	case 66:
-	case 69:
-	case 70:
-		return 4;
-	default:
-		if (rid > 70) {
-			return 0;
-		}
-		return 8;
-	}
-}
-
-bool GDBDebugServer::send_reason()
-{
-	return send_cmd_ack("S05");
-}
-
-bool GDBDebugServer::cmd_extended_mode(gdb_cmd & cmd)
-{
-	return send_cmd_ack("OK");
-}
-
-bool GDBDebugServer::cmd_reason(gdb_cmd & cmd)
-{
-	return send_reason();
-}
-
-bool GDBDebugServer::cmd_supported(gdb_cmd & cmd)
-{
-	return send_cmd_ack("PacketSize=1200");
-}
-
-bool GDBDebugServer::cmd_thread_info(gdb_cmd & cmd)
-{
-	std::string result = "";
-	const auto on_select = [&](u32, cpu_thread& cpu)
-	{
-		if (result.length()) {
-			result += ",";
-		}
-		result += u64_to_padded_hex(static_cast<u64>(cpu.id));
-	};
-	idm::select<ppu_thread>(on_select);
-	idm::select<ARMv7Thread>(on_select);
-	idm::select<RawSPUThread>(on_select);
-	idm::select<SPUThread>(on_select);
-
-	//todo: this may exceed max command length
-	result = "m" + result + "l";
-	
-	return send_cmd_ack(result);;
-}
-
-bool GDBDebugServer::cmd_current_thread(gdb_cmd & cmd)
-{
-	return send_cmd_ack(selected_thread.expired() ? "" : u64_to_padded_hex(selected_thread.lock()->id));
-}
-
-bool GDBDebugServer::cmd_read_register(gdb_cmd & cmd)
-{
-	select_thread(general_ops_thread_id);
-	auto th = selected_thread.lock();
-	if (th->id_type() == 1) {
-		auto ppu = std::static_pointer_cast<ppu_thread>(th);
-		u32 rid = hex_to_u32(cmd.data);
-		std::string result = get_reg(ppu, rid);
-		if (!result.length()) {
-			gdbDebugServer.warning("Wrong register id %d", rid);
-			return send_cmd_ack("E01");
-		}
-		return send_cmd_ack(result);
-	}
-	gdbDebugServer.warning("Unimplemented thread type %d", th->id_type());
-	return send_cmd_ack("");
-}
-
-bool GDBDebugServer::cmd_write_register(gdb_cmd & cmd)
-{
-	select_thread(general_ops_thread_id);
-	auto th = selected_thread.lock();
-	if (th->id_type() == 1) {
-		auto ppu = std::static_pointer_cast<ppu_thread>(th);
-		size_t eq_pos = cmd.data.find('=');
-		if (eq_pos == std::string::npos) {
-			gdbDebugServer.warning("Wrong write_register cmd data %s", cmd.data.c_str());
-			return send_cmd_ack("E02");
-		}
-		u32 rid = hex_to_u32(cmd.data.substr(0, eq_pos));
-		std::string value = cmd.data.substr(eq_pos + 1);
-		if (!set_reg(ppu, rid, value)) {
-			gdbDebugServer.warning("Wrong register id %d", rid);
-			return send_cmd_ack("E01");
-		}
-		return send_cmd_ack("OK");
-	}
-	gdbDebugServer.warning("Unimplemented thread type %d", th->id_type());
-	return send_cmd_ack("");
-}
-
-bool GDBDebugServer::cmd_read_memory(gdb_cmd & cmd)
-{
-	size_t s = cmd.data.find(',');
-	u32 addr = hex_to_u32(cmd.data.substr(0, s));
-	u32 len = hex_to_u32(cmd.data.substr(s + 1));
-	std::string result;
-	result.reserve(len * 2);
-	for (u32 i = 0; i < len; ++i) {
-		if (vm::check_addr(addr + i)) {
-			result += to_hexbyte(vm::read8(addr + i));
-		} else {
-			break;
-			//result += "xx";
-		}
-	}
-	if (len && !result.length()) {
-		//nothing read
-		return send_cmd_ack("E01");
-	}
-	return send_cmd_ack(result);
-}
-
-bool GDBDebugServer::cmd_write_memory(gdb_cmd & cmd)
-{
-	size_t s = cmd.data.find(',');
-	size_t s2 = cmd.data.find(':');
-	if ((s == std::string::npos) || (s2 == std::string::npos)) {
-		gdbDebugServer.warning("Malformed write memory request received: %s", cmd.data.c_str());
-		return send_cmd_ack("E01");
-	}
-	u32 addr = hex_to_u32(cmd.data.substr(0, s));
-	u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1));
-	const char* data_ptr = (cmd.data.c_str()) + s2 + 1;
-	for (u32 i = 0; i < len; ++i) {
-		if (vm::check_addr(addr + i)) {
-			u8 val;
-			int res = sscanf_s(data_ptr, "%02hhX", &val);
-			if (!res) {
-				gdbDebugServer.warning("Couldn't read u8 from string %s", data_ptr);
-				return send_cmd_ack("E02");
-			}
-			data_ptr += 2;
-			vm::write8(addr + i, val);
-		} else {
-			return send_cmd_ack("E03");
-		}
-	}
-	return send_cmd_ack("OK");
-}
-
-bool GDBDebugServer::cmd_read_all_registers(gdb_cmd & cmd)
-{
-	std::string result;
-	select_thread(general_ops_thread_id);
-
-	auto th = selected_thread.lock();
-	if (th->id_type() == 1) {
-		auto ppu = std::static_pointer_cast<ppu_thread>(th);
-		//68 64-bit registers, and 3 32-bit
-		result.reserve(68*16 + 3*8);
-		for (int i = 0; i < 71; ++i) {
-			result += get_reg(ppu, i);
-		}
-		return send_cmd_ack(result);
-	}
-	gdbDebugServer.warning("Unimplemented thread type %d", th->id_type());
-	return send_cmd_ack("");
-}
-
-bool GDBDebugServer::cmd_write_all_registers(gdb_cmd & cmd)
-{
-	select_thread(general_ops_thread_id);
-	auto th = selected_thread.lock();
-	if (th->id_type() == 1) {
-		auto ppu = std::static_pointer_cast<ppu_thread>(th);
-		int ptr = 0;
-		for (int i = 0; i < 71; ++i) {
-			int sz = get_reg_size(ppu, i);
-			set_reg(ppu, i, cmd.data.substr(ptr, sz * 2));
-			ptr += sz * 2;
-		}
-		return send_cmd_ack("OK");
-	}
-	gdbDebugServer.warning("Unimplemented thread type %d", th->id_type());
-	return send_cmd_ack("E01");
-}
-
-bool GDBDebugServer::cmd_set_thread_ops(gdb_cmd & cmd)
-{
-	char type = cmd.data[0];
-	std::string thread = cmd.data.substr(1);
-	u64 id = thread == "-1" ? ALL_THREADS : hex_to_u64(thread);
-	if (type == 'c') {
-		continue_ops_thread_id = id;
-	} else {
-		general_ops_thread_id = id;
-	}
-	if (select_thread(id)) {
-		return send_cmd_ack("OK");
-	}
-	gdbDebugServer.warning("Client asked to use thread %llx for %s, but no matching thread was found", id, type == 'c' ? "continue ops" : "general ops");
-	return send_cmd_ack("E01");
-}
-
-bool GDBDebugServer::cmd_attached_to_what(gdb_cmd & cmd)
-{
-	//creating processes from client is not available yet
-	return send_cmd_ack("1");
-}
-
-bool GDBDebugServer::cmd_kill(gdb_cmd & cmd)
-{
-	Emu.Stop();
-	return true;
-}
-
-bool GDBDebugServer::cmd_continue_support(gdb_cmd & cmd)
-{
-	return send_cmd_ack("vCont;c;s;C;S");
-}
-
-bool GDBDebugServer::cmd_vcont(gdb_cmd & cmd)
-{
-	//todo: handle multiple actions and thread ids
-	this->from_breakpoint = false;
-	if (cmd.data[1] == 'c') {
-		select_thread(continue_ops_thread_id);
-		auto ppu = std::static_pointer_cast<ppu_thread>(selected_thread.lock());
-		ppu->state -= cpu_flag::dbg_pause;
-		if (Emu.IsPaused()) {
-			Emu.Resume();
-		}
-		thread_ctrl::wait();
-		//we are in all-stop mode
-		Emu.Pause();
-		return send_reason();
-	} else if (cmd.data[1] == 's') {
-		select_thread(continue_ops_thread_id);
-		auto ppu = std::static_pointer_cast<ppu_thread>(selected_thread.lock());
-		ppu->state += cpu_flag::dbg_step;
-		ppu->state -= cpu_flag::dbg_pause;
-		if (Emu.IsPaused()) {
-			Emu.Resume();
-		} else {
-			ppu->notify();
-		}
-		thread_ctrl::wait();
-		//we are in all-stop mode
-		Emu.Pause();
-		return send_reason();
-	}
-	return send_cmd_ack("");
-}
-
-static const u32 INVALID_PTR = 0xffffffff;
-
-bool GDBDebugServer::cmd_set_breakpoint(gdb_cmd & cmd)
-{
-	char type = cmd.data[0];
-	//software breakpoint
-	if (type == '0') {
-		u32 addr = INVALID_PTR;
-		if (cmd.data.find(';') != std::string::npos) {
-			gdbDebugServer.warning("Received request to set breakpoint with condition, but they are not supported");
-			return send_cmd_ack("E01");
-		}
-		sscanf_s(cmd.data.c_str(), "0,%x", &addr);
-		if (addr == INVALID_PTR) {
-			gdbDebugServer.warning("Can't parse breakpoint request, data: %s", cmd.data.c_str());
-			return send_cmd_ack("E02");
-		}
-		ppu_set_breakpoint(addr);
-		return send_cmd_ack("OK");
-	}
-	//other breakpoint types are not supported
-	return send_cmd_ack("");
-}
-
-bool GDBDebugServer::cmd_remove_breakpoint(gdb_cmd & cmd)
-{
-	char type = cmd.data[0];
-	//software breakpoint
-	if (type == '0') {
-		u32 addr = INVALID_PTR;
-		sscanf_s(cmd.data.c_str(), "0,%x", &addr);
-		if (addr == INVALID_PTR) {
-			gdbDebugServer.warning("Can't parse breakpoint remove request, data: %s", cmd.data.c_str());
-			return send_cmd_ack("E01");
-		}
-		ppu_remove_breakpoint(addr);
-		return send_cmd_ack("OK");
-	}
-	//other breakpoint types are not supported
-	return send_cmd_ack("");
-
-}
-
-#define PROCESS_CMD(cmds,handler) if (cmd.cmd == cmds) { if (!handler(cmd)) break; else continue; }
-
-void GDBDebugServer::on_task()
-{
-	sock_init();
-
-	start_server();
-
-	while (!stop) {
-		sockaddr_in client;
-		socklen_t client_len = sizeof(client);
-		client_socket = accept(server_socket, (struct sockaddr *) &client, &client_len);
-
-		if (client_socket == INVALID_SOCKET) {
-			if (check_errno_again()) {
-				thread_ctrl::wait_for(50);
-				continue;
-			}
-
-			gdbDebugServer.error("Could not establish new connection\n");
-			return;
-		}
-		//stop immediately
-		Emu.Pause();
-
-		try {
-			char hostbuf[32];
-			inet_ntop(client.sin_family, reinterpret_cast<void*>(&client.sin_addr), hostbuf, 32);
-			gdbDebugServer.success("Got connection to GDB debug server from %s:%d", hostbuf, client.sin_port);
-
-			gdb_cmd cmd;
-
-			while (!stop) {
-				if (!read_cmd(cmd)) {
-					break;
-				}
-				gdbDebugServer.trace("Command %s with data %s received", cmd.cmd.c_str(), cmd.data.c_str());
-				PROCESS_CMD("!", cmd_extended_mode);
-				PROCESS_CMD("?", cmd_reason);
-				PROCESS_CMD("qSupported", cmd_supported);
-				PROCESS_CMD("qfThreadInfo", cmd_thread_info);
-				PROCESS_CMD("qC", cmd_current_thread);
-				PROCESS_CMD("p", cmd_read_register);
-				PROCESS_CMD("P", cmd_write_register);
-				PROCESS_CMD("m", cmd_read_memory);
-				PROCESS_CMD("M", cmd_write_memory);
-				PROCESS_CMD("g", cmd_read_all_registers);
-				PROCESS_CMD("G", cmd_write_all_registers);
-				PROCESS_CMD("H", cmd_set_thread_ops);
-				PROCESS_CMD("qAttached", cmd_attached_to_what);
-				PROCESS_CMD("k", cmd_kill);
-				PROCESS_CMD("vCont?", cmd_continue_support);
-				PROCESS_CMD("vCont", cmd_vcont);
-				PROCESS_CMD("z", cmd_remove_breakpoint);
-				PROCESS_CMD("Z", cmd_set_breakpoint);
-
-				gdbDebugServer.trace("Unsupported command received %s", cmd.cmd.c_str());
-				if (!send_cmd_ack("")) {
-					break;
-				}
-			}
-		}
-		catch (std::runtime_error& e) 
-		{
-			if (client_socket) {
-				closesocket(client_socket);
-				client_socket = 0;
-			}
-			gdbDebugServer.error(e.what());
-		}
-	}
-}
-
-#undef PROCESS_CMD
-
-void GDBDebugServer::on_exit()
-{
-	if (server_socket) {
-		closesocket(server_socket);
-	}
-	if (client_socket) {
-		closesocket(client_socket);
-	}
-	sock_quit();
-}
-
-std::string GDBDebugServer::get_name() const
-{
-	return "GDBDebugger";
-}
-
-void GDBDebugServer::on_stop()
-{
-	this->stop = true;
-	//just in case we are waiting for breakpoint
-	this->notify();
-	named_thread::on_stop();
-}
-
-u32 g_gdb_debugger_id = 0;
-
-#ifndef _WIN32
-#undef sscanf_s
-#endif
-
-#undef HEX_U32
-#undef HEX_U64
-
-#endif
@@ -1,131 +0,0 @@
-#pragma once
-
-#ifdef WITH_GDB_DEBUGGER
-
-#include "Thread.h"
-#include <Emu/IdManager.h>
-#include "Emu/CPU/CPUThread.h"
-#include "Emu/Cell/PPUThread.h"
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-using socket_t = SOCKET;
-#else
-using socket_t = int;
-#endif
-
-typedef struct gdb_cmd {
-	std::string cmd;
-	std::string data;
-	u8 checksum;
-} gdb_cmd;
-
-class wrong_checksum_exception : public std::runtime_error {
-public:
-	wrong_checksum_exception(char const* const message) : runtime_error(message) {}
-};
-
-const u64 ALL_THREADS = 0xffffffffffffffff;
-const u64 ANY_THREAD = 0;
-
-class GDBDebugServer : public named_thread {
-
-	socket_t server_socket;
-	socket_t client_socket;
-	std::weak_ptr<cpu_thread> selected_thread;
-	u64 continue_ops_thread_id = ANY_THREAD;
-	u64 general_ops_thread_id = ANY_THREAD;
-
-	//initialize server socket and start listening
-	void start_server();
-	//read at most cnt bytes to buf, returns nubmer of bytes actually read
-	int read(void* buf, int cnt);
-	//reads one character
-	char read_char();
-	//reads pairs of hex characters and returns their integer value
-	u8 read_hexbyte();
-	//tries to read command, throws exceptions if anything goes wrong
-	void try_read_cmd(gdb_cmd& out_cmd);
-	//reads commands until receiveing one with valid checksum
-	//in case of other exception (i.e. wrong first char of command)
-	//it will log exception text and return false 
-	//in that case best for caller would be to stop reading, because 
-	//chance of getting correct command is low
-	bool read_cmd(gdb_cmd& out_cmd);
-	//send cnt bytes from buf to client
-	void send(const char* buf, int cnt);
-	//send character to client
-	void send_char(char c);
-	//acknowledge packet, either as accepted or declined
-	void ack(bool accepted);
-	//sends command body cmd to client
-	void send_cmd(const std::string & cmd);
-	//sends command to client until receives positive acknowledgement
-	//returns false in case some error happened, and command wasn't sent
-	bool send_cmd_ack(const std::string & cmd);
-	//appends encoded char c to string str, and returns checksum. encoded byte can occupy 2 bytes
-	static u8 append_encoded_char(char c, std::string& str);
-	//convert u8 to 2 byte hexademical representation
-	static std::string to_hexbyte(u8 i);
-	//choose thread, support ALL_THREADS and ANY_THREAD values, returns true if some thread was selected
-	bool select_thread(u64 id);
-	//returns register value as hex string by register id (in gdb), in case of wrong id returns empty string
-	static std::string get_reg(std::shared_ptr<ppu_thread> thread, u32 rid);
-	//sets register value to hex string by register id (in gdb), in case of wrong id returns false
-	static bool set_reg(std::shared_ptr<ppu_thread> thread, u32 rid, std::string value);
-	//returns size of register with id rid in bytes, zero if invalid rid is provided
-	static u32 get_reg_size(std::shared_ptr<ppu_thread> thread, u32 rid);
-	//send reason of stop, returns false if sending response failed
-	bool send_reason();
-
-	//commands
-	bool cmd_extended_mode(gdb_cmd& cmd);
-	bool cmd_reason(gdb_cmd& cmd);
-	bool cmd_supported(gdb_cmd& cmd);
-	bool cmd_thread_info(gdb_cmd& cmd);
-	bool cmd_current_thread(gdb_cmd& cmd);
-	bool cmd_read_register(gdb_cmd& cmd);
-	bool cmd_write_register(gdb_cmd& cmd);
-	bool cmd_read_memory(gdb_cmd& cmd);
-	bool cmd_write_memory(gdb_cmd& cmd);
-	bool cmd_read_all_registers(gdb_cmd& cmd);
-	bool cmd_write_all_registers(gdb_cmd& cmd);
-	bool cmd_set_thread_ops(gdb_cmd& cmd);
-	bool cmd_attached_to_what(gdb_cmd& cmd);
-	bool cmd_kill(gdb_cmd& cmd);
-	bool cmd_continue_support(gdb_cmd& cmd);
-	bool cmd_vcont(gdb_cmd& cmd);
-	bool cmd_set_breakpoint(gdb_cmd& cmd);
-	bool cmd_remove_breakpoint(gdb_cmd& cmd);
-
-protected:
-	void on_task() override final;
-	void on_exit() override final;
-
-public:
-	static const u32 id_base = 1;
-	static const u32 id_step = 1;
-	static const u32 id_count = 0x100000;
-
-	bool from_breakpoint = true;
-	bool stop = false;
-
-	virtual std::string get_name() const;
-	virtual void on_stop() override final;
-};
-
-extern u32 g_gdb_debugger_id;
-
-#endif
@@ -4,7 +4,7 @@

 #pragma push_macro("new")
 #undef new
-#include <gsl/gsl>
+#include <gsl.h>
 #pragma pop_macro("new")
 #undef Expects
 #undef Ensures
@@ -5,15 +5,12 @@
 #include <unordered_set>
 #include <set>
 #include <array>
-#include <deque>

 #include "types.h"
+#include "Macro.h"
 #include "StrFmt.h"
 #include "File.h"
 #include "Log.h"
-#include "mutex.h"
-#include "sysinfo.h"
-#include "VirtualMemory.h"

 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -23,19 +20,24 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
 #include "llvm/ExecutionEngine/JITEventListener.h"
-#include "llvm/ExecutionEngine/ObjectCache.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif

 #ifdef _WIN32
 #include <Windows.h>
+#else
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
 #endif

 #include "JIT.h"

-// Memory manager mutex
-shared_mutex s_mutex;
+// Global LLVM context (thread-unsafe)
+llvm::LLVMContext g_llvm_ctx;

 // Size of virtual memory area reserved: 512 MB
 static const u64 s_memory_size = 0x20000000;
@@ -43,133 +45,69 @@ static const u64 s_memory_size = 0x20000000;
 // Try to reserve a portion of virtual memory in the first 2 GB address space beforehand, if possible.
 static void* const s_memory = []() -> void*
 {
-	llvm::InitializeNativeTarget();
-	llvm::InitializeNativeTargetAsmPrinter();
-	LLVMLinkInMCJIT();
-
-	for (u64 addr = 0x10000000; addr <= 0x80000000 - s_memory_size; addr += 0x1000000)
+#ifdef _WIN32
+	for (u64 addr = 0x1000000; addr <= 0x60000000; addr += 0x1000000)
 	{
-		if (auto ptr = utils::memory_reserve(s_memory_size, (void*)addr))
+		if (VirtualAlloc((void*)addr, s_memory_size, MEM_RESERVE, PAGE_NOACCESS))
 		{
-			return ptr;
+			return (void*)addr;
 		}
 	}

-	return utils::memory_reserve(s_memory_size);
+	return VirtualAlloc(NULL, s_memory_size, MEM_RESERVE, PAGE_NOACCESS);
+#else
+	return ::mmap((void*)0x10000000, s_memory_size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+#endif
 }();

-static void* s_next = s_memory;
+// EH frames
+static u8* s_unwind_info;
+static u64 s_unwind_size;

 #ifdef _WIN32
-static std::deque<std::vector<RUNTIME_FUNCTION>> s_unwater;
-static std::vector<std::vector<RUNTIME_FUNCTION>> s_unwind; // .pdata
+static std::vector<RUNTIME_FUNCTION> s_unwind; // Custom .pdata section replacement
 #endif

-// Reset memory manager
-extern void jit_finalize()
-{
-#ifdef _WIN32
-	for (auto&& unwind : s_unwind)
-	{
-		if (!RtlDeleteFunctionTable(unwind.data()))
-		{
-			LOG_FATAL(GENERAL, "RtlDeleteFunctionTable() failed! Error %u", GetLastError());
-		}
-	}
-
-	s_unwind.clear();
-#else
-	// TODO: unregister EH frames if necessary
-#endif
-
-	utils::memory_decommit(s_memory, s_memory_size);
-
-	s_next = s_memory;
-}
-
 // Helper class
-struct MemoryManager : llvm::RTDyldMemoryManager
+struct MemoryManager final : llvm::RTDyldMemoryManager
 {
-	std::unordered_map<std::string, u64>& m_link;
+	std::unordered_map<std::string, std::uintptr_t> table;

-	std::array<u8, 16>* m_tramps{};
-
-	u8* m_code_addr{}; // TODO
-
-	MemoryManager(std::unordered_map<std::string, u64>& table)
-		: m_link(table)
+	MemoryManager(std::unordered_map<std::string, std::uintptr_t>&& table)
+		: table(std::move(table))
 	{
 	}

 	[[noreturn]] static void null()
 	{
-		fmt::throw_exception("Null function" HERE);
+		throw std::runtime_error("Null function" HERE);
 	}

-	llvm::JITSymbol findSymbol(const std::string& name) override
+	virtual u64 getSymbolAddress(const std::string& name) override
 	{
-		auto& addr = m_link[name];
-
-		// Find function address
-		if (!addr)
+		if (u64 addr = RTDyldMemoryManager::getSymbolAddress(name))
 		{
-			addr = RTDyldMemoryManager::getSymbolAddress(name);
-
-			if (addr)
-			{
-				LOG_WARNING(GENERAL, "LLVM: Symbol requested: %s -> 0x%016llx", name, addr);
-			}
-			else
-			{
-				LOG_ERROR(GENERAL, "LLVM: Linkage failed: %s", name);
-				addr = (u64)null;
-			}
+			// This may be bad if LLVM requests some built-in functions like fma.
+			LOG_ERROR(GENERAL, "LLVM: Symbol requested %s -> 0x%016llx", name, addr);
+			return addr;
 		}

-		// Verify address for small code model
-		if ((u64)s_memory > 0x80000000 - s_memory_size ? (u64)addr - (u64)s_memory >= s_memory_size : addr >= 0x80000000)
+		const auto found = table.find(name);
+
+		if (found != table.end())
 		{
-			// Lock memory manager
-			writer_lock lock(s_mutex);
-
-			// Allocate memory for trampolines
-			if (!m_tramps)
-			{
-				m_tramps = reinterpret_cast<decltype(m_tramps)>(s_next);
-				utils::memory_commit(s_next, 4096, utils::protection::wx);
-				s_next = (u8*)((u64)s_next + 4096);
-			}
-
-			// Create a trampoline
-			auto& data = *m_tramps++;
-			data[0x0] = 0xff; // JMP [rip+2]
-			data[0x1] = 0x25;
-			data[0x2] = 0x02;
-			data[0x3] = 0x00;
-			data[0x4] = 0x00;
-			data[0x5] = 0x00;
-			data[0x6] = 0x48; // MOV rax, imm64 (not executed)
-			data[0x7] = 0xb8;
-			std::memcpy(data.data() + 8, &addr, 8);
-			addr = (u64)&data;
-
-			// Reset pointer (memory page exhausted)
-			if (((u64)m_tramps % 4096) == 0)
-			{
-				m_tramps = nullptr;
-			}
+			return found->second;
 		}

-		return {addr, llvm::JITSymbolFlags::Exported};
+		// It's fine if some function is never called, for example.
+		LOG_ERROR(GENERAL, "LLVM: Linkage failed for %s", name);
+		return (u64)null;
 	}

 	virtual u8* allocateCodeSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name) override
 	{
-		// Lock memory manager
-		writer_lock lock(s_mutex);
-
 		// Simple allocation
-		const u64 next = ::align((u64)s_next + size, 4096);
+		const u64 next = ::align((u64)m_next + size, 4096);

 		if (next > (u64)s_memory + s_memory_size)
 		{
@@ -177,20 +115,24 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 			return nullptr;
 		}

-		utils::memory_commit(s_next, size, utils::protection::wx);
-		m_code_addr = (u8*)s_next;
+#ifdef _WIN32
+		if (!VirtualAlloc(m_next, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE))
+#else
+		if (::mprotect(m_next, size, PROT_READ | PROT_WRITE | PROT_EXEC))
+#endif
+		{
+			LOG_FATAL(GENERAL, "LLVM: Failed to allocate memory at 0x%p", m_next);
+			return nullptr;
+		}

-		LOG_NOTICE(GENERAL, "LLVM: Code section %u '%s' allocated -> %p (size=0x%llx, aligned 0x%x)", sec_id, sec_name.data(), s_next, size, align);
-		return (u8*)std::exchange(s_next, (void*)next);
+		LOG_SUCCESS(GENERAL, "LLVM: Code section %u '%s' allocated -> 0x%p (size=0x%llx, aligned 0x%x)", sec_id, sec_name.data(), m_next, size, align);
+		return (u8*)std::exchange(m_next, (void*)next);
 	}

 	virtual u8* allocateDataSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name, bool is_ro) override
 	{
-		// Lock memory manager
-		writer_lock lock(s_mutex);
-
 		// Simple allocation
-		const u64 next = ::align((u64)s_next + size, 4096);
+		const u64 next = ::align((u64)m_next + size, 4096);

 		if (next > (u64)s_memory + s_memory_size)
 		{
@@ -198,303 +140,188 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 			return nullptr;
 		}

-		if (!is_ro)
+#ifdef _WIN32
+		if (!VirtualAlloc(m_next, size, MEM_COMMIT, PAGE_READWRITE))
+#else
+		if (::mprotect(m_next, size, PROT_READ | PROT_WRITE))
+#endif
 		{
-			LOG_ERROR(GENERAL, "LLVM: Writeable data section not supported!");
+			LOG_FATAL(GENERAL, "LLVM: Failed to allocate memory at 0x%p", m_next);
+			return nullptr;
 		}

-		utils::memory_commit(s_next, size);
-
-		LOG_NOTICE(GENERAL, "LLVM: Data section %u '%s' allocated -> %p (size=0x%llx, aligned 0x%x, %s)", sec_id, sec_name.data(), s_next, size, align, is_ro ? "ro" : "rw");
-		return (u8*)std::exchange(s_next, (void*)next);
+		LOG_SUCCESS(GENERAL, "LLVM: Data section %u '%s' allocated -> 0x%p (size=0x%llx, aligned 0x%x, %s)", sec_id, sec_name.data(), m_next, size, align, is_ro ? "ro" : "rw");
+		return (u8*)std::exchange(m_next, (void*)next);
 	}

 	virtual bool finalizeMemory(std::string* = nullptr) override
 	{
-		// Lock memory manager
-		writer_lock lock(s_mutex);
-
-		// TODO: make only read-only sections read-only
-//#ifdef _WIN32
-//		DWORD op;
-//		VirtualProtect(s_memory, (u64)m_next - (u64)s_memory, PAGE_READONLY, &op);
-//		VirtualProtect(s_code_addr, s_code_size, PAGE_EXECUTE_READ, &op);
-//#else
-//		::mprotect(s_memory, (u64)m_next - (u64)s_memory, PROT_READ);
-//		::mprotect(s_code_addr, s_code_size, PROT_READ | PROT_EXEC);
-//#endif
+		// TODO: make sections read-only when necessary
 		return false;
 	}

 	virtual void registerEHFrames(u8* addr, u64 load_addr, std::size_t size) override
 	{
-#ifdef _WIN32
-		// Lock memory manager
-		writer_lock lock(s_mutex);
-
-		// Use s_memory as a BASE, compute the difference
-		const u64 unwind_diff = (u64)addr - (u64)s_memory;
-
-		// Fix RUNTIME_FUNCTION records (.pdata section)
-		auto pdata = std::move(s_unwater.front());
-		s_unwater.pop_front();
-
-		for (auto& rf : pdata)
-		{
-			rf.UnwindData += static_cast<DWORD>(unwind_diff);
-		}
-
-		// Register .xdata UNWIND_INFO structs
-		if (!RtlAddFunctionTable(pdata.data(), (DWORD)pdata.size(), (u64)s_memory))
-		{
-			LOG_ERROR(GENERAL, "RtlAddFunctionTable() failed! Error %u", GetLastError());
-		}
-		else
-		{
-			s_unwind.emplace_back(std::move(pdata));
-		}
-#endif
+		s_unwind_info = addr;
+		s_unwind_size = size;

 		return RTDyldMemoryManager::registerEHFrames(addr, load_addr, size);
 	}

-	virtual void deregisterEHFrames() override
+	virtual void deregisterEHFrames(u8* addr, u64 load_addr, std::size_t size) override
 	{
 		LOG_ERROR(GENERAL, "deregisterEHFrames() called"); // Not expected

-		return RTDyldMemoryManager::deregisterEHFrames();
-	}
-};
-
-// Helper class
-struct EventListener : llvm::JITEventListener
-{
-	MemoryManager& m_mem;
-
-	EventListener(MemoryManager& mem)
-		: m_mem(mem)
-	{
+		return RTDyldMemoryManager::deregisterEHFrames(addr, load_addr, size);
 	}

-	virtual void NotifyObjectEmitted(const llvm::object::ObjectFile& obj, const llvm::RuntimeDyld::LoadedObjectInfo& inf) override
+	~MemoryManager()
 	{
 #ifdef _WIN32
-		for (auto it = obj.section_begin(), end = obj.section_end(); it != end; ++it)
+		if (!RtlDeleteFunctionTable(s_unwind.data()))
 		{
-			llvm::StringRef name;
-			it->getName(name);
-
-			if (name == ".pdata")
-			{
-				llvm::StringRef data;
-				it->getContents(data);
-
-				std::vector<RUNTIME_FUNCTION> rfs(data.size() / sizeof(RUNTIME_FUNCTION));
-
-				auto offsets = reinterpret_cast<DWORD*>(rfs.data());
-
-				// Initialize .pdata section using relocation info
-				for (auto ri = it->relocation_begin(), end = it->relocation_end(); ri != end; ++ri)
-				{
-					if (ri->getType() == 3 /*R_X86_64_GOT32*/)
-					{
-						const u64 value = *reinterpret_cast<const DWORD*>(data.data() + ri->getOffset());
-						offsets[ri->getOffset() / sizeof(DWORD)] = static_cast<DWORD>(value + ri->getSymbol()->getAddress().get());
-					}
-				}
-
-				// Lock memory manager
-				writer_lock lock(s_mutex);
-
-				// Use s_memory as a BASE, compute the difference
-				const u64 code_diff = (u64)m_mem.m_code_addr - (u64)s_memory;
-
-				// Fix RUNTIME_FUNCTION records (.pdata section)
-				for (auto& rf : rfs)
-				{
-					rf.BeginAddress += static_cast<DWORD>(code_diff);
-					rf.EndAddress   += static_cast<DWORD>(code_diff);
-				}
-
-				s_unwater.emplace_back(std::move(rfs));
-			}
+			LOG_FATAL(GENERAL, "RtlDeleteFunctionTable(addr=0x%p) failed! Error %u", s_unwind_info, GetLastError());
 		}
+
+		if (!VirtualFree(s_memory, 0, MEM_DECOMMIT))
+		{
+			LOG_FATAL(GENERAL, "VirtualFree(0x%p) failed! Error %u", s_memory, GetLastError());
+		}
+#else
+		if (::mprotect(s_memory, s_memory_size, PROT_NONE))
+		{
+			LOG_FATAL(GENERAL, "mprotect(0x%p) failed! Error %d", s_memory, errno);
+		}
+
+		// TODO: unregister EH frames if necessary
 #endif
 	}
+
+private:
+	void* m_next = s_memory;
 };

 // Helper class
-class ObjectCache final : public llvm::ObjectCache
+struct EventListener final : llvm::JITEventListener
 {
-	const std::string& m_path;
-
-public:
-	ObjectCache(const std::string& path)
-		: m_path(path)
+	virtual void NotifyObjectEmitted(const llvm::object::ObjectFile& obj, const llvm::RuntimeDyld::LoadedObjectInfo& inf) override
 	{
-	}
-
-	~ObjectCache() override = default;
-
-	void notifyObjectCompiled(const llvm::Module* module, llvm::MemoryBufferRef obj) override
-	{
-		std::string name = m_path;
-		name.append(module->getName());
-		fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
-		LOG_SUCCESS(GENERAL, "LLVM: Created module: %s", module->getName().data());
-	}
-
-	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
-	{
-		if (fs::file cached{path, fs::read})
-		{
-			auto buf = llvm::MemoryBuffer::getNewUninitMemBuffer(cached.size());
-			cached.read(const_cast<char*>(buf->getBufferStart()), buf->getBufferSize());
-			return buf;
-		}
-
-		return nullptr;
-	}
-
-	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* module) override
-	{
-		std::string path = m_path;
-		path.append(module->getName());
-
-		if (auto buf = load(path))
-		{
-			LOG_SUCCESS(GENERAL, "LLVM: Loaded module: %s", module->getName().data());
-			return buf;
-		}
-
-		return nullptr;
+		const llvm::StringRef elf = obj.getData();
+		fs::file(fs::get_config_dir() + "LLVM.obj", fs::rewrite)
+			.write(elf.data(), elf.size());
 	}
 };

-jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, std::string _cpu)
-	: m_link(std::move(_link))
-	, m_cpu(std::move(_cpu))
-{
-	if (m_cpu.empty())
-	{
-		m_cpu = llvm::sys::getHostCPUName();
+static EventListener s_listener;

-		if (m_cpu == "sandybridge" ||
-			m_cpu == "ivybridge" ||
-			m_cpu == "haswell" ||
-			m_cpu == "broadwell" ||
-			m_cpu == "skylake" ||
-			m_cpu == "skylake-avx512" ||
-			m_cpu == "cannonlake")
-		{
-			if (!utils::has_avx())
-			{
-				m_cpu = "nehalem";
-			}
-		}
-	}
+jit_compiler::jit_compiler(std::unique_ptr<llvm::Module>&& _module, std::unordered_map<std::string, std::uintptr_t>&& table)
+{
+	EXPECTS(s_memory);

 	std::string result;

-	if (m_link.empty())
-	{
-		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
-		m_engine.reset(llvm::EngineBuilder(std::make_unique<llvm::Module>("null_", m_context))
-			.setErrorStr(&result)
-			.setOptLevel(llvm::CodeGenOpt::Aggressive)
-			.setCodeModel(llvm::CodeModel::Small)
-			.setMCPU(m_cpu)
-			.create());
-	}
-	else
-	{
-		// Primary JIT
-		auto mem = std::make_unique<MemoryManager>(m_link);
-		m_jit_el = std::make_unique<EventListener>(*mem);
+	const auto module_ptr = _module.get();

-		m_engine.reset(llvm::EngineBuilder(std::make_unique<llvm::Module>("null", m_context))
-			.setErrorStr(&result)
-			.setMCJITMemoryManager(std::move(mem))
-			.setOptLevel(llvm::CodeGenOpt::Aggressive)
-			.setCodeModel(llvm::CodeModel::Small)
-			.setMCPU(m_cpu)
-			.create());
+	// Initialization
+	llvm::InitializeNativeTarget();
+	llvm::InitializeNativeTargetAsmPrinter();
+	LLVMLinkInMCJIT();

-		if (m_engine)
-		{
-			m_engine->RegisterJITEventListener(m_jit_el.get());
-		}
-	}
+	m_engine.reset(llvm::EngineBuilder(std::move(_module))
+		.setErrorStr(&result)
+		.setMCJITMemoryManager(std::make_unique<MemoryManager>(std::move(table)))
+		.setOptLevel(llvm::CodeGenOpt::Aggressive)
+		.setRelocationModel(llvm::Reloc::PIC_)
+		.setCodeModel((u64)s_memory <= 0x60000000 ? llvm::CodeModel::Medium : llvm::CodeModel::Large) // TODO
+		.setMCPU(llvm::sys::getHostCPUName())
+		.create());

 	if (!m_engine)
 	{
-		fmt::throw_exception("LLVM: Failed to create ExecutionEngine: %s", result);
+		throw fmt::exception("LLVM: Failed to create ExecutionEngine: %s", result);
 	}
+
+	m_engine->setProcessAllSections(true); // ???
+	m_engine->RegisterJITEventListener(&s_listener);
+	m_engine->finalizeObject();
+
+	for (auto& func : module_ptr->functions())
+	{
+		if (!func.empty())
+		{
+			const std::string& name = func.getName();
+
+			// Register compiled function
+			m_map[name] = m_engine->getFunctionAddress(name);
+		}
+
+		// Delete IR to lower memory consumption
+		func.deleteBody();
+	}
+
+#ifdef _WIN32
+	// Register .xdata UNWIND_INFO (.pdata section is empty for some reason)
+	std::set<u64> func_set;
+
+	for (const auto& pair : m_map)
+	{
+		func_set.emplace(pair.second);
+	}
+
+	// Hack (cannot obtain last function size)
+	func_set.emplace(::align(*--func_set.end() + 4096, 4096));
+
+	const u64 base = (u64)s_memory;
+	const u8* bits = s_unwind_info;
+
+	s_unwind.clear();
+	s_unwind.reserve(m_map.size());
+
+	for (auto it = func_set.begin(), end = --func_set.end(); it != end; it++)
+	{
+		const u64 addr = *it;
+		const u64 next = *func_set.upper_bound(addr);
+
+		// Generate RUNTIME_FUNCTION record
+		RUNTIME_FUNCTION uw;
+		uw.BeginAddress = static_cast<u32>(addr - base);
+		uw.EndAddress   = static_cast<u32>(next - base);
+		uw.UnwindData   = static_cast<u32>((u64)bits - base);
+		s_unwind.emplace_back(uw);
+
+		// Parse .xdata UNWIND_INFO record
+		const u8 flags = *bits++; // Version and flags
+		const u8 prolog = *bits++; // Size of prolog
+		const u8 count = *bits++; // Count of unwind codes
+		const u8 frame = *bits++; // Frame Reg + Off
+		bits += ::align(std::max<u8>(1, count), 2) * sizeof(u16); // UNWIND_CODE array
+
+		if (flags != 1) 
+		{
+			LOG_ERROR(GENERAL, "LLVM: unsupported UNWIND_INFO version/flags (0x%02x)", flags);
+			break;
+		}
+
+		LOG_TRACE(GENERAL, "LLVM: .xdata at 0x%llx: function 0x%x..0x%x: p0x%02x, c0x%02x, f0x%02x", uw.UnwindData + base, uw.BeginAddress + base, uw.EndAddress + base, prolog, count, frame);
+	}
+
+	if (s_unwind_info + s_unwind_size != bits)
+	{
+		LOG_FATAL(GENERAL, "LLVM: .xdata analysis failed! (0x%p != 0x%p)", s_unwind_info + s_unwind_size, bits);
+	}
+	else if (!RtlAddFunctionTable(s_unwind.data(), (DWORD)s_unwind.size(), base))
+	{
+		LOG_FATAL(GENERAL, "RtlAddFunctionTable(addr=0x%p) failed! Error %u", s_unwind_info, GetLastError());
+	}
+	else
+	{
+		LOG_SUCCESS(GENERAL, "LLVM: UNWIND_INFO registered (addr=0x%p, size=0x%llx)", s_unwind_info, s_unwind_size);
+	}
+#endif
 }

 jit_compiler::~jit_compiler()
 {
 }

-void jit_compiler::add(std::unique_ptr<llvm::Module> module, const std::string& path)
-{
-	ObjectCache cache{path};
-	m_engine->setObjectCache(&cache);
-
-	const auto ptr = module.get();
-	m_engine->addModule(std::move(module));
-	m_engine->generateCodeForModule(ptr);
-	m_engine->setObjectCache(nullptr);
-
-	for (auto& func : ptr->functions())
-	{
-		// Delete IR to lower memory consumption
-		func.deleteBody();
-	}
-}
-
-void jit_compiler::add(const std::string& path)
-{
-	m_engine->addObjectFile(std::move(llvm::object::ObjectFile::createObjectFile(*ObjectCache::load(path)).get()));
-}
-
-void jit_compiler::fin()
-{
-	m_engine->finalizeObject();
-}
-
-u64 jit_compiler::get(const std::string& name)
-{
-	return m_engine->getGlobalValueAddress(name);
-}
-
-std::unordered_map<std::string, u64> jit_compiler::add(std::unordered_map<std::string, std::string> data)
-{
-	// Lock memory manager
-	writer_lock lock(s_mutex);
-
-	std::unordered_map<std::string, u64> result;
-
-	std::size_t size = 0;
-
-	for (auto&& pair : data)
-	{
-		size += ::align(pair.second.size(), 16);
-	}
-
-	utils::memory_commit(s_next, size, utils::protection::wx);
-	std::memset(s_next, 0xc3, ::align(size, 4096));
-
-	for (auto&& pair : data)
-	{
-		std::memcpy(s_next, pair.second.data(), pair.second.size());
-		result.emplace(pair.first, (u64)s_next);
-		s_next = (void*)::align((u64)s_next + pair.second.size(), 16);
-	}
-
-	s_next = (void*)::align((u64)s_next, 4096);
-
-	return result;
-}
-
 #endif
@@ -7,9 +7,7 @@
 #include <unordered_map>

 #include "types.h"
-#include "mutex.h"

-#include "restore_new.h"
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
@@ -19,61 +17,33 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#include "define_new_memleakdetect.h"
+
+extern llvm::LLVMContext g_llvm_ctx;

 // Temporary compiler interface
 class jit_compiler final
 {
-	// Local LLVM context
-	llvm::LLVMContext m_context;
-
-	// JIT Event Listener
-	std::unique_ptr<struct EventListener> m_jit_el;
-
 	// Execution instance
 	std::unique_ptr<llvm::ExecutionEngine> m_engine;

-	// Link table
-	std::unordered_map<std::string, u64> m_link;
-
-	// Arch
-	std::string m_cpu;
+	// Compiled functions
+	std::unordered_map<std::string, std::uintptr_t> m_map;

 public:
-	jit_compiler(const std::unordered_map<std::string, u64>& _link, std::string _cpu);
+	jit_compiler(std::unique_ptr<llvm::Module>&&, std::unordered_map<std::string, std::uintptr_t>&&);
 	~jit_compiler();

-	// Get LLVM context
-	auto& get_context()
-	{
-		return m_context;
-	}
-
-	// Add module (path to obj cache dir)
-	void add(std::unique_ptr<llvm::Module> module, const std::string& path);
-
-	// Add object (path to obj file)
-	void add(const std::string& path);
-
-	// Finalize
-	void fin();
-
 	// Get compiled function address
-	u64 get(const std::string& name);
-
-	// Add functions directly to the memory manager (name -> code)
-	static std::unordered_map<std::string, u64> add(std::unordered_map<std::string, std::string>);
-
-	// Get CPU info
-	const std::string& cpu() const
+	std::uintptr_t get(const std::string& name) const
 	{
-		return m_cpu;
-	}
+		const auto found = m_map.find(name);
+		
+		if (found != m_map.end())
+		{
+			return found->second;
+		}

-	// Check JIT purpose
-	bool is_primary() const
-	{
-		return !m_link.empty();
+		return 0;
 	}
 };

@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
@@ -1,265 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- * 
- * The MIT License (MIT)
- * 
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "LUrlParser.h"
-
-#include <algorithm>
-#include <cstring>
-#include <stdlib.h>
-
-// check if the scheme name is valid
-static bool IsSchemeValid( const std::string& SchemeName )
-{
-	for ( auto c : SchemeName  )
-	{
-		if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
-	}
-
-	return true;
-}
-
-bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
-{
-	if ( !IsValid() ) { return false; }
-
-	int Port = atoi( m_Port.c_str() );
-
-	if ( Port <= 0 || Port > 65535 ) { return false; }
-
-	if ( OutPort ) { *OutPort = Port; }
-
-	return true;
-}
-
-// based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
-{
-	LUrlParser::clParseURL Result;
-
-	const char* CurrentString = URL.c_str();
-
-	/*
-	 *	<scheme>:<scheme-specific-part>
-	 *	<scheme> := [a-z\+\-\.]+
-	 *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
-	 */
-
-	// try to read scheme
-	{
-		const char* LocalString = strchr( CurrentString, ':' );
-
-		if ( !LocalString )
-		{
-			return clParseURL( LUrlParserError_NoUrlCharacter );
-		}
-
-		// save the scheme name
-		Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
-
-		if ( !IsSchemeValid( Result.m_Scheme ) )
-		{
-			return clParseURL( LUrlParserError_InvalidSchemeName );
-		}
-
-		// scheme should be lowercase
-		std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
-
-		// skip ':'
-		CurrentString = LocalString+1;
-	}
-
-	/*
-	 *	//<user>:<password>@<host>:<port>/<url-path>
-	 *	any ":", "@" and "/" must be normalized
-	 */
-
-	// skip "//"
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-
-	// check if the user name and password are specified
-	bool bHasUserName = false;
-
-	const char* LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( *LocalString == '@' )
-		{
-			// user name and password are specified
-			bHasUserName = true;
-			break;
-		}
-		else if ( *LocalString == '/' )
-		{
-			// end of <host>:<port> specification
-			bHasUserName = false;
-			break;
-		}
-
-		LocalString++;
-	}
-
-	// user name and password
-	LocalString = CurrentString;
-
-	if ( bHasUserName )
-	{
-		// read user name
-		while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
-
-		Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
-
-		// proceed with the current pointer
-		CurrentString = LocalString;
-
-		if ( *CurrentString == ':' )
-		{
-			// skip ':'
-			CurrentString++;
-
-			// read password
-			LocalString = CurrentString;
-
-			while ( *LocalString && *LocalString != '@' ) LocalString++;
-
-			Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
-
-			CurrentString = LocalString;
-		}
-
-		// skip '@'
-		if ( *CurrentString != '@' )
-		{
-			return clParseURL( LUrlParserError_NoAtSign );
-		}
-
-		CurrentString++;
-	}
-
-	bool bHasBracket = ( *CurrentString == '[' );
-
-	// go ahead, read the host name
-	LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( bHasBracket && *LocalString == ']' )
-		{
-			// end of IPv6 address
-			LocalString++;
-			break;
-		}
-		else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
-		{
-			// port number is specified
-			break;
-		}
-
-		LocalString++;
-	}
-
-	Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// is port number specified?
-	if ( *CurrentString == ':' )
-	{
-		CurrentString++;
-
-		// read port number
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '/' ) LocalString++;
-
-		Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// end of string
-	if ( !*CurrentString )
-	{
-		Result.m_ErrorCode = LUrlParserError_Ok;
-
-		return Result;
-	}
-
-	// skip '/'
-	if ( *CurrentString != '/' )
-	{
-		return clParseURL( LUrlParserError_NoSlash );
-	}
-
-	CurrentString++;
-
-	// parse the path
-	LocalString = CurrentString;
-
-	while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
-
-	Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// check for query
-	if ( *CurrentString == '?' )
-	{
-		// skip '?'
-		CurrentString++;
-
-		// read query
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '#' ) LocalString++;
-
-		Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// check for fragment
-	if ( *CurrentString == '#' )
-	{
-		// skip '#'
-		CurrentString++;
-
-		// read fragment
-		LocalString = CurrentString;
-
-		while ( *LocalString ) LocalString++;
-
-		Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	Result.m_ErrorCode = LUrlParserError_Ok;
-
-	return Result;
-}
@@ -1,78 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- * 
- * The MIT License (MIT)
- * 
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#pragma once
-
-#include <string>
-
-namespace LUrlParser
-{
-	enum LUrlParserError
-	{
-		LUrlParserError_Ok = 0,
-		LUrlParserError_Uninitialized = 1,
-		LUrlParserError_NoUrlCharacter = 2,
-		LUrlParserError_InvalidSchemeName = 3,
-		LUrlParserError_NoDoubleSlash = 4,
-		LUrlParserError_NoAtSign = 5,
-		LUrlParserError_UnexpectedEndOfLine = 6,
-		LUrlParserError_NoSlash = 7,
-	};
-
-	class clParseURL
-	{
-	public:
-		LUrlParserError m_ErrorCode;
-		std::string m_Scheme;
-		std::string m_Host;
-		std::string m_Port;
-		std::string m_Path;
-		std::string m_Query;
-		std::string m_Fragment;
-		std::string m_UserName;
-		std::string m_Password;
-
-		clParseURL()
-			: m_ErrorCode( LUrlParserError_Uninitialized )
-		{}
-
-		/// return 'true' if the parsing was successful
-		bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
-
-		/// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
-		bool GetPort( int* OutPort ) const;
-
-		/// parse the URL
-		static clParseURL ParseURL( const std::string& URL );
-
-	private:
-		explicit clParseURL( LUrlParserError ErrorCode )
-			: m_ErrorCode( ErrorCode )
-		{}
-	};
-
-} // namespace LUrlParser
@@ -1,318 +1,92 @@
 #include "Log.h"
 #include "File.h"
 #include "StrFmt.h"
-#include "sema.h"

-#include "Utilities/sysinfo.h"
-#include "rpcs3_version.h"
+#include <cstdarg>
 #include <string>
-#include <unordered_map>
-
-#ifdef _WIN32
-#define NOMINMAX
-#include <Windows.h>
-#else
-#include <chrono>
-#include <sys/mman.h>
-#endif
-
-#include <zlib.h>
-
-static std::string empty_string()
-{
-	return {};
-}

 // Thread-specific log prefix provider
-thread_local std::string(*g_tls_log_prefix)() = &empty_string;
+thread_local std::string(*g_tls_log_prefix)() = nullptr;

-template<>
-void fmt_class_string<logs::level>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto lev)
-	{
-		switch (lev)
-		{
-		case logs::level::always: return "Nothing";
-		case logs::level::fatal: return "Fatal";
-		case logs::level::error: return "Error";
-		case logs::level::todo: return "TODO";
-		case logs::level::success: return "Success";
-		case logs::level::warning: return "Warning";
-		case logs::level::notice: return "Notice";
-		case logs::level::trace: return "Trace";
-		}
-
-		return unknown;
-	});
-}
+#ifndef _MSC_VER
+constexpr DECLARE(bijective<logs::level, const char*>::map);
+#endif

 namespace logs
 {
-	constexpr std::size_t s_log_size = 128 * 1024 * 1024;
-	constexpr std::size_t s_log_size_s = s_log_size / 2;
-	constexpr std::size_t s_log_size_t = s_log_size / 4 + s_log_size_s;
-	constexpr std::size_t s_log_size_e = s_log_size / 8 + s_log_size_t;
-	constexpr std::size_t s_log_size_f = s_log_size / 16 + s_log_size_e;
+	struct listener
+	{
+		listener() = default;
+
+		virtual ~listener() = default;
+
+		virtual void log(const channel& ch, level sev, const std::string& text) = 0;
+	};

 	class file_writer
 	{
+		// Could be memory-mapped file
 		fs::file m_file;
-		std::string m_name;
-
-#ifdef _WIN32
-		::HANDLE m_fmap;
-#endif
-		atomic_t<std::size_t> m_pos{0};
-		std::size_t m_size{0};
-		uchar* m_fptr{};

 	public:
 		file_writer(const std::string& name);

-		virtual ~file_writer();
+		virtual ~file_writer() = default;

 		// Append raw data
-		void log(logs::level sev, const char* text, std::size_t size);
-	};
+		void log(const std::string& text);

-	struct channel_info
-	{
-		channel* pointer = nullptr;
-		level enabled = level::notice;
-
-		void set_level(level value)
-		{
-			enabled = value;
-
-			if (pointer)
-			{
-				pointer->enabled = value;
-			}
-		}
-	};
-
-	struct stored_message
-	{
-		message m;
-		u64 stamp;
-		std::string prefix;
-		std::string text;
+		// Get current file size (may be used by secondary readers)
+		std::size_t size() const;
 	};

 	struct file_listener : public file_writer, public listener
 	{
-		file_listener(const std::string& name);
-
-		virtual ~file_listener() = default;
+		file_listener(const std::string& name)
+			: file_writer(name)
+			, listener()
+		{
+		}

 		// Encode level, current thread name, channel name and write log message
-		virtual void log(u64 stamp, const message& msg, const std::string& prefix, const std::string& text) override;
-
-		// Channel registry
-		std::unordered_map<std::string, channel_info> channels;
-
-		// Messages for delayed listener initialization
-		std::vector<stored_message> messages;
+		virtual void log(const channel& ch, level sev, const std::string& text) override;
 	};

-	static file_listener* get_logger()
+	static file_listener& get_logger()
 	{
 		// Use magic static
 		static file_listener logger("RPCS3.log");
-		return &logger;
+		return logger;
 	}

-	static u64 get_stamp()
-	{
-		static struct time_initializer
-		{
-#ifdef _WIN32
-			LARGE_INTEGER freq;
-			LARGE_INTEGER start;
-
-			time_initializer()
-			{
-				QueryPerformanceFrequency(&freq);
-				QueryPerformanceCounter(&start);
-			}
-#else
-			std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
-#endif
-
-			u64 get() const
-			{
-#ifdef _WIN32
-				LARGE_INTEGER now;
-				QueryPerformanceCounter(&now);
-				const LONGLONG diff = now.QuadPart - start.QuadPart;
-				return diff / freq.QuadPart * 1'000'000 + diff % freq.QuadPart * 1'000'000 / freq.QuadPart;
-#else
-				return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - start).count();
-#endif
-			}
-		} timebase{};
-
-		return timebase.get();
-	}
-
-	channel GENERAL("");
-	channel LOADER("LDR");
-	channel MEMORY("MEM");
-	channel RSX("RSX");
-	channel HLE("HLE");
-	channel PPU("PPU");
-	channel SPU("SPU");
+	channel GENERAL(nullptr, level::notice);
+	channel LOADER("LDR", level::notice);
+	channel MEMORY("MEM", level::notice);
+	channel RSX("RSX", level::notice);
+	channel HLE("HLE", level::notice);
+	channel PPU("PPU", level::notice);
+	channel SPU("SPU", level::notice);
 	channel ARMv7("ARMv7");
-
-	// Channel registry mutex
-	semaphore<> g_mutex;
-
-	// Must be set to true in main()
-	atomic_t<bool> g_init{false};
-
-	void reset()
-	{
-		semaphore_lock lock(g_mutex);
-
-		for (auto&& pair : get_logger()->channels)
-		{
-			pair.second.set_level(level::notice);
-		}
-	}
-
-	void set_level(const std::string& ch_name, level value)
-	{
-		semaphore_lock lock(g_mutex);
-
-		get_logger()->channels[ch_name].set_level(value);
-	}
-
-	// Must be called in main() to stop accumulating messages in g_messages
-	void set_init()
-	{
-		if (!g_init)
-		{
-			semaphore_lock lock(g_mutex);
-			get_logger()->messages.clear();
-			g_init = true;
-		}
-	}
 }

-logs::listener::~listener()
+void logs::channel::broadcast(const logs::channel& ch, logs::level sev, const char* fmt...)
 {
-}
-
-void logs::listener::add(logs::listener* _new)
-{
-	// Get first (main) listener
-	listener* lis = get_logger();
-
-	semaphore_lock lock(g_mutex);
-
-	// Install new listener at the end of linked list
-	while (lis->m_next || !lis->m_next.compare_and_swap_test(nullptr, _new))
-	{
-		lis = lis->m_next;
-	}
-
-	// Send initial messages
-	for (const auto& msg : get_logger()->messages)
-	{
-		_new->log(msg.stamp, msg.m, msg.prefix, msg.text);
-	}
-}
-
-void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u64* args)
-{
-	// Get timestamp
-	const u64 stamp = get_stamp();
-
-	// Register channel
-	if (ch->enabled == level::_uninit)
-	{
-		semaphore_lock lock(g_mutex);
-
-		auto& info = get_logger()->channels[ch->name];
-
-		if (info.pointer && info.pointer != ch)
-		{
-			fmt::throw_exception("logs::channel repetition: %s", ch->name);
-		}
-		else if (!info.pointer)
-		{
-			info.pointer = ch;
-			ch->enabled  = info.enabled;
-
-			// Check level again
-			if (info.enabled < sev)
-			{
-				return;
-			}
-		}
-	}
-
-	// Get text
-	thread_local std::string text; text.clear();
-	fmt::raw_append(text, fmt, sup, args);
-	std::string prefix = g_tls_log_prefix();
-
-	// Get first (main) listener
-	listener* lis = get_logger();
-
-	if (!g_init)
-	{
-		semaphore_lock lock(g_mutex);
-
-		if (!g_init)
-		{
-			while (lis)
-			{
-				lis->log(stamp, *this, prefix, text);
-				lis = lis->m_next;
-			}
-
-			// Store message additionally
-			get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text});
-		}
-	}
-
-	// Send message to all listeners
-	while (lis)
-	{
-		lis->log(stamp, *this, prefix, text);
-		lis = lis->m_next;
-	}
+	va_list args;
+	va_start(args, fmt);
+	get_logger().log(ch, sev, fmt::unsafe_vformat(fmt, args));
+	va_end(args);
 }

 [[noreturn]] extern void catch_all_exceptions();

 logs::file_writer::file_writer(const std::string& name)
-	: m_name(name)
 {
 	try
 	{
-		if (!m_file.open(fs::get_config_dir() + name, fs::read + fs::write + fs::create + fs::trunc + fs::unshare))
+		if (!m_file.open(fs::get_config_dir() + name, fs::rewrite + fs::append))
 		{
-			fmt::throw_exception("Can't create file %s (error %s)", name, fs::g_tls_error);
+			throw fmt::exception("Can't create log file %s (error %d)", name, fs::g_tls_error);
 		}
-
-#ifdef _WIN32
-		m_fmap = CreateFileMappingW(m_file.get_handle(), 0, PAGE_READWRITE, s_log_size >> 32, s_log_size & 0xffffffff, 0);
-		m_fptr = m_fmap ? (uchar*)MapViewOfFile(m_fmap, FILE_MAP_WRITE, 0, 0, 0) : nullptr;
-#else
-		m_file.trunc(s_log_size);
-		m_fptr = (uchar*)::mmap(0, s_log_size, PROT_READ | PROT_WRITE, MAP_SHARED, m_file.get_handle(), 0);
-#endif
-
-		verify(name.c_str()), m_fptr;
-		std::memset(m_fptr, '\n', s_log_size);
-
-		// Rotate backups (TODO)
-		fs::remove_file(fs::get_config_dir() + name + "1.gz");
-		fs::create_dir(fs::get_config_dir() + "old_logs");
-		fs::rename(fs::get_config_dir() + m_name + ".gz", fs::get_config_dir() + "old_logs/" + m_name + ".gz", true);
 	}
 	catch (...)
 	{
@@ -320,131 +94,54 @@ logs::file_writer::file_writer(const std::string& name)
 	}
 }

-logs::file_writer::~file_writer()
+void logs::file_writer::log(const std::string& text)
 {
-	if (m_size == 0)
-	{
-		m_size = std::min<std::size_t>(+m_pos, s_log_size);
-	}
-
-	// Compress
-	z_stream zs{};
-	if (deflateInit2(&zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) == Z_OK)
-	{
-		auto buf = std::make_unique<uchar[]>(s_log_size);
-		zs.avail_in  = ::narrow<u32>(m_size);
-		zs.avail_out = s_log_size;
-		zs.next_in   = m_fptr;
-		zs.next_out  = buf.get();
-
-		if (deflate(&zs, Z_FINISH) != Z_STREAM_ERROR)
-		{
-			fs::file(fs::get_config_dir() + m_name + ".gz", fs::rewrite).write(buf.get(), zs.total_out);
-		}
-
-		if (deflateEnd(&zs) != Z_OK)
-		{
-		}
-	}
-
-#ifdef _WIN32
-	UnmapViewOfFile(m_fptr);
-	CloseHandle(m_fmap);
-#else
-	::munmap(m_fptr, s_log_size);
-#endif
-	m_file.trunc(m_size);
+	m_file.write(text);
 }

-void logs::file_writer::log(logs::level sev, const char* text, std::size_t size)
+std::size_t logs::file_writer::size() const
 {
-	// Adaptive log limit
-	const auto lim =
-		sev >= logs::level::success ? s_log_size_s :
-		sev == logs::level::todo ? s_log_size_t :
-		sev == logs::level::error ? s_log_size_e : s_log_size_f;
-
-	if (m_pos >= lim)
-	{
-		return;
-	}
-
-	// Acquire memory
-	const auto pos = m_pos.fetch_add(size);
-
-	// Write if possible
-	if (pos + size <= s_log_size)
-	{
-		std::memcpy(m_fptr + pos, text, size);
-	}
-	else if (pos <= s_log_size)
-	{
-		m_size = pos;
-	}
+	return m_file.pos();
 }

-logs::file_listener::file_listener(const std::string& name)
-	: file_writer(name)
-	, listener()
+void logs::file_listener::log(const logs::channel& ch, logs::level sev, const std::string& text)
 {
-	// Write UTF-8 BOM
-	file_writer::log(logs::level::always, "\xEF\xBB\xBF", 3);
-
-	// Write initial message
-	stored_message ver;
-	ver.m.ch  = nullptr;
-	ver.m.sev = level::always;
-	ver.stamp = 0;
-	ver.text = fmt::format("RPCS3 v%s | %s\n%s", rpcs3::version.to_string(), rpcs3::get_branch(), utils::get_system_info());
-
-	file_writer::log(logs::level::always, ver.text.data(), ver.text.size());
-	file_writer::log(logs::level::always, "\n", 1);
-	messages.emplace_back(std::move(ver));
-}
-
-void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& _text)
-{
-	thread_local std::string text;
+	std::string msg; msg.reserve(text.size() + 200);

 	// Used character: U+00B7 (Middle Dot)
-	switch (msg.sev)
+	switch (sev)
 	{
-	case level::always:  text = u8"·A "; break;
-	case level::fatal:   text = u8"·F "; break;
-	case level::error:   text = u8"·E "; break;
-	case level::todo:    text = u8"·U "; break;
-	case level::success: text = u8"·S "; break;
-	case level::warning: text = u8"·W "; break;
-	case level::notice:  text = u8"·! "; break;
-	case level::trace:   text = u8"·T "; break;
+	case level::always:  msg = u8"·A "; break;
+	case level::fatal:   msg = u8"·F "; break;
+	case level::error:   msg = u8"·E "; break;
+	case level::todo:    msg = u8"·U "; break;
+	case level::success: msg = u8"·S "; break;
+	case level::warning: msg = u8"·W "; break;
+	case level::notice:  msg = u8"·! "; break;
+	case level::trace:   msg = u8"·T "; break;
 	}

-	// Print miscosecond timestamp
-	const u64 hours = stamp / 3600'000'000;
-	const u64 mins = (stamp % 3600'000'000) / 60'000'000;
-	const u64 secs = (stamp % 60'000'000) / 1'000'000;
-	const u64 frac = (stamp % 1'000'000);
-	fmt::append(text, "%u:%02u:%02u.%06u ", hours, mins, secs, frac);
+	// TODO: print time?

-	if (prefix.size() > 0)
+	if (auto prefix = g_tls_log_prefix)
 	{
-		text += "{";
-		text += prefix;
-		text += "} ";
+		msg += '{';
+		msg += prefix();
+		msg += "} ";
 	}
-
-	if (msg.ch && '\0' != *msg.ch->name)
+	
+	if (ch.name)
 	{
-		text += msg.ch->name;
-		text += msg.sev == level::todo ? " TODO: " : ": ";
+		msg += ch.name;
+		msg += sev == level::todo ? " TODO: " : ": ";
 	}
-	else if (msg.sev == level::todo)
+	else if (sev == level::todo)
 	{
-		text += "TODO: ";
+		msg += "TODO: ";
 	}
+	
+	msg += text;
+	msg += '\n';

-	text += _text;
-	text += '\n';
-
-	file_writer::log(msg.sev, text.data(), text.size());
+	file_writer::log(msg);
 }
@@ -2,54 +2,19 @@

 #include "types.h"
 #include "Atomic.h"
-#include "StrFmt.h"
-#include <climits>

 namespace logs
 {
 	enum class level : uint
 	{
-		always, // Highest log severity (unused, cannot be disabled)
+		always, // highest level (unused, cannot be disabled)
 		fatal,
 		error,
 		todo,
 		success,
 		warning,
 		notice,
-		trace, // Lowest severity (usually disabled)
-
-		_uninit = UINT_MAX, // Special value for delayed initialization
-	};
-
-	struct channel;
-
-	// Message information (temporary data)
-	struct message
-	{
-		channel* ch;
-		level sev;
-
-		// Send log message to global logger instance
-		void broadcast(const char*, const fmt_type_info*, const u64*);
-	};
-
-	class listener
-	{
-		// Next listener (linked list)
-		atomic_t<listener*> m_next{};
-
-		friend struct message;
-
-	public:
-		constexpr listener() = default;
-
-		virtual ~listener();
-
-		// Process log message
-		virtual void log(u64 stamp, const message& msg, const std::string& prefix, const std::string& text) = 0;
-
-		// Add new listener
-		static void add(listener*);
+		trace, // lowest level (usually disabled)
 	};

 	struct channel
@@ -60,26 +25,28 @@ namespace logs
 		// The lowest logging level enabled for this channel (used for early filtering)
 		atomic_t<level> enabled;

-		// Constant initialization: channel name
-		constexpr channel(const char* name)
+		// Constant initialization: name and initial log level
+		constexpr channel(const char* name, level enabled = level::trace)
 			: name(name)
-			, enabled(level::_uninit)
+			, enabled(enabled)
 		{
 		}

 		// Formatting function
 		template<typename... Args>
-		SAFE_BUFFERS FORCE_INLINE void format(level sev, const char* fmt, const Args&... args)
+		void format(level sev, const char* fmt, const Args&... args) const
 		{
-			if (UNLIKELY(sev <= enabled))
-			{
-				message{this, sev}.broadcast(fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
-			}
+#ifdef _MSC_VER
+			if (sev <= enabled)
+#else
+			if (__builtin_expect(sev <= enabled, 0))
+#endif
+				broadcast(*this, sev, fmt, ::unveil<Args>::get(args)...);
 		}

 #define GEN_LOG_METHOD(_sev)\
 		template<typename... Args>\
-		SAFE_BUFFERS void _sev(const char* fmt, const Args&... args)\
+		void _sev(const char* fmt, const Args&... args) const\
 		{\
 			return format<Args...>(level::_sev, fmt, args...);\
 		}
@@ -93,6 +60,10 @@ namespace logs
 		GEN_LOG_METHOD(trace)

 #undef GEN_LOG_METHOD
+
+	private:
+		// Send log message to global logger instance
+		static void broadcast(const channel& ch, level sev, const char* fmt...);
 	};

 	/* Small set of predefined channels */
@@ -105,20 +76,30 @@ namespace logs
 	extern channel PPU;
 	extern channel SPU;
 	extern channel ARMv7;
-
-	// Log level control: set all channels to level::notice
-	void reset();
-
-	// Log level control: register channel if necessary, set channel level
-	void set_level(const std::string&, level);
 }

+template<>
+struct bijective<logs::level, const char*>
+{
+	static constexpr bijective_pair<logs::level, const char*> map[]
+	{
+		{ logs::level::always, "Nothing" },
+		{ logs::level::fatal, "Fatal" },
+		{ logs::level::error, "Error" },
+		{ logs::level::todo, "TODO" },
+		{ logs::level::success, "Success" },
+		{ logs::level::warning, "Warning" },
+		{ logs::level::notice, "Notice" },
+		{ logs::level::trace, "Trace" },
+	};
+};
+
 // Legacy:

-#define LOG_SUCCESS(ch, fmt, ...) logs::ch.success("" fmt, ##__VA_ARGS__)
-#define LOG_NOTICE(ch, fmt, ...)  logs::ch.notice ("" fmt, ##__VA_ARGS__)
-#define LOG_WARNING(ch, fmt, ...) logs::ch.warning("" fmt, ##__VA_ARGS__)
-#define LOG_ERROR(ch, fmt, ...)   logs::ch.error  ("" fmt, ##__VA_ARGS__)
-#define LOG_TODO(ch, fmt, ...)    logs::ch.todo   ("" fmt, ##__VA_ARGS__)
-#define LOG_TRACE(ch, fmt, ...)   logs::ch.trace  ("" fmt, ##__VA_ARGS__)
-#define LOG_FATAL(ch, fmt, ...)   logs::ch.fatal  ("" fmt, ##__VA_ARGS__)
+#define LOG_SUCCESS(ch, fmt, ...) logs::ch.success(fmt, ##__VA_ARGS__)
+#define LOG_NOTICE(ch, fmt, ...)  logs::ch.notice (fmt, ##__VA_ARGS__)
+#define LOG_WARNING(ch, fmt, ...) logs::ch.warning(fmt, ##__VA_ARGS__)
+#define LOG_ERROR(ch, fmt, ...)   logs::ch.error  (fmt, ##__VA_ARGS__)
+#define LOG_TODO(ch, fmt, ...)    logs::ch.todo   (fmt, ##__VA_ARGS__)
+#define LOG_TRACE(ch, fmt, ...)   logs::ch.trace  (fmt, ##__VA_ARGS__)
+#define LOG_FATAL(ch, fmt, ...)   logs::ch.fatal  (fmt, ##__VA_ARGS__)
@@ -0,0 +1,98 @@
+#pragma once
+
+class MTProgressDialog : public wxDialog
+{
+	wxGauge** m_gauge;
+	wxStaticText** m_msg;
+
+	wxArrayLong m_maximum;
+	const u8 m_cores;
+
+	static const uint layout = 16;
+	static const uint maxdial = 65536;
+	wxArrayInt m_lastupdate;
+
+public:
+	MTProgressDialog(wxWindow* parent, const wxSize& size, const wxString& title,
+			const wxString& msg, const wxArrayLong& maximum, const u8 cores)
+		: wxDialog(parent, wxID_ANY, title, wxDefaultPosition)
+		, m_maximum(maximum)
+		, m_cores(cores)
+	{
+		wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+
+		m_gauge = new wxGauge*[m_cores];
+		m_msg = new wxStaticText*[m_cores];
+
+		m_lastupdate.SetCount(cores);
+
+		for(uint i=0; i<m_cores; ++i)
+		{
+			m_lastupdate[i] = -1;
+
+			m_msg[i] = new wxStaticText(this, wxID_ANY, msg);
+			sizer->Add(m_msg[i], 0, wxLEFT | wxTOP, layout);
+
+			m_gauge[i] = new wxGauge(this, wxID_ANY, maxdial,
+									  wxDefaultPosition, wxDefaultSize,
+									  wxGA_HORIZONTAL );
+
+			sizer->Add(m_gauge[i], 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, layout);
+			m_gauge[i]->SetValue(0);
+
+			sizer->AddSpacer(5);
+		}
+
+		SetSizerAndFit(sizer);
+		if(size != wxDefaultSize)
+		{
+			SetSize(size);
+		}
+		else
+		{
+			wxSize ws;
+			ws.x = 400;
+			ws.y = GetSize().y + 8;
+			SetSize(ws);
+		}
+
+		m_maximum.SetCount(m_cores);
+
+		Show();
+	}
+
+	force_inline void Update(const u8 thread_id, const u64 value, const wxString& msg)
+	{
+		if(thread_id > m_cores) return;
+
+		const int curupdate = (int)(((double)value/(double)m_maximum[thread_id])*1000);
+		if(curupdate == m_lastupdate[thread_id]) return;
+		m_lastupdate[thread_id] = curupdate;
+
+		m_msg[thread_id]->SetLabel(msg);
+
+		if(value >= (u32)m_maximum[thread_id]) return;
+		m_gauge[thread_id]->SetValue(((double)value / (double)m_maximum[thread_id]) * maxdial);
+	}
+
+	const u32 GetMaxValue(const uint thread_id) const
+	{
+		if(thread_id > m_cores) return 0;
+		return m_maximum[thread_id];
+	}
+
+	void SetMaxFor(const uint thread_id, const u64 val)
+	{
+		if(thread_id > m_cores) return;
+		m_maximum[thread_id] = val;
+		m_lastupdate[thread_id] = 0;
+	}
+
+	virtual void Close(bool force = false)
+	{
+		m_lastupdate.Empty();
+		m_maximum.Empty();
+
+		wxDialog::Close(force);
+	}
+};
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <cstdint>
+#include <exception>
+
+template<typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
+constexpr T align(const T& value, std::uint64_t align)
+{
+	return static_cast<T>((value + (align - 1)) & ~(align - 1));
+}
+
+template<typename To, typename From>
+constexpr To narrow_impl(const To& result, const From& value, const char* message)
+{
+	return static_cast<From>(result) != value ? throw std::runtime_error(message) : result;
+}
+
+// Narrow cast (similar to gsl::narrow) with fixed message
+template<typename To, typename From>
+constexpr auto narrow(const From& value, const char* fixed_msg = "::narrow() failed") -> decltype(static_cast<To>(static_cast<From>(std::declval<To>())))
+{
+	return narrow_impl(static_cast<To>(value), value, fixed_msg);
+}
+
+// Return 32 bit .size() for container
+template<typename CT>
+constexpr auto size32(const CT& container, const char* fixed_msg = "::size32() failed") -> decltype(static_cast<std::uint32_t>(container.size()))
+{
+	return narrow<std::uint32_t>(container.size(), fixed_msg);
+}
+
+// Return 32 bit size for an array
+template<typename T, std::size_t Size>
+constexpr std::uint32_t size32(const T(&)[Size])
+{
+	static_assert(Size <= UINT32_MAX, "size32() error: too big");
+	return static_cast<std::uint32_t>(Size);
+}
+
+#define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size")
+#define CHECK_ALIGN(type, align) static_assert(alignof(type) == align, "Invalid " #type " type alignment")
+#define CHECK_MAX_SIZE(type, size) static_assert(sizeof(type) <= size, #type " type size is too big")
+#define CHECK_SIZE_ALIGN(type, size, align) CHECK_SIZE(type, size); CHECK_ALIGN(type, align)
+#define CHECK_STORAGE(type, storage) static_assert(sizeof(type) <= sizeof(storage) && alignof(type) <= alignof(decltype(storage)), #type " is too small")
+
+// Return 32 bit sizeof() to avoid widening/narrowing conversions with size_t
+#define SIZE_32(type) static_cast<std::uint32_t>(sizeof(type))
+
+// Return 32 bit alignof() to avoid widening/narrowing conversions with size_t
+#define ALIGN_32(type) static_cast<std::uint32_t>(alignof(type))
+
+// Return 32 bit custom offsetof()
+#define OFFSET_32(type, x) static_cast<std::uint32_t>(reinterpret_cast<std::uintptr_t>(&reinterpret_cast<const volatile char&>(reinterpret_cast<type*>(0ull)->x)))
+
+// Sometimes to avoid writing std::remove_cv_t<>, example: std::is_same<CV T1, CV T2>
+#define CV const volatile
+
+#define CONCATENATE_DETAIL(x, y) x ## y
+#define CONCATENATE(x, y) CONCATENATE_DETAIL(x, y)
+
+#define STRINGIZE_DETAIL(x) #x
+#define STRINGIZE(x) STRINGIZE_DETAIL(x)
+
+// Macro set, wraps an expression into lambda
+#define WRAP_EXPR(expr, ...) [&](__VA_ARGS__) { return expr; }
+#define COPY_EXPR(expr, ...) [=](__VA_ARGS__) { return expr; }
+#define PURE_EXPR(expr, ...) [] (__VA_ARGS__) { return expr; }
+
+#define return_ return
+
+#define HERE "\n(in file " __FILE__ ":" STRINGIZE(__LINE__) ")"
+
+// Ensure that the expression is evaluated to true. Always evaluated and allowed to have side effects (unlike assert() macro).
+#define VERIFY(expr) do { if (!(expr)) throw std::runtime_error("Verification failed: " #expr HERE); } while (0)
+
+// EXPECTS() and ENSURES() are intended to check function arguments and results.
+// Expressions are not guaranteed to evaluate.
+#define EXPECTS(expr) do { if (!(expr)) throw std::runtime_error("Precondition failed: " #expr HERE); } while (0)
+#define ENSURES(expr) do { if (!(expr)) throw std::runtime_error("Postcondition failed: " #expr HERE); } while (0)
+
+#define DECLARE(...) decltype(__VA_ARGS__) __VA_ARGS__
+
+#define STR_CASE(value) case value: return #value
@@ -0,0 +1,51 @@
+#include "Platform.h"
+
+#ifdef __APPLE__
+#include <sys/types.h>
+#include <sys/_types/_timespec.h>
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <mach/mach_time.h>
+#undef CPU_STATE_MAX
+
+#define MT_NANO (+1.0E-9)
+#define MT_GIGA UINT64_C(1000000000)
+
+// TODO create a list of timers,
+static double mt_timebase = 0.0;
+static uint64_t mt_timestart = 0;
+
+// TODO be more careful in a multithreaded environement
+int clock_gettime(clockid_t clk_id, struct timespec *tp)
+{
+    kern_return_t retval = KERN_SUCCESS;
+    if( clk_id == TIMER_ABSTIME)
+    {
+        if (!mt_timestart) { // only one timer, initilized on the first call to the TIMER
+            mach_timebase_info_data_t tb = { 0 };
+            mach_timebase_info(&tb);
+            mt_timebase = tb.numer;
+            mt_timebase /= tb.denom;
+            mt_timestart = mach_absolute_time();
+        }
+
+        double diff = (mach_absolute_time() - mt_timestart) * mt_timebase;
+        tp->tv_sec = diff * MT_NANO;
+        tp->tv_nsec = diff - (tp->tv_sec * MT_GIGA);
+    }
+    else // other clk_ids are mapped to the coresponding mach clock_service
+    {
+        clock_serv_t cclock;
+        mach_timespec_t mts;
+
+        host_get_clock_service(mach_host_self(), clk_id, &cclock);
+        retval = clock_get_time(cclock, &mts);
+        mach_port_deallocate(mach_task_self(), cclock);
+
+        tp->tv_sec = mts.tv_sec;
+        tp->tv_nsec = mts.tv_nsec;
+    }
+
+    return retval;
+}
+#endif /* __APPLE__ */
@@ -0,0 +1,122 @@
+#pragma once
+
+#include <cstdint>
+#include <immintrin.h>
+#include <emmintrin.h>
+
+#define IS_LE_MACHINE 1
+#define IS_BE_MACHINE 0
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+
+#ifdef _MSC_VER
+#define ASSUME(cond) __assume(cond)
+#define LIKELY(cond) (cond)
+#define UNLIKELY(cond) (cond)
+#else
+#define ASSUME(cond) do { if (!(cond)) __builtin_unreachable(); } while (0)
+#define LIKELY(cond) __builtin_expect(!!(cond), 1)
+#define UNLIKELY(cond) __builtin_expect(!!(cond), 0)
+#endif
+
+// Some platforms don't support thread_local well yet.
+#ifndef _MSC_VER
+#define thread_local __thread
+#endif
+
+#ifdef _MSC_VER
+#define never_inline __declspec(noinline)
+#else
+#define never_inline __attribute__((noinline))
+#endif
+
+#ifdef _MSC_VER
+#define force_inline __forceinline
+#else
+#define force_inline __attribute__((always_inline)) inline
+#endif
+
+#if defined(__GNUG__)
+
+#include <stdlib.h>
+
+#define _fpclass(x) std::fpclassify(x)
+#define INFINITE 0xFFFFFFFF
+
+#ifdef __APPLE__
+
+// XXX only supports a single timer
+#define TIMER_ABSTIME -1
+/* The opengroup spec isn't clear on the mapping from REALTIME to CALENDAR
+ being appropriate or not.
+ http://pubs.opengroup.org/onlinepubs/009695299/basedefs/time.h.html */
+#define CLOCK_REALTIME  1 // #define CALENDAR_CLOCK 1 from mach/clock_types.h
+#define CLOCK_MONOTONIC 0 // #define SYSTEM_CLOCK 0
+
+typedef int clockid_t;
+
+/* the mach kernel uses struct mach_timespec, so struct timespec
+    is loaded from <sys/_types/_timespec.h> for compatability */
+// struct timespec { time_t tv_sec; long tv_nsec; };
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp);
+
+#endif /* __APPLE__ */
+#endif /* __GNUG__ */
+
+inline std::uint32_t cntlz32(std::uint32_t arg)
+{
+#if defined(_MSC_VER)
+	unsigned long res;
+	return _BitScanReverse(&res, arg) ? res ^ 31 : 32;
+#else
+	return arg ? __builtin_clzll(arg) - 32 : 32;
+#endif
+}
+
+inline std::uint64_t cntlz64(std::uint64_t arg)
+{
+#if defined(_MSC_VER)
+	unsigned long res;
+	return _BitScanReverse64(&res, arg) ? res ^ 63 : 64;
+#else
+	return arg ? __builtin_clzll(arg) : 64;
+#endif
+}
+
+// Helper function, used by ""_u16, ""_u32, ""_u64
+constexpr std::uint8_t to_u8(char c)
+{
+	return static_cast<std::uint8_t>(c);
+}
+
+// Convert 2-byte string to u16 value like reinterpret_cast does
+constexpr std::uint16_t operator""_u16(const char* s, std::size_t length)
+{
+	return length != 2 ? throw s :
+#if IS_LE_MACHINE == 1
+		to_u8(s[1]) << 8 | to_u8(s[0]);
+#endif
+}
+
+// Convert 4-byte string to u32 value like reinterpret_cast does
+constexpr std::uint32_t operator""_u32(const char* s, std::size_t length)
+{
+	return length != 4 ? throw s :
+#if IS_LE_MACHINE == 1
+		to_u8(s[3]) << 24 | to_u8(s[2]) << 16 | to_u8(s[1]) << 8 | to_u8(s[0]);
+#endif
+}
+
+// Convert 8-byte string to u64 value like reinterpret_cast does
+constexpr std::uint64_t operator""_u64(const char* s, std::size_t length)
+{
+	return length != 8 ? throw s :
+#if IS_LE_MACHINE == 1
+		static_cast<std::uint64_t>(to_u8(s[7]) << 24 | to_u8(s[6]) << 16 | to_u8(s[5]) << 8 | to_u8(s[4])) << 32 | to_u8(s[3]) << 24 | to_u8(s[2]) << 16 | to_u8(s[1]) << 8 | to_u8(s[0]);
+#endif
+}
@@ -0,0 +1,90 @@
+#include "Utilities/Semaphore.h"
+
+#include <mutex>
+#include <condition_variable>
+
+struct benaphore::internal
+{
+	std::mutex mutex;
+
+	std::size_t acq_order{};
+	std::size_t rel_order{};
+
+	std::condition_variable cond;
+};
+
+void benaphore::wait_hard()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	// Notify non-zero waiter queue size
+	if (m_value.exchange(-1) == 1)
+	{
+		// Return immediately (acquired)
+		m_value = 0;
+		return;
+	}
+
+	// Remember the order
+	const std::size_t order = ++m_data->acq_order;
+
+	// Wait for the appropriate rel_order (TODO)
+	while (m_data->rel_order < order)
+	{
+		m_data->cond.wait(lock);
+	}
+
+	if (order == m_data->acq_order && m_data->acq_order == m_data->rel_order)
+	{
+		// Cleaup
+		m_data->acq_order = 0;
+		m_data->rel_order = 0;
+		m_value.compare_and_swap(-1, 0);
+	}
+}
+
+void benaphore::post_hard()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	if (m_value.compare_and_swap(0, 1) != -1)
+	{
+		// Do nothing (released)
+		return;
+	}
+
+	if (m_data->acq_order == m_data->rel_order)
+	{
+		m_value = 1;
+		return;
+	}
+
+	// Awake one thread
+	m_data->rel_order += 1;
+		
+	// Unlock and notify
+	lock.unlock();
+	m_data->cond.notify_one();
+}
+
+void benaphore::initialize_once()
+{
+	if (UNLIKELY(!m_data))
+	{
+		auto ptr = new benaphore::internal;
+
+		if (!m_data.compare_and_swap_test(nullptr, ptr))
+		{
+			delete ptr;
+		}
+	}
+}
+
+benaphore::~benaphore()
+{
+	delete m_data;
+}
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "types.h"
+#include "Atomic.h"
+#include "Platform.h"
+
+// Binary semaphore
+class benaphore
+{
+	struct internal;
+
+	// Reserved value (-1) enforces *_hard() calls
+	atomic_t<u32> m_value{};
+
+	atomic_t<internal*> m_data{};
+
+	void wait_hard();
+	void post_hard();
+
+public:
+	constexpr benaphore() = default;
+
+	~benaphore();
+
+	// Initialize internal data
+	void initialize_once();
+
+	void wait()
+	{
+		if (UNLIKELY(!m_value.compare_and_swap_test(1, 0)))
+		{
+			wait_hard();
+		}
+	}
+
+	bool try_wait()
+	{
+		return m_value.compare_and_swap_test(1, 0);
+	}
+
+	void post()
+	{
+		if (UNLIKELY(!m_value.compare_and_swap_test(0, 1)))
+		{
+			post_hard();
+		}
+	}
+};
@@ -0,0 +1,187 @@
+#include "SharedMutex.h"
+
+#include <mutex>
+#include <condition_variable>
+
+struct shared_mutex::internal
+{
+	std::mutex mutex;
+
+	std::size_t rq_size{}; // Reader queue size (threads waiting on m_rcv)
+	std::size_t wq_size{}; // Writer queue size (threads waiting on m_wcv and m_ocv)
+
+	std::condition_variable rcv; // Reader queue
+	std::condition_variable wcv; // Writer queue
+	std::condition_variable ocv; // For current exclusive owner
+};
+
+void shared_mutex::lock_shared_hard()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	// Validate
+	if ((m_ctrl & SM_INVALID_BIT) != 0) throw std::runtime_error("shared_mutex::lock_shared(): Invalid bit");
+	if ((m_ctrl & SM_READER_MASK) == 0) throw std::runtime_error("shared_mutex::lock_shared(): No readers");
+
+	// Notify non-zero reader queue size
+	m_ctrl |= SM_WAITERS_BIT, m_data->rq_size++;
+
+	// Fix excess reader count
+	if ((--m_ctrl & SM_READER_MASK) == 0 && m_data->wq_size)
+	{
+		// Notify exclusive owner
+		m_data->ocv.notify_one();
+	}
+
+	// Obtain the reader lock
+	while (true)
+	{
+		const auto ctrl = m_ctrl.load();
+
+		// Check writers and reader limit
+		if (m_data->wq_size || (ctrl & ~SM_WAITERS_BIT) >= SM_READER_MAX)
+		{
+			m_data->rcv.wait(lock);
+			continue;
+		}
+
+		if (m_ctrl.compare_and_swap_test(ctrl, ctrl + 1))
+		{
+			break;
+		}
+	}
+
+	if (!--m_data->rq_size && !m_data->wq_size)
+	{
+		m_ctrl &= ~SM_WAITERS_BIT;
+	}
+}
+
+void shared_mutex::unlock_shared_notify()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	if ((m_ctrl & SM_READER_MASK) == 0 && m_data->wq_size)
+	{
+		// Notify exclusive owner
+		lock.unlock();
+		m_data->ocv.notify_one();
+	}
+	else if (m_data->rq_size)
+	{
+		// Notify other readers
+		lock.unlock();
+		m_data->rcv.notify_one();
+	}
+}
+
+void shared_mutex::lock_hard()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	// Validate
+	if ((m_ctrl & SM_INVALID_BIT) != 0) throw std::runtime_error("shared_mutex::lock(): Invalid bit");
+
+	// Notify non-zero writer queue size
+	m_ctrl |= SM_WAITERS_BIT, m_data->wq_size++;
+
+	// Obtain the writer lock
+	while (true)
+	{
+		const auto ctrl = m_ctrl.load();
+
+		if (ctrl & SM_WRITER_LOCK)
+		{
+			m_data->wcv.wait(lock);
+			continue;
+		}
+
+		if (m_ctrl.compare_and_swap_test(ctrl, ctrl | SM_WRITER_LOCK))
+		{
+			break;
+		}
+	}
+
+	// Wait for remaining readers
+	while ((m_ctrl & SM_READER_MASK) != 0)
+	{
+		m_data->ocv.wait(lock);
+	}
+
+	if (!--m_data->wq_size && !m_data->rq_size)
+	{
+		m_ctrl &= ~SM_WAITERS_BIT;
+	}
+}
+
+void shared_mutex::unlock_notify()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	if (m_data->wq_size)
+	{
+		// Notify next exclusive owner
+		lock.unlock();
+		m_data->wcv.notify_one();
+	}
+	else if (m_data->rq_size)
+	{
+		// Notify all readers
+		lock.unlock();
+		m_data->rcv.notify_all();
+	}
+}
+
+void shared_mutex::lock_upgrade_hard()
+{
+	unlock_shared();
+	lock();
+}
+
+void shared_mutex::lock_degrade_hard()
+{
+	initialize_once();
+
+	std::unique_lock<std::mutex> lock(m_data->mutex);
+
+	m_ctrl -= SM_WRITER_LOCK - 1;
+
+	if (m_data->rq_size)
+	{
+		// Notify all readers
+		lock.unlock();
+		m_data->rcv.notify_all();
+	}
+	else if (m_data->wq_size)
+	{
+		// Notify next exclusive owner
+		lock.unlock();
+		m_data->wcv.notify_one();
+	}
+}
+
+void shared_mutex::initialize_once()
+{
+	if (UNLIKELY(!m_data))
+	{
+		auto ptr = new shared_mutex::internal;
+
+		if (!m_data.compare_and_swap_test(nullptr, ptr))
+		{
+			delete ptr;
+		}
+	}
+}
+
+shared_mutex::~shared_mutex()
+{
+	delete m_data;
+}
@@ -0,0 +1,180 @@
+#pragma once
+
+#include "types.h"
+#include "Atomic.h"
+#include "Platform.h"
+
+//! An attempt to create effective implementation of "shared mutex", lock-free in optimistic case.
+//! All locking and unlocking may be done by a single LOCK XADD or LOCK CMPXCHG instruction.
+//! MSVC implementation of std::shared_timed_mutex seems suboptimal.
+//! std::shared_mutex is not available until C++17.
+class shared_mutex final
+{
+	enum : u32
+	{
+		SM_WRITER_LOCK = 1u << 31, // Exclusive lock flag, must be MSB
+		SM_WAITERS_BIT = 1u << 30, // Flag set if m_wq_size or m_rq_size is non-zero
+		SM_INVALID_BIT = 1u << 29, // Unreachable reader count bit (may be set by incorrect unlock_shared() call)
+
+		SM_READER_MASK = SM_WAITERS_BIT - 1, // Valid reader count bit mask
+		SM_READER_MAX  = 1u << 24, // Max reader count
+	};
+
+	atomic_t<u32> m_ctrl{}; // Control variable: reader count | SM_* flags
+
+	struct internal;
+
+	atomic_t<internal*> m_data{}; // Internal data
+
+	void lock_shared_hard();
+	void unlock_shared_notify();
+
+	void lock_hard();
+	void unlock_notify();
+
+	void lock_upgrade_hard();
+	void lock_degrade_hard();
+
+public:
+	constexpr shared_mutex() = default;
+
+	// Initialize internal data
+	void initialize_once();
+
+	~shared_mutex();
+
+	bool try_lock_shared()
+	{
+		const u32 ctrl = m_ctrl.load();
+
+		return ctrl < SM_READER_MAX && m_ctrl.compare_and_swap_test(ctrl, ctrl + 1);
+	}
+
+	void lock_shared()
+	{
+		// Optimization: unconditional increment, compensated later
+		if (UNLIKELY(m_ctrl++ >= SM_READER_MAX))
+		{
+			lock_shared_hard();
+		}
+	}
+
+	void unlock_shared()
+	{
+		if (UNLIKELY(m_ctrl-- >= SM_READER_MAX))
+		{
+			unlock_shared_notify();
+		}
+	}
+
+	bool try_lock()
+	{
+		return !m_ctrl && m_ctrl.compare_and_swap_test(0, SM_WRITER_LOCK);
+	}
+
+	void lock()
+	{
+		if (UNLIKELY(!m_ctrl.compare_and_swap_test(0, SM_WRITER_LOCK)))
+		{
+			lock_hard();
+		}
+	}
+
+	void unlock()
+	{
+		m_ctrl &= ~SM_WRITER_LOCK;
+
+		if (UNLIKELY(m_ctrl))
+		{
+			unlock_notify();
+		}
+	}
+
+	bool try_lock_upgrade()
+	{
+		return m_ctrl == 1 && m_ctrl.compare_and_swap_test(1, SM_WRITER_LOCK);
+	}
+
+	bool try_lock_degrade()
+	{
+		return m_ctrl == SM_WRITER_LOCK && m_ctrl.compare_and_swap_test(SM_WRITER_LOCK, 1);
+	}
+
+	void lock_upgrade()
+	{
+		if (UNLIKELY(!m_ctrl.compare_and_swap_test(1, SM_WRITER_LOCK)))
+		{
+			lock_upgrade_hard();
+		}
+	}
+
+	void lock_degrade()
+	{
+		if (UNLIKELY(!m_ctrl.compare_and_swap_test(SM_WRITER_LOCK, 1)))
+		{
+			lock_degrade_hard();
+		}
+	}
+};
+
+//! Simplified shared (reader) lock implementation.
+//! std::shared_lock may be used instead if necessary.
+class reader_lock final
+{
+	shared_mutex& m_mutex;
+
+public:
+	reader_lock(const reader_lock&) = delete;
+
+	reader_lock(shared_mutex& mutex)
+		: m_mutex(mutex)
+	{
+		m_mutex.lock_shared();
+	}
+
+	~reader_lock()
+	{
+		m_mutex.unlock_shared();
+	}
+};
+
+//! Simplified exclusive (writer) lock implementation.
+//! std::lock_guard may or std::unique_lock be used instead if necessary.
+class writer_lock final
+{
+	shared_mutex& m_mutex;
+
+public:
+	writer_lock(const writer_lock&) = delete;
+
+	writer_lock(shared_mutex& mutex)
+		: m_mutex(mutex)
+	{
+		m_mutex.lock();
+	}
+
+	~writer_lock()
+	{
+		m_mutex.unlock();
+	}
+};
+
+// Exclusive (writer) lock in the scope of shared (reader) lock.
+class upgraded_lock final
+{
+	shared_mutex& m_mutex;
+
+public:
+	upgraded_lock(const writer_lock&) = delete;
+
+	upgraded_lock(shared_mutex& mutex)
+		: m_mutex(mutex)
+	{
+		m_mutex.lock_upgrade();
+	}
+
+	~upgraded_lock()
+	{
+		m_mutex.lock_degrade();
+	}
+};
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <deque>
+
+// Tag used in sleep_entry<> constructor
+static struct defer_sleep_tag {} constexpr defer_sleep{};
+
+// Define sleep queue as std::deque with T* pointers, T - thread type
+template<typename T> using sleep_queue = std::deque<T*>;
+
+// Automatic object handling a thread pointer (T*) in the sleep queue
+// Sleep is called in the constructor (if not null)
+// Awake is called in the destructor (if not null)
+// Sleep queue is actually std::deque with pointers, be careful about the lifetime
+template<typename T, void(T::*Sleep)() = &T::sleep, void(T::*Awake)() = &T::awake>
+class sleep_entry final
+{
+	sleep_queue<T>& m_queue;
+	T& m_thread;
+
+public:
+	// Constructor; enter() not called
+	sleep_entry(sleep_queue<T>& queue, T& entry, const defer_sleep_tag&)
+		: m_queue(queue)
+		, m_thread(entry)
+	{
+		if (Sleep) (m_thread.*Sleep)();
+	}
+
+	// Constructor; calls enter()
+	sleep_entry(sleep_queue<T>& queue, T& entry)
+		: sleep_entry(queue, entry, defer_sleep)
+	{
+		enter();
+	}
+
+	// Destructor; calls leave()
+	~sleep_entry()
+	{
+		leave();
+		if (Awake) (m_thread.*Awake)();
+	}
+
+	// Add thread to the sleep queue
+	void enter()
+	{
+		for (auto t : m_queue)
+		{
+			if (t == &m_thread)
+			{
+				// Already exists, is it an error?
+				return;
+			}
+		}
+		
+		m_queue.emplace_back(&m_thread);
+	}
+
+	// Remove thread from the sleep queue
+	void leave()
+	{
+		for (auto it = m_queue.begin(), end = m_queue.end(); it != end; it++)
+		{
+			if (*it == &m_thread)
+			{
+				m_queue.erase(it);
+				return;
+			}
+		}
+	}
+
+	// Check whether the thread exists in the sleep queue
+	explicit operator bool() const
+	{
+		for (auto it = m_queue.begin(), end = m_queue.end(); it != end; it++)
+		{
+			if (*it == &m_thread)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+};
@@ -1,305 +1,73 @@
 #include "StrFmt.h"
 #include "BEType.h"
 #include "StrUtil.h"
-#include "cfmt.h"

+#include <cassert>
+#include <array>
+#include <memory>
 #include <algorithm>

-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <errno.h>
+std::string v128::to_hex() const
+{
+	return fmt::format("%016llx%016llx", _u64[1], _u64[0]);
+}
+
+std::string v128::to_xyzw() const
+{
+	return fmt::format("x: %g y: %g z: %g w: %g", _f[3], _f[2], _f[1], _f[0]);
+}
+
+std::string fmt::unsafe_vformat(const char* fmt, va_list _args) noexcept
+{
+	// Fixed stack buffer for the first attempt
+	std::array<char, 4096> fixed_buf;
+
+	// Possibly dynamically allocated buffer for the second attempt
+	std::unique_ptr<char[]> buf;
+
+	// Pointer to the current buffer
+	char* buf_addr = fixed_buf.data();
+
+	for (std::size_t buf_size = fixed_buf.size();;)
+	{
+		va_list args;
+		va_copy(args, _args);
+
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
 #endif
-
-template <>
-void fmt_class_string<std::pair<const fmt_type_info*, u64>>::format(std::string& out, u64 arg)
-{
-	// Dynamic format arg
-	const auto& pair = get_object(arg);
-
-	if (pair.first)
-	{
-		pair.first->fmt_string(out, pair.second);
-	}
-}
-
-void fmt_class_string<const void*>::format(std::string& out, u64 arg)
-{
-	if (arg)
-	{
-		fmt::append(out, "%p", reinterpret_cast<const void*>(static_cast<std::uintptr_t>(arg)));
-	}
-	else
-	{
-		out += "(NULL)";		
-	}
-}
-
-void fmt_class_string<const char*>::format(std::string& out, u64 arg)
-{
-	if (arg)
-	{
-		out += reinterpret_cast<const char*>(static_cast<std::uintptr_t>(arg));
-	}
-	else
-	{
-		out += "(NULL)";
-	}
-}
-
-template <>
-void fmt_class_string<std::string>::format(std::string& out, u64 arg)
-{
-	out += get_object(arg).c_str(); // TODO?
-}
-
-template <>
-void fmt_class_string<std::vector<char>>::format(std::string& out, u64 arg)
-{
-	const std::vector<char>& obj = get_object(arg);
-	out.append(obj.cbegin(), obj.cend());
-}
-
-template <>
-void fmt_class_string<char>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#hhx", static_cast<char>(arg));
-}
-
-template <>
-void fmt_class_string<uchar>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#hhx", static_cast<uchar>(arg));
-}
-
-template <>
-void fmt_class_string<schar>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#hhx", static_cast<schar>(arg));
-}
-
-template <>
-void fmt_class_string<short>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#hx", static_cast<short>(arg));
-}
-
-template <>
-void fmt_class_string<ushort>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#hx", static_cast<ushort>(arg));
-}
-
-template <>
-void fmt_class_string<int>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#x", static_cast<int>(arg));
-}
-
-template <>
-void fmt_class_string<uint>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#x", static_cast<uint>(arg));
-}
-
-template <>
-void fmt_class_string<long>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#lx", static_cast<long>(arg));
-}
-
-template <>
-void fmt_class_string<ulong>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#lx", static_cast<ulong>(arg));
-}
-
-template <>
-void fmt_class_string<llong>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#llx", static_cast<llong>(arg));
-}
-
-template <>
-void fmt_class_string<ullong>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%#llx", static_cast<ullong>(arg));
-}
-
-template <>
-void fmt_class_string<float>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%gf", static_cast<float>(reinterpret_cast<f64&>(arg)));
-}
-
-template <>
-void fmt_class_string<double>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%g", reinterpret_cast<f64&>(arg));
-}
-
-template <>
-void fmt_class_string<bool>::format(std::string& out, u64 arg)
-{
-	out += arg ? "true" : "false";
-}
-
-template <>
-void fmt_class_string<v128>::format(std::string& out, u64 arg)
-{
-	const v128& vec = get_object(arg);
-	fmt::append(out, "0x%016llx%016llx", vec._u64[1], vec._u64[0]);
-}
-
-namespace fmt
-{
-	void raw_error(const char* msg)
-	{
-		throw std::runtime_error{msg};
-	}
-
-	void raw_verify_error(const char* msg, const fmt_type_info* sup, u64 arg)
-	{
-		std::string out{"Verification failed"};
-
-		// Print error code (may be irrelevant)
-#ifdef _WIN32
-		if (DWORD error = GetLastError())
-		{
-			fmt::append(out, " (e=%#x)", error);
-		}
-#else
-		if (int error = errno)
-		{
-			fmt::append(out, " (e=%d)", error);
-		}
+		const std::size_t len = std::vsnprintf(buf_addr, buf_size, fmt, args);
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
 #endif
+		va_end(args);

-		if (sup)
+		assert(len <= INT_MAX);
+
+		if (len < buf_size)
 		{
-			out += " (";
-			sup->fmt_string(out, arg); // Print value
-			out += ")";
+			return{ buf_addr, len };
 		}

-		if (msg)
-		{
-			out += ": ";
-			out += msg;
-		}
-
-		throw std::runtime_error{out};
+		buf.reset(buf_addr = new char[buf_size = len + 1]);
 	}
-
-	void raw_narrow_error(const char* msg, const fmt_type_info* sup, u64 arg)
-	{
-		std::string out{"Narrow error"};
-
-		if (sup)
-		{
-			out += " (";
-			sup->fmt_string(out, arg); // Print value
-			out += ")";
-		}
-
-		if (msg)
-		{
-			out += ": ";
-			out += msg;
-		}
-
-		throw std::range_error{out};
-	}
-
-	// Hidden template
-	template <typename T>
-	void raw_throw_exception(const char* fmt, const fmt_type_info* sup, const u64* args)
-	{
-		std::string out;
-		raw_append(out, fmt, sup, args);
-		throw T{out};
-	}
-
-	// Explicit instantiations (not exhaustive)
-	template void raw_throw_exception<std::runtime_error>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::logic_error>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::domain_error>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::invalid_argument>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::out_of_range>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::range_error>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::overflow_error>(const char*, const fmt_type_info*, const u64*);
-	template void raw_throw_exception<std::underflow_error>(const char*, const fmt_type_info*, const u64*);
-
-	struct cfmt_src;
 }

-// Temporary implementation
-struct fmt::cfmt_src
+std::string fmt::unsafe_format(const char* fmt...) noexcept
 {
-	const fmt_type_info* sup;
-	const u64* args;
+	va_list args;
+	va_start(args, fmt);
+	auto result = unsafe_vformat(fmt, args);
+	va_end(args);

-	bool test(std::size_t index) const
-	{
-		if (!sup[index].fmt_string)
-		{
-			return false;
-		}
+	return result;
+}

-		return true;
-	}
-
-	template <typename T>
-	T get(std::size_t index) const
-	{
-		return *reinterpret_cast<const T*>(reinterpret_cast<const u8*>(args + index));
-	}
-
-	void skip(std::size_t extra)
-	{
-		sup += extra + 1;
-		args += extra + 1;
-	}
-
-	std::size_t fmt_string(std::string& out, std::size_t extra) const
-	{
-		const std::size_t start = out.size();
-		sup[extra].fmt_string(out, args[extra]);
-		return out.size() - start;
-	}
-
-	// Returns type size (0 if unknown, pointer, unsigned, assumed max)
-	std::size_t type(std::size_t extra) const
-	{
-// Hack: use known function pointers to determine type
-#define TYPE(type) \
-	if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);
-
-		TYPE(int);
-		TYPE(llong);
-		TYPE(schar);
-		TYPE(short);
-		if (std::is_signed<char>::value) TYPE(char);
-		TYPE(long);
-
-#undef TYPE
-
-		return 0;
-	}
-
-	static constexpr std::size_t size_char  = 1;
-	static constexpr std::size_t size_short = 2;
-	static constexpr std::size_t size_int   = 0;
-	static constexpr std::size_t size_long  = sizeof(ulong);
-	static constexpr std::size_t size_llong = sizeof(ullong);
-	static constexpr std::size_t size_size  = sizeof(std::size_t);
-	static constexpr std::size_t size_max   = sizeof(std::uintmax_t);
-	static constexpr std::size_t size_diff  = sizeof(std::ptrdiff_t);
-};
-
-void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup, const u64* args) noexcept
+fmt::exception_base::exception_base(const char* fmt...)
+	: std::runtime_error((va_start(m_args, fmt), unsafe_vformat(fmt, m_args)))
 {
-	cfmt_append(out, fmt, cfmt_src{sup, args});
+	va_end(m_args);
 }

 std::string fmt::replace_first(const std::string& src, const std::string& from, const std::string& to)
@@ -314,7 +82,7 @@ std::string fmt::replace_first(const std::string& src, const std::string& from,
 	return (pos ? src.substr(0, pos) + to : to) + std::string(src.c_str() + pos + from.length());
 }

-std::string fmt::replace_all(const std::string& src, const std::string& from, const std::string& to)
+std::string fmt::replace_all(const std::string &src, const std::string& from, const std::string& to)
 {
 	std::string target = src;
 	for (auto pos = target.find(from); pos != std::string::npos; pos = target.find(from, pos + 1))
@@ -334,7 +102,7 @@ std::vector<std::string> fmt::split(const std::string& source, std::initializer_

 	for (size_t cursor_end = 0; cursor_end < source.length(); ++cursor_end)
 	{
-		for (auto& separator : separators)
+		for (auto &separator : separators)
 		{
 			if (strncmp(source.c_str() + cursor_end, separator.c_str(), separator.length()) == 0)
 			{
@@ -343,7 +111,7 @@ std::vector<std::string> fmt::split(const std::string& source, std::initializer_
 					result.push_back(candidate);

 				cursor_begin = cursor_end + separator.length();
-				cursor_end   = cursor_begin - 1;
+				cursor_end = cursor_begin - 1;
 				break;
 			}
 		}
@@ -362,7 +130,7 @@ std::string fmt::trim(const std::string& source, const std::string& values)
 	std::size_t begin = source.find_first_not_of(values);

 	if (begin == source.npos)
-		return {};
+		return{};

 	return source.substr(begin, source.find_last_not_of(values) + 1);
 }
@@ -375,7 +143,7 @@ std::string fmt::to_upper(const std::string& string)
 	return result;
 }

-bool fmt::match(const std::string& source, const std::string& mask)
+bool fmt::match(const std::string &source, const std::string &mask)
 {
 	std::size_t source_position = 0, mask_position = 0;

@@ -1,291 +1,52 @@
 #pragma once

-#include "types.h"
-
+#include <cstdarg>
 #include <exception>
-#include <stdexcept>
 #include <string>

+#include "Platform.h"
+#include "types.h"
+
 namespace fmt
 {
-	template <typename... Args>
-	static std::string format(const char*, const Args&...);
-}
+	std::string unsafe_format(const char* fmt...) noexcept;
+	std::string unsafe_vformat(const char*, va_list) noexcept;

-template <typename T, typename>
-struct fmt_unveil
-{
-	static_assert(sizeof(T) > 0, "fmt_unveil<> error: incomplete type");
-
-	using type = T;
-
-	static inline u64 get(const T& arg)
+	// Formatting function
+	template<typename... Args>
+	inline std::string format(const char* fmt, const Args&... args)
 	{
-		return reinterpret_cast<std::uintptr_t>(&arg);
+		return unsafe_format(fmt, ::unveil<Args>::get(args)...);
 	}

-	// Temporary value container (can possibly be created by other fmt_unveil<> specializations)
-	struct u64_wrapper
+	// Helper class
+	class exception_base : public std::runtime_error
 	{
-		T arg;
+		// Helper (there is no other room)
+		va_list m_args;

-		// Allow implicit conversion
-		operator u64() const
+	protected:
+		// Internal formatting constructor
+		exception_base(const char* fmt...);
+	};
+
+	// Exception type derived from std::runtime_error with formatting constructor
+	class exception : public exception_base
+	{
+	public:
+		template<typename... Args>
+		exception(const char* fmt, const Args&... args)
+			: exception_base(fmt, ::unveil<Args>::get(args)...)
 		{
-			return reinterpret_cast<std::uintptr_t>(&arg);
 		}
 	};

-	// This overload resolution takes the precedence
-	static inline u64_wrapper get(T&& arg)
+	// Narrow cast (similar to gsl::narrow) with exception message formatting
+	template<typename To, typename From, typename... Args>
+	inline auto narrow(const char* format_str, const From& value, const Args&... args) -> decltype(static_cast<To>(static_cast<From>(std::declval<To>())))
 	{
-		return u64_wrapper{std::move(arg)};
-	}
-};
-
-template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_integral<T>::value && sizeof(T) <= 8 && alignof(T) <= 8>>
-{
-	using type = T;
-
-	static inline u64 get(T arg)
-	{
-		return static_cast<T>(arg);
-	}
-};
-
-template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_floating_point<T>::value && sizeof(T) <= 8 && alignof(T) <= 8>>
-{
-	using type = T;
-
-	// Convert FP to f64 and reinterpret as u64
-	static inline u64 get(const f64& arg)
-	{
-		return *reinterpret_cast<const u64*>(reinterpret_cast<const u8*>(&arg));
-	}
-};
-
-template <>
-struct fmt_unveil<f16, void>
-{
-	using type = f16;
-
-	static inline u64 get(const f16& arg)
-	{
-		return fmt_unveil<f64>::get(arg.operator float());
-	}
-};
-
-template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_enum<T>::value>>
-{
-	using type = T;
-
-	static inline u64 get(T arg)
-	{
-		return static_cast<std::underlying_type_t<T>>(arg);
-	}
-};
-
-template <typename T>
-struct fmt_unveil<T*, void>
-{
-	using type = const T*;
-
-	static inline u64 get(const T* arg)
-	{
-		return reinterpret_cast<std::uintptr_t>(arg);
-	}
-};
-
-template <typename T, std::size_t N>
-struct fmt_unveil<T[N], void>
-{
-	using type = const T*;
-
-	static inline u64 get(const T* arg)
-	{
-		return reinterpret_cast<std::uintptr_t>(arg);
-	}
-};
-
-template <>
-struct fmt_unveil<b8, void>
-{
-	using type = bool;
-
-	static inline u64 get(const b8& value)
-	{
-		return fmt_unveil<bool>::get(value);
-	}
-};
-
-// String type format provider, also type classifier (format() called if an argument is formatted as "%s")
-template <typename T, typename = void>
-struct fmt_class_string
-{
-	// Formatting function (must be explicitly specialized)
-	static void format(std::string& out, u64 arg);
-
-	// Helper typedef (visible in format())
-	using type = T;
-
-	// Helper function (converts arg to object reference)
-	static SAFE_BUFFERS FORCE_INLINE const T& get_object(u64 arg)
-	{
-		return *reinterpret_cast<const T*>(static_cast<std::uintptr_t>(arg));
-	}
-
-	// Enum -> string function type
-	using convert_t = const char*(*)(T value);
-
-	// Enum -> string function registered
-	static convert_t convert_enum;
-
-	// Helper function (safely converts arg to enum value)
-	static SAFE_BUFFERS FORCE_INLINE void format_enum(std::string& out, u64 arg, convert_t convert)
-	{
-		// Save convert function
-		if (convert_enum == nullptr)
-		{
-			convert_enum = convert;
-		}
-
-		const auto value = static_cast<std::underlying_type_t<T>>(arg);
-
-		// Check narrowing
-		if (static_cast<u64>(value) == arg)
-		{
-			if (const char* str = convert(static_cast<T>(value)))
-			{
-				out += str;
-				return;
-			}
-		}
-
-		// Fallback to underlying type formatting
-		fmt_class_string<std::underlying_type_t<T>>::format(out, static_cast<u64>(value));
-	}
-
-	// Helper function (bitset formatting)
-	static SAFE_BUFFERS FORCE_INLINE void format_bitset(std::string& out, u64 arg, const char* prefix, const char* delim, const char* suffix, void (*fmt)(std::string&, u64))
-	{
-		// Start from raw value
-		fmt_class_string<u64>::format(out, arg);
-
-		out += prefix;
-
-		for (u64 i = 0; i < 63; i++)
-		{
-			const u64 mask = 1ull << i;
-
-			if (arg & mask)
-			{
-				fmt(out, i);
-
-				if (arg >> (i + 1))
-				{
-					out += delim;
-				}
-			}
-		}
-
-		if (arg & (1ull << 63))
-		{
-			fmt(out, 63);
-		}
-
-		out += suffix;
-	}
-
-	// Helper constant (may be used in format_enum as lambda return value)
-	static constexpr const char* unknown = nullptr;
-};
-
-template <typename T, typename V>
-const char*(*fmt_class_string<T, V>::convert_enum)(T) = nullptr;
-
-template <>
-struct fmt_class_string<const void*, void>
-{
-	static void format(std::string& out, u64 arg);
-};
-
-template <typename T>
-struct fmt_class_string<T*, void> : fmt_class_string<const void*, void>
-{
-	// Classify all pointers as const void*
-};
-
-template <>
-struct fmt_class_string<const char*, void>
-{
-	static void format(std::string& out, u64 arg);
-};
-
-template <>
-struct fmt_class_string<char*, void> : fmt_class_string<const char*>
-{
-	// Classify char* as const char*
-};
-
-struct fmt_type_info
-{
-	decltype(&fmt_class_string<int>::format) fmt_string;
-
-	template <typename T>
-	static constexpr fmt_type_info make()
-	{
-		return fmt_type_info
-		{
-			&fmt_class_string<T>::format,
-		};
-	}
-};
-
-// Argument array type (each element generated via fmt_unveil<>)
-template <typename... Args>
-using fmt_args_t = const u64(&&)[sizeof...(Args) + 1];
-
-namespace fmt
-{
-	template <typename... Args>
-	SAFE_BUFFERS FORCE_INLINE const fmt_type_info* get_type_info()
-	{
-		// Constantly initialized null-terminated list of type-specific information
-		static constexpr fmt_type_info result[sizeof...(Args) + 1]{fmt_type_info::make<Args>()...};
-
+		const auto result = static_cast<To>(value);
+		if (static_cast<From>(result) != value) throw fmt::exception(format_str, value, args...);
 		return result;
 	}
-
-	// Internal formatting function
-	void raw_append(std::string& out, const char*, const fmt_type_info*, const u64*) noexcept;
-
-	// Formatting function
-	template <typename... Args>
-	SAFE_BUFFERS FORCE_INLINE void append(std::string& out, const char* fmt, const Args&... args)
-	{
-		raw_append(out, fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
-	}
-
-	// Formatting function
-	template <typename... Args>
-	SAFE_BUFFERS FORCE_INLINE std::string format(const char* fmt, const Args&... args)
-	{
-		std::string result;
-		append<Args...>(result, fmt, args...);
-		return result;
-	}
-
-	// Internal exception message formatting template, must be explicitly specialized or instantiated in cpp to minimize code bloat
-	template <typename T>
-	[[noreturn]] void raw_throw_exception(const char*, const fmt_type_info*, const u64*);
-
-	// Throw exception with formatting
-	template <typename T = std::runtime_error, typename... Args>
-	[[noreturn]] SAFE_BUFFERS FORCE_INLINE void throw_exception(const char* fmt, const Args&... args)
-	{
-		raw_throw_exception<T>(fmt, fmt::get_type_info<fmt_unveil_t<Args>...>(), fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
-	}
 }
@@ -7,8 +7,8 @@
 #include <functional>

 // Copy null-terminated string from std::string to char array with truncation
-template <std::size_t N>
-inline void strcpy_trunc(char (&dst)[N], const std::string& src)
+template<std::size_t N>
+inline void strcpy_trunc(char(&dst)[N], const std::string& src)
 {
 	const std::size_t count = src.size() >= N ? N - 1 : src.size();
 	std::memcpy(dst, src.c_str(), count);
@@ -16,8 +16,8 @@ inline void strcpy_trunc(char (&dst)[N], const std::string& src)
 }

 // Copy null-terminated string from char array to another char array with truncation
-template <std::size_t N, std::size_t N2>
-inline void strcpy_trunc(char (&dst)[N], const char (&src)[N2])
+template<std::size_t N, std::size_t N2>
+inline void strcpy_trunc(char(&dst)[N], const char(&src)[N2])
 {
 	const std::size_t count = N2 >= N ? N - 1 : N2;
 	std::memcpy(dst, src, count);
@@ -27,10 +27,10 @@ inline void strcpy_trunc(char (&dst)[N], const char (&src)[N2])
 namespace fmt
 {
 	std::string replace_first(const std::string& src, const std::string& from, const std::string& to);
-	std::string replace_all(const std::string& src, const std::string& from, const std::string& to);
+	std::string replace_all(const std::string &src, const std::string& from, const std::string& to);

-	template <size_t list_size>
-	std::string replace_all(std::string src, const std::pair<std::string, std::string> (&list)[list_size])
+	template<size_t list_size>
+	std::string replace_all(std::string src, const std::pair<std::string, std::string>(&list)[list_size])
 	{
 		for (size_t pos = 0; pos < src.length(); ++pos)
 		{
@@ -53,8 +53,8 @@ namespace fmt
 		return src;
 	}

-	template <size_t list_size>
-	std::string replace_all(std::string src, const std::pair<std::string, std::function<std::string()>> (&list)[list_size])
+	template<size_t list_size>
+	std::string replace_all(std::string src, const std::pair<std::string, std::function<std::string()>>(&list)[list_size])
 	{
 		for (size_t pos = 0; pos < src.length(); ++pos)
 		{
@@ -80,17 +80,17 @@ namespace fmt
 	std::vector<std::string> split(const std::string& source, std::initializer_list<std::string> separators, bool is_skip_empty = true);
 	std::string trim(const std::string& source, const std::string& values = " \t");

-	template <typename T>
+	template<typename T>
 	std::string merge(const T& source, const std::string& separator)
 	{
 		if (!source.size())
 		{
-			return {};
+			return{};
 		}

 		std::string result;

-		auto it  = source.begin();
+		auto it = source.begin();
 		auto end = source.end();
 		for (--end; it != end; ++it)
 		{
@@ -100,23 +100,23 @@ namespace fmt
 		return result + source.back();
 	}

-	template <typename T>
+	template<typename T>
 	std::string merge(std::initializer_list<T> sources, const std::string& separator)
 	{
 		if (!sources.size())
 		{
-			return {};
+			return{};
 		}

 		std::string result;
 		bool first = true;

-		for (auto& v : sources)
+		for (auto &v : sources)
 		{
 			if (first)
 			{
 				result = fmt::merge(v, separator);
-				first  = false;
+				first = false;
 			}
 			else
 			{
@@ -129,5 +129,5 @@ namespace fmt

 	std::string to_upper(const std::string& string);

-	bool match(const std::string& source, const std::string& mask);
+	bool match(const std::string &source, const std::string &mask);
 }
@@ -1,14 +1,11 @@
 #pragma once

-#include "types.h"
-#include "Atomic.h"
-
 #include <exception>
 #include <string>
 #include <memory>

-#include "sema.h"
-#include "cond.h"
+#include "Platform.h"
+#include "Atomic.h"

 // Will report exception and call std::abort() if put in catch(...)
 [[noreturn]] void catch_all_exceptions();
@@ -20,19 +17,19 @@ class task_stack
 	{
 		std::unique_ptr<task_base> next;

-		virtual ~task_base();
+		virtual ~task_base() = default;

-		virtual void invoke()
+		virtual void exec()
 		{
 			if (next)
 			{
-				next->invoke();
+				next->exec();
 			}
 		}
 	};

-	template <typename F>
-	struct task_type final : task_base
+	template<typename F>
+	struct task_type : task_base
 	{
 		std::remove_reference_t<F> func;

@@ -41,10 +38,10 @@ class task_stack
 		{
 		}

-		void invoke() final override
+		void exec() override
 		{
 			func();
-			task_base::invoke();
+			task_base::exec();
 		}
 	};

@@ -53,7 +50,7 @@ class task_stack
 public:
 	task_stack() = default;

-	template <typename F>
+	template<typename F>
 	task_stack(F&& func)
 		: m_stack(new task_type<F>(std::forward<F>(func)))
 	{
@@ -73,11 +70,11 @@ public:
 		m_stack.reset();
 	}

-	void invoke() const
+	void exec() const
 	{
 		if (m_stack)
 		{
-			m_stack->invoke();
+			m_stack->exec();
 		}
 	}
 };
@@ -85,32 +82,20 @@ public:
 // Thread control class
 class thread_ctrl final
 {
-	// Current thread
+public: // TODO
+	struct internal;
+
+private:
 	static thread_local thread_ctrl* g_tls_this_thread;

-	// Self pointer
-	std::shared_ptr<thread_ctrl> m_self;
+	// Thread handle storage
+	std::aligned_storage_t<16> m_thread;

-	// Thread handle (platform-specific)
-	atomic_t<std::uintptr_t> m_thread{0};
+	// Thread join contention counter
+	atomic_t<u32> m_joining{};

-	// Thread mutex
-	mutable semaphore<> m_mutex;
-
-	// Thread condition variable
-	cond_variable m_cond;
-
-	// Thread flags
-	atomic_t<u32> m_signal{0};
-
-	// Thread joining condition variable
-	cond_variable m_jcv;
-
-	// Remotely set or caught exception
-	std::exception_ptr m_exception;
-
-	// Thread initial task or atexit task
-	task_stack m_task;
+	// Thread internals
+	atomic_t<internal*> m_data{};

 	// Fixed name
 	std::string m_name;
@@ -122,19 +107,19 @@ class thread_ctrl final
 	void initialize();

 	// Called at the thread end
-	void finalize(std::exception_ptr) noexcept;
+	void finalize() noexcept;

-	// Add task (atexit)
-	static void _push(task_stack);
+	// Get atexit function
+	void push_atexit(task_stack);

-	// Internal waiting function, may throw. Infinite value is -1.
-	static bool _wait_for(u64 usec);
+	// Start waiting
+	void wait_start(u64 timeout);

-	// Internal throwing function. Mutex must be locked and will be unlocked.
-	[[noreturn]] void _throw();
+	// Proceed waiting
+	bool wait_wait(u64 timeout);

-	// Internal notification function
-	void _notify(cond_variable thread_ctrl::*);
+	// Check exception
+	void test();

 public:
 	thread_ctrl(std::string&& name);
@@ -149,57 +134,120 @@ public:
 		return m_name;
 	}

-	// Get exception
-	std::exception_ptr get_exception() const;
-
-	// Set exception
-	void set_exception(std::exception_ptr ptr);
+	// Initialize internal data
+	void initialize_once();

 	// Get thread result (may throw, simultaneous joining allowed)
 	void join();

-	// Notify the thread
+	// Lock thread mutex
+	void lock();
+
+	// Lock conditionally (double-checked)
+	template<typename F>
+	bool lock_if(F&& pred)
+	{
+		if (pred())
+		{
+			lock();
+
+			try
+			{
+				if (LIKELY(pred()))
+				{
+					return true;
+				}
+				else
+				{
+					unlock();
+					return false;
+				}
+			}
+			catch (...)
+			{
+				unlock();
+				throw;
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	// Unlock thread mutex (internal data must be initialized)
+	void unlock();
+
+	// Lock, unlock, notify the thread (required if the condition changed locklessly)
+	void lock_notify();
+
+	// Notify the thread (internal data must be initialized)
 	void notify();

-	// Wait once with timeout. Abortable, may throw. May spuriously return false.
-	static inline bool wait_for(u64 usec)
+	// Set exception (internal data must be initialized, thread mutex must be locked)
+	void set_exception(std::exception_ptr);
+
+	// Current thread sleeps for specified amount of microseconds.
+	// Wrapper for std::this_thread::sleep, doesn't require valid thread_ctrl.
+	[[deprecated]] static void sleep(u64 useconds);
+
+	// Wait until pred(). Abortable, may throw. Thread must be locked.
+	// Timeout in microseconds (zero means infinite).
+	template<typename F>
+	static inline auto wait(u64 useconds, F&& pred)
 	{
-		return _wait_for(usec);
+		g_tls_this_thread->wait_start(useconds);
+
+		while (true)
+		{
+			g_tls_this_thread->test();
+
+			if (auto&& result = pred())
+			{
+				return result;
+			}
+			else if (!g_tls_this_thread->wait_wait(useconds) && useconds)
+			{
+				return result;
+			}
+		}
 	}

-	// Wait. Abortable, may throw.
-	static inline void wait()
-	{
-		_wait_for(-1);
-	}
-
-	// Wait until pred(). Abortable, may throw.
-	template<typename F, typename RT = std::result_of_t<F()>>
-	static inline RT wait(F&& pred)
+	// Wait until pred(). Abortable, may throw. Thread must be locked.
+	template<typename F>
+	static inline auto wait(F&& pred)
 	{
 		while (true)
 		{
-			if (RT result = pred())
+			g_tls_this_thread->test();
+
+			if (auto&& result = pred())
 			{
 				return result;
 			}

-			_wait_for(-1);
+			g_tls_this_thread->wait_wait(0);
 		}
 	}

-	// Wait eternally until aborted.
+	// Wait once. Thread must be locked.
+	static inline void wait()
+	{
+		g_tls_this_thread->test();
+		g_tls_this_thread->wait_wait(0);
+		g_tls_this_thread->test();
+	}
+
+	// Wait unconditionally until aborted. Thread must be locked.
 	[[noreturn]] static inline void eternalize()
 	{
 		while (true)
 		{
-			_wait_for(-1);
+			g_tls_this_thread->test();
+			g_tls_this_thread->wait_wait(0);
 		}
 	}

-	// Test exception (may throw).
-	static void test();
-
 	// Get current thread (may be nullptr)
 	static thread_ctrl* get_current()
 	{
@@ -210,32 +258,22 @@ public:
 	template<typename F>
 	static inline void atexit(F&& func)
 	{
-		_push(std::forward<F>(func));
-	}
-
-	// Create detached named thread
-	template<typename N, typename F>
-	static inline void spawn(N&& name, F&& func)
-	{
-		auto out = std::make_shared<thread_ctrl>(std::forward<N>(name));
-
-		thread_ctrl::start(out, std::forward<F>(func));
+		return g_tls_this_thread->push_atexit(std::forward<F>(func));
 	}

 	// Named thread factory
 	template<typename N, typename F>
-	static inline void spawn(std::shared_ptr<thread_ctrl>& out, N&& name, F&& func)
+	static inline std::shared_ptr<thread_ctrl> spawn(N&& name, F&& func)
 	{
-		out = std::make_shared<thread_ctrl>(std::forward<N>(name));
+		auto ctrl = std::make_shared<thread_ctrl>(std::forward<N>(name));

-		thread_ctrl::start(out, std::forward<F>(func));
+		thread_ctrl::start(ctrl, std::forward<F>(func));
+
+		return ctrl;
 	}
-
-	static void set_native_priority(int priority);
-	static void set_ideal_processor_core(int core);
 };

-class named_thread
+class named_thread : public std::enable_shared_from_this<named_thread>
 {
 	// Pointer to managed resource (shared with actual thread)
 	std::shared_ptr<thread_ctrl> m_thread;
@@ -252,8 +290,8 @@ public:
 	virtual std::string get_name() const;

 protected:
-	// Start thread (cannot be called from the constructor: should throw in such case)
-	void start_thread(const std::shared_ptr<void>& _this);
+	// Start thread (cannot be called from the constructor: should throw bad_weak_ptr in such case)
+	void start();

 	// Thread task (called in the thread)
 	virtual void on_task() = 0;
@@ -261,14 +299,11 @@ protected:
 	// Thread finalization (called after on_task)
 	virtual void on_exit() {}

-	// Called once upon thread spawn within the thread's own context
-	virtual void on_spawn() {}
-
 public:
 	// ID initialization
-	virtual void on_init(const std::shared_ptr<void>& _this)
+	virtual void on_init()
 	{
-		return start_thread(_this);
+		start();
 	}

 	// ID finalization
@@ -278,19 +313,42 @@ public:
 	}

 	// Access thread_ctrl
-	thread_ctrl* get() const
+	thread_ctrl* operator->() const
 	{
 		return m_thread.get();
 	}
+};

-	void join() const
+// Simple thread mutex locker
+class thread_lock final
+{
+	thread_ctrl* m_thread;
+
+public:
+	thread_lock(const thread_lock&) = delete;
+
+	// Lock specified thread
+	thread_lock(thread_ctrl* thread)
+		: m_thread(thread)
 	{
-		return m_thread->join();
+		m_thread->lock();
 	}

-	void notify() const
+	// Lock specified named_thread
+	thread_lock(named_thread& thread)
+		: thread_lock(thread.operator->())
 	{
-		return m_thread->notify();
+	}
+
+	// Lock current thread
+	thread_lock()
+		: thread_lock(thread_ctrl::get_current())
+	{
+	}
+
+	~thread_lock()
+	{
+		m_thread->unlock();
 	}
 };

@@ -302,8 +360,8 @@ class scope_thread final
 public:
 	template<typename N, typename F>
 	scope_thread(N&& name, F&& func)
+		: m_thread(thread_ctrl::spawn(std::forward<N>(name), std::forward<F>(func)))
 	{
-		thread_ctrl::spawn(m_thread, std::forward<N>(name), std::forward<F>(func));
 	}

 	// Deleted copy/move constructors + copy/move operators
@@ -314,10 +372,4 @@ public:
 	{
 		m_thread->join();
 	}
-
-	// Access thread_ctrl
-	thread_ctrl* get() const
-	{
-		return m_thread.get();
-	}
 };
@@ -6,8 +6,8 @@ class Timer
 {
 private:
 	bool m_stopped;
-	std::chrono::steady_clock::time_point m_start;
-	std::chrono::steady_clock::time_point m_end;
+	std::chrono::high_resolution_clock::time_point m_start;
+	std::chrono::high_resolution_clock::time_point m_end;

 public:
 	Timer() : m_stopped(false)
@@ -17,13 +17,13 @@ public:
 	void Start()
 	{
 		m_stopped = false;
-		m_start = std::chrono::steady_clock::now();
+		m_start = std::chrono::high_resolution_clock::now();
 	}

 	void Stop()
 	{
 		m_stopped = true;
-		m_end = std::chrono::steady_clock::now();
+		m_end = std::chrono::high_resolution_clock::now();
 	}

 	double GetElapsedTimeInSec() const
@@ -38,14 +38,14 @@ public:

 	u64 GetElapsedTimeInMicroSec() const
 	{
-		std::chrono::steady_clock::time_point now = m_stopped ? m_end : std::chrono::steady_clock::now();
+		std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now();

 		return std::chrono::duration_cast<std::chrono::microseconds>(now - m_start).count();
 	}

 	u64 GetElapsedTimeInNanoSec() const
 	{
-		std::chrono::steady_clock::time_point now = m_stopped ? m_end : std::chrono::steady_clock::now();
+		std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now();

 		return std::chrono::duration_cast<std::chrono::nanoseconds>(now - m_start).count();
 	}
@@ -11,78 +11,35 @@
 #include <sys/types.h>
 #endif

-namespace utils
+namespace memory_helper
 {
-	// Convert memory protection (internal)
-	static auto operator +(protection prot)
+	void* reserve_memory(size_t size)
 	{
 #ifdef _WIN32
-		DWORD _prot = PAGE_NOACCESS;
-		switch (prot)
-		{
-		case protection::rw: _prot = PAGE_READWRITE; break;
-		case protection::ro: _prot = PAGE_READONLY; break;
-		case protection::no: break;
-		case protection::wx: _prot = PAGE_EXECUTE_READWRITE; break;
-		case protection::rx: _prot = PAGE_EXECUTE_READ; break;
-		}
+		void* ret = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS);
+		ENSURES(ret != NULL);
 #else
-		int _prot = PROT_NONE;
-		switch (prot)
-		{
-		case protection::rw: _prot = PROT_READ | PROT_WRITE; break;
-		case protection::ro: _prot = PROT_READ; break;
-		case protection::no: break;
-		case protection::wx: _prot = PROT_READ | PROT_WRITE | PROT_EXEC; break;
-		case protection::rx: _prot = PROT_READ | PROT_EXEC; break;
-		}
+		void* ret = mmap(nullptr, size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+		ENSURES(ret != 0);
 #endif
-
-		return _prot;
+		return ret;
 	}

-	void* memory_reserve(std::size_t size, void* use_addr)
+	void commit_page_memory(void* pointer, size_t size)
 	{
 #ifdef _WIN32
-		return ::VirtualAlloc(use_addr, size, MEM_RESERVE, PAGE_NOACCESS);
+		VERIFY(VirtualAlloc(pointer, size, MEM_COMMIT, PAGE_READWRITE) != NULL);
 #else
-		auto ptr = ::mmap(use_addr, size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
-
-		if (use_addr && ptr != use_addr)
-		{
-			::munmap(ptr, size);
-			return nullptr;
-		}
-
-		return ptr;
+		VERIFY(mprotect((void*)((u64)pointer & -4096), size, PROT_READ | PROT_WRITE) != -1);
 #endif
 	}

-	void memory_commit(void* pointer, std::size_t size, protection prot)
+	void free_reserved_memory(void* pointer, size_t size)
 	{
 #ifdef _WIN32
-		verify(HERE), ::VirtualAlloc(pointer, size, MEM_COMMIT, +prot);
+		VERIFY(VirtualFree(pointer, 0, MEM_DECOMMIT) != 0);
 #else
-		verify(HERE), ::mprotect((void*)((u64)pointer & -4096), ::align(size, 4096), +prot) != -1;
-#endif
-	}
-
-	void memory_decommit(void* pointer, std::size_t size)
-	{
-#ifdef _WIN32
-		verify(HERE), ::VirtualFree(pointer, size, MEM_DECOMMIT);
-#else
-		verify(HERE), ::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
-#endif
-	}
-
-	void memory_protect(void* pointer, std::size_t size, protection prot)
-	{
-#ifdef _WIN32
-		DWORD old;
-		verify(HERE), ::VirtualProtect(pointer, size, +prot, &old);
-#else
-		verify(HERE), ::mprotect((void*)((u64)pointer & -4096), ::align(size, 4096), +prot) != -1;
+		VERIFY(mprotect(pointer, size, PROT_NONE) != -1);
 #endif
 	}
 }
@@ -1,35 +1,22 @@
 #pragma once

-namespace utils
+namespace memory_helper
 {
-	// Memory protection type
-	enum class protection
-	{
-		rw, // Read + write (default)
-		ro, // Read only
-		no, // No access
-		wx, // Read + write + execute
-		rx, // Read + execute
-	};
-
 	/**
 	* Reserve `size` bytes of virtual memory and returns it.
 	* The memory should be commited before usage.
 	*/
-	void* memory_reserve(std::size_t size, void* use_addr = nullptr);
+	void* reserve_memory(std::size_t size);

 	/**
 	* Commit `size` bytes of virtual memory starting at pointer.
 	* That is, bake reserved memory with physical memory.
 	* pointer should belong to a range of reserved memory.
 	*/
-	void memory_commit(void* pointer, std::size_t size, protection prot = protection::rw);
+	void commit_page_memory(void* pointer, std::size_t size);

 	/**
 	* Decommit all memory committed via commit_page_memory.
 	*/
-	void memory_decommit(void* pointer, std::size_t size);
-
-	// Set memory protection
-	void memory_protect(void* pointer, std::size_t size, protection prot);
+	void free_reserved_memory(void* pointer, std::size_t size);
 }
@@ -1,165 +0,0 @@
-#include "bin_patch.h"
-#include "yaml-cpp/yaml.h"
-#include "File.h"
-#include "Config.h"
-
-template <>
-void fmt_class_string<patch_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](patch_type value)
-	{
-		switch (value)
-		{
-		case patch_type::load: return "load";
-		case patch_type::byte: return "byte";
-		case patch_type::le16: return "le16";
-		case patch_type::le32: return "le32";
-		case patch_type::le64: return "le64";
-		case patch_type::bef32: return "bef32";
-		case patch_type::bef64: return "bef64";
-		case patch_type::be16: return "be16";
-		case patch_type::be32: return "be32";
-		case patch_type::be64: return "be64";
-		case patch_type::lef32: return "lef32";
-		case patch_type::lef64: return "lef64";
-		}
-
-		return unknown;
-	});
-}
-
-void patch_engine::append(const std::string& patch)
-{
-	if (fs::file f{patch})
-	{
-		auto root = YAML::Load(f.to_string());
-
-		for (auto pair : root)
-		{
-			auto& name = pair.first.Scalar();
-			auto& data = m_map[name];
-			
-			for (auto patch : pair.second)
-			{
-				u64 type64 = 0;
-				cfg::try_to_enum_value(&type64, &fmt_class_string<patch_type>::format, patch[0].Scalar());
-
-				struct patch info{};
-				info.type   = static_cast<patch_type>(type64);
-				info.offset = patch[1].as<u32>(0);
-
-				switch (info.type)
-				{
-				case patch_type::load:
-				{
-					// Special syntax: copy named sequence (must be loaded before)
-					const auto found = m_map.find(patch[1].Scalar());
-
-					if (found != m_map.end())
-					{
-						// Address modifier (optional)
-						const u32 mod = patch[2].as<u32>(0);
-
-						for (const auto& rd : found->second)
-						{
-							info = rd;
-							info.offset += mod;
-							data.emplace_back(info);
-						}
-
-						continue;
-					}
-
-					// TODO: error
-					break;
-				}
-				case patch_type::bef32:
-				case patch_type::lef32:
-				{
-					info.value_as<f32>() = patch[2].as<f32>();
-					break;
-				}
-				case patch_type::bef64:
-				case patch_type::lef64:
-				{
-					info.value_as<f64>() = patch[2].as<f64>();
-					break;
-				}
-				default:
-				{
-					info.value = patch[2].as<u64>();
-					break;
-				}
-				}
-				
-				data.emplace_back(info);
-			}
-		}
-	}
-}
-
-std::size_t patch_engine::apply(const std::string& name, u8* dst) const
-{
-	const auto found = m_map.find(name);
-
-	if (found == m_map.cend())
-	{
-		return 0;
-	}
-
-	// Apply modifications sequentially
-	for (const auto& p : found->second)
-	{
-		auto ptr = dst + p.offset;
-
-		switch (p.type)
-		{
-		case patch_type::load:
-		{
-			// Invalid in this context
-			break;
-		}
-		case patch_type::byte:
-		{
-			*ptr = static_cast<u8>(p.value);
-			break;
-		}
-		case patch_type::le16:
-		{
-			*reinterpret_cast<le_t<u16, 1>*>(ptr) = static_cast<u16>(p.value);
-			break;
-		}
-		case patch_type::le32:
-		case patch_type::lef32:
-		{
-			*reinterpret_cast<le_t<u32, 1>*>(ptr) = static_cast<u32>(p.value);
-			break;
-		}
-		case patch_type::le64:
-		case patch_type::lef64:
-		{
-			*reinterpret_cast<le_t<u64, 1>*>(ptr) = static_cast<u64>(p.value);
-			break;
-		}
-		case patch_type::be16:
-		{
-			*reinterpret_cast<be_t<u16, 1>*>(ptr) = static_cast<u16>(p.value);
-			break;
-		}
-		case patch_type::be32:
-		case patch_type::bef32:
-		{
-			*reinterpret_cast<be_t<u32, 1>*>(ptr) = static_cast<u32>(p.value);
-			break;
-		}
-		case patch_type::be64:
-		case patch_type::bef64:
-		{
-			*reinterpret_cast<be_t<u64, 1>*>(ptr) = static_cast<u64>(p.value);
-			break;
-		}
-		}
-	}
-
-	return found->second.size();
-}
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "BEType.h"
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-enum class patch_type
-{
-	load,
-	byte,
-	le16,
-	le32,
-	le64,
-	lef32,
-	lef64,
-	be16,
-	be32,
-	be64,
-	bef32,
-	bef64,
-};
-
-class patch_engine
-{
-	struct patch
-	{
-		patch_type type;
-		u32 offset;
-		u64 value;
-
-		template <typename T>
-		T& value_as()
-		{
-			return *reinterpret_cast<T*>(reinterpret_cast<char*>(&value));
-		}
-	};
-
-	// Database
-	std::unordered_map<std::string, std::vector<patch>> m_map;
-
-public:
-	// Load from file
-	void append(const std::string& path);
-
-	// Apply patch (returns the number of entries applied)
-	std::size_t apply(const std::string& name, u8* dst) const;
-};
@@ -1,732 +0,0 @@
-#pragma once
-
-/*
-This header helps to extend scoped enum types (enum class) in two possible ways:
-1) Enabling bitwise operators for enums
-2) Advanced bs_t<> template (this converts enum type to another "bitset" enum type)
-
-To enable bitwise operators, enum scope must contain `__bitwise_ops` entry.
-
-enum class flags
-{
-	__bitwise_ops, // Not essential, but recommended to put it first
-
-	flag1 = 1 << 0,
-	flag2 = 1 << 1,
-};
-
-Examples:
-`flags::flag1 | flags::flag2` - bitwise OR
-`flags::flag1 & flags::flag2` - bitwise AND
-`flags::flag1 ^ flags::flag2` - bitwise XOR
-`~flags::flag1` - bitwise NEG
-
-To enable bs_t<> template, enum scope must contain `__bitset_enum_max` entry.
-
-enum class flagzz : u32
-{
-	flag1, // Bit indices start from zero
-	flag2,
-
-	__bitset_enum_max // It must be the last value
-};
-
-Now some operators are enabled for two enum types: `flagzz` and `bs_t<flagzz>`.
-These are very different from previously described bitwise operators.
-
-Examples:
-`+flagzz::flag1` - unary `+` operator convert flagzz value to bs_t<flagzz>
-`flagzz::flag1 + flagzz::flag2` - bitset union
-`flagzz::flag1 - flagzz::flag2` - bitset difference
-Intersection (&) and symmetric difference (^) is also available.
-
-*/
-
-#include "types.h"
-
-// Helper template
-template<typename T>
-struct bs_base
-{
-	// Underlying type
-	using under = std::underlying_type_t<T>;
-
-	// Actual bitset type
-	enum class type : under
-	{
-		null = 0, // Empty bitset
-
-		__bitset_set_type = 0 // SFINAE marker
-	};
-
-	static constexpr std::size_t bitmax = sizeof(T) * 8;
-	static constexpr std::size_t bitsize = static_cast<under>(T::__bitset_enum_max);
-
-	static_assert(std::is_enum<T>::value, "bs_t<> error: invalid type (must be enum)");
-	static_assert(!bitsize || bitsize <= bitmax, "bs_t<> error: invalid __bitset_enum_max");
-
-	// Helper function
-	static constexpr under shift(T value)
-	{
-		return static_cast<under>(1) << static_cast<under>(value);
-	}
-
-	friend type& operator +=(type& lhs, type rhs)
-	{
-		reinterpret_cast<under&>(lhs) |= static_cast<under>(rhs);
-		return lhs;
-	}
-
-	friend type& operator -=(type& lhs, type rhs)
-	{
-		reinterpret_cast<under&>(lhs) &= ~static_cast<under>(rhs);
-		return lhs;
-	}
-
-	friend type& operator &=(type& lhs, type rhs)
-	{
-		reinterpret_cast<under&>(lhs) &= static_cast<under>(rhs);
-		return lhs;
-	}
-
-	friend type& operator ^=(type& lhs, type rhs)
-	{
-		reinterpret_cast<under&>(lhs) ^= static_cast<under>(rhs);
-		return lhs;
-	}
-
-	friend type& operator +=(type& lhs, T rhs)
-	{
-		reinterpret_cast<under&>(lhs) |= shift(rhs);
-		return lhs;
-	}
-
-	friend type& operator -=(type& lhs, T rhs)
-	{
-		reinterpret_cast<under&>(lhs) &= ~shift(rhs);
-		return lhs;
-	}
-
-	friend type& operator &=(type& lhs, T rhs)
-	{
-		reinterpret_cast<under&>(lhs) &= shift(rhs);
-		return lhs;
-	}
-
-	friend type& operator ^=(type& lhs, T rhs)
-	{
-		reinterpret_cast<under&>(lhs) ^= shift(rhs);
-		return lhs;
-	}
-
-	friend constexpr type operator +(type lhs, type rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) | static_cast<under>(rhs));
-	}
-
-	friend constexpr type operator -(type lhs, type rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) & ~static_cast<under>(rhs));
-	}
-
-	friend constexpr type operator &(type lhs, type rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) & static_cast<under>(rhs));
-	}
-
-	friend constexpr type operator ^(type lhs, type rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) ^ static_cast<under>(rhs));
-	}
-
-	friend constexpr type operator &(type lhs, T rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) & shift(rhs));
-	}
-
-	friend constexpr type operator ^(type lhs, T rhs)
-	{
-		return static_cast<type>(static_cast<under>(lhs) ^ shift(rhs));
-	}
-
-	friend constexpr type operator &(T lhs, type rhs)
-	{
-		return static_cast<type>(shift(lhs) & static_cast<under>(rhs));
-	}
-
-	friend constexpr type operator ^(T lhs, type rhs)
-	{
-		return static_cast<type>(shift(lhs) ^ static_cast<under>(rhs));
-	}
-
-	friend constexpr bool operator ==(T lhs, type rhs)
-	{
-		return shift(lhs) == rhs;
-	}
-
-	friend constexpr bool operator ==(type lhs, T rhs)
-	{
-		return lhs == shift(rhs);
-	}
-
-	friend constexpr bool operator !=(T lhs, type rhs)
-	{
-		return shift(lhs) != rhs;
-	}
-
-	friend constexpr bool operator !=(type lhs, T rhs)
-	{
-		return lhs != shift(rhs);
-	}
-
-	friend constexpr bool test(type value)
-	{
-		return static_cast<under>(value) != 0;
-	}
-
-	friend constexpr bool test(type lhs, type rhs)
-	{
-		return (static_cast<under>(lhs) & static_cast<under>(rhs)) != 0;
-	}
-
-	friend constexpr bool test(type lhs, T rhs)
-	{
-		return (static_cast<under>(lhs) & shift(rhs)) != 0;
-	}
-
-	friend constexpr bool test(T lhs, type rhs)
-	{
-		return (shift(lhs) & static_cast<under>(rhs)) != 0;
-	}
-
-	friend bool test_and_set(type& lhs, type rhs)
-	{
-		return test_and_set(reinterpret_cast<under&>(lhs), static_cast<under>(rhs));
-	}
-
-	friend bool test_and_set(type& lhs, T rhs)
-	{
-		return test_and_set(reinterpret_cast<under&>(lhs), shift(rhs));
-	}
-
-	friend bool test_and_reset(type& lhs, type rhs)
-	{
-		return test_and_reset(reinterpret_cast<under&>(lhs), static_cast<under>(rhs));
-	}
-
-	friend bool test_and_reset(type& lhs, T rhs)
-	{
-		return test_and_reset(reinterpret_cast<under&>(lhs), shift(rhs));
-	}
-
-	friend bool test_and_complement(type& lhs, type rhs)
-	{
-		return test_and_complement(reinterpret_cast<under&>(lhs), static_cast<under>(rhs));
-	}
-
-	friend bool test_and_complement(type& lhs, T rhs)
-	{
-		return test_and_complement(reinterpret_cast<under&>(lhs), shift(rhs));
-	}
-};
-
-// Bitset type for enum class with available bits [0, T::__bitset_enum_max)
-template<typename T>
-using bs_t = typename bs_base<T>::type;
-
-// Unary '+' operator: promote plain enum value to bitset value
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator +(T value)
-{
-	return static_cast<bs_t<T>>(bs_base<T>::shift(value));
-}
-
-// Binary '+' operator: bitset union
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator +(T lhs, T rhs)
-{
-	return static_cast<bs_t<T>>(bs_base<T>::shift(lhs) | bs_base<T>::shift(rhs));
-}
-
-// Binary '+' operator: bitset union
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator +(typename bs_base<T>::type lhs, T rhs)
-{
-	return static_cast<bs_t<T>>(static_cast<typename bs_base<T>::under>(lhs) | bs_base<T>::shift(rhs));
-}
-
-// Binary '+' operator: bitset union
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator +(T lhs, typename bs_base<T>::type rhs)
-{
-	return static_cast<bs_t<T>>(bs_base<T>::shift(lhs) | static_cast<typename bs_base<T>::under>(rhs));
-}
-
-// Binary '-' operator: bitset difference
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator -(T lhs, T rhs)
-{
-	return static_cast<bs_t<T>>(bs_base<T>::shift(lhs) & ~bs_base<T>::shift(rhs));
-}
-
-// Binary '-' operator: bitset difference
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator -(typename bs_base<T>::type lhs, T rhs)
-{
-	return static_cast<bs_t<T>>(static_cast<typename bs_base<T>::under>(lhs) & ~bs_base<T>::shift(rhs));
-}
-
-// Binary '-' operator: bitset difference
-template<typename T, typename = decltype(T::__bitset_enum_max)>
-constexpr bs_t<T> operator -(T lhs, typename bs_base<T>::type rhs)
-{
-	return static_cast<bs_t<T>>(bs_base<T>::shift(lhs) & ~static_cast<typename bs_base<T>::under>(rhs));
-}
-
-template<typename BS, typename T>
-struct atomic_add<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bs_t<T> op1(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::fetch_or(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline bs_t<T> op2(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::or_fetch(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename BS, typename T>
-struct atomic_sub<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bs_t<T> op1(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), ~bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline bs_t<T> op2(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), ~bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename BS, typename T>
-struct atomic_and<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bs_t<T> op1(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline bs_t<T> op2(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename BS, typename T>
-struct atomic_xor<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bs_t<T> op1(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::fetch_xor(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline bs_t<T> op2(bs_t<T>& left, T right)
-	{
-		return static_cast<bs_t<T>>(atomic_storage<under>::xor_fetch(reinterpret_cast<under&>(left), bs_base<T>::shift(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_add<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_or(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::or_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_sub<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), ~static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), ~static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_and<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_xor<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_xor(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::xor_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename BS, typename T>
-struct atomic_test_and_set<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bool _op(bs_t<T>& left, T value)
-	{
-		return atomic_storage<under>::bts(reinterpret_cast<under&>(left), static_cast<uint>(static_cast<under>(value)));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename BS, typename T>
-struct atomic_test_and_reset<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bool _op(bs_t<T>& left, T value)
-	{
-		return atomic_storage<under>::btr(reinterpret_cast<under&>(left), static_cast<uint>(static_cast<under>(value)));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename BS, typename T>
-struct atomic_test_and_complement<BS, T, void_t<decltype(T::__bitset_enum_max), std::enable_if_t<std::is_same<BS, bs_t<T>>::value>>>
-{
-	using under = typename bs_base<T>::under;
-
-	static inline bool _op(bs_t<T>& left, T value)
-	{
-		return atomic_storage<under>::btc(reinterpret_cast<under&>(left), static_cast<uint>(static_cast<under>(value)));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename T>
-struct atomic_test_and_set<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_set(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename T>
-struct atomic_test_and_reset<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_reset(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename T>
-struct atomic_test_and_complement<T, T, void_t<decltype(T::__bitset_set_type)>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_complement(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-// Binary '|' operator: bitwise OR
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr T operator |(T lhs, T rhs)
-{
-	return static_cast<T>(std::underlying_type_t<T>(lhs) | std::underlying_type_t<T>(rhs));
-}
-
-// Binary '&' operator: bitwise AND
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr T operator &(T lhs, T rhs)
-{
-	return static_cast<T>(std::underlying_type_t<T>(lhs) & std::underlying_type_t<T>(rhs));
-}
-
-// Binary '^' operator: bitwise XOR
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr T operator ^(T lhs, T rhs)
-{
-	return static_cast<T>(std::underlying_type_t<T>(lhs) ^ std::underlying_type_t<T>(rhs));
-}
-
-// Unary '~' operator: bitwise NEG
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr T operator ~(T value)
-{
-	return static_cast<T>(~std::underlying_type_t<T>(value));
-}
-
-// Bitwise OR assignment
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline T& operator |=(T& lhs, T rhs)
-{
-	reinterpret_cast<std::underlying_type_t<T>&>(lhs) |= std::underlying_type_t<T>(rhs);
-	return lhs;
-}
-
-// Bitwise AND assignment
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline T& operator &=(T& lhs, T rhs)
-{
-	reinterpret_cast<std::underlying_type_t<T>&>(lhs) &= std::underlying_type_t<T>(rhs);
-	return lhs;
-}
-
-// Bitwise XOR assignment
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline T& operator ^=(T& lhs, T rhs)
-{
-	reinterpret_cast<std::underlying_type_t<T>&>(lhs) ^= std::underlying_type_t<T>(rhs);
-	return lhs;
-}
-
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr bool test(T value)
-{
-	return std::underlying_type_t<T>(value) != 0;
-}
-
-template<typename T, typename = decltype(T::__bitwise_ops)>
-constexpr bool test(T lhs, T rhs)
-{
-	return (std::underlying_type_t<T>(lhs) & std::underlying_type_t<T>(rhs)) != 0;
-}
-
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline bool test_and_set(T& lhs, T rhs)
-{
-	return test_and_set(reinterpret_cast<std::underlying_type_t<T>&>(lhs), std::underlying_type_t<T>(rhs));
-}
-
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline bool test_and_reset(T& lhs, T rhs)
-{
-	return test_and_reset(reinterpret_cast<std::underlying_type_t<T>&>(lhs), std::underlying_type_t<T>(rhs));
-}
-
-template<typename T, typename = decltype(T::__bitwise_ops)>
-inline bool test_and_complement(T& lhs, T rhs)
-{
-	return test_and_complement(reinterpret_cast<std::underlying_type_t<T>&>(lhs), std::underlying_type_t<T>(rhs));
-}
-
-template<typename T>
-struct atomic_or<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_or(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::or_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_and<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_and(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::and_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_xor<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline T op1(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::fetch_xor(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto fetch_op = &op1;
-
-	static inline T op2(T& left, T right)
-	{
-		return static_cast<T>(atomic_storage<under>::xor_fetch(reinterpret_cast<under&>(left), static_cast<under>(right)));
-	}
-
-	static constexpr auto op_fetch = &op2;
-	static constexpr auto atomic_op = &op2;
-};
-
-template<typename T>
-struct atomic_test_and_set<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_set(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename T>
-struct atomic_test_and_reset<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_reset(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
-
-template<typename T>
-struct atomic_test_and_complement<T, T, void_t<decltype(T::__bitwise_ops), std::enable_if_t<std::is_enum<T>::value>>>
-{
-	using under = std::underlying_type_t<T>;
-
-	static inline bool _op(T& left, T value)
-	{
-		return atomic_storage<under>::test_and_complement(reinterpret_cast<under&>(left), static_cast<under>(value));
-	}
-
-	static constexpr auto fetch_op = &_op;
-	static constexpr auto op_fetch = &_op;
-	static constexpr auto atomic_op = &_op;
-};
@@ -1,634 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include <climits>
-#include <string>
-#include <vector>
-#include <algorithm>
-
-/*
-C-style format parser. Appends formatted string to `out`, returns number of characters written.
-`out`: mutable reference to std::string, std::vector<char> or other compatible container
-`fmt`: null-terminated string of `Char` type (char or constructible from char)
-`src`: rvalue reference to argument provider.
-*/
-template<typename Dst, typename Char, typename Src>
-std::size_t cfmt_append(Dst& out, const Char* fmt, Src&& src)
-{
-	const std::size_t start_pos = out.size();
-
-	struct cfmt_context
-	{
-		std::size_t size; // Size of current format sequence
-
-		u8 args; // Number of extra args used
-		u8 type; // Integral type bytesize
-		bool dot; // Precision enabled
-		bool left;
-		bool sign;
-		bool space;
-		bool alter;
-		bool zeros;
-
-		uint width;
-		uint prec;
-	};
-
-	cfmt_context ctx{0};
-
-	// Error handling: print untouched sequence, stop further formatting
-	const auto drop_sequence = [&]
-	{
-		out.insert(out.end(), fmt - ctx.size, fmt);
-		ctx.size = -1;
-	};
-
-	const auto read_decimal = [&](uint result) -> uint
-	{
-		while (fmt[0] >= '0' && fmt[0] <= '9' && result <= (UINT_MAX / 10))
-		{
-			result = result * 10 + (fmt[0] - '0');
-			fmt++, ctx.size++;
-		}
-
-		return result;
-	};
-
-	const auto write_octal = [&](u64 value, u64 min_num)
-	{
-		out.resize(out.size() + std::max<u64>(min_num, 66 / 3 - (cntlz64(value | 1, true) + 2) / 3), '0');
-
-		// Write in reversed order
-		for (auto i = out.rbegin(); value; i++, value /= 8)
-		{
-			*i = value % 8 + '0';
-		}
-	};
-
-	const auto write_hex = [&](u64 value, bool upper, u64 min_num)
-	{
-		out.resize(out.size() + std::max<u64>(min_num, 64 / 4 - cntlz64(value | 1, true) / 4), '0');
-		
-		// Write in reversed order
-		for (auto i = out.rbegin(); value; i++, value /= 16)
-		{
-			*i = (upper ? "0123456789ABCDEF" : "0123456789abcdef")[value % 16];
-		}
-	};
-
-	const auto write_decimal = [&](u64 value, s64 min_size)
-	{
-		const std::size_t start = out.size();
-
-		do
-		{
-			out.push_back(value % 10 + '0');
-			value /= 10;
-		}
-		while (0 < --min_size || value);
-
-		// Revert written characters
-		for (std::size_t i = start, j = out.size() - 1; i < j; i++, j--)
-		{
-			std::swap(out[i], out[j]);
-		}
-	};
-
-	// Single pass over fmt string (null-terminated), TODO: check correct order
-	while (const Char ch = *fmt++) if (ctx.size == 0)
-	{
-		if (ch == '%')
-		{
-			ctx.size = 1;
-		}
-		else
-		{
-			out.push_back(ch);
-		}
-	}
-	else if (ctx.size == 1 && ch == '%')
-	{
-		ctx = {0};
-		out.push_back(ch);
-	}
-	else if (ctx.size == -1)
-	{
-		out.push_back(ch);
-	}
-	else switch (ctx.size++, ch)
-	{
-	case '-': ctx.left = true; break;
-	case '+': ctx.sign = true; break;
-	case ' ': ctx.space = true; break;
-	case '#': ctx.alter = true; break;
-	case '0': ctx.zeros = true; break;
-
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	{
-		if (UNLIKELY(ctx.width))
-		{
-			drop_sequence();
-		}
-		else
-		{
-			ctx.width = read_decimal(ch - '0');
-		}
-		
-		break;
-	}
-
-	case '*':
-	{
-		if (UNLIKELY(ctx.width || !src.test(ctx.args)))
-		{
-			drop_sequence();
-		}
-		else
-		{
-			const int warg = src.template get<int>(ctx.args++);
-			ctx.width = std::abs(warg);
-			ctx.left |= warg < 0;
-		}
-		
-		break;
-	}
-
-	case '.':
-	{
-		if (UNLIKELY(ctx.dot || ctx.prec))
-		{
-			drop_sequence();
-		}
-		else if (*fmt >= '0' && *fmt <= '9') // TODO: does it allow '0'?
-		{
-			ctx.prec = read_decimal(0);
-			ctx.dot = true;
-		}
-		else if (*fmt == '*')
-		{
-			if (UNLIKELY(!src.test(ctx.args)))
-			{
-				drop_sequence();
-			}
-			else
-			{
-				fmt++, ctx.size++;
-				const int parg = src.template get<int>(ctx.args++);
-				ctx.prec = std::max(parg, 0);
-				ctx.dot = parg >= 0;
-			}
-		}
-		else
-		{
-			ctx.prec = 0;
-			ctx.dot = true;
-		}
-
-		break;
-	}
-
-	case 'h':
-	{
-		if (UNLIKELY(ctx.type))
-		{
-			drop_sequence();
-		}
-		else if (fmt[0] == 'h')
-		{
-			fmt++, ctx.size++;
-			ctx.type = src.size_char;
-		}
-		else
-		{
-			ctx.type = src.size_short;
-		}
-
-		break;
-	}
-
-	case 'l':
-	{
-		if (UNLIKELY(ctx.type))
-		{
-			drop_sequence();
-		}
-		else if (fmt[0] == 'l')
-		{
-			fmt++, ctx.size++;
-			ctx.type = src.size_llong;
-		}
-		else
-		{
-			ctx.type = src.size_long;
-		}
-
-		break;
-	}
-
-	case 'z':
-	{
-		if (UNLIKELY(ctx.type))
-		{
-			drop_sequence();
-		}
-		else
-		{
-			ctx.type = src.size_size;
-		}
-
-		break;
-	}
-
-	case 'j':
-	{
-		if (UNLIKELY(ctx.type))
-		{
-			drop_sequence();
-		}
-		else
-		{
-			ctx.type = src.size_max;
-		}
-
-		break;
-	}
-
-	case 't':
-	{
-		if (UNLIKELY(ctx.type))
-		{
-			drop_sequence();
-		}
-		else
-		{
-			ctx.type = src.size_diff;
-		}
-
-		break;
-	}
-
-	case 'c':
-	{
-		if (UNLIKELY(ctx.type || !src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		const std::size_t start = out.size();
-		out.push_back(src.template get<Char>(ctx.args));
-
-		if (1 < ctx.width)
-		{
-			// Add spaces if necessary
-			out.insert(out.begin() + start + ctx.left, ctx.width - 1, ' ');
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 's':
-	{
-		if (UNLIKELY(ctx.type || !src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		const std::size_t start = out.size();
-		const std::size_t size1 = src.fmt_string(out, ctx.args);
-		
-		if (ctx.dot && size1 > ctx.prec)
-		{
-			// Shrink if necessary
-			out.resize(start + ctx.prec);
-		}
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add spaces if necessary
-			out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ' ');
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'd':
-	case 'i':
-	{
-		if (UNLIKELY(!src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		if (!ctx.type)
-		{
-			ctx.type = (u8)src.type(ctx.args);
-
-			if (!ctx.type)
-			{
-				ctx.type = src.size_int;
-			}
-		}
-
-		// Sign-extended argument expected
-		const u64 val = src.template get<u64>(ctx.args);
-		const bool negative = ctx.type && static_cast<s64>(val) < 0;
-
-		const std::size_t start = out.size();
-
-		if (!ctx.dot || ctx.prec)
-		{
-			if (negative)
-			{
-				out.push_back('-');
-			}
-			else if (ctx.sign)
-			{
-				out.push_back('+');
-			}
-			else if (ctx.space)
-			{
-				out.push_back(' ');
-			}
-
-			write_decimal(negative ? 0 - val : val, ctx.prec);
-		}
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add padding if necessary
-			if (ctx.zeros && !ctx.left && !ctx.dot)
-			{
-				out.insert(out.begin() + start + (negative || ctx.sign || ctx.space), ctx.width - size2, '0');
-			}
-			else
-			{
-				out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ' ');
-			}
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'o':
-	{
-		if (UNLIKELY(!src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		if (!ctx.type)
-		{
-			ctx.type = (u8)src.type(ctx.args);
-
-			if (!ctx.type)
-			{
-				ctx.type = src.size_int;
-			}
-		}
-
-		const u64 mask =
-			ctx.type == 1 ? 0xffull :
-			ctx.type == 2 ? 0xffffull :
-			ctx.type == 4 ? 0xffffffffull : 0xffffffffffffffffull;
-
-		// Trunc sign-extended signed types
-		const u64 val = src.template get<u64>(ctx.args) & mask;
-
-		const std::size_t start = out.size();
-
-		if (ctx.alter)
-		{
-			out.push_back('0');
-
-			if (val)
-			{
-				write_octal(val, ctx.prec ? ctx.prec - 1 : 0);
-			}
-		}
-		else if (!ctx.dot || ctx.prec)
-		{
-			write_octal(val, ctx.prec);
-		}
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add padding if necessary
-			out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ctx.zeros && !ctx.left && !ctx.dot ? '0' : ' ');
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'x':
-	case 'X':
-	{
-		if (UNLIKELY(!src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		if (!ctx.type)
-		{
-			ctx.type = (u8)src.type(ctx.args);
-
-			if (!ctx.type)
-			{
-				ctx.type = src.size_int;
-			}
-		}
-
-		const u64 mask =
-			ctx.type == 1 ? 0xffull :
-			ctx.type == 2 ? 0xffffull :
-			ctx.type == 4 ? 0xffffffffull : 0xffffffffffffffffull;
-
-		// Trunc sign-extended signed types
-		const u64 val = src.template get<u64>(ctx.args) & mask;
-
-		const std::size_t start = out.size();
-
-		if (ctx.alter)
-		{
-			out.push_back('0');
-
-			if (val)
-			{
-				out.push_back(ch); // Prepend 0x or 0X
-				write_hex(val, ch == 'X', ctx.prec);
-			}
-		}
-		else if (!ctx.dot || ctx.prec)
-		{
-			write_hex(val, ch == 'X', ctx.prec);
-		}
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add padding if necessary
-			if (ctx.zeros && !ctx.left && !ctx.dot)
-			{
-				out.insert(out.begin() + start + (ctx.alter && val ? 2 : 0), ctx.width - size2, '0');
-			}
-			else
-			{
-				out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ' ');
-			}
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'u':
-	{
-		if (UNLIKELY(!src.test(ctx.args)))
-		{
-			drop_sequence();
-			break;
-		}
-
-		if (!ctx.type)
-		{
-			ctx.type = (u8)src.type(ctx.args);
-
-			if (!ctx.type)
-			{
-				ctx.type = src.size_int;
-			}
-		}
-
-		const u64 mask =
-			ctx.type == 1 ? 0xffull :
-			ctx.type == 2 ? 0xffffull :
-			ctx.type == 4 ? 0xffffffffull : 0xffffffffffffffffull;
-
-		// Trunc sign-extended signed types
-		const u64 val = src.template get<u64>(ctx.args) & mask;
-
-		const std::size_t start = out.size();
-
-		if (!ctx.dot || ctx.prec)
-		{
-			write_decimal(val, ctx.prec);
-		}
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add padding if necessary
-			out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ctx.zeros && !ctx.left && !ctx.dot ? '0' : ' ');
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'p':
-	{
-		if (UNLIKELY(!src.test(ctx.args) || ctx.type))
-		{
-			drop_sequence();
-			break;
-		}
-
-		const u64 val = src.template get<u64>(ctx.args);
-
-		const std::size_t start = out.size();
-
-		write_hex(val, false, sizeof(void*) * 2);
-
-		const std::size_t size2 = out.size() - start;
-
-		if (size2 < ctx.width)
-		{
-			// Add padding if necessary
-			out.insert(ctx.left ? out.end() : out.begin() + start, ctx.width - size2, ' ');
-		}
-		
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'f':
-	case 'F':
-	case 'e':
-	case 'E':
-	case 'a':
-	case 'A':
-	case 'g':
-	case 'G':
-	{
-		if (UNLIKELY(!src.test(ctx.args) || ctx.type))
-		{
-			drop_sequence();
-			break;
-		}
-
-		// Fallback (TODO)
-
-		const std::string _fmt(fmt - ctx.size, fmt);
-
-		const f64 arg0 = src.template get<f64>(0);
-		const u64 arg1 = ctx.args >= 1 ? src.template get<u64>(1) : 0;
-		const u64 arg2 = ctx.args >= 2 ? src.template get<u64>(2) : 0;
-
-		if (const std::size_t _size = std::snprintf(0, 0, _fmt.c_str(), arg0, arg1, arg2))
-		{
-			out.resize(out.size() + _size);
-			std::snprintf(&out.front() + out.size() - _size, _size + 1, _fmt.c_str(), arg0, arg1, arg2);
-		}
-
-		src.skip(ctx.args);
-		ctx = {0};
-		break;
-	}
-
-	case 'L': // long double, not supported
-	case 'n': // writeback, not supported
-	default:
-	{
-		drop_sequence();
-	}
-	}
-
-	// Handle unfinished sequence
-	if (ctx.size && ctx.size != -1)
-	{
-		fmt--, drop_sequence();
-	}
-
-	return out.size() - start_pos;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DH	3352e235b6	Major gcm emulation improvements Improved RSX DMA support (WIP)	2016-07-08 21:15:27 +03:00
DH	816169fe9e	OpenGL: improved vertex textures support	2016-07-04 21:17:23 +03:00