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

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXBaseEffectImpl_QueryInterface ().
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 2b1da8c77f4cb2509876281e2bf7a361d6c865f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1da8c77f4cb2509876281e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:06 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXBaseEffectImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c76bdef..b8509b1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1116,15 +1116,13 @@ static inline struct ID3DXBaseEffectImpl *impl_from_ID3DXBaseEffect(ID3DXBaseEff /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXBaseEffectImpl_QueryInterface(ID3DXBaseEffect *iface, REFIID riid, void **object) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - - TRACE("iface %p, riid %s, object %p\n", This, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBaseEffect)) { - This->ID3DXBaseEffect_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Henri Verbeet : d3d9: COM cleanup for the IDirect3DVertexDeclaration9 interface.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 949f7b45244d77bfd839307ee002fa1bc6ca52d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949f7b45244d77bfd839307ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:03 2012 +0200 d3d9: COM cleanup for the IDirect3DVertexDeclaration9 interface. --- dlls/d3d9/buffer.c | 1 - dlls/d3d9/d3d9_private.h | 5 +++- dlls/d3d9/device.c | 11 ++++--- dlls/d3d9/shader.c | 1 - dlls/d3d9/surface.c | 1 - dlls/d3d9/vertexdeclaration.c | 61 +++++++++++++++++++++++++--------------- 6 files changed, 48 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=949f7b45244d77bfd8393…

1 0

Henri Verbeet : include: Fix a couple of ID3DXSaveUserData prototypes.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: bdcc868ec473739076204e1fb6f3dec68af7a7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcc868ec473739076204e1fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:05 2012 +0200 include: Fix a couple of ID3DXSaveUserData prototypes. --- include/d3dx9anim.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 142acba..1e31299 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -192,10 +192,10 @@ DECLARE_INTERFACE(ID3DXLoadUserData) #define INTERFACE ID3DXSaveUserData DECLARE_INTERFACE(ID3DXSaveUserData) { - STDMETHOD(AddFrameChildData)(CONST LPD3DXFRAME *frame, LPD3DXFILESAVEOBJECT save_obj, - LPD3DXFILESAVEDATA frame_data) PURE; - STDMETHOD(AddMeshChildData)(CONST LPD3DXMESHCONTAINER *mesh_container, - LPD3DXFILESAVEOBJECT save_obj, LPD3DXFILESAVEDATA mesh_data) PURE; + STDMETHOD(AddFrameChildData)(const D3DXFRAME *frame, + ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; + STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, + ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE; STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE;

1 0

Alexandre Julliard : gdi32: Avoid redundant computation of the gradient bounding rectangle.
by Alexandre Julliard April 13, 2012

April 13, 2012

Module: wine Branch: master Commit: 6c028b19c5467a4614fe475e058b71b452727ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c028b19c5467a4614fe475e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:41:16 2012 +0200 gdi32: Avoid redundant computation of the gradient bounding rectangle. --- dlls/gdi32/dibdrv/bitblt.c | 79 ++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index c3acb8c..dd9525f 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -573,7 +573,7 @@ static DWORD blend_rect( dib_info *dst, const RECT *dst_rect, const dib_info *sr /* compute y-ordered, device coords vertices for a horizontal rectangle gradient */ static void get_gradient_hrect_vertices( const GRADIENT_RECT *rect, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[2] ) + const POINT *dev_pts, TRIVERTEX v[2], RECT *bounds ) { int v0 = rect->UpperLeft; int v1 = rect->LowerRight; @@ -585,15 +585,15 @@ static void get_gradient_hrect_vertices( const GRADIENT_RECT *rect, const TRIVER } v[0] = vert[v0]; v[1] = vert[v1]; - v[0].x = dev_pts[v0].x; - v[1].x = dev_pts[v1].x; - v[0].y = min( dev_pts[v0].y, dev_pts[v1].y ); - v[1].y = max( dev_pts[v0].y, dev_pts[v1].y ); + bounds->left = v[0].x = dev_pts[v0].x; + bounds->right = v[1].x = dev_pts[v1].x; + bounds->top = v[0].y = min( dev_pts[v0].y, dev_pts[v1].y ); + bounds->bottom = v[1].y = max( dev_pts[v0].y, dev_pts[v1].y ); } /* compute y-ordered, device coords vertices for a vertical rectangle gradient */ static void get_gradient_vrect_vertices( const GRADIENT_RECT *rect, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[2] ) + const POINT *dev_pts, TRIVERTEX v[2], RECT *bounds ) { int v0 = rect->UpperLeft; int v1 = rect->LowerRight; @@ -605,15 +605,15 @@ static void get_gradient_vrect_vertices( const GRADIENT_RECT *rect, const TRIVER } v[0] = vert[v0]; v[1] = vert[v1]; - v[0].x = min( dev_pts[v0].x, dev_pts[v1].x ); - v[1].x = max( dev_pts[v0].x, dev_pts[v1].x ); - v[0].y = dev_pts[v0].y; - v[1].y = dev_pts[v1].y; + bounds->left = v[0].x = min( dev_pts[v0].x, dev_pts[v1].x ); + bounds->right = v[1].x = max( dev_pts[v0].x, dev_pts[v1].x ); + bounds->top = v[0].y = dev_pts[v0].y; + bounds->bottom = v[1].y = dev_pts[v1].y; } /* compute y-ordered, device coords vertices for a triangle gradient */ static void get_gradient_triangle_vertices( const GRADIENT_TRIANGLE *tri, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[3] ) + const POINT *dev_pts, TRIVERTEX v[3], RECT *bounds ) { int v0, v1, v2; @@ -644,31 +644,19 @@ static void get_gradient_triangle_vertices( const GRADIENT_TRIANGLE *tri, const v[1].x = dev_pts[v1].x; v[2].x = dev_pts[v2].x; v[2].y = dev_pts[v2].y; + bounds->left = min( v[0].x, min( v[1].x, v[2].x )); + bounds->top = v[0].y; + bounds->right = max( v[0].x, max( v[1].x, v[2].x )); + bounds->bottom = v[2].y; } -static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip ) +static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip, const RECT *bounds ) { int i; struct clipped_rects clipped_rects; - RECT rect; BOOL ret = TRUE; - if (mode == GRADIENT_FILL_TRIANGLE) - { - rect.left = min( v[0].x, min( v[1].x, v[2].x )); - rect.top = v[0].y; - rect.right = max( v[0].x, max( v[1].x, v[2].x )); - rect.bottom = v[2].y; - } - else - { - rect.left = v[0].x; - rect.top = v[0].y; - rect.right = v[1].x; - rect.bottom = v[1].y; - } - - if (!get_clipped_rects( dib, &rect, clip, &clipped_rects )) return TRUE; + if (!get_clipped_rects( dib, bounds, clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { if (!(ret = dib->funcs->gradient_rect( dib, &clipped_rects.rects[i], v, mode ))) break; @@ -1298,12 +1286,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_RECT_H: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_hrect_vertices( rect, vert_array, dev_pts, vert ); - gradient_rect( &dib, vert, mode, 0 ); - rc.left = vert[0].x; - rc.top = vert[0].y; - rc.right = vert[1].x; - rc.bottom = vert[1].y; + get_gradient_hrect_vertices( rect, vert_array, dev_pts, vert, &rc ); + gradient_rect( &dib, vert, mode, 0, &rc ); add_rect_to_region( rgn, &rc ); } break; @@ -1311,12 +1295,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_RECT_V: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_vrect_vertices( rect, vert_array, dev_pts, vert ); - gradient_rect( &dib, vert, mode, 0 ); - rc.left = vert[0].x; - rc.top = vert[0].y; - rc.right = vert[1].x; - rc.bottom = vert[1].y; + get_gradient_vrect_vertices( rect, vert_array, dev_pts, vert, &rc ); + gradient_rect( &dib, vert, mode, 0, &rc ); add_rect_to_region( rgn, &rc ); } break; @@ -1324,8 +1304,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_TRIANGLE: for (i = 0; i < ngrad; i++, tri++) { - get_gradient_triangle_vertices( tri, vert_array, dev_pts, vert ); - if (gradient_rect( &dib, vert, mode, 0 )) + get_gradient_triangle_vertices( tri, vert_array, dev_pts, vert, &rc ); + if (gradient_rect( &dib, vert, mode, 0, &rc )) { for (y = vert[0].y; y < vert[2].y; y++) { @@ -1405,6 +1385,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, unsigned int i; POINT *pts; TRIVERTEX vert[3]; + RECT bounds; BOOL ret = TRUE; if (!(pts = HeapAlloc( GetProcessHeap(), 0, nvert * sizeof(*pts) ))) return FALSE; @@ -1420,33 +1401,33 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, case GRADIENT_FILL_RECT_H: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_hrect_vertices( rect, vert_array, pts, vert ); + get_gradient_hrect_vertices( rect, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - gradient_rect( &pdev->dib, vert, mode, pdev->clip ); + gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; case GRADIENT_FILL_RECT_V: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_vrect_vertices( rect, vert_array, pts, vert ); + get_gradient_vrect_vertices( rect, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - gradient_rect( &pdev->dib, vert, mode, pdev->clip ); + gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; case GRADIENT_FILL_TRIANGLE: for (i = 0; i < ngrad; i++, tri++) { - get_gradient_triangle_vertices( tri, vert_array, pts, vert ); + get_gradient_triangle_vertices( tri, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = vert[2].Alpha = 0; - if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip )) ret = FALSE; + if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds )) ret = FALSE; } break; }

1 0

Huw Davies : wineps: Move the default resolution fallback to the ppd parser .
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 1d2cd06592da89b0a8401cc8a1d331181a8a8f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2cd06592da89b0a8401cc8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:13 2012 +0100 wineps: Move the default resolution fallback to the ppd parser. --- dlls/wineps.drv/init.c | 5 ----- dlls/wineps.drv/ppd.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0134bd6..584254c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -707,11 +707,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) goto fail; } - /* Some gimp-print ppd files don't contain a DefaultResolution line - set it to 300 if it's not specified */ - if(pi->ppd->DefaultResolution == 0) - pi->ppd->DefaultResolution = 300; - if(using_default_devmode) { DWORD papersize; diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index c4dff21..456195d 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -634,6 +634,10 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InputSlots ); list_init( &ppd->Duplexes ); + /* Some gimp-print ppd files don't contain a DefaultResolution line + so default to 300 */ + ppd->DefaultResolution = 300; + /* * The Windows PostScript drivers create the following "virtual bin" for * every PostScript printer

1 0

Piotr Caban : msvcrt: Added support for _TRUNCATE flag in wcsncpy_s.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: a80aec4c56bfc9b845e89bf55af4e638f153b4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80aec4c56bfc9b845e89bf55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 12 16:19:31 2012 +0200 msvcrt: Added support for _TRUNCATE flag in wcsncpy_s. --- dlls/msvcrt/tests/string.c | 6 ++++++ dlls/msvcrt/wcs.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9f0d8be..afa9954 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -682,6 +682,12 @@ static void test_wcscpy_s(void) ret = p_wcsncpy_s(szDestShort, 8, szLongText, sizeof(szLongText)/sizeof(WCHAR)); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 5, szLongText, -1); + ok(ret == STRUNCATE, "expected STRUNCATE got %d\n", ret); + ok(szDest[4] == 0, "szDest[4] not 0\n"); + ok(!memcmp(szDest, szLongText, 4*sizeof(WCHAR)), "szDest = %s\n", wine_dbgstr_w(szDest)); } static void test__wcsupr_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6786ce..21cee47 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1230,6 +1230,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co MSVCRT_size_t count ) { MSVCRT_size_t size = 0; + INT ret = 0; if (!wcDest || !numElement) return MSVCRT_EINVAL; @@ -1242,8 +1243,12 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co } size = min(strlenW(wcSrc), count); - - if (size >= numElement) + if (count==MSVCRT__TRUNCATE && size>=numElement) + { + ret = MSVCRT_STRUNCATE; + size = numElement-1; + } + else if (size >= numElement) { return MSVCRT_ERANGE; } @@ -1251,7 +1256,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); wcDest[size] = '\0'; - return 0; + return ret; } /******************************************************************

1 0

Ilya Basin : regedit: Fix buffer size when exporting binary values.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: f900ed1474b0fd05dbf0a11907d0bf0682fff979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900ed1474b0fd05dbf0a1190… Author: Ilya Basin <basinilya(a)gmail.com> Date: Thu Apr 12 18:10:59 2012 +0400 regedit: Fix buffer size when exporting binary values. --- programs/regedit/regproc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1a87442..f82d793 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1018,12 +1018,13 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD /* - The 2 spaces that concat places at the start of the * line effectively reduce the space available for data. * - If the value name and hex prefix are very long - * ( > REG_FILE_HEX_LINE_LEN) then we may overestimate + * ( > REG_FILE_HEX_LINE_LEN) or *line_len divides + * without a remainder then we may overestimate * the needed number of lines by one. But that's ok. - * - The trailing linefeed takes the place of a comma so - * it's accounted for already. + * - The trailing '\r' takes the place of a comma so + * we only need to add 1 for the trailing '\n' */ - *line_len += *line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len; + *line_len += *line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len + 1; REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len); lstrcpyW(*line_buf + hex_pos, hex_prefix); if (value_size)

1 0

Aric Stewart : wineqtdecoder: Call OutputQueue_Destroy during pin disconnect.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 40456f4bb4089f4c77131bf99efc1cd0175f85e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40456f4bb4089f4c77131bf99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 11 14:07:18 2012 -0500 wineqtdecoder: Call OutputQueue_Destroy during pin disconnect. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index ba2d05d..b21f198 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -745,6 +745,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) if (This->pVideo_Pin) { + OutputQueue_Destroy(This->pVideo_Pin->queue); hr = BaseOutputPinImpl_BreakConnect(&This->pVideo_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pVideo_Pin->pin.pin.IPin_iface); @@ -752,6 +753,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) } if (This->pAudio_Pin) { + OutputQueue_Destroy(This->pAudio_Pin->queue); hr = BaseOutputPinImpl_BreakConnect(&This->pAudio_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pAudio_Pin->pin.pin.IPin_iface); @@ -1269,7 +1271,6 @@ static ULONG WINAPI QTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); - OutputQueue_Destroy(This->queue); CoTaskMemFree(This); return 0; }

1 0

Akihiro Sagawa : comctl32: Add support for retrieving lpszText in TOOLINFO structure.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: b48f394e4f3ee73eb2f974d19770d411d13f3e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48f394e4f3ee73eb2f974d19… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 12 00:42:55 2012 +0900 comctl32: Add support for retrieving lpszText in TOOLINFO structure. --- dlls/comctl32/tests/tooltips.c | 16 ++++++++++++++++ dlls/comctl32/tooltips.c | 27 +++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 596598f..31504d1 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -322,6 +322,11 @@ static void test_gettext(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); + + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.lpszText == NULL, + "expected NULL, got %p", toolinfoA.lpszText); } else { @@ -355,6 +360,12 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, testtipA) == 0, "lpszText should be an empty string\n"); + memset(bufA, 0x1f, sizeof(bufA)); + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, testtipA) == 0, + "expected %s, got %p\n", testtipA, toolinfoA.lpszText); + length = SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0); ok(length == 0, "Expected 0, got %d\n", length); } @@ -378,6 +389,11 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, testcallbackA) == 0, "lpszText should be an (%s) string\n", testcallbackA); + + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.lpszText == LPSTR_TEXTCALLBACKA, + "expected LPSTR_TEXTCALLBACKA, got %p\n", toolinfoA.lpszText); } DestroyWindow(hwnd); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 162867d..1d758b4 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -943,6 +943,21 @@ TOOLTIPS_GetToolFromPoint (const TOOLTIPS_INFO *infoPtr, HWND hwnd, const POINT return -1; } +static inline void +TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) +{ + if (ti->lpszText) { + if (toolPtr->lpszText == NULL || + IS_INTRESOURCE(toolPtr->lpszText) || + toolPtr->lpszText == LPSTR_TEXTCALLBACKW) + ti->lpszText = toolPtr->lpszText; + else if (isW) + strcpyW (ti->lpszText, toolPtr->lpszText); + else + WideCharToMultiByte(CP_ACP, 0, toolPtr->lpszText, -1, + (LPSTR)ti->lpszText, INFOTIPSIZE, NULL, NULL); + } +} static BOOL TOOLTIPS_IsWindowActive (HWND hwnd) @@ -1199,8 +1214,7 @@ TOOLTIPS_EnumToolsT (const TOOLTIPS_INFO *infoPtr, UINT uIndex, TTTOOLINFOW *ti, ti->uId = toolPtr->uId; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* ti->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOA_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1246,8 +1260,7 @@ TOOLTIPS_GetCurrentToolT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL is ti->uFlags = toolPtr->uFlags; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* ti->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1385,8 +1398,7 @@ TOOLTIPS_GetToolInfoT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) ti->uFlags = toolPtr->uFlags; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* lpToolInfo->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1420,8 +1432,7 @@ TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, lptthit->ti.uId = toolPtr->uId; lptthit->ti.rect = toolPtr->rect; lptthit->ti.hinst = toolPtr->hinst; -/* lptthit->ti.lpszText = toolPtr->lpszText; */ - lptthit->ti.lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, &lptthit->ti, isW); if (lptthit->ti.cbSize >= TTTOOLINFOW_V2_SIZE) lptthit->ti.lParam = toolPtr->lParam; }

1 0

Huw Davies : wineps: Simplify the failure path.
by Alexandre Julliard April 12, 2012

April 12, 2012

Module: wine Branch: master Commit: 92bce60f37b5e870d92a04cbe178d04d3e8f55dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bce60f37b5e870d92a04cbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:12 2012 +0100 wineps: Simplify the failure path. --- dlls/wineps.drv/init.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2e8087b..0134bd6 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -608,7 +608,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) if (OpenPrinterW( pi->friendly_name, &hPrinter, NULL ) == 0) { ERR ("OpenPrinter failed with code %i\n", GetLastError ()); - goto cleanup; + goto fail; } len = WideCharToMultiByte( CP_ACP, 0, name, -1, NULL, 0, NULL, NULL ); @@ -616,7 +616,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) WideCharToMultiByte( CP_ACP, 0, name, -1, nameA, len, NULL, NULL ); pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); - if (!pi->Devmode) goto closeprinter; + if (!pi->Devmode) goto fail; #ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) { @@ -681,7 +681,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { res = ERROR_FILE_NOT_FOUND; ERR ("Error %i getting PPD file name for printer '%s'\n", res, debugstr_w(name)); - goto closeprinter; + goto fail; } ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 ); strcpy( ppdFileName, data_dir ); @@ -704,7 +704,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) if(!pi->ppd) { MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n", ppdFileName); - goto closeprinter; + goto fail; } /* Some gimp-print ppd files don't contain a DefaultResolution line @@ -748,7 +748,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) TRACE ("No 'Paper Size' for printer '%s'\n", debugstr_w(name)); else { ERR ("GetPrinterDataA returned %i\n", res); - goto closeprinter; + goto fail; } /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. @@ -767,10 +767,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); - ClosePrinter( hPrinter ); - - pi->Fonts = NULL; - LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); @@ -782,24 +778,23 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) BOOL added; if (PSDRV_AddAFMtoList(&pi->Fonts, afm, &added) == FALSE) { PSDRV_FreeAFMList(pi->Fonts); - goto cleanup; + goto fail; } } } + ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd); list_add_head( &printer_list, &pi->entry ); return pi; -closeprinter: - ClosePrinter(hPrinter); -cleanup: +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); -fail: HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd);

1 0