wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated DXVA2 stub and header patches.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-04-04 07:06:47 +02:00
parent d30bfe1a41
commit d886426f50
5 changed files with 170 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
patches/11-DXVA2/0001-include-Add-dxva2api.idl.patch
View File

@ -1,12 +1,12 @@
From fceaf9739a92377afc2834e0ce9d9a187f06a2e9 Mon Sep 17 00:00:00 2001
From a527e16eb1a778cef71ba5daa90417e0220bdd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Mar 2014 21:09:24 +0100
Subject: include: Add dxva2api.idl
---
include/Makefile.in | 1 +
include/dxva2api.idl | 503 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 504 insertions(+)
include/dxva2api.idl | 534 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 535 insertions(+)
create mode 100644 include/dxva2api.idl
diff --git a/include/Makefile.in b/include/Makefile.in
@ -23,12 +23,12 @@ index ebdc96b..d6997db 100644
fusion.idl \
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
new file mode 100644
index 0000000..c11f90d
index 0000000..b858820
--- /dev/null
+++ b/include/dxva2api.idl
@@ -0,0 +1,503 @@
@@ -0,0 +1,534 @@
+/*
+ * Copyright Michael Müller for Pipelight
+ * Copyright 2014 Michael Müller for Pipelight
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
@ -56,51 +56,83 @@ index 0000000..c11f90d
+typedef DWORD D3DPOOL;
+cpp_quote("#endif")
+
+/* MPEG2 */
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0,0x4563, 0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+
+/* alternate names */
+cpp_quote("#define DXVA2_ModeMPEG2_MOCOMP DXVA2_ModeMPEG2_MoComp")
+
+cpp_quote("#define DXVA2_ModeWMV8_PostProc DXVA2_ModeWMV8_A")
+cpp_quote("#define DXVA2_ModeWMV8_MoComp DXVA2_ModeWMV8_B")
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);")
+
+cpp_quote("#define DXVA2_ModeWMV9_PostProc DXVA2_ModeWMV9_A")
+cpp_quote("#define DXVA2_ModeWMV9_MoComp DXVA2_ModeWMV9_B")
+cpp_quote("#define DXVA2_ModeWMV9_IDCT DXVA2_ModeWMV9_C")
+
+cpp_quote("#define DXVA2_ModeVC1_PostProc DXVA2_ModeVC1_A")
+cpp_quote("#define DXVA2_ModeVC1_MoComp DXVA2_ModeVC1_B")
+cpp_quote("#define DXVA2_ModeVC1_IDCT DXVA2_ModeVC1_C")
+cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D")
+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);")
+
+/* H264 */
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_MoComp_NoFGT DXVA2_ModeH264_A")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_MoComp_FGT DXVA2_ModeH264_B")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_IDCT_NoFGT DXVA2_ModeH264_C")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_IDCT_FGT DXVA2_ModeH264_D")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_VLD_NoFGT DXVA2_ModeH264_E")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeH264_VLD_FGT DXVA2_ModeH264_F")
+
+/* WMV8 */
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeWMV8_PostProc DXVA2_ModeWMV8_A")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeWMV8_MoComp DXVA2_ModeWMV8_B")
+
+/* WMV9 */
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeWMV9_PostProc DXVA2_ModeWMV9_A")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeWMV9_MoComp DXVA2_ModeWMV9_B")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeWMV9_IDCT DXVA2_ModeWMV9_C")
+
+/* VC1 */
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeVC1_PostProc DXVA2_ModeVC1_A")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeVC1_MoComp DXVA2_ModeVC1_B")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeVC1_IDCT DXVA2_ModeVC1_C")
+
+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D")
+
+/* Encryption */
+cpp_quote("DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
+
+typedef LONGLONG REFERENCE_TIME;
+
+enum
+{
+ DXVA2_PictureParametersBufferType = 0,
+ DXVA2_MacroBlockControlBufferType = 1,
+ DXVA2_ResidualDifferenceBufferType = 2,
+ DXVA2_DeblockingControlBufferType = 3,
+ DXVA2_InverseQuantizationMatrixBufferType = 4,
+ DXVA2_SliceControlBufferType = 5,
+ DXVA2_BitStreamDateBufferType = 6,
+ DXVA2_MotionVectorBuffer = 7,
+ DXVA2_FilmGrainBuffer = 8
+};
+
+enum
+{
+ DXVA2_VideoDecoderRenderTarget = 0,
+ DXVA2_VideoProcessorRenderTarget = 1,
+ DXVA2_VideoSoftwareRenderTarget = 2
@ -214,8 +246,8 @@ index 0000000..c11f90d
+ {
+ struct
+ {
+ USHORT Fraction;
+ SHORT Value;
+ USHORT Fraction;
+ SHORT Value;
+ };
+ LONG ll;
+ };
@ -366,7 +398,6 @@ index 0000000..c11f90d
+]
+interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService
+{
+
+ HRESULT GetDecoderDeviceGuids(
+ [out] UINT *count,
+ [out] GUID **pGuids);

40
patches/11-DXVA2/0002-include-Add-PhysicalMonitorEnumerationAPI.h.patch → patches/11-DXVA2/0002-include-Add-physicalmonitorenumerationapi.h.patch
View File

@ -1,34 +1,34 @@
From 807e66d582215c2335b39ea2a35bc0abe2cf64dd Mon Sep 17 00:00:00 2001
From 4f8c9effee69055d3bf5a92076cf49185e26624a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Mar 2014 05:20:09 +0100
Subject: include: Add PhysicalMonitorEnumerationAPI.h
Subject: include: Add physicalmonitorenumerationapi.h
---
include/Makefile.in | 1 +
include/PhysicalMonitorEnumerationAPI.h | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 include/PhysicalMonitorEnumerationAPI.h
include/physicalmonitorenumerationapi.h | 40 +++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 include/physicalmonitorenumerationapi.h
diff --git a/include/Makefile.in b/include/Makefile.in
index d6997db..fd4f7c1 100644
index d6997db..3aa45cf 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -475,6 +475,7 @@ SRCDIR_INCLUDES = \
patchapi.h \
pdh.h \
pdhmsg.h \
+ PhysicalMonitorEnumerationAPI.h \
+ physicalmonitorenumerationapi.h \
pktdef.h \
poppack.h \
powrprof.h \
diff --git a/include/PhysicalMonitorEnumerationAPI.h b/include/PhysicalMonitorEnumerationAPI.h
diff --git a/include/physicalmonitorenumerationapi.h b/include/physicalmonitorenumerationapi.h
new file mode 100644
index 0000000..33b1c68
index 0000000..deac267
--- /dev/null
+++ b/include/PhysicalMonitorEnumerationAPI.h
@@ -0,0 +1,27 @@
+++ b/include/physicalmonitorenumerationapi.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright Michael Müller for Pipelight
+ * Copyright 2014 Michael Müller for Pipelight
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
@ -45,7 +45,14 @@ index 0000000..33b1c68
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#ifndef __WINE_PHYSICALMONITORENUMERATIONAPI_H
+#define __WINE_PHYSICALMONITORENUMERATIONAPI_H
+
+#include <d3d9.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PHYSICAL_MONITOR_DESCRIPTION_SIZE 128
+
@ -54,7 +61,12 @@ index 0000000..33b1c68
+ HANDLE hPhysicalMonitor;
+ WCHAR szPhysicalMonitorDescription[PHYSICAL_MONITOR_DESCRIPTION_SIZE];
+} PHYSICAL_MONITOR, *LPPHYSICAL_MONITOR;
\ No newline at end of file
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_PHYSICALMONITORENUMERATIONAPI_H */
--
1.7.9.5

57
patches/11-DXVA2/0003-include-Add-LowLevelMonitorConfigurationAPI.h.patch → patches/11-DXVA2/0003-include-Add-lowlevelmonitorconfigurationapi.h.patch
View File

@ -1,22 +1,34 @@
From 49c89bb58a132a3b34bb40c6eae04d82e5d75978 Mon Sep 17 00:00:00 2001
From 10738eb0140ae5b623f6949ed7bd109ddb53b3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Mar 2014 05:24:03 +0100
Subject: include: Add LowLevelMonitorConfigurationAPI.h
Subject: include: Add lowlevelmonitorconfigurationapi.h
---
include/LowLevelMonitorConfigurationAPI.h | 30 +++++++++++++++++++++++++++++
include/Makefile.in | 1 +
2 files changed, 31 insertions(+)
create mode 100644 include/LowLevelMonitorConfigurationAPI.h
include/lowlevelmonitorconfigurationapi.h | 43 +++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
create mode 100644 include/lowlevelmonitorconfigurationapi.h
diff --git a/include/LowLevelMonitorConfigurationAPI.h b/include/LowLevelMonitorConfigurationAPI.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 3aa45cf..eee809e 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \
lmuseflg.h \
lmwksta.h \
loadperf.h \
+ lowlevelmonitorconfigurationapi.h \
lzexpand.h \
mapi.h \
mapicode.h \
diff --git a/include/lowlevelmonitorconfigurationapi.h b/include/lowlevelmonitorconfigurationapi.h
new file mode 100644
index 0000000..dda1174
index 0000000..aeedf4b
--- /dev/null
+++ b/include/LowLevelMonitorConfigurationAPI.h
@@ -0,0 +1,30 @@
+++ b/include/lowlevelmonitorconfigurationapi.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright Michael Müller for Pipelight
+ * Copyright 2014 Michael Müller for Pipelight
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
@ -33,6 +45,13 @@ index 0000000..dda1174
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H
+#define __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _MC_TIMING_REPORT
+{
+ BYTE bTimingStatusByte;
@ -45,18 +64,12 @@ index 0000000..dda1174
+ MC_MOMENTARY,
+ MC_SET_PARAMETER
+} MC_VCP_CODE_TYPE, *LPMC_VCP_CODE_TYPE;
diff --git a/include/Makefile.in b/include/Makefile.in
index fd4f7c1..ce30aa6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \
lmuseflg.h \
lmwksta.h \
loadperf.h \
+ LowLevelMonitorConfigurationAPI.h \
lzexpand.h \
mapi.h \
mapicode.h \
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H */
--
1.7.9.5

57
patches/11-DXVA2/0004-include-Add-HighLevelMonitorConfigurationAPI.h.patch → patches/11-DXVA2/0004-include-Add-highlevelmonitorconfigurationapi.h.patch
View File

@ -1,22 +1,34 @@
From 55f15ed3d397d9220a6b5435ce98c007e0d5514f Mon Sep 17 00:00:00 2001
From 055cb5d80161f8c6f2b6783bac914d99373a8219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Mar 2014 05:26:25 +0100
Subject: include: Add HighLevelMonitorConfigurationAPI.h
Subject: include: Add highlevelmonitorconfigurationapi.h
---
include/HighLevelMonitorConfigurationAPI.h | 69 ++++++++++++++++++++++++++++
include/Makefile.in | 1 +
2 files changed, 70 insertions(+)
create mode 100644 include/HighLevelMonitorConfigurationAPI.h
include/highlevelmonitorconfigurationapi.h | 82 ++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
create mode 100644 include/highlevelmonitorconfigurationapi.h
diff --git a/include/HighLevelMonitorConfigurationAPI.h b/include/HighLevelMonitorConfigurationAPI.h
diff --git a/include/Makefile.in b/include/Makefile.in
index eee809e..5c6a1c6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -330,6 +330,7 @@ SRCDIR_INCLUDES = \
gdipluspixelformats.h \
gdiplustypes.h \
guiddef.h \
+ highlevelmonitorconfigurationapi.h \
hlguids.h \
htmlhelp.h \
http.h \
diff --git a/include/highlevelmonitorconfigurationapi.h b/include/highlevelmonitorconfigurationapi.h
new file mode 100644
index 0000000..edcc1d2
index 0000000..9a0547c
--- /dev/null
+++ b/include/HighLevelMonitorConfigurationAPI.h
@@ -0,0 +1,69 @@
+++ b/include/highlevelmonitorconfigurationapi.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Michael Müller for Pipelight
+ * Copyright 2014 Michael Müller for Pipelight
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
@ -33,6 +45,13 @@ index 0000000..edcc1d2
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H
+#define __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum _MC_COLOR_TEMPERATURE
+{
+ MC_COLOR_TEMPERATURE_UNKNOWN,
@ -84,18 +103,12 @@ index 0000000..edcc1d2
+ MC_MICROELECTROMECHANICAL,
+ MC_FIELD_EMISSION_DEVICE
+} MC_DISPLAY_TECHNOLOGY_TYPE, *LPMC_DISPLAY_TECHNOLOGY_TYPE;
diff --git a/include/Makefile.in b/include/Makefile.in
index ce30aa6..da8e75d 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -330,6 +330,7 @@ SRCDIR_INCLUDES = \
gdipluspixelformats.h \
gdiplustypes.h \
guiddef.h \
+ HighLevelMonitorConfigurationAPI.h \
hlguids.h \
htmlhelp.h \
http.h \
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H */
--
1.7.9.5

10
patches/11-DXVA2/0005-dxva2-Add-implementation-for-stub-functions.patch
View File

@ -1,4 +1,4 @@
From 79288605ddeb6dda4e1b039cd611ba23e60cf178 Mon Sep 17 00:00:00 2001
From af2b41c356507cd708a31c7ad918e70f2d0e37b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Mar 2014 05:32:36 +0100
Subject: dxva2: Add implementation for stub functions
@ -87,7 +87,7 @@ index da94df3..024a972 100644
+@ stdcall SetVCPFeature(ptr long long)
@ stub UABGetCertificate
diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index d16320f..f22e5d1 100644
index d16320f..051c0fd 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -21,9 +21,304 @@
@ -95,9 +95,9 @@ index d16320f..f22e5d1 100644
#include "wine/debug.h"
+#include "dxva2api.h"
+#include "PhysicalMonitorEnumerationAPI.h"
+#include "LowLevelMonitorConfigurationAPI.h"
+#include "HighLevelMonitorConfigurationAPI.h"
+#include "physicalmonitorenumerationapi.h"
+#include "lowlevelmonitorconfigurationapi.h"
+#include "highlevelmonitorconfigurationapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxva2);