wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to ignore AllowXsltScript and AllowDocumentFunction properties in msxml.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-01-15 15:24:35 +01:00
parent 1261a0540c
commit d4f26a2f95
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
patches/msxml3-AllowXsltScript/0001-msxml3-Accept-AllowXsltScript-and-AllowDocumentFunct.patch Normal file
View File

@ -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

1
patches/msxml3-AllowXsltScript/definition Normal file
View File

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

19
patches/patchinstall.sh
View File

@ -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: