January 2012 - Wine-Commits

Jacek Caban : mshtml: Added VT_I2 handling to debugstr_variant.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 3029bdf33d516ee460ea3c378ef4d6c3d9e86fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3029bdf33d516ee460ea3c378… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 17:45:17 2012 +0100 mshtml: Added VT_I2 handling to debugstr_variant. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e82e8e2..c1dfd13 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -509,6 +509,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_EMPTY}"; case VT_NULL: return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); case VT_R8:

1 0

Jacek Caban : mshtml: Added VT_I2 handling to IHTMLSelectElement: add implementation.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 0dedfab9a73812ecaece786b6e60981750fd4d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dedfab9a73812ecaece786b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 17:45:39 2012 +0100 mshtml: Added VT_I2 handling to IHTMLSelectElement:add implementation. --- dlls/mshtml/htmlelem.c | 5 +++ dlls/mshtml/htmlselect.c | 44 +++++++++++++++++------- dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/nsembed.c | 17 +++++++++ dlls/mshtml/nsiface.idl | 77 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 132 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 36103be..030a0d2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1649,6 +1649,11 @@ static const IHTMLElementVtbl HTMLElementVtbl = { HTMLElement_get_all }; +HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement *iface) +{ + return iface->lpVtbl == &HTMLElementVtbl ? impl_from_IHTMLElement(iface) : NULL; +} + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0d45448..fc91c2d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -375,26 +375,44 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem VARIANT before) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - IHTMLDOMNode *node, *tmp; - HRESULT hres; + nsIWritableVariant *nsvariant; + HTMLElement *element_obj; + nsresult nsres; + + TRACE("(%p)->(%p %s)\n", This, element, debugstr_variant(&before)); + + element_obj = unsafe_impl_from_IHTMLElement(element); + if(!element_obj) { + FIXME("External IHTMLElement implementation?\n"); + return E_INVALIDARG; + } - FIXME("(%p)->(%p %s): semi-stub\n", This, element, debugstr_variant(&before)); + nsvariant = create_nsvariant(); + if(!nsvariant) + return E_FAIL; - if(V_VT(&before) != VT_EMPTY) { + switch(V_VT(&before)) { + case VT_EMPTY: + nsres = nsIWritableVariant_SetAsEmpty(nsvariant); + break; + case VT_I2: + nsres = nsIWritableVariant_SetAsInt16(nsvariant, V_I2(&before)); + break; + default: FIXME("unhandled before %s\n", debugstr_variant(&before)); + nsIWritableVariant_Release(nsvariant); return E_NOTIMPL; } - hres = IHTMLElement_QueryInterface(element, &IID_IHTMLDOMNode, (void**)&node); - if(FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_appendChild(&This->element.node.IHTMLDOMNode_iface, node, &tmp); - IHTMLDOMNode_Release(node); - if(SUCCEEDED(hres) && tmp) - IHTMLDOMNode_Release(tmp); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->nselem, (nsIVariant*)nsvariant); + nsIWritableVariant_Release(nsvariant); + if(NS_FAILED(nsres)) { + ERR("Add failed: %08x\n", nsres); + return E_FAIL; + } - return hres; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 20923e9..2385588 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -706,6 +706,7 @@ nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; +nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; void set_window_bscallback(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; @@ -802,6 +803,8 @@ void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; void release_nodes(HTMLDocumentNode*) DECLSPEC_HIDDEN; +HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; + void release_script_hosts(HTMLWindow*) DECLSPEC_HIDDEN; void connect_scripts(HTMLWindow*) DECLSPEC_HIDDEN; void doc_insert_script(HTMLWindow*,nsIDOMHTMLScriptElement*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6874459..fdc6286 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -46,6 +46,7 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" +#define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" #define PR_UINT32_MAX 0xffffffff @@ -713,6 +714,22 @@ nsICommandParams *create_nscommand_params(void) return ret; } +nsIWritableVariant *create_nsvariant(void) +{ + nsIWritableVariant *ret = NULL; + nsresult nsres; + + if(!pCompMgr) + return NULL; + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, + NS_VARIANT_CONTRACTID, NULL, &IID_nsIWritableVariant, (void**)&ret); + if(NS_FAILED(nsres)) + ERR("Could not get nsIVariant\n"); + + return ret; +} + nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv) { nsIInterfaceRequestor *iface_req; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 6a88103..2cefaec 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -133,7 +133,6 @@ typedef nsISupports nsIDOMClientRectList; typedef nsISupports nsINode; typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; -typedef nsISupports nsIVariant; typedef nsISupports nsIDOMUserDataHandler; typedef nsISupports nsIDocShellLoadInfo; typedef nsISupports nsISHEntry; @@ -286,6 +285,82 @@ interface nsISimpleEnumerator : nsISupports [ object, + uuid(81e4c2de-acac-4ad6-901a-b5fb1b851a0d), + local +] +interface nsIVariant : nsISupports +{ + nsresult GetDataType(PRUint16 *aDataType); + nsresult GetAsInt8(PRUint8 *_retval); + nsresult GetAsInt16(PRInt16 *_retval); + nsresult GetAsInt32(PRInt32 *_retval); + nsresult GetAsInt64(PRInt64 *_retval); + nsresult GetAsUint8(PRUint8 *_retval); + nsresult GetAsUint16(PRUint16 *_retval); + nsresult GetAsUint32(PRUint32 *_retval); + nsresult GetAsUint64(PRUint64 *_retval); + nsresult GetAsFloat(float *_retval); + nsresult GetAsDouble(double *_retval); + nsresult GetAsBool(PRBool *_retval); + nsresult GetAsChar(char *_retval); + nsresult GetAsWChar(PRUnichar *_retval); + nsresult GetAsID(nsID *retval); + nsresult GetAsAString(nsAString *_retval); + nsresult GetAsDOMString(nsAString *_retval); + nsresult GetAsACString(nsACString *_retval); + nsresult GetAsAUTF8String(nsACString *_retval); + nsresult GetAsString(char * *_retval); + nsresult GetAsWString(PRUnichar * *_retval); + nsresult GetAsISupports(nsISupports * *_retval); + nsresult GetAsJSVal(long /*jsval*/ *_retval); + nsresult GetAsInterface(nsIID **iid, void **iface); + nsresult GetAsArray(PRUint16 *type, nsIID *iid, PRUint32 *count, void **ptr); + nsresult GetAsStringWithSize(PRUint32 *size, char **str); + nsresult GetAsWStringWithSize(PRUint32 *size, PRUnichar **str); +} + +[ + object, + uuid(5586a590-8c82-11d5-90f3-0010a4e73d9a), + local +] +interface nsIWritableVariant : nsIVariant +{ + nsresult GetWritable(PRBool *aWritable); + nsresult SetWritable(PRBool aWritable); + nsresult SetAsInt8(PRUint8 aValue); + nsresult SetAsInt16(PRInt16 aValue); + nsresult SetAsInt32(PRInt32 aValue); + nsresult SetAsInt64(PRInt64 aValue); + nsresult SetAsUint8(PRUint8 aValue); + nsresult SetAsUint16(PRUint16 aValue); + nsresult SetAsUint32(PRUint32 aValue); + nsresult SetAsUint64(PRUint64 aValue); + nsresult SetAsFloat(float aValue); + nsresult SetAsDouble(double aValue); + nsresult SetAsBool(PRBool aValue); + nsresult SetAsChar(char aValue); + nsresult SetAsWChar(PRUnichar aValue); + nsresult SetAsID(const nsID *aValue); + nsresult SetAsAString(const nsAString *aValue); + nsresult SetAsDOMString(const nsAString *aValue); + nsresult SetAsACString(const nsACString *aValue); + nsresult SetAsAUTF8String(const nsACString *aValue); + nsresult SetAsString(const char * aValue); + nsresult SetAsWString(const PRUnichar * aValue); + nsresult SetAsISupports(nsISupports *aValue); + nsresult SetAsInterface(const nsIID *iid, void *iface); + nsresult SetAsArray(PRUint16 type, const nsIID *iid, PRUint32 count, void *ptr); + nsresult SetAsStringWithSize(PRUint32 size, const char *str); + nsresult SetAsWStringWithSize(PRUint32 size, const PRUnichar *str); + nsresult SetAsVoid(); + nsresult SetAsEmpty(); + nsresult SetAsEmptyArray(); + nsresult SetFromVariant(nsIVariant *aValue); +} + +[ + object, uuid(fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a), local ]

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: f3be2883d3b90e0a2d49f4c46aaa0756fc23c242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3be2883d3b90e0a2d49f4c46… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Jan 27 12:26:32 2012 +0100 po: Update Italian translation. --- po/it.po | 150 +++++++++++++++++++------------------------------------------ 1 files changed, 47 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3be2883d3b90e0a2d49f…

1 0

Jacek Caban : mshtml: Added support for anchor targets.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: bc69cba2fe9d75c1c0e523b7fa497786d3f0430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc69cba2fe9d75c1c0e523b7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:00 2012 +0100 mshtml: Added support for anchor targets. --- dlls/mshtml/htmlanchor.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1424f1e..9e9f369 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -29,6 +29,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "binding.h" #include "wine/debug.h" @@ -42,13 +43,42 @@ typedef struct { nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; +static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *target) +{ + nsAString href_str; + IUri *uri; + nsresult nsres; + HRESULT hres; + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *href; + + nsAString_GetData(&href_str, &href); + hres = create_relative_uri(This->element.node.doc->basedoc.window, href, &uri); + }else { + ERR("Could not get anchor href: %08x\n", nsres); + hres = E_FAIL; + } + nsAString_Finish(&href_str); + if(FAILED(hres)) + return hres; + + hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL); + IUri_Release(uri); + return hres; +} + static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; nsresult nsres; HRESULT hres = E_FAIL; + static const WCHAR _parentW[] = {'p','a','r','e','n','t',0}; static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + static const WCHAR _topW[] = {'_','t','o','p',0}; nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); @@ -57,9 +87,14 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&target_str, &target); if(*target && strcmpiW(target, _selfW)) { - FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); + if(strcmpiW(target, _parentW) && strcmpiW(target, _topW)) { + hres = navigate_anchor_window(This, target); + }else { + FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); + hres = S_OK; + } nsAString_Finish(&target_str); - return S_OK; + return hres; } } nsAString_Finish(&target_str);

1 0

Jacek Caban : mshtml: Added support for middle-button opening anchors in a new window.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 61fd6c97badea7ff92dc77bd903aa7bb3e338307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fd6c97badea7ff92dc77bd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:13 2012 +0100 mshtml: Added support for middle-button opening anchors in a new window. --- dlls/mshtml/htmlanchor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 9e9f369..27d39e3 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -642,6 +642,9 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, case 0: *prevent_default = TRUE; return navigate_anchor(This); + case 1: + *prevent_default = TRUE; + return navigate_anchor_window(This, NULL); default: *prevent_default = FALSE; return S_OK;

1 0

Michael Stefaniuc : shell32: Forward IExtractIconA:: Release to IExtractIconW:Release.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 725db4d19d168749cc39c294a7e5fa84db6518a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725db4d19d168749cc39c294a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:30:58 2012 +0100 shell32: Forward IExtractIconA::Release to IExtractIconW:Release. --- dlls/shell32/folders.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index bf4c255..c829c3a 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -440,7 +440,7 @@ static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface) { IExtractIconW *This = impl_from_IExtractIconA(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_Release(This); } /************************************************************************** * IExtractIconA_GetIconLocation

1 0

Michael Stefaniuc : shell32: Pass the object instead of the iface to an internal helper.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: a14b7df8478eda8f7f46eadfcd49c435128589eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14b7df8478eda8f7f46eadfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:17:46 2012 +0100 shell32: Pass the object instead of the iface to an internal helper. --- dlls/shell32/folders.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 6f49a3d..0143315 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -161,10 +161,9 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) return refCount; } -static HRESULT getIconLocationForFolder(IExtractIconW *iface, UINT uFlags, - LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +static HRESULT getIconLocationForFolder(IExtractIconWImpl *This, UINT uFlags, LPWSTR szIconFile, + UINT cchMax, int *piIndex, UINT *pwFlags) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; int icon_idx; WCHAR wszPath[MAX_PATH]; WCHAR wszCLSIDValue[CHARS_IN_GUID]; @@ -318,8 +317,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } else if (_ILIsFolder (pSimplePidl)) { - getIconLocationForFolder(iface, uFlags, szIconFile, cchMax, piIndex, - pwFlags); + getIconLocationForFolder(This, uFlags, szIconFile, cchMax, piIndex, pwFlags); } else {

1 0

Nikolay Sivov : msxml3: Support CDATA nodes in MXWriter.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 23c3d908667b96e5ee54679dee7c419d262da75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c3d908667b96e5ee54679de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 15:30:03 2012 +0300 msxml3: Support CDATA nodes in MXWriter. --- dlls/msxml3/mxwriter.c | 18 ++++++++++--- dlls/msxml3/tests/saxreader.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a94fa51..3e08840 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1143,16 +1143,26 @@ static HRESULT WINAPI SAXLexicalHandler_endEntity(ISAXLexicalHandler *iface, con static HRESULT WINAPI SAXLexicalHandler_startCDATA(ISAXLexicalHandler *iface) { + static const WCHAR scdataW[] = {'<','!','[','C','D','A','T','A','['}; mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + static const WCHAR ecdataW[] = {']',']','>'}; + + TRACE("(%p)\n", This); + + write_output_buffer(This->buffer, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int nchars) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d05596e..30ac57e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2905,6 +2905,60 @@ static void test_mxwriter_comment(void) free_bstrs(); } +static void test_mxwriter_cdata(void) +{ + ISAXContentHandler *content; + ISAXLexicalHandler *lexical; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_startCDATA(lexical); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<![CDATA["), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_startCDATA(lexical); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_endCDATA(lexical); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + ISAXLexicalHandler_Release(lexical); + IMXWriter_Release(writer); + free_bstrs(); + +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2941,6 +2995,7 @@ START_TEST(saxreader) test_mxwriter_startendelement(); test_mxwriter_characters(); test_mxwriter_comment(); + test_mxwriter_cdata(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();

1 0

Jacek Caban : mshtml: Moved creating URIs relative to window to a new function.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: c5257dc126fbb63ae5afe27dd221e8bd08c7bbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5257dc126fbb63ae5afe27dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:55:46 2012 +0100 mshtml: Moved creating URIs relative to window to a new function. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 5 +---- dlls/mshtml/persist.c | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index dfb14cf..697370a 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -114,3 +114,4 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DEC HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; +HRESULT create_relative_uri(HTMLWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 25fd1ce..67cf3fb 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -814,10 +814,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return S_OK; } - if(This->uri) - hres = CoInternetCombineUrlEx(This->uri, url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); - else - hres = CreateUri(url, 0, 0, &uri); + hres = create_relative_uri(This, url, &uri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6cb7b72..f131062 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -175,6 +175,13 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } +HRESULT create_relative_uri(HTMLWindow *window, const WCHAR *rel_uri, IUri **uri) +{ + return window->uri + ? CoInternetCombineUrlEx(window->uri, rel_uri, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, uri, 0) + : CreateUri(rel_uri, 0, 0, uri); +} + void set_download_state(HTMLDocumentObj *doc, int state) { if(doc->client) {

1 0

Michael Stefaniuc : shell32: Avoid an unsafe IExtractIconW to object cast.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 83693d9611659eca62ae260ba6f6309e310594a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83693d9611659eca62ae260ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:42:22 2012 +0100 shell32: Avoid an unsafe IExtractIconW to object cast. --- dlls/shell32/folders.c | 69 +++++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index bab2b1c..b57fcf4 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -70,32 +70,7 @@ static inline IExtractIconWImpl *impl_from_IPersistFile(IPersistFile *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IPersistFile_iface); } -static const IExtractIconAVtbl eiavt; -static const IExtractIconWVtbl eivt; -static const IPersistFileVtbl pfvt; - -/************************************************************************** -* IExtractIconW_Constructor -*/ -IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) -{ - IExtractIconWImpl* ei; - - TRACE("%p\n", pidl); - - ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); - ei->ref=1; - ei->IExtractIconW_iface.lpVtbl = &eivt; - ei->IExtractIconA_iface.lpVtbl = &eiavt; - ei->IPersistFile_iface.lpVtbl = &pfvt; - ei->pidl=ILClone(pidl); - - pdump(pidl); - - TRACE("(%p)\n", ei); - return &ei->IExtractIconW_iface; -} /************************************************************************** * IExtractIconW::QueryInterface */ @@ -404,17 +379,6 @@ static const IExtractIconWVtbl eivt = }; /************************************************************************** -* IExtractIconA_Constructor -*/ -IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl); - IExtractIconA *eia = &This->IExtractIconA_iface; - - TRACE("(%p)->(%p)\n", This, eia); - return eia; -} -/************************************************************************** * IExtractIconA::QueryInterface */ static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, @@ -564,3 +528,36 @@ static const IPersistFileVtbl pfvt = (void *) 0xdeadbeef /* IEIPersistFile_fnSaveCompleted */, (void *) 0xdeadbeef /* IEIPersistFile_fnGetCurFile */ }; + +IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei; + + TRACE("%p\n", pidl); + + ei = HeapAlloc(GetProcessHeap(), 0, sizeof(*ei)); + ei->ref=1; + ei->IExtractIconW_iface.lpVtbl = &eivt; + ei->IExtractIconA_iface.lpVtbl = &eiavt; + ei->IPersistFile_iface.lpVtbl = &pfvt; + ei->pidl=ILClone(pidl); + + pdump(pidl); + + TRACE("(%p)\n", ei); + return ei; +} + +IExtractIconW *IExtractIconW_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei = extracticon_create(pidl); + + return &ei->IExtractIconW_iface; +} + +IExtractIconA *IExtractIconA_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei = extracticon_create(pidl); + + return &ei->IExtractIconA_iface; +}

1 0