[PATCH v4 1/7] mshtml: Override document.URL's name when adding it from the mshtml typelib.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Because the typelib should contain the lowercase `url` symbol instead.

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/dispex.c         | 18 +++++++++++-------
 dlls/mshtml/htmldoc.c        |  2 ++
 dlls/mshtml/mshtml_private.h |  1 +
 dlls/mshtml/tests/dom.js     |  5 +++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 5007f9a5d30..90650e5acc4 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -270,16 +270,20 @@ static BOOL is_arg_type_supported(VARTYPE vt)
 }

static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti,
-                          dispex_hook_invoke_t hook)
+                          dispex_hook_invoke_t hook, const WCHAR *name_override)
 {
     func_info_t *info;
     BSTR name;
     HRESULT hres;

-    hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL);
-    if(FAILED(hres)) {
-        WARN("GetDocumentation failed: %08lx\n", hres);
-        return;
+    if(name_override)
+        name = SysAllocString(name_override);
+    else {
+        hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL);
+        if(FAILED(hres)) {
+            WARN("GetDocumentation failed: %08lx\n", hres);
+            return;
+        }
     }

for(info = data->funcs; info < data->funcs+data->func_cnt; info++) {
@@ -441,9 +445,9 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp
                 hook = NULL;
         }

-        if(!hook || hook->invoke) {
+        if(!hook || hook->invoke || hook->name) {
             add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo,
-                          hook ? hook->invoke : NULL);
+                          hook ? hook->invoke : NULL, hook ? hook->name : NULL);
         }

ITypeInfo_ReleaseFuncDesc(typeinfo, funcdesc);
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index aa3efe27c68..0c96d73eb76 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -5975,6 +5975,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = {
 static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
 {
     static const dispex_hook_t document2_hooks[] = {
+        {DISPID_IHTMLDOCUMENT2_URL,      NULL, L"URL"},
         {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentNode_location_hook},
         {DISPID_UNKNOWN}
     };
@@ -6307,6 +6308,7 @@ static const tid_t HTMLDocumentObj_iface_tids[] = {
 static void HTMLDocumentObj_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
 {
     static const dispex_hook_t document2_hooks[] = {
+        {DISPID_IHTMLDOCUMENT2_URL,      NULL, L"URL"},
         {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentObj_location_hook},
         {DISPID_UNKNOWN}
     };
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 18104afc10a..4ce90d3f17e 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -359,6 +359,7 @@ typedef HRESULT (*dispex_hook_invoke_t)(DispatchEx*,WORD,DISPPARAMS*,VARIANT*,
 typedef struct {
     DISPID dispid;
     dispex_hook_invoke_t invoke;
+    const WCHAR *name;
 } dispex_hook_t;

struct DispatchEx {
diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js
index e82424e5c55..43c52d89757 100644
--- a/dlls/mshtml/tests/dom.js
+++ b/dlls/mshtml/tests/dom.js
@@ -18,6 +18,11 @@

var tests = [];

+sync_test("url", function() {
+    ok(document.URL === "http://winetest.example.org/index.html?dom.js", "document.URL = " + document.URL);
+    ok(!("documentURI" in document), "documentURI in document");
+});
+
 sync_test("input_selection", function() {
     var input = document.createElement("input");
     input.type = "text";