wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Piotr Caban : msvcp90: Don't set failbit in basic_istream::tellg.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 98bc9fdaa431f274fe3a9fc538b0b562c6fad981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98bc9fdaa431f274fe3a9fc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 19 17:59:55 2018 +0200 msvcp90: Don't set failbit in basic_istream::tellg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42304 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 11 ----------- dlls/msvcp90/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f85997..fb9d668 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8823,9 +8823,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -8842,9 +8839,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); #endif return ret; @@ -10398,9 +10392,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -10417,8 +10408,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); #endif return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 8a91117..970b17a 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1857,6 +1857,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1884,6 +1888,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);

1 0

Jacek Caban : winegcc: Check also for unsuffixed lib/ dir in get_lib_dir.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 551d0971c54896f286e41a39217094a477363d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551d0971c54896f286e41a39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 16:50:33 2018 +0200 winegcc: Check also for unsuffixed lib/ dir in get_lib_dir. Wine uses lib/ and lib64/ by default. This fixes -m32 handling in such configuration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5d604d2..931ac53 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -458,7 +458,12 @@ static char *get_lib_dir( struct options *opts ) while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; - if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; + if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) + { + p -= 2; + strcpy( p, libwine ); + if (check_platform( opts, buffer )) goto found; + } if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) { strcpy( p, "32" );

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for footer text.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 3fcfb9c5cc15c9a3a94c328075fea81545631ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcfb9c5cc15c9a3a94c3280… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:44 2018 +0800 comctl32/taskdialog: Add support for footer text. 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 | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 3508dbc..457a5ff 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -68,6 +68,7 @@ struct taskdialog_info HWND expando_button; HWND verification_box; HWND footer_icon; + HWND footer_text; HWND *buttons; INT button_count; HWND default_button; @@ -737,6 +738,12 @@ static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); } +static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) +{ + dialog_info->footer_text = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszFooter, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -766,6 +773,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; + LONG footer_icon_right, footer_icon_bottom; LONG x, y; SIZE size; INT i; @@ -952,6 +960,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(line_widths); /* Footer icon */ + footer_icon_right = 0; + footer_icon_bottom = dialog_height; if (dialog_info->footer_icon) { x = h_spacing; @@ -959,9 +969,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) size.cx = GetSystemMetrics(SM_CXSMICON); size.cy = GetSystemMetrics(SM_CYSMICON); SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); - dialog_height = y + size.cy; + footer_icon_right = x + size.cx; + footer_icon_bottom = y + size.cy; } + /* Footer text */ + taskdialog_label_layout(dialog_info, dialog_info->footer_text, footer_icon_right, dialog_width, &dialog_height, + syslink); + dialog_height = max(dialog_height, footer_icon_bottom); + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1058,6 +1074,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); taskdialog_add_footer_icon(dialog_info); + taskdialog_add_footer_text(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) @@ -1184,7 +1201,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; if ((taskdialog_hyperlink_enabled(dialog_info)) - && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info + || hwndFrom == dialog_info->footer_text) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for footer icon.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 615f3a1fb71594ac62a5d52be0431314af8e6c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=615f3a1fb71594ac62a5d52b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:34 2018 +0800 comctl32/taskdialog: Add support for footer icon. 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 | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 411b8e9..3508dbc 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -67,6 +67,7 @@ struct taskdialog_info HWND expanded_info; HWND expando_button; HWND verification_box; + HWND footer_icon; HWND *buttons; INT button_count; HWND default_button; @@ -446,17 +447,24 @@ static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; + INT cx = 0, cy = 0; HICON hicon; if (!icon) return; - if ((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + if (((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + || ((flags & TDF_USE_HICON_FOOTER) && element == TDIE_ICON_FOOTER)) hicon = icon; else { - hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (element == TDIE_ICON_FOOTER) + { + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + } + hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); if (!hicon) - hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); } @@ -467,6 +475,8 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->hwnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hicon); SendMessageW(dialog_info->main_icon, STM_SETICON, (WPARAM)hicon, 0); } + else if (element == TDIE_ICON_FOOTER) + SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) @@ -718,6 +728,15 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) dialog_info->button_count = count; } +static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) +{ + if (!dialog_info->taskconfig->u2.hFooterIcon) return; + + dialog_info->footer_icon = + CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0); + taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -932,6 +951,17 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Footer icon */ + if (dialog_info->footer_icon) + { + x = h_spacing; + y = dialog_height + v_spacing; + size.cx = GetSystemMetrics(SM_CXSMICON); + size.cy = GetSystemMetrics(SM_CYSMICON); + SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + dialog_height = y + size.cy; + } + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1027,6 +1057,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_expando_button(dialog_info); taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); + taskdialog_add_footer_icon(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links)

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for verification box.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: bf6cde92fb954bb6eb94ba9b2822a7cada9b00b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6cde92fb954bb6eb94ba9b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:24 2018 +0800 comctl32/taskdialog: Add support for verification box. 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 | 58 ++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 136 +++++++++++++++++++++++++++++++-------- 2 files changed, 166 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6cde92fb954bb6eb94…

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for expando button.
by Alexandre Julliard 19 Jul '18

19 Jul '18

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for expanded information.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: ec11805139dc4a97fe6fd3b13fca23bbff7d3f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec11805139dc4a97fe6fd3b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:04 2018 +0800 comctl32/taskdialog: Add support for expanded information. 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 | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1c32a4b..db278ca 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -62,6 +62,7 @@ struct taskdialog_info INT radio_button_count; HWND *command_links; INT command_link_count; + HWND expanded_info; HWND *buttons; INT button_count; HWND default_button; @@ -74,6 +75,7 @@ struct taskdialog_info LONG v_spacing; } m; INT selected_radio_id; + BOOL expanded; }; struct button_layout_info @@ -530,6 +532,18 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) } } +static void taskdialog_add_expanded_info(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + + if (!taskconfig->pszExpandedInformation) return; + + dialog_info->expanded = taskconfig->dwFlags & TDF_EXPANDED_BY_DEFAULT; + dialog_info->expanded_info = taskdialog_create_label(dialog_info, taskconfig->pszExpandedInformation, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); + ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -644,6 +658,11 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) /* Content */ taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height, syslink); + /* Expanded information */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, main_icon_right, dialog_width, &dialog_height, + syslink); + /* Progress bar */ if (dialog_info->progress_bar) { @@ -763,6 +782,10 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Expanded information */ + if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); + /* Add height for spacing, title height and frame height */ dialog_height += v_spacing; dialog_height += GetSystemMetrics(SM_CYCAPTION); @@ -812,6 +835,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_main_icon(dialog_info); taskdialog_add_main_instruction(dialog_info); taskdialog_add_content(dialog_info); + taskdialog_add_expanded_info(dialog_info); taskdialog_add_progress_bar(dialog_info); taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); @@ -926,7 +950,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR { PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; - if ((taskdialog_hyperlink_enabled(dialog_info)) && (hwndFrom == dialog_info->content) + if ((taskdialog_hyperlink_enabled(dialog_info)) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl);

1 0

Zhiyi Zhang : comctl32/taskdialog: Use window handle to identify control internally.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: d2fb18166d8595d53d45f7d08d535bd3af67c296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2fb18166d8595d53d45f7d0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:03:51 2018 +0800 comctl32/taskdialog: Use window handle to identify control internally. Use window handle to identify control when handling BN_CLICKED notification to support buttons with id larger than 0xFFFF. 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 | 20 ++++++++++++++------ dlls/comctl32/tests/taskdialog.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 856a0b3..1c32a4b 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -82,6 +82,8 @@ struct button_layout_info LONG line; }; +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); + static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) { if (width) *width = MulDiv(*width, dialog_info->m.x_baseunit, 4); @@ -191,6 +193,13 @@ static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, if (hwnd) EnableWindow(hwnd, enable); } +static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -211,8 +220,9 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, INT command_id) +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) { + INT command_id = GetWindowLongW(hwnd, GWLP_ID); HWND radio_button; radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); @@ -389,7 +399,6 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; HWND default_button; - INT id; if (!dialog_info->radio_button_count) return; @@ -402,8 +411,7 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo if (default_button) { SendMessageW(default_button, BM_SETCHECK, BST_CHECKED, 0); - id = GetWindowLongW(default_button, GWLP_ID); - taskdialog_on_button_click(dialog_info, id); + taskdialog_on_button_click(dialog_info, default_button); } } @@ -844,7 +852,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { case TDM_CLICK_BUTTON: - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_click_button(dialog_info, wParam); break; case TDM_ENABLE_BUTTON: taskdialog_enable_button(dialog_info, wParam, lParam); @@ -899,7 +907,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_on_button_click(dialog_info, (HWND)lParam); break; } return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 33d3757..7fb8f3d 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -215,6 +215,20 @@ static const struct message_info msg_return_no_default_radio_button_id_and_flag[ { 0 } }; +static const struct message_info msg_select_negative_id_radio_button[] = +{ + { TDM_CLICK_RADIO_BUTTON, -2, 0 }, + { 0 } +}; + +static const struct message_info msg_return_press_negative_id_radio_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_select_negative_id_radio_button }, + { TDN_RADIO_BUTTON_CLICKED, -2, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -451,6 +465,11 @@ static void test_buttons(void) info.nDefaultRadioButton = 0xff; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default flag, invalid id"); + + info.nDefaultRadioButton = 0; + info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; + run_test(&info, IDOK, -2, msg_return_press_negative_id_radio_button, + "radio button: manually click radio button with negative id"); } static void test_help(void)

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _Id.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 05f9db7b95ca0919c579957549e2d8dbaa468cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f9db7b95ca0919c5799575… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 18 07:15:45 2018 -0700 msvcr110: Create current scheduler in _CurrentScheduler::_Id. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 15 +++++++++++++++ dlls/msvcrt/scheduler.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 4b0043b..dcee5c1 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -35,6 +35,8 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p_CurrentScheduler_Id)(void); +static unsigned int (CDECL *p__CurrentScheduler__Id)(void); static BOOL init(void) { @@ -50,12 +52,15 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); + p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id@_CurrentScheduler@details@Concurrency@@SAIXZ"); return TRUE; } static void test_CurrentScheduler(void) { + unsigned int id; unsigned int ncpus; unsigned int expect; SYSTEM_INFO si; @@ -63,13 +68,23 @@ static void test_CurrentScheduler(void) expect = ~0; ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == expect, "expected %u, got %u\n", expect, id); GetSystemInfo(&si); expect = si.dwNumberOfProcessors; + /* these _CurrentScheduler calls trigger scheduler creation + if either is commented out, the following CurrentScheduler (no _) tests will still work */ ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + id = p__CurrentScheduler__Id(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(id == 0, "expected 0, got %u\n", id); + + /* these CurrentScheduler tests assume scheduler is created */ ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == 0, "expected 0, got %u\n", id); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 6269c98..c6c0fa7 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1071,6 +1071,7 @@ unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) unsigned int __cdecl _CurrentScheduler__Id(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_Id(); }

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 630.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 5757c2c8c63bc0175556cdb5cf0655ad0e9c94ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5757c2c8c63bc0175556cdb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:01 2018 +0200 wined3d: Add GPU information for Intel HD Graphics 630. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68b2a11..7d9a5e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1517,6 +1517,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97badbe..ece41eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2497,6 +2497,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD630 = 0x5912, }; struct wined3d_fbo_ops

1 0

← Newer
1
2
3
4
5
6
7
...
41
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 July 2018