From 759fd000ad0c42e853abb88bc823064e956f3ca9 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Feb 2016 04:52:52 +0100
Subject: [PATCH] Added patch to translate 16 bit address in
 MCIWNDM_SETTIMEFORMATA MCIWndProc16 command.

---
 ...slate-16-bit-address-in-MCIWNDM_SETT.patch | 28 +++++++++++++++++++
 .../msvideo-MCIWNDM_SETTIMEFORMATA/definition |  1 +
 patches/patchinstall.sh                       | 16 +++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 patches/msvideo-MCIWNDM_SETTIMEFORMATA/0001-msvideo.dll-Translate-16-bit-address-in-MCIWNDM_SETT.patch
 create mode 100644 patches/msvideo-MCIWNDM_SETTIMEFORMATA/definition

diff --git a/patches/msvideo-MCIWNDM_SETTIMEFORMATA/0001-msvideo.dll-Translate-16-bit-address-in-MCIWNDM_SETT.patch b/patches/msvideo-MCIWNDM_SETTIMEFORMATA/0001-msvideo.dll-Translate-16-bit-address-in-MCIWNDM_SETT.patch
new file mode 100644
index 00000000..d8dc6a40
--- /dev/null
+++ b/patches/msvideo-MCIWNDM_SETTIMEFORMATA/0001-msvideo.dll-Translate-16-bit-address-in-MCIWNDM_SETT.patch
@@ -0,0 +1,28 @@
+From 3e131a30d2f1b69de3c378b54f82f03f45bba6bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sat, 6 Feb 2016 02:24:05 +0100
+Subject: msvideo.dll16: Translate 16 bit address in MCIWNDM_SETTIMEFORMATA
+ command.
+
+---
+ dlls/msvideo.dll16/msvideo16.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c
+index 1b715e4..f39b52d 100644
+--- a/dlls/msvideo.dll16/msvideo16.c
++++ b/dlls/msvideo.dll16/msvideo16.c
+@@ -991,6 +991,10 @@ static LRESULT WINAPI MCIWndProc16(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
+         lparam = (ULONG_PTR)MapSL(lparam);
+         break;
+ 
++    case MCIWNDM_SETTIMEFORMATA:
++        lparam = (ULONG_PTR)MapSL(lparam);
++        break;
++
+     default:
+         break;
+     }
+-- 
+2.7.0
+
diff --git a/patches/msvideo-MCIWNDM_SETTIMEFORMATA/definition b/patches/msvideo-MCIWNDM_SETTIMEFORMATA/definition
new file mode 100644
index 00000000..cd0541b5
--- /dev/null
+++ b/patches/msvideo-MCIWNDM_SETTIMEFORMATA/definition
@@ -0,0 +1 @@
+Fixes: Translate 16 bit address in MCIWNDM_SETTIMEFORMATA MCIWndProc16 command
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index afc42bc4..8c6cd9ed 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -185,6 +185,7 @@ patch_enable_all ()
 	enable_msvcr120_strof="$1"
 	enable_msvcrt_Math_Precision="$1"
 	enable_msvcrt_StdHandle_RefCount="$1"
+	enable_msvideo_MCIWNDM_SETTIMEFORMATA="$1"
 	enable_ntdll_APC_Performance="$1"
 	enable_ntdll_APC_Start_Process="$1"
 	enable_ntdll_Activation_Context="$1"
@@ -696,6 +697,9 @@ patch_enable ()
 		msvcrt-StdHandle_RefCount)
 			enable_msvcrt_StdHandle_RefCount="$2"
 			;;
+		msvideo-MCIWNDM_SETTIMEFORMATA)
+			enable_msvideo_MCIWNDM_SETTIMEFORMATA="$2"
+			;;
 		ntdll-APC_Performance)
 			enable_ntdll_APC_Performance="$2"
 			;;
@@ -4334,6 +4338,18 @@ if test "$enable_msvcrt_StdHandle_RefCount" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset msvideo-MCIWNDM_SETTIMEFORMATA
+# |
+# | Modified files:
+# |   *	dlls/msvideo.dll16/msvideo16.c
+# |
+if test "$enable_msvideo_MCIWNDM_SETTIMEFORMATA" -eq 1; then
+	patch_apply msvideo-MCIWNDM_SETTIMEFORMATA/0001-msvideo.dll-Translate-16-bit-address-in-MCIWNDM_SETT.patch
+	(
+		echo '+    { "Michael Müller", "msvideo.dll16: Translate 16 bit address in MCIWNDM_SETTIMEFORMATA command.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-APC_Performance
 # |
 # | Modified files: