[mingw-headers/f20] Backported more upstream commits which are needed by latest mingw-wine-gecko
Erik van Pienbroek
epienbro at fedoraproject.org
Sat Mar 7 20:27:29 UTC 2015
commit 2e9b1672a2ab64892497a3132e8576bcbc7d6756
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Mar 7 21:27:26 2015 +0100
Backported more upstream commits which are needed by latest mingw-wine-gecko
commit-33cd049 | 42 ++++++++++++++++++++++++++++++++
commit-5db5317 | 21 ++++++++++++++++
commit-6a4cb01 | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
commit-a0c08bc | 27 +++++++++++++++++++++
commit-eba7897 | 23 ++++++++++++++++++
mingw-headers.spec | 15 +++++++++++-
6 files changed, 198 insertions(+), 1 deletion(-)
---
diff --git a/commit-33cd049 b/commit-33cd049
new file mode 100644
index 0000000..0d06d9f
--- /dev/null
+++ b/commit-33cd049
@@ -0,0 +1,42 @@
+commit 33cd049d72ef5b5eae897e1e513e6b1b3b0432c6
+Author: Jacek Caban <jacek at codeweavers.com>
+Date: Tue Nov 4 17:57:42 2014 +0100
+
+ opmapi.h fixes.
+
+diff --git a/mingw-w64-headers/include/opmapi.h b/mingw-w64-headers/include/opmapi.h
+index 085896f..4addf11 100644
+--- a/mingw-w64-headers/include/opmapi.h
++++ b/mingw-w64-headers/include/opmapi.h
+@@ -8,8 +8,6 @@
+
+ #include <dxva2api.h>
+
+-#if (_WIN32_WINNT >= 0x0600)
+-
+ #define OPM_OMAC_SIZE 16
+ #define OPM_CONFIGURE_SETTING_DATA_SIZE 4056
+ #define OPM_REQUESTED_INFORMATION_SIZE 4076
+@@ -225,11 +223,11 @@ DECLARE_INTERFACE_(IOPMVideoOutput,IUnknown)
+ STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+ /* IOPMVideoOutput methods */
+- STDMETHOD_(HRESULT,Configure)(THIS_ const OPM_CONFIGURE_PARAMETERS *pParameters,ULONG ulAdditionalParametersSize,const BYTE *pbAdditionalParameters) PURE;
+- STDMETHOD_(HRESULT,COPPCompatibleGetInformation)(THIS_ const OPM_COPP_COMPATIBLE_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
++ STDMETHOD_(HRESULT,StartInitialization)(THIS_ OPM_RANDOM_NUMBER *prnRandomNumber,BYTE **ppbCertificate,ULONG *pulCertificateLength) PURE;
+ STDMETHOD_(HRESULT,FinishInitialization)(THIS_ const OPM_ENCRYPTED_INITIALIZATION_PARAMETERS *pParameters) PURE;
+ STDMETHOD_(HRESULT,GetInformation)(THIS_ const OPM_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
+- STDMETHOD_(HRESULT,StartInitialization)(THIS_ OPM_RANDOM_NUMBER *prnRandomNumber,BYTE **ppbCertificate,ULONG *pulCertificateLength) PURE;
++ STDMETHOD_(HRESULT,COPPCompatibleGetInformation)(THIS_ const OPM_COPP_COMPATIBLE_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
++ STDMETHOD_(HRESULT,Configure)(THIS_ const OPM_CONFIGURE_PARAMETERS *pParameters,ULONG ulAdditionalParametersSize,const BYTE *pbAdditionalParameters) PURE;
+
+ END_INTERFACE
+ };
+@@ -263,7 +263,5 @@
+ }
+ #endif
+
+-#endif /*(_WIN32_WINNT >= 0x0600)*/
+-
+ #endif /*_INC_OPMAPI*/
+
diff --git a/commit-5db5317 b/commit-5db5317
new file mode 100644
index 0000000..05f6157
--- /dev/null
+++ b/commit-5db5317
@@ -0,0 +1,21 @@
+commit 5db53174d752d3f2b53deea55d9543365699cf26
+Author: Jacek Caban <jacek at codeweavers.com>
+Date: Fri Sep 26 12:18:08 2014 +0200
+
+ windns.h: Added some missing defines.
+
+diff --git a/mingw-w64-headers/include/windns.h b/mingw-w64-headers/include/windns.h
+index 51c2220..35d4222 100644
+--- a/mingw-w64-headers/include/windns.h
++++ b/mingw-w64-headers/include/windns.h
+@@ -771,7 +771,10 @@ extern "C" {
+ #define DNS_QUERY_NO_NETBT 0x00000080
+ #define DNS_QUERY_WIRE_ONLY 0x00000100
+ #define DNS_QUERY_RETURN_MESSAGE 0x00000200
++#define DNS_QUERY_MULTICAST_ONLY 0x00000400
++#define DNS_QUERY_NO_MULTICAST 0x00000800
+ #define DNS_QUERY_TREAT_AS_FQDN 0x00001000
++#define DNS_QUERY_APPEND_MULTILABEL 0x00800000
+ #define DNS_QUERY_DONT_RESET_TTL_VALUES 0x00100000
+ #define DNS_QUERY_RESERVED 0xff000000
+ #define DNS_QUERY_CACHE_ONLY DNS_QUERY_NO_WIRE_QUERY
diff --git a/commit-6a4cb01 b/commit-6a4cb01
new file mode 100644
index 0000000..1bb4df9
--- /dev/null
+++ b/commit-6a4cb01
@@ -0,0 +1,71 @@
+commit 6a4cb01b989abb1516dce1031f18841318115a1e
+Author: Jacek Caban <jacek at codeweavers.com>
+Date: Thu Nov 13 14:47:06 2014 +0100
+
+ Updated imported headers to current Wine version.
+
+diff --git a/mingw-w64-headers/direct-x/include/d3d9.h b/mingw-w64-headers/direct-x/include/d3d9.h
+index afdd47b..1557fa2 100644
+--- a/mingw-w64-headers/direct-x/include/d3d9.h
++++ b/mingw-w64-headers/direct-x/include/d3d9.h
+@@ -63,6 +63,8 @@
+ #define D3D_SDK_VERSION 32
+ #define D3DADAPTER_DEFAULT 0
+ #define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002)
++#define D3DPRESENT_DONOTWAIT __MSABI_LONG(1)
++#define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2)
+ #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3)
+ #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000)
+ #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001)
+diff --git a/mingw-w64-headers/direct-x/include/d3dx9shape.h b/mingw-w64-headers/direct-x/include/d3dx9shape.h
+index ec19750..1dcd40a 100644
+--- a/mingw-w64-headers/direct-x/include/d3dx9shape.h
++++ b/mingw-w64-headers/direct-x/include/d3dx9shape.h
+@@ -30,6 +30,8 @@ HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float
+ float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
+ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1, float radius2,
+ float length, UINT slices, UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
++HRESULT WINAPI D3DXCreatePolygon(struct IDirect3DDevice9 *device, float length, UINT sides, struct ID3DXMesh **mesh,
++ ID3DXBuffer **adjacency);
+ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, UINT slices,
+ UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
+ HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device,
+diff --git a/mingw-w64-headers/include/wpcapi.h b/mingw-w64-headers/include/wpcapi.h
+index 4d37183..c3e55d1 100644
+--- a/mingw-w64-headers/include/wpcapi.h
++++ b/mingw-w64-headers/include/wpcapi.h
+@@ -51,6 +51,14 @@ typedef interface IWindowsParentalControls IWindowsParentalControls;
+ extern "C" {
+ #endif
+
++typedef enum tagWPCFLAG_RESTRICTION {
++ WPCFLAG_NO_RESTRICTION = 0x0,
++ WPCFLAG_LOGGING_REQUIRED = 0x1,
++ WPCFLAG_WEB_FILTERED = 0x2,
++ WPCFLAG_HOURS_RESTRICTED = 0x4,
++ WPCFLAG_GAMES_BLOCKED = 0x8,
++ WPCFLAG_APPS_RESTRICTED = 0x10
++} WPCFLAG_RESTRICTION;
+ /*****************************************************************************
+ * IWPCSettings interface
+ */
+diff --git a/mingw-w64-headers/include/wpcapi.idl b/mingw-w64-headers/include/wpcapi.idl
+index 19c5256..db2d991 100644
+--- a/mingw-w64-headers/include/wpcapi.idl
++++ b/mingw-w64-headers/include/wpcapi.idl
+@@ -19,6 +19,15 @@
+ import "oaidl.idl";
+ import "ocidl.idl";
+
++typedef [v1_enum] enum tagWPCFLAG_RESTRICTION {
++ WPCFLAG_NO_RESTRICTION = 0x0000,
++ WPCFLAG_LOGGING_REQUIRED = 0x0001,
++ WPCFLAG_WEB_FILTERED = 0x0002,
++ WPCFLAG_HOURS_RESTRICTED = 0x0004,
++ WPCFLAG_GAMES_BLOCKED = 0x0008,
++ WPCFLAG_APPS_RESTRICTED = 0x0010
++} WPCFLAG_RESTRICTION;
++
+ [
+ uuid(8fdf6ca1-0189-47e4-b670-1a8a4636e340),
+ object
diff --git a/commit-a0c08bc b/commit-a0c08bc
new file mode 100644
index 0000000..11eeb5a
--- /dev/null
+++ b/commit-a0c08bc
@@ -0,0 +1,27 @@
+commit a0c08bc7fa79950132f28addb6ca11295f608202
+Author: Jacek Caban <jacek at codeweavers.com>
+Date: Mon Sep 8 10:38:47 2014 +0200
+
+ winerror.h: Added a few missing error codes.
+
+diff --git a/mingw-w64-headers/include/winerror.h b/mingw-w64-headers/include/winerror.h
+index e682d75..260514b 100644
+--- a/mingw-w64-headers/include/winerror.h
++++ b/mingw-w64-headers/include/winerror.h
+@@ -247,6 +247,16 @@
+ #define ERROR_ARITHMETIC_OVERFLOW __MSABI_LONG(534)
+ #define ERROR_PIPE_CONNECTED __MSABI_LONG(535)
+ #define ERROR_PIPE_LISTENING __MSABI_LONG(536)
++#define ERROR_WAKE_SYSTEM __MSABI_LONG(730)
++#define ERROR_WAIT_1 __MSABI_LONG(731)
++#define ERROR_WAIT_2 __MSABI_LONG(732)
++#define ERROR_WAIT_3 __MSABI_LONG(733)
++#define ERROR_WAIT_63 __MSABI_LONG(734)
++#define ERROR_ABANDONED_WAIT_0 __MSABI_LONG(735)
++#define ERROR_ABANDONED_WAIT_63 __MSABI_LONG(736)
++#define ERROR_USER_APC __MSABI_LONG(737)
++#define ERROR_KERNEL_APC __MSABI_LONG(738)
++#define ERROR_ALERTED __MSABI_LONG(739)
+ #define ERROR_EA_ACCESS_DENIED __MSABI_LONG(994)
+ #define ERROR_OPERATION_ABORTED __MSABI_LONG(995)
+ #define ERROR_IO_INCOMPLETE __MSABI_LONG(996)
diff --git a/commit-eba7897 b/commit-eba7897
new file mode 100644
index 0000000..b126964
--- /dev/null
+++ b/commit-eba7897
@@ -0,0 +1,23 @@
+commit eba78977c58f54f2ee0c65ab7dfdf64a53b715cd
+Author: Jacek Caban <jacek at codeweavers.com>
+Date: Fri Oct 31 15:01:27 2014 +0100
+
+ winnt.h: Added UNW_* flags for amd64.
+
+diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
+index a20c884..b703125 100644
+--- a/mingw-w64-headers/include/winnt.h
++++ b/mingw-w64-headers/include/winnt.h
+@@ -1746,6 +1746,12 @@ extern "C" {
+ typedef DWORD (*POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK)(HANDLE Process,PVOID TableAddress,PDWORD Entries,PRUNTIME_FUNCTION *Functions);
+
+ #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME "OutOfProcessFunctionTableCallback"
++
++#define UNW_FLAG_NHANDLER 0x00
++#define UNW_FLAG_EHANDLER 0x01
++#define UNW_FLAG_UHANDLER 0x02
++#define UNW_FLAG_CHAININFO 0x04
++
+ #endif /* end of _AMD64_ */
+
+
diff --git a/mingw-headers.spec b/mingw-headers.spec
index b321a13..ebf9868 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -19,7 +19,7 @@
Name: mingw-headers
Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Win32/Win64 header files
License: Public Domain and LGPLv2+ and ZPLv2.1
@@ -69,6 +69,11 @@ Patch22: 0022-dwrite.h-Don-t-duplicate-parent-interface-methods-fo.patch
Patch23: 0023-string_s.h-wchar_s.h-Added-wcsnlen_s-implementation.patch
Patch24: 0024-Use-__forceinline-for-wcsnlen_s-implementation.patch
Patch25: 0025-Implement-IDXGIDevice1.patch
+Patch26: commit-5db5317
+Patch27: commit-6a4cb01
+Patch28: commit-a0c08bc
+Patch29: commit-33cd049
+Patch30: commit-eba7897
%description
@@ -135,6 +140,11 @@ unzip %{S:0}
%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
%build
@@ -169,6 +179,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
%changelog
+* Sat Mar 7 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.3.0-3
+- Backported more upstream commits which are needed by latest mingw-wine-gecko
+
* Wed Dec 31 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.3.0-2
- Backport various upstream commits which are required to build
the most recent mingw-wine-gecko and mingw-angleproject
More information about the scm-commits
mailing list