January 2012 - Wine-commits

Jacek Caban : mshtml: Added VT_I2 handling to debugstr_variant.
by Alexandre Julliard 27 Jan '12

27 Jan '12

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 27 Jan '12

27 Jan '12

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 27 Jan '12

27 Jan '12

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

Nikolay Sivov : msxml3: Support CDATA nodes in MXWriter.
by Alexandre Julliard 27 Jan '12

27 Jan '12

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

Nikolay Sivov : msxml3: Support startDTD()/endDTD() in MXWriter.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 6106afe359f0ab904f9b7e4e9867a0cd5bb0cea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6106afe359f0ab904f9b7e4e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 16:09:42 2012 +0300 msxml3: Support startDTD()/endDTD() in MXWriter. --- dlls/msxml3/mxwriter.c | 80 ++++++++++++++++++++++++++++++++------ dlls/msxml3/tests/saxreader.c | 86 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 153 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3e08840..c94faaa 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR emptyW[] = {0}; +static const WCHAR spaceW[] = {' '}; +static const WCHAR quotW[] = {'\"'}; typedef enum { @@ -266,10 +268,10 @@ static void close_output_buffer(mxwriter *This) */ static WCHAR *get_escaped_string(const WCHAR *str, int *len) { - static const WCHAR ltW[] = {'&','l','t',';'}; - static const WCHAR ampW[] = {'&','a','m','p',';'}; - static const WCHAR quotW[] = {'&','q','u','o','t',';'}; - static const WCHAR gtW[] = {'&','g','t',';'}; + static const WCHAR ltW[] = {'&','l','t',';'}; + static const WCHAR ampW[] = {'&','a','m','p',';'}; + static const WCHAR equotW[] = {'&','q','u','o','t',';'}; + static const WCHAR gtW[] = {'&','g','t',';'}; const int default_alloc = 100; const int grow_thresh = 10; @@ -301,8 +303,8 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) ptr += sizeof(ampW)/sizeof(WCHAR); break; case '"': - memcpy(ptr, quotW, sizeof(quotW)); - ptr += sizeof(quotW)/sizeof(WCHAR); + memcpy(ptr, equotW, sizeof(equotW)); + ptr += sizeof(equotW)/sizeof(WCHAR); break; case '>': memcpy(ptr, gtW, sizeof(gtW)); @@ -330,7 +332,6 @@ static void write_prolog_buffer(const mxwriter *This) static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; static const WCHAR noW[] = {'n','o','\"','?','>'}; - static const WCHAR quotW[] = {'\"'}; static const WCHAR crlfW[] = {'\r','\n'}; /* version */ @@ -951,9 +952,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( for (i = 0; i < length; i++) { - static const WCHAR spaceW[] = {' '}; static const WCHAR eqqW[] = {'=','\"'}; - static const WCHAR quotW[] = {'\"'}; const WCHAR *str; WCHAR *escaped; INT len = 0; @@ -1114,17 +1113,72 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, const WCHAR *name, int name_len, const WCHAR *publicId, int publicId_len, const WCHAR *systemId, int systemId_len) { + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',' '}; + static const WCHAR openintW[] = {'[','\r','\n'}; + mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_wn(name, name_len), debugstr_wn(publicId, publicId_len), + + TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(name, name_len), debugstr_wn(publicId, publicId_len), debugstr_wn(systemId, systemId_len)); - return E_NOTIMPL; + + if (!name) return E_INVALIDARG; + + write_output_buffer(This->buffer, doctypeW, sizeof(doctypeW)/sizeof(WCHAR)); + + if (*name) + { + write_output_buffer(This->buffer, name, name_len); + write_output_buffer(This->buffer, spaceW, 1); + } + + if (publicId) + { + static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; + + write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, publicId, publicId_len); + write_output_buffer(This->buffer, quotW, 1); + + if (!systemId) return E_INVALIDARG; + + if (*publicId) + write_output_buffer(This->buffer, spaceW, 1); + + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, systemId, systemId_len); + write_output_buffer(This->buffer, quotW, 1); + + if (*systemId) + write_output_buffer(This->buffer, spaceW, 1); + } + else if (systemId) + { + static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; + + write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(This->buffer, systemId, systemId_len); + write_output_buffer(This->buffer, quotW, 1); + if (*systemId) + write_output_buffer(This->buffer, spaceW, 1); + } + + write_output_buffer(This->buffer, openintW, sizeof(openintW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_endDTD(ISAXLexicalHandler *iface) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + static const WCHAR closedtdW[] = {']','>','\r','\n'}; + + TRACE("(%p)\n", This); + + write_output_buffer(This->buffer, closedtdW, sizeof(closedtdW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXLexicalHandler_startEntity(ISAXLexicalHandler *iface, const WCHAR *name, int len) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 30ac57e..1f47062 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2956,7 +2956,92 @@ static void test_mxwriter_cdata(void) ISAXLexicalHandler_Release(lexical); IMXWriter_Release(writer); free_bstrs(); +} +static void test_mxwriter_dtd(void) +{ + static const WCHAR nameW[] = {'n','a','m','e'}; + static const WCHAR pubW[] = {'p','u','b'}; + static const WCHAR sysW[] = {'s','y','s'}; + 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_startDTD(lexical, NULL, 0, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, sysW, sizeof(sysW)/sizeof(WCHAR)); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, 0, NULL, 0); + 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_("<!DOCTYPE name [\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + /* system id is required if public is present */ + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), + pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + 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_("<!DOCTYPE name [\r\n<!DOCTYPE name PUBLIC \"pub\"" + "<!DOCTYPE name PUBLIC \"pub\" \"sys\" [\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_endDTD(lexical); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_endDTD(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_("<!DOCTYPE name [\r\n<!DOCTYPE name PUBLIC \"pub\"" + "<!DOCTYPE name PUBLIC \"pub\" \"sys\" [\r\n]>\r\n]>\r\n"), + 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) @@ -2996,6 +3081,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_comment(); test_mxwriter_cdata(); + test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();

1 0

Nikolay Sivov : msxml3: Add a helper to output quoted strings.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 2f18cfd85e6e766d762afdba16229153c7291769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f18cfd85e6e766d762afdba1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 16:23:56 2012 +0300 msxml3: Add a helper to output quoted strings. --- dlls/msxml3/mxwriter.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index c94faaa..cb1a67f 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -250,6 +250,15 @@ static HRESULT write_output_buffer(output_buffer *buffer, const WCHAR *data, int return write_output_buffer_mode(buffer, OutputBuffer_Both, data, len); } +static HRESULT write_output_buffer_quoted(output_buffer *buffer, const WCHAR *data, int len) +{ + write_output_buffer(buffer, quotW, 1); + write_output_buffer(buffer, data, len); + write_output_buffer(buffer, quotW, 1); + + return S_OK; +} + /* frees buffer data, reallocates with a default lengths */ static void close_output_buffer(mxwriter *This) { @@ -327,7 +336,7 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) static void write_prolog_buffer(const mxwriter *This) { - static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"'}; + static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','='}; static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','=','\"'}; static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; @@ -336,8 +345,7 @@ static void write_prolog_buffer(const mxwriter *This) /* version */ write_output_buffer(This->buffer, versionW, sizeof(versionW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, This->version, -1); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, This->version, -1); /* encoding */ write_output_buffer(This->buffer, encodingW, sizeof(encodingW)/sizeof(WCHAR)); @@ -952,7 +960,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( for (i = 0; i < length; i++) { - static const WCHAR eqqW[] = {'=','\"'}; + static const WCHAR eqW[] = {'='}; const WCHAR *str; WCHAR *escaped; INT len = 0; @@ -964,17 +972,15 @@ static HRESULT WINAPI SAXContentHandler_startElement( write_output_buffer(This->buffer, spaceW, 1); write_output_buffer(This->buffer, str, len); - write_output_buffer(This->buffer, eqqW, 2); + write_output_buffer(This->buffer, eqW, 1); len = 0; hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; escaped = get_escaped_string(str, &len); - write_output_buffer(This->buffer, escaped, len); + write_output_buffer_quoted(This->buffer, escaped, len); heap_free(escaped); - - write_output_buffer(This->buffer, quotW, 1); } } @@ -1136,18 +1142,14 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, publicId, publicId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, publicId, publicId_len); if (!systemId) return E_INVALIDARG; if (*publicId) write_output_buffer(This->buffer, spaceW, 1); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, systemId, systemId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, systemId, systemId_len); if (*systemId) write_output_buffer(This->buffer, spaceW, 1); @@ -1157,9 +1159,7 @@ static HRESULT WINAPI SAXLexicalHandler_startDTD(ISAXLexicalHandler *iface, static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); - write_output_buffer(This->buffer, quotW, 1); - write_output_buffer(This->buffer, systemId, systemId_len); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer_quoted(This->buffer, systemId, systemId_len); if (*systemId) write_output_buffer(This->buffer, spaceW, 1); }

1 0

Francois Gouget : wrc: Add a trailing '\n' to the error() calls.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 1a512846e250af51048d9c38609f19dbf39cc7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a512846e250af51048d9c386… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 27 14:08:22 2012 +0100 wrc: Add a trailing '\n' to the error() calls. --- tools/wrc/genres.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index d6e641f..edf4823 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -287,13 +287,13 @@ static int parse_accel_string( const string_t *key, int flags ) (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) { print_location( &key->loc ); - error("VIRTKEY code is not equal to ascii value"); + error("VIRTKEY code is not equal to ascii value\n"); } if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) { print_location( &key->loc ); - error("Cannot use both '^' and CONTROL modifier"); + error("Cannot use both '^' and CONTROL modifier\n"); } else if(key->str.cstr[0] == '^') { @@ -301,7 +301,7 @@ static int parse_accel_string( const string_t *key, int flags ) if(keycode >= ' ') { print_location( &key->loc ); - error("Control-code out of range"); + error("Control-code out of range\n"); } } else @@ -314,12 +314,12 @@ static int parse_accel_string( const string_t *key, int flags ) (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) { print_location( &key->loc ); - error("VIRTKEY code is not equal to ascii value"); + error("VIRTKEY code is not equal to ascii value\n"); } if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) { print_location( &key->loc ); - error("Cannot use both '^' and CONTROL modifier"); + error("Cannot use both '^' and CONTROL modifier\n"); } else if(key->str.wstr[0] == '^') { @@ -327,7 +327,7 @@ static int parse_accel_string( const string_t *key, int flags ) if(keycode >= ' ') { print_location( &key->loc ); - error("Control-code out of range"); + error("Control-code out of range\n"); } } else

1 0

Andrew Eikum : winealsa: Avoid underrun by adding a lead-in when starting with few samples.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 7c52a257fb74c21e59318becf70dacffa5f9d720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c52a257fb74c21e59318becf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 23 11:00:14 2012 -0600 winealsa: Avoid underrun by adding a lead-in when starting with few samples. --- dlls/winealsa.drv/mmdevdrv.c | 63 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fedd040..fdb069a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; +#define EXTRA_SAFE_RT 40000 struct ACImpl; typedef struct ACImpl ACImpl; @@ -112,6 +113,7 @@ struct ACImpl { UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ HANDLE timer; BYTE *local_buffer, *tmp_buffer; @@ -961,8 +963,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, This->mmdev_period_rt, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ This->alsa_bufsize_frames = This->mmdev_period_frames * 4; if(err < 0 || alsa_period_us < period / 10) @@ -1034,6 +1034,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } + /* Bear in mind weird situations where + * ALSA period (50ms) > mmdevapi buffer (3x10ms) + * or surprising rounding as seen with 22050x8x1 with Pulse: + * ALSA period 220 vs. 221 frames in mmdevapi and + * buffer 883 vs. 2205 frames in mmdevapi! */ + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + This->hidden_frames = This->alsa_period_frames + This->mmdev_period_frames + + MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); + /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ @@ -1147,11 +1156,18 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - LeaveCriticalSection(&This->lock); + /* Hide some frames in the ALSA buffer. Allows to return GetCurrentPadding=0 + * yet have enough data left to play (as if it were in native's mixer). Add: + * + mmdevapi_period such that at the end of it, ALSA still has data; + * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; + * + alsa_period such that ALSA always has at least one period to play. */ + if(This->dataflow == eRender) + *latency = MulDiv(This->hidden_frames, 10000000, This->fmt->nSamplesPerSec); + else + *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) + + This->mmdev_period_rt; - /* one mmdevapi period plus one period we hide in the ALSA buffer */ - *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) - + This->mmdev_period_rt; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -1473,11 +1489,11 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, } static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, - snd_pcm_uframes_t frames, ACImpl *This) + snd_pcm_uframes_t frames, ACImpl *This, BOOL mute) { snd_pcm_sframes_t written; - if(This->session->mute){ + if(mute){ int err; if((err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * This->fmt->nChannels)) < 0) @@ -1510,8 +1526,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, static void alsa_write_data(ACImpl *This) { - snd_pcm_sframes_t written; - snd_pcm_uframes_t to_write, avail, write_limit, max_period, in_alsa; + snd_pcm_sframes_t written, in_alsa; + snd_pcm_uframes_t to_write, avail, write_limit, max_period; int err; BYTE *buf = This->local_buffer + (This->lcl_offs_frames * This->fmt->nBlockAlign); @@ -1557,7 +1573,29 @@ static void alsa_write_data(ACImpl *This) to_write = min(to_write, write_limit); - written = alsa_write_best_effort(This->pcm_handle, buf, to_write, This); + /* Add a lead-in when starting with too few frames to ensure + * continuous rendering. Additional benefit: Force ALSA to start. + * GetPosition continues to reflect the speaker position because + * snd_pcm_delay includes buffered frames in its total delay + * and last_pos_frames prevents moving backwards. */ + if(!in_alsa && This->held_frames < This->hidden_frames){ + UINT32 s_frames = This->hidden_frames - This->held_frames; + BYTE *silence = HeapAlloc(GetProcessHeap(), 0, + s_frames * This->fmt->nBlockAlign); + + if(silence){ + in_alsa = alsa_write_best_effort(This->pcm_handle, + silence, s_frames, This, TRUE); + TRACE("lead-in %ld\n", in_alsa); + HeapFree(GetProcessHeap(), 0, silence); + if(in_alsa <= 0) + return; + }else + WARN("Couldn't allocate lead-in, expect underrun\n"); + } + + written = alsa_write_best_effort(This->pcm_handle, buf, to_write, This, + This->session->mute); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); return; @@ -1575,7 +1613,8 @@ static void alsa_write_data(ACImpl *This) if(This->held_frames && (written < write_limit)){ /* wrapped and have some data back at the start to write */ written = alsa_write_best_effort(This->pcm_handle, This->local_buffer, - min(This->held_frames, write_limit - written), This); + min(This->held_frames, write_limit - written), This, + This->session->mute); if(written < 0){ WARN("Couldn't write: %ld (%s)\n", written, snd_strerror(written)); return;

1 0

Jörg Höhle : winealsa: Fix -errno typo.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 594002d0116087a8454f11f09c34e744dbcdc4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=594002d0116087a8454f11f09… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jan 27 10:03:01 2012 +0100 winealsa: Fix -errno typo. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fdb069a..ba29fde 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -582,7 +582,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); switch(err){ - case EBUSY: + case -EBUSY: return AUDCLNT_E_DEVICE_IN_USE; default: return AUDCLNT_E_ENDPOINT_CREATE_FAILED;

1 0

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

27 Jan '12

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