Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update mingw-w64 to latest from git.

Browse Source
This commit is contained in:
Alexey Pavlov
2016-05-27 09:31:19 +03:00
parent 2623f8fb75
commit 239b3d2581
7 changed files with 12 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
mingw-w64-crt-git/0002-dxgi-Add-interface-for-IDXGISurface1.patch
View File

@@ -1,258 +0,0 @@
From a02316fd603ffa47e68c700390e66baaa2ffa7f5 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Mon, 16 Feb 2015 19:56:22 +0000
Subject: [PATCH 2/6] dxgi: Add interface for IDXGISurface1
---
mingw-w64-headers/direct-x/include/dxgi.h | 191 ++++++++++++++++++++++++++++
mingw-w64-headers/direct-x/include/dxgi.idl | 19 +++
2 files changed, 210 insertions(+)
diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h
index 88e76a2..08def83 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.h
+++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -42,6 +42,11 @@ typedef interface IDXGIKeyedMutex IDXGIKeyedMutex;
typedef interface IDXGISurface IDXGISurface;
#endif
+#ifndef __IDXGISurface1_FWD_DEFINED__
+#define __IDXGISurface1_FWD_DEFINED__
+typedef interface IDXGISurface1 IDXGISurface1;
+#endif
+
#ifndef __IDXGIOutput_FWD_DEFINED__
#define __IDXGIOutput_FWD_DEFINED__
typedef interface IDXGIOutput IDXGIOutput;
@@ -1019,6 +1024,192 @@ void __RPC_STUB IDXGISurface_Unmap_Stub(
#endif /* __IDXGISurface_INTERFACE_DEFINED__ */
/*****************************************************************************
+ * IDXGISurface1 interface
+ */
+#ifndef __IDXGISurface1_INTERFACE_DEFINED__
+#define __IDXGISurface1_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IDXGISurface1, 0x4ae63092, 0x6327, 0x4c1b, 0x80,0xae, 0xbf,0xe1,0x2e,0xa3,0x2b,0x86);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("4ae63092-6327-4c1b-80ae-bfe12ea32b86")
+IDXGISurface1 : public IDXGISurface
+{
+ virtual HRESULT STDMETHODCALLTYPE GetDC(
+ WINBOOL Discard,
+ HDC *dc) = 0;
+
+ virtual HRESULT STDMETHODCALLTYPE ReleaseDC(
+ RECT *rect) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IDXGISurface1, 0x4ae63092, 0x6327, 0x4c1b, 0x80,0xae, 0xbf,0xe1,0x2e,0xa3,0x2b,0x86)
+#endif
+#else
+typedef struct IDXGISurface1Vtbl {
+ BEGIN_INTERFACE
+
+ /*** IUnknown methods ***/
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **ppvObject);
+
+ ULONG (STDMETHODCALLTYPE *AddRef)(
+ IDXGISurface1* This);
+
+ ULONG (STDMETHODCALLTYPE *Release)(
+ IDXGISurface1* This);
+
+ /*** IDXGIObject methods ***/
+ HRESULT (STDMETHODCALLTYPE *SetPrivateData)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ UINT data_size,
+ const void *data);
+
+ HRESULT (STDMETHODCALLTYPE *SetPrivateDataInterface)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ const IUnknown *object);
+
+ HRESULT (STDMETHODCALLTYPE *GetPrivateData)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ UINT *data_size,
+ void *data);
+
+ HRESULT (STDMETHODCALLTYPE *GetParent)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **parent);
+
+ /*** IDXGIDeviceSubObject methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDevice)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **device);
+
+ /*** IDXGISurface methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDesc)(
+ IDXGISurface1* This,
+ DXGI_SURFACE_DESC *desc);
+
+ HRESULT (STDMETHODCALLTYPE *Map)(
+ IDXGISurface1* This,
+ DXGI_MAPPED_RECT *mapped_rect,
+ UINT flags);
+
+ HRESULT (STDMETHODCALLTYPE *Unmap)(
+ IDXGISurface1* This);
+
+ /*** IDXGISurface1 methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDC)(
+ IDXGISurface1* This,
+ WINBOOL Discard,
+ HDC *dc);
+
+ HRESULT (STDMETHODCALLTYPE *ReleaseDC)(
+ IDXGISurface1* This,
+ RECT *rect);
+
+ END_INTERFACE
+} IDXGISurface1Vtbl;
+interface IDXGISurface1 {
+ CONST_VTBL IDXGISurface1Vtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IDXGISurface1_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IDXGISurface1_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IDXGISurface1_Release(This) (This)->lpVtbl->Release(This)
+/*** IDXGIObject methods ***/
+#define IDXGISurface1_SetPrivateData(This,guid,data_size,data) (This)->lpVtbl->SetPrivateData(This,guid,data_size,data)
+#define IDXGISurface1_SetPrivateDataInterface(This,guid,object) (This)->lpVtbl->SetPrivateDataInterface(This,guid,object)
+#define IDXGISurface1_GetPrivateData(This,guid,data_size,data) (This)->lpVtbl->GetPrivateData(This,guid,data_size,data)
+#define IDXGISurface1_GetParent(This,riid,parent) (This)->lpVtbl->GetParent(This,riid,parent)
+/*** IDXGIDeviceSubObject methods ***/
+#define IDXGISurface1_GetDevice(This,riid,device) (This)->lpVtbl->GetDevice(This,riid,device)
+/*** IDXGISurface methods ***/
+#define IDXGISurface1_GetDesc(This,desc) (This)->lpVtbl->GetDesc(This,desc)
+#define IDXGISurface1_Map(This,mapped_rect,flags) (This)->lpVtbl->Map(This,mapped_rect,flags)
+#define IDXGISurface1_Unmap(This) (This)->lpVtbl->Unmap(This)
+/*** IDXGISurface1 methods ***/
+#define IDXGISurface1_GetDC(This,Discard,dc) (This)->lpVtbl->GetDC(This,Discard,dc)
+#define IDXGISurface1_ReleaseDC(This,rect) (This)->lpVtbl->ReleaseDC(This,rect)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_QueryInterface(IDXGISurface1* This,REFIID riid,void **ppvObject) {
+ return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IDXGISurface1_AddRef(IDXGISurface1* This) {
+ return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IDXGISurface1_Release(IDXGISurface1* This) {
+ return This->lpVtbl->Release(This);
+}
+/*** IDXGIObject methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_SetPrivateData(IDXGISurface1* This,REFGUID guid,UINT data_size,const void *data) {
+ return This->lpVtbl->SetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGISurface1_SetPrivateDataInterface(IDXGISurface1* This,REFGUID guid,const IUnknown *object) {
+ return This->lpVtbl->SetPrivateDataInterface(This,guid,object);
+}
+static FORCEINLINE HRESULT IDXGISurface1_GetPrivateData(IDXGISurface1* This,REFGUID guid,UINT *data_size,void *data) {
+ return This->lpVtbl->GetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGISurface1_GetParent(IDXGISurface1* This,REFIID riid,void **parent) {
+ return This->lpVtbl->GetParent(This,riid,parent);
+}
+/*** IDXGIDeviceSubObject methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDevice(IDXGISurface1* This,REFIID riid,void **device) {
+ return This->lpVtbl->GetDevice(This,riid,device);
+}
+/*** IDXGISurface methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDesc(IDXGISurface1* This,DXGI_SURFACE_DESC *desc) {
+ return This->lpVtbl->GetDesc(This,desc);
+}
+static FORCEINLINE HRESULT IDXGISurface1_Map(IDXGISurface1* This,DXGI_MAPPED_RECT *mapped_rect,UINT flags) {
+ return This->lpVtbl->Map(This,mapped_rect,flags);
+}
+static FORCEINLINE HRESULT IDXGISurface1_Unmap(IDXGISurface1* This) {
+ return This->lpVtbl->Unmap(This);
+}
+/*** IDXGISurface1 methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDC(IDXGISurface1* This,WINBOOL Discard,HDC *dc) {
+ return This->lpVtbl->GetDC(This,Discard,dc);
+}
+static FORCEINLINE HRESULT IDXGISurface1_ReleaseDC(IDXGISurface1* This,RECT *rect) {
+ return This->lpVtbl->ReleaseDC(This,rect);
+}
+#endif
+#endif
+
+#endif
+
+HRESULT STDMETHODCALLTYPE IDXGISurface1_GetDC_Proxy(
+ IDXGISurface1* This,
+ WINBOOL Discard,
+ HDC *dc);
+void __RPC_STUB IDXGISurface1_GetDC_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+HRESULT STDMETHODCALLTYPE IDXGISurface1_ReleaseDC_Proxy(
+ IDXGISurface1* This,
+ RECT *rect);
+void __RPC_STUB IDXGISurface1_ReleaseDC_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+
+#endif /* __IDXGISurface1_INTERFACE_DEFINED__ */
+
+/*****************************************************************************
* IDXGIOutput interface
*/
#ifndef __IDXGIOutput_INTERFACE_DEFINED__
diff --git a/mingw-w64-headers/direct-x/include/dxgi.idl b/mingw-w64-headers/direct-x/include/dxgi.idl
index 009a6b5..41ff7f1 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.idl
+++ b/mingw-w64-headers/direct-x/include/dxgi.idl
@@ -1,5 +1,6 @@
/*
* Copyright 2007 Andras Kovacs
+ * Copyright 2015 Martell Malone
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -223,6 +224,24 @@ interface IDXGISurface : IDXGIDeviceSubObject
[
object,
+ uuid(4ae63092-6327-4c1b-80ae-bfe12ea32b86),
+ local,
+ pointer_default(unique)
+]
+interface IDXGISurface1 : IDXGISurface
+{
+ HRESULT GetDC(
+ [in] BOOL Discard,
+ [out] HDC *dc
+ );
+
+ HRESULT ReleaseDC(
+ [in] RECT *rect
+ );
+}
+
+[
+ object,
local,
uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa)
]
--
2.4.5

11
mingw-w64-crt-git/PKGBUILD
View File

@@ -4,7 +4,7 @@ _realname=crt
pkgbase=mingw-w64-${_realname}-git
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
pkgver=5.0.0.4636.f97302f
pkgver=5.0.0.4671.1b12b90
pkgrel=1
pkgdesc='MinGW-w64 CRT for Windows'
arch=('any')
@@ -19,12 +19,10 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
options=('!strip' 'staticlibs' '!buildflags' '!emptydirs')
source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
"0002-dxgi-Add-interface-for-IDXGISurface1.patch"
"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch"
"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch"
"0005-handle-ctor_list-internally.patch")
sha256sums=('SKIP'
'6bd7bac99793b9b1f7f8319da11f3f57b828cef61da4c43f579f49039cf29ac5'
'677642bbb0df3f1e0467f075f24c720657e9ed912a6e69cbf189352271fc09c1'
'c6c996b273ee049a2c0b9570f007d2d76a95ff56abb3b147f156e6a221a561ef'
'0eabe00375d4e26fd7e9afa56f6a9da02845fe2c0f900f5e1f829842bff8624a')
@@ -39,10 +37,9 @@ pkgver() {
prepare() {
cd ${srcdir}/mingw-w64
git am "${srcdir}"/0002-dxgi-Add-interface-for-IDXGISurface1.patch
git am "${srcdir}"/0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
git am "${srcdir}"/0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
#git apply -R "${srcdir}"/0005-handle-ctor_list-internally.patch
git am --committer-date-is-author-date "${srcdir}"/0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
git am --committer-date-is-author-date "${srcdir}"/0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
#git apply -R --committer-date-is-author-date "${srcdir}"/0005-handle-ctor_list-internally.patch
}
build() {

258
mingw-w64-headers-git/0002-dxgi-Add-interface-for-IDXGISurface1.patch
View File

@@ -1,258 +0,0 @@
From a02316fd603ffa47e68c700390e66baaa2ffa7f5 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Mon, 16 Feb 2015 19:56:22 +0000
Subject: [PATCH 2/6] dxgi: Add interface for IDXGISurface1
---
mingw-w64-headers/direct-x/include/dxgi.h | 191 ++++++++++++++++++++++++++++
mingw-w64-headers/direct-x/include/dxgi.idl | 19 +++
2 files changed, 210 insertions(+)
diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h
index 88e76a2..08def83 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.h
+++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -42,6 +42,11 @@ typedef interface IDXGIKeyedMutex IDXGIKeyedMutex;
typedef interface IDXGISurface IDXGISurface;
#endif
+#ifndef __IDXGISurface1_FWD_DEFINED__
+#define __IDXGISurface1_FWD_DEFINED__
+typedef interface IDXGISurface1 IDXGISurface1;
+#endif
+
#ifndef __IDXGIOutput_FWD_DEFINED__
#define __IDXGIOutput_FWD_DEFINED__
typedef interface IDXGIOutput IDXGIOutput;
@@ -1019,6 +1024,192 @@ void __RPC_STUB IDXGISurface_Unmap_Stub(
#endif /* __IDXGISurface_INTERFACE_DEFINED__ */
/*****************************************************************************
+ * IDXGISurface1 interface
+ */
+#ifndef __IDXGISurface1_INTERFACE_DEFINED__
+#define __IDXGISurface1_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IDXGISurface1, 0x4ae63092, 0x6327, 0x4c1b, 0x80,0xae, 0xbf,0xe1,0x2e,0xa3,0x2b,0x86);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("4ae63092-6327-4c1b-80ae-bfe12ea32b86")
+IDXGISurface1 : public IDXGISurface
+{
+ virtual HRESULT STDMETHODCALLTYPE GetDC(
+ WINBOOL Discard,
+ HDC *dc) = 0;
+
+ virtual HRESULT STDMETHODCALLTYPE ReleaseDC(
+ RECT *rect) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IDXGISurface1, 0x4ae63092, 0x6327, 0x4c1b, 0x80,0xae, 0xbf,0xe1,0x2e,0xa3,0x2b,0x86)
+#endif
+#else
+typedef struct IDXGISurface1Vtbl {
+ BEGIN_INTERFACE
+
+ /*** IUnknown methods ***/
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **ppvObject);
+
+ ULONG (STDMETHODCALLTYPE *AddRef)(
+ IDXGISurface1* This);
+
+ ULONG (STDMETHODCALLTYPE *Release)(
+ IDXGISurface1* This);
+
+ /*** IDXGIObject methods ***/
+ HRESULT (STDMETHODCALLTYPE *SetPrivateData)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ UINT data_size,
+ const void *data);
+
+ HRESULT (STDMETHODCALLTYPE *SetPrivateDataInterface)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ const IUnknown *object);
+
+ HRESULT (STDMETHODCALLTYPE *GetPrivateData)(
+ IDXGISurface1* This,
+ REFGUID guid,
+ UINT *data_size,
+ void *data);
+
+ HRESULT (STDMETHODCALLTYPE *GetParent)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **parent);
+
+ /*** IDXGIDeviceSubObject methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDevice)(
+ IDXGISurface1* This,
+ REFIID riid,
+ void **device);
+
+ /*** IDXGISurface methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDesc)(
+ IDXGISurface1* This,
+ DXGI_SURFACE_DESC *desc);
+
+ HRESULT (STDMETHODCALLTYPE *Map)(
+ IDXGISurface1* This,
+ DXGI_MAPPED_RECT *mapped_rect,
+ UINT flags);
+
+ HRESULT (STDMETHODCALLTYPE *Unmap)(
+ IDXGISurface1* This);
+
+ /*** IDXGISurface1 methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetDC)(
+ IDXGISurface1* This,
+ WINBOOL Discard,
+ HDC *dc);
+
+ HRESULT (STDMETHODCALLTYPE *ReleaseDC)(
+ IDXGISurface1* This,
+ RECT *rect);
+
+ END_INTERFACE
+} IDXGISurface1Vtbl;
+interface IDXGISurface1 {
+ CONST_VTBL IDXGISurface1Vtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IDXGISurface1_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IDXGISurface1_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IDXGISurface1_Release(This) (This)->lpVtbl->Release(This)
+/*** IDXGIObject methods ***/
+#define IDXGISurface1_SetPrivateData(This,guid,data_size,data) (This)->lpVtbl->SetPrivateData(This,guid,data_size,data)
+#define IDXGISurface1_SetPrivateDataInterface(This,guid,object) (This)->lpVtbl->SetPrivateDataInterface(This,guid,object)
+#define IDXGISurface1_GetPrivateData(This,guid,data_size,data) (This)->lpVtbl->GetPrivateData(This,guid,data_size,data)
+#define IDXGISurface1_GetParent(This,riid,parent) (This)->lpVtbl->GetParent(This,riid,parent)
+/*** IDXGIDeviceSubObject methods ***/
+#define IDXGISurface1_GetDevice(This,riid,device) (This)->lpVtbl->GetDevice(This,riid,device)
+/*** IDXGISurface methods ***/
+#define IDXGISurface1_GetDesc(This,desc) (This)->lpVtbl->GetDesc(This,desc)
+#define IDXGISurface1_Map(This,mapped_rect,flags) (This)->lpVtbl->Map(This,mapped_rect,flags)
+#define IDXGISurface1_Unmap(This) (This)->lpVtbl->Unmap(This)
+/*** IDXGISurface1 methods ***/
+#define IDXGISurface1_GetDC(This,Discard,dc) (This)->lpVtbl->GetDC(This,Discard,dc)
+#define IDXGISurface1_ReleaseDC(This,rect) (This)->lpVtbl->ReleaseDC(This,rect)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_QueryInterface(IDXGISurface1* This,REFIID riid,void **ppvObject) {
+ return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IDXGISurface1_AddRef(IDXGISurface1* This) {
+ return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IDXGISurface1_Release(IDXGISurface1* This) {
+ return This->lpVtbl->Release(This);
+}
+/*** IDXGIObject methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_SetPrivateData(IDXGISurface1* This,REFGUID guid,UINT data_size,const void *data) {
+ return This->lpVtbl->SetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGISurface1_SetPrivateDataInterface(IDXGISurface1* This,REFGUID guid,const IUnknown *object) {
+ return This->lpVtbl->SetPrivateDataInterface(This,guid,object);
+}
+static FORCEINLINE HRESULT IDXGISurface1_GetPrivateData(IDXGISurface1* This,REFGUID guid,UINT *data_size,void *data) {
+ return This->lpVtbl->GetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGISurface1_GetParent(IDXGISurface1* This,REFIID riid,void **parent) {
+ return This->lpVtbl->GetParent(This,riid,parent);
+}
+/*** IDXGIDeviceSubObject methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDevice(IDXGISurface1* This,REFIID riid,void **device) {
+ return This->lpVtbl->GetDevice(This,riid,device);
+}
+/*** IDXGISurface methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDesc(IDXGISurface1* This,DXGI_SURFACE_DESC *desc) {
+ return This->lpVtbl->GetDesc(This,desc);
+}
+static FORCEINLINE HRESULT IDXGISurface1_Map(IDXGISurface1* This,DXGI_MAPPED_RECT *mapped_rect,UINT flags) {
+ return This->lpVtbl->Map(This,mapped_rect,flags);
+}
+static FORCEINLINE HRESULT IDXGISurface1_Unmap(IDXGISurface1* This) {
+ return This->lpVtbl->Unmap(This);
+}
+/*** IDXGISurface1 methods ***/
+static FORCEINLINE HRESULT IDXGISurface1_GetDC(IDXGISurface1* This,WINBOOL Discard,HDC *dc) {
+ return This->lpVtbl->GetDC(This,Discard,dc);
+}
+static FORCEINLINE HRESULT IDXGISurface1_ReleaseDC(IDXGISurface1* This,RECT *rect) {
+ return This->lpVtbl->ReleaseDC(This,rect);
+}
+#endif
+#endif
+
+#endif
+
+HRESULT STDMETHODCALLTYPE IDXGISurface1_GetDC_Proxy(
+ IDXGISurface1* This,
+ WINBOOL Discard,
+ HDC *dc);
+void __RPC_STUB IDXGISurface1_GetDC_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+HRESULT STDMETHODCALLTYPE IDXGISurface1_ReleaseDC_Proxy(
+ IDXGISurface1* This,
+ RECT *rect);
+void __RPC_STUB IDXGISurface1_ReleaseDC_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+
+#endif /* __IDXGISurface1_INTERFACE_DEFINED__ */
+
+/*****************************************************************************
* IDXGIOutput interface
*/
#ifndef __IDXGIOutput_INTERFACE_DEFINED__
diff --git a/mingw-w64-headers/direct-x/include/dxgi.idl b/mingw-w64-headers/direct-x/include/dxgi.idl
index 009a6b5..41ff7f1 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.idl
+++ b/mingw-w64-headers/direct-x/include/dxgi.idl
@@ -1,5 +1,6 @@
/*
* Copyright 2007 Andras Kovacs
+ * Copyright 2015 Martell Malone
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -223,6 +224,24 @@ interface IDXGISurface : IDXGIDeviceSubObject
[
object,
+ uuid(4ae63092-6327-4c1b-80ae-bfe12ea32b86),
+ local,
+ pointer_default(unique)
+]
+interface IDXGISurface1 : IDXGISurface
+{
+ HRESULT GetDC(
+ [in] BOOL Discard,
+ [out] HDC *dc
+ );
+
+ HRESULT ReleaseDC(
+ [in] RECT *rect
+ );
+}
+
+[
+ object,
local,
uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa)
]
--
2.4.5

9
mingw-w64-headers-git/PKGBUILD
View File

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
pkgdesc="MinGW-w64 headers for Windows"
pkgver=5.0.0.4636.71f47f6
pkgver=5.0.0.4671.1b12b90
pkgrel=1
arch=('any')
url="http://mingw-w64.sourceforge.net"
@@ -16,11 +16,9 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
options=('!strip' '!libtool' '!emptydirs')
source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
"0002-dxgi-Add-interface-for-IDXGISurface1.patch"
"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch"
"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch")
sha256sums=('SKIP'
'6bd7bac99793b9b1f7f8319da11f3f57b828cef61da4c43f579f49039cf29ac5'
'677642bbb0df3f1e0467f075f24c720657e9ed912a6e69cbf189352271fc09c1'
'c6c996b273ee049a2c0b9570f007d2d76a95ff56abb3b147f156e6a221a561ef')
@@ -35,9 +33,8 @@ pkgver() {
prepare() {
cd ${srcdir}/mingw-w64
git am "${srcdir}/"0002-dxgi-Add-interface-for-IDXGISurface1.patch
git am "${srcdir}/"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
git am "${srcdir}/"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
git am --committer-date-is-author-date "${srcdir}/"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
git am --committer-date-is-author-date "${srcdir}/"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
cd ${srcdir}/mingw-w64/mingw-w64-headers
touch include/windows.*.h include/wincrypt.h include/prsht.h

4
mingw-w64-libmangle-git/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=5.0.0.4509.2e5a9a2
pkgver=5.0.0.4669.7de6266
pkgrel=1
pkgdesc="MinGW-w64 libmangle"
arch=('any')
@@ -31,7 +31,7 @@ pkgver() {
}
build() {
[ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
${srcdir}/mingw-w64/mingw-w64-libraries/libmangle/configure \

4
mingw-w64-tools-git/PKGBUILD
View File

@@ -4,10 +4,10 @@
_realname=tools
pkgbase=mingw-w64-${_realname}-git
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=5.0.0.4592.90b8472
pkgver=5.0.0.4669.7de6266
pkgrel=1
pkgdesc="MinGW-w64 tools"
arch=('any')

2
mingw-w64-winpthreads-git/PKGBUILD
View File

@@ -5,7 +5,7 @@
_realname=winpthreads
pkgbase=mingw-w64-${_realname}-git
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
pkgver=5.0.0.4662.23bd6d0
pkgver=5.0.0.4670.00cda6f
pkgrel=1
pkgdesc="MinGW-w64 winpthreads library"
url="http://mingw-w64.sourceforge.net"