Module: wine Branch: master Commit: c74d9a43b8fea10e704065c3aa6fbda1bf6bb049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74d9a43b8fea10e704065c3aa...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Aug 20 16:19:41 2012 +0200
mshtml: Added IHTMLWindow6::get_sessionStorage implementation.
---
dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlstorage.c | 219 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 14 +++- dlls/mshtml/mshtml_private.h | 5 + 4 files changed, 238 insertions(+), 1 deletions(-)
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 8ece8f5..53cd2e9 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -39,6 +39,7 @@ C_SRCS = \ htmlscreen.c \ htmlscript.c \ htmlselect.c \ + htmlstorage.c \ htmlstyle.c \ htmlstyle2.c \ htmlstyle3.c \ diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c new file mode 100644 index 0000000..e0c4a53 --- /dev/null +++ b/dlls/mshtml/htmlstorage.c @@ -0,0 +1,219 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + DispatchEx dispex; + IHTMLStorage IHTMLStorage_iface; + LONG ref; +} HTMLStorage; + +static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) +{ + return CONTAINING_RECORD(iface, HTMLStorage, IHTMLStorage_iface); +} + +static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID riid, void **ppv) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IHTMLStorage_iface; + }else if(IsEqualGUID(&IID_IHTMLStorage, riid)) { + TRACE("(%p)->(IID_IHTMLStorage %p)\n", This, ppv); + *ppv = &This->IHTMLStorage_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLStorage_GetTypeInfoCount(IHTMLStorage *iface, UINT *pctinfo) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_GetTypeInfo(IHTMLStorage *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLStorage_GetIDsOfNames(IHTMLStorage *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%d %p)\n", This, lIndex, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IHTMLStorageVtbl HTMLStorageVtbl = { + HTMLStorage_QueryInterface, + HTMLStorage_AddRef, + HTMLStorage_Release, + HTMLStorage_GetTypeInfoCount, + HTMLStorage_GetTypeInfo, + HTMLStorage_GetIDsOfNames, + HTMLStorage_Invoke, + HTMLStorage_get_length, + HTMLStorage_get_remainingSpace, + HTMLStorage_key, + HTMLStorage_getItem, + HTMLStorage_setItem, + HTMLStorage_removeItem, + HTMLStorage_clear +}; + +static const tid_t HTMLStorage_iface_tids[] = { + IHTMLStorage_tid, + 0 +}; +static dispex_static_data_t HTMLStorage_dispex = { + NULL, + IHTMLStorage_tid, + NULL, + HTMLStorage_iface_tids +}; + +HRESULT create_storage(IHTMLStorage **p) +{ + HTMLStorage *storage; + + storage = heap_alloc_zero(sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; + storage->ref = 1; + init_dispex(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex); + + *p = &storage->IHTMLStorage_iface; + return S_OK; +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e9a0625..c45df2c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1876,8 +1876,20 @@ static HRESULT WINAPI HTMLWindow6_get_XDomainRequest(IHTMLWindow6 *iface, VARIAN static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLStorage **p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + if(!This->inner_window->session_storage) { + HRESULT hres; + + hres = create_storage(&This->inner_window->session_storage); + if(FAILED(hres)) + return hres; + } + + IHTMLStorage_AddRef(This->inner_window->session_storage); + *p = This->inner_window->session_storage; + return S_OK; }
static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dee8f90..39b491e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -160,6 +160,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ + XIID(IHTMLStorage) \ XIID(IHTMLStyle) \ XIID(IHTMLStyle2) \ XIID(IHTMLStyle3) \ @@ -180,6 +181,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLWindow2) \ XIID(IHTMLWindow3) \ XIID(IHTMLWindow4) \ + XIID(IHTMLWindow5) \ XIID(IHTMLWindow6) \ XIID(IOmHistory) \ XIID(IOmNavigator) @@ -391,6 +393,7 @@ struct HTMLInnerWindow { HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; IOmHistory *history; + IHTMLStorage *session_storage;
global_prop_t *global_props; DWORD global_prop_cnt; @@ -718,6 +721,8 @@ IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN;
+HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; + void HTMLDocument_HTMLDocument3_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_HTMLDocument5_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN;