headers: Import Wine version 11.6
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am index b75ed6a..30535b8 100644 --- a/mingw-w64-headers/Makefile.am +++ b/mingw-w64-headers/Makefile.am
@@ -314,6 +314,7 @@ include/windows.globalization.idl \ include/windows.graphics.capture.idl \ include/windows.graphics.capture.interop.idl \ + include/windows.graphics.directx.direct3d11.interop.idl \ include/windows.graphics.directx.idl \ include/windows.graphics.directx.direct3d11.idl \ include/windows.graphics.display.idl \
diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in index c06a9d8..c29430b 100644 --- a/mingw-w64-headers/Makefile.in +++ b/mingw-w64-headers/Makefile.in
@@ -613,6 +613,7 @@ @HAVE_WIDL_TRUE@ include/windows.globalization.idl \ @HAVE_WIDL_TRUE@ include/windows.graphics.capture.idl \ @HAVE_WIDL_TRUE@ include/windows.graphics.capture.interop.idl \ +@HAVE_WIDL_TRUE@ include/windows.graphics.directx.direct3d11.interop.idl \ @HAVE_WIDL_TRUE@ include/windows.graphics.directx.idl \ @HAVE_WIDL_TRUE@ include/windows.graphics.directx.direct3d11.idl \ @HAVE_WIDL_TRUE@ include/windows.graphics.display.idl \
diff --git a/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h new file mode 100644 index 0000000..267b9b1 --- /dev/null +++ b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h
@@ -0,0 +1,160 @@ +/*** Autogenerated by WIDL 11.5 from include/windows.graphics.directx.direct3d11.interop.idl - Do not edit ***/ + +#ifdef _WIN32 +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif +#include <rpc.h> +#include <rpcndr.h> +#endif + +#ifndef COM_NO_WINDOWS_H +#include <windows.h> +#include <ole2.h> +#endif + +#ifndef __windows_graphics_directx_direct3d11_interop_h__ +#define __windows_graphics_directx_direct3d11_interop_h__ + +/* Forward declarations */ + +#ifndef ____x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_FWD_DEFINED__ +#define ____x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_FWD_DEFINED__ +typedef interface __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess; +#ifdef __cplusplus +#define __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess +namespace ABI { + namespace Windows { + namespace Graphics { + namespace DirectX { + namespace Direct3D11 { + interface IDirect3DDxgiInterfaceAccess; + } + } + } + } +} +#endif /* __cplusplus */ +#endif + +/* Headers for imported files */ + +#include <dxgi.h> +#include <inspectable.h> +#include <windows.graphics.directx.direct3d11.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT CreateDirect3D11DeviceFromDXGIDevice(IDXGIDevice *dxgiDevice,IInspectable **graphicsDevice); + +/***************************************************************************** + * IDirect3DDxgiInterfaceAccess interface + */ +#ifndef ____x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_INTERFACE_DEFINED__ +#define ____x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_INTERFACE_DEFINED__ + +DEFINE_GUID(IID___x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess, 0xa9b3d012, 0x3df2, 0x4ee3, 0xb8,0xd1, 0x86,0x95,0xf4,0x57,0xd3,0xc1); +#if defined(__cplusplus) && !defined(CINTERFACE) +} /* extern "C" */ +namespace ABI { + namespace Windows { + namespace Graphics { + namespace DirectX { + namespace Direct3D11 { + MIDL_INTERFACE("a9b3d012-3df2-4ee3-b8d1-8695f457d3c1") + IDirect3DDxgiInterfaceAccess : public IUnknown + { + virtual HRESULT STDMETHODCALLTYPE GetInterface( + REFIID iid, + void **object) = 0; + + }; + } + } + } + } +} +extern "C" { +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(__x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess, 0xa9b3d012, 0x3df2, 0x4ee3, 0xb8,0xd1, 0x86,0x95,0xf4,0x57,0xd3,0xc1) +#endif +#else +typedef struct __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccessVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess *This); + + ULONG (STDMETHODCALLTYPE *Release)( + __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess *This); + + /*** IDirect3DDxgiInterfaceAccess methods ***/ + HRESULT (STDMETHODCALLTYPE *GetInterface)( + __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess *This, + REFIID iid, + void **object); + + END_INTERFACE +} __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccessVtbl; + +interface __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess { + CONST_VTBL __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccessVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_AddRef(This) (This)->lpVtbl->AddRef(This) +#define __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_Release(This) (This)->lpVtbl->Release(This) +/*** IDirect3DDxgiInterfaceAccess methods ***/ +#define __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_GetInterface(This,iid,object) (This)->lpVtbl->GetInterface(This,iid,object) +#else +/*** IUnknown methods ***/ +static inline HRESULT __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_QueryInterface(__x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static inline ULONG __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_AddRef(__x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess* This) { + return This->lpVtbl->AddRef(This); +} +static inline ULONG __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_Release(__x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess* This) { + return This->lpVtbl->Release(This); +} +/*** IDirect3DDxgiInterfaceAccess methods ***/ +static inline HRESULT __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_GetInterface(__x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess* This,REFIID iid,void **object) { + return This->lpVtbl->GetInterface(This,iid,object); +} +#endif +#ifdef WIDL_using_Windows_Graphics_DirectX_Direct3D11 +#define IID_IDirect3DDxgiInterfaceAccess IID___x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess +#define IDirect3DDxgiInterfaceAccessVtbl __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccessVtbl +#define IDirect3DDxgiInterfaceAccess __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess +#define IDirect3DDxgiInterfaceAccess_QueryInterface __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_QueryInterface +#define IDirect3DDxgiInterfaceAccess_AddRef __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_AddRef +#define IDirect3DDxgiInterfaceAccess_Release __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_Release +#define IDirect3DDxgiInterfaceAccess_GetInterface __x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_GetInterface +#endif /* WIDL_using_Windows_Graphics_DirectX_Direct3D11 */ +#endif + +#endif + +#endif /* ____x_ABI_CWindows_CGraphics_CDirectX_CDirect3D11_CIDirect3DDxgiInterfaceAccess_INTERFACE_DEFINED__ */ + +/* Begin additional prototypes for all interfaces */ + + +/* End additional prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __windows_graphics_directx_direct3d11_interop_h__ */
diff --git a/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl new file mode 100644 index 0000000..b5ca72e --- /dev/null +++ b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl
@@ -0,0 +1,34 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "dxgi.idl"; +import "inspectable.idl"; +import "windows.graphics.directx.direct3d11.idl"; + +namespace Windows.Graphics.DirectX.Direct3D11 { + HRESULT CreateDirect3D11DeviceFromDXGIDevice([in] IDXGIDevice* dxgiDevice, [out] IInspectable** graphicsDevice); + + [ + uuid(A9B3D012-3DF2-4EE3-B8D1-8695F457D3C1) + ] + interface IDirect3DDxgiInterfaceAccess : IUnknown { + HRESULT GetInterface([in] REFIID iid, [out, iid_is(iid)] void **object); + }; +}
diff --git a/mingw-w64-headers/include/winhttp.h b/mingw-w64-headers/include/winhttp.h index 4b3683a..0bcf584 100644 --- a/mingw-w64-headers/include/winhttp.h +++ b/mingw-w64-headers/include/winhttp.h
@@ -55,7 +55,8 @@ #define ICU_REJECT_USERPWD 0x00004000 /* flags for WinHttpOpen */ -#define WINHTTP_FLAG_ASYNC 0x10000000 +#define WINHTTP_FLAG_ASYNC 0x10000000 +#define WINHTTP_FLAG_SECURE_DEFAULTS 0x30000000 /* flags for WinHttpOpenRequest */ #define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 @@ -64,6 +65,7 @@ #define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 #define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 #define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE +#define WINHTTP_FLAG_AUTOMATIC_CHUNKING 0x00000200 #define WINHTTP_FLAG_SECURE 0x00800000 #define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 @@ -168,6 +170,7 @@ #define WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL 133 #define WINHTTP_OPTION_HTTP_PROTOCOL_USED 134 #define WINHTTP_OPTION_KDC_PROXY_SETTINGS 136 +#define WINHTTP_OPTION_PROXY_DISABLE_SERVICE_CALLS 137 #define WINHTTP_OPTION_ENCODE_EXTRA 138 #define WINHTTP_OPTION_DISABLE_STREAM_QUEUE 139 #define WINHTTP_OPTION_IPV6_FAST_FALLBACK 140 @@ -330,7 +333,11 @@ #define ERROR_WINHTTP_SECURE_FAILURE_PROXY (WINHTTP_ERROR_BASE + 188) #define ERROR_WINHTTP_RESERVED_189 (WINHTTP_ERROR_BASE + 189) #define ERROR_WINHTTP_HTTP_PROTOCOL_MISMATCH (WINHTTP_ERROR_BASE + 190) -#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 188) +#define ERROR_WINHTTP_GLOBAL_CALLBACK_FAILED (WINHTTP_ERROR_BASE + 191) +#define ERROR_WINHTTP_FEATURE_DISABLED (WINHTTP_ERROR_BASE + 192) +#define ERROR_WINHTTP_FAST_FORWARDING_NOT_SUPPORTED (WINHTTP_ERROR_BASE + 193) + +#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 193) #define WINHTTP_RESET_STATE 0x00000001 #define WINHTTP_RESET_SWPAD_CURRENT_NETWORK 0x00000002 @@ -511,8 +518,10 @@ #define WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE 0x01000000 #define WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE 0x02000000 #define WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE 0x04000000 +#define WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE 0x08000000 #define WINHTTP_CALLBACK_STATUS_SETTINGS_WRITE_COMPLETE 0x10000000 #define WINHTTP_CALLBACK_STATUS_SETTINGS_READ_COMPLETE 0x20000000 + #define WINHTTP_CALLBACK_FLAG_RESOLVE_NAME (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) #define WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) #define WINHTTP_CALLBACK_FLAG_SEND_REQUEST (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) @@ -530,10 +539,14 @@ #define WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE #define WINHTTP_CALLBACK_FLAG_REQUEST_ERROR WINHTTP_CALLBACK_STATUS_REQUEST_ERROR #define WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE +#define WINHTTP_CALLBACK_FLAG_GETPROXYSETTINGS_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE + #define WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR \ - | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE) + | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE \ + | WINHTTP_CALLBACK_STATUS_GETPROXYSETTINGS_COMPLETE) + #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff #define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) @@ -547,6 +560,9 @@ #define WINHTTP_HANDLE_TYPE_SESSION 1 #define WINHTTP_HANDLE_TYPE_CONNECT 2 #define WINHTTP_HANDLE_TYPE_REQUEST 3 +#define WINHTTP_HANDLE_TYPE_PROXY_RESOLVER 4 +#define WINHTTP_HANDLE_TYPE_WEBSOCKET 5 +#define WINHTTP_HANDLE_TYPE_PROTOCOL 6 #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED 0x00000001 #define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT 0x00000002