November 2012 - Wine-Commits

Henri Verbeet : wined3d: Add support for GLSL based fixed function fragment shaders.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 10d46bc042696bb9e5c45ac88af332c957bbff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d46bc042696bb9e5c45ac88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:38 2012 +0100 wined3d: Add support for GLSL based fixed function fragment shaders. --- dlls/wined3d/arb_program_shader.c | 14 - dlls/wined3d/directx.c | 18 +- dlls/wined3d/glsl_shader.c | 1068 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 14 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 1049 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d46bc042696bb9e5c45…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 2445ff616e02c2735296e107c8cb37e3d765cf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2445ff616e02c2735296e107c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:35 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fe79711..4cdfe2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -573,7 +573,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; }; #undef INTERFACE @@ -938,7 +938,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;

1 0

Nikolay Sivov : msxml3: Fix a redundant newline in transformation result in html mode.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: f9ab8dab519b25f6d5aa86f403dd6fc910b12264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ab8dab519b25f6d5aa86f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 22:22:25 2012 -0500 msxml3: Fix a redundant newline in transformation result in html mode. --- dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 36602eb..4835859 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -833,6 +833,53 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlDtdPtr cur = doc->intSubset; + + xmlOutputBufferWriteString(buf, "<!DOCTYPE "); + xmlOutputBufferWriteString(buf, (const char *)cur->name); + if (cur->ExternalID) + { + xmlOutputBufferWriteString(buf, " PUBLIC "); + xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + } + else if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " SYSTEM "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + xmlOutputBufferWriteString(buf, ">\n"); +} + +static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlElementType type; + + /* force HTML output */ + type = doc->type; + doc->type = XML_HTML_DOCUMENT_NODE; + if (doc->intSubset) + htmldtd_dumpcontent(buf, doc); + if (doc->children) + { + xmlNodePtr cur = doc->children; + + while (cur) + { + htmlNodeDumpFormatOutput(buf, doc, cur, NULL, 1); + cur = cur->next; + } + + } + doc->type = type; +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -860,7 +907,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); if (output) { - htmlDocContentDumpOutput(output, result->doc, NULL); + htmldoc_dumpcontent(output, result->doc); content = xmlBufferContent(output->buffer); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f59a001..85d2bc4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9732,8 +9732,7 @@ todo_wine { hr = IXSLProcessor_get_output(processor, &v); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); - /* we currently output one '\n' instead of empty string */ - todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); VariantClear(&v); @@ -12469,6 +12468,47 @@ static void test_namedmap_newenum(void) IXMLDOMDocument_Release(doc); } +static const char xsltext_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\" encoding=\"us-ascii\"/>" +"<xsl:template match=\"/\">" +" <xsl:choose>" +" <xsl:when test=\"testkey\">" +" <xsl:text>testdata</xsl:text>" +" </xsl:when>" +" </xsl:choose>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static void test_xsltext(void) +{ + IXMLDOMDocument *doc, *doc2; + VARIANT_BOOL b; + HRESULT hr; + BSTR ret; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(xsltext_xsl), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc2, _bstr_("<testkey/>"), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12552,6 +12592,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xsltemplate(); + test_xsltext(); hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, &IID_IMXNamespaceManager, (void**)&unk);

1 0

Michael Stefaniuc : user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 96e428cc9e30b45ce3c7ea3075dd25816f748f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e428cc9e30b45ce3c7ea307… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:39:45 2012 +0100 user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user.exe16/user.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7f184a2..b99c0ad 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1320,7 +1320,8 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, struct gray_string_info *info; if (!cch) cch = strlen(str16); - if (!(info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) + cch ))) return FALSE; + info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct gray_string_info, str[cch] )); + if (!info) return FALSE; info->proc = gsprc; info->param = lParam; memcpy( info->str, str16, cch );

1 0

Nikolay Sivov : msxml3: Disable text data escaping for format nodes set with put_data().
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 47d2f3caf56eb6c06b1d8f6d0f07b9815da685e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d2f3caf56eb6c06b1d8f6d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 12 09:29:30 2012 -0500 msxml3: Disable text data escaping for format nodes set with put_data(). --- dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++++++++++++++++----- dlls/msxml3/text.c | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 85d2bc4..4b894b0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12185,6 +12185,9 @@ static void test_put_data(void) WCHAR buff[100], *data; IXMLDOMDocument *doc; DOMNodeType *type; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; BSTR get_data; HRESULT hr; @@ -12199,9 +12202,6 @@ static void test_put_data(void) type = put_data_types; while (*type != NODE_INVALID) { - IXMLDOMNode *node; - VARIANT v; - V_VT(&v) = VT_I2; V_I2(&v) = *type; @@ -12213,8 +12213,6 @@ static void test_put_data(void) { case NODE_TEXT: { - IXMLDOMText *text; - hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); EXPECT_HR(hr, S_OK); hr = IXMLDOMText_put_data(text, data); @@ -12284,6 +12282,32 @@ static void test_put_data(void) type++; } + /* \r\n sequence is never escaped */ + V_VT(&v) = VT_I2; + V_I2(&v) = NODE_TEXT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + hr = IXMLDOMText_get_xml(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); free_bstrs(); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6fb29f9..e9c64c1 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -26,6 +26,7 @@ #include <stdarg.h> #ifdef HAVE_LIBXML2 # include <libxml/parser.h> +# include <libxml/parserInternals.h> # include <libxml/xmlerror.h> #endif @@ -55,6 +56,11 @@ static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) return CONTAINING_RECORD(iface, domtext, IXMLDOMText_iface); } +static void domtext_reset_noenc(domtext *This) +{ + This->node.node->name = NULL; +} + static HRESULT WINAPI domtext_QueryInterface( IXMLDOMText *iface, REFIID riid, @@ -182,6 +188,7 @@ static HRESULT WINAPI domtext_put_nodeValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); + domtext_reset_noenc(This); return node_put_value(&This->node, &value); } @@ -371,6 +378,7 @@ static HRESULT WINAPI domtext_put_text( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + domtext_reset_noenc(This); return node_put_text( &This->node, p ); } @@ -608,7 +616,14 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); + static WCHAR rnW[] = {'\r','\n',0}; + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + + if (data && !strcmpW(rnW, data)) + This->node.node->name = xmlStringTextNoenc; + else + domtext_reset_noenc(This); return node_set_content(&This->node, data); }

1 0

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

Nov. 12, 2012

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

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL2.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 67886fed9291e379765e8d6f9ef2e036ed10d9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67886fed9291e379765e8d6f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:37 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f05f690b..3746b4b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface,

1 0

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

Nov. 12, 2012

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: Added refresh tests.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

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 : mshtml: Added exec_refresh implementation.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

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