[PATCH v3 2/4] mshtml: Implement HTMLStorage_setItem().

[Hans Leidekker]

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
 dlls/mshtml/htmlstorage.c | 113 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c
index 8ef92453b95..f7b92114622 100644
--- a/dlls/mshtml/htmlstorage.c
+++ b/dlls/mshtml/htmlstorage.c
@@ -338,11 +338,120 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR
     return hres;
 }
 
+static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value)
+{
+    BSTR str;
+    VARIANT var;
+    HRESULT hres;
+
+    str = SysAllocString(name);
+    if(!str)
+        return E_OUTOFMEMORY;
+    V_VT(&var) = VT_BSTR;
+    V_BSTR(&var) = value;
+
+    hres = IXMLDOMElement_setAttribute(elem, str, var);
+    SysFreeString(str);
+    return hres;
+}
+
+static HRESULT save_document(IXMLDOMDocument *doc, const WCHAR *filename)
+{
+    VARIANT var;
+    HRESULT hres;
+
+    V_VT(&var) = VT_BSTR;
+    V_BSTR(&var) = SysAllocString(filename);
+    if(!V_BSTR(&var))
+        return E_OUTOFMEMORY;
+
+    hres = IXMLDOMDocument_save(doc, var);
+    SysFreeString(V_BSTR(&var));
+    return hres;
+}
+
+static HRESULT set_item(const WCHAR *filename, BSTR key, BSTR value)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMNode *root = NULL, *node = NULL;
+    IXMLDOMElement *elem = NULL;
+    BSTR query = NULL;
+    HRESULT hres;
+
+    hres = open_document(filename, &doc);
+    if(hres != S_OK)
+        return hres;
+
+    hres = get_root_node(doc, &root);
+    if(hres != S_OK)
+        goto done;
+
+    query = build_query(key);
+    if(!query) {
+        hres = E_OUTOFMEMORY;
+        goto done;
+    }
+
+    hres = IXMLDOMNode_selectSingleNode(root, query, &node);
+    if(hres == S_OK) {
+        hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem);
+        if(hres != S_OK)
+            goto done;
+
+        hres = set_attribute(elem, L"value", value);
+        if(hres != S_OK)
+            goto done;
+    }else {
+        BSTR str = SysAllocString(L"item");
+        hres = IXMLDOMDocument_createElement(doc, str, &elem);
+        SysFreeString(str);
+        if(hres != S_OK)
+            goto done;
+
+        hres = set_attribute(elem, L"name", key);
+        if(hres != S_OK)
+            goto done;
+
+        hres = set_attribute(elem, L"value", value);
+        if(hres != S_OK)
+            goto done;
+
+        hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL);
+        if(hres != S_OK)
+            goto done;
+    }
+
+    hres = save_document(doc, filename);
+
+done:
+    SysFreeString(query);
+    if(root)
+        IXMLDOMNode_Release(root);
+    if(node)
+        IXMLDOMNode_Release(node);
+    if(elem)
+        IXMLDOMElement_Release(elem);
+    IXMLDOMDocument_Release(doc);
+    return hres;
+}
+
 static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue)
 {
     HTMLStorage *This = impl_from_IHTMLStorage(iface);
-    FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue));
-    return E_NOTIMPL;
+    HRESULT hres;
+
+    TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue));
+
+    if(!This->filename) {
+        FIXME("session storage not supported\n");
+        return E_NOTIMPL;
+    }
+
+    WaitForSingleObject(This->mutex, INFINITE);
+    hres = set_item(This->filename, bstrKey, bstrValue);
+    ReleaseMutex(This->mutex);
+
+    return hres;
 }
 
 static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey)
-- 
2.30.2

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=115763

Your paranoid android.


=== debian11 (32 bit report) ===

Report validation errors:
mshtml:htmldoc has no test summary line (early exit of the main process?)
mshtml:htmldoc has unaccounted for todo messages
mshtml:htmldoc returned a non-zero exit code despite reporting no failures

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>