June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 2/6] wined3d: Get rid of WINED3DCAPS typedef.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 14, 2018

Re: [PATCH v2 5/5] wined3d: Set stream stride and offset even when buffer is NULL.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 14, 2018

Re: [PATCH 1/5] wined3d: Generate shader epilogue before conditional returns.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 14, 2018

[PATCH] msi: Add package minor/major upgrade tests

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/package.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-)

June 14, 2018

[PATCH] mshtml: Added IHTMLWindow7::performance property implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 35 +++++++-- dlls/mshtml/mshtml_private.h | 5 ++ dlls/mshtml/omnavigator.c | 164 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 13 +++- 4 files changed, 210 insertions(+), 7 deletions(-)

June 14, 2018

Re: [PATCH 5/5] comctl32/taskdialog: Add support for progress bar.

by Zhiyi Zhang

On Thu 6 14 21:03, Nikolay Sivov wrote: > On 06/14/2018 11:02 AM, Zhiyi Zhang wrote: > >> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> >> --- >> dlls/comctl32/taskdialog.c | 45 ++++++++++++++++++++++ >> dlls/comctl32/tests/taskdialog.c | 65 ++++++++++++++++++++++++++++++++ >> 2 files changed, 110 insertions(+) >> >> diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c >> index 91c8af019b..3c198df6d1 100644 >> --- a/dlls/comctl32/taskdialog.c >> +++ b/dlls/comctl32/taskdialog.c >> @@ -57,6 +57,7 @@ struct taskdialog_info >> HWND main_icon; >> HWND main_instruction; >> HWND content; >> + HWND progress_bar; >> HWND *buttons; >> INT button_count; >> HWND default_button; >> @@ -351,6 +352,17 @@ static void taskdialog_add_content(struct taskdialog_info *dialog_info) >> taskdialog_hyperlink_enabled(dialog_info)); >> } >> +static void taskdialog_add_progress_bar(struct taskdialog_info *dialog_info) >> +{ >> + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; >> + DWORD style = PBS_SMOOTH | PBS_SMOOTHREVERSE | WS_CHILD | WS_VISIBLE; >> + >> + if (!(taskconfig->dwFlags & (TDF_SHOW_PROGRESS_BAR | TDF_SHOW_MARQUEE_PROGRESS_BAR))) return; >> + if (taskconfig->dwFlags & TDF_SHOW_MARQUEE_PROGRESS_BAR) style |= PBS_MARQUEE; >> + dialog_info->progress_bar = >> + CreateWindowW(PROGRESS_CLASSW, NULL, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); >> +} >> + >> static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT id, const WCHAR *text, >> BOOL custom_button) >> { >> @@ -464,6 +476,17 @@ 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); >> + /* Progress bar */ >> + if (dialog_info->progress_bar) >> + { >> + x = main_icon_right + h_spacing; >> + y = dialog_height + v_spacing; >> + size.cx = dialog_width - x - h_spacing; >> + size.cy = GetSystemMetrics(SM_CYVSCROLL); >> + SetWindowPos(dialog_info->progress_bar, 0, x, y, size.cx, size.cy, SWP_NOZORDER); >> + dialog_height = y + size.cy; >> + } >> + >> dialog_height = max(dialog_height, main_icon_bottom); >> /* Common and custom buttons */ >> @@ -598,6 +621,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_progress_bar(dialog_info); >> taskdialog_add_buttons(dialog_info); >> /* Set default button */ >> @@ -621,6 +645,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR >> { >> static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; >> struct taskdialog_info *dialog_info; >> + LRESULT result; >> TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); >> @@ -635,6 +660,26 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR >> case TDM_ENABLE_BUTTON: >> taskdialog_enable_button(dialog_info, wParam, lParam); >> break; >> + case TDM_SET_MARQUEE_PROGRESS_BAR: >> + SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, 0); >> + break; > > This appears to be wrong, it shouldn't just start/stop animation, but switch from marquee to regular mode and back, in our case flipping styles. > Thanks. In the end, turns out I still got it confused with TDM_SET_PROGRESS_BAR_MARQUEE, even though I noticed the easy confusion from the start :( I sent a v2. >> >> + case TDM_SET_PROGRESS_BAR_POS: >> + result = 0; >> + if (!(dialog_info->taskconfig->dwFlags & TDF_SHOW_MARQUEE_PROGRESS_BAR)) >> + result = SendMessageW(dialog_info->progress_bar, PBM_SETPOS, wParam, 0); >> + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, result); >> + break; > > Did you verify that Progress control handles this correctly, maybe flags check is not necessary? > >> + case TDM_SET_PROGRESS_BAR_MARQUEE: >> + SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); >> + break; >> case WM_INITDIALOG: >> dialog_info = (struct taskdialog_info *)lParam; >> diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c >> index cca700cd18..10cd3da794 100644 >> --- a/dlls/comctl32/tests/taskdialog.c >> +++ b/dlls/comctl32/tests/taskdialog.c >> @@ -373,6 +373,70 @@ static void test_timer(void) >> pTaskDialogIndirect(&info, NULL, NULL, NULL); >> } >> +static HRESULT CALLBACK taskdialog_callback_proc_progress_bar(HWND hwnd, UINT notification, WPARAM wParam, >> + LPARAM lParam, LONG_PTR ref_data) >> +{ >> + unsigned long ret; >> + DWORD *flags = (DWORD *)ref_data; > You can pass flags by value. > > Sure.

June 14, 2018

[PATCH v2 5/5] comctl32/taskdialog: Add support for progress bar.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 55 ++++++++++++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 67 ++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index c1299cd7bb..42fee878b6 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -57,6 +57,7 @@ struct taskdialog_info HWND main_icon; HWND main_instruction; HWND content; + HWND progress_bar; HWND *buttons; INT button_count; HWND default_button; @@ -351,6 +352,17 @@ static void taskdialog_add_content(struct taskdialog_info *dialog_info) taskdialog_hyperlink_enabled(dialog_info)); } +static void taskdialog_add_progress_bar(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + DWORD style = PBS_SMOOTH | PBS_SMOOTHREVERSE | WS_CHILD | WS_VISIBLE; + + if (!(taskconfig->dwFlags & (TDF_SHOW_PROGRESS_BAR | TDF_SHOW_MARQUEE_PROGRESS_BAR))) return; + if (taskconfig->dwFlags & TDF_SHOW_MARQUEE_PROGRESS_BAR) style |= PBS_MARQUEE; + dialog_info->progress_bar = + CreateWindowW(PROGRESS_CLASSW, NULL, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT id, const WCHAR *text, BOOL custom_button) { @@ -464,6 +476,17 @@ 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); + /* Progress bar */ + if (dialog_info->progress_bar) + { + x = main_icon_right + h_spacing; + y = dialog_height + v_spacing; + size.cx = dialog_width - x - h_spacing; + size.cy = GetSystemMetrics(SM_CYVSCROLL); + SetWindowPos(dialog_info->progress_bar, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + dialog_height = y + size.cy; + } + dialog_height = max(dialog_height, main_icon_bottom); /* Common and custom buttons */ @@ -597,6 +620,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_progress_bar(dialog_info); taskdialog_add_buttons(dialog_info); /* Set default button */ @@ -620,6 +644,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; struct taskdialog_info *dialog_info; + LRESULT result; TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); @@ -634,6 +659,36 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_ENABLE_BUTTON: taskdialog_enable_button(dialog_info, wParam, lParam); break; + case TDM_SET_MARQUEE_PROGRESS_BAR: + { + BOOL marquee = wParam; + LONG style; + if(!dialog_info->progress_bar) break; + style = GetWindowLongW(dialog_info->progress_bar, GWL_STYLE); + style = marquee ? style | PBS_MARQUEE : style & (~PBS_MARQUEE); + SetWindowLongW(dialog_info->progress_bar, GWL_STYLE, style); + break; + } + case TDM_SET_PROGRESS_BAR_STATE: + result = SendMessageW(dialog_info->progress_bar, PBM_SETSTATE, wParam, 0); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, result); + break; + case TDM_SET_PROGRESS_BAR_RANGE: + result = SendMessageW(dialog_info->progress_bar, PBM_SETRANGE, 0, lParam); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, result); + break; + case TDM_SET_PROGRESS_BAR_POS: + result = 0; + if (dialog_info->progress_bar) + { + LONG style = GetWindowLongW(dialog_info->progress_bar, GWL_STYLE); + if (!(style & PBS_MARQUEE)) result = SendMessageW(dialog_info->progress_bar, PBM_SETPOS, wParam, 0); + } + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, result); + break; + case TDM_SET_PROGRESS_BAR_MARQUEE: + SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index cca700cd18..e91a878876 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -373,6 +373,72 @@ static void test_timer(void) pTaskDialogIndirect(&info, NULL, NULL, NULL); } +static HRESULT CALLBACK taskdialog_callback_proc_progress_bar(HWND hwnd, UINT notification, WPARAM wParam, + LPARAM lParam, LONG_PTR ref_data) +{ + unsigned long ret; + LONG flags = (LONG)ref_data; + if (notification == TDN_CREATED) + { + /* TDM_SET_PROGRESS_BAR_STATE */ + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_STATE, PBST_NORMAL, 0); + ok(ret == PBST_NORMAL, "Expect state: %d got state: %lx\n", PBST_NORMAL, ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_STATE, PBST_PAUSED, 0); + ok(ret == PBST_NORMAL, "Expect state: %d got state: %lx\n", PBST_NORMAL, ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_STATE, PBST_ERROR, 0); + /* Progress bar has fixme on handling PBM_SETSTATE message */ + todo_wine ok(ret == PBST_PAUSED, "Expect state: %d got state: %lx\n", PBST_PAUSED, ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_STATE, PBST_NORMAL, 0); + todo_wine ok(ret == PBST_ERROR, "Expect state: %d got state: %lx\n", PBST_ERROR, ret); + + /* TDM_SET_PROGRESS_BAR_RANGE */ + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_RANGE, 0, MAKELPARAM(0, 200)); + ok(ret == MAKELONG(0, 100), "Expect range:%x got:%lx\n", MAKELONG(0, 100), ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_RANGE, 0, MAKELPARAM(0, 200)); + ok(ret == MAKELONG(0, 200), "Expect range:%x got:%lx\n", MAKELONG(0, 200), ret); + + /* TDM_SET_PROGRESS_BAR_POS */ + if (flags & TDF_SHOW_MARQUEE_PROGRESS_BAR) + { + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_POS, 1, 0); + ok(ret == 0, "Expect position:%x got:%lx\n", 0, ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_POS, 2, 0); + ok(ret == 0, "Expect position:%x got:%lx\n", 0, ret); + } + else + { + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_POS, 1, 0); + ok(ret == 0, "Expect position:%x got:%lx\n", 0, ret); + ret = SendMessageW(hwnd, TDM_SET_PROGRESS_BAR_POS, 2, 0); + ok(ret == 1, "Expect position:%x got:%lx\n", 1, ret); + } + + SendMessageW(hwnd, TDM_CLICK_BUTTON, IDOK, 0); + } + + return S_OK; +} + +static void test_progress_bar(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.dwFlags = TDF_SHOW_PROGRESS_BAR; + info.pfCallback = taskdialog_callback_proc_progress_bar; + info.lpCallbackData = (LONG_PTR)info.dwFlags; + info.dwCommonButtons = TDCBF_OK_BUTTON; + pTaskDialogIndirect(&info, NULL, NULL, NULL); + + info.dwFlags = TDF_SHOW_MARQUEE_PROGRESS_BAR; + info.lpCallbackData = (LONG_PTR)info.dwFlags; + pTaskDialogIndirect(&info, NULL, NULL, NULL); + + info.dwFlags = TDF_SHOW_PROGRESS_BAR | TDF_SHOW_MARQUEE_PROGRESS_BAR; + info.lpCallbackData = (LONG_PTR)info.dwFlags; + pTaskDialogIndirect(&info, NULL, NULL, NULL); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -411,6 +477,7 @@ START_TEST(taskdialog) test_buttons(); test_help(); test_timer(); + test_progress_bar(); unload_v6_module(ctx_cookie, hCtx); } -- 2.17.1

June 14, 2018

Re: [PATCH v4 1/5] ntdll: Return BIOS info from NtQuerySystemInformation on Linux

by Huw Davies

On Thu, Jun 14, 2018 at 07:26:54AM -0600, Alex Henrie wrote: > On Thu, Jun 14, 2018 at 2:07 AM Huw Davies <huw(a)codeweavers.com> wrote: > > > > On Wed, Jun 13, 2018 at 09:41:15PM -0600, Alex Henrie wrote: > > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > > > --- > > > dlls/ntdll/nt.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 169 insertions(+) > > > > > > diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c > > > index dc0ce04f42..72ae381813 100644 > > > --- a/dlls/ntdll/nt.c > > > +++ b/dlls/ntdll/nt.c > > > @@ -66,6 +66,50 @@ > > > > > > WINE_DEFAULT_DEBUG_CHANNEL(ntdll); > > > > > > +#include "pshpack1.h" > > > + > > > +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION > > > +{ > > > + SystemFirmwareTable_Enumerate = 0, > > > + SystemFirmwareTable_Get = 1 > > > +} SYSTEM_FIRMWARE_TABLE_ACTION; > > > + > > > +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION > > > +{ > > > + ULONG ProviderSignature; > > > + SYSTEM_FIRMWARE_TABLE_ACTION Action; > > > + ULONG TableID; > > > + ULONG TableBufferLength; > > > + UCHAR TableBuffer[1]; > > > +} SYSTEM_FIRMWARE_TABLE_INFORMATION; > > > > These two at least should be in winternl.h > > Are you sure? They're not in the native winternl.h. I thought we had other 'struct SYSTEM_' definitions in there that aren't in the native SDK. > > Also, some tests would be nice, both for the ntdll (free feel to just > > tidy up mine) and kernel32 functions. > > Your test just checks that > NtQuerySystemInformation(SystemFirmwareTableInformation, ...) returns > STATUS_SUCCESS, which doesn't seem very useful. The returned data > itself is dependent on the BIOS and could be very different on > different computers. Well it must be useful because you claimed it returned STATUS_NOT_IMPLEMENTED before I wrote it ;-) You obviously can't test the data, but testing the lengths (i.e. the returned length and buffer length) is also interesting. In principle the kernel32 tests could compare the data returned from a call to the ntdll function with the data returned from the kernel32 function. Huw.

June 14, 2018

Re: [PATCH v4 1/5] ntdll: Return BIOS info from NtQuerySystemInformation on Linux

by Alex Henrie

On Thu, Jun 14, 2018 at 2:07 AM Huw Davies <huw(a)codeweavers.com> wrote: > > On Wed, Jun 13, 2018 at 09:41:15PM -0600, Alex Henrie wrote: > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > > --- > > dlls/ntdll/nt.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 169 insertions(+) > > > > diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c > > index dc0ce04f42..72ae381813 100644 > > --- a/dlls/ntdll/nt.c > > +++ b/dlls/ntdll/nt.c > > @@ -66,6 +66,50 @@ > > > > WINE_DEFAULT_DEBUG_CHANNEL(ntdll); > > > > +#include "pshpack1.h" > > + > > +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION > > +{ > > + SystemFirmwareTable_Enumerate = 0, > > + SystemFirmwareTable_Get = 1 > > +} SYSTEM_FIRMWARE_TABLE_ACTION; > > + > > +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION > > +{ > > + ULONG ProviderSignature; > > + SYSTEM_FIRMWARE_TABLE_ACTION Action; > > + ULONG TableID; > > + ULONG TableBufferLength; > > + UCHAR TableBuffer[1]; > > +} SYSTEM_FIRMWARE_TABLE_INFORMATION; > > These two at least should be in winternl.h Are you sure? They're not in the native winternl.h. > It fails to build on macOS > nt.c:2454:27: error: label at end of compound statement: expected statement > case RSMB: > > I suspect you may want to move the main body of the implementation into > a helper function, to avoid adding even more bloat to the main switch. Thanks for catching the Mac OS build error. While I'm fixing that I'll see what I can do to organize the code better. > Also, some tests would be nice, both for the ntdll (free feel to just > tidy up mine) and kernel32 functions. Your test just checks that NtQuerySystemInformation(SystemFirmwareTableInformation, ...) returns STATUS_SUCCESS, which doesn't seem very useful. The returned data itself is dependent on the BIOS and could be very different on different computers. > Note, that these went to wine-patches rather than wine-devel. Yes, my mistake, old habits die hard... Thanks for the feedback. -Alex

June 14, 2018

Re: [PATCH 4/5] comctl32/taskdialog: Add support for hyperlink.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 14, 2018