March 2013 - Wine-Commits - list.winehq.org

Jactry Zeng : Simplified Chinese translation for release 1.5.25
by Jeremy Newman March 4, 2013

March 4, 2013

Module: website Branch: master Commit: b8b771f97a0b1450087ff00f7c0bf1c398683422 URL: http://source.winehq.org/git/website.git/?a=commit;h=b8b771f97a0b1450087ff0… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 3 17:54:49 2013 +0800 Simplified Chinese translation for release 1.5.25 --- news/zh-cn/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013030101.xml b/news/zh-cn/2013030101.xml new file mode 100644 index 0000000..aa814f8 --- /dev/null +++ b/news/zh-cn/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>三月 1, 2013</date> +<title>Wine 1.5.25 发布</title> +<body> + Wine 开发版 1.5.25 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.25">更新</a>： +<ul> + <li>Mac 后端驱动对光标的正确支持。</li> + <li>RichEdit 对从右往左文本支持的修复。</li> + <li>Wingdings 字体实现的初始版本。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.25
by Jeremy Newman March 4, 2013

March 4, 2013

Module: website Branch: master Commit: a81716c434d0cc784d2041cff31cdcad5ccd5dc0 URL: http://source.winehq.org/git/website.git/?a=commit;h=a81716c434d0cc784d2041… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 2 15:54:47 2013 +0100 Polish translation for release 1.5.25 --- news/pl/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013030101.xml b/news/pl/2013030101.xml new file mode 100644 index 0000000..3d6aaa2 --- /dev/null +++ b/news/pl/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 1, 2013</date> +<title>Wydano Wine 1.5.25</title> +<body> + Wydanie rozwojowe Wine 1.5.25 jest już dostępne. + <a href="{$root}/announce/1.5.25">Co nowego</a> w tym wydaniu: +<ul> + <li>Właściwe wsparcie dla kursora w sterowniku Mac.</li> + <li>Poprawki we wsparciu od-prawej-do-lewej w RichEdit.</li> + <li>Początkowa wersja czcionki Wingdings.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.25 freigegeben
by Jeremy Newman March 4, 2013

March 4, 2013

Module: website Branch: master Commit: b94f771ab046f16ac8604f063ad8861c1dae1ec7 URL: http://source.winehq.org/git/website.git/?a=commit;h=b94f771ab046f16ac8604f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 2 14:07:21 2013 +0100 Wine 1.5.25 freigegeben --- news/de/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013030101.xml b/news/de/2013030101.xml new file mode 100644 index 0000000..c670390 --- /dev/null +++ b/news/de/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. März 2013</date> +<title>Wine 1.5.25 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Richtige Cursor Unterstützung im Mac Treiber.</li> + <li>Fehlerbehebungen für die Unterstützung bidirektionaler Schrift in RichEdit.</li> + <li>Anfängliche Version einer Wingdings Schrift.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.25
by Jeremy Newman March 4, 2013

March 4, 2013

Module: website Branch: master Commit: 1b0b1a577a137eb3e770dac8ebab986edb5ab2dd URL: http://source.winehq.org/git/website.git/?a=commit;h=1b0b1a577a137eb3e770da… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 1 23:20:50 2013 +0100 French translation for release 1.5.25 --- news/fr/2013030101.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013030101.xml b/news/fr/2013030101.xml new file mode 100644 index 0000000..fa9f2b3 --- /dev/null +++ b/news/fr/2013030101.xml @@ -0,0 +1,14 @@ +<news> +<date>1er mars 2013</date> +<title>Sortie de Wine 1.5.25</title> +<body> + La version de développement 1.5.25 de Wine est disponible. + <a href="{$root}/announce/1.5.25">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge correcte du curseur dans le pilote Mac.</li> + <li>Correctifs pour la prise en charge du texte écrit de droite à gauche dans RichEdit.</li> + <li>Version initiale d'une police Wingdings.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.25
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: website Branch: master Commit: e54216454ad3e9ba64b85170a3637b5bd624930d URL: http://source.winehq.org/git/website.git/?a=commit;h=e54216454ad3e9ba64b851… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:50:05 2013 +0100 Wine release 1.5.25 --- news/en/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013030101.xml b/news/en/2013030101.xml new file mode 100644 index 0000000..e5387bb --- /dev/null +++ b/news/en/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>March 1, 2013</date> +<title>Wine 1.5.25 Released</title> +<body> + The Wine development release 1.5.25 is now available. + <a href="{$root}/announce/1.5.25">What's new</a> in this release: +<ul> + <li>Proper cursor support in the Mac driver.</li> + <li>Fixes for right-to-left support in RichEdit.</li> + <li>Initial version of a Wingdings font.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.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.5.25 : Alexandre Julliard : Release 1.5.25
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: refs/tags/wine-1.5.25 Tag: 8e9e95f3248270f1eddc2e6e6da061f3d378e5e8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8e9e95f3248270f1eddc2e6e6da0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:40:05 2013 +0100 Release 1.5.25

1 0

Alexandre Julliard : Release 1.5.25.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: ac9ca974e364cd0dcfa006bed8acfd896144a6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9ca974e364cd0dcfa006bed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:40:05 2013 +0100 Release 1.5.25. --- ANNOUNCE | 655 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 341 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9ca974e364cd0dcfa00…

1 0

Jacek Caban : mshtml: Added IHTMLElement2::insertAdjacentElement tests.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 4a6807038b9c9b290f71fb74d56ab6af4f998982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6807038b9c9b290f71fb74d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:45:07 2013 +0100 mshtml: Added IHTMLElement2::insertAdjacentElement tests. --- dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1ca7b87..913411c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4179,6 +4179,48 @@ static void test_create_img_elem(IHTMLDocument2 *doc) } } +#define insert_adjacent_elem(a,b,c) _insert_adjacent_elem(__LINE__,a,b,c) +static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const char *where, IHTMLElement *elem) +{ + IHTMLElement2 *elem2 = _get_elem2_iface(line, (IUnknown*)parent); + IHTMLElement *ret_elem = NULL; + BSTR str = a2bstr(where); + HRESULT hres; + + hres = IHTMLElement2_insertAdjacentElement(elem2, str, elem, &ret_elem); + IHTMLElement2_Release(elem2); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "insertAdjacentElement failed: %08x\n", hres); + ok_(__FILE__,line)(ret_elem == elem, "ret_elem != elem\n"); + IHTMLElement_Release(ret_elem); +} + +void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *elem, *elem2; + + static const elem_type_t br_br[] = {ET_BR, ET_BR}; + static const elem_type_t br_div_br[] = {ET_BR, ET_DIV, ET_BR}; + + elem = test_create_elem(doc, "BR"); + insert_adjacent_elem(parent, "BeforeEnd", elem); + IHTMLElement_Release(elem); + + test_elem_all((IUnknown*)parent, br_br, 1); + + elem = test_create_elem(doc, "BR"); + insert_adjacent_elem(parent, "beforeend", elem); + + test_elem_all((IUnknown*)parent, br_br, 2); + + elem2 = test_create_elem(doc, "DIV"); + insert_adjacent_elem(elem, "beforebegin", elem2); + IHTMLElement_Release(elem2); + IHTMLElement_Release(elem); + + test_elem_all((IUnknown*)parent, br_div_br, 3); +} + static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) { IHTMLBodyElement *body; @@ -6405,6 +6447,9 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, ""); + test_insert_adjacent_elems(doc, div); + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE);

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: insertAdjacentElement implementation.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: e03de990ef3fef92ca57dbe89e1d7df00993cd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03de990ef3fef92ca57dbe89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:57 2013 +0100 mshtml: Added IHTMLElement2::insertAdjacentElement implementation. --- dlls/mshtml/htmlelem.c | 8 +++++--- dlls/mshtml/htmlelem2.c | 19 +++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 581669c..f0789f8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1087,7 +1087,7 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode) +HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) { nsIDOMNode *ret_nsnode; nsresult nsres; @@ -1153,6 +1153,8 @@ static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDO if (NS_FAILED(nsres)) return E_FAIL; + if(ret_node) + hres = get_node(This->node.doc, ret_nsnode, TRUE, ret_node); nsIDOMNode_Release(ret_nsnode); return hres; } @@ -1194,7 +1196,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = insert_adjacent_node(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode, NULL); nsIDOMNode_Release(nsnode); return hr; } @@ -1226,7 +1228,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = insert_adjacent_node(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode, NULL); nsIDOMNode_Release(nsnode); return hr; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index dc3ad7f..24aaba5 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1120,8 +1120,23 @@ static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, B IHTMLElement *insertedElement, IHTMLElement **inserted) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, inserted); - return E_NOTIMPL; + HTMLDOMNode *ret_node; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, inserted); + + elem = unsafe_impl_from_IHTMLElement(insertedElement); + if(!elem) + return E_INVALIDARG; + + hres = insert_adjacent_node(This, where, elem->node.nsnode, &ret_node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&ret_node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)inserted); + IHTMLDOMNode_Release(&ret_node->IHTMLDOMNode_iface); + return hres; } static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, IHTMLElement *apply, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dab68d7..c515e6c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -831,6 +831,8 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT insert_adjacent_node(HTMLElement*,const WCHAR*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; + HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: insert_adjacent_node clean up.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 6d55379f7a98c9149d4ed072a8f654dd20c0f8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d55379f7a98c9149d4ed072a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:48 2013 +0100 mshtml: insert_adjacent_node clean up. --- dlls/mshtml/htmlelem.c | 105 +++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 208493f..581669c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1087,68 +1087,74 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsIDOMNode *nsnode) +static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode) { - static const WCHAR wszBeforeBegin[] = {'b','e','f','o','r','e','B','e','g','i','n',0}; - static const WCHAR wszAfterBegin[] = {'a','f','t','e','r','B','e','g','i','n',0}; - static const WCHAR wszBeforeEnd[] = {'b','e','f','o','r','e','E','n','d',0}; - static const WCHAR wszAfterEnd[] = {'a','f','t','e','r','E','n','d',0}; + nsIDOMNode *ret_nsnode; nsresult nsres; + HRESULT hres = S_OK; - if (!strcmpiW(where, wszBeforeBegin)) - { - nsIDOMNode *unused; + static const WCHAR beforebeginW[] = {'b','e','f','o','r','e','b','e','g','i','n',0}; + static const WCHAR afterbeginW[] = {'a','f','t','e','r','b','e','g','i','n',0}; + static const WCHAR beforeendW[] = {'b','e','f','o','r','e','e','n','d',0}; + static const WCHAR afterendW[] = {'a','f','t','e','r','e','n','d',0}; + + if (!strcmpiW(where, beforebeginW)) { nsIDOMNode *parent; + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); - if (!parent) return E_INVALIDARG; - nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &unused); - if (unused) nsIDOMNode_Release(unused); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!parent) + return E_INVALIDARG; + + nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &ret_nsnode); nsIDOMNode_Release(parent); - } - else if (!strcmpiW(where, wszAfterBegin)) - { - nsIDOMNode *unused; + }else if(!strcmpiW(where, afterbeginW)) { nsIDOMNode *first_child; - nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); - nsres = nsIDOMNode_InsertBefore(This->node.nsnode, nsnode, first_child, &unused); - if (unused) nsIDOMNode_Release(unused); - if (first_child) nsIDOMNode_Release(first_child); - } - else if (!strcmpiW(where, wszBeforeEnd)) - { - nsIDOMNode *unused; - nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &unused); - if (unused) nsIDOMNode_Release(unused); - } - else if (!strcmpiW(where, wszAfterEnd)) - { - nsIDOMNode *unused; - nsIDOMNode *next_sibling; - nsIDOMNode *parent; - nsIDOMNode_GetParentNode(This->node.nsnode, &parent); - if (!parent) return E_INVALIDARG; - - nsIDOMNode_GetNextSibling(This->node.nsnode, &next_sibling); - if (next_sibling) - { - nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &unused); - nsIDOMNode_Release(next_sibling); + + nsres = nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMNode_InsertBefore(This->node.nsnode, nsnode, first_child, &ret_nsnode); + if(NS_FAILED(nsres)) + return E_FAIL; + + if (first_child) + nsIDOMNode_Release(first_child); + }else if (!strcmpiW(where, beforeendW)) { + nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &ret_nsnode); + }else if (!strcmpiW(where, afterendW)) { + nsIDOMNode *next_sibling, *parent; + + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); + if(NS_FAILED(nsres)) + return E_FAIL; + if(!parent) + return E_INVALIDARG; + + nsres = nsIDOMNode_GetNextSibling(This->node.nsnode, &next_sibling); + if(NS_SUCCEEDED(nsres)) { + if(next_sibling) { + nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &ret_nsnode); + nsIDOMNode_Release(next_sibling); + }else { + nsres = nsIDOMNode_AppendChild(parent, nsnode, &ret_nsnode); + } } - else - nsres = nsIDOMNode_AppendChild(parent, nsnode, &unused); + nsIDOMNode_Release(parent); - if (unused) nsIDOMNode_Release(unused); - } - else - { + }else { ERR("invalid where: %s\n", debugstr_w(where)); return E_INVALIDARG; } if (NS_FAILED(nsres)) return E_FAIL; - else - return S_OK; + + nsIDOMNode_Release(ret_nsnode); + return hres; } static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR where, @@ -1188,9 +1194,8 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode); nsIDOMNode_Release(nsnode); - return hr; } @@ -1221,7 +1226,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w return E_FAIL; } - hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + hr = insert_adjacent_node(This, where, nsnode); nsIDOMNode_Release(nsnode); return hr;

1 0

Piotr Caban : cmd: Fixed memory leak in WCMD_run_program.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 743a42b25907c410069a2730831ff4d844c32b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a42b25907c410069a27308… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:13 2013 +0100 cmd: Fixed memory leak in WCMD_run_program. --- programs/cmd/wcmdmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ee64253..95f2995 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1213,6 +1213,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) Note: Launching internal wine processes cannot specify a full path to exe */ status = CreateProcessW(assumeInternal?NULL : thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); + heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote WCHARacters and try again */

1 0

Jacek Caban : ieframe: Fixed tests on IE10.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 5068bdb6748534c2b7ccd7a8763643021cbf762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5068bdb6748534c2b7ccd7a87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:40:07 2013 +0100 ieframe: Fixed tests on IE10. --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 43f761b..39bc21d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -446,6 +446,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 69: /* TODO */ case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ + case 113: /* TODO (IE10) */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -453,6 +454,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 134: /* TODO (IE10) */ + case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ @@ -950,6 +953,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe CHECK_EXPECT2(Invoke_282); break; + case 290: /* FIXME: IE10 */ + break; + default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); }

1 0

Piotr Caban : msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: d622ffcba08f79631eecdb5f86cd2f04a0ddeab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d622ffcba08f79631eecdb5f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 14:31:41 2013 +0100 msvcrt: Fixed closing of FindFirstFile handle in build_expanded_argv. --- dlls/msvcrt/data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b31e5f7..80e023a 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -431,7 +431,7 @@ static int build_expanded_argv(int *argc, char **argv) args_no++; size += len+path_len; }while(FindNextFileA(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) { @@ -528,7 +528,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) args_no++; size += len+path_len; }while(FindNextFileW(h, &data)); - CloseHandle(h); + FindClose(h); } if(!len) {

1 0

Jacek Caban : mshtml: Fixed handling escaped paths in is_gecko_path.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 46827308158ad290806c099d03fcc89db4644566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46827308158ad290806c099d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 14:14:48 2013 +0100 mshtml: Fixed handling escaped paths in is_gecko_path. --- dlls/mshtml/nsembed.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 7691849..1613fe8 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shlobj.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -1106,12 +1107,14 @@ BOOL is_gecko_path(const char *path) if(!buf || strlenW(buf) < gecko_path_len) return FALSE; - buf[gecko_path_len] = 0; for(ptr = buf; *ptr; ptr++) { if(*ptr == '\\') *ptr = '/'; } + UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE); + buf[gecko_path_len] = 0; + ret = !strcmpiW(buf, gecko_path); heap_free(buf); return ret;

1 0

Jacek Caban : mshtml: Fixed 'adjacent' spelling.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 306cec23cb465632e67ade46c39cc2a92637dc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306cec23cb465632e67ade46c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 15:44:38 2013 +0100 mshtml: Fixed 'adjacent' spelling. --- dlls/mshtml/htmlelem2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 16d5056..dc3ad7f 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1116,7 +1116,7 @@ static HRESULT WINAPI HTMLElement2_get_oncontextmenu(IHTMLElement2 *iface, VARIA return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_insertAdjecentElement(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, BSTR where, IHTMLElement *insertedElement, IHTMLElement **inserted) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1132,14 +1132,14 @@ static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, IHTMLEleme return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_getAdjecentText(IHTMLElement2 *iface, BSTR where, BSTR *text) +static HRESULT WINAPI HTMLElement2_getAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR *text) { HTMLElement *This = impl_from_IHTMLElement2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(where), text); return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_replaceAdjecentText(IHTMLElement2 *iface, BSTR where, +static HRESULT WINAPI HTMLElement2_replaceAdjacentText(IHTMLElement2 *iface, BSTR where, BSTR newText, BSTR *oldText) { HTMLElement *This = impl_from_IHTMLElement2(iface); @@ -1348,10 +1348,10 @@ static const IHTMLElement2Vtbl HTMLElement2Vtbl = { HTMLElement2_mergeAttributes, HTMLElement2_put_oncontextmenu, HTMLElement2_get_oncontextmenu, - HTMLElement2_insertAdjecentElement, + HTMLElement2_insertAdjacentElement, HTMLElement2_applyElement, - HTMLElement2_getAdjecentText, - HTMLElement2_replaceAdjecentText, + HTMLElement2_getAdjacentText, + HTMLElement2_replaceAdjacentText, HTMLElement2_get_canHandleChildren, HTMLElement2_addBehavior, HTMLElement2_removeBehavior,

1 0

Jacek Caban : wininet: Renamed socketFD to socket.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: febbb85528a27be1da825537635fa11a5531e7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febbb85528a27be1da8255376… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:16:17 2013 +0100 wininet: Renamed socketFD to socket. --- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 582599d..2dc1c6c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,8 +89,8 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { + int socket; BOOL secure; - int socketFD; void *ssl_s; server_t *server; DWORD security_flags; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index dc47f2c..e423830 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -610,39 +610,39 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t int result, flag; assert(server->addr_len); - result = netconn->socketFD = socket(server->addr.ss_family, SOCK_STREAM, 0); + result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { flag = 1; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); - result = connect(netconn->socketFD, (struct sockaddr*)&server->addr, server->addr_len); + ioctlsocket(netconn->socket, FIONBIO, &flag); + result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { if (sock_get_error(errno) == WSAEINPROGRESS) { struct pollfd pfd; int res; - pfd.fd = netconn->socketFD; + pfd.fd = netconn->socket; pfd.events = POLLOUT; res = poll(&pfd, 1, timeout); if (!res) { - closesocket(netconn->socketFD); + closesocket(netconn->socket); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socketFD, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) result = 0; } } } if(result == -1) - closesocket(netconn->socketFD); + closesocket(netconn->socket); else { flag = 0; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); + ioctlsocket(netconn->socket, FIONBIO, &flag); } } if(result == -1) @@ -650,7 +650,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t #ifdef TCP_NODELAY flag = 1; - result = setsockopt(netconn->socketFD, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); + result = setsockopt(netconn->socket, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); if(result < 0) WARN("setsockopt(TCP_NODELAY) failed\n"); #endif @@ -681,7 +681,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->socketFD = -1; + netconn->socket = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); @@ -709,7 +709,7 @@ void free_netconn(netconn_t *netconn) } #endif - closesocket(netconn->socketFD); + closesocket(netconn->socket); heap_free(netconn); } @@ -823,7 +823,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } pSSL_set_options(ssl_s, tls_option); - if (!pSSL_set_fd(ssl_s, connection->socketFD)) + if (!pSSL_set_fd(ssl_s, connection->socket)) { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -904,7 +904,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) /* fallback to connect without TLSv1.1/TLSv1.2 */ if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) { - closesocket(connection->socketFD); + closesocket(connection->socket); pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); res = create_netconn_socket(connection->server, connection, 500); if (res != ERROR_SUCCESS) @@ -928,7 +928,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socketFD, msg, len, flags); + *sent = send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS; @@ -966,7 +966,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * if (!connection->secure) { - *recvd = recv(connection->socketFD, buf, len, flags); + *recvd = recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1004,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { #ifdef FIONREAD int unread; - int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread); + int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) { TRACE("%d bytes of queued, but unread data\n", unread); @@ -1030,7 +1030,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1038,13 +1038,13 @@ BOOL NETCON_is_alive(netconn_t *netconn) char b; mode = 1; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK); + len = recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; return len == 1 || (len == -1 && errno == WSAEWOULDBLOCK); @@ -1111,7 +1111,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; } - result = setsockopt(connection->socketFD, SOL_SOCKET, + result = setsockopt(connection->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv)); if (result == -1)

1 0

Jacek Caban : wininet: Renamed useSSL to secure and set it after secure connection is established .
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: c6ee6d6c9e1e200ed5155570dd368d9ca10ac7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ee6d6c9e1e200ed5155570d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:15:53 2013 +0100 wininet: Renamed useSSL to secure and set it after secure connection is established. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 861288d..468fee6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1968,7 +1968,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn->useSSL) + if (req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6d08db1..582599d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,7 +89,7 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { - BOOL useSSL; + BOOL secure; int socketFD; void *ssl_s; server_t *server; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4869d60..dc47f2c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -848,6 +848,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } connection->ssl_s = ssl_s; + connection->secure = TRUE; bits = NETCON_GetCipherStrength(connection); if (bits >= 128) @@ -879,21 +880,20 @@ fail: DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; -#ifdef SONAME_LIBSSL + /* can't connect if we are already connected */ - if (connection->ssl_s) - { + if(connection->secure) { ERR("already connected\n"); return ERROR_INTERNET_CANNOT_CONNECT; } - connection->useSSL = TRUE; if(server != connection->server) { server_release(connection->server); server_addref(server); connection->server = server; } +#ifdef SONAME_LIBSSL /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS) @@ -926,7 +926,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { - if (!connection->useSSL) + if(!connection->secure) { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) @@ -958,13 +958,13 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, - int *recvd /* out */) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd) { *recvd = 0; if (!len) return ERROR_SUCCESS; - if (!connection->useSSL) + + if (!connection->secure) { *recvd = recv(connection->socketFD, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; @@ -1000,7 +1000,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { *available = 0; - if (!connection->useSSL) + if(!connection->secure) { #ifdef FIONREAD int unread;

1 0

Vincent Povirk : mscoree: Keep a reference to mscoree when shutting down.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 276d202e792d78c1298795fa72a95c47a182160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=276d202e792d78c1298795fa7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 28 15:43:25 2013 -0600 mscoree: Keep a reference to mscoree when shutting down. --- dlls/mscoree/metahost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 143494c..6906075 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -313,6 +313,12 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * void unload_all_runtimes(void) { int i; + HMODULE handle; + + /* If the only references to mscoree are through dll's that were loaded by + * Mono, shutting down the Mono runtime will free mscoree, so take a + * reference to prevent that from happening. */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Dmitry Timoshkov : fonts: Add an initial version of Wingdings font.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 1b17f0fd5ded290a332260cad963dac53c08609f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b17f0fd5ded290a332260cad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 1 18:01:58 2013 +0900 fonts: Add an initial version of Wingdings font. This version contains just 3 glyphs which were copied from OpenSymbol font. --- fonts/Makefile.in | 3 +- fonts/wingding.sfd | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/wingding.ttf | Bin 0 -> 4332 bytes 3 files changed, 168 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 47fb8aa..0a9d7a7 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -54,7 +54,8 @@ TRUETYPE_FONTS = \ marlett.ttf \ symbol.ttf \ tahoma.ttf \ - tahomabd.ttf + tahomabd.ttf \ + wingding.ttf FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd new file mode 100644 index 0000000..33573e5 --- /dev/null +++ b/fonts/wingding.sfd @@ -0,0 +1,166 @@ +SplineFontDB: 3.0 +FontName: WineWingdings +FullName: Wingdings +FamilyName: Wingdings +Weight: Regular +Copyright: Copyright (C) 2013 Dmitry Timoshkov +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -170 +UnderlineWidth: 130 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +NeedsXUIDChange: 1 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 33 12 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 256 4 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: ogonek +Encoding: 254 731 1 +Width: 1896 +Flags: W +LayerCount: 2 +Fore +SplineSet +1652 0 m 1,0,-1 + 172 0 l 1,1,-1 + 172 1482 l 1,2,-1 + 1600 1482 l 1,3,-1 + 1732 1560 l 1,4,-1 + 1768 1510 l 1,5,6 + 1729 1487 1729 1487 1652 1416 c 1,7,-1 + 1652 0 l 1,0,-1 +1506 1270 m 1,8,9 + 1113 841 1113 841 902 398 c 1,10,-1 + 700 252 l 1,11,12 + 565 696 565 696 390 768 c 1,13,14 + 489 882 489 882 588 882 c 0,15,16 + 674 882 674 882 790 602 c 1,17,18 + 976 917 976 917 1410 1336 c 1,19,-1 + 320 1336 l 1,20,-1 + 320 148 l 1,21,-1 + 1506 148 l 1,22,-1 + 1506 1270 l 1,8,9 +EndSplineSet +EndChar + +StartChar: registered +Encoding: 168 174 2 +Width: 1884 +Flags: W +LayerCount: 2 +Fore +SplineSet +322 148 m 1,0,-1 + 1506 148 l 1,1,-1 + 1506 1332 l 1,2,-1 + 322 1332 l 1,3,-1 + 322 148 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: G +Encoding: 71 71 3 +Width: 1581 +Flags: HW +LayerCount: 2 +Fore +SplineSet +446 -52 m 0,0,1 + 446 -119 446 -119 566 -150 c 0,2,3 + 647 -172 647 -172 744 -172 c 0,4,5 + 831 -172 831 -172 926 -142 c 0,6,7 + 1052 -103 1052 -103 1052 -40 c 0,8,9 + 1052 -9 1052 -9 1026 6 c 1,10,11 + 1021 -62 1021 -62 906 -96 c 0,12,13 + 824 -120 824 -120 730 -120 c 0,14,15 + 480 -120 480 -120 480 -6 c 1,16,17 + 446 -17 446 -17 446 -52 c 0,0,1 +408 428 m 0,18,19 + 408 347 408 347 504 162 c 1,20,-1 + 516 6 l 1,21,22 + 563 -70 563 -70 760 -70 c 0,23,24 + 868 -70 868 -70 912 -46 c 0,25,26 + 947 -24 947 -24 964 32 c 2,27,-1 + 1010 170 l 1,28,-1 + 1138 492 l 1,29,30 + 1137 665 1137 665 1082 928 c 0,31,32 + 1010 1268 1010 1268 910 1268 c 0,33,34 + 883 1268 883 1268 864 1226 c 0,35,36 + 848 1194 848 1194 848 1164 c 0,37,38 + 848 1087 848 1087 896 818 c 1,39,40 + 856 884 856 884 796 884 c 0,41,42 + 718 884 718 884 706 790 c 1,43,44 + 690 832 690 832 638 832 c 0,45,46 + 580 832 580 832 556 770 c 1,47,-1 + 526 776 l 2,48,49 + 408 776 408 776 408 428 c 0,18,19 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf new file mode 100644 index 0000000..0c963c0 Binary files /dev/null and b/fonts/wingding.ttf differ

1 0

Alessandro Pignotti : quartz: Use the moniker to create the filter directly .
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 1ebed65e924f1981601e56abe3997cbadb3aecc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebed65e924f1981601e56abe… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:13:45 2013 +0100 quartz: Use the moniker to create the filter directly. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 985e568..acd6dca 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1394,13 +1394,13 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG pin; hr = GetFilterInfo(pMoniker, &clsid, &var); - IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr);

1 0

Nikolay Sivov : msxml3: Don' t make a variant copy if no need to for setting node value.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: d4d92616b9ebc0c93354ebb2c435a85264ec8b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d92616b9ebc0c93354ebb2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 09:02:49 2013 +0400 msxml3: Don't make a variant copy if no need to for setting node value. --- dlls/msxml3/node.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4508609..be47a75 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -282,36 +282,48 @@ static HRESULT node_set_content_escaped(xmlnode *This, LPCWSTR value) HRESULT node_put_value(xmlnode *This, VARIANT *value) { - VARIANT string_value; HRESULT hr; - VariantInit(&string_value); - hr = VariantChangeType(&string_value, value, 0, VT_BSTR); - if(FAILED(hr)) { - WARN("Couldn't convert to VT_BSTR\n"); - return hr; - } + if (V_VT(value) != VT_BSTR) + { + VARIANT string_value; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, value, 0, VT_BSTR); + if(FAILED(hr)) { + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } - hr = node_set_content(This, V_BSTR(&string_value)); - VariantClear(&string_value); + hr = node_set_content(This, V_BSTR(&string_value)); + VariantClear(&string_value); + } + else + hr = node_set_content(This, V_BSTR(value)); return hr; } HRESULT node_put_value_escaped(xmlnode *This, VARIANT *value) { - VARIANT string_value; HRESULT hr; - VariantInit(&string_value); - hr = VariantChangeType(&string_value, value, 0, VT_BSTR); - if(FAILED(hr)) { - WARN("Couldn't convert to VT_BSTR\n"); - return hr; - } + if (V_VT(value) != VT_BSTR) + { + VARIANT string_value; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, value, 0, VT_BSTR); + if(FAILED(hr)) { + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } - hr = node_set_content_escaped(This, V_BSTR(&string_value)); - VariantClear(&string_value); + hr = node_set_content_escaped(This, V_BSTR(&string_value)); + VariantClear(&string_value); + } + else + hr = node_set_content_escaped(This, V_BSTR(value)); return hr; }

1 0

Andrew Talbot : kernel32/tests: Do not assume the signedness of plain char.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 64c6c08e088d1d53d9f038d7167c6531f2ce365a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c6c08e088d1d53d9f038d71… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 28 22:47:11 2013 +0000 kernel32/tests: Do not assume the signedness of plain char. --- dlls/kernel32/tests/codepage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index c980348..36ea66d 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -285,7 +285,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); ok(ret == 1, "ret is %d\n", ret); - ok(mbc == -28, "mbc is %d\n", mbc); + ok(mbc == '\xe4', "mbc is %d\n", mbc); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); @@ -301,7 +301,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); ok(ret == 1, "ret is %d\n", ret); - ok(mbc == -16, "mbc is %d\n", mbc); + ok(mbc == '\xf0', "mbc is %d\n", mbc); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == 0), /* win95 */

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: e458665a42aec77e4d4560df712062c4c80a30fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e458665a42aec77e4d4560df7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 28 22:47:14 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/converter.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 975730a..f0730d7 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -93,7 +93,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -160,7 +160,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -223,7 +223,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -283,7 +283,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -325,7 +325,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -378,7 +378,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -420,7 +420,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -468,7 +468,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -516,7 +516,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -564,7 +564,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -607,7 +607,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -655,7 +655,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -674,7 +674,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -696,7 +696,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -740,7 +740,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -838,7 +838,7 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); if (SUCCEEDED(hr) && prc) { - UINT x, y; + INT x, y; for (y=0; y<prc->Height; y++) for (x=0; x<prc->Width; x++) @@ -879,7 +879,7 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -947,7 +947,7 @@ static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRec if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow;

1 0

Alessandro Pignotti : quartz: It' s not guaranteed that filters have a GUID in the property bag.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: d1ff1c049550aeead52dabb87ce269eb0aa8123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ff1c049550aeead52dabb87… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:26:48 2013 +0100 quartz: It's not guaranteed that filters have a GUID in the property bag. --- dlls/quartz/filtergraph.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6b53d72..53556cf 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -808,9 +808,8 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) return hr; } -static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) +static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) { - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; IPropertyBag * pPropBagCat = NULL; HRESULT hr; @@ -820,18 +819,10 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); - - if (SUCCEEDED(hr)) - hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); - - VariantClear(pvar); - - if (SUCCEEDED(hr)) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s\n", debugstr_w(V_UNION(pvar, bstrVal))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -1024,7 +1015,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; - hr = GetFilterInfo(pMoniker, &clsid, &var); + hr = GetFilterInfo(pMoniker, &var); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; @@ -1395,13 +1386,12 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, &nb) == S_OK) { VARIANT var; - GUID clsid; IPin* ppinfilter; IBaseFilter* pfilter = NULL; IEnumPins* penumpins = NULL; ULONG pin; - hr = GetFilterInfo(pMoniker, &clsid, &var); + hr = GetFilterInfo(pMoniker, &var); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error;

1 0

Alessandro Pignotti : quartz: Get the CLSID directly from the filter.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 3271406502115910454d1838570e9d13daa71bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3271406502115910454d18385… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:21:48 2013 +0100 quartz: Get the CLSID directly from the filter. --- dlls/quartz/filtergraph.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index acd6dca..6b53d72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1025,14 +1025,28 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IAMGraphBuilderCallback *callback = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); - IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; } + hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + IMoniker_Release(pMoniker); + if (FAILED(hr)) { + WARN("Unable to create filter (%x), trying next one\n", hr); + goto error; + } + + hr = IBaseFilter_GetClassID(pfilter, &clsid); + if (FAILED(hr)) + { + IBaseFilter_Release(pfilter); + goto error; + } + if (IsEqualGUID(&clsid, &FilterCLSID)) { /* Skip filter (same as the one the output pin belongs to) */ + IBaseFilter_Release(pfilter); goto error; } @@ -1052,12 +1066,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); - if (FAILED(hr)) { - WARN("Unable to create filter (%x), trying next one\n", hr); - goto error; - } - if (callback) { HRESULT rc;

1 0

Nikolay Sivov : msxml3: Escape value for attribute in put_value().
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: c9563be542a8bbdb918efcbb4270ba0fe54c854b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9563be542a8bbdb918efcbb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:09:25 2013 +0400 msxml3: Escape value for attribute in put_value(). --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index d461ce1..9ab3035 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -603,7 +603,7 @@ static HRESULT WINAPI domattr_put_value( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); - return node_put_value(&This->node, &value); + return node_put_value_escaped(&This->node, &value); } static const struct IXMLDOMAttributeVtbl domattr_vtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2ff78c2..c1bfc1a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8046,10 +8046,15 @@ static void test_put_nodeTypedValue(void) static void test_get_xml(void) { static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n"; + static const char attrA[] = "attr=\""a & b"\""; + static const char attr2A[] = "\"a & b\""; + static const char attr3A[] = "attr=\"&quot;a\""; + static const char attr4A[] = ""a"; static const char fooA[] = "<foo/>"; IXMLDOMProcessingInstruction *pi; IXMLDOMNode *first; IXMLDOMElement *elem = NULL; + IXMLDOMAttribute *attr; IXMLDOMDocument *doc; VARIANT_BOOL b; VARIANT v; @@ -8105,6 +8110,51 @@ static void test_get_xml(void) SysFreeString(xml); IXMLDOMElement_Release(elem); + + /* attribute node */ + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("\"a & b\""); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attrA), (sizeof(attrA)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr2A), (sizeof(attr2A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(""a"); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attr3A), (sizeof(attr3A)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr4A), (sizeof(attr4A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Jörg Höhle : wineoss: Add midi MTC Quarter Frame support (on output).
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 702fe6738b1091eb6f58735ed75e8c67d58f76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702fe6738b1091eb6f58735ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 26 11:18:36 2013 +0100 wineoss: Add midi MTC Quarter Frame support (on output). --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 11b7c91..2b3d433 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1445,7 +1445,6 @@ static DWORD modData(WORD wDevID, DWORD dwParam) switch (evt & 0x0F) { case 0x00: /* System Exclusive, don't do it on modData, * should require modLongData*/ - case 0x01: /* Undefined */ case 0x04: /* Undefined. */ case 0x05: /* Undefined. */ case 0x07: /* End of Exclusive. */ @@ -1470,6 +1469,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) SEQ_MIDIOUT(dev, 0x01); SEQ_MIDIOUT(dev, 0xf7); break; + case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1);

1 0

Jörg Höhle : winealsa: Reword some MIDI log messages.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 2bc23b0c55fc50a468959c8bc4334a2e15d1a98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc23b0c55fc50a468959c8bc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 19 20:43:09 2013 +0100 winealsa: Reword some MIDI log messages. --- dlls/winealsa.drv/midi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ee975e3..11b0f30 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -118,9 +118,6 @@ static HANDLE hThread; * Low level MIDI implementation * *======================================================================*/ -static int midiOpenSeq(int); -static int midiCloseSeq(void); - #if 0 /* Debug Purpose */ static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) { @@ -246,21 +243,21 @@ static int midiOpenSeq(int create_client) if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); #else port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port created successfully (%d)\n", port_in); + TRACE("Input port %d created successfully\n", port_in); #endif } } @@ -413,7 +410,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) break; } if (toSend != 0) { - TRACE("Sending event %08x (from %d %d)\n", toSend, ev->source.client, ev->source.port); + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } @@ -485,7 +482,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; - TRACE("input port connected %d %d %d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); + TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { end_thread = 0; @@ -761,8 +758,9 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; + TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -999,7 +997,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); snd_seq_event_output_direct(midiSeq, &event); HeapFree(GetProcessHeap(), 0, lpNewData);

1 0

Nikolay Sivov : msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 2907ad98c03090377a810346bececf1cd992f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907ad98c03090377a810346b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 09:08:33 2013 +0400 msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect. --- dlls/msxml3/element.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4892920..929830b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1228,7 +1228,6 @@ static HRESULT WINAPI domelem_setAttribute( xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; HRESULT hr; - VARIANT var; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value)); @@ -1236,16 +1235,25 @@ static HRESULT WINAPI domelem_setAttribute( if ( !element ) return E_FAIL; - VariantInit(&var); - hr = VariantChangeType(&var, &value, 0, VT_BSTR); - if(hr != S_OK) + if (V_VT(&value) != VT_BSTR) { - FIXME("VariantChangeType failed\n"); - return hr; + VARIANT var; + + VariantInit(&var); + hr = VariantChangeType(&var, &value, 0, VT_BSTR); + if (hr != S_OK) + { + FIXME("VariantChangeType failed\n"); + return hr; + } + + xml_value = xmlchar_from_wchar(V_BSTR(&var)); + VariantClear(&var); } + else + xml_value = xmlchar_from_wchar(V_BSTR(&value)); xml_name = xmlchar_from_wchar( name ); - xml_value = xmlchar_from_wchar( V_BSTR(&var) ); if ((local = xmlSplitQName2(xml_name, &prefix))) { @@ -1268,7 +1276,6 @@ static HRESULT WINAPI domelem_setAttribute( heap_free(xml_value); heap_free(xml_name); - VariantClear(&var); return hr; }

1 0

Nikolay Sivov : msxml3: Remove unneeded cast to xmlDocPtr.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: a935a44b441a586e4a8044fa5ad423b532349415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a935a44b441a586e4a8044fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 28 22:44:02 2013 +0400 msxml3: Remove unneeded cast to xmlDocPtr. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 32e9591..67902bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -632,7 +632,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) static inline xmlDocPtr get_doc( domdoc *This ) { - return (xmlDocPtr)This->node.node; + return This->node.node->doc; } static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml )

1 0

Jörg Höhle : winmm: Prevent some MIDI race conditions.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: b0fc000ce1fef6067d921040965e055f5e09d926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc000ce1fef6067d9210409… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 23 09:47:27 2013 +0100 winmm: Prevent some MIDI race conditions. --- dlls/winealsa.drv/midi.c | 37 ++++++++++++++++--------------------- dlls/wineoss.drv/midi.c | 17 ++++++----------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 11b0f30..748fa79 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -389,9 +389,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) * to handle the case where ALSA split the sysex into several events */ if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } } else { @@ -478,6 +478,16 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } + MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + + MidiInDev[wDevID].lpQueueHdr = NULL; + MidiInDev[wDevID].dwTotalPlayed = 0; + MidiInDev[wDevID].bufsize = 0x3FFF; + MidiInDev[wDevID].midiDesc = *lpDesc; + MidiInDev[wDevID].state = 0; + MidiInDev[wDevID].incLen = 0; + MidiInDev[wDevID].startTime = 0; + /* Connect our app port to the device port */ if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; @@ -497,16 +507,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Created thread for midi-in\n"); } - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; - MidiInDev[wDevID].startTime = 0; - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } @@ -644,12 +644,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -726,10 +725,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 2b3d433..bd013e1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -563,9 +563,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } if (sbfb && lpMidiHdr != NULL) { lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -906,12 +906,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -1102,10 +1101,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0;

1 0