Jacek Caban : mshtml: Don't use UAS_EXACTLEGACY in navigator object.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 02f46d7ec9d8e7ca0984ac93bbd8b9bdb724837a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=02f46d7ec9d8e7ca0984ac93b...

Author: Jacek Caban 
Date:   Mon Mar 29 12:04:56 2021 +0200

mshtml: Don't use UAS_EXACTLEGACY in navigator object.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/mshtml/omnavigator.c         | 1 -
 dlls/mshtml/tests/documentmode.js | 3 ++-
 dlls/mshtml/tests/dom.c           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index 94616a7db78..43067b813a1 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -1162,7 +1162,6 @@ static unsigned int get_ua_version(OmNavigator *navigator)
 {
     switch(dispex_compat_mode(&navigator->dispex)) {
     case COMPAT_MODE_QUIRKS:
-        return UAS_EXACTLEGACY | 7;
     case COMPAT_MODE_IE5:
     case COMPAT_MODE_IE7:
         return 7;
diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index ec23ab8d494..bc237061939 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -368,7 +368,8 @@ sync_test("navigator", function() {
        "userAgent = " + navigator.userAgent + " appVersion = " + app);

re = v < 11
-        ? "^" + (v < 9 ? "4" : "5") + "\.0 \(compatible; MSIE " + (v < 7 ? 7 : v) + "\.0; Windows NT [^\)]*\)$"
+        ? "^" + (v < 9 ? "4" : "5") + "\.0 \(compatible; MSIE " + (v < 7 ? 7 : v) +
+          "\.0; Windows NT [0-9].[0-9]; .*Trident/[678]\.0.*\)$"
         : "^5.0 \(Windows NT [0-9].[0-9]; .*Trident/[678]\.0.*rv:11.0\) like Gecko$";
     ok(new RegExp(re).test(app), "appVersion = " + app);

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index de33e6c73a5..e2d861d7239 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -6383,7 +6383,6 @@ static void test_navigator(IHTMLDocument2 *doc)
     bstr = NULL;
     hres = IOmNavigator_get_userAgent(navigator, &bstr);
     ok(hres == S_OK, "get_userAgent failed: %08x\n", hres);
-    todo_wine
     ok(!lstrcmpW(bstr, buf), "userAgent returned %s, expected "%s"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf));
     SysFreeString(bstr);

@@ -6393,7 +6392,6 @@ static void test_navigator(IHTMLDocument2 *doc)

hres = IOmNavigator_get_appVersion(navigator, &bstr);
     ok(hres == S_OK, "get_appVersion failed: %08x\n", hres);
-    todo_wine
     ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected "%s"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8));
     SysFreeString(bstr);