November 2012 - Wine-commits

Nikolay Sivov : scrrun: Improve OpenTextFile stub.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 49a8d4ecb0cb868451c7ba3ded34d4e69248d8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a8d4ecb0cb868451c7ba3de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 11:43:39 2012 -0500 scrrun: Improve OpenTextFile stub. --- dlls/scrrun/filesystem.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun_private.h | 1 + 2 files changed, 242 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5a10aa8..cd94c43 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -38,11 +38,247 @@ struct folder { LONG ref; }; +struct textstream { + ITextStream ITextStream_iface; + LONG ref; +}; + static inline struct folder *impl_from_IFolder(IFolder *iface) { return CONTAINING_RECORD(iface, struct folder, IFolder_iface); } +static inline struct textstream *impl_from_ITextStream(ITextStream *iface) +{ + return CONTAINING_RECORD(iface, struct textstream, ITextStream_iface); +} + +static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj) +{ + struct textstream *This = impl_from_ITextStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_ITextStream) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + ITextStream_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI textstream_AddRef(ITextStream *iface) +{ + struct textstream *This = impl_from_ITextStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI textstream_Release(ITextStream *iface) +{ + struct textstream *This = impl_from_ITextStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI textstream_GetTypeInfoCount(ITextStream *iface, UINT *pctinfo) +{ + struct textstream *This = impl_from_ITextStream(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI textstream_GetTypeInfo(ITextStream *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct textstream *This = impl_from_ITextStream(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(ITextStream_tid, ppTInfo); +} + +static HRESULT WINAPI textstream_GetIDsOfNames(ITextStream *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + struct textstream *This = impl_from_ITextStream(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(ITextStream_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI textstream_Invoke(ITextStream *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct textstream *This = impl_from_ITextStream(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(ITextStream_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI textstream_get_Line(ITextStream *iface, LONG *line) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, line); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_get_Column(ITextStream *iface, LONG *column) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, column); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_get_AtEndOfStream(ITextStream *iface, VARIANT_BOOL *eos) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, eos); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_get_AtEndOfLine(ITextStream *iface, VARIANT_BOOL *eol) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, eol); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%p): stub\n", This, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(text)); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(text)); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_WriteBlankLines(ITextStream *iface, LONG lines) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%d): stub\n", This, lines); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_Skip(ITextStream *iface, LONG count) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p)->(%d): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_SkipLine(ITextStream *iface) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI textstream_Close(ITextStream *iface) +{ + struct textstream *This = impl_from_ITextStream(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const ITextStreamVtbl textstreamvtbl = { + textstream_QueryInterface, + textstream_AddRef, + textstream_Release, + textstream_GetTypeInfoCount, + textstream_GetTypeInfo, + textstream_GetIDsOfNames, + textstream_Invoke, + textstream_get_Line, + textstream_get_Column, + textstream_get_AtEndOfStream, + textstream_get_AtEndOfLine, + textstream_Read, + textstream_ReadLine, + textstream_ReadAll, + textstream_Write, + textstream_WriteLine, + textstream_WriteBlankLines, + textstream_Skip, + textstream_SkipLine, + textstream_Close +}; + +static HRESULT create_textstream(ITextStream **ret) +{ + struct textstream *stream; + + stream = heap_alloc(sizeof(struct textstream)); + if (!stream) return E_OUTOFMEMORY; + + stream->ITextStream_iface.lpVtbl = &textstreamvtbl; + stream->ref = 1; + + *ret = &stream->ITextStream_iface; + return S_OK; +} + static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **obj) { struct folder *This = impl_from_IFolder(iface); @@ -651,13 +887,12 @@ static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR FileName, return E_NOTIMPL; } -static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR FileName, - IOMode IOMode, VARIANT_BOOL Create, - Tristate Format, ITextStream **ppts) +static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, + IOMode mode, VARIANT_BOOL create, + Tristate format, ITextStream **stream) { - FIXME("%p %s %d %d %d %p\n", iface, debugstr_w(FileName), IOMode, Create, Format, ppts); - - return E_NOTIMPL; + FIXME("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); + return create_textstream(stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 4578c41..adf5317 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -27,6 +27,7 @@ typedef enum tid_t IDictionary_tid, IFileSystem3_tid, IFolder_tid, + ITextStream_tid, LAST_tid } tid_t;

1 0

Nikolay Sivov : scrrun: Block stream reading calls if it' s not in ForReading mode.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 7a4225c68f6d3029dc6f81afeeeb25bc5f55520b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4225c68f6d3029dc6f81afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 13:36:12 2012 -0500 scrrun: Block stream reading calls if it's not in ForReading mode. --- dlls/scrrun/filesystem.c | 32 ++++++++++- dlls/scrrun/tests/filesystem.c | 119 +++++++++++++++++++++++++++++++++------- 2 files changed, 129 insertions(+), 22 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index cd94c43..8fafc7c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -41,6 +41,13 @@ struct folder { struct textstream { ITextStream ITextStream_iface; LONG ref; + + IOMode mode; +}; + +enum iotype { + IORead, + IOWrite }; static inline struct folder *impl_from_IFolder(IFolder *iface) @@ -53,6 +60,14 @@ static inline struct textstream *impl_from_ITextStream(ITextStream *iface) return CONTAINING_RECORD(iface, struct textstream, ITextStream_iface); } +static int textstream_check_iomode(struct textstream *This, enum iotype type) +{ + if (type == IORead) + return This->mode == ForWriting || This->mode == ForAppending; + else + return 1; +} + static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj) { struct textstream *This = impl_from_ITextStream(iface); @@ -183,6 +198,10 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -190,6 +209,10 @@ static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -197,6 +220,10 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -265,7 +292,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(ITextStream **ret) +static HRESULT create_textstream(IOMode mode, ITextStream **ret) { struct textstream *stream; @@ -274,6 +301,7 @@ static HRESULT create_textstream(ITextStream **ret) stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; + stream->mode = mode; *ret = &stream->ITextStream_iface; return S_OK; @@ -892,7 +920,7 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, Tristate format, ITextStream **stream) { FIXME("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - return create_textstream(stream); + return create_textstream(mode, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d6c596c..e0c8684 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -31,6 +31,8 @@ #include "initguid.h" #include "scrrun.h" +static IFileSystem3 *fs3; + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -41,27 +43,18 @@ static void test_interfaces(void) HRESULT hr; IDispatch *disp; IDispatchEx *dispex; - IFileSystem3 *fs3; IObjectWithSite *site; VARIANT_BOOL b; BSTR path; WCHAR windows_path[MAX_PATH]; WCHAR file_path[MAX_PATH]; - hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IDispatch, (void**)&disp); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); - return; - } + IFileSystem3_QueryInterface(fs3, &IID_IDispatch, (void**)&disp); GetSystemDirectoryW(windows_path, MAX_PATH); lstrcpyW(file_path, windows_path); lstrcatW(file_path, file_kernel32W); - hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); @@ -119,25 +112,16 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "Folder exists\n"); SysFreeString(path); - IFileSystem3_Release(fs3); IDispatch_Release(disp); } static void test_createfolder(void) { - IFileSystem3 *fs3; HRESULT hr; WCHAR pathW[MAX_PATH]; BSTR path; IFolder *folder; - hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IFileSystem3, (void**)&fs3); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); - return; - } - /* create existing directory */ GetCurrentDirectoryW(sizeof(pathW)/sizeof(WCHAR), pathW); path = SysAllocString(pathW); @@ -146,16 +130,111 @@ static void test_createfolder(void) ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); ok(folder == NULL, "got %p\n", folder); SysFreeString(path); +} - IFileSystem3_Release(fs3); +static void test_textstream(void) +{ + static WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; + ITextStream *stream; + VARIANT_BOOL b; + HANDLE file; + HRESULT hr; + BSTR name, data; + + file = CreateFileW(testfileW, GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(file); + + name = SysAllocString(testfileW); + b = VARIANT_FALSE; + hr = IFileSystem3_FileExists(fs3, name, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "got %x\n", b); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == S_FALSE || broken(hr == S_OK), "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got 0x%x\n", b); +} + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); +} + b = 10; + hr = ITextStream_get_AtEndOfLine(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); +} + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadLine(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadAll(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(name); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); +} + b = 10; + hr = ITextStream_get_AtEndOfLine(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); +} + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadLine(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadAll(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + DeleteFileW(testfileW); } START_TEST(filesystem) { + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IFileSystem3, (void**)&fs3); + if(FAILED(hr)) { + win_skip("Could not create FileSystem object: %08x\n", hr); + return; + } + test_interfaces(); test_createfolder(); + test_textstream(); + + IFileSystem3_Release(fs3); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Properly report history update for location. replace call.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 7ac09e721c544ffdc7176c646986c4d18a38b56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac09e721c544ffdc7176c646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:57:48 2012 +0100 mshtml: Properly report history update for location.replace call. --- dlls/mshtml/binding.h | 4 ++++ dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/htmlframebase.c | 3 ++- dlls/mshtml/htmllocation.c | 6 ++++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 --- dlls/mshtml/navigate.c | 10 ++++++---- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 6 +++--- 10 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 1eee469..7934c90 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -114,6 +114,7 @@ void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; +HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; @@ -123,4 +124,7 @@ HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDE IUri *get_uri_nofrag(IUri*) DECLSPEC_HIDDEN; +void set_current_mon(HTMLOuterWindow*,IMoniker*,DWORD) DECLSPEC_HIDDEN; +void set_current_uri(HTMLOuterWindow*,IUri*) DECLSPEC_HIDDEN; + HRESULT bind_mon_to_wstr(HTMLInnerWindow*,IMoniker*,WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index b0ec97e..a7b87a8 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -121,7 +121,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) if(*href) { if(!window) window = This->element.node.doc->basedoc.window; - hres = navigate_url(window, href, window->uri); + hres = navigate_url(window, href, window->uri, BINDING_NAVIGATED); }else { TRACE("empty href\n"); hres = S_OK; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0a41522..5fc9560 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -37,6 +37,7 @@ #include "mshtml_private.h" #include "htmlevent.h" #include "pluginhost.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -609,7 +610,7 @@ static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window, v, This->window->uri); + return navigate_url(This->window, v, This->window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index a11adca..e05e219 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "mshtml_private.h" +#include "binding.h" #include "wine/debug.h" @@ -136,7 +137,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) return E_FAIL; } - return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri); + return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 3a978b5..9e4d6d2 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -170,7 +171,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->uri); + return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -570,7 +571,8 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) return E_FAIL; } - return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->uri); + return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->uri, + BINDING_NAVIGATED|BINDING_REPLACE); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1696ed5..0318002 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -206,7 +206,7 @@ static void release_outer_window(HTMLOuterWindow *This) } remove_target_tasks(This->task_magic); - set_current_mon(This, NULL); + set_current_mon(This, NULL, 0); if(This->base.inner_window) detach_inner_window(This->base.inner_window); release_children(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f24354d..74f1b39 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -781,7 +781,6 @@ void init_node_cc(void); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; void call_property_onchanged(ConnectionPoint*,DISPID) DECLSPEC_HIDDEN; @@ -810,8 +809,6 @@ nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsresult create_nsfile(const PRUnichar*,nsIFile**) DECLSPEC_HIDDEN; HRESULT create_pending_window(HTMLOuterWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; -void set_current_mon(HTMLOuterWindow*,IMoniker*) DECLSPEC_HIDDEN; -void set_current_uri(HTMLOuterWindow*,IUri*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLInnerWindow*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLOuterWindow*,HTMLInnerWindow*) DECLSPEC_HIDDEN; void abort_window_bindings(HTMLInnerWindow*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 33ebbca..9532a82 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1777,7 +1777,7 @@ static void start_doc_binding_proc(task_t *_task) { start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; - set_current_mon(task->window, task->pending_window->bscallback->bsc.mon); + set_current_mon(task->window, task->pending_window->bscallback->bsc.mon, BINDING_NAVIGATED); start_binding(task->pending_window, &task->pending_window->bscallback->bsc, NULL); } @@ -1948,6 +1948,7 @@ typedef struct { task_t header; HTMLOuterWindow *window; nsChannelBSC *bscallback; + DWORD flags; IMoniker *mon; IUri *uri; } navigate_task_t; @@ -1959,7 +1960,7 @@ static void navigate_proc(task_t *_task) hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { - set_current_mon(task->window, task->bscallback->bsc.mon); + set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); start_binding(task->window->pending_window, &task->bscallback->bsc, NULL); } @@ -2124,6 +2125,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC task->window = window; task->bscallback = bsc; + task->flags = flags; task->mon = mon; IUri_AddRef(uri); @@ -2317,7 +2319,7 @@ HRESULT load_uri(HTMLOuterWindow *window, IUri *uri, DWORD flags) return hres; } -HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri) +HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri, DWORD flags) { BSTR display_uri; IUri *uri; @@ -2359,7 +2361,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u } } - hres = navigate_uri(window, uri, display_uri, BINDING_NAVIGATED); + hres = navigate_uri(window, uri, display_uri, flags); IUri_Release(uri); SysFreeString(display_uri); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 5ce6648..90543df 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -992,7 +992,7 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc } if(is_doc_channel) - set_current_mon(window, mon); + set_current_mon(window, mon, BINDING_NAVIGATED); hres = create_channelbsc(mon, NULL, NULL, 0, is_doc_channel, &bscallback); IMoniker_Release(mon); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 649c906..457f5dc 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -132,14 +132,14 @@ void set_current_uri(HTMLOuterWindow *window, IUri *uri) IUri_GetDisplayUri(uri, &window->url); } -void set_current_mon(HTMLOuterWindow *This, IMoniker *mon) +void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) { IUriContainer *uri_container; IUri *uri = NULL; HRESULT hres; if(This->mon) { - if(This->doc_obj) + if(This->doc_obj && !(flags & BINDING_REPLACE)) notify_travellog_update(This->doc_obj); IMoniker_Release(This->mon); This->mon = NULL; @@ -323,7 +323,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) update_doc(This, UPDATE_TITLE|UPDATE_UI); }else { update_doc(This, UPDATE_TITLE); - set_current_mon(This->window, mon); + set_current_mon(This->window, mon, flags); } if(This->doc_obj->client) {

1 0

Jacek Caban : mshtml: Don't skip history notification for about: URLs.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 8f1bb21f35d7ffdb58c9891d599ed0611839d587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1bb21f35d7ffdb58c9891d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:57:58 2012 +0100 mshtml: Don't skip history notification for about: URLs. --- dlls/mshtml/persist.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 457f5dc..210fab0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -80,15 +80,6 @@ static void notify_travellog_update(HTMLDocumentObj *doc) if(!doc->is_webbrowser) return; - /* Don't notify if we were in about: page */ - if(doc->basedoc.window->uri) { - DWORD scheme; - - hres = IUri_GetScheme(doc->basedoc.window->uri, &scheme); - if(SUCCEEDED(hres) && scheme == URL_SCHEME_ABOUT) - return; - } - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT vin;

1 0

Jacek Caban : mshtml: Added IPersistHistory tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0d1ce5a308ab2e1aad7fa1f157d387ecc5e6b127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1ce5a308ab2e1aad7fa1f15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:13 2012 +0100 mshtml: Added IPersistHistory tests. --- dlls/mshtml/tests/htmldoc.c | 118 +++++++++++++++++++++++++++++++++--------- 1 files changed, 92 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1ce5a308ab2e1aad7fa…

1 0

Jacek Caban : mshtml: Store embedder' s IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: f0b7db4df8622d6f4b36b32ce94f665d6cf8e503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b7db4df8622d6f4b36b32ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:27 2012 +0100 mshtml: Store embedder's IOleComandTarget iface in HTMLDocumentObj and use it in handle_navigation_error. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 11 +++-------- dlls/mshtml/oleobj.c | 9 +++++++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 74f1b39..3a02416 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -531,6 +531,7 @@ struct HTMLDocumentObj { IOleClientSite *client; IDocHostUIHandler *hostui; + IOleCommandTarget *client_cmdtrg; BOOL custom_hostui; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9532a82..1c6b80c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1450,7 +1450,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) { HTMLOuterWindow *outer_window; HTMLDocumentObj *doc; - IOleCommandTarget *olecmd; BOOL is_error_url; SAFEARRAY *sa; SAFEARRAYBOUND bound; @@ -1473,18 +1472,15 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) if(FAILED(hres) || is_error_url) return; - hres = IOleClientSite_QueryInterface(doc->client, - &IID_IOleCommandTarget, (void**)&olecmd); + if(!doc->client_cmdtrg) if(FAILED(hres)) return; bound.lLbound = 0; bound.cElements = 8; sa = SafeArrayCreate(VT_VARIANT, 1, &bound); - if(!sa) { - IOleCommandTarget_Release(olecmd); + if(!sa) return; - } ind = 0; V_VT(&var) = VT_I4; @@ -1532,11 +1528,10 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) V_ARRAY(&var) = sa; V_VT(&varOut) = VT_BOOL; V_BOOL(&varOut) = VARIANT_TRUE; - IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); + IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); SysFreeString(unk); SafeArrayDestroy(sa); - IOleCommandTarget_Release(olecmd); } static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 0a1f97c..d62c306 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -231,6 +231,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->usermode = UNKNOWN_USERMODE; } + if(This->doc_obj->client_cmdtrg) { + IOleCommandTarget_Release(This->doc_obj->client_cmdtrg); + This->doc_obj->client_cmdtrg = NULL; + } + if(This->doc_obj->hostui && !This->doc_obj->custom_hostui) { IDocHostUIHandler_Release(This->doc_obj->hostui); This->doc_obj->hostui = NULL; @@ -319,6 +324,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite VARIANT var; OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; + This->doc_obj->client_cmdtrg = cmdtrg; + if(!hostui_setup) { IDocObjectService *doc_object_service; IBrowserService *browser_service; @@ -361,8 +368,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); - - IOleCommandTarget_Release(cmdtrg); } if(This->doc_obj->usermode == UNKNOWN_USERMODE)

1 0

Jacek Caban : mshtml: Added exec_refresh implementation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 1cc3cf1b640f5e00732cae92cda11a7e7ebee8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc3cf1b640f5e00732cae92c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:41 2012 +0100 mshtml: Added exec_refresh implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +- dlls/mshtml/navigate.c | 20 +++++++------ dlls/mshtml/nsevents.c | 4 ++- dlls/mshtml/olecmd.c | 64 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/persist.c | 3 +- 7 files changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 7934c90..42560ea 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -101,6 +101,7 @@ typedef struct { #define BINDING_NAVIGATED 0x0001 #define BINDING_REPLACE 0x0002 #define BINDING_FROMHIST 0x0004 +#define BINDING_REFRESH 0x0008 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3a02416..6c7662e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -374,6 +374,7 @@ struct HTMLOuterWindow { IUri *uri; IUri *uri_nofrag; BSTR url; + DWORD load_flags; SCRIPTMODE scriptmode; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index fcae9ff..4b07c3f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -32,6 +32,7 @@ #include "mshtml_private.h" #include "htmlscript.h" #include "htmlevent.h" +#include "binding.h" #include "wine/debug.h" @@ -267,7 +268,7 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); - if(doc->is_webbrowser && doc->usermode != EDITMODE) + if(doc->is_webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1c6b80c..346524d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2052,7 +2052,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC if(!uri_nofrag) return E_FAIL; - if(window->doc_obj->client) { + if(window->doc_obj->client && !(flags & BINDING_REFRESH)) { IOleCommandTarget *cmdtrg; hres = IOleClientSite_QueryInterface(window->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -2075,7 +2075,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC } } - if(window->uri_nofrag && !post_data_size) { + if(!(flags & BINDING_REFRESH) && window->uri_nofrag && !post_data_size) { BOOL eq; hres = IUri_IsEqual(uri_nofrag, window->uri_nofrag, &eq); @@ -2115,7 +2115,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; - if(!(flags & BINDING_FROMHIST)) + if(!(flags & (BINDING_FROMHIST|BINDING_REFRESH))) call_docview_84(window->doc_obj); task->window = window; @@ -2266,13 +2266,15 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis HRESULT hres; if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { - BOOL cancel = FALSE; + if(!(flags & BINDING_REFRESH)) { + BOOL cancel = FALSE; - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, - NULL, NULL, 0, NULL, TRUE, &cancel); - if(SUCCEEDED(hres) && cancel) { - TRACE("Navigation canceled\n"); - return S_OK; + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, + NULL, NULL, 0, NULL, TRUE, &cancel); + if(SUCCEEDED(hres) && cancel) { + TRACE("Navigation canceled\n"); + return S_OK; + } } return super_navigate(window, uri, flags, NULL, NULL, 0); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 5f23e08..297ef8c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -34,6 +34,7 @@ #include "mshtml_private.h" #include "htmlscript.h" #include "htmlevent.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -258,7 +259,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_title(doc_obj); } - if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service) + if(doc_obj && doc_obj->usermode!=EDITMODE && doc_obj->doc_object_service + && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8932843..bda06b5 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -384,10 +385,69 @@ static HRESULT exec_get_zoom_range(HTMLDocument *This, DWORD nCmdexecopt, VARIAN return E_NOTIMPL; } +typedef struct { + task_t header; + HTMLOuterWindow *window; +}refresh_task_t; + +static void refresh_proc(task_t *_task) +{ + refresh_task_t *task = (refresh_task_t*)_task; + HTMLOuterWindow *window = task->window; + + TRACE("%p\n", window); + + window->readystate = READYSTATE_UNINITIALIZED; + + if(window->doc_obj && window->doc_obj->client_cmdtrg) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(window->doc_obj->client_cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + } + + load_uri(task->window, task->window->uri, BINDING_REFRESH); +} + +static void refresh_destr(task_t *_task) +{ + refresh_task_t *task = (refresh_task_t*)_task; + + IHTMLWindow2_Release(&task->window->base.IHTMLWindow2_iface); + heap_free(task); +} + static HRESULT exec_refresh(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + refresh_task_t *task; + HRESULT hres; + + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); + + if(This->doc_obj->client) { + IOleCommandTarget *olecmd; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + hres = IOleCommandTarget_Exec(olecmd, &CGID_DocHostCommandHandler, 2300, nCmdexecopt, pvaIn, pvaOut); + IOleCommandTarget_Release(olecmd); + if(SUCCEEDED(hres)) + return S_OK; + } + } + + if(!This->window) + return E_UNEXPECTED; + + task = heap_alloc(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + + IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface); + task->window = This->window; + + return push_task(&task->header, refresh_proc, refresh_destr, This->window->task_magic); } static HRESULT exec_stop(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 210fab0..430786f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -130,12 +130,13 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & BINDING_REPLACE)) + if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) notify_travellog_update(This->doc_obj); IMoniker_Release(This->mon); This->mon = NULL; } + This->load_flags = flags; if(!mon) return;

1 0

Jacek Caban : mshtml: Added refresh tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 47274313db0f442e1f7b58043aa4283010461260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47274313db0f442e1f7b58043… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:58:54 2012 +0100 mshtml: Added refresh tests. --- dlls/mshtml/tests/htmldoc.c | 79 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index faa8ba7..1669943 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -132,6 +132,7 @@ DEFINE_EXPECT(Exec_ShellDocView_103); DEFINE_EXPECT(Exec_ShellDocView_105); DEFINE_EXPECT(Exec_ShellDocView_138); DEFINE_EXPECT(Exec_ShellDocView_140); +DEFINE_EXPECT(Exec_DocHostCommandHandler_2300); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -203,7 +204,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, ignore_external_qi; static BOOL inplace_deactivated, open_call; -static BOOL complete, loading_js, loading_hash; +static BOOL complete, loading_js, loading_hash, is_refresh; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window; @@ -931,7 +932,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D test_readyState(NULL); return S_OK; case 1005: - CHECK_EXPECT(OnChanged_1005); + CHECK_EXPECT2(OnChanged_1005); if(!editmode) test_readyState(NULL); readystate_set_interactive = (load_state != LD_INTERACTIVE); @@ -2728,7 +2729,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) - && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) || nCmdID != 63)) + && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) + || (nCmdID != 63 && (!is_refresh || nCmdID != 37)))) test_readyState(NULL); if(!pguidCmdGroup) { @@ -2824,12 +2826,20 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 37: CHECK_EXPECT2(Exec_ShellDocView_37); - if(nav_url) - test_GetCurMoniker(doc_unk, NULL, nav_serv_url); - else if(load_from_stream) - test_GetCurMoniker(doc_unk, NULL, "about:blank"); - else if(!editmode) - test_GetCurMoniker(doc_unk, doc_mon, NULL); + if(is_refresh && load_state == LD_COMPLETE) { + load_state = LD_DOLOAD; + test_readyState(NULL); + }else if(is_refresh && load_state == LD_DOLOAD) { + test_readyState(NULL); + load_state = LD_LOADING; + }else { + if(nav_url) + test_GetCurMoniker(doc_unk, NULL, nav_serv_url); + else if(load_from_stream) + test_GetCurMoniker(doc_unk, NULL, "about:blank"); + else if(!editmode) + test_GetCurMoniker(doc_unk, doc_mon, NULL); + } ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); ok(pvaIn != NULL, "pvaIn == NULL\n"); @@ -3041,6 +3051,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case OLECMDID_SHOWSCRIPTERROR: /* TODO */ return S_OK; + case 2300: + CHECK_EXPECT(Exec_DocHostCommandHandler_2300); + return E_NOTIMPL; default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -3414,7 +3427,7 @@ static HRESULT WINAPI DocObjectService_ActiveElementChanged( IDocObjectService* This, IHTMLElement *pHTMLElement) { - CHECK_EXPECT(ActiveElementChanged); + CHECK_EXPECT2(ActiveElementChanged); return E_NOTIMPL; } @@ -5041,6 +5054,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) #define DWL_ONREADY_LOADING 0x0040 #define DWL_EXPECT_HISTUPDATE 0x0080 #define DWL_FROM_HISTORY 0x0100 +#define DWL_REFRESH 0x0200 static void test_download(DWORD flags) { @@ -5050,12 +5064,17 @@ static void test_download(DWORD flags) MSG msg; b = is_js ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Exec_HTTPEQUIV_DONE; + is_refresh = (flags & DWL_REFRESH) != 0; hwnd = FindWindowA("Internet Explorer_Hidden", NULL); ok(hwnd != NULL, "Could not find hidden window\n"); test_readyState(NULL); + if(flags & DWL_REFRESH) { + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + } if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) @@ -5121,7 +5140,7 @@ static void test_download(DWORD flags) SET_EXPECT(UpdateBackForwardState); } if(!is_js) { - if(!editmode) { + if(!editmode && !(flags & DWL_REFRESH)) { if(!(flags & DWL_EMPTY)) SET_EXPECT(FireNavigateComplete2); SET_EXPECT(FireDocumentComplete); @@ -5136,6 +5155,10 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } + if(flags & DWL_REFRESH) { + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + } if(flags & DWL_VERBDONE) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) @@ -5174,7 +5197,7 @@ static void test_download(DWORD flags) SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */ SET_CALLED(EnableModeless_FALSE); /* IE7 */ SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */ - if(nav_url && !is_js) + if(nav_url && !is_js && !(flags & DWL_REFRESH)) todo_wine CHECK_CALLED(Exec_ShellDocView_37); else if(flags & (DWL_CSS|DWL_HTTP)) CLEAR_CALLED(Exec_ShellDocView_37); /* Called by IE9 */ @@ -5182,7 +5205,10 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - todo_wine CHECK_CALLED(Exec_SETTITLE); + if(!(flags & DWL_REFRESH)) + todo_wine CHECK_CALLED(Exec_SETTITLE); + else + CHECK_CALLED(Exec_SETTITLE); } if(!is_js) { CHECK_CALLED(OnChanged_1005); @@ -5213,7 +5239,7 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!is_js) { - if(!editmode) { + if(!editmode && !(flags & DWL_REFRESH)) { if(!(flags & DWL_EMPTY)) { if(support_wbapp) CHECK_CALLED(FireNavigateComplete2); @@ -5474,6 +5500,30 @@ static void test_load_history(IHTMLDocument2 *doc) history_stream = NULL; } +static void test_refresh(IHTMLDocument2 *doc) +{ + IOleCommandTarget *cmdtrg; + VARIANT vin, vout; + HRESULT hres; + + trace("Refresh...\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); + + V_VT(&vin) = VT_EMPTY; + V_VT(&vout) = VT_EMPTY; + SET_EXPECT(Exec_DocHostCommandHandler_2300); + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); + ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(V_VT(&vout) == VT_EMPTY, "V_VT(vout) = %d\n", V_VT(&vout)); + CHECK_CALLED(Exec_DocHostCommandHandler_2300); + + IOleCommandTarget_Release(cmdtrg); + + test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH); +} + static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) { IHTMLWindow2 *window, *new_window; @@ -6950,6 +7000,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) if(support_wbapp) { test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); test_travellog(doc); + test_refresh(doc); } test_put_href(doc, FALSE, NULL, "javascript:external%20&&undefined", TRUE, FALSE, 0); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0);

1 0

Jacek Caban : ieframe: Forward more DocHost::Exec calls to embedders.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: d22a8bbd66261b4005495a3d704de1d111778ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22a8bbd66261b4005495a3d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:06 2012 +0100 ieframe: Forward more DocHost::Exec calls to embedders. --- dlls/ieframe/dochost.c | 4 ++++ dlls/ieframe/iexplore.c | 3 ++- dlls/ieframe/tests/webbrowser.c | 4 ++-- dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 0449f24..c063851 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -526,6 +526,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_UPDATECOMMANDS: + case OLECMDID_SETDOWNLOADSTATE: return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); default: FIXME("Unimplemented cmdid %d\n", nCmdID); @@ -605,6 +606,9 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) + return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; } diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index c4641bd..0643f16 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,8 +789,9 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, VARIANT *out) { - return S_OK; + return E_NOTIMPL; } + static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 57c2be9..213e43d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2753,7 +2753,7 @@ static void test_download(DWORD flags) } todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); @@ -2771,7 +2771,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ if(!is_first_load) todo_wine CHECK_CALLED(GetHostInfo); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index b82233b..1bd14fa 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1219,11 +1219,13 @@ static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, D } if(!cmdtrg) - return S_OK; + return E_NOTIMPL; hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out); IOleCommandTarget_Release(cmdtrg); - if(FAILED(hres)) + if(SUCCEEDED(hres)) + TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); + else FIXME("Exec failed\n"); return hres;

1 0

Francois Gouget : shell32: Fix a buffer overflow in CommandLineToArgvW().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3b6b2107e2648b562c7266b17c66ab263c374c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6b2107e2648b562c7266b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Nov 10 01:00:54 2012 +0100 shell32: Fix a buffer overflow in CommandLineToArgvW(). --- dlls/shell32/shell32_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7648dbb..1507d4a 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -227,15 +227,20 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*s) s++; } - /* close the argument */ + /* close the executable path */ *d++=0; /* skip to the first argument and initialize it if any */ while (*s==' ' || *s=='\t') s++; - if (*s) - argv[argc++]=d; + if (!*s) + { + /* There are no parameters so we are all done */ + *numargs=argc; + return argv; + } /* Split and copy the remaining arguments */ + argv[argc++]=d; qcount=bcount=0; while (*s) {

1 0