wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Daniel Lehman : mshtml: Decrement refcount in nsWeakReference::Release ( Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: a018ea5501975d54476a61114a482de3e38db617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a018ea5501975d54476a61114… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Mar 20 22:56:50 2017 -0700 mshtml: Decrement refcount in nsWeakReference::Release (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f21ec7f170950b610c5fbd36c8eda74a530cfe22) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e343dde..aee00e6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1204,7 +1204,7 @@ static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) { nsWeakReference *This = impl_from_nsIWeakReference(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref);

1 0

Dmitry Timoshkov : dsound: Fix a memory leak.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8f5c2ad60c649bb0d130454a5c998b6202a1e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5c2ad60c649bb0d130454a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:23:52 2017 +0800 dsound: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c39121fc97a0f8441ef0a9fb8e4103631574c504) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 15 ++++++++++++++- dlls/dsound/propset.c | 12 +++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 796fe1e..8dd86e4 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -89,7 +89,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 63d1226..53914cd 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -31,6 +31,7 @@ #include "uuids.h" #include "wine/list.h" +#include "wine/unicode.h" #define DS_MAX_CHANNELS 6 @@ -254,7 +255,7 @@ extern struct list DSOUND_renderers DECLSPEC_HIDDEN; extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; -extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; +extern const WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; @@ -264,3 +265,15 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN; + +static inline WCHAR *strdupW( const WCHAR *str ) +{ + size_t size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index b89c45a..9ef4ac9 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -200,7 +200,6 @@ static HRESULT DSPROPERTY_DescriptionW( IMMDevice *mmdevice; IPropertyStore *ps; PROPVARIANT pv; - DWORD desclen; HRESULT hr; TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", @@ -248,12 +247,9 @@ static HRESULT DSPROPERTY_DescriptionW( return hr; } - desclen = lstrlenW(pv.u.pwszVal) + 1; - /* FIXME: Still a memory leak.. */ - ppd->Description = HeapAlloc(GetProcessHeap(), 0, desclen * sizeof(WCHAR)); - memcpy(ppd->Description, pv.u.pwszVal, desclen * sizeof(WCHAR)); - ppd->Module = wine_vxd_drv; - ppd->Interface = wInterface; + ppd->Description = strdupW(pv.u.pwszVal); + ppd->Module = strdupW(wine_vxd_drv); + ppd->Interface = strdupW(wInterface); ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; PropVariantClear(&pv); @@ -463,6 +459,7 @@ static HRESULT DSPROPERTY_DescriptionA( return hr; if (!DSPROPERTY_descWtoA(&data, ppd)) hr = E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr; @@ -488,6 +485,7 @@ static HRESULT DSPROPERTY_Description1( if (FAILED(hr)) return hr; DSPROPERTY_descWto1(&data, ppd); + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr;

1 0

Dmitry Timoshkov : user.exe16: Fix memory leak in case when HeapReAlloc fails.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: faa13dd161fd3d0aaf14c34c86d1eda2c23a85cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa13dd161fd3d0aaf14c34c8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 15:56:24 2017 +0800 user.exe16: Fix memory leak in case when HeapReAlloc fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c3ed829279cb7951688392801e3210abd19d27f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index aba797d..4a00d58 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3245,8 +3245,11 @@ DWORD WINAPI FormatMessage16( /* CMF - This makes a BIG assumption about va_list */ while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { + LPSTR new_b; sz = (ret == -1 ? sz + 100 : ret + 1); - b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + new_b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + if (!new_b) break; + b = new_b; } for (x=b; *x; x++) ADD_TO_T(*x); HeapFree(GetProcessHeap(), 0, b);

1 0

Józef Kucia : user32: Fix memory leak in WinHelpA().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: ee4165f4373b96328b90f35d279c66af49835967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4165f4373b96328b90f35d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 30 12:21:54 2017 +0200 user32: Fix memory leak in WinHelpA(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae9d5ce5f70ca196ee6b71e9d16cd4ded914d4f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/winhelp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index a2c331b..c40b0fc 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -80,6 +80,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD HWND hDest; int size, dsize, nlen; WINHELP* lpwh; + LRESULT ret; hDest = FindWindowA("MS_WINHELP", NULL); if (!hDest) @@ -156,7 +157,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); - return SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + ret = SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + HeapFree(GetProcessHeap(), 0, lpwh); + return ret; }

1 0

Michael Stefaniuc : fonts: Increase the Em size to fix a build failure with freetype 2.8.1.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 68852272b7ae275ef230178588fc198d78097e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68852272b7ae275ef23017858… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:42 2017 +0200 fonts: Increase the Em size to fix a build failure with freetype 2.8.1. Freetype 2.8.1 implemented the stricter Em bounds from OpenType 1.8.2 which require a minimum Em size of 16. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40166848a7944383a4cfdaac9b18bd03fbb2b4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- fonts/courier.sfd | 1015 +++++++++++++------------- fonts/courier.ttf | Bin 17884 -> 17892 bytes fonts/fixedsys.sfd | 519 ++++++------- fonts/fixedsys.ttf | Bin 10696 -> 10704 bytes fonts/ms_sans_serif.sfd | 1051 +++++++++++++------------- fonts/ms_sans_serif.ttf | Bin 38360 -> 38536 bytes fonts/small_fonts.sfd | 1825 +++++++++++++++++++++++----------------------- fonts/small_fonts.ttf | Bin 18796 -> 19068 bytes fonts/small_fonts_jp.sfd | 881 +++++++++++----------- fonts/small_fonts_jp.ttf | Bin 9820 -> 9828 bytes 10 files changed, 2648 insertions(+), 2643 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68852272b7ae275ef2301…

1 0

Michael Stefaniuc : tools/sfnt2fon: Just skip all glyphs below 0x20.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: a4cea8118a92f90c60cb13c8f292ecacc5bc6b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cea8118a92f90c60cb13c8f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:41 2017 +0200 tools/sfnt2fon: Just skip all glyphs below 0x20. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89e79d8144308a24676ef069d567a14655985b0c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index ea915da..25f0763 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -439,9 +439,9 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, el = 0; first_char = FT_Get_First_Char(face, &gi); - if(first_char == 0xd) /* fontforge's first glyph is 0xd, we'll catch this and skip it */ - first_char = 32; /* FT_Get_Next_Char for some reason returns too high - number in this case */ + if(first_char < 0x20) /* Ignore glyphs below 0x20 */ + first_char = 0x20; /* FT_Get_Next_Char for some reason returns too high + number in this case */ info = calloc( 1, sizeof(*info) );

1 0

Nikolay Sivov : gdi32: Pick first charmap if none was selected using preferred encoding.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 9f96ad8edb12e53c54bc235da57ea8ffc5bdd951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f96ad8edb12e53c54bc235da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 10:13:47 2017 +0100 gdi32: Pick first charmap if none was selected using preferred encoding. FreeType 2.8.1 has similar logic removed from WinFNT module, that always pre-selected first charmap. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d82321006de92dcd74465c905121618a76eae76a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a5147b5..e8cdd14 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5145,6 +5145,13 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) if (select_charmap( face, *encs )) break; encs++; } + + if (!face->charmap && face->num_charmaps) + { + if (!pFT_Set_Charmap(face, face->charmaps[0])) + return face->charmap->encoding; + } + return *encs; }

1 0

Nikolay Sivov : comctl32/toolbar: Support undocumented IDs for standard bitmap lists.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 852b83950ee06fa06e9ba42fa6e3a6b23424beb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852b83950ee06fa06e9ba42fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:39 2017 +0300 comctl32/toolbar: Support undocumented IDs for standard bitmap lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d93ae6ff346d0a84ad0db2cc034b72f0595e59e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 93 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 7 +++- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a8bcd40..1cfbe3e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -490,13 +490,81 @@ static void add_128x15_bitmap(HWND hToolbar, int nCmds) static void test_add_bitmap(void) { + TBADDBITMAP stdsmall, std; HWND hToolbar = NULL; TBADDBITMAP bmp128; TBADDBITMAP bmp80; - TBADDBITMAP stdsmall; TBADDBITMAP addbmp; HIMAGELIST himl; - INT ret; + INT ret, id; + + /* Test default bitmaps range */ + for (id = IDB_STD_SMALL_COLOR; id < IDB_HIST_LARGE_COLOR; id++) + { + HIMAGELIST himl; + int cx, cy, count; + + rebuild_toolbar(&hToolbar); + + std.hInst = HINST_COMMCTRL; + std.nID = id; + + ret = SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&std); + ok(ret == 0, "Got %d\n", ret); + + himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); + ok(himl != NULL, "Got %p\n", himl); + + ret = ImageList_GetIconSize(himl, &cx, &cy); + ok(ret, "Got %d\n", ret); + ok(cx == cy, "Got %d x %d\n", cx, cy); + + count = ImageList_GetImageCount(himl); + + /* Image count */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case IDB_STD_LARGE_COLOR: + case 2: + case 3: + ok(count == 15, "got count %d\n", count); + break; + case IDB_VIEW_SMALL_COLOR: + case IDB_VIEW_LARGE_COLOR: + case 6: + case 7: + ok(count == 12, "got count %d\n", count); + break; + case IDB_HIST_SMALL_COLOR: + case IDB_HIST_LARGE_COLOR: + ok(count == 5, "got count %d\n", count); + break; + default: + ok(0, "id %d, count %d\n", id, count); + } + + /* Image sizes */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case 2: + case IDB_VIEW_SMALL_COLOR: + case 6: + case IDB_HIST_SMALL_COLOR: + ok(cx == 16, "got size %d\n", cx); + break; + case IDB_STD_LARGE_COLOR: + case 3: + case IDB_VIEW_LARGE_COLOR: + case 7: + case IDB_HIST_LARGE_COLOR: + ok(cx == 24, "got size %d\n", cx); + break; + default: + ok(0, "id %d, size %d\n", id, cx); + } + } /* empty 128x15 bitmap */ bmp128.hInst = GetModuleHandleA(NULL); @@ -2408,6 +2476,26 @@ todo_wine DestroyWindow(hwnd); } +static void test_imagelist(void) +{ + HIMAGELIST imagelist; + HWND hwnd = NULL; + int ret; + + rebuild_toolbar(&hwnd); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + ret = SendMessageA(hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(16, 16)); + ok(ret, "got %d\n", ret); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2453,6 +2541,7 @@ START_TEST(toolbar) test_noresize(); test_save(); test_drawtext_flags(); + test_imagelist(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 92ab856..b6e4a05 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2809,18 +2809,22 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp switch (lpAddBmp->nID) { case IDB_STD_SMALL_COLOR: + case 2: info.nButtons = 15; info.nID = IDB_STD_SMALL; break; case IDB_STD_LARGE_COLOR: + case 3: info.nButtons = 15; info.nID = IDB_STD_LARGE; break; case IDB_VIEW_SMALL_COLOR: + case 6: info.nButtons = 12; info.nID = IDB_VIEW_SMALL; break; case IDB_VIEW_LARGE_COLOR: + case 7: info.nButtons = 12; info.nID = IDB_VIEW_LARGE; break; @@ -2833,6 +2837,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nID = IDB_HIST_LARGE; break; default: + WARN("unknown bitmap id, %ld\n", lpAddBmp->nID); return -1; } @@ -4345,7 +4350,7 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam);

1 0

Nikolay Sivov : comctl32/toolbar: Don't add NULL imagelist entries.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: dfda3173b3951781fa197c625d34bbe861d220b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfda3173b3951781fa197c625… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:38 2017 +0300 comctl32/toolbar: Don't add NULL imagelist entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ece34a1319f47cb7cd242c0f95d57cd1d35ae8f4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 784745c..92ab856 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6903,6 +6903,10 @@ static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIS /* Check if the entry already exists */ c = TOOLBAR_GetImageListEntry(*pies, *cies, id); + /* Don't add new entry for NULL imagelist */ + if (!c && !himl) + return NULL; + /* If this is a new entry we must create it and insert into the array */ if (!c) {

1 0

Nikolay Sivov : comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 04c5da5629145fd2d22571bddb4e8b64f20dd19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c5da5629145fd2d22571bdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:50:54 2017 +0300 comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 970029bb9ba33928bb20c5e397d47f023e4a6501) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 13 ++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f2f7924..a8bcd40 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2367,6 +2367,47 @@ static void test_save(void) RegCloseKey( key ); } +static void test_drawtext_flags(void) +{ + HWND hwnd = NULL; + UINT flags; + + rebuild_toolbar(&hwnd); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + + /* zero mask, flags are retained */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + /* set/remove */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags); + ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2411,6 +2452,7 @@ START_TEST(toolbar) test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); + test_drawtext_flags(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0c545a2..784745c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4546,17 +4546,16 @@ TOOLBAR_SetDisabledImageList (TOOLBAR_INFO *infoPtr, WPARAM wParam, HIMAGELIST h static LRESULT -TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) { - DWORD dwTemp; + DWORD old_flags; - TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", infoPtr->hwndSelf, (DWORD)wParam, (DWORD)lParam); + TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); - dwTemp = infoPtr->dwDTFlags; - infoPtr->dwDTFlags = - (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; + old_flags = infoPtr->dwDTFlags; + infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); - return (LRESULT)dwTemp; + return (LRESULT)old_flags; } /* This function differs a bit from what MSDN says it does:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017