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

Lucas Zawacki : Portuguese translation for release 1.5.25 ( resend with small correction)
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 93a47eeefe71235942074de740c6c209f558ea6c URL: http://source.winehq.org/git/website.git/?a=commit;h=93a47eeefe71235942074d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Mar 18 13:42:26 2013 -0300 Portuguese translation for release 1.5.25 (resend with small correction) --- news/pt/2013030101.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013030101.xml b/news/pt/2013030101.xml new file mode 100644 index 0000000..9fd4a6d --- /dev/null +++ b/news/pt/2013030101.xml @@ -0,0 +1,14 @@ +<news> +<date>1 de Março de 2013</date> +<title>Wine 1.5.25 lançado</title> +<body> + A versão de desenvolvimento 1.5.25 já está disponível agora. + <a href="{$root}/announce/1.5.25">Novidades</a> desta versão: +<ul> + <li>Suporte adequado ao cursor no driver de Mac.</li> + <li>Correções no suporte a escrita direita-para-esquerda no RichEdit.</li> + <li>Versão inicial de uma fonte Wingdings.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 82991652b5c02862c526df19e90d3bb2a5788f7a URL: http://source.winehq.org/git/website.git/?a=commit;h=82991652b5c02862c526df… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Mar 18 13:28:17 2013 -0300 Portuguese translation for release 1.5.26 --- news/pt/2013031501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2013031501.xml b/news/pt/2013031501.xml new file mode 100644 index 0000000..fc9db96 --- /dev/null +++ b/news/pt/2013031501.xml @@ -0,0 +1,16 @@ +<news> +<date>15 de Março de 2013</date> +<title>Wine 1.5.26 lançado</title> +<body> + A versão de desenvolvimento 1.5.26 já está disponível agora. + <a href="{$root}/announce/1.5.26">Novidades</a> desta versão: +<ul> + <li>Suporte a OpenGL no driver para Mac.</li> + <li>Suporte a área de transferência e drag&drop no driver para Mac.</li> + <li>Melhorias na cache de URLs.</li> + <li>Algumas correções em binários ARM.</li> + <li>Fim do suporte à plataforma SPARC.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.26 freigegeben
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 7c8cf53b5f15fdd95c4dfa38fbae802f3fff8f8c URL: http://source.winehq.org/git/website.git/?a=commit;h=7c8cf53b5f15fdd95c4dfa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 16 15:31:51 2013 +0100 Wine 1.5.26 freigegeben --- news/de/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2013031501.xml b/news/de/2013031501.xml new file mode 100644 index 0000000..9891453 --- /dev/null +++ b/news/de/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>15. März 2013</date> +<title>Wine 1.5.26 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.26 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.26">Neuerungen (en)</a> in dieser Version: +<ul> + <li>OpenGL Unterstützung im Mac Treiber.</li> + <li>Zwischenablage und Drag&Drop Unterstützung im Mac Treiber.</li> + <li>Verbesserungen am URL Cache.</li> + <li>Einige Fehlerbehebungen für ARM Binaries.</li> + <li>SPARC Plattform wird nicht länger Unterstützt.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: e81f79a5f651540a4cbc090a1c0a6e4acd54239a URL: http://source.winehq.org/git/website.git/?a=commit;h=e81f79a5f651540a4cbc09… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 15 23:55:39 2013 +0100 French translation for release 1.5.26 --- news/fr/2013031501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2013031501.xml b/news/fr/2013031501.xml new file mode 100644 index 0000000..a42046a --- /dev/null +++ b/news/fr/2013031501.xml @@ -0,0 +1,16 @@ +<news> +<date>15 mars 2013</date> +<title>Sortie de Wine 1.5.26</title> +<body> + La version de développement 1.5.26 de Wine est disponible. + <a href="{$root}/announce/1.5.26">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge d'OpenGL dans le pilote Mac.</li> + <li>Prise en charge du presse-papiers et du glisser-déposer dans le pilote Mac.</li> + <li>Améliorations au cache d'URL.</li> + <li>Plusieurs correctifs pour les binaires ARM.</li> + <li>Suppression de la prise en charge de la plate-forme SPARC.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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

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

March 18, 2013

Module: website Branch: master Commit: 8a1e8e555bd13aa47ff5c2398e857ab42e9e02c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=8a1e8e555bd13aa47ff5c2… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 17 06:52:34 2013 +0100 Polish translation for release 1.5.26 --- news/pl/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013031501.xml b/news/pl/2013031501.xml new file mode 100644 index 0000000..6dc9824 --- /dev/null +++ b/news/pl/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>Marzec 15, 2013</date> +<title>Wydano Wine 1.5.26</title> +<body> + Wydanie rozwojowe Wine 1.5.26 jest już dostępne. + <a href="{$root}/announce/1.5.26">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla OpenGL w sterowniku Mac.</li> + <li>Wsparcie dla schowka oraz przeciągania i upuszczania w sterowniku Mac.</li> + <li>Ulepszenia w pamięci podręcznej adresów URL.</li> + <li>Kilka poprawek w plikach binarnych ARM.</li> + <li>Zaprzestanie wsparcia dla platformy SPARC.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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

Jactry Zeng : Simplified Chinese translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: ddb8a0f8cc3c9ddee5323b59c4dc0f67c38b9b47 URL: http://source.winehq.org/git/website.git/?a=commit;h=ddb8a0f8cc3c9ddee5323b… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 16 23:36:20 2013 +0800 Simplified Chinese translation for release 1.5.26 --- news/zh-cn/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013031501.xml b/news/zh-cn/2013031501.xml new file mode 100644 index 0000000..88490f2 --- /dev/null +++ b/news/zh-cn/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>三月 15, 2013</date> +<title>Wine 1.5.26 发布</title> +<body> + Wine 开发版 1.5.26 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.26">更新</a>： +<ul> + <li>Mac 后端驱动对 OpenGL 的支持。</li> + <li>Mac 后端驱动对剪贴板和拖放的支持。</li> + <li>对 URL cache 的改进。</li> + <li>针对 ARM 二进制的一些修复。</li> + <li>不再支持 SPARC 平台。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.26
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: website Branch: master Commit: e340c245acc0761b6c4dbd01be73c98a51fdba11 URL: http://source.winehq.org/git/website.git/?a=commit;h=e340c245acc0761b6c4dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:42:24 2013 +0100 Wine release 1.5.26 --- news/en/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013031501.xml b/news/en/2013031501.xml new file mode 100644 index 0000000..fce9941 --- /dev/null +++ b/news/en/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>March 15, 2013</date> +<title>Wine 1.5.26 Released</title> +<body> + The Wine development release 1.5.26 is now available. + <a href="{$root}/announce/1.5.26">What's new</a> in this release: +<ul> + <li>OpenGL support in the Mac driver.</li> + <li>Clipboard and drag&drop support in the Mac driver.</li> + <li>Improvements to the URL cache.</li> + <li>Some fixes for ARM binaries.</li> + <li>SPARC platform no longer supported.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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.26 : Alexandre Julliard : Release 1.5.26
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: refs/tags/wine-1.5.26 Tag: b4c349e950e458863c62112cbcf32735b29333ff URL: http://source.winehq.org/git/wine.git/?a=tag;h=b4c349e950e458863c62112cbcf3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26

1 0

Alexandre Julliard : Release 1.5.26.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 99982f886f039241425623c0076dc9ae70b9ef6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99982f886f039241425623c00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26. --- ANNOUNCE | 703 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99982f886f03924142562…

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 support.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: d3e8d44e9c0535b8ff520917163cec9b5eae823f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e8d44e9c0535b8ff5209171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:15 2013 +0100 mshtml: Added HTMLElementEvents2 support. --- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/mshtml_private.h | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 02c1538..db4b8e7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1679,6 +1679,8 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve return S_OK; } +cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; + const cpc_entry_t HTMLElement_cpc[] = { HTMLELEMENT_CPC, {NULL} diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 19446ad..9ea1708 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -883,12 +883,20 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) return hres; } -static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, VARIANT *retv) +static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_obj, VARIANT *retv) { DISPPARAMS dp = {NULL,NULL,0,0}; + VARIANT event_arg; ULONG argerr; EXCEPINFO ei; + if(event_obj) { + V_VT(&event_arg) = VT_DISPATCH; + V_DISPATCH(&event_arg) = (IDispatch*)&event_obj->IHTMLEventObj_iface; + dp.rgvarg = &event_arg; + dp.cArgs = 1; + } + memset(&ei, 0, sizeof(ei)); return IDispatch_Invoke(disp, dispid, &IID_NULL, 0, DISPATCH_METHOD, &dp, retv, &ei, &argerr); } @@ -1019,7 +1027,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&v) = VT_EMPTY; TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, &v); + hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, + cp->data->pass_event_arg ? event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a2a9436..d0bb68e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -114,6 +114,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLUnknownElement) \ XDIID(DispHTMLWindow2) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLElementEvents2) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAttributeCollection) \ XIID(IHTMLAttributeCollection2) \ @@ -430,6 +431,7 @@ typedef enum { typedef struct _cp_static_data_t { tid_t tid; void (*on_advise)(IUnknown*,struct _cp_static_data_t*); + BOOL pass_event_arg; DWORD id_cnt; DISPID *ids; } cp_static_data_t; @@ -666,7 +668,8 @@ typedef struct { IHTMLElement3_tid, \ IHTMLElement4_tid -#define HTMLELEMENT_CPC {NULL} +extern cp_static_data_t HTMLElementEvents2_data; +#define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} extern const cpc_entry_t HTMLElement_cpc[]; typedef struct {

1 0

Jacek Caban : mshtml: Use lazy allocation for connection points.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: af6c518e7d25f33aa80a5c4d8ac6add2fb0a8040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c518e7d25f33aa80a5c4d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:53 2013 +0100 mshtml: Use lazy allocation for connection points. --- dlls/mshtml/conpoint.c | 100 +++++++++++++++++++++++++++-------------- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlbody.c | 12 +++-- dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmldoc.c | 16 +++++-- dlls/mshtml/htmlelem.c | 11 ++++- dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlevent.c | 56 ++++++++++++------------ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 2 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 3 + dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 10 +++- dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextcont.c | 2 - dlls/mshtml/htmltextnode.c | 3 + dlls/mshtml/mshtml_private.h | 28 ++++++------ dlls/mshtml/mutation.c | 2 +- dlls/mshtml/persist.c | 2 +- 32 files changed, 174 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af6c518e7d25f33aa80a5…

1 0

Alistair Leslie-Hughes : msxml3: Implment IXMLParser SetInput.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 6f2f577fa5c77ddd8f1790ee142c92ec1c460967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f577fa5c77ddd8f1790ee1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 15 16:16:02 2013 +1100 msxml3: Implment IXMLParser SetInput. --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 46812c8..51f2a27 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -135,6 +135,9 @@ static void create_test(void) ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); ok(nodefactory == &thenodefactory, "expected NULL\n"); + hr = IXMLParser_SetInput(parser, NULL); + ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_SetFactory(parser, NULL); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 154e439..4c91a1e 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -47,6 +47,7 @@ typedef struct _xmlparser { IXMLParser IXMLParser_iface; IXMLNodeFactory *nodefactory; + IUnknown *input; LONG ref; int flags; @@ -96,6 +97,9 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + if(This->input) + IUnknown_Release(This->input); + if(This->nodefactory) IXMLNodeFactory_Release(This->nodefactory); @@ -246,9 +250,18 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p %p)\n", This, pStm); + TRACE("(%p %p)\n", This, pStm); - return E_NOTIMPL; + if(!pStm) + return E_INVALIDARG; + + if(This->input) + IUnknown_Release(This->input); + + This->input = pStm; + IUnknown_AddRef(This->input); + + return S_OK; } static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData, @@ -435,6 +448,7 @@ HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj) This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl; This->nodefactory = NULL; + This->input = NULL; This->flags = 0; This->ref = 1;

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges shouldn' t add margins to string bounds.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: db746fe8970058b369c23ddbc62a147b9abfba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db746fe8970058b369c23ddbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:37:53 2013 +0900 gdiplus: GdipMeasureCharacterRanges shouldn't add margins to string bounds. --- dlls/gdiplus/graphics.c | 5 ----- dlls/gdiplus/tests/graphics.c | 8 +------- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb3f228..93f85b1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4684,11 +4684,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Y = layoutRect->Y * args.rel_height; scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - if (scaled_rect.Width >= 0.5) - { - scaled_rect.Width -= margin_x * 2.0 * args.rel_width; - if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ - } get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fe525b6..4df2119 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4033,11 +4033,8 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); todo_wine expectf_(height - margin_y, bounds.Height, 1.0); @@ -4071,13 +4068,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); -todo_wine expectf(height_rgn, bounds.Height); set_rect_empty(&rect); @@ -4234,6 +4227,7 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); +todo_wine expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0);

1 0

Francois Gouget : msvcr110: Remove an unused debug channel.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 534410b8320b8c8ffff9226df3263fc57eb75d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=534410b8320b8c8ffff9226df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 15 02:50:09 2013 +0100 msvcr110: Remove an unused debug channel. --- dlls/msvcr110/msvcr110.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 70c03d2..ba943b0 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,9 +23,6 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcr110); /********************************************************************* * DllMain (MSVCR110.@)

1 0

Jacek Caban : mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3:: getElementsByTagName implementation.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 1d05cd515c168e45d38f344952b27b406ad07bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d05cd515c168e45d38f34495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:23 2013 +0100 mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3::getElementsByTagName implementation. --- dlls/mshtml/htmldoc3.c | 7 ++----- dlls/mshtml/tests/dom.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4b9b12e..de5cdab 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -566,9 +566,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, { HTMLDocument *This = impl_from_IHTMLDocument3(iface); nsIDOMNodeList *nslist; - nsAString id_str, ns_str; + nsAString id_str; nsresult nsres; - static const WCHAR str[] = {'*',0}; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); @@ -578,10 +577,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, } nsAString_InitDepend(&id_str, v); - nsAString_InitDepend(&ns_str, str); - nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->doc_node->nsdoc, &ns_str, &id_str, &nslist); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); nsAString_Finish(&id_str); - nsAString_Finish(&ns_str); if(FAILED(nsres)) { ERR("GetElementByName failed: %08x\n", nsres); return E_FAIL; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d2be89f..2e4e3d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6281,7 +6281,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - str = a2bstr("img"); + str = a2bstr("Img"); hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); SysFreeString(str);

1 0

Jacek Caban : wininet: Use parsed status_code to test for CONTINUE HTTP response.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: c6005aabcdb76afb8b0bc5592171d84b0c9fd0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6005aabcdb76afb8b0bc5592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 11:46:22 2013 +0100 wininet: Use parsed status_code to test for CONTINUE HTTP response. --- dlls/wininet/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a3f68ae..d0ed459 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5680,7 +5680,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); do { - static const WCHAR szHundred[] = {'1','0','0',0}; /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ @@ -5716,7 +5715,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) TRACE("version [%s] status code [%s] status text [%s]\n", debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); - codeHundred = (!strcmpW(status_code, szHundred)); + codeHundred = request->status_code == HTTP_STATUS_CONTINUE; } else if (!codeHundred) {

1 0

Marcus Meissner : quartz: Free wszPatternString (Coverity).
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 2d05c24a1e7a9ea2f9d82c7e8fba46151bf93efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05c24a1e7a9ea2f9d82c7e8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:47 2013 +0100 quartz: Free wszPatternString (Coverity). --- dlls/quartz/filesource.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 95e146d..aee6d97 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -335,12 +335,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } - if (strcmpW(wszValueName, source_filter_name)==0) + if (strcmpW(wszValueName, source_filter_name)==0) { + HeapFree(GetProcessHeap(), 0, wszPatternString); continue; + } /* if it is not the source filter value */ if (process_pattern_string(wszPatternString, pReader) == S_OK) { + HeapFree(GetProcessHeap(), 0, wszPatternString); if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) break; if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) @@ -354,8 +357,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } bFound = TRUE; - } - HeapFree(GetProcessHeap(), 0, wszPatternString); + } else + HeapFree(GetProcessHeap(), 0, wszPatternString); } CloseHandle(hkeyMinor); }

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 tests.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 3c4e4ee3c0d04d2bf53cc4e50e635c40b1d25a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4e4ee3c0d04d2bf53cc4e50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:31 2013 +0100 mshtml: Added HTMLElementEvents2 tests. --- dlls/mshtml/tests/events.c | 74 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6d74f40..8e9d88c9 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -82,6 +82,7 @@ DEFINE_EXPECT(submit_onclick_cancel); DEFINE_EXPECT(submit_onclick_attached); DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); +DEFINE_EXPECT(elem2_cp_onclick); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -1239,6 +1240,31 @@ static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); } +#define test_cp_eventarg(a,b,c,d,e,f) _test_cp_eventarg(__LINE__,a,b,c,d,e,f) +static void _test_cp_eventarg(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +{ + IHTMLEventObj *event; + + ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); + ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); + ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); + ok_(__FILE__,line)(V_VT(vres) == VT_EMPTY, "V_VT(vres) = %d\n", V_VT(vres)); + ok_(__FILE__,line)(ei != NULL, "ei == NULL\n"); + ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); + + ok(V_VT(dp->rgvarg) == VT_DISPATCH, "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + ok(V_DISPATCH(dp->rgvarg) != NULL, "V_DISPATCH(dp->rgvarg) = %p\n", V_DISPATCH(dp->rgvarg)); + + event = _get_event_obj(line); + ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); + IHTMLEventObj_Release(event); +} + static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) @@ -1278,6 +1304,24 @@ static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMemb CONNECTION_POINT_OBJ(doccp_onclick_cancel, DIID_HTMLDocumentEvents); +static HRESULT WINAPI elem2_cp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(elem2_cp_onclick); + test_cp_eventarg(riid, wFlags, pdp, pVarResult, pei, puArgErr); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(elem2_cp, DIID_HTMLElementEvents2); + static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -1492,8 +1536,8 @@ static IDispatch EventDispatch = { &EventDispatchVtbl }; static void test_onclick(IHTMLDocument2 *doc) { + DWORD cp_cookie, elem2_cp_cookie; IHTMLElement *div, *body; - DWORD cp_cookie; VARIANT v; HRESULT hres; @@ -1638,6 +1682,34 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(doccp_onclick); CHECK_CALLED(invoke_onclick); + elem2_cp_cookie = register_cp((IUnknown*)div, &DIID_HTMLElementEvents2, (IUnknown*)&elem2_cp_obj); + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_disp); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(elem2_cp_onclick); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + SET_EXPECT(doc_onclick_attached); + SET_EXPECT(doccp_onclick); + SET_EXPECT(invoke_onclick); + + trace("click >>>\n"); + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + trace("click <<<\n"); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_disp); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(elem2_cp_onclick); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + CHECK_CALLED(doc_onclick_attached); + CHECK_CALLED(doccp_onclick); + CHECK_CALLED(invoke_onclick); + + unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); V_VT(&v) = VT_NULL;

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 02f2ab943777840176bc7ee552826e7933be7aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f2ab943777840176bc7ee55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 15 10:39:00 2013 +0100 winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO. --- dlls/winhttp/session.c | 94 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++ include/winhttp.h | 16 +++++++ 3 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d43b225..394fddd 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -25,6 +25,11 @@ #include "windef.h" #include "winbase.h" +#ifndef __MINGW32__ +#define USE_WS_PREFIX +#endif +#include "winsock2.h" +#include "ws2ipdef.h" #include "winhttp.h" #include "wincrypt.h" #include "winreg.h" @@ -587,6 +592,71 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } +static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +{ +#ifndef __MINGW32__ + switch (addr->sa_family) + { + case AF_INET: + { + const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; + struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; + char *p; + + addr_win->sin_family = WS_AF_INET; + addr_win->sin_port = addr_unix->sin_port; + memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); + p = (char *)&addr_win->sin_addr + 4; + memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); + return TRUE; + } + case AF_INET6: + { + const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; + struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; + + addr_win->sin6_family = WS_AF_INET6; + addr_win->sin6_port = addr_unix->sin6_port; + addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; + memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + addr_win->sin6_scope_id = addr_unix->sin6_scope_id; +#else + addr_win->sin6_scope_id = 0; +#endif + memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#else + switch (addr->sa_family) + { + case AF_INET: + { + struct sockaddr_in *addr_in = (struct sockaddr_in *)addr_storage; + + memcpy( addr_in, addr, sizeof(*addr_in) ); + memset( addr_in + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in) ); + return TRUE; + } + case AF_INET6: + { + struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr_storage; + + memcpy( addr_in6, addr, sizeof(*addr_in6) ); + memset( addr_in6 + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in6) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#endif +} + static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { request_t *request = (request_t *)hdr; @@ -683,6 +753,30 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(DWORD); return TRUE; } + case WINHTTP_OPTION_CONNECTION_INFO: + { + WINHTTP_CONNECTION_INFO *info = buffer; + struct sockaddr local; + socklen_t len = sizeof(local); + const struct sockaddr *remote = (const struct sockaddr *)&request->connect->sockaddr; + + if (!buffer || *buflen < sizeof(*info)) + { + *buflen = sizeof(*info); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!netconn_connected( &request->netconn )) + { + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + if (getsockname( request->netconn.socket, &local, &len )) return FALSE; + if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + info->cbSize = sizeof(*info); + return TRUE; + } case WINHTTP_OPTION_RESOLVE_TIMEOUT: *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index fd0db18..b03e108 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -23,6 +23,8 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> @@ -2019,6 +2021,65 @@ static void test_bad_header( int port ) WinHttpCloseHandle( ses ); } +static void test_connection_info( int port ) +{ + static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; + HINTERNET ses, con, req; + WINHTTP_CONNECTION_INFO info; + DWORD size, error; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, basicW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + size = sizeof(info); + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + if (!ret && error == ERROR_INVALID_PARAMETER) + { + win_skip( "WINHTTP_OPTION_CONNECTION_INFO not supported\n" ); + return; + } + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + size = 0; + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_credentials(void) { static WCHAR userW[] = {'u','s','e','r',0}; @@ -2768,6 +2829,7 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; + test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_basic_authentication(si.port); diff --git a/include/winhttp.h b/include/winhttp.h index cf0da83..9247abf 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -19,6 +19,12 @@ #ifndef __WINE_WINHTTP_H #define __WINE_WINHTTP_H +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack4.h> +#endif + #define WINHTTPAPI #define BOOLAPI WINHTTPAPI BOOL WINAPI @@ -527,6 +533,14 @@ typedef struct DWORD dwMinorVersion; } HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; +#ifdef _WS2DEF_ +typedef struct +{ + DWORD cbSize; + SOCKADDR_STORAGE LocalAddress; + SOCKADDR_STORAGE RemoteAddress; +} WINHTTP_CONNECTION_INFO; +#endif #ifdef __cplusplus extern "C" { @@ -565,4 +579,6 @@ BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); } #endif +#include <poppack.h> + #endif /* __WINE_WINHTTP_H */

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified .
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 6ab04040e52465e77558a067309e8a54bdc0f32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab04040e52465e77558a0673… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:38:21 2013 +0900 gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified. Unlike GdipMeasureString which always treats empty layout extents as infinite. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 21 +++++++++++++-------- dlls/gdiplus/graphicspath.c | 3 ++- dlls/gdiplus/tests/graphics.c | 8 -------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 87f3b8b..f2214b5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -442,7 +442,7 @@ typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 93f85b1..10a6402 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4418,7 +4418,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) { WCHAR* stringdup; @@ -4441,6 +4441,11 @@ GpStatus gdip_format_string(HDC hdc, nwidth = rect->Width; nheight = rect->Height; + if (ignore_empty_clip) + { + if (!nwidth) nwidth = INT_MAX; + if (!nheight) nheight = INT_MAX; + } if (format) hkprefix = format->hkprefix; @@ -4698,7 +4703,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, - measure_ranges_callback, &args); + (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -4806,8 +4811,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -4822,7 +4827,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.linesfilled = &lines; lines = glyphs = 0; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); if (linesfilled) *linesfilled = lines; @@ -4979,8 +4984,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) @@ -5005,7 +5010,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); DeleteObject(rgn); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index f4d1a4b..62f8490 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1009,7 +1009,8 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); + status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, + format, TRUE, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4df2119..cbe0b9d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4050,13 +4050,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf(width_rgn, bounds.Width); -todo_wine expectf(height_rgn, bounds.Height); rect.X = 5.0; @@ -4247,9 +4243,7 @@ todo_wine expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); /* Far alignment */ @@ -4317,9 +4311,7 @@ todo_wine expectf_(5.0 - width_rgn, bounds.X, 2.0); todo_wine expectf_(5.0 - height_rgn, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); status = GdipDeleteFont(font);

1 0

Marcus Meissner : msxml3: Initialize hr (Coverity).
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 5d0ae3d112c9e109e14870795389497fba92966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0ae3d112c9e109e14870795… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:45 2013 +0100 msxml3: Initialize hr (Coverity). --- dlls/msxml3/element.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 70360e5..20cd9b7 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1243,7 +1243,7 @@ static HRESULT WINAPI domelem_setAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value));

1 0

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

March 15, 2013

Module: wine Branch: master Commit: f3790542d502f8e79d677fbe3e1afbd7980229e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3790542d502f8e79d677fbe3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 14 21:04:24 2013 +0000 user32: Avoid signed-unsigned integer comparisons. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b587e63..0a38440 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4701,7 +4701,7 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod */ static int MENU_depth( POPUPMENU *pmenu, int depth) { - int i; + UINT i; MENUITEM *item; int subdepth;

1 0

Francois Gouget : testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: ce43ff14cd99a98408a17b35eda843372b6789bb URL: http://source.winehq.org/git/tools.git/?a=commit;h=ce43ff14cd99a98408a17b35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 21:57:36 2013 +0100 testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified. --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 232e767..11c355f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = CreateJobs(); + my $Jobs = WineTestBot::Jobs::CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - ScheduleJobs(); + WineTestBot::Jobs::ScheduleJobs(); return undef; }

1 0

Jacek Caban : mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 532de89170c697c77765ef1c345596d4b1488950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532de89170c697c77765ef1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:00 2013 +0100 mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations. --- include/mshtmdid.h | 9 +++++ include/mshtml.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 08dd25d..e57a3f8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2432,6 +2432,15 @@ #define DISPID_IHTMLTEXTAREAELEMENT_WRAP DISPID_RICHTEXT+3 #define DISPID_IHTMLTEXTAREAELEMENT_CREATETEXTRANGE DISPID_RICHTEXT+6 +/* IHTMLButtonElement */ +#define DISPID_IHTMLBUTTONELEMENT_TYPE DISPID_INPUT +#define DISPID_IHTMLBUTTONELEMENT_VALUE DISPID_A_VALUE +#define DISPID_IHTMLBUTTONELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLBUTTONELEMENT_STATUS DISPID_BUTTON+1 +#define DISPID_IHTMLBUTTONELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLBUTTONELEMENT_FORM DISPID_SITE+4 +#define DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE DISPID_BUTTON+2 + /* IHTMLInputElement */ #define DISPID_IHTMLINPUTELEMENT_TYPE DISPID_INPUT #define DISPID_IHTMLINPUTELEMENT_VALUE DISPID_A_VALUE diff --git a/include/mshtml.idl b/include/mshtml.idl index e1caea4..f64eb98 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10139,6 +10139,95 @@ methods: } /***************************************************************************** + * IHTMLButtonElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2bb-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLButtonElement : IDispatch +{ + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([in] VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + HRESULT form([out, retval] IHTMLFormElement **p); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + HRESULT createTextRange([out, retval] IHTMLTxtRange **range); +} + +/***************************************************************************** + * DispHTMLButtonElement dispinterface + */ +[ + hidden, + uuid(3050f51f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLButtonElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + BSTR type(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + void value(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + BSTR value(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + void status(VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + VARIANT status(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + IHTMLFormElement *form(); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + IHTMLTxtRange *createTextRange(); +} + +/***************************************************************************** * IHTMLHeadElement interface */ [

1 0

Piotr Caban : msvcrt: Limit access to out buffer in fread function.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 027d9852105d515196f7c6271d76b8c5316e47cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=027d9852105d515196f7c6271… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 14 13:13:44 2013 +0100 msvcrt: Limit access to out buffer in fread function. DVDFab HD Decrypter expects that unused part of output buffer is not modified. --- dlls/msvcrt/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4561711..28aefc1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -35,6 +35,7 @@ # include <unistd.h> #endif #include <sys/types.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -3652,10 +3653,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm while(rcnt>0) { int i; - /* Fill the buffer on small reads. - * TODO: Use a better buffering strategy. - */ - if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF) + if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && !(file->_flag & MSVCRT__IONBF) && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; @@ -3670,8 +3668,12 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm file->_cnt -= i; file->_ptr += i; } + } else if (rcnt > UINT_MAX) { + i = MSVCRT__read(file->_file, ptr, UINT_MAX); + } else if (rcnt < MSVCRT_BUFSIZ) { + i = MSVCRT__read(file->_file, ptr, rcnt); } else { - i = MSVCRT__read(file->_file,ptr, rcnt); + i = MSVCRT__read(file->_file, ptr, rcnt - MSVCRT_BUFSIZ/2); } pread += i; rcnt -= i;

1 0