Gabriel Ivăncescu : mshtml: Implement removeItem() for sessionStorage.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: adc5bcba57e9a498de9c0fe7c544842bacc62457
URL:    https://gitlab.winehq.org/wine/wine/-/commit/adc5bcba57e9a498de9c0fe7c544842...

Author: Gabriel Ivăncescu 
Date:   Fri Aug 26 16:38:37 2022 +0300

mshtml: Implement removeItem() for sessionStorage.

Signed-off-by: Gabriel Ivăncescu

---

dlls/mshtml/htmlstorage.c | 11 +++++++++--
 dlls/mshtml/tests/misc.c  | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c
index d25f8fef6a1..a7feba6ce69 100644
--- a/dlls/mshtml/htmlstorage.c
+++ b/dlls/mshtml/htmlstorage.c
@@ -642,13 +642,20 @@ done:
 static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey)
 {
     HTMLStorage *This = impl_from_IHTMLStorage(iface);
+    struct session_entry *session_entry;
     HRESULT hres;

TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey));

if(!This->filename) {
-        FIXME("session storage not supported\n");
-        return E_NOTIMPL;
+        hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry);
+        if(SUCCEEDED(hres) && session_entry) {
+            This->session_storage->num_keys--;
+            wine_rb_remove(&This->session_storage->data_map, &session_entry->entry);
+            SysFreeString(session_entry->value);
+            heap_free(session_entry);
+        }
+        return hres;
     }

WaitForSingleObject(This->mutex, INFINITE);
diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c
index 02ef7451b88..1a60ce4f70d 100644
--- a/dlls/mshtml/tests/misc.c
+++ b/dlls/mshtml/tests/misc.c
@@ -332,6 +332,9 @@ static void test_HTMLStorage(void)
     SysFreeString(key);

key = SysAllocString(L"undefined");
+    hres = IHTMLStorage_removeItem(storage, key);
+    ok(hres == S_OK, "removeItem failed: %08lx\n", hres);
+
     value = SysAllocString(L"null");
     hres = IHTMLStorage_setItem(storage, key, value);
     ok(hres == S_OK, "setItem failed: %08lx\n", hres);
@@ -383,6 +386,11 @@ static void test_HTMLStorage(void)
     ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var));
     ok(!wcscmp(V_BSTR(&var), L""), "got %s\n", wine_dbgstr_w(V_BSTR(&var)));
     VariantClear(&var);
+
+    hres = IHTMLStorage_removeItem(storage, NULL);
+    ok(hres == S_OK, "removeItem failed: %08lx\n", hres);
+    hres = IHTMLStorage_removeItem(storage2, key);
+    ok(hres == S_OK, "removeItem failed: %08lx\n", hres);
     SysFreeString(key);

key = SysAllocString(L"aaaa");
@@ -397,6 +405,14 @@ static void test_HTMLStorage(void)
     ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var));
     ok(!wcscmp(V_BSTR(&var), L"bbbb"), "got %s\n", wine_dbgstr_w(V_BSTR(&var)));
     VariantClear(&var);
+
+    hres = IHTMLStorage_removeItem(storage2, key);
+    ok(hres == S_OK, "removeItem failed: %08lx\n", hres);
+
+    V_VT(&var) = 0xdead;
+    hres = IHTMLStorage_getItem(storage, key, &var);
+    ok(hres == S_OK, "getItem failed: %08lx\n", hres);
+    ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var));
     SysFreeString(key);

key = SysAllocString(L"foo");