mshtml: Use dispex_to_string when retrieving the value of an object.

Rather than always returning "[object]" in every mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Use dispex_to_string when retrieving the value of an object.
d9eb90e6 · Gabriel Ivăncescu · Alexandre Julliard · c667bbe8 · d9eb90e6 · d9eb90e6
Commit d9eb90e6 authored Oct 06, 2021 by Gabriel Ivăncescu Committed by Alexandre Julliard Oct 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 7 deletions

dispex.c dlls/mshtml/dispex.c +8 -6

dom.c dlls/mshtml/tests/dom.c +5 -1

No files found.
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -715,15 +715,17 @@ HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id)
 static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params,
        VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
 {
+    HRESULT hres;
+
    if(This->info->desc->vtbl && This->info->desc->vtbl->value)
        return This->info->desc->vtbl->value(This, lcid, flags, params, res, ei, caller);

    switch(flags) {
    case DISPATCH_PROPERTYGET:
        V_VT(res) = VT_BSTR;
-        V_BSTR(res) = SysAllocString(L"[object]");
-        if(!V_BSTR(res))
-            return E_OUTOFMEMORY;
+        hres = dispex_to_string(This, &V_BSTR(res));
+        if(FAILED(hres))
+            return hres;
        break;
    default:
        FIXME("Unimplemented flags %x\n", flags);
@@ -1305,9 +1307,9 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, 
        if(func->id == DISPID_VALUE) {
            BSTR ret;

-            ret = SysAllocString(L"[object]");
-            if(!ret)
-                return E_OUTOFMEMORY;
+            hres = dispex_to_string(This, &ret);
+            if(FAILED(hres))
+                return hres;

            V_VT(res) = VT_BSTR;
            V_BSTR(res) = ret;

--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -107,7 +107,11 @@ static const char noscript_str[] =
    "<body><noscript><div>test</div></noscript></body></html>";
 static const char doctype_str[] =
    "<!DOCTYPE html>"
-    "<html><head><title>emptydiv test</title></head>"
+    "<html>"
+    "  <head>"
+    "    <meta http-equiv=\"x-ua-compatible\" content=\"IE=8\" />"
+    "    <title>emptydiv test</title>"
+    "  </head>"
    "<body><div id=\"divid\"></div></body></html>";

 static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0};