From d4f26a2f9580b48a3776c0e68aa0cdb25f1985f4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 15 Jan 2017 15:24:35 +0100
Subject: [PATCH] Added patch to ignore AllowXsltScript and
 AllowDocumentFunction properties in msxml.

---
 ...lowXsltScript-and-AllowDocumentFunct.patch | 37 +++++++++++++++++++
 patches/msxml3-AllowXsltScript/definition     |  1 +
 patches/patchinstall.sh                       | 19 ++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch
 create mode 100644 patches/msxml3-AllowXsltScript/definition

diff --git a/patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch b/patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch
new file mode 100644
index 00000000..32a6dc39
--- /dev/null
+++ b/patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch
@@ -0,0 +1,37 @@
+From 5eac8a570514043d3a534b165aa6e2f846826e0e Mon Sep 17 00:00:00 2001
+From: Nikolay Sivov <nsivov@codeweavers.com>
+Date: Mon, 19 Dec 2016 00:06:04 +0300
+Subject: msxml3: Accept AllowXsltScript and AllowDocumentFunction properties
+
+Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
+---
+ dlls/msxml3/domdoc.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
+index 36432190bb4..62b48fcb21a 100644
+--- a/dlls/msxml3/domdoc.c
++++ b/dlls/msxml3/domdoc.c
+@@ -71,6 +71,8 @@ static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0
+ static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0};
+ static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0};
+ static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0};
++static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0};
++static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0};
+ 
+ /* Anything that passes the test_get_ownerDocument()
+  * tests can go here (data shared between all instances).
+@@ -3072,7 +3074,9 @@ static HRESULT WINAPI domdoc_setProperty(
+     }
+     else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 ||
+              lstrcmpiW(p, PropertyNewParserW) == 0 ||
+-             lstrcmpiW(p, PropertyResolveExternalsW) == 0)
++             lstrcmpiW(p, PropertyResolveExternalsW) == 0 ||
++             lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 ||
++             lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0)
+     {
+         /* Ignore */
+         FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value));
+-- 
+2.11.0
+
diff --git a/patches/msxml3-AllowXsltScript/definition b/patches/msxml3-AllowXsltScript/definition
new file mode 100644
index 00000000..c4861e26
--- /dev/null
+++ b/patches/msxml3-AllowXsltScript/definition
@@ -0,0 +1 @@
+Fixes: [41747] Ignore AllowXsltScript and AllowDocumentFunction properties in msxml
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 3ef34367..45ff0bf0 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -212,6 +212,7 @@ patch_enable_all ()
 	enable_msvcrt_Math_Precision="$1"
 	enable_msvfw32_ICGetDisplayFormat="$1"
 	enable_msvideo_dll16_DrawDibProfileDisplay="$1"
+	enable_msxml3_AllowXsltScript="$1"
 	enable_ntdll_APC_Performance="$1"
 	enable_ntdll_APC_Start_Process="$1"
 	enable_ntdll_Activation_Context="$1"
@@ -842,6 +843,9 @@ patch_enable ()
 		msvideo.dll16-DrawDibProfileDisplay)
 			enable_msvideo_dll16_DrawDibProfileDisplay="$2"
 			;;
+		msxml3-AllowXsltScript)
+			enable_msxml3_AllowXsltScript="$2"
+			;;
 		ntdll-APC_Performance)
 			enable_ntdll_APC_Performance="$2"
 			;;
@@ -5165,6 +5169,21 @@ if test "$enable_msvideo_dll16_DrawDibProfileDisplay" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset msxml3-AllowXsltScript
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#41747] Ignore AllowXsltScript and AllowDocumentFunction properties in msxml
+# |
+# | Modified files:
+# |   *	dlls/msxml3/domdoc.c
+# |
+if test "$enable_msxml3_AllowXsltScript" -eq 1; then
+	patch_apply msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch
+	(
+		echo '+    { "Nikolay Sivov", "msxml3: Accept AllowXsltScript and AllowDocumentFunction properties.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-APC_Performance
 # |
 # | Modified files: