From 986a0115487460c6d68b90183ab9a201b68a84d0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 15 Jan 2017 22:56:27 +0100
Subject: [PATCH] Added patch to avoid duplicate definition of REFERENCE_TIME.

---
 ...plicate-definition-of-REFERENCE_TIME.patch | 27 +++++++++++++++++++
 patches/include-Duplicate_Typedef/definition  |  1 +
 patches/patchinstall.sh                       | 19 +++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 patches/include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
 create mode 100644 patches/include-Duplicate_Typedef/definition

diff --git a/patches/include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch b/patches/include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
new file mode 100644
index 00000000..d707c1c4
--- /dev/null
+++ b/patches/include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
@@ -0,0 +1,27 @@
+From 607d3969a3b2633ce4dd4f99f96d1666c15cd98d Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 15 Jan 2017 22:52:09 +0100
+Subject: include: Avoid duplicate definition of REFERENCE_TIME.
+
+---
+ include/dmdls.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/dmdls.h b/include/dmdls.h
+index b40ef88bf8d..ea7dcf00946 100644
+--- a/include/dmdls.h
++++ b/include/dmdls.h
+@@ -30,7 +30,10 @@ typedef LONG PCENT;
+ typedef LONG PERCENT;
+ typedef LONG TCENT;
+ 
++#ifndef REFERENCE_TIME_DEFINED
++#define REFERENCE_TIME_DEFINED
+ typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME;
++#endif
+ 
+ /*****************************************************************************
+  * FOURCC definition
+-- 
+2.11.0
+
diff --git a/patches/include-Duplicate_Typedef/definition b/patches/include-Duplicate_Typedef/definition
new file mode 100644
index 00000000..d7c5a3c7
--- /dev/null
+++ b/patches/include-Duplicate_Typedef/definition
@@ -0,0 +1 @@
+Fixes: [42211] Avoid duplicate definition of REFERENCE_TIME
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 4d6e8473..38ef3c2f 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -170,6 +170,7 @@ patch_enable_all ()
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
 	enable_imm32_IMMDisableLegacyIME="$1"
+	enable_include_Duplicate_Typedef="$1"
 	enable_inseng_Implementation="$1"
 	enable_iphlpapi_System_Ping="$1"
 	enable_iphlpapi_TCP_Table="$1"
@@ -721,6 +722,9 @@ patch_enable ()
 		imm32-IMMDisableLegacyIME)
 			enable_imm32_IMMDisableLegacyIME="$2"
 			;;
+		include-Duplicate_Typedef)
+			enable_include_Duplicate_Typedef="$2"
+			;;
 		inseng-Implementation)
 			enable_inseng_Implementation="$2"
 			;;
@@ -4398,6 +4402,21 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset include-Duplicate_Typedef
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#42211] Avoid duplicate definition of REFERENCE_TIME
+# |
+# | Modified files:
+# |   *	include/dmdls.h
+# |
+if test "$enable_include_Duplicate_Typedef" -eq 1; then
+	patch_apply include-Duplicate_Typedef/0001-include-Avoid-duplicate-definition-of-REFERENCE_TIME.patch
+	(
+		echo '+    { "Sebastian Lackner", "include: Avoid duplicate definition of REFERENCE_TIME.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset inseng-Implementation
 # |
 # | This patchset fixes the following Wine bugs: