April 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use return_nsstr helper in more functions.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 16a5a5c91b1142adbfbb7b274eacc338a399c4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a5a5c91b1142adbfbb7b274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:20:25 2012 +0200 mshtml: Use return_nsstr helper in more functions. --- dlls/mshtml/htmlframebase.c | 34 +++++++--------------------------- dlls/mshtml/htmlimg.c | 30 +++++------------------------- dlls/mshtml/htmlinput.c | 28 ++-------------------------- dlls/mshtml/htmlnode.c | 26 +++++--------------------- dlls/mshtml/htmloption.c | 24 ++---------------------- dlls/mshtml/htmlscript.c | 10 +--------- dlls/mshtml/htmlselect.c | 28 ++-------------------------- dlls/mshtml/htmltextarea.c | 28 ++-------------------------- dlls/mshtml/htmlwindow.c | 20 +------------------- 9 files changed, 27 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16a5a5c91b1142adbfbb7…

1 0

Jacek Caban : mshtml: Use return_nsstr helper in HTMLElement object implementation.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 29fbc70267059289d5d81823dd461c207ab27d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fbc70267059289d5d81823d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:02:31 2012 +0200 mshtml: Use return_nsstr helper in HTMLElement object implementation. --- dlls/mshtml/htmlelem.c | 72 ++++++----------------------------------------- dlls/mshtml/htmlelem2.c | 28 ++++------------- 2 files changed, 16 insertions(+), 84 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1baf9e2..02a49d2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -352,7 +352,6 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) HTMLElement *This = impl_from_IHTMLElement(iface); nsAString class_str; nsresult nsres; - HRESULT hres = S_OK; TRACE("(%p)->(%p)\n", This, p); @@ -363,20 +362,7 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) nsAString_Init(&class_str, NULL); nsres = nsIDOMHTMLElement_GetClassName(This->nselem, &class_str); - - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *class; - nsAString_GetData(&class_str, &class); - *p = *class ? SysAllocString(class) : NULL; - }else { - ERR("GetClassName failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&class_str); - - TRACE("className=%s\n", debugstr_w(*p)); - return hres; + return return_nsstr(nsres, &class_str, p); } static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) @@ -404,34 +390,24 @@ static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - const PRUnichar *id; nsAString id_str; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(!This->nselem) + if(!This->nselem) { + *p = NULL; return S_OK; + } nsAString_Init(&id_str, NULL); nsres = nsIDOMHTMLElement_GetId(This->nselem, &id_str); - nsAString_GetData(&id_str, &id); - - if(NS_FAILED(nsres)) - ERR("GetId failed: %08x\n", nsres); - else if(*id) - *p = SysAllocString(id); - - nsAString_Finish(&id_str); - return S_OK; + return return_nsstr(nsres, &id_str, p); } static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - const PRUnichar *tag; nsAString tag_str; nsresult nsres; @@ -443,21 +419,12 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) WARN("NULL nselem, assuming comment\n"); *p = SysAllocString(comment_tagW); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } nsAString_Init(&tag_str, NULL); nsres = nsIDOMHTMLElement_GetTagName(This->nselem, &tag_str); - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&tag_str, &tag); - *p = SysAllocString(tag); - }else { - ERR("GetTagName failed: %08x\n", nsres); - *p = NULL; - } - nsAString_Finish(&tag_str); - - return S_OK; + return return_nsstr(nsres, &tag_str, p); } static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLElement **p) @@ -787,17 +754,7 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) nsAString_Init(&title_str, NULL); nsres = nsIDOMHTMLElement_GetTitle(This->nselem, &title_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *title; - - nsAString_GetData(&title_str, &title); - *p = *title ? SysAllocString(title) : NULL; - }else { - ERR("GetTitle failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + return return_nsstr(nsres, &title_str, p); } static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) @@ -1018,18 +975,7 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) nsAString_Init(&html_str, NULL); nsres = nsIDOMHTMLElement_GetInnerHTML(This->nselem, &html_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *html; - - nsAString_GetData(&html_str, &html); - *p = *html ? SysAllocString(html) : NULL; - }else { - FIXME("SetInnerHtml failed %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&html_str); - return S_OK; + return return_nsstr(nsres, &html_str, p); } static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 2538b55..9362805 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -978,32 +978,18 @@ static HRESULT WINAPI HTMLElement2_put_dir(IHTMLElement2 *iface, BSTR v) static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); + nsAString dir_str; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(This->nselem) { - nsAString dir_str; - nsresult nsres; - - nsAString_Init(&dir_str, NULL); - - nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *dir; - nsAString_GetData(&dir_str, &dir); - if(*dir) - *p = SysAllocString(dir); - }else { - ERR("GetDir failed: %08x\n", nsres); - } - - nsAString_Finish(&dir_str); + if(!This->nselem) { + *p = NULL; + return S_OK; } - TRACE("ret %s\n", debugstr_w(*p)); - return S_OK; + nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); + return return_nsstr(nsres, &dir_str, p); } static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDispatch **range)

1 0

Jacek Caban : mshtml: Use return_nsstr helper in IHTMLBodyElement:: get_background implementation.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: b43cd188df54e2546d8b03e2b49842ac6ee29d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43cd188df54e2546d8b03e2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:02:11 2012 +0200 mshtml: Use return_nsstr helper in IHTMLBodyElement::get_background implementation. --- dlls/mshtml/htmlbody.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d96142a..fb22128 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -293,21 +293,8 @@ static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BS TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&background_str, NULL); - nsres = nsIDOMHTMLBodyElement_GetBackground(This->nsbody, &background_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *background; - nsAString_GetData(&background_str, &background); - *p = *background ? SysAllocString(background) : NULL; - }else { - ERR("GetBackground failed: %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&background_str); - - TRACE("*p = %s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &background_str, p); } static HRESULT WINAPI HTMLBodyElement_put_bgProperties(IHTMLBodyElement *iface, BSTR v)

1 0

Alexandre Julliard : gdi32: Map all the points at once in PolyPolyline, similarly to what PolyPolygon does.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: ea5fa7ddbef2ac8bbbfc12fee12a1761573d99a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5fa7ddbef2ac8bbbfc12fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:39:06 2012 +0200 gdi32: Map all the points at once in PolyPolyline, similarly to what PolyPolygon does. --- dlls/gdi32/dibdrv/graphics.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 5cffeac..d29c405 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -949,19 +949,21 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - DWORD max_points = 0, i; + DWORD total, pos, i; POINT *points; BOOL ret = TRUE; HRGN outline = 0; - for (i = 0; i < polylines; i++) + for (i = total = 0; i < polylines; i++) { if (counts[i] < 2) return FALSE; - max_points = max( counts[i], max_points ); + total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; + memcpy( points, pt, total * sizeof(*pt) ); + LPtoDP( dev->hdc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { @@ -969,14 +971,11 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO return FALSE; } - for (i = 0; i < polylines; i++) + for (i = pos = 0; i < polylines; i++) { - memcpy( points, pt, counts[i] * sizeof(*pt) ); - pt += counts[i]; - LPtoDP( dev->hdc, points, counts[i] ); - reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE, outline ); + pdev->pen_lines( pdev, counts[i], points + pos, FALSE, outline ); + pos += counts[i]; } if (outline)

1 0

Henri Verbeet : d3d9: Use the wined3d declaration to retrieve the FVF in IDirect3DDevice9Impl_GetFVF ().
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 81ed6e0c86108a640f741d0a6bc6e3622a4ce90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ed6e0c86108a640f741d0a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:02 2012 +0200 d3d9: Use the wined3d declaration to retrieve the FVF in IDirect3DDevice9Impl_GetFVF(). --- dlls/d3d9/device.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 440533c..b265d82 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2236,32 +2236,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(IDirect3DDevice9Ex *iface, DWO return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(IDirect3DDevice9Ex *iface, DWORD *pFVF) +static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) { - IDirect3DVertexDeclaration9 *decl; + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_vertex_declaration *wined3d_declaration; + IDirect3DVertexDeclaration9Impl *d3d9_declaration; HRESULT hr; - TRACE("iface %p, fvf %p.\n", iface, pFVF); + TRACE("iface %p, fvf %p.\n", iface, fvf); - hr = IDirect3DDevice9_GetVertexDeclaration(iface, &decl); - if (FAILED(hr)) + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_get_vertex_declaration(device->wined3d_device, &wined3d_declaration))) { - WARN("Failed to get vertex declaration, %#x\n", hr); - *pFVF = 0; + wined3d_mutex_unlock(); + WARN("Failed to get vertex declaration, hr %#x.\n", hr); + *fvf = 0; return hr; } - if (decl) + if (wined3d_declaration) { - *pFVF = ((IDirect3DVertexDeclaration9Impl *)decl)->convFVF; - IDirect3DVertexDeclaration9_Release(decl); + d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *fvf = d3d9_declaration->convFVF; + wined3d_vertex_declaration_decref(wined3d_declaration); } else { - *pFVF = 0; + *fvf = 0; } + wined3d_mutex_unlock(); - TRACE("Returning FVF %#x\n", *pFVF); + TRACE("Returning FVF %#x.\n", *fvf); return hr; }

1 0

Jacek Caban : mshtml: Improved helper for returning color as VARIANT in HTMLBodyElement implementation .
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 4c66a4626bef026cf496585ac64d85d4c1ec10f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c66a4626bef026cf496585ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:00:55 2012 +0200 mshtml: Improved helper for returning color as VARIANT in HTMLBodyElement implementation. --- dlls/mshtml/htmlbody.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 26f5574..d96142a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -178,10 +178,16 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } -static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) +static HRESULT return_nscolor(nsresult nsres, nsAString *nsstr, VARIANT *p) { const PRUnichar *color; + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + nsAString_Finish(nsstr); + return E_FAIL; + } + nsAString_GetData(nsstr, &color); if(*color == '#') { @@ -190,7 +196,15 @@ static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) }else { V_VT(p) = VT_BSTR; V_BSTR(p) = SysAllocString(color); + if(!V_BSTR(p)) { + nsAString_Finish(nsstr); + return E_OUTOFMEMORY; + } } + + nsAString_Finish(nsstr); + TRACE("ret %s\n", debugstr_variant(p)); + return S_OK; } static inline HTMLBodyElement *impl_from_IHTMLBodyElement(IHTMLBodyElement *iface) @@ -502,13 +516,7 @@ static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT nsAString_Init(&link_str, NULL); nsres = nsIDOMHTMLBodyElement_GetLink(This->nsbody, &link_str); - if(NS_FAILED(nsres)) - ERR("GetLink failed: %08x\n", nsres); - - nscolor_to_variant(&link_str, p); - nsAString_Finish(&link_str); - - return S_OK; + return return_nscolor(nsres, &link_str, p); } static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v) @@ -540,13 +548,7 @@ static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT nsAString_Init(&vlink_str, NULL); nsres = nsIDOMHTMLBodyElement_GetVLink(This->nsbody, &vlink_str); - if(NS_FAILED(nsres)) - ERR("GetLink failed: %08x\n", nsres); - - nscolor_to_variant(&vlink_str, p); - nsAString_Finish(&vlink_str); - - return S_OK; + return return_nscolor(nsres, &vlink_str, p); } static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v) @@ -578,13 +580,7 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT nsAString_Init(&alink_str, NULL); nsres = nsIDOMHTMLBodyElement_GetALink(This->nsbody, &alink_str); - if(NS_FAILED(nsres)) - ERR("GetALink failed: %08x\n", nsres); - - nscolor_to_variant(&alink_str, p); - nsAString_Finish(&alink_str); - - return S_OK; + return return_nscolor(nsres, &alink_str, p); } static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v)

1 0

Alexandre Julliard : gdi32/tests: Add test cases for wide pen bounding rectangles.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 81fcb10977780207bb0e932b039a3f60fe9b0775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fcb10977780207bb0e932b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:42:58 2012 +0200 gdi32/tests: Add test cases for wide pen bounding rectangles. --- dlls/gdi32/tests/dc.c | 61 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 324e65b..4b8567d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -744,7 +744,7 @@ static void test_boundsrect(void) HBITMAP bitmap, dib, old; RECT rect, expect, set_rect; UINT ret; - int level; + int i, level; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -952,8 +952,8 @@ static void test_boundsrect(void) memset( buffer, 0, sizeof(buffer) ); info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - info->bmiHeader.biWidth = 64; - info->bmiHeader.biHeight = 64; + info->bmiHeader.biWidth = 256; + info->bmiHeader.biHeight = 256; info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 8; info->bmiHeader.biCompression = BI_RGB; @@ -971,19 +971,66 @@ static void test_boundsrect(void) SetRect( &expect, 6, 6, 56, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); - LineTo( hdc, 100, 30 ); + LineTo( hdc, 300, 30 ); ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); - SetRect( &expect, 6, 6, 64, 51 ); + SetRect( &expect, 6, 6, 256, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); - LineTo( hdc, -100, -100 ); + LineTo( hdc, -300, -300 ); ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); - SetRect( &expect, 0, 0, 64, 51 ); + SetRect( &expect, 0, 0, 256, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + /* test the wide pen heuristics */ + SetBoundsRect( hdc, NULL, DCB_ENABLE | DCB_RESET ); + for (i = 0; i < 1000; i++) + { + static const UINT endcaps[3] = { PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE, PS_ENDCAP_FLAT }; + static const UINT joins[3] = { PS_JOIN_ROUND, PS_JOIN_BEVEL, PS_JOIN_MITER }; + LOGBRUSH brush = { BS_SOLID, RGB(0,0,0), 0 }; + UINT join = joins[i % 3]; + UINT endcap = endcaps[(i / 3) % 3]; + INT inflate, width = 1 + i / 9; + HPEN pen = ExtCreatePen( PS_GEOMETRIC | join | endcap | PS_SOLID, width, &brush, 0, NULL ); + HPEN old = SelectObject( hdc, pen ); + MoveToEx( hdc, 100, 100, NULL ); + LineTo( hdc, 160, 100 ); + LineTo( hdc, 100, 160 ); + LineTo( hdc, 160, 160 ); + GetBoundsRect( hdc, &rect, DCB_RESET ); + SetRect( &expect, 100, 100, 161, 161 ); + + inflate = width + 2; + if (join == PS_JOIN_MITER) + { + inflate *= 5; + if (endcap == PS_ENDCAP_SQUARE) + InflateRect( &expect, (inflate * 3 + 1) / 2, (inflate * 3 + 1) / 2 ); + else + InflateRect( &expect, inflate, inflate ); + } + else + { + if (endcap == PS_ENDCAP_SQUARE) + InflateRect( &expect, inflate - inflate / 4, inflate - inflate / 4 ); + else + InflateRect( &expect, (inflate + 1) / 2, (inflate + 1) / 2 ); + } + expect.left = max( expect.left, 0 ); + expect.top = max( expect.top, 0 ); + expect.right = min( expect.right, 256 ); + expect.bottom = min( expect.bottom, 256 ); + todo_wine + ok( EqualRect(&rect, &expect), + "Got %d,%d,%d,%d expected %d,%d,%d,%d %u/%x/%x\n", + rect.left, rect.top, rect.right, rect.bottom, + expect.left, expect.top, expect.right, expect.bottom, width, endcap, join ); + DeleteObject( SelectObject( hdc, old )); + } + DeleteDC( hdc ); DeleteObject( bitmap ); DeleteObject( dib );

1 0

Huw Davies : wineps: Add the duplex entry to the list.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: cd83f8857664bd5635d7fb7ad28962ff3f116312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd83f8857664bd5635d7fb7ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:57:47 2012 +0100 wineps: Add the duplex entry to the list. --- dlls/wineps.drv/ppd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 456195d..6ee11b0 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -894,6 +894,7 @@ PPD *PSDRV_ParsePPD(char *fname) duplex->WinDuplex = DMDUP_SIMPLEX; } tuple.option = tuple.opttrans = tuple.value = NULL; + list_add_tail( &ppd->Duplexes, &duplex->entry ); } else if(!strcmp("*DefaultDuplex", tuple.key)) {

1 0

Huw Davies : wineps: Move ppd filename retrieval to a separate function.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 72cfc219f0ba2fc3aea19760558f7820f4883176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cfc219f0ba2fc3aea197605… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:57:48 2012 +0100 wineps: Move ppd filename retrieval to a separate function. --- dlls/wineps.drv/init.c | 205 ++++++++++++++++++++++++++---------------------- 1 files changed, 112 insertions(+), 93 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 584254c..b2597d7 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -573,6 +573,106 @@ static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODE *dm ) return SetPrinterW( printer, 9, (BYTE *)&info, 0 ); } +static inline char *expand_env_string( char *str, DWORD type ) +{ + if (type == REG_EXPAND_SZ) + { + char *tmp; + DWORD needed = ExpandEnvironmentStringsA( str, NULL, 0 ); + tmp = HeapAlloc( GetProcessHeap(), 0, needed ); + if (tmp) + { + ExpandEnvironmentStringsA( str, tmp, needed ); + HeapFree( GetProcessHeap(), 0, str ); + return tmp; + } + } + return str; +} + +static char *get_ppd_filename( HANDLE printer, const char *nameA, BOOL *needs_unlink ) +{ + char *ret = NULL; + DWORD needed, err, type; + HKEY hkey; + const char *data_dir, *filename; + + *needs_unlink = FALSE; + +#ifdef SONAME_LIBCUPS + if (cupshandle != (void*)-1) + { + typeof(cupsGetPPD) *pcupsGetPPD; + + pcupsGetPPD = wine_dlsym( cupshandle, "cupsGetPPD", NULL, 0 ); + if (pcupsGetPPD) + { + filename = pcupsGetPPD( nameA ); + + if (filename) + { + needed = strlen( filename ) + 1; + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + memcpy( ret, filename, needed ); + *needs_unlink = TRUE; + return ret; + } + else + WARN( "CUPS did not find ppd for %s\n", debugstr_a(nameA) ); + } + } +#endif + + err = GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed ); + if (err == ERROR_MORE_DATA) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", &type, + (BYTE *)ret, needed, &needed ); + return expand_env_string( ret, type ); + } + + /* Look for a ppd file for this printer in the config file. + * First look under that printer's name, and then under 'generic' + */ + /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey ) == ERROR_SUCCESS ) + { + const char *value_name = NULL; + + if (RegQueryValueExA( hkey, nameA, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = nameA; + else if (RegQueryValueExA( hkey, "generic", 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = "generic"; + + if (value_name) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + RegQueryValueExA( hkey, value_name, 0, &type, (BYTE *)ret, &needed ); + } + RegCloseKey( hkey ); + if (ret) return expand_env_string( ret, type ); + } + + if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; + else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; + else + { + ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(nameA) ); + return NULL; + } + ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); + if (ret) + { + strcpy( ret, data_dir ); + strcat( ret, filename ); + } + + return ret; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -585,11 +685,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) FONTNAME *font; const AFM *afm; HANDLE hPrinter = 0; - const char *ppd = NULL; - DWORD ppdType; - char *ppdFileName = NULL, *nameA = NULL; - HKEY hkey; - BOOL using_default_devmode = FALSE; + char *ppd_filename = NULL, *nameA = NULL; + BOOL using_default_devmode = FALSE, needs_unlink = FALSE; int len; TRACE("'%s'\n", debugstr_w(name)); @@ -618,93 +715,14 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); if (!pi->Devmode) goto fail; -#ifdef SONAME_LIBCUPS - if (cupshandle != (void*)-1) { - typeof(cupsGetPPD) * pcupsGetPPD = NULL; - - pcupsGetPPD = wine_dlsym(cupshandle, "cupsGetPPD", NULL, 0); - if (pcupsGetPPD) { - ppd = pcupsGetPPD( nameA ); - - if (ppd) { - needed=strlen(ppd)+1; - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - memcpy(ppdFileName, ppd, needed); - ppdType=REG_SZ; - res = ERROR_SUCCESS; - /* we should unlink() that file later */ - } else { - res = ERROR_FILE_NOT_FOUND; - WARN("Did not find ppd for %s\n", debugstr_w(name)); - } - } - } -#endif - if (!ppdFileName) { - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed); - if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", &ppdType, - (LPBYTE)ppdFileName, needed, &needed); - } - } - /* Look for a ppd file for this printer in the config file. - * First look under that printer's name, and then under 'generic' - */ - /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ - if((res != ERROR_SUCCESS) && !RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey)) - { - const char* value_name; - - if (RegQueryValueExA(hkey, nameA, 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name=nameA; - } else if (RegQueryValueExA(hkey, "generic", 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name="generic"; - } else { - value_name=NULL; - } - if (value_name) { - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - RegQueryValueExA(hkey, value_name, 0, &ppdType, (LPBYTE)ppdFileName, &needed); - } - RegCloseKey(hkey); - } + ppd_filename = get_ppd_filename( hPrinter, nameA, &needs_unlink ); + if (!ppd_filename) goto fail; - if (!ppdFileName) + pi->ppd = PSDRV_ParsePPD( ppd_filename ); + if (!pi->ppd) { - const char *data_dir, *filename; - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - res = ERROR_FILE_NOT_FOUND; - ERR ("Error %i getting PPD file name for printer '%s'\n", res, debugstr_w(name)); - goto fail; - } - ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 ); - strcpy( ppdFileName, data_dir ); - strcat( ppdFileName, filename ); - } else { - res = ERROR_SUCCESS; - if (ppdType==REG_EXPAND_SZ) { - char* tmp; - - /* Expand environment variable references */ - needed=ExpandEnvironmentStringsA(ppdFileName,NULL,0); - tmp=HeapAlloc(PSDRV_Heap, 0, needed); - ExpandEnvironmentStringsA(ppdFileName,tmp,needed); - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=tmp; - } - } - - pi->ppd = PSDRV_ParsePPD(ppdFileName); - if(!pi->ppd) { - MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n", - ppdFileName); - goto fail; + WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); + goto fail; } if(using_default_devmode) { @@ -780,19 +798,20 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) } ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); list_add_head( &printer_list, &pi->entry ); return pi; fail: if (hPrinter) ClosePrinter( hPrinter ); - HeapFree(PSDRV_Heap, 0, ppdFileName); HeapFree(PSDRV_Heap, 0, pi->FontSubTable); HeapFree(PSDRV_Heap, 0, pi->friendly_name); HeapFree(PSDRV_Heap, 0, pi->Devmode); HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); return NULL; }

1 0

Henri Verbeet : wined3d: Unify the wined3d_mapped_rect and wined3d_mapped_box structures.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 8cef8b358760b17de780f0093f653c0c7e6afebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cef8b358760b17de780f0093… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:04 2012 +0200 wined3d: Unify the wined3d_mapped_rect and wined3d_mapped_box structures. --- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/surface.c | 27 +++++++++++++++++---------- dlls/d3d8/volume.c | 12 ++++++++---- dlls/d3d9/surface.c | 11 ++++++++--- dlls/d3d9/volume.c | 12 ++++++++---- dlls/ddraw/surface.c | 16 ++++++++-------- dlls/wined3d/device.c | 20 +++++++++----------- dlls/wined3d/surface.c | 29 +++++++++++++++-------------- dlls/wined3d/volume.c | 20 ++++++++++---------- include/wine/wined3d.h | 12 +++--------- 10 files changed, 87 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cef8b358760b17de780f…

1 0