[PATCH v4 3/6] mshtml: Fallback to text/xml for unknown content types ending with +xml in get_mimeType.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmldoc.c    |  7 +++++++
 dlls/mshtml/tests/xhr.js | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index cbb668ad81f..dd0fb2fd62e 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1269,6 +1269,7 @@ static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p)
     nsAString nsstr;
     nsresult nsres;
     HRESULT hres;
+    size_t len;

TRACE("(%p)->(%p)\n", This, p);

@@ -1283,6 +1284,12 @@ static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p)
         return map_nsresult(nsres);

nsAString_GetData(&nsstr, &content_type);
+
+    /* Unknown content types with +xml are reported as XML */
+    if((len = wcslen(content_type)) >= 4 && !memcmp(content_type + len - 4, L"+xml", 4 * sizeof(WCHAR)) &&
+       wcscmp(content_type, L"application/xhtml+xml") && wcscmp(content_type, L"image/svg+xml"))
+        content_type = L"text/xml";
+
     hres = get_mime_type_display_name(content_type, p);
     nsAString_Finish(&nsstr);
     return hres;
diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js
index 46aed46624c..7c553dc25ea 100644
--- a/dlls/mshtml/tests/xhr.js
+++ b/dlls/mshtml/tests/xhr.js
@@ -259,9 +259,16 @@ async_test("content_types", function() {

function onload() {
         ok(xhr.responseText === xml, "unexpected responseText " + xhr.responseText);
-        if(v < 10 || types === xml_types)
+        if(v < 10 || types === xml_types) {
             ok(xhr.responseXML !== null, "unexpected null responseXML for " + types[i]);
-        else
+            if(v >= 10) {
+                var r = xhr.responseXML.mimeType, e = "text/xml";
+                if(types[i] === "application/xHtml+xml" || types[i] === "image/SvG+xml")
+                    e = types[i].toLowerCase();
+                e = external.getExpectedMimeType(e);
+                ok(r === e, "XML document mimeType for " + types[i] + " = " + r + ", expected " + e);
+            }
+        }else
             ok(xhr.responseXML === null, "unexpected non-null responseXML for " + (override ? "overridden " : "") + types[i]);

if(("overrideMimeType" in xhr) && !override) {