From dcdcf180479e194de5f50a598bf11320a9986a5b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 27 Dec 2015 22:28:37 +0100
Subject: [PATCH] Added patch to workaround installation bug of IE7 caused by
 version bump.

---
 README.md                                     |  3 +-
 ...Sync-registry-and-program-resource-v.patch | 32 +++++++++++++++++++
 .../iexplore-Revert_ProductVersion/definition |  1 +
 patches/patchinstall.sh                       | 16 ++++++++++
 staging/changelog                             |  1 +
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 patches/iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch
 create mode 100644 patches/iexplore-Revert_ProductVersion/definition

diff --git a/README.md b/README.md
index 5e1dae50..5c78e84b 100644
--- a/README.md
+++ b/README.md
@@ -34,13 +34,14 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [5]:**
+**Bug fixes and features included in the next upcoming release [6]:**
 
 * Avoid corruption of caret when SetCaretPos() is called
 * Check IsWoW64Process before calling Wow64 functions in UNIXFS_get_unix_path
 * Pass MOUSEHOOKSTRUCTEX struct to mouse hook callback ([Wine Bug #38314](https://bugs.winehq.org/show_bug.cgi?id=38314))
 * SHMapHandle should not set error when NULL is passed as hShared
 * SysAllocStringByteLen should align terminating null WCHAR
+* Workaround installation bug of IE7 caused by version bump
 
 
 **Bug fixes and features in Wine Staging 1.8 [268]:**
diff --git a/patches/iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch b/patches/iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch
new file mode 100644
index 00000000..0b965515
--- /dev/null
+++ b/patches/iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch
@@ -0,0 +1,32 @@
+From 0c1c8f2879629c0e698c23373e699742f34b2bd1 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 27 Dec 2015 22:25:31 +0100
+Subject: Revert "iexplore: Sync registry and program resource values."
+
+This reverts commit bda46cc6fd5fa0f3c9db947108b685533662037a.
+---
+ programs/iexplore/iexplore.rc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc
+index 3d6d50f..cd75781 100644
+--- a/programs/iexplore/iexplore.rc
++++ b/programs/iexplore/iexplore.rc
+@@ -18,10 +18,10 @@
+ 
+ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer"
+ #define WINE_FILENAME_STR "iexplore.exe"
+-#define WINE_FILEVERSION 9,0,8112,16421
+-#define WINE_FILEVERSION_STR "9.0.8112.16421"
+-#define WINE_PRODUCTVERSION 9,0,8112,16421
+-#define WINE_PRODUCTVERSION_STR "9.0.8112.16421"
++#define WINE_FILEVERSION 6,0,2900,2180
++#define WINE_FILEVERSION_STR "6.0.2900.2180"
++#define WINE_PRODUCTVERSION 6,0,2900,2180
++#define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+ #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
+ 
+ #include "wine/wine_common_ver.rc"
+-- 
+2.6.4
+
diff --git a/patches/iexplore-Revert_ProductVersion/definition b/patches/iexplore-Revert_ProductVersion/definition
new file mode 100644
index 00000000..2f0fdf62
--- /dev/null
+++ b/patches/iexplore-Revert_ProductVersion/definition
@@ -0,0 +1 @@
+Fixes: Workaround installation bug of IE7 caused by version bump
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 3968e7ac..7f65e431 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -143,6 +143,7 @@ patch_enable_all ()
 	enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$1"
 	enable_hnetcfg_INetFwAuthorizedApplication="$1"
 	enable_ieframe_IViewObject_Draw="$1"
+	enable_iexplore_Revert_ProductVersion="$1"
 	enable_imagehlp_BindImageEx="$1"
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
@@ -543,6 +544,9 @@ patch_enable ()
 		ieframe-IViewObject-Draw)
 			enable_ieframe_IViewObject_Draw="$2"
 			;;
+		iexplore-Revert_ProductVersion)
+			enable_iexplore_Revert_ProductVersion="$2"
+			;;
 		imagehlp-BindImageEx)
 			enable_imagehlp_BindImageEx="$2"
 			;;
@@ -3261,6 +3265,18 @@ if test "$enable_ieframe_IViewObject_Draw" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset iexplore-Revert_ProductVersion
+# |
+# | Modified files:
+# |   *	programs/iexplore/iexplore.rc
+# |
+if test "$enable_iexplore_Revert_ProductVersion" -eq 1; then
+	patch_apply iexplore-Revert_ProductVersion/0001-Revert-iexplore-Sync-registry-and-program-resource-v.patch
+	(
+		echo '+    { "Sebastian Lackner", "Revert \"iexplore: Sync registry and program resource values.\".", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset imagehlp-BindImageEx
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/staging/changelog b/staging/changelog
index cd71d509..581d7be6 100644
--- a/staging/changelog
+++ b/staging/changelog
@@ -5,6 +5,7 @@ wine-staging (1.9.0) UNRELEASED; urgency=low
   * Added patch to check IsWoW64Process before calling Wow64 functions in
     UNIXFS_get_unix_path.
   * Added patch to pass MOUSEHOOKSTRUCTEX struct to mouse hook callback.
+  * Added patch to workaround installation bug of IE7 caused by version bump.
   * Removed patch to add a stub driver for tdi.sys (accepted upstream).
   * Removed patch to implement support for ws2_32.dll.WSAPoll (accepted
     upstream).