wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : msxml3: Added node_query_inerface function for common xmlnode child objects implementation .
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 0670d092f137da408fe2f3ed0119a1a08ea1a932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0670d092f137da408fe2f3ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:54:46 2010 +0200 msxml3: Added node_query_inerface function for common xmlnode child objects implementation. --- dlls/msxml3/attribute.c | 4 ++++ dlls/msxml3/cdata.c | 4 ++++ dlls/msxml3/comment.c | 4 ++++ dlls/msxml3/docfrag.c | 4 ++++ dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 4 ++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 11 +++++++++++ dlls/msxml3/pi.c | 4 ++++ dlls/msxml3/text.c | 4 ++++ 11 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 327f91c..3554859 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -67,6 +67,10 @@ static HRESULT WINAPI domattr_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b23d19d..e378295 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -74,6 +74,10 @@ static HRESULT WINAPI domcdata_QueryInterface( TRACE("Unsupported interface\n"); return E_NOINTERFACE; } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 6e7b77e..f496625 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -68,6 +68,10 @@ static HRESULT WINAPI domcomment_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 9ca63d3..b013deb 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -67,6 +67,10 @@ static HRESULT WINAPI domfrag_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3f01329..8fdf5c1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -545,7 +545,7 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { *ppvObject = &This->lpvtblISupportErrorInfo; } - else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) + else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5b4a604..6247269 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -74,7 +74,7 @@ static HRESULT WINAPI domelem_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } - else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) + else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index c55fd18..396db9b 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -67,6 +67,10 @@ static HRESULT WINAPI entityref_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index fe843b8..e8251bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -162,6 +162,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) extern void init_xmlnode(xmlnode*,xmlNodePtr,IXMLDOMNode*,dispex_static_data_t*); extern void destroy_xmlnode(xmlnode*); +extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 5b9eee4..a2e175e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -80,6 +80,13 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) return This->node; } +BOOL node_query_interface(xmlnode *This, REFIID riid, void **ppv) +{ + if(This->dispex.outer) + return dispex_query_interface(&This->dispex, riid, ppv); + return FALSE; +} + static HRESULT WINAPI xmlnode_QueryInterface( IXMLDOMNode *iface, REFIID riid, @@ -97,6 +104,8 @@ static HRESULT WINAPI xmlnode_QueryInterface( }else if (IsEqualGUID( riid, &IID_IDispatch) || IsEqualGUID( riid, &IID_IXMLDOMNode)) { *ppvObject = &This->lpVtbl; + }else if(node_query_interface(This, riid, ppvObject)) { + return *ppvObject ? S_OK : E_NOINTERFACE; }else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; @@ -1725,6 +1734,8 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe if(dispex_data) init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); + else + This->dispex.outer = NULL; } IXMLDOMNode *create_node( xmlNodePtr node ) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2c70cc7..0b2a7e7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -67,6 +67,10 @@ static HRESULT WINAPI dom_pi_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index d3da258..0ae5aa6 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -69,6 +69,10 @@ static HRESULT WINAPI domtext_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) {

1 0

Jacek Caban : msxml3: Store outer iface as IXMLDOMNode instead of IUnknown in xmlnode.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: f5348b25aff4642956891ef267a06341aed0f1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5348b25aff4642956891ef26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:54:13 2010 +0200 msxml3: Store outer iface as IXMLDOMNode instead of IUnknown in xmlnode. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 4 ++-- dlls/msxml3/node.c | 18 +++++++++--------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 0bdc691..327f91c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -556,7 +556,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->lpVtbl = &domattr_vtbl; This->ref = 1; - init_xmlnode(&This->node, attribute, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 373bbc8..b23d19d 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -835,7 +835,7 @@ IUnknown* create_cdata( xmlNodePtr text ) This->lpVtbl = &domcdata_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 74d036d..6e7b77e 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -781,7 +781,7 @@ IUnknown* create_comment( xmlNodePtr comment ) This->lpVtbl = &domcomment_vtbl; This->ref = 1; - init_xmlnode(&This->node, comment, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, comment, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index d1b5b8c..9ca63d3 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -526,7 +526,7 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment ) This->lpVtbl = &domfrag_vtbl; This->ref = 1; - init_xmlnode(&This->node, fragment, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 98045a0..3f01329 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2404,7 +2404,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->safeopt = 0; doc->bsc = NULL; - init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl, &domdoc_dispex); + init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IXMLDOMNode*)&doc->lpVtbl, &domdoc_dispex); *document = (IXMLDOMDocument3*)&doc->lpVtbl; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4c557ef..5b4a604 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -801,7 +801,7 @@ IUnknown* create_element( xmlNodePtr element ) This->lpVtbl = &domelem_vtbl; This->ref = 1; - init_xmlnode(&This->node, element, (IUnknown*)&This->lpVtbl, &domelem_dispex); + init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->lpVtbl, &domelem_dispex); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f583141..c55fd18 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -525,7 +525,7 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) This->lpVtbl = &entityref_vtbl; This->ref = 1; - init_xmlnode(&This->node, entity, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2210574..fe843b8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -145,7 +145,7 @@ typedef struct _xmlnode { DispatchEx dispex; const struct IXMLDOMNodeVtbl *lpVtbl; - IUnknown *pUnkOuter; + IXMLDOMNode *iface; LONG ref; xmlNodePtr node; } xmlnode; @@ -160,7 +160,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) return (IXMLDOMNode*)&This->lpVtbl; } -extern void init_xmlnode(xmlnode*,xmlNodePtr,IUnknown*,dispex_static_data_t*); +extern void init_xmlnode(xmlnode*,xmlNodePtr,IXMLDOMNode*,dispex_static_data_t*); extern void destroy_xmlnode(xmlnode*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2c6df32..5b9eee4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -89,8 +89,8 @@ static HRESULT WINAPI xmlnode_QueryInterface( TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - if(This->pUnkOuter) - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + if(This->iface) + return IXMLDOMNode_QueryInterface(This->iface, riid, ppvObject); if (IsEqualGUID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -112,8 +112,8 @@ static ULONG WINAPI xmlnode_AddRef( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - if(This->pUnkOuter) - return IUnknown_AddRef(This->pUnkOuter); + if(This->iface) + return IXMLDOMNode_AddRef(This->iface); return InterlockedIncrement(&This->ref); } @@ -124,8 +124,8 @@ static ULONG WINAPI xmlnode_Release( xmlnode *This = impl_from_IXMLDOMNode( iface ); LONG ref; - if(This->pUnkOuter) - return IUnknown_Release(This->pUnkOuter); + if(This->iface) + return IXMLDOMNode_Release(This->iface); ref = InterlockedDecrement( &This->ref ); if(!ref) { @@ -1713,7 +1713,7 @@ void destroy_xmlnode(xmlnode *This) xmldoc_release(This->node->doc); } -void init_xmlnode(xmlnode *This, xmlNodePtr node, IUnknown *outer, dispex_static_data_t *dispex_data ) +void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) { if(node) xmldoc_add_ref( node->doc ); @@ -1721,10 +1721,10 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IUnknown *outer, dispex_static This->lpVtbl = &xmlnode_vtbl; This->ref = 1; This->node = node; - This->pUnkOuter = outer; + This->iface = node_iface; if(dispex_data) - init_dispex(&This->dispex, This->pUnkOuter, dispex_data); + init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); } IXMLDOMNode *create_node( xmlNodePtr node ) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4a5e621..2c70cc7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -611,7 +611,7 @@ IUnknown* create_pi( xmlNodePtr pi ) This->lpVtbl = &dom_pi_vtbl; This->ref = 1; - init_xmlnode(&This->node, pi, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a087076..d3da258 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -811,7 +811,7 @@ IUnknown* create_text( xmlNodePtr text ) This->lpVtbl = &domtext_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; }

1 0

Alexandre Julliard : ws2_32/tests: Fix some buffer overflows in traces.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 9f2c51800dacf11cf93dc4aeb5d5ea6c3c9d6cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c51800dacf11cf93dc4aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 21:07:54 2010 +0200 ws2_32/tests: Fix some buffer overflows in traces. --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e61d550..631fcda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2629,23 +2629,22 @@ static void get_event_details(int event, int *bit, char *name) } } -static char *dbgstr_event_seq(const LPARAM *seq) +static const char *dbgstr_event_seq(const LPARAM *seq) { static char message[1024]; - char name[10]; + char name[12]; + int len = 1; message[0] = '['; message[1] = 0; while (*seq) { get_event_details(WSAGETSELECTEVENT(*seq), NULL, name); - - sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ", - name, WSAGETSELECTERROR(*seq)); - + len += sprintf(message + len, "%s(%d) ", name, WSAGETSELECTERROR(*seq)); seq++; } - strcat(message, "]"); + if (len > 1) len--; + strcpy( message + len, "]" ); return message; } @@ -2654,7 +2653,8 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) static char message[1024]; struct async_message *curr = messages_received; int index, error, bit = 0; - char name[10]; + char name[12]; + int len = 1; message[0] = '['; message[1] = 0; @@ -2685,10 +2685,10 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) curr = curr->next; } - sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ", - name, error); + len += sprintf(message + len, "%s(%d) ", name, error); } - strcat(message, "]"); + if (len > 1) len--; + strcpy( message + len, "]" ); return message; }

1 0

André Hentschel : Wine 1.3.2 freigegeben
by Jeremy Newman 03 Sep '10

03 Sep '10

Module: website Branch: master Commit: 5285a42945c9bfec1bed86b7b3270e5593f7c84c URL: http://source.winehq.org/git/website.git/?a=commit;h=5285a42945c9bfec1bed86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 3 20:05:18 2010 +0200 Wine 1.3.2 freigegeben --- news/de/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2010090301.xml b/news/de/2010090301.xml new file mode 100644 index 0000000..a1f1cb9 --- /dev/null +++ b/news/de/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. September 2010</date> +<title>Wine 1.3.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Update der Gecko Engine, jetzt auch als 64-Bit Version.</li> + <li>Neue Implementierung der Linux Konsolenunterstützung.</li> + <li>Viele neue Funktionen in den C Runtime Dlls.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.2
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: website Branch: master Commit: 1d39150eee1a07262c0bf8ea9bcbadf5e64b0e05 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d39150eee1a07262c0bf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:47:43 2010 +0200 Wine release 1.3.2 --- news/en/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2010090301.xml b/news/en/2010090301.xml new file mode 100644 index 0000000..62f34ed --- /dev/null +++ b/news/en/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>September 3, 2010</date> +<title>Wine 1.3.2 Released</title> +<body> + The Wine development release 1.3.2 is now available. + <a href="{$root}/announce/1.3.2">What's new</a> in this release: +<ul> + <li>Update of the Gecko engine, now including a 64-bit version.</li> + <li>New implementation of console support on Unix terminals.</li> + <li>Many new functions in the C runtime dlls.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.2 : Alexandre Julliard : Release 1.3.2
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: refs/tags/wine-1.3.2 Tag: 196c67636fb97e6ea6428d0d0a364824ed561040 URL: http://source.winehq.org/git/wine.git/?a=tag;h=196c67636fb97e6ea6428d0d0a36… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:07 2010 +0200 Release 1.3.2

1 0

Alexandre Julliard : Release 1.3.2.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 75af4023079d16976cf937fb0e0ef061cb3883cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=75af4023079d16976cf937fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:05 2010 +0200 Release 1.3.2. --- ANNOUNCE | 1337 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 646 insertions(+), 711 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75af4023079d16976cf93…

1 0

Jörg Höhle : winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 294d0c9501c68e6b07a9cce5ed51d5ac5d53ca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=294d0c9501c68e6b07a9cce5e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 20:57:24 2010 +0200 winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN. --- dlls/winmm/mci.c | 8 ++++++-- dlls/winmm/tests/mci.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6724d7f..c7e8165 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -898,14 +898,18 @@ static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, { LPCWSTR alias = NULL; /* Open always defines an alias for further reference */ - if (dwParam & MCI_OPEN_ALIAS) /* open ... alias */ + if (dwParam & MCI_OPEN_ALIAS) { /* open ... alias */ alias = lpParms->lpstrAlias; - else { + if (MCI_GetDriverFromString(alias)) + return MCIERR_DUPLICATE_ALIAS; + } else { if ((dwParam & MCI_OPEN_ELEMENT) /* open file.wav */ && !(dwParam & MCI_OPEN_ELEMENT_ID)) alias = lpParms->lpstrElementName; else if (dwParam & MCI_OPEN_TYPE ) /* open cdaudio */ alias = wmd->lpstrDeviceType; + if (alias && MCI_GetDriverFromString(alias)) + return MCIERR_DEVICE_OPEN; } if (alias) { wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(alias)+1) * sizeof(WCHAR)); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index e951fbf..f47d4f6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -525,6 +525,11 @@ static void test_openCloseWAVE(HWND hwnd) err = mciGetDeviceID("waveaudio"); ok(err==1,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("open no-such-file.wav alias waveaudio", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open alias waveaudio returned %s\n", dbg_mcierr(err)); + /* If it were not already in use, open avivideo alias waveaudio would succeed, + * making for funny test cases. */ + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err)); @@ -1124,10 +1129,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci status tempfile.wav mode returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"playing"), "mci auto-open status mode, got: %s\n", buf); - if (0) { /* FIXME: wait until this no more confuses Wine */ err = mciSendString("open tempfile.wav", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); - } + ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); + + err = mciSendString("open foo.wav alias tempfile.wav", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open re-using alias returned %s\n", dbg_mcierr(err)); + /* w2k/xp and Wine differ. While the device is busy playing, it is * regularly open and accessible via the filename: subsequent * commands must not cause auto-open each. In Wine, a subsequent

1 0

Jörg Höhle : winmm: GetDeviceID only considers a single name per entry.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 6b271b6d3c4b8b155613d8b1456754dec953bcdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b271b6d3c4b8b155613d8b14… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 21:03:43 2010 +0200 winmm: GetDeviceID only considers a single name per entry. --- dlls/winmm/mci.c | 4 ---- dlls/winmm/tests/mci.c | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b7799c8..6724d7f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -127,10 +127,6 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) ret = wmd->wDeviceID; break; } - if (wmd->lpstrDeviceType && strcmpiW(wmd->lpstrDeviceType, lpstrName) == 0) { - ret = wmd->wDeviceID; - break; - } } LeaveCriticalSection(&WINMM_cs); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 8adc46b..e951fbf 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -565,7 +565,7 @@ static void test_recordWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); test_notification(hwnd, "open new no #2", 0); @@ -724,6 +724,15 @@ static void test_playWAVE(HWND hwnd) return; } + err = mciGetDeviceID("mysound"); + ok(err==1,"mciGetDeviceID mysound returned %u, expected 1\n", err); + + err = mciGetDeviceID("tempfile.wav"); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); + + err = mciGetDeviceID("waveaudio"); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("status mysound length", buf, sizeof(buf), NULL); ok(!err,"mci status length returned %s\n", dbg_mcierr(err)); todo_wine ok(!strcmp(buf,"2000"), "mci status length gave %s, expected 2000, some tests will fail.\n", buf); @@ -852,10 +861,10 @@ static void test_asyncWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("tempfile.wav"); - ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); @@ -1095,6 +1104,9 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"tempfile.wav"), "sysinfo name 1 open: %s\n", buf); test_notification(hwnd, "sysinfo name notify\n", MCI_NOTIFY_SUCCESSFUL); + err = mciGetDeviceID("tempfile.wav"); + ok(err==1,"mciGetDeviceID tempfile.wav returned %u, expected 1\n", err); + /* Save the full pathname to the file. */ err = mciSendString("info tempfile.wav file", path, sizeof(path), NULL); ok(!err,"mci info tempfile.wav file returned %s\n", dbg_mcierr(err));

1 0

Jörg Höhle : winmm: Correctly parse the MCI Sysinfo command.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 565c56c61f1afa6c56734034f53333b748d83656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565c56c61f1afa6c56734034f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 3 06:33:52 2010 +0200 winmm: Correctly parse the MCI Sysinfo command. --- dlls/winmm/mci.c | 79 ++++++++++++++++++++++++++++++++++------------- dlls/winmm/tests/mci.c | 23 +++++++++++++- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 7a3cd8f..b7799c8 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -544,6 +544,23 @@ static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) return MCIERR_EXTENSION_NOT_FOUND; } +/************************************************************************** + * MCI_GetDevTypeFromResource [internal] + */ +static UINT MCI_GetDevTypeFromResource(LPCWSTR lpstrName) +{ + WCHAR buf[32]; + UINT uDevType; + for (uDevType = MCI_DEVTYPE_FIRST; uDevType <= MCI_DEVTYPE_LAST; uDevType++) { + if (LoadStringW(hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + /* FIXME: ignore digits suffix */ + if (!strcmpiW(buf, lpstrName)) + return uDevType; + } + } + return 0; +} + #define MAX_MCICMDTABLE 20 #define MCI_COMMAND_TABLE_NOT_LOADED 0xFFFE @@ -1319,21 +1336,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; - } else if (!strcmpW(verb, wszSysinfo)) { - /* System commands are not subject to auto-open. */ - /* It's too early to handle Sysinfo here because the - * requirements on dev depend on the flags: - * alias with INSTALLNAME, name like "waveaudio" - * with QUANTITY and NAME. */ - data[4] = MCI_ALL_DEVICE_ID; - if (MCI_ALL_DEVICE_ID != uDevID) { - /* FIXME: Map device name like waveaudio to MCI_DEVTYPE_xyz */ - uDevID = mciGetDeviceIDW(dev); - wmd = MCI_GetDriver(uDevID); - if (wmd) - data[4] = wmd->wType; - } - } else if (!strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { + } else if (!strcmpW(verb, wszSysinfo) || !strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { /* Prevent auto-open for system commands. */ } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ @@ -1409,11 +1412,32 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, data[0] = (DWORD_PTR)hwndCallback; } - if (wMsg == MCI_OPEN && strcmpW(verb, wszOpen)) { - ERR("Cannot open with command %s\n", debugstr_w(verb)); - dwRet = MCIERR_INTERNAL; - wMsg = 0; - goto errCleanUp; + switch (wMsg) { + case MCI_OPEN: + if (strcmpW(verb, wszOpen)) { + FIXME("Cannot open with command %s\n", debugstr_w(verb)); + dwRet = MCIERR_INTERNAL; + wMsg = 0; + goto errCleanUp; + } + break; + case MCI_SYSINFO: + /* Requirements on dev depend on the flags: + * alias with INSTALLNAME, name like "digitalvideo" + * with QUANTITY and NAME. */ + { + LPMCI_SYSINFO_PARMSW lpParms = (LPMCI_SYSINFO_PARMSW)data; + lpParms->wDeviceType = MCI_ALL_DEVICE_ID; + if (uDevID != MCI_ALL_DEVICE_ID) { + if (dwFlags & MCI_SYSINFO_INSTALLNAME) + wmd = MCI_GetDriver(mciGetDeviceIDW(dev)); + else if (!(lpParms->wDeviceType = MCI_GetDevTypeFromResource(dev))) { + dwRet = MCIERR_DEVICE_TYPE_REQUIRED; + goto errCleanUp; + } + } + } + break; } TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", @@ -1799,7 +1823,17 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } else { TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); - cnt = 1; + /* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType)) + * then lookup registry and/or system.ini for name, ignoring digits suffix */ + switch (LOWORD(lpParms->wDeviceType)) { + case MCI_DEVTYPE_CD_AUDIO: + case MCI_DEVTYPE_WAVEFORM_AUDIO: + case MCI_DEVTYPE_SEQUENCER: + cnt = 1; + break; + default: /* "digitalvideo" gets 0 because it's not in the registry */ + cnt = 0; + } } } *(DWORD*)lpParms->lpstrReturn = cnt; @@ -1814,7 +1848,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm wmd->lpstrDeviceType); } else { *lpParms->lpstrReturn = 0; - ret = MCIERR_INVALID_DEVICE_ID; + ret = (uDevID == MCI_ALL_DEVICE_ID) + ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 382ff6a..8adc46b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -263,6 +263,19 @@ static void test_mciParser(HWND hwnd) err = mciSendString("open all", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_CANNOT_USE_ALL,"open all: %s\n", dbg_mcierr(err)); + /* avivideo is not a known MCI_DEVTYPE resource name */ + err = mciSendString("sysinfo avivideo quantity", buf, sizeof(buf), hwnd); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo sequencer quantity: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo digitalvideo quantity", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"0"), "sysinfo digitalvideo quantity returned %s\n", buf); + + /* quantity 0 yet open 1 (via type "avivideo"), fun */ + err = mciSendString("sysinfo digitalvideo quantity open", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity open: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"1"), "sysinfo digitalvideo quantity open returned %s\n", buf); + err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); @@ -425,10 +438,16 @@ static void test_openCloseWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity: %s\n", dbg_mcierr(err)); err = mciSendString("sysinfo nosuchalias quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo all installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_CANNOT_USE_ALL,"sysinfo all installname: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010