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

Vincent Povirk : mscoree: Don't return from _CorExeMain.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: fe4f00681e8e4f1c63ab253490af0d3acfd0262c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4f00681e8e4f1c63ab2534… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:21:59 2019 -0500 mscoree: Don't return from _CorExeMain. Testing on Windows shows that unmanaged threads do not keep the process open after a .NET program's entry point and all .NET foreground threads have exited. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ca8ba0d..95f6a9a 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1524,6 +1524,8 @@ __int32 WINAPI _CorExeMain(void) mono_runtime_quit(); } + ExitProcess(exit_code); + return exit_code; }

1 0

Detlef Riekenberg : combase/tests: Remove a no longer useful test.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: baac17030cfb9d6aec5549125f117c5ff47c0b86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baac17030cfb9d6aec554912… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 17:43:39 2019 +0200 combase/tests: Remove a no longer useful test. Microsoft changed the behavior from returning NULL into returning a valid pointer. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 7a705da..04d0f3e 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -227,7 +227,6 @@ static void test_string_buffer(void) /* Test creation of an empty buffer */ ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); - ok(buf == NULL, "Empty string buffer isn't a null string\n"); ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n");

1 0

Detlef Riekenberg : iphlpapi/tests: Remove a test with a wrong assumption.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: f0db9c4b3be1f44289d2f7e26d4fa3548edf6d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db9c4b3be1f44289d2f7e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 18:25:22 2019 +0200 iphlpapi/tests: Remove a test with a wrong assumption. The order of the interfaces is not fixed and can change, Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1be9f3c..a2be862 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -285,9 +285,6 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - /* loopback must never be the first when more than one interface is found */ - if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) - ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Vijay Kiran Kamuju : taskmgr: Use StrFormatKBSizeW/ StrFormatByteSizeW to show memory usage.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 17056908acae1d5c7cf5d255ec232210abfe86da URL: https://source.winehq.org/git/wine.git/?a=commit;h=17056908acae1d5c7cf5d255… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 3 15:18:37 2019 +0200 taskmgr: Use StrFormatKBSizeW/StrFormatByteSizeW to show memory usage. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/graph.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 48313e9..6006ac3 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e1..9a8f569 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commctrl.h> +#include <shlwapi.h> #include <winnt.h> #include "taskmgr.h" @@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - /* * Get the client area rectangle */ @@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); + if (CommitChargeTotal < 1024) + StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); + else + StrFormatByteSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); /* * Draw the font text onto the graph

1 0

Piotr Caban : winspool.drv: Don't use strcasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 4c106a931934a8fee8e2f0e07d5420efe7e22919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c106a931934a8fee8e2f0e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:48 2019 +0200 winspool.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bfa63f9..763d244 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1194,14 +1194,14 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) e = s; while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; for(prettyname = s+1; isspace(*prettyname); prettyname++) ; } e = prettyname + strlen(prettyname); while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; /* prettyname must fit into the dmDeviceName member of DEVMODE struct, * if it is too long, we use it as comment below. */

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: ae4d8e1838753a11666592b6406fabd7789f8a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4d8e1838753a11666592b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:28 2019 +0300 comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 211 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4d8e1838753a116665…

1 0

Gabriel Ivăncescu : comctl32/button: Implement split buttons.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: ee2f71d8f6f00d6252a8a1a37dc2c37806dc7f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2f71d8f6f00d6252a8a1a3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:29 2019 +0300 comctl32/button: Implement split buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20123 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2f71d8f6f00d6252a8…

1 0

Gabriel Ivăncescu : comctl32/button: Implement themed split buttons.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 6fbb64fe6751ca2beb8fe832b57751cf6fb8e08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fbb64fe6751ca2beb8fe832… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:30 2019 +0300 comctl32/button: Implement themed split buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20123 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 47933c0..1f29fb2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -170,6 +170,7 @@ typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void SB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -185,8 +186,8 @@ static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = CB_ThemedPaint, /* BS_AUTORADIOBUTTON */ NULL, /* BS_PUSHBOX */ NULL, /* BS_OWNERDRAW */ - NULL, /* BS_SPLITBUTTON */ - NULL, /* BS_DEFSPLITBUTTON */ + SB_ThemedPaint, /* BS_SPLITBUTTON */ + SB_ThemedPaint, /* BS_DEFSPLITBUTTON */ NULL, /* BS_COMMANDLINK */ NULL, /* BS_DEFCOMMANDLINK */ }; @@ -2526,6 +2527,114 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (hPrevFont) SelectObject(hDC, hPrevFont); } +static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) +{ + HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; + RECT rc, content_rect, push_rect, dropdown_rect; + NMCUSTOMDRAW nmcd; + LRESULT cdrf; + HWND parent; + + GetClientRect(infoPtr->hwnd, &rc); + init_custom_draw(&nmcd, infoPtr, hDC, &rc); + + parent = GetParent(infoPtr->hwnd); + if (!parent) parent = infoPtr->hwnd; + + /* Send erase notifications */ + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + + /* The zone outside the content is ignored for the dropdown (draws over) */ + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &rc, &content_rect); + get_split_button_rects(infoPtr, &rc, &push_rect, &dropdown_rect); + + if (infoPtr->split_style & BCSS_NOSPLIT) + { + push_rect = rc; + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + } + else + { + RECT r = { dropdown_rect.left, content_rect.top, dropdown_rect.right, content_rect.bottom }; + UINT edge = (infoPtr->split_style & BCSS_ALIGNLEFT) ? BF_RIGHT : BF_LEFT; + const RECT *clip = NULL; + + /* If only the dropdown is pressed, we need to draw it separately */ + if (state != PBS_PRESSED && (infoPtr->state & BST_DROPDOWNPUSHED)) + { + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, PBS_PRESSED, &rc, &dropdown_rect); + clip = &push_rect; + } + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, clip); + + /* Draw the separator */ + DrawThemeEdge(theme, hDC, BP_PUSHBUTTON, state, &r, EDGE_ETCHED, edge, NULL); + + /* The content rect should be the content area of the push button */ + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + } + + if (cdrf & CDRF_NOTIFYPOSTERASE) + { + nmcd.dwDrawStage = CDDS_POSTERASE; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + + /* Send paint notifications */ + nmcd.dwDrawStage = CDDS_PREPAINT; + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (!(cdrf & CDRF_DOERASE)) + { + COLORREF old_color, color; + INT old_bk_mode; + WCHAR *text; + + if ((text = get_button_text(infoPtr))) + { + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect); + heap_free(text); + } + + GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color); + old_bk_mode = SetBkMode(hDC, TRANSPARENT); + old_color = SetTextColor(hDC, color); + + draw_split_button_dropdown_glyph(infoPtr, hDC, &dropdown_rect); + + SetTextColor(hDC, old_color); + SetBkMode(hDC, old_bk_mode); + } + + if (cdrf & CDRF_NOTIFYPOSTPAINT) + { + nmcd.dwDrawStage = CDDS_POSTPAINT; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + + if (focused) + { + MARGINS margins; + + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + push_rect.left += margins.cxLeftWidth; + push_rect.top += margins.cyTopHeight; + push_rect.right -= margins.cxRightWidth; + push_rect.bottom -= margins.cyBottomHeight; + DrawFocusRect(hDC, &push_rect); + } + +cleanup: + if (old_font) SelectObject(hDC, old_font); +} + void BUTTON_Register(void) { WNDCLASSW wndClass;

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for BCN_DROPDOWN notification.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 09bdf5d07d2bb7f4f6c7eac08e1cc5f65d0a8694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09bdf5d07d2bb7f4f6c7eac0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:31 2019 +0300 comctl32/tests: Add tests for BCN_DROPDOWN notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 4de0769..bb9c87f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -186,6 +186,7 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam static HDC cd_first_hdc; struct message msg = { 0 }; NMCUSTOMDRAW *cd = (NMCUSTOMDRAW*)lParam; + NMBCDROPDOWN *bcd = (NMBCDROPDOWN*)lParam; LRESULT ret; if (ignore_message( message )) return 0; @@ -252,6 +253,29 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam return ret; } + if (message == WM_NOTIFY && bcd->hdr.code == BCN_DROPDOWN) + { + UINT button = GetWindowLongW(bcd->hdr.hwndFrom, GWL_STYLE) & BS_TYPEMASK; + RECT rc; + + GetClientRect(bcd->hdr.hwndFrom, &rc); + + ok(bcd->hdr.hwndFrom != NULL, "Received BCN_DROPDOWN with no hwnd attached, wParam %lu id %lu\n", + wParam, bcd->hdr.idFrom); + ok(bcd->hdr.idFrom == wParam, "[%u] Mismatch between wParam (%lu) and idFrom (%lu)\n", + button, wParam, bcd->hdr.idFrom); + ok(EqualRect(&rc, &bcd->rcButton), "[%u] Wrong rcButton, expected %s got %s\n", + button, wine_dbgstr_rect(&rc), wine_dbgstr_rect(&bcd->rcButton)); + + msg.message = message; + msg.flags = sent|parent|wparam|lparam|id; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = BCN_DROPDOWN; + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + return 0; + } + if (message == WM_PAINT) { PAINTSTRUCT ps; @@ -569,6 +593,20 @@ static const struct message pre_post_pre_post_cd_seq[] = { 0 } }; +static const struct message bcn_dropdown_seq[] = +{ + { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, + { BCM_SETDROPDOWNSTATE, sent|wparam|lparam|defwinproc, 1, 0 }, + { WM_NOTIFY, sent|parent|id, 0, 0, BCN_DROPDOWN }, + { BCM_SETDROPDOWNSTATE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_KEYUP, sent|wparam|lparam, VK_DOWN, 0xc0000000 }, + { WM_PAINT, sent }, + { WM_DRAWITEM, sent|parent|optional }, /* for owner draw button */ + { WM_PAINT, sent|optional }, /* sometimes sent rarely */ + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; + static HWND create_button(DWORD style, HWND parent) { HMENU menuid = 0; @@ -932,6 +970,17 @@ static void test_button_messages(void) } disable_test_cd(); + + if (!broken(LOBYTE(LOWORD(GetVersion())) < 6)) /* not available pre-Vista */ + { + /* Send down arrow key to make the buttons send the drop down notification */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); + SendMessageW(hwnd, WM_KEYUP, VK_DOWN, 0xc0000000); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, bcn_dropdown_seq, "BCN_DROPDOWN from the button", FALSE); + } + DestroyWindow(hwnd); }

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETIDEALSIZE for split buttons.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 9c62f7e42bc4ba0f87d23dd59eb4d6091a6e0059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c62f7e42bc4ba0f87d23dd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:32 2019 +0300 comctl32/button: Implement BCM_GETIDEALSIZE for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1f29fb2..e974f86 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -197,6 +197,7 @@ typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -211,9 +212,9 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ GB_GetIdealSize, /* BS_PUSHBOX */ GB_GetIdealSize, /* BS_OWNERDRAW */ + SB_GetIdealSize, /* BS_SPLITBUTTON */ + SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_SPLITBUTTON */ - PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ PB_GetIdealSize, /* BS_COMMANDLINK */ PB_GetIdealSize /* BS_DEFCOMMANDLINK */ }; @@ -1347,6 +1348,25 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG extra_width = infoPtr->glyph_size.cx * 2 + GetSystemMetrics(SM_CXEDGE); + SIZE label_size; + + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + size->cx = max(size->cx, extra_width); + } + else + { + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &label_size); + size->cx = label_size.cx + ((size->cx == 0) ? extra_width : 0); + size->cy = label_size.cy; + } + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects *

1 0