November 2013 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDocument3:: getElementsByName implementation.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: f3a2cb7bbd1ad25b078fdc9b4404dee0f0de33ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a2cb7bbd1ad25b078fdc9b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 15:50:15 2013 +0100 mshtml: Added IHTMLDocument3::getElementsByName implementation. --- dlls/mshtml/htmldoc3.c | 39 ++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index de5cdab..9637e99 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -536,8 +536,43 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST IHTMLElementCollection **ppelColl) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), ppelColl); - return E_NOTIMPL; + nsIDOMNodeList *node_list; + nsAString selector_str; + WCHAR *selector; + nsresult nsres; + + static const WCHAR formatW[] = {'*','[','i','d','=','%','s',']',',','*','[','n','a','m','e','=','%','s',']',0}; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), ppelColl); + + if(!This->doc_node || !This->doc_node->nsdoc) { + /* We should probably return an empty collection. */ + FIXME("No nsdoc\n"); + return E_NOTIMPL; + } + + selector = heap_alloc(2*SysStringLen(v)*sizeof(WCHAR) + sizeof(formatW)); + if(!selector) + return E_OUTOFMEMORY; + sprintfW(selector, formatW, v, v); + + /* + * NOTE: IE getElementsByName implementation differs from Gecko. It searches both name and id attributes. + * That's why we use CSS selector instead. We should also use name only when it applies to given element + * types and search should be case insensitive. Those are currently not supported properly. + */ + nsAString_InitDepend(&selector_str, selector); + nsres = nsIDOMNodeSelector_QuerySelectorAll(This->doc_node->nsnode_selector, &selector_str, &node_list); + nsAString_Finish(&selector_str); + heap_free(selector); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *ppelColl = create_collection_from_nodelist(This->doc_node, node_list); + nsIDOMNodeList_Release(node_list); + return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf72873..6e6b01a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -759,6 +759,18 @@ static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) return elem; } +#define get_doc3_iface(u) _get_doc3_iface(__LINE__,u) +static IHTMLDocument3 *_get_doc3_iface(unsigned line, IHTMLDocument2 *doc) +{ + IHTMLDocument3 *doc3; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08x\n", hres); + + return doc3; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -6737,6 +6749,54 @@ static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) } } +#define doc_get_elems_by_name(a,b) _doc_get_elems_by_name(__LINE__,a,b) +static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocument2 *doc, const char *name) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, doc); + IHTMLElementCollection *col; + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLDocument3_getElementsByName(doc3, str, &col); + ok_(__FILE__,line)(hres == S_OK, "getElementsByName failed: %08x\n", hres); + ok_(__FILE__,line)(col != NULL, "col = NULL\n"); + + IHTMLDocument3_Release(doc3); + SysFreeString(str); + return col; +} + +static void test_elem_names(IHTMLDocument2 *doc) +{ + IHTMLElementCollection *col; + IHTMLElement *body; + LONG len; + HRESULT hres; + + static const elem_type_t test1_types[] = {ET_INPUT, ET_A, ET_DIV}; + + body = doc_get_body(doc); + + test_elem_set_innerhtml((IUnknown*)body, + "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); + col = doc_get_elems_by_name(doc, "test"); + test_elem_collection((IUnknown*)col, test1_types, sizeof(test1_types)/sizeof(*test1_types)); + IHTMLElementCollection_Release(col); + + col = doc_get_elems_by_name(doc, "yyy"); + test_elem_collection((IUnknown*)col, NULL, 0); + IHTMLElementCollection_Release(col); + + /* case insensivity test */ + col = doc_get_elems_by_name(doc, "Xxx"); + hres = IHTMLElementCollection_get_length(col, &len); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + todo_wine ok(len == 1, "len = %d\n", len); + IHTMLElementCollection_Release(col); + + IHTMLElement_Release(body); +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6825,6 +6885,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_attr(div); test_blocked(doc, div); + test_elem_names(doc); IHTMLElement_Release(div); }

1 0

Vincent Povirk : windowscodecs: Implement IPropertyBag2_Write_Proxy.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 25264f0b11f3cb483dad644eb18f1c8257ef0543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25264f0b11f3cb483dad644eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 15 13:10:45 2013 -0600 windowscodecs: Implement IPropertyBag2_Write_Proxy. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 91fb6e6..9d1c5df 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -37,6 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IPropertyBag2_Write_Proxy(IPropertyBag2 *iface, + ULONG cProperties, PROPBAG2 *ppropbag, VARIANT *pvarValue) +{ + return IPropertyBag2_Write(iface, cProperties, ppropbag, pvarValue); +} + HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 9497aec..81a827e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -4,7 +4,7 @@ @ stdcall -private DllUnregisterServer() @ stub IEnumString_Next_WIC_Proxy @ stub IEnumString_Reset_WIC_Proxy -@ stub IPropertyBag2_Write_Proxy +@ stdcall IPropertyBag2_Write_Proxy(ptr long ptr ptr) @ stdcall IWICBitmapClipper_Initialize_Proxy(ptr ptr ptr) IWICBitmapClipper_Initialize_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportAnimation_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportLossless_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportLossless_Proxy_W

1 0

Vincent Povirk : explorer: Use StrRetToStrW to convert STRRET result.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: cd1abd68c3bd48267f96403e9ed937e1a11911db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1abd68c3bd48267f96403e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 14:50:51 2013 -0500 explorer: Use StrRetToStrW to convert STRRET result. --- programs/explorer/explorer.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1df781c..d01a3c3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -118,20 +118,13 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag HICON icon; strret.uType=STRRET_WSTR; hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + if(SUCCEEDED(hres)) + hres = StrRetToStrW(&strret, pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - switch(strret.uType) - { - case STRRET_WSTR: - item->pszText = strret.u.pOleStr; - break; - default: - WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType); - break; - } hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, &reserved,(void**)&extract_icon); if(SUCCEEDED(hres))

1 0

Vincent Povirk : gdiplus: Allow excluding from infinite regions.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 1202e9af56521f7362e8e1183923ad8ec851949e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202e9af56521f7362e8e1183… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 11:46:30 2013 -0500 gdiplus: Allow excluding from infinite regions. --- dlls/gdiplus/region.c | 8 +++--- dlls/gdiplus/tests/region.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 832ce69..4ba86eb 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -988,8 +988,8 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeIntersect: return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); case CombineModeXor: case CombineModeExclude: - FIXME("cannot exclude from an infinite region\n"); - /* fall-through */ + left = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + break; case CombineModeUnion: case CombineModeComplement: *hrgn = NULL; return Ok; @@ -1013,8 +1013,8 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = left; return Ok; case CombineModeXor: case CombineModeComplement: - FIXME("cannot exclude from an infinite region\n"); - /* fall-through */ + right = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + break; case CombineModeUnion: case CombineModeExclude: DeleteObject(left); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 66d950a..5632e4d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2082,6 +2082,56 @@ static void test_isvisiblerect(void) ReleaseDC(0, hdc); } +static void test_excludeinfinite(void) +{ + GpStatus status; + GpRegion *region; + UINT count=0xdeadbeef; + GpRectF scans[4]; + GpMatrix *identity; + static const RectF rect_exclude = {0.0, 0.0, 1.0, 1.0}; + + status = GdipCreateMatrix(&identity); + expect(Ok, status); + + status = GdipCreateRegion(&region); + expect(Ok, status); + + status = GdipCombineRegionRect(region, &rect_exclude, CombineModeExclude); + expect(Ok, status); + + status = GdipGetRegionScansCount(region, &count, identity); + expect(Ok, status); + expect(4, count); + + count = 4; + status = GdipGetRegionScans(region, scans, (INT*)&count, identity); + expect(Ok, status); + + expectf(-4194304.0, scans[0].X); + expectf(-4194304.0, scans[0].Y); + expectf(8388608.0, scans[0].Width); + expectf(4194304.0, scans[0].Height); + + expectf(-4194304.0, scans[1].X); + expectf(0.0, scans[1].Y); + expectf(4194304.0, scans[1].Width); + expectf(1.0, scans[1].Height); + + expectf(1.0, scans[2].X); + expectf(0.0, scans[2].Y); + expectf(4194303.0, scans[2].Width); + expectf(1.0, scans[2].Height); + + expectf(-4194304.0, scans[3].X); + expectf(1.0, scans[3].Y); + expectf(8388608.0, scans[3].Width); + expectf(4194303.0, scans[3].Height); + + GdipDeleteRegion(region); + GdipDeleteMatrix(identity); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2107,6 +2157,7 @@ START_TEST(region) test_getbounds(); test_isvisiblepoint(); test_isvisiblerect(); + test_excludeinfinite(); GdiplusShutdown(gdiplusToken); }

1 0

Volkan Gezer : Turkish translation update for release 1.6.1
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: a8efd10c5f02b890fc89011b0555716c62ab15fe URL: http://source.winehq.org/git/website.git/?a=commit;h=a8efd10c5f02b890fc8901… Author: Volkan Gezer <vlkngzr(a)gmail.com> Date: Sun Nov 17 15:11:56 2013 +0100 Turkish translation update for release 1.6.1 --- news/tr/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/tr/2013111501.xml b/news/tr/2013111501.xml new file mode 100644 index 0000000..030a83a --- /dev/null +++ b/news/tr/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>15 Kasım 2013</date> +<title>Wine 1.6.1 Yayınlandı</title> +<body> + Wine bakım sürümü 1.6.1 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.6.1">yenilikler</a>: +<ul> + <li>Çeviri güncellemeleri.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6.1
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: e287ca516dd16346c38238a156725d74eeb35886 URL: http://source.winehq.org/git/website.git/?a=commit;h=e287ca516dd16346c38238… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Nov 17 09:50:30 2013 +0100 Polish translation for release 1.6.1 --- news/pl/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/pl/2013111501.xml b/news/pl/2013111501.xml new file mode 100644 index 0000000..784e312 --- /dev/null +++ b/news/pl/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>Listopad 15, 2013</date> +<title>Wydano Wine 1.6.1</title> +<body> + Poprawione wydanie Wine 1.6.1 jest już dostępne. + <a href="{$root}/announce/1.6.1">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.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

Frédéric Delanoy : Add French lang page
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: 3d9febb82bba94b5617672c453e553f97cae8820 URL: http://source.winehq.org/git/website.git/?a=commit;h=3d9febb82bba94b5617672… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 16 10:29:39 2013 +0100 Add French lang page --- templates/fr/lang.template | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/templates/fr/lang.template b/templates/fr/lang.template new file mode 100644 index 0000000..69fb1ba --- /dev/null +++ b/templates/fr/lang.template @@ -0,0 +1,12 @@ + + + + + +<h1 class="title">{$langChange}</h1> + +Langue actuelle : {$langCur} + +<ul style="list-style: none; margin-left: 20px; padding: 0;"> + +</ul>

1 0

Frédéric Delanoy : French translation for release 1.6.1
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: 7480e0b6b030ec5a6deb5228e606d6e579b7133b URL: http://source.winehq.org/git/website.git/?a=commit;h=7480e0b6b030ec5a6deb52… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 16 01:03:08 2013 +0100 French translation for release 1.6.1 --- news/fr/2013111501.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/fr/2013111501.xml b/news/fr/2013111501.xml new file mode 100644 index 0000000..d9f1663 --- /dev/null +++ b/news/fr/2013111501.xml @@ -0,0 +1,12 @@ +<news> +<date>15 novembre 2013</date> +<title>Sortie de Wine 1.6.1</title> +<body> + La version de maintenance 1.6.1 de Wine est disponible. + <a href="{$root}/announce/1.6.1">Nouveautés</a> de cette version : +<ul> + <li>Mises à jour de traductions</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.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

Andrey Gusev : Ukrainian translation for release 1.6.1
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: 5f241038722f88e52fd51c74bfb6735bb6f3079c URL: http://source.winehq.org/git/website.git/?a=commit;h=5f241038722f88e52fd51c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 16 00:41:15 2013 +0200 Ukrainian translation for release 1.6.1 --- news/uk/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/uk/2013111501.xml b/news/uk/2013111501.xml new file mode 100644 index 0000000..4d553b1 --- /dev/null +++ b/news/uk/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>15 листопада 2013</date> +<title>Випущено Wine 1.6.1</title> +<body> + Технічний реліз Wine 1.6.1 наразі доступний. + <a href="{$root}/announce/1.6.1">Що нового</a> в цьому релізі: +<ul> + <li>Оновлення перекладів.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.6.1
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: 409d1ff51babe1774af1002fd3d41aa725fb10ed URL: http://source.winehq.org/git/website.git/?a=commit;h=409d1ff51babe1774af100… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Nov 18 12:53:56 2013 -0200 Portuguese translation for release 1.6.1 --- news/pt/2013111501.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pt/2013111501.xml b/news/pt/2013111501.xml new file mode 100644 index 0000000..bec2b7b --- /dev/null +++ b/news/pt/2013111501.xml @@ -0,0 +1,12 @@ +<news> +<date>15 de Novembro de 2013</date> +<title>Wine 1.6.1 lançado</title> +<body> + A versão de manutenção 1.6.1 já está disponível agora. + <a href="{$root}/announce/1.6.1">Novidades</a> desta versão: +<ul> + <li>Traduções atualizadas.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.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