From 6581a6f2ea45b3e9b7ebd0dc42df68e3cd17676b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 15 Feb 2018 20:49:03 +1100
Subject: [PATCH] Rebase against 389c3add0ad93f3b2180c636363b25f6c78757a2

---
 ...m32-Add-stub-for-ImmDisableLegacyIME.patch | 42 -------------------
 patches/imm32-IMMDisableLegacyIME/definition  |  1 -
 patches/patchinstall.sh                       | 18 +-------
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 patches/imm32-IMMDisableLegacyIME/0001-imm32-Add-stub-for-ImmDisableLegacyIME.patch
 delete mode 100644 patches/imm32-IMMDisableLegacyIME/definition

diff --git a/patches/imm32-IMMDisableLegacyIME/0001-imm32-Add-stub-for-ImmDisableLegacyIME.patch b/patches/imm32-IMMDisableLegacyIME/0001-imm32-Add-stub-for-ImmDisableLegacyIME.patch
deleted file mode 100644
index 6104e6ba..00000000
--- a/patches/imm32-IMMDisableLegacyIME/0001-imm32-Add-stub-for-ImmDisableLegacyIME.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2f48b5b48caac9a9260577114fd9813aa499d01f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 21 Jan 2016 00:26:24 +0100
-Subject: imm32: Add stub for ImmDisableLegacyIME.
-
----
- dlls/imm32/imm.c      | 9 +++++++++
- dlls/imm32/imm32.spec | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
-index 3fab6fc..87c2fcd 100644
---- a/dlls/imm32/imm.c
-+++ b/dlls/imm32/imm.c
-@@ -3036,3 +3036,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl)
-     FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl);
-     return FALSE;
- }
-+
-+/***********************************************************************
-+ *              IMMDisableLegacyIME(IMM32.@)
-+ */
-+BOOL WINAPI ImmDisableLegacyIME(void)
-+{
-+    FIXME("stub\n");
-+    return TRUE;
-+}
-diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec
-index 0bee92a..b92cc1b 100644
---- a/dlls/imm32/imm32.spec
-+++ b/dlls/imm32/imm32.spec
-@@ -11,6 +11,7 @@
- @ stdcall ImmDestroySoftKeyboard(long)
- @ stdcall ImmDisableIME(long)
- @ stdcall ImmDisableIme(long) ImmDisableIME
-+@ stdcall ImmDisableLegacyIME()
- @ stdcall ImmDisableTextFrameService(long)
- @ stdcall ImmEnumInputContext(long ptr long)
- @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr)
--- 
-2.6.4
-
diff --git a/patches/imm32-IMMDisableLegacyIME/definition b/patches/imm32-IMMDisableLegacyIME/definition
deleted file mode 100644
index 2f5d3593..00000000
--- a/patches/imm32-IMMDisableLegacyIME/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: Add stub for imm32.IMMDisableLegacyIME
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 9ddd0541..7f4bf04c 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "9d897b73a877e5eaae26df87930c951ff8273c14"
+	echo "389c3add0ad93f3b2180c636363b25f6c78757a2"
 }
 
 # Show version information
@@ -181,7 +181,6 @@ patch_enable_all ()
 	enable_imagehlp_BindImageEx="$1"
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
-	enable_imm32_IMMDisableLegacyIME="$1"
 	enable_include_winsock="$1"
 	enable_inseng_Implementation="$1"
 	enable_iphlpapi_System_Ping="$1"
@@ -804,9 +803,6 @@ patch_enable ()
 		imagehlp-ImageLoad)
 			enable_imagehlp_ImageLoad="$2"
 			;;
-		imm32-IMMDisableLegacyIME)
-			enable_imm32_IMMDisableLegacyIME="$2"
-			;;
 		include-winsock)
 			enable_include_winsock="$2"
 			;;
@@ -4946,18 +4942,6 @@ if test "$enable_imagehlp_ImageLoad" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset imm32-IMMDisableLegacyIME
-# |
-# | Modified files:
-# |   *	dlls/imm32/imm.c, dlls/imm32/imm32.spec
-# |
-if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
-	patch_apply imm32-IMMDisableLegacyIME/0001-imm32-Add-stub-for-ImmDisableLegacyIME.patch
-	(
-		printf '%s\n' '+    { "Michael Müller", "imm32: Add stub for ImmDisableLegacyIME.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset include-winsock
 # |
 # | Modified files: