[PATCH v2 3/5] mshtml: Use the doc_type to find out the mimeType when the document has no associated window.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

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

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 542382bf4d0..547de31afe1 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -39,6 +39,13 @@

WINE_DEFAULT_DEBUG_CHANNEL(mshtml);

+static const WCHAR *const content_type_from_document_type[] = {
+    [DOCTYPE_HTML]  = L"text/html",
+    [DOCTYPE_XHTML] = L"application/xhtml+xml",
+    [DOCTYPE_XML]   = L"text/xml",
+    [DOCTYPE_SVG]   = L"image/svg+xml",
+};
+
 static dispex_static_data_t *const dispex_from_document_type[] = {
     [DOCTYPE_HTML]  = &HTMLDocument_dispex,
     [DOCTYPE_XHTML] = &XMLDocument_dispex,
@@ -1305,7 +1312,10 @@ static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p)

*p = NULL;

-    if(This->window && !This->window->navigation_start_time)
+    if(!This->window)
+        return get_mime_type_display_name(content_type_from_document_type[This->doc_type], p);
+
+    if(!This->window->navigation_start_time)
         return (*p = SysAllocString(L"")) ? S_OK : E_FAIL;

nsAString_InitDepend(&nsstr, NULL);
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) {