winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones.

include/dxgi.idl

@@ -23,28 +23,7 @@ import "dxgitype.h";
 const UINT _FACDXGI = 0x87a;
 
 cpp_quote("#define MAKE_DXGI_STATUS(x)                         MAKE_HRESULT(0, _FACDXGI, x)")
-cpp_quote("#define DXGI_STATUS_OCCLUDED                        MAKE_DXGI_STATUS(1)")
-cpp_quote("#define DXGI_STATUS_CLIPPED                         MAKE_DXGI_STATUS(2)")
-cpp_quote("#define DXGI_STATUS_NO_REDIRECTION                  MAKE_DXGI_STATUS(4)")
-cpp_quote("#define DXGI_STATUS_NO_DESKTOP_ACCESS               MAKE_DXGI_STATUS(5)")
-cpp_quote("#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE    MAKE_DXGI_STATUS(6)")
-cpp_quote("#define DXGI_STATUS_MODE_CHANGED                    MAKE_DXGI_STATUS(7)")
-cpp_quote("#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS         MAKE_DXGI_STATUS(8)")
-
 cpp_quote("#define MAKE_DXGI_HRESULT(x)                        MAKE_HRESULT(1, _FACDXGI, x)")
-cpp_quote("#define DXGI_ERROR_INVALID_CALL                     MAKE_DXGI_HRESULT(1)")
-cpp_quote("#define DXGI_ERROR_NOT_FOUND                        MAKE_DXGI_HRESULT(2)")
-cpp_quote("#define DXGI_ERROR_MORE_DATA                        MAKE_DXGI_HRESULT(3)")
-cpp_quote("#define DXGI_ERROR_UNSUPPORTED                      MAKE_DXGI_HRESULT(4)")
-cpp_quote("#define DXGI_ERROR_DEVICE_REMOVED                   MAKE_DXGI_HRESULT(5)")
-cpp_quote("#define DXGI_ERROR_DEVICE_HUNG                      MAKE_DXGI_HRESULT(6)")
-cpp_quote("#define DXGI_ERROR_DEVICE_RESET                     MAKE_DXGI_HRESULT(7)")
-cpp_quote("#define DXGI_ERROR_WAS_STILL_DRAWING                MAKE_DXGI_HRESULT(10)")
-cpp_quote("#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT        MAKE_DXGI_HRESULT(11)")
-cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE     MAKE_DXGI_HRESULT(12)")
-cpp_quote("#define DXGI_ERROR_DRIVER_INTERNAL_ERROR            MAKE_DXGI_HRESULT(32)")
-cpp_quote("#define DXGI_ERROR_NONEXCLUSIVE                     MAKE_DXGI_HRESULT(33)")
-cpp_quote("#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE          MAKE_DXGI_HRESULT(34)")
 
 cpp_quote("#if 0")
 typedef HANDLE HMONITOR;

include/winerror.h

@@ -3116,6 +3116,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
 #define D2DERR_PRINT_FORMAT_NOT_SUPPORTED                  _HRESULT_TYPEDEF_(0x8899002c)
 #define D2DERR_TOO_MANY_TRANSFORM_INPUTS                   _HRESULT_TYPEDEF_(0x8899002d)
 
+#define DXGI_STATUS_OCCLUDED                               _HRESULT_TYPEDEF_(0x087a0001)
+#define DXGI_STATUS_CLIPPED                                _HRESULT_TYPEDEF_(0x087a0002)
+#define DXGI_STATUS_NO_REDIRECTION                         _HRESULT_TYPEDEF_(0x087a0004)
+#define DXGI_STATUS_NO_DESKTOP_ACCESS                      _HRESULT_TYPEDEF_(0x087a0005)
+#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE           _HRESULT_TYPEDEF_(0x087a0006)
+#define DXGI_STATUS_MODE_CHANGED                           _HRESULT_TYPEDEF_(0x087a0007)
+#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS                _HRESULT_TYPEDEF_(0x087a0008)
+#define DXGI_STATUS_UNOCCLUDED                             _HRESULT_TYPEDEF_(0x087a0009)
+#define DXGI_STATUS_DDA_WAS_STILL_DRAWING                  _HRESULT_TYPEDEF_(0x087a000a)
+#define DXGI_STATUS_PRESENT_REQUIRED                       _HRESULT_TYPEDEF_(0x087a002f)
+
+#define DXGI_ERROR_INVALID_CALL                            _HRESULT_TYPEDEF_(0x887a0001)
+#define DXGI_ERROR_NOT_FOUND                               _HRESULT_TYPEDEF_(0x887a0002)
+#define DXGI_ERROR_MORE_DATA                               _HRESULT_TYPEDEF_(0x887a0003)
+#define DXGI_ERROR_UNSUPPORTED                             _HRESULT_TYPEDEF_(0x887a0004)
+#define DXGI_ERROR_DEVICE_REMOVED                          _HRESULT_TYPEDEF_(0x887a0005)
+#define DXGI_ERROR_DEVICE_HUNG                             _HRESULT_TYPEDEF_(0x887a0006)
+#define DXGI_ERROR_DEVICE_RESET                            _HRESULT_TYPEDEF_(0x887a0007)
+#define DXGI_ERROR_WAS_STILL_DRAWING                       _HRESULT_TYPEDEF_(0x887a000a)
+#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT               _HRESULT_TYPEDEF_(0x887a000b)
+#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE            _HRESULT_TYPEDEF_(0x887a000c)
+#define DXGI_ERROR_DRIVER_INTERNAL_ERROR                   _HRESULT_TYPEDEF_(0x887a0020)
+#define DXGI_ERROR_NONEXCLUSIVE                            _HRESULT_TYPEDEF_(0x887a0021)
+#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE                 _HRESULT_TYPEDEF_(0x887a0022)
+#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED              _HRESULT_TYPEDEF_(0x887a0023)
+#define DXGI_ERROR_REMOTE_OUTOFMEMORY                      _HRESULT_TYPEDEF_(0x887a0024)
+#define DXGI_ERROR_ACCESS_LOST                             _HRESULT_TYPEDEF_(0x887a0026)
+#define DXGI_ERROR_WAIT_TIMEOUT                            _HRESULT_TYPEDEF_(0x887a0027)
+#define DXGI_ERROR_SESSION_DISCONNECTED                    _HRESULT_TYPEDEF_(0x887a0028)
+#define DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE                _HRESULT_TYPEDEF_(0x887a0029)
+#define DXGI_ERROR_CANNOT_PROTECT_CONTENT                  _HRESULT_TYPEDEF_(0x887a002a)
+#define DXGI_ERROR_ACCESS_DENIED                           _HRESULT_TYPEDEF_(0x887a002b)
+#define DXGI_ERROR_NAME_ALREADY_EXISTS                     _HRESULT_TYPEDEF_(0x887a002c)
+#define DXGI_ERROR_SDK_COMPONENT_MISSING                   _HRESULT_TYPEDEF_(0x887a002d)
+#define DXGI_ERROR_NOT_CURRENT                             _HRESULT_TYPEDEF_(0x887a002e)
+#define DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY               _HRESULT_TYPEDEF_(0x887a0030)
+#define DXGI_ERROR_MODE_CHANGE_IN_PROGRESS                 _HRESULT_TYPEDEF_(0x887a0025)
+
 #define ERROR_AUDITING_DISABLED                            _HRESULT_TYPEDEF_(0xC0090001)
 #define ERROR_ALL_SIDS_FILTERED                            _HRESULT_TYPEDEF_(0xC0090002)