On 8/16/2016 5:51 AM, Jacek Caban wrote:
On 16.08.2016 14:14, dw wrote:
cpp_quote("#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1,
_FACDXGI, x)")
+cpp_quote("")
+cpp_quote("/* These defines are (incorrectly) duplicated in winerror.h. Avoid
the")
+cpp_quote(" redefine error. */")
+cpp_quote("#ifndef DXGI_ERROR_INVALID_CALL")
+cpp_quote("")
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)")
@@ -45,6 +50,9 @@ cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE
MAKE_DXGI_HRESULT
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("")
+cpp_quote("#endif /* DXGI_ERROR_INVALID_CALL */")
+cpp_quote("")
Those should be removed from dxgi.idl.
Fine by me (attached). Ok to push?
I'm going to assume that your lack of comment re defines3.patch mean
that you have no further objections. As requested, MFIdl.h is no longer
being changed.
dw
diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h
index d116b89..0519ef7 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.h
+++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -108,19 +108,6 @@ extern "C" {
#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7)
#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8)
#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1, _FACDXGI, x)
-#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)
-#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2)
-#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3)
-#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4)
-#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5)
-#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6)
-#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7)
-#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10)
-#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11)
-#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)
-#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32)
-#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33)
-#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34)
#if 0
typedef HANDLE HMONITOR;
typedef struct _LUID {
diff --git a/mingw-w64-headers/direct-x/include/dxgi.idl b/mingw-w64-headers/direct-x/include/dxgi.idl
index c7ba584..bfa8511 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.idl
+++ b/mingw-w64-headers/direct-x/include/dxgi.idl
@@ -32,19 +32,6 @@ cpp_quote("#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(
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;
------------------------------------------------------------------------------
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
