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

Marcus Meissner : strmbase: Use correct *ppv (Coverity).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b964758543d9d58b6f29d0c52716a358bee7dd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b964758543d9d58b6f29d0c52… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 16 08:53:47 2012 +0200 strmbase: Use correct *ppv (Coverity). --- dlls/strmbase/qualitycontrol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index b73f912..f6c9ea7 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); - if (!ppv) + if (!*ppv) return E_OUTOFMEMORY; This = *ppv; This->input = input;

1 0

Marcus Meissner : dmusic: Remove useless NULL check (Coverity).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: af5c45aac0f2725f200ca78d147043d9fac6f259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5c45aac0f2725f200ca78d1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 16 09:12:40 2012 +0200 dmusic: Remove useless NULL check (Coverity). --- dlls/dmusic/tests/dmusic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 29ad642..c537afa 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -100,8 +100,7 @@ static void test_dmusic(void) if (port) IDirectMusicPort_Release(port); - if (dmusic) - IDirectMusic_Release(dmusic); + IDirectMusic_Release(dmusic); } START_TEST(dmusic)

1 0

Jacek Caban : jscript: Make sure to jump out of switch before entering implicit default clausule.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 05d59abc1c7a0463a90fc121252b0e342a3609d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d59abc1c7a0463a90fc1212… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 11:25:25 2012 +0200 jscript: Make sure to jump out of switch before entering implicit default clausule. --- dlls/jscript/compile.c | 3 +++ dlls/jscript/tests/lang.js | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0a66348..b14c50b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1516,6 +1516,9 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t assert(i == case_cnt); if(!have_default) { + hres = push_instr_uint(ctx, OP_jmp, stat_ctx.break_label); + if(FAILED(hres)) + return hres; instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; if(!push_instr(ctx, OP_undefined)) return E_OUTOFMEMORY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 41374e2..4d2efa3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -726,6 +726,16 @@ case 3: ok(false, "unexpected case 3"); } +(function() { + var i=0; + + switch(1) { + case 1: + i++; + } + return i; +})(); + tmp = eval("1"); ok(tmp === 1, "eval(\"1\") !== 1"); eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;");

1 0

Alexandre Julliard : po: Fix a msgid in the Danish translation.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: baa7c3b18ad912193927e37ccb7ce1df5abf816b URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa7c3b18ad912193927e37cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 12:09:32 2012 +0200 po: Fix a msgid in the Danish translation. --- po/da.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index 3fea860..eb28626 100644 --- a/po/da.po +++ b/po/da.po @@ -3946,7 +3946,7 @@ msgid "Drive is already JOINed.\n" msgstr "Drev er allerede JOINed.\n" #: winerror.mc:541 -msgid "Drive is already SUBST-ed.\n" +msgid "Drive is already SUBSTed.\n" msgstr "Drev er allerede erstattet.\n" #: winerror.mc:546

1 0

Alexandre Julliard : gdi32: Add helper functions for manipulating bounds rectangles.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b1ccff1a9c7bd3028821ae1745de83ef111daa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ccff1a9c7bd3028821ae174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 16:04:39 2012 +0200 gdi32: Add helper functions for manipulating bounds rectangles. --- dlls/gdi32/bitblt.c | 3 +- dlls/gdi32/dc.c | 52 +++++++++++++++++---------------------------- dlls/gdi32/font.c | 16 +++++++------- dlls/gdi32/gdi_private.h | 18 +++++++++++++++- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 71b8e8f..a97231c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -408,8 +408,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, LPtoDP( dev->hdc, pts, nvert ); /* compute bounding rect of all the rectangles/triangles */ - dst.visrect.left = dst.visrect.top = INT_MAX; - dst.visrect.right = dst.visrect.bottom = INT_MIN; + reset_bounds( &dst.visrect ); for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) { ULONG v = ((ULONG *)grad_array)[i]; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 478100d..c256f26 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -114,6 +114,8 @@ DC *alloc_dc_ptr( WORD magic ) dc->xformVport2World = dc->xformWorld2Wnd; dc->vport2WorldValid = TRUE; + reset_bounds( &dc->bounds ); + if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); @@ -1316,21 +1318,23 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if (rect) { - *rect = dc->BoundsRect; - ret = is_rect_empty( rect ) ? DCB_RESET : DCB_SET; - rect->left = max( rect->left, 0 ); - rect->top = max( rect->top, 0 ); - rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); - rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); + if (is_rect_empty( &dc->bounds )) + { + rect->left = rect->top = rect->right = rect->bottom = 0; + ret = DCB_RESET; + } + else + { + *rect = dc->bounds; + rect->left = max( rect->left, 0 ); + rect->top = max( rect->top, 0 ); + rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); + rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); + ret = DCB_SET; + } DPtoLP( hdc, (POINT *)rect, 2 ); } - if (flags & DCB_RESET) - { - dc->BoundsRect.left = 0; - dc->BoundsRect.top = 0; - dc->BoundsRect.right = 0; - dc->BoundsRect.bottom = 0; - } + if (flags & DCB_RESET) reset_bounds( &dc->bounds ); release_dc_ptr( dc ); return ret; } @@ -1348,32 +1352,16 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if (!(dc = get_dc_ptr( hdc ))) return 0; ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | - (is_rect_empty( &dc->BoundsRect ) ? DCB_RESET : DCB_SET); + (is_rect_empty( &dc->bounds ) ? DCB_RESET : DCB_SET); - if (flags & DCB_RESET) - { - dc->BoundsRect.left = 0; - dc->BoundsRect.top = 0; - dc->BoundsRect.right = 0; - dc->BoundsRect.bottom = 0; - } + if (flags & DCB_RESET) reset_bounds( &dc->bounds ); if ((flags & DCB_ACCUMULATE) && rect) { RECT rc = *rect; LPtoDP( hdc, (POINT *)&rc, 2 ); - if (!is_rect_empty( &rc )) - { - if (!is_rect_empty( &dc->BoundsRect)) - { - dc->BoundsRect.left = min( dc->BoundsRect.left, rc.left ); - dc->BoundsRect.top = min( dc->BoundsRect.top, rc.top ); - dc->BoundsRect.right = max( dc->BoundsRect.right, rc.right ); - dc->BoundsRect.bottom = max( dc->BoundsRect.bottom, rc.bottom ); - } - else dc->BoundsRect = rc; - } + add_bounds_rect( &dc->bounds, &rc ); } if (flags & DCB_ENABLE) dc->bounds_enabled = TRUE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f5c44d8..d9c16a4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1761,20 +1761,20 @@ static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) { int i; - RECT rect; + RECT rect, bounds; - rect.left = rect.top = INT_MAX; - rect.right = rect.bottom = INT_MIN; + reset_bounds( &bounds ); for (i = 0; i < count; i++) { GLYPHMETRICS metrics; if (get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, NULL )) continue; - rect.left = min( rect.left, x + metrics.gmptGlyphOrigin.x ); - rect.top = min( rect.top, y - metrics.gmptGlyphOrigin.y ); - rect.right = max( rect.right, x + metrics.gmptGlyphOrigin.x + (int)metrics.gmBlackBoxX ); - rect.bottom = max( rect.bottom, y - metrics.gmptGlyphOrigin.y + (int)metrics.gmBlackBoxY ); + rect.left = x + metrics.gmptGlyphOrigin.x; + rect.top = y - metrics.gmptGlyphOrigin.y; + rect.right = rect.left + metrics.gmBlackBoxX; + rect.bottom = rect.top + metrics.gmBlackBoxY; + add_bounds_rect( &bounds, &rect ); if (dx) { @@ -1791,7 +1791,7 @@ static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, y += metrics.gmCellIncY; } } - return rect; + return bounds; } /* helper for nulldrv_ExtTextOut */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5728a53..20b522d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -21,6 +21,7 @@ #ifndef __WINE_GDI_PRIVATE_H #define __WINE_GDI_PRIVATE_H +#include <limits.h> #include <math.h> #include <stdlib.h> #include <stdarg.h> @@ -149,7 +150,7 @@ typedef struct tagDC XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ - RECT BoundsRect; /* Current bounding rect */ + RECT bounds; /* Current bounding rect */ } DC; /* Certain functions will do no further processing if the driver returns this. @@ -457,6 +458,21 @@ static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int h } } +static inline void reset_bounds( RECT *bounds ) +{ + bounds->left = bounds->top = INT_MAX; + bounds->right = bounds->bottom = INT_MIN; +} + +static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) +{ + if (is_rect_empty( rect )) return; + bounds->left = min( bounds->left, rect->left ); + bounds->top = min( bounds->top, rect->top ); + bounds->right = max( bounds->right, rect->right ); + bounds->bottom = max( bounds->bottom, rect->bottom ); +} + static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1;

1 0

Christian Costa : winegstreamer: Remove useless FIXME.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 1a5851f634efe9261b9bb98b32eb07e72d713437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5851f634efe9261b9bb98b3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 19:23:31 2012 +0200 winegstreamer: Remove useless FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 3a84f7a..03b854b 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -796,7 +796,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P NULL); hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); - FIXME("%08x\n", hr); gst_caps_unref(capsin); gst_caps_unref(capsout);

1 0

Akihiro Sagawa : comctl32/tests: Add tests for long info tip texts.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 28f26c978387e161b42b9dd5960a91e1af6b49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f26c978387e161b42b9dd59… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 13 22:45:20 2012 +0900 comctl32/tests: Add tests for long info tip texts. --- dlls/comctl32/tests/tooltips.c | 124 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 31504d1..cf571de 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -636,6 +636,128 @@ static void test_ttm_gettoolinfo(void) DestroyWindow(hwnd); } +static void test_longtextA(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. In fact, the buffer is not null-terminated."; + HWND hwnd; + TTTOOLINFOA toolinfoA = { 0 }; + CHAR bufA[256]; + LRESULT r; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = GetModuleHandleA(NULL); + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1234ABCD; + strcpy(bufA, longtextA); + toolinfoA.lpszText = bufA; + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + if (r) + { + int textlen; + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0xABCD1234; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_ENUMTOOLSA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(toolinfoA.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoA.uId); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + +static void test_longtextW(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. Actually, this is not applied for wide version."; + HWND hwnd; + TTTOOLINFOW toolinfoW = { 0 }; + WCHAR bufW[256]; + LRESULT r; + int lenW; + + hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + if(!hwnd) + { + win_skip("CreateWindowExW() not supported. Skipping.\n"); + return; + } + + toolinfoW.cbSize = TTTOOLINFOW_V2_SIZE; + toolinfoW.hwnd = NULL; + toolinfoW.hinst = GetModuleHandleW(NULL); + toolinfoW.uFlags = 0; + toolinfoW.uId = 0x1234ABCD; + MultiByteToWideChar(CP_ACP, 0, longtextA, -1, bufW, sizeof(bufW)/sizeof(bufW[0])); + lenW = lstrlenW(bufW); + toolinfoW.lpszText = bufW; + toolinfoW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); + if (r) + { + int textlen; + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0xABCD1234; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_ENUMTOOLSW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + ok(toolinfoW.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoW.uId); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW || + broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ + "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -644,4 +766,6 @@ START_TEST(tooltips) test_customdraw(); test_gettext(); test_ttm_gettoolinfo(); + test_longtextA(); + test_longtextW(); }

1 0

Akihiro Sagawa : comctl32: Truncate the info tip text when using ANSI version messages.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 8cedea0d60f567b68531be06efc4f0a21ad8b516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cedea0d60f567b68531be06e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 13 22:45:22 2012 +0900 comctl32: Truncate the info tip text when using ANSI version messages. --- dlls/comctl32/tests/tooltips.c | 6 +++--- dlls/comctl32/tooltips.c | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index cf571de..c92ed62 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -668,7 +668,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_ENUMTOOLSA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); ok(toolinfoA.uId == 0x1234ABCD, "uId should be retrieved, got %p\n", (void*)toolinfoA.uId); @@ -678,7 +678,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); memset(bufA, 0, sizeof(bufA)); toolinfoA.hwnd = NULL; @@ -686,7 +686,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); } DestroyWindow(hwnd); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 1d758b4..d1e57a3 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -171,6 +171,8 @@ typedef struct #define ICON_HEIGHT 16 #define ICON_WIDTH 16 +#define MAX_TEXT_SIZE_A 80 /* maximum retriving text size by ANSI message */ + static LRESULT CALLBACK TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); @@ -954,8 +956,9 @@ TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) else if (isW) strcpyW (ti->lpszText, toolPtr->lpszText); else + /* ANSI version, the buffer is maximum 80 bytes without null. */ WideCharToMultiByte(CP_ACP, 0, toolPtr->lpszText, -1, - (LPSTR)ti->lpszText, INFOTIPSIZE, NULL, NULL); + (LPSTR)ti->lpszText, MAX_TEXT_SIZE_A, NULL, NULL); } } @@ -1341,12 +1344,13 @@ TOOLTIPS_GetTextT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) /* NB this API is broken, there is no way for the app to determine what size buffer it requires nor a way to specify how long the - one it supplies is. We'll assume it's up to INFOTIPSIZE */ + one it supplies is. According to the test result, it's up to + 80 bytes by the ANSI version. */ buffer[0] = '\0'; TOOLTIPS_GetTipText(infoPtr, nTool, buffer); WideCharToMultiByte(CP_ACP, 0, buffer, -1, (LPSTR)ti->lpszText, - INFOTIPSIZE, NULL, NULL); + MAX_TEXT_SIZE_A, NULL, NULL); } return 0;

1 0

Michael Stefaniuc : d3drm: Remove leftover return statement (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 72d7ce28f051177b33e732909e56fda939334975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d7ce28f051177b33e732909… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:26:22 2012 +0200 d3drm: Remove leftover return statement (Smatch). --- dlls/d3drm/d3drm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7d92858..3db6b9e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1452,8 +1452,6 @@ end: IDirectXFile_Release(pDXFile); return ret; - - return E_NOTIMPL; } static HRESULT WINAPI IDirect3DRM3Impl_Tick(IDirect3DRM3* iface, D3DVALUE tick)

1 0

Michael Stefaniuc : mmdevapi: Remove superfluous NULL pointer check before HeapFree (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 5c47973c249cf22a4750de42880012269de555f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c47973c249cf22a4750de428… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:31:57 2012 +0200 mmdevapi: Remove superfluous NULL pointer check before HeapFree (Smatch). --- dlls/mmdevapi/devenum.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 866aa06..075313c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -301,8 +301,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st }else if(cur->ref > 0) WARN("Modifying an MMDevice with postitive reference count!\n"); - if(cur->drv_id) - HeapFree(GetProcessHeap(), 0, cur->drv_id); + HeapFree(GetProcessHeap(), 0, cur->drv_id); cur->drv_id = name; cur->flow = flow;

1 0