July 2018 - Wine-Commits - list.winehq.org

Zhiyi Zhang : comctl32/taskdialog: Use dynamic buffer for taskdialog_get_label_size().
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 07d8d624598ad74933970063e29040c10b4675c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d8d624598ad74933970063… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 26 11:35:24 2018 +0800 comctl32/taskdialog: Use dynamic buffer for taskdialog_get_label_size(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 33fb578..5625f2b 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -235,7 +235,7 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND HFONT hfont, old_hfont; HDC hdc; RECT rect = {0}; - WCHAR text[1024]; + WCHAR *text; INT text_length; if (syslink) @@ -250,7 +250,15 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND style |= DT_LEFT; hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - text_length = GetWindowTextW(hwnd, text, ARRAY_SIZE(text)); + text_length = GetWindowTextLengthW(hwnd); + text = Alloc((text_length + 1) * sizeof(WCHAR)); + if (!text) + { + size->cx = 0; + size->cy = 0; + return; + } + GetWindowTextW(hwnd, text, text_length + 1); hdc = GetDC(hwnd); old_hfont = SelectObject(hdc, hfont); rect.right = max_width; @@ -258,6 +266,7 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND size->cx = min(max_width, rect.right - rect.left); if (old_hfont) SelectObject(hdc, old_hfont); ReleaseDC(hwnd, hdc); + Free(text); } static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon)

1 0

Alexandre Julliard : comdlg32/filedlg: Resize the Places toolbar along with the dialog.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 75ff2c12342101acd533cfb8c91c34fe9326ee92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75ff2c12342101acd533cfb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 13:39:23 2018 +0200 comdlg32/filedlg: Resize the Places toolbar along with the dialog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/filedlg.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 0dc2b48..22a5a93 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -487,7 +487,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 7bed515..deae866 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1241,6 +1241,10 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) rc.bottom - rc.top + chgy, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); break; + case IDC_TOOLBARPLACES: + DeferWindowPos( hdwp, ctrl, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top + chgy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + break; } } }

1 0

Dmitry Timoshkov : comctl32/listbox: Fix the listbox sorting algorithm.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 02c36b52b0071482d369deacb3a617a7f01e8a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c36b52b0071482d369deac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:34 2018 +0300 comctl32/listbox: Fix the listbox sorting algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 11 ++++++----- dlls/comctl32/tests/listbox.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a1fdf83..e033975 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -791,10 +791,11 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { INT index, min, max, res; - if (!(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + if (!descr->nb_items || !(descr->style & LBS_SORT)) return -1; /* Add it at the end */ + min = 0; - max = descr->nb_items; - while (min != max) + max = descr->nb_items - 1; + while (min <= max) { index = (min + max) / 2; if (HAS_STRINGS(descr)) @@ -817,10 +818,10 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res > 0) max = index; + if (res > 0) max = index - 1; else min = index + 1; } - return exact ? -1 : max; + return exact ? -1 : min; } diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 69d3381..9af675b 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2032,7 +2032,7 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); ok(ret == 2, "expected 2, got %ld\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", FALSE); DestroyWindow(listbox); /* LBS_HASSTRINGS */

1 0

Zebediah Figura : quartz: Inline copying pin info and update comment.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 1105d0bafb4d86731795600116ff49d9f65ebaa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1105d0bafb4d867317956001… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:25 2018 +0200 quartz: Inline copying pin info and update comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5197d5c..a3674f2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -138,18 +138,6 @@ out: return hr; } - -static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) -{ - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ - strcpyW(pDest->achName, pSrc->achName); - pDest->dir = pSrc->dir; - pDest->pFilter = pSrc->pFilter; -} - static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) { return IPin_EndOfStream( pin ); @@ -179,15 +167,20 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) /*** PullPin implementation ***/ -static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, - QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, PullPin * pPinImpl) +static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info, + SAMPLEPROC_PULL pSampleProc, void *pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, PullPin *pPinImpl) { /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl; pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; - Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); + /* avoid copying uninitialized data */ + strcpyW(pPinImpl->pin.pinInfo.achName, info->achName); + pPinImpl->pin.pinInfo.dir = info->dir; + pPinImpl->pin.pinInfo.pFilter = info->pFilter; ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); /* Input pin attributes */

1 0

Jason Edmeades : xcopy: Add support for xcopy /k.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 1bfe68512d4b10c3426e05564e13d18800420470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bfe68512d4b10c3426e0556… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:41 2018 +0100 xcopy: Add support for xcopy /k. xcopy should remove read only permissions from the destination file unless the /k option is supplied. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40706 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 38 +++++++++++++++++++++++++++++++++++++- po/bg.po | 3 ++- po/ca.po | 38 +++++++++++++++++++++++++++++++++++++- po/cs.po | 38 +++++++++++++++++++++++++++++++++++++- po/da.po | 38 +++++++++++++++++++++++++++++++++++++- po/de.po | 38 +++++++++++++++++++++++++++++++++++++- po/el.po | 3 ++- po/en.po | 4 +++- po/en_US.po | 4 +++- po/eo.po | 3 ++- po/es.po | 38 +++++++++++++++++++++++++++++++++++++- po/fa.po | 3 ++- po/fi.po | 38 +++++++++++++++++++++++++++++++++++++- po/fr.po | 38 +++++++++++++++++++++++++++++++++++++- po/he.po | 38 +++++++++++++++++++++++++++++++++++++- po/hi.po | 3 ++- po/hr.po | 38 +++++++++++++++++++++++++++++++++++++- po/hu.po | 38 +++++++++++++++++++++++++++++++++++++- po/it.po | 38 +++++++++++++++++++++++++++++++++++++- po/ja.po | 38 +++++++++++++++++++++++++++++++++++++- po/ko.po | 38 +++++++++++++++++++++++++++++++++++++- po/lt.po | 38 +++++++++++++++++++++++++++++++++++++- po/ml.po | 3 ++- po/nb_NO.po | 38 +++++++++++++++++++++++++++++++++++++- po/nl.po | 38 +++++++++++++++++++++++++++++++++++++- po/or.po | 3 ++- po/pa.po | 3 ++- po/pl.po | 38 +++++++++++++++++++++++++++++++++++++- po/pt_BR.po | 38 +++++++++++++++++++++++++++++++++++++- po/pt_PT.po | 38 +++++++++++++++++++++++++++++++++++++- po/rm.po | 3 ++- po/ro.po | 38 +++++++++++++++++++++++++++++++++++++- po/ru.po | 38 +++++++++++++++++++++++++++++++++++++- po/sk.po | 3 ++- po/sl.po | 38 +++++++++++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 3 ++- po/sr_RS(a)latin.po | 3 ++- po/sv.po | 38 +++++++++++++++++++++++++++++++++++++- po/te.po | 3 ++- po/th.po | 3 ++- po/tr.po | 38 +++++++++++++++++++++++++++++++++++++- po/uk.po | 38 +++++++++++++++++++++++++++++++++++++- po/wa.po | 3 ++- po/wine.pot | 3 ++- po/zh_CN.po | 38 +++++++++++++++++++++++++++++++++++++- po/zh_TW.po | 38 +++++++++++++++++++++++++++++++++++++- programs/xcopy/tests/xcopy.c | 25 +++++++++++++++++++++++++ programs/xcopy/xcopy.c | 25 ++++++++++++++++++------- programs/xcopy/xcopy.h | 1 + programs/xcopy/xcopy.rc | 1 + 50 files changed, 1119 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bfe68512d4b10c3426e…

1 0

Zebediah Figura : strmbase: Update comment for copying pin info.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 567be5b60ee6c165828f6a43b252299b5f9f6dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=567be5b60ee6c165828f6a43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:43:24 2018 +0200 strmbase: Update comment for copying pin info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ef22a57..a100ae1 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -145,10 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { - /* Tempting to just do a memcpy, but the name field is - 128 characters long! We will probably never exceed 10 - most of the time, so we are better off copying - each field manually */ + /* avoid copying uninitialized data */ strcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter;

1 0

Dmitry Timoshkov : comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 7decba4e2bf985acbc38d9895e18d691ac914a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7decba4e2bf985acbc38d989… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 5 08:14:33 2018 +0300 comctl32/listbox: Fix order of items passed in WM_COMPAREITEM data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42602 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 12 ++++++------ dlls/comctl32/tests/listbox.c | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 94712fd..a1fdf83 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -798,7 +798,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, str, descr->items[index].str); + res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); else { COMPAREITEMSTRUCT cis; @@ -809,15 +809,15 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) cis.hwndItem = descr->self; /* note that some application (MetaStock) expects the second item * to be in the listbox */ - cis.itemID1 = -1; - cis.itemData1 = (ULONG_PTR)str; - cis.itemID2 = index; - cis.itemData2 = descr->items[index].data; + cis.itemID1 = index; + cis.itemData1 = descr->items[index].data; + cis.itemID2 = -1; + cis.itemData2 = (ULONG_PTR)str; cis.dwLocaleId = descr->locale; res = SendMessageW( descr->owner, WM_COMPAREITEM, id, (LPARAM)&cis ); } if (!res) return index; - if (res < 0) max = index; + if (res > 0) max = index; else min = index + 1; } return exact ? -1 : max; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 790c2c4..69d3381 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -326,9 +326,7 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA ok(wParam == cis->CtlID, "expected %#x, got %#lx\n", cis->CtlID, wParam); ok(cis->hwndItem == ctrl, "expected %p, got %p\n", ctrl, cis->hwndItem); -todo_wine ok((int)cis->itemID1 >= 0, "expected >= 0, got %d\n", cis->itemID1); -todo_wine ok((int)cis->itemID2 == -1, "expected -1, got %d\n", cis->itemID2); if (cis->CtlType == ODT_LISTBOX) @@ -2030,10 +2028,8 @@ static void test_WM_MEASUREITEM(void) ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 0"); ok(ret == 0, "expected 0, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); -todo_wine ok(ret == 1, "expected 1, got %ld\n", ret); ret = SendMessageA(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); -todo_wine ok(ret == 2, "expected 2, got %ld\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, lb_addstring_sort_parent_seq, "LB_ADDSTRING (LBS_SORT)", TRUE);

1 0

Alexandre Julliard : server: Don' t clip update regions to the desktop window.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 8cfac3b218669edcef8b92ea8370b0579eb23ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfac3b218669edcef8b92ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 5 12:48:13 2018 +0200 server: Don't clip update regions to the desktop window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- server/window.c | 23 ++++++++--------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0cfafe4..cb918fa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4760,7 +4760,7 @@ static void test_showwindow(void) flush_sequence(); ShowWindow(hwnd, SW_SHOWMAXIMIZED); ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); DestroyWindow(hwnd); flush_sequence(); @@ -5339,7 +5339,7 @@ static void test_messages(void) hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, -10, -10, 10000, 10000, NULL, 0, 0, NULL ); ok (hwnd != 0, "Failed to create popup window\n"); - ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", TRUE); + ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", FALSE); DestroyWindow(hwnd); diff --git a/server/window.c b/server/window.c index 0a32d46..322001d 100644 --- a/server/window.c +++ b/server/window.c @@ -1141,27 +1141,20 @@ struct window_class* get_window_class( user_handle_t window ) /* the returned rectangle is in window coordinates; return 0 if rectangle is empty */ static int get_window_visible_rect( struct window *win, rectangle_t *rect, int frame ) { - int offset_x = 0, offset_y = 0; - - if (!(win->style & WS_VISIBLE)) return 0; + int offset_x = win->window_rect.left, offset_y = win->window_rect.top; *rect = frame ? win->window_rect : win->client_rect; - if (!is_desktop_window(win)) - { - offset_x = win->window_rect.left; - offset_y = win->window_rect.top; - } - while (win->parent) + if (!(win->style & WS_VISIBLE)) return 0; + if (is_desktop_window( win )) return 1; + + while (!is_desktop_window( win->parent )) { win = win->parent; if (!(win->style & WS_VISIBLE) || win->style & WS_MINIMIZE) return 0; - if (!is_desktop_window(win)) - { - offset_x += win->client_rect.left; - offset_y += win->client_rect.top; - offset_rect( rect, win->client_rect.left, win->client_rect.top ); - } + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_rect( rect, win->client_rect.left, win->client_rect.top ); if (!intersect_rect( rect, rect, &win->client_rect )) return 0; if (!intersect_rect( rect, rect, &win->window_rect )) return 0; }

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for radio buttons.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 4836727d5e8ccf848971b67992c3d67eac54db36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4836727d5e8ccf848971b679… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 26 11:36:37 2018 +0800 comctl32/taskdialog: Add support for radio buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 139 ++++++++++++++++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 172 ++++++++++++++++++++++++++++++++++----- 2 files changed, 290 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4836727d5e8ccf848971…

1 0

Michael Stefaniuc : quartz: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: e7bcc1193aeb88079e63d7e799daff43ff5c8522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7bcc1193aeb88079e63d7e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:22 2018 +0200 quartz: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index d78f643..d189d1d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - typedef struct FilterMapper3Impl { IUnknown IUnknown_inner; @@ -264,7 +262,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory( { LPWSTR wClsidAMCat = NULL; LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + ARRAY_SIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; HKEY hKey = NULL; LONG lRet; HRESULT hr; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c LPWSTR wszClsid = NULL; HKEY hKey; LONG lRet; - WCHAR wszKeyName[ARRAYSIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); @@ -1337,7 +1335,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin( HKEY hKey = NULL; HKEY hPinsKey = NULL; WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); @@ -1498,7 +1496,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID LONG lRet; LPWSTR wszClsid = NULL; HKEY hKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s)\n", iface, debugstr_guid(&Filter)); @@ -1563,7 +1561,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi LPWSTR wszClsid = NULL; HKEY hKey = NULL; WCHAR * wszPinNameKey; - WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; + WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(Name));

1 0