Rebase against 36bb9d905ae10713bcd197958fb71aa86930a505.

patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch

@@ -1,37 +0,0 @@
-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
-

patches/msxml3-AllowXsltScript/definition

@@ -1 +0,0 @@
-Fixes: [41747] Ignore AllowXsltScript and AllowDocumentFunction properties in msxml

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2dd0fb880c005cd5660928d1646a117407cec238"
+	echo "36bb9d905ae10713bcd197958fb71aa86930a505"
 }
 
 # Show version information
@@ -215,7 +215,6 @@ patch_enable_all ()
 	enable_msvcrt_Math_Precision="$1"
 	enable_msvfw32_ICGetDisplayFormat="$1"
 	enable_msvideo16_HasThunk="$1"
-	enable_msxml3_AllowXsltScript="$1"
 	enable_ntdll_APC_Performance="$1"
 	enable_ntdll_APC_Start_Process="$1"
 	enable_ntdll_Activation_Context="$1"
@@ -853,9 +852,6 @@ patch_enable ()
 		msvideo16-HasThunk)
 			enable_msvideo16_HasThunk="$2"
 			;;
-		msxml3-AllowXsltScript)
-			enable_msxml3_AllowXsltScript="$2"
-			;;
 		ntdll-APC_Performance)
 			enable_ntdll_APC_Performance="$2"
 			;;
@@ -5064,21 +5060,6 @@ if test "$enable_msvideo16_HasThunk" -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
-	(
-		printf '%s\n' '+    { "Nikolay Sivov", "msxml3: Accept AllowXsltScript and AllowDocumentFunction properties.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-APC_Performance
 # |
 # | Modified files:
@@ -7073,10 +7054,8 @@ fi
 # |   *	dlls/shlwapi/ordinal.c, dlls/shlwapi/tests/ordinal.c
 # |
 if test "$enable_shlwapi_SHMapHandle" -eq 1; then
-	patch_apply shlwapi-SHMapHandle/0001-shlwapi-tests-Test-NULL-handle-duplication-in-SHMapH.patch
 	patch_apply shlwapi-SHMapHandle/0002-shlwapi-SHMapHandle-should-not-set-error-when-NULL-i.patch
 	(
-		printf '%s\n' '+    { "Bruno Jesus", "shlwapi/tests: Test NULL handle duplication in SHMapHandle().", 1 },';
 		printf '%s\n' '+    { "Sebastian Lackner", "shlwapi: SHMapHandle should not set error when NULL is passed as hShared.", 1 },';
 	) >> "$patchlist"
 fi

patches/shlwapi-SHMapHandle/0001-shlwapi-tests-Test-NULL-handle-duplication-in-SHMapH.patch

@@ -1,35 +0,0 @@
-From 8a51e9551f4dcb89ec57a713f9ee153fc961a64d Mon Sep 17 00:00:00 2001
-From: Bruno Jesus <00cpxxx@gmail.com>
-Date: Tue, 1 Dec 2015 19:51:20 +0800
-Subject: shlwapi/tests: Test NULL handle duplication in SHMapHandle()
-
-Related to https://bugs.winehq.org/show_bug.cgi?id=36838
-
-Not sure when Olivier Dierick will be back to this so I'm sending the
-test I made.
-
-Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
----
- dlls/shlwapi/tests/ordinal.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
-index bd3d46a..df07df4 100644
---- a/dlls/shlwapi/tests/ordinal.c
-+++ b/dlls/shlwapi/tests/ordinal.c
-@@ -550,6 +550,12 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)
-     ok(ret, "SHUnlockShared failed: %u\n", GetLastError());
- 
-     /* test SHMapHandle */
-+    SetLastError(0xdeadbeef);
-+    hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0);
-+    ok(hmem2 == NULL, "expected NULL, got new handle\n");
-+todo_wine
-+    ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError());
-+
-     hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0);
- 
-     /* It seems like Windows Vista/2008 uses a different internal implementation
--- 
-2.6.4
-