February 2013 - Wine-commits

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute:: get_nodeName in detached attributes.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 06666c266d4ae59d62deea1cbaed0f8db3b760bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=06666c266d4ae59d62deea1cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:27 2013 +0100 mshtml: Added support for IHTMLDOMAttribute::get_nodeName in detached attributes. --- dlls/mshtml/htmlattr.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 4c4d8a4..1b01662 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -126,8 +126,13 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; + if(!This->name) { + FIXME("No name available\n"); + return E_FAIL; + } + + *p = SysAllocString(This->name); + return *p ? S_OK : E_OUTOFMEMORY; } return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p);

1 0

Jacek Caban : mshtml: Added IHTMLDocument5::createAttribute tests.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 5ffeb458d864ef50b2778145c5f04edef277dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffeb458d864ef50b2778145c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:38 2013 +0100 mshtml: Added IHTMLDocument5::createAttribute tests. --- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5ee0261..2013b53 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2609,6 +2609,18 @@ static void test_dynamic_properties(IHTMLElement *elem) SysFreeString(attr1); } +#define test_attr_node_name(a,b) _test_attr_node_name(__LINE__,a,b) +static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const char *exname) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDOMAttribute_get_nodeName(attr, &str); + ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exname), "node name is %s, expected %s\n", wine_dbgstr_w(str), exname); + SysFreeString(str); +} + static void test_attr_collection_disp(IDispatch *disp) { IDispatchEx *dispex; @@ -2647,10 +2659,9 @@ static void test_attr_collection_disp(IDispatch *disp) ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLDOMAttribute, (void**)&attr); ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); - hres = IHTMLDOMAttribute_get_nodeName(attr, &bstr); - ok(hres == S_OK, "get_nodeName failed: %08x\n", hres); - ok(!strcmp_wa(bstr, "attr1"), "node name is %s, expected attr1\n", wine_dbgstr_w(bstr)); - SysFreeString(bstr); + + test_attr_node_name(attr, "attr1"); + IHTMLDOMAttribute_Release(attr); VariantClear(&var); @@ -6399,6 +6410,7 @@ static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node, *node2, *node3, *comment; + IHTMLDOMAttribute *attr; IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; @@ -6490,6 +6502,20 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(comment); } + str = a2bstr("Test"); + hres = IHTMLDocument5_createAttribute(doc5, str, &attr); + ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); + SysFreeString(str); + if(SUCCEEDED(hres)) { + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + test_attr_node_name(attr, "Test"); + + IHTMLDOMAttribute_Release(attr); + } + IHTMLDocument5_Release(doc5); }

1 0

Piotr Caban : msvcrt: Mark gmtime32 tests with negative argument as broken on win8.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 61f82d6d02eb34333de9c45561e47f68fb6f1d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f82d6d02eb34333de9c4556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 20 15:53:24 2013 +0100 msvcrt: Mark gmtime32 tests with negative argument as broken on win8. --- dlls/msvcrt/tests/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index b9bc7f1..30d9fa7 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -109,7 +109,7 @@ static void test_gmtime(void) gmt = -1; gmt_tm = p_gmtime32(&gmt); - ok(gmt_tm == NULL, "gmt_tm != NULL\n"); + ok(gmt_tm==NULL || broken(gmt_tm->tm_year==70 && gmt_tm->tm_sec<0), "gmt_tm != NULL\n"); gmt = valid = 0; gmt_tm = p_gmtime32(&gmt); @@ -181,9 +181,12 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(err == EINVAL, "err = %d\n", err); - ok(errno == EINVAL, "errno = %d\n", errno); - ok(gmt_tm_s.tm_year == -1, "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), + "tm_year = %d\n", gmt_tm_s.tm_year); + if(gmt_tm_s.tm_year == -1) { + ok(err==EINVAL, "err = %d\n", err); + ok(errno==EINVAL, "errno = %d\n", errno); + } } static void test_mktime(void)

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC for font enumeration.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 97b92fe12c35673a9234f990b8f66797cc58c603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b92fe12c35673a9234f990b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:17:36 2013 +0800 gdiplus: Use an off-screen DC for font enumeration. --- dlls/gdiplus/font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6e31331..51c7aec 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -979,12 +979,12 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, *IsStyleAvailable = FALSE; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) *IsStyleAvailable = TRUE; - ReleaseDC(0, hdc); + DeleteDC(hdc); return Ok; } @@ -1276,7 +1276,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); @@ -1288,7 +1288,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } return Ok; } @@ -1403,7 +1403,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lfw.lfFaceName[0] = 0; @@ -1416,7 +1416,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } *fontCollection = &installedFontCollection;

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC as an image surface.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 0553eba08f15a321838f34e7aac15ead64c2cb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0553eba08f15a321838f34e7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:13 2013 +0800 gdiplus: Use an off-screen DC as an image surface. --- dlls/gdiplus/image.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9c34333..59ea41c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -116,10 +116,9 @@ static INT ipicture_pixel_height(IPicture *pic) IPicture_get_Height(pic, &y); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); y = MulDiv(y, GetDeviceCaps(hdcref, LOGPIXELSY), INCH_HIMETRIC); - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return y; } @@ -131,11 +130,9 @@ static INT ipicture_pixel_width(IPicture *pic) IPicture_get_Width(pic, &x); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); x = MulDiv(x, GetDeviceCaps(hdcref, LOGPIXELSX), INCH_HIMETRIC); - - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return x; } @@ -1688,7 +1685,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biClrUsed = 0; bih.biClrImportant = 0; - screendc = GetDC(0); + screendc = CreateCompatibleDC(0); if (iinfo.hbmColor) { GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); @@ -1756,7 +1753,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } } - ReleaseDC(0, screendc); + DeleteDC(screendc); DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); @@ -1806,14 +1803,14 @@ static void generate_halftone_palette(ARGB *entries, UINT count) static GpStatus get_screen_resolution(REAL *xres, REAL *yres) { - HDC screendc = GetDC(0); + HDC screendc = CreateCompatibleDC(0); if (!screendc) return GenericError; *xres = (REAL)GetDeviceCaps(screendc, LOGPIXELSX); *yres = (REAL)GetDeviceCaps(screendc, LOGPIXELSY); - ReleaseDC(0, screendc); + DeleteDC(screendc); return Ok; }

1 0

Dmitry Timoshkov : gdiplus: Use an off-screen DC to trace a path.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 42a5943598eb908686e27554c2882617b6445bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a5943598eb908686e27554c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 20 14:18:56 2013 +0800 gdiplus: Use an off-screen DC to trace a path. --- dlls/gdiplus/region.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f7bad57..5583514 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -894,7 +894,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (!graphics) { - new_hdc = GetDC(0); + new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; @@ -902,13 +902,13 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) graphics = new_graphics; if (stat != Ok) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); return stat; } } else if (!graphics->hdc) { - graphics->hdc = new_hdc = GetDC(0); + graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; } @@ -929,7 +929,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) RestoreDC(graphics->hdc, save_state); if (new_hdc) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); if (new_graphics) GdipDeleteGraphics(new_graphics); else

1 0

Nozomi Kodama : d3dx9: Specify arguments in trace to ease debugging.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: bd5921814003a162edd20f811e48629614974f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5921814003a162edd20f811… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:43:29 2013 -1000 d3dx9: Specify arguments in trace to ease debugging. --- dlls/d3dx9_36/math.c | 174 +++++++++++++++++++++++++------------------------ 1 files changed, 89 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd5921814003a162edd20…

1 0

Nozomi Kodama : d3dx9: Add a missing trace.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: f9347a8f0ea4c356d8cbed7b2c2e3f35f57d87c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9347a8f0ea4c356d8cbed7b2… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 22:52:42 2013 -1000 d3dx9: Add a missing trace. --- dlls/d3dx9_36/math.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 0afb36b..10623f7 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1743,6 +1743,9 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2* out, UINT outstride D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { const D3DXVECTOR2 v = *pv; + + TRACE("pout %p, pv %p, pm %p", pout, pv, pm); + pout->x = pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y; pout->y = pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y; return pout;

1 0

Nozomi Kodama : d3dx9: Avoid useless computations.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: de852879d1c9c3678307bb94ed2dda4b3a6d66fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de852879d1c9c3678307bb94e… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Fri Feb 15 23:04:25 2013 -1000 d3dx9: Avoid useless computations. --- dlls/d3dx9_36/math.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 10623f7..69c3297 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -388,10 +388,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, c D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2) { + D3DXMATRIX temp; + int i, j; + TRACE("pout %p, pm1 %p, pm2 %p\n", pout, pm1, pm2); - D3DXMatrixMultiply(pout, pm1, pm2); - D3DXMatrixTranspose(pout, pout); + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + temp.u.m[j][i] = pm1->u.m[i][0] * pm2->u.m[0][j] + pm1->u.m[i][1] * pm2->u.m[1][j] + pm1->u.m[i][2] * pm2->u.m[2][j] + pm1->u.m[i][3] * pm2->u.m[3][j]; + + *pout = temp; return pout; }

1 0

Lucas Zawacki : Portuguese translation for release 1.5.23
by Jeremy Newman 20 Feb '13

20 Feb '13

Module: website Branch: master Commit: 3e7366ced286b7c72bfe9d3b9f23a3f8951e4baf URL: http://source.winehq.org/git/website.git/?a=commit;h=3e7366ced286b7c72bfe9d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Feb 19 13:50:04 2013 -0300 Portuguese translation for release 1.5.23 --- news/pt/2013020101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013020101.xml b/news/pt/2013020101.xml new file mode 100644 index 0000000..f35e476 --- /dev/null +++ b/news/pt/2013020101.xml @@ -0,0 +1,15 @@ +<news> +<date>1 de Fevereiro de 2013</date> +<title>Wine 1.5.23 lançado</title> +<body> + A versão de desenvolvimento 1.5.23 já está disponível agora. + <a href="{$root}/announce/1.5.23">Novidades</a> desta versão: +<ul> + <li>Suporte a HTTPS independentemente do OpenSSL.</li> + <li>Suporte a manipulação de eventos no driver de Mac.</li> + <li>Uma aplicação Netstat funcional embutida.</li> + <li>Várias funções matemáticas do runtime C++.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.23.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