Apply BOOL->WINBOOL fix to headers imported from Wine.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2829 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/direct-x/include/d3d10.h

diff --git a/mingw-w64-headers/direct-x/include/d3d10.h b/mingw-w64-headers/direct-x/include/d3d10.h
index dd6ea6c..8c1ed0f 100644
--- a/mingw-w64-headers/direct-x/include/d3d10.h
+++ b/mingw-w64-headers/direct-x/include/d3d10.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from d3d10.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from d3d10.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -615,8 +615,8 @@
     D3D10_BLEND_OP_MAX = 5
 } D3D10_BLEND_OP;
 typedef struct D3D10_BLEND_DESC {
-    BOOL AlphaToCoverageEnable;
-    BOOL BlendEnable[8];
+    WINBOOL AlphaToCoverageEnable;
+    WINBOOL BlendEnable[8];
     D3D10_BLEND SrcBlend;
     D3D10_BLEND DestBlend;
     D3D10_BLEND_OP BlendOp;
@@ -656,10 +656,10 @@
     D3D10_COMPARISON_FUNC StencilFunc;
 } D3D10_DEPTH_STENCILOP_DESC;
 typedef struct D3D10_DEPTH_STENCIL_DESC {
-    BOOL DepthEnable;
+    WINBOOL DepthEnable;
     D3D10_DEPTH_WRITE_MASK DepthWriteMask;
     D3D10_COMPARISON_FUNC DepthFunc;
-    BOOL StencilEnable;
+    WINBOOL StencilEnable;
     UINT8 StencilReadMask;
     UINT8 StencilWriteMask;
     D3D10_DEPTH_STENCILOP_DESC FrontFace;
@@ -677,14 +677,14 @@
 typedef struct D3D10_RASTERIZER_DESC {
     D3D10_FILL_MODE FillMode;
     D3D10_CULL_MODE CullMode;
-    BOOL FrontCounterClockwise;
+    WINBOOL FrontCounterClockwise;
     INT DepthBias;
     FLOAT DepthBiasClamp;
     FLOAT SlopeScaledDepthBias;
-    BOOL DepthClipEnable;
-    BOOL ScissorEnable;
-    BOOL MultisampleEnable;
-    BOOL AntialiasedLineEnable;
+    WINBOOL DepthClipEnable;
+    WINBOOL ScissorEnable;
+    WINBOOL MultisampleEnable;
+    WINBOOL AntialiasedLineEnable;
 } D3D10_RASTERIZER_DESC;
 typedef enum D3D10_FILTER {
     D3D10_FILTER_MIN_MAG_MIP_POINT = 0,
@@ -1118,7 +1118,7 @@
 } D3D10_QUERY_MISC_FLAG;
 typedef struct D3D10_QUERY_DATA_TIMESTAMP_DISJOINT {
     UINT64 Frequency;
-    BOOL Disjoint;
+    WINBOOL Disjoint;
 } D3D10_QUERY_DATA_TIMESTAMP_DISJOINT;
 typedef struct D3D10_QUERY_DATA_PIPELINE_STATISTICS {
     UINT64 IAVertices;
@@ -3559,7 +3559,7 @@
 
     virtual void STDMETHODCALLTYPE SetPredication(
         ID3D10Predicate *pPredicate,
-        BOOL PredicateValue) = 0;
+        WINBOOL PredicateValue) = 0;
 
     virtual void STDMETHODCALLTYPE GSSetShaderResources(
         UINT StartSlot,
@@ -3710,7 +3710,7 @@
 
     virtual void STDMETHODCALLTYPE GetPredication(
         ID3D10Predicate **ppPredicate,
-        BOOL *pPredicateValue) = 0;
+        WINBOOL *pPredicateValue) = 0;
 
     virtual void STDMETHODCALLTYPE GSGetShaderResources(
         UINT StartSlot,
@@ -4036,7 +4036,7 @@
     void (STDMETHODCALLTYPE *SetPredication)(
         ID3D10Device* This,
         ID3D10Predicate *pPredicate,
-        BOOL PredicateValue);
+        WINBOOL PredicateValue);
 
     void (STDMETHODCALLTYPE *GSSetShaderResources)(
         ID3D10Device* This,
@@ -4218,7 +4218,7 @@
     void (STDMETHODCALLTYPE *GetPredication)(
         ID3D10Device* This,
         ID3D10Predicate **ppPredicate,
-        BOOL *pPredicateValue);
+        WINBOOL *pPredicateValue);
 
     void (STDMETHODCALLTYPE *GSGetShaderResources)(
         ID3D10Device* This,
@@ -4748,7 +4748,7 @@
 void STDMETHODCALLTYPE ID3D10Device_SetPredication_Proxy(
     ID3D10Device* This,
     ID3D10Predicate *pPredicate,
-    BOOL PredicateValue);
+    WINBOOL PredicateValue);
 void __RPC_STUB ID3D10Device_SetPredication_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -5058,7 +5058,7 @@
 void STDMETHODCALLTYPE ID3D10Device_GetPredication_Proxy(
     ID3D10Device* This,
     ID3D10Predicate **ppPredicate,
-    BOOL *pPredicateValue);
+    WINBOOL *pPredicateValue);
 void __RPC_STUB ID3D10Device_GetPredication_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -5499,10 +5499,10 @@
     virtual void STDMETHODCALLTYPE Leave(
         ) = 0;
 
-    virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected(
-        BOOL bMTProtect) = 0;
+    virtual WINBOOL STDMETHODCALLTYPE SetMultithreadProtected(
+        WINBOOL bMTProtect) = 0;
 
-    virtual BOOL STDMETHODCALLTYPE GetMultithreadProtected(
+    virtual WINBOOL STDMETHODCALLTYPE GetMultithreadProtected(
         ) = 0;
 
 };
@@ -5529,11 +5529,11 @@
     void (STDMETHODCALLTYPE *Leave)(
         ID3D10Multithread* This);
 
-    BOOL (STDMETHODCALLTYPE *SetMultithreadProtected)(
+    WINBOOL (STDMETHODCALLTYPE *SetMultithreadProtected)(
         ID3D10Multithread* This,
-        BOOL bMTProtect);
+        WINBOOL bMTProtect);
 
-    BOOL (STDMETHODCALLTYPE *GetMultithreadProtected)(
+    WINBOOL (STDMETHODCALLTYPE *GetMultithreadProtected)(
         ID3D10Multithread* This);
 
     END_INTERFACE
@@ -5570,15 +5570,15 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-BOOL STDMETHODCALLTYPE ID3D10Multithread_SetMultithreadProtected_Proxy(
+WINBOOL STDMETHODCALLTYPE ID3D10Multithread_SetMultithreadProtected_Proxy(
     ID3D10Multithread* This,
-    BOOL bMTProtect);
+    WINBOOL bMTProtect);
 void __RPC_STUB ID3D10Multithread_SetMultithreadProtected_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-BOOL STDMETHODCALLTYPE ID3D10Multithread_GetMultithreadProtected_Proxy(
+WINBOOL STDMETHODCALLTYPE ID3D10Multithread_GetMultithreadProtected_Proxy(
     ID3D10Multithread* This);
 void __RPC_STUB ID3D10Multithread_GetMultithreadProtected_Stub(
     IRpcStubBuffer* This,

mingw-w64-headers/direct-x/include/d3d10effect.h

diff --git a/mingw-w64-headers/direct-x/include/d3d10effect.h b/mingw-w64-headers/direct-x/include/d3d10effect.h
index e020583..7156b9f 100644
--- a/mingw-w64-headers/direct-x/include/d3d10effect.h
+++ b/mingw-w64-headers/direct-x/include/d3d10effect.h
@@ -91,7 +91,7 @@
 
 typedef struct _D3D10_EFFECT_DESC
 {
-    BOOL IsChildEffect;
+    WINBOOL IsChildEffect;
     UINT ConstantBuffers;
     UINT SharedConstantBuffers;
     UINT GlobalVariables;
@@ -102,7 +102,7 @@
 typedef struct _D3D10_EFFECT_SHADER_DESC
 {
     const BYTE *pInputSignature;
-    BOOL IsInline;
+    WINBOOL IsInline;
     const BYTE *pBytecode;
     UINT BytecodeLength;
     LPCSTR SODecl;
@@ -132,7 +132,7 @@
 #define INTERFACE ID3D10EffectType
 DECLARE_INTERFACE(ID3D10EffectType)
 {
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_TYPE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE;
@@ -147,7 +147,7 @@
 #define INTERFACE ID3D10EffectVariable
 DECLARE_INTERFACE(ID3D10EffectVariable)
 {
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -181,7 +181,7 @@
 DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -220,7 +220,7 @@
 DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -254,10 +254,10 @@
     STDMETHOD(GetInt)(THIS_ int *value) PURE;
     STDMETHOD(SetIntArray)(THIS_ int *values, UINT offset, UINT count) PURE;
     STDMETHOD(GetIntArray)(THIS_ int *values, UINT offset, UINT count) PURE;
-    STDMETHOD(SetBool)(THIS_ BOOL value) PURE;
-    STDMETHOD(GetBool)(THIS_ BOOL *value) PURE;
-    STDMETHOD(SetBoolArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE;
-    STDMETHOD(GetBoolArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE;
+    STDMETHOD(SetBool)(THIS_ WINBOOL value) PURE;
+    STDMETHOD(GetBool)(THIS_ WINBOOL *value) PURE;
+    STDMETHOD(SetBoolArray)(THIS_ WINBOOL *values, UINT offset, UINT count) PURE;
+    STDMETHOD(GetBoolArray)(THIS_ WINBOOL *values, UINT offset, UINT count) PURE;
 };
 #undef INTERFACE
 
@@ -267,7 +267,7 @@
 DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -293,16 +293,16 @@
     STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
     /* ID3D10EffectVectorVariable methods */
-    STDMETHOD(SetBoolVector)(THIS_ BOOL *value) PURE;
+    STDMETHOD(SetBoolVector)(THIS_ WINBOOL *value) PURE;
     STDMETHOD(SetIntVector)(THIS_ int *value) PURE;
     STDMETHOD(SetFloatVector)(THIS_ float *value) PURE;
-    STDMETHOD(GetBoolVector)(THIS_ BOOL *value) PURE;
+    STDMETHOD(GetBoolVector)(THIS_ WINBOOL *value) PURE;
     STDMETHOD(GetIntVector)(THIS_ int *value) PURE;
     STDMETHOD(GetFloatVector)(THIS_ float *value) PURE;
-    STDMETHOD(SetBoolVectorArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE;
+    STDMETHOD(SetBoolVectorArray)(THIS_ WINBOOL *values, UINT offset, UINT count) PURE;
     STDMETHOD(SetIntVectorArray)(THIS_ int *values, UINT offset, UINT count) PURE;
     STDMETHOD(SetFloatVectorArray)(THIS_ float *values, UINT offset, UINT count) PURE;
-    STDMETHOD(GetBoolVectorArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE;
+    STDMETHOD(GetBoolVectorArray)(THIS_ WINBOOL *values, UINT offset, UINT count) PURE;
     STDMETHOD(GetIntVectorArray)(THIS_ int *values, UINT offset, UINT count) PURE;
     STDMETHOD(GetFloatVectorArray)(THIS_ float *values, UINT offset, UINT count) PURE;
 };
@@ -314,7 +314,7 @@
 DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -357,7 +357,7 @@
 DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -395,7 +395,7 @@
 DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -435,7 +435,7 @@
 DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -475,7 +475,7 @@
 DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -514,7 +514,7 @@
 DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -557,7 +557,7 @@
 DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -595,7 +595,7 @@
 DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -633,7 +633,7 @@
 DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -671,7 +671,7 @@
 DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
 {
     /* ID3D10EffectVariable methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
@@ -707,7 +707,7 @@
 #define INTERFACE ID3D10EffectTechnique
 DECLARE_INTERFACE(ID3D10EffectTechnique)
 {
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE;
@@ -727,8 +727,8 @@
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
     /* ID3D10Effect methods */
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
-    STDMETHOD_(BOOL, IsPool)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsPool)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
@@ -739,7 +739,7 @@
     STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByIndex)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ LPCSTR name) PURE;
     STDMETHOD(Optimize)(THIS) PURE;
-    STDMETHOD_(BOOL, IsOptimized)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsOptimized)(THIS) PURE;
 };
 #undef INTERFACE
 
@@ -762,7 +762,7 @@
 #define INTERFACE ID3D10EffectPass
 DECLARE_INTERFACE(ID3D10EffectPass)
 {
-    STDMETHOD_(BOOL, IsValid)(THIS) PURE;
+    STDMETHOD_(WINBOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_PASS_DESC *desc) PURE;
     STDMETHOD(GetVertexShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;
     STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;

mingw-w64-headers/direct-x/include/dxgi.h

diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h
index 8294206..4690a17 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.h
+++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from dxgi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from dxgi.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -122,7 +122,7 @@
 typedef struct DXGI_OUTPUT_DESC {
     WCHAR DeviceName[32];
     RECT DesktopCoordinates;
-    BOOL AttachedToDesktop;
+    WINBOOL AttachedToDesktop;
     DXGI_MODE_ROTATION Rotation;
     HMONITOR Monitor;
 } DXGI_OUTPUT_DESC;
@@ -150,7 +150,7 @@
     DXGI_USAGE BufferUsage;
     UINT BufferCount;
     HWND OutputWindow;
-    BOOL Windowed;
+    WINBOOL Windowed;
     DXGI_SWAP_EFFECT SwapEffect;
     UINT Flags;
 } DXGI_SWAP_CHAIN_DESC;
@@ -541,7 +541,7 @@
 
     virtual HRESULT STDMETHODCALLTYPE TakeOwnership(
         IUnknown *device,
-        BOOL exclusive) = 0;
+        WINBOOL exclusive) = 0;
 
     virtual void STDMETHODCALLTYPE ReleaseOwnership(
         ) = 0;
@@ -628,7 +628,7 @@
     HRESULT (STDMETHODCALLTYPE *TakeOwnership)(
         IDXGIOutput* This,
         IUnknown *device,
-        BOOL exclusive);
+        WINBOOL exclusive);
 
     void (STDMETHODCALLTYPE *ReleaseOwnership)(
         IDXGIOutput* This);
@@ -729,7 +729,7 @@
 HRESULT STDMETHODCALLTYPE IDXGIOutput_TakeOwnership_Proxy(
     IDXGIOutput* This,
     IUnknown *device,
-    BOOL exclusive);
+    WINBOOL exclusive);
 void __RPC_STUB IDXGIOutput_TakeOwnership_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -942,11 +942,11 @@
         void **surface) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(
-        BOOL fullscreen,
+        WINBOOL fullscreen,
         IDXGIOutput *target) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(
-        BOOL *fullscreen,
+        WINBOOL *fullscreen,
         IDXGIOutput **target) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetDesc(
@@ -1031,12 +1031,12 @@
 
     HRESULT (STDMETHODCALLTYPE *SetFullscreenState)(
         IDXGISwapChain* This,
-        BOOL fullscreen,
+        WINBOOL fullscreen,
         IDXGIOutput *target);
 
     HRESULT (STDMETHODCALLTYPE *GetFullscreenState)(
         IDXGISwapChain* This,
-        BOOL *fullscreen,
+        WINBOOL *fullscreen,
         IDXGIOutput **target);
 
     HRESULT (STDMETHODCALLTYPE *GetDesc)(
@@ -1121,7 +1121,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IDXGISwapChain_SetFullscreenState_Proxy(
     IDXGISwapChain* This,
-    BOOL fullscreen,
+    WINBOOL fullscreen,
     IDXGIOutput *target);
 void __RPC_STUB IDXGISwapChain_SetFullscreenState_Stub(
     IRpcStubBuffer* This,
@@ -1130,7 +1130,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IDXGISwapChain_GetFullscreenState_Proxy(
     IDXGISwapChain* This,
-    BOOL *fullscreen,
+    WINBOOL *fullscreen,
     IDXGIOutput **target);
 void __RPC_STUB IDXGISwapChain_GetFullscreenState_Stub(
     IRpcStubBuffer* This,

mingw-w64-headers/direct-x/include/dxgitype.h

diff --git a/mingw-w64-headers/direct-x/include/dxgitype.h b/mingw-w64-headers/direct-x/include/dxgitype.h
index 549a6a5..58b300f 100644
--- a/mingw-w64-headers/direct-x/include/dxgitype.h
+++ b/mingw-w64-headers/direct-x/include/dxgitype.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from dxgitype.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from dxgitype.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -145,7 +145,7 @@
     DXGI_MODE_SCALING Scaling;
 } DXGI_MODE_DESC;
 typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES {
-    BOOL ScaleAndOffsetSupported;
+    WINBOOL ScaleAndOffsetSupported;
     float MaxConvertedValue;
     float MinConvertedValue;
     UINT NumGammaControlPoints;

mingw-w64-headers/direct-x/include/xinput.h

diff --git a/mingw-w64-headers/direct-x/include/xinput.h b/mingw-w64-headers/direct-x/include/xinput.h
index 24fbdb3..48ab393 100644
--- a/mingw-w64-headers/direct-x/include/xinput.h
+++ b/mingw-w64-headers/direct-x/include/xinput.h
@@ -224,7 +224,7 @@
 extern "C" {
 #endif
 
-void WINAPI XInputEnable(BOOL);
+void WINAPI XInputEnable(WINBOOL);
 DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*);
 DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*);
 DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE);

mingw-w64-headers/include/fusion.h

diff --git a/mingw-w64-headers/include/fusion.h b/mingw-w64-headers/include/fusion.h
index 90f4c08..2a3bea3 100644
--- a/mingw-w64-headers/include/fusion.h
+++ b/mingw-w64-headers/include/fusion.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from fusion.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from fusion.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -897,7 +897,7 @@
 #endif  /* __IInstallReferenceEnum_INTERFACE_DEFINED__ */
 
 HRESULT WINAPI ClearDownloadCache(void);
-HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR,BOOL,LPCWSTR,BOOL,BOOL*,AssemblyComparisonResult*);
+HRESULT WINAPI CompareAssemblyIdentity(LPCWSTR,WINBOOL,LPCWSTR,WINBOOL,WINBOOL*,AssemblyComparisonResult*);
 HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);
 HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum**,IUnknown*,IAssemblyName*,DWORD,LPVOID);
 HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME*,LPCWSTR,DWORD,LPVOID);

mingw-w64-headers/include/mscat.h

diff --git a/mingw-w64-headers/include/mscat.h b/mingw-w64-headers/include/mscat.h
index 7c5c86b..f344d8d 100644
--- a/mingw-w64-headers/include/mscat.h
+++ b/mingw-w64-headers/include/mscat.h
@@ -93,7 +93,7 @@
     HANDLE hFile;
     DWORD dwCurFilePos;
     DWORD dwLastMemberOffset;
-    BOOL fEOF;
+    WINBOOL fEOF;
     LPWSTR pwszResultDir;
     HANDLE hCATStore;
 } CRYPTCATCDF;
@@ -102,23 +102,23 @@
 
 typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *);
 
-BOOL      WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
+WINBOOL      WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
 HCATINFO  WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD);
-BOOL      WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
+WINBOOL      WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
 HCATINFO  WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);
-BOOL      WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
-BOOL      WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
-BOOL      WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
-BOOL      WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD);
-BOOL      WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD);
-BOOL      WINAPI CryptCATCDFClose(CRYPTCATCDF *);
+WINBOOL      WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
+WINBOOL      WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
+WINBOOL      WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
+WINBOOL      WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD);
+WINBOOL      WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD);
+WINBOOL      WINAPI CryptCATCDFClose(CRYPTCATCDF *);
 CRYPTCATATTRIBUTE * WINAPI CryptCATCDFEnumCatAttributes(CRYPTCATCDF *, CRYPTCATATTRIBUTE *,
                                                         PFN_CDF_PARSE_ERROR_CALLBACK);
 LPWSTR              WINAPI CryptCATCDFEnumMembersByCDFTagEx(CRYPTCATCDF *, LPWSTR,
                                                             PFN_CDF_PARSE_ERROR_CALLBACK,
-                                                            CRYPTCATMEMBER **, BOOL, LPVOID);
+                                                            CRYPTCATMEMBER **, WINBOOL, LPVOID);
 CRYPTCATCDF       * WINAPI CryptCATCDFOpen(LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK);
-BOOL                WINAPI CryptCATClose(HANDLE);
+WINBOOL                WINAPI CryptCATClose(HANDLE);
 CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateAttr(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *);
 CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateCatAttr(HANDLE, CRYPTCATATTRIBUTE *);
 CRYPTCATMEMBER    * WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER *);

mingw-w64-headers/include/mscoree.h

diff --git a/mingw-w64-headers/include/mscoree.h b/mingw-w64-headers/include/mscoree.h
index 8a6eeb3..3225891 100644
--- a/mingw-w64-headers/include/mscoree.h
+++ b/mingw-w64-headers/include/mscoree.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from mscoree.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from mscoree.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>

mingw-w64-headers/include/optary.h

diff --git a/mingw-w64-headers/include/optary.h b/mingw-w64-headers/include/optary.h
index 73acb55..3910de0 100644
--- a/mingw-w64-headers/include/optary.h
+++ b/mingw-w64-headers/include/optary.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from optary.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from optary.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>

mingw-w64-headers/include/wincodec.h

diff --git a/mingw-w64-headers/include/wincodec.h b/mingw-w64-headers/include/wincodec.h
index bf36118..d122e20 100644
--- a/mingw-w64-headers/include/wincodec.h
+++ b/mingw-w64-headers/include/wincodec.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from wincodec.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from wincodec.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -255,7 +255,7 @@
     ULONG Length;
     BYTE *Pattern;
     BYTE *Mask;
-    BOOL EndOfStream;
+    WINBOOL EndOfStream;
 } WICBitmapPattern;
 typedef UINT32 WICColor;
 #define WINCODEC_ERR_WRONGSTATE 0x88982f04
@@ -949,7 +949,7 @@
 {
     virtual HRESULT STDMETHODCALLTYPE InitializePredefined(
         WICBitmapPaletteType ePaletteType,
-        BOOL fAddTransparentColor) = 0;
+        WINBOOL fAddTransparentColor) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE InitializeCustom(
         WICColor *pColors,
@@ -958,7 +958,7 @@
     virtual HRESULT STDMETHODCALLTYPE InitializeFromBitmap(
         IWICBitmapSource *pISurface,
         UINT colorCount,
-        BOOL fAddTransparentColor) = 0;
+        WINBOOL fAddTransparentColor) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE InitializeFromPalette(
         IWICPalette *pIPalette) = 0;
@@ -975,13 +975,13 @@
         UINT *pcActualColors) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE IsBlackWhite(
-        BOOL *pfIsBlackWhite) = 0;
+        WINBOOL *pfIsBlackWhite) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE IsGrayscale(
-        BOOL *pfIsGrayscale) = 0;
+        WINBOOL *pfIsGrayscale) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE HasAlpha(
-        BOOL *pfHasAlpha) = 0;
+        WINBOOL *pfHasAlpha) = 0;
 
 };
 #else
@@ -1004,7 +1004,7 @@
     HRESULT (STDMETHODCALLTYPE *InitializePredefined)(
         IWICPalette* This,
         WICBitmapPaletteType ePaletteType,
-        BOOL fAddTransparentColor);
+        WINBOOL fAddTransparentColor);
 
     HRESULT (STDMETHODCALLTYPE *InitializeCustom)(
         IWICPalette* This,
@@ -1015,7 +1015,7 @@
         IWICPalette* This,
         IWICBitmapSource *pISurface,
         UINT colorCount,
-        BOOL fAddTransparentColor);
+        WINBOOL fAddTransparentColor);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromPalette)(
         IWICPalette* This,
@@ -1037,15 +1037,15 @@
 
     HRESULT (STDMETHODCALLTYPE *IsBlackWhite)(
         IWICPalette* This,
-        BOOL *pfIsBlackWhite);
+        WINBOOL *pfIsBlackWhite);
 
     HRESULT (STDMETHODCALLTYPE *IsGrayscale)(
         IWICPalette* This,
-        BOOL *pfIsGrayscale);
+        WINBOOL *pfIsGrayscale);
 
     HRESULT (STDMETHODCALLTYPE *HasAlpha)(
         IWICPalette* This,
-        BOOL *pfHasAlpha);
+        WINBOOL *pfHasAlpha);
 
     END_INTERFACE
 } IWICPaletteVtbl;
@@ -1076,7 +1076,7 @@
 HRESULT STDMETHODCALLTYPE IWICPalette_InitializePredefined_Proxy(
     IWICPalette* This,
     WICBitmapPaletteType ePaletteType,
-    BOOL fAddTransparentColor);
+    WINBOOL fAddTransparentColor);
 void __RPC_STUB IWICPalette_InitializePredefined_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1095,7 +1095,7 @@
     IWICPalette* This,
     IWICBitmapSource *pISurface,
     UINT colorCount,
-    BOOL fAddTransparentColor);
+    WINBOOL fAddTransparentColor);
 void __RPC_STUB IWICPalette_InitializeFromBitmap_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1137,7 +1137,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICPalette_IsBlackWhite_Proxy(
     IWICPalette* This,
-    BOOL *pfIsBlackWhite);
+    WINBOOL *pfIsBlackWhite);
 void __RPC_STUB IWICPalette_IsBlackWhite_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1145,7 +1145,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICPalette_IsGrayscale_Proxy(
     IWICPalette* This,
-    BOOL *pfIsGrayscale);
+    WINBOOL *pfIsGrayscale);
 void __RPC_STUB IWICPalette_IsGrayscale_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1153,7 +1153,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICPalette_HasAlpha_Proxy(
     IWICPalette* This,
-    BOOL *pfHasAlpha);
+    WINBOOL *pfHasAlpha);
 void __RPC_STUB IWICPalette_HasAlpha_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1538,20 +1538,20 @@
         UINT *pcchActual) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE DoesSupportAnimation(
-        BOOL *pfSupportAnimation) = 0;
+        WINBOOL *pfSupportAnimation) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE DoesSupportChromaKey(
-        BOOL *pfSupportChromaKey) = 0;
+        WINBOOL *pfSupportChromaKey) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE DoesSupportLossless(
-        BOOL *pfSupportLossless) = 0;
+        WINBOOL *pfSupportLossless) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE DoesSupportMultiframe(
-        BOOL *pfSupportMultiframe) = 0;
+        WINBOOL *pfSupportMultiframe) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE MatchesMimeType(
         LPCWSTR wzMimeType,
-        BOOL *pfMatches) = 0;
+        WINBOOL *pfMatches) = 0;
 
 };
 #else
@@ -1654,24 +1654,24 @@
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
         IWICBitmapCodecInfo* This,
-        BOOL *pfSupportAnimation);
+        WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
         IWICBitmapCodecInfo* This,
-        BOOL *pfSupportChromaKey);
+        WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
         IWICBitmapCodecInfo* This,
-        BOOL *pfSupportLossless);
+        WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
         IWICBitmapCodecInfo* This,
-        BOOL *pfSupportMultiframe);
+        WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
         IWICBitmapCodecInfo* This,
         LPCWSTR wzMimeType,
-        BOOL *pfMatches);
+        WINBOOL *pfMatches);
 
     END_INTERFACE
 } IWICBitmapCodecInfoVtbl;
@@ -1780,7 +1780,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(
     IWICBitmapCodecInfo* This,
-    BOOL *pfSupportAnimation);
+    WINBOOL *pfSupportAnimation);
 void __RPC_STUB IWICBitmapCodecInfo_DoesSupportAnimation_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1788,7 +1788,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportChromaKey_Proxy(
     IWICBitmapCodecInfo* This,
-    BOOL *pfSupportChromaKey);
+    WINBOOL *pfSupportChromaKey);
 void __RPC_STUB IWICBitmapCodecInfo_DoesSupportChromaKey_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1796,7 +1796,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportLossless_Proxy(
     IWICBitmapCodecInfo* This,
-    BOOL *pfSupportLossless);
+    WINBOOL *pfSupportLossless);
 void __RPC_STUB IWICBitmapCodecInfo_DoesSupportLossless_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1804,7 +1804,7 @@
     DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy(
     IWICBitmapCodecInfo* This,
-    BOOL *pfSupportMultiframe);
+    WINBOOL *pfSupportMultiframe);
 void __RPC_STUB IWICBitmapCodecInfo_DoesSupportMultiframe_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1813,7 +1813,7 @@
 HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_MatchesMimeType_Proxy(
     IWICBitmapCodecInfo* This,
     LPCWSTR wzMimeType,
-    BOOL *pfMatches);
+    WINBOOL *pfMatches);
 void __RPC_STUB IWICBitmapCodecInfo_MatchesMimeType_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -1845,7 +1845,7 @@
 
     virtual HRESULT STDMETHODCALLTYPE MatchesPattern(
         IStream *pIStream,
-        BOOL *pfMatches) = 0;
+        WINBOOL *pfMatches) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE CreateInstance(
         IWICBitmapDecoder **ppIBitmapDecoder) = 0;
@@ -1951,24 +1951,24 @@
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
         IWICBitmapDecoderInfo* This,
-        BOOL *pfSupportAnimation);
+        WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
         IWICBitmapDecoderInfo* This,
-        BOOL *pfSupportChromaKey);
+        WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
         IWICBitmapDecoderInfo* This,
-        BOOL *pfSupportLossless);
+        WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
         IWICBitmapDecoderInfo* This,
-        BOOL *pfSupportMultiframe);
+        WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
         IWICBitmapDecoderInfo* This,
         LPCWSTR wzMimeType,
-        BOOL *pfMatches);
+        WINBOOL *pfMatches);
 
     /*** IWICBitmapDecoderInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPatterns)(
@@ -1981,7 +1981,7 @@
     HRESULT (STDMETHODCALLTYPE *MatchesPattern)(
         IWICBitmapDecoderInfo* This,
         IStream *pIStream,
-        BOOL *pfMatches);
+        WINBOOL *pfMatches);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
         IWICBitmapDecoderInfo* This,
@@ -2031,7 +2031,7 @@
 HRESULT STDMETHODCALLTYPE IWICBitmapDecoderInfo_MatchesPattern_Proxy(
     IWICBitmapDecoderInfo* This,
     IStream *pIStream,
-    BOOL *pfMatches);
+    WINBOOL *pfMatches);
 void __RPC_STUB IWICBitmapDecoderInfo_MatchesPattern_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -2647,24 +2647,24 @@
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
         IWICBitmapEncoderInfo* This,
-        BOOL *pfSupportAnimation);
+        WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
         IWICBitmapEncoderInfo* This,
-        BOOL *pfSupportChromaKey);
+        WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
         IWICBitmapEncoderInfo* This,
-        BOOL *pfSupportLossless);
+        WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
         IWICBitmapEncoderInfo* This,
-        BOOL *pfSupportMultiframe);
+        WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
         IWICBitmapEncoderInfo* This,
         LPCWSTR wzMimeType,
-        BOOL *pfMatches);
+        WINBOOL *pfMatches);
 
     /*** IWICBitmapEncoderInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
@@ -2956,7 +2956,7 @@
     virtual HRESULT STDMETHODCALLTYPE CanConvert(
         REFWICPixelFormatGUID srcPixelFormat,
         REFWICPixelFormatGUID dstPixelFormat,
-        BOOL *pfCanConvert) = 0;
+        WINBOOL *pfCanConvert) = 0;
 
 };
 #else
@@ -3015,7 +3015,7 @@
         IWICFormatConverter* This,
         REFWICPixelFormatGUID srcPixelFormat,
         REFWICPixelFormatGUID dstPixelFormat,
-        BOOL *pfCanConvert);
+        WINBOOL *pfCanConvert);
 
     END_INTERFACE
 } IWICFormatConverterVtbl;
@@ -3058,7 +3058,7 @@
     IWICFormatConverter* This,
     REFWICPixelFormatGUID srcPixelFormat,
     REFWICPixelFormatGUID dstPixelFormat,
-    BOOL *pfCanConvert);
+    WINBOOL *pfCanConvert);
 void __RPC_STUB IWICFormatConverter_CanConvert_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,

mingw-w64-headers/include/winhttp.h

diff --git a/mingw-w64-headers/include/winhttp.h b/mingw-w64-headers/include/winhttp.h
index 17fc38a..ac8ba67 100644
--- a/mingw-w64-headers/include/winhttp.h
+++ b/mingw-w64-headers/include/winhttp.h
@@ -20,7 +20,7 @@
 #define __WINE_WINHTTP_H
 
 #define WINHTTPAPI
-#define BOOLAPI WINHTTPAPI BOOL WINAPI
+#define BOOLAPI WINHTTPAPI WINBOOL WINAPI
 
 
 typedef LPVOID HINTERNET;
@@ -490,7 +490,7 @@
 
 typedef struct
 {
-    BOOL   fAutoDetect;
+    WINBOOL   fAutoDetect;
     LPWSTR lpszAutoConfigUrl;
     LPWSTR lpszProxy;
     LPWSTR lpszProxyBypass;
@@ -505,7 +505,7 @@
     LPCWSTR lpszAutoConfigUrl;
     LPVOID lpvReserved;
     DWORD dwReserved;
-    BOOL fAutoLogonIfChallenged;
+    WINBOOL fAutoLogonIfChallenged;
 } WINHTTP_AUTOPROXY_OPTIONS;
 
 typedef struct
@@ -519,34 +519,34 @@
 extern "C" {
 #endif
 
-BOOL        WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD);
-BOOL        WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*);
-BOOL        WINAPI WinHttpCheckPlatform(void);
-BOOL        WINAPI WinHttpCloseHandle(HINTERNET);
+WINBOOL        WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD);
+WINBOOL        WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*);
+WINBOOL        WINAPI WinHttpCheckPlatform(void);
+WINBOOL        WINAPI WinHttpCloseHandle(HINTERNET);
 HINTERNET   WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD);
-BOOL        WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS);
-BOOL        WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD);
-BOOL        WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*);
-BOOL        WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*);
-BOOL        WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*);
+WINBOOL        WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS);
+WINBOOL        WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD);
+WINBOOL        WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*);
+WINBOOL        WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*);
+WINBOOL        WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*);
 HINTERNET   WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD);
 HINTERNET   WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD);
-BOOL        WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*);
-BOOL        WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD);
-BOOL        WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD);
-BOOL        WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD);
-BOOL        WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD);
-BOOL        WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD);
-BOOL        WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID);
-BOOL        WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR);
-BOOL        WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*);
-BOOL        WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID);
-BOOL        WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD);
+WINBOOL        WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*);
+WINBOOL        WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD);
+WINBOOL        WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD);
+WINBOOL        WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD);
+WINBOOL        WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD);
+WINBOOL        WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD);
+WINBOOL        WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID);
+WINBOOL        WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR);
+WINBOOL        WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*);
+WINBOOL        WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID);
+WINBOOL        WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD);
 WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR);
-BOOL        WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int);
-BOOL        WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR);
-BOOL        WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*);
-BOOL        WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD);
+WINBOOL        WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int);
+WINBOOL        WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR);
+WINBOOL        WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*);
+WINBOOL        WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD);
 
 #ifdef __cplusplus
 }

mingw-w64-headers/include/xmllite.h

diff --git a/mingw-w64-headers/include/xmllite.h b/mingw-w64-headers/include/xmllite.h
index 212e933..105c569 100644
--- a/mingw-w64-headers/include/xmllite.h
+++ b/mingw-w64-headers/include/xmllite.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.2-rc3 from xmllite.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.2-rc7 from xmllite.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -107,10 +107,10 @@
         LPCWSTR *baseUri,
         UINT *baseUri_length) = 0;
 
-    virtual BOOL STDMETHODCALLTYPE IsDefault(
+    virtual WINBOOL STDMETHODCALLTYPE IsDefault(
         ) = 0;
 
-    virtual BOOL STDMETHODCALLTYPE IsEmptyElement(
+    virtual WINBOOL STDMETHODCALLTYPE IsEmptyElement(
         ) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetLineNumber(
@@ -125,7 +125,7 @@
     virtual HRESULT STDMETHODCALLTYPE GetDepth(
         UINT *depth) = 0;
 
-    virtual BOOL STDMETHODCALLTYPE IsEOF(
+    virtual WINBOOL STDMETHODCALLTYPE IsEOF(
         ) = 0;
 
 };
@@ -218,10 +218,10 @@
         LPCWSTR *baseUri,
         UINT *baseUri_length);
 
-    BOOL (STDMETHODCALLTYPE *IsDefault)(
+    WINBOOL (STDMETHODCALLTYPE *IsDefault)(
         IXmlReader* This);
 
-    BOOL (STDMETHODCALLTYPE *IsEmptyElement)(
+    WINBOOL (STDMETHODCALLTYPE *IsEmptyElement)(
         IXmlReader* This);
 
     HRESULT (STDMETHODCALLTYPE *GetLineNumber)(
@@ -240,7 +240,7 @@
         IXmlReader* This,
         UINT *depth);
 
-    BOOL (STDMETHODCALLTYPE *IsEOF)(
+    WINBOOL (STDMETHODCALLTYPE *IsEOF)(
         IXmlReader* This);
 
     END_INTERFACE
@@ -418,14 +418,14 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-BOOL STDMETHODCALLTYPE IXmlReader_IsDefault_Proxy(
+WINBOOL STDMETHODCALLTYPE IXmlReader_IsDefault_Proxy(
     IXmlReader* This);
 void __RPC_STUB IXmlReader_IsDefault_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-BOOL STDMETHODCALLTYPE IXmlReader_IsEmptyElement_Proxy(
+WINBOOL STDMETHODCALLTYPE IXmlReader_IsEmptyElement_Proxy(
     IXmlReader* This);
 void __RPC_STUB IXmlReader_IsEmptyElement_Stub(
     IRpcStubBuffer* This,
@@ -464,7 +464,7 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-BOOL STDMETHODCALLTYPE IXmlReader_IsEOF_Proxy(
+WINBOOL STDMETHODCALLTYPE IXmlReader_IsEOF_Proxy(
     IXmlReader* This);
 void __RPC_STUB IXmlReader_IsEOF_Stub(
     IRpcStubBuffer* This,
@@ -497,7 +497,7 @@
 STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);
 typedef IUnknown IXmlReaderInput;
 STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,
-                                            LPCWSTR encoding, BOOL hint,
+                                            LPCWSTR encoding, WINBOOL hint,
                                             LPCWSTR base_uri, IXmlReaderInput **ppInput);
 /* Begin additional prototypes for all interfaces */