wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Jacek Caban : mshtml: Added IHTMLWindow7:: performance property implementation.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 83f845dfa1bb4a6ec6e8b7f65e9469dc9a8a7787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f845dfa1bb4a6ec6e8b7f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 14 17:35:14 2018 +0200 mshtml: Added IHTMLWindow7::performance property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 364dae8..401d19d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2315,16 +2315,39 @@ static HRESULT WINAPI HTMLWindow7_get_styleMedia(IHTMLWindow7 *iface, IHTMLStyle static HRESULT WINAPI HTMLWindow7_put_performance(IHTMLWindow7 *iface, VARIANT v) { - HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + HTMLInnerWindow *This = impl_from_IHTMLWindow7(iface)->inner_window; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!This->performance_initialized) { + V_VT(&This->performance) = VT_EMPTY; + This->performance_initialized = TRUE; + } + + return VariantCopy(&This->performance, &v); } static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT *p) { - HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLInnerWindow *This = impl_from_IHTMLWindow7(iface)->inner_window; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->performance_initialized) { + IHTMLPerformance *performance; + + hres = create_performance(&performance); + if(FAILED(hres)) + return hres; + + V_VT(&This->performance) = VT_DISPATCH; + V_DISPATCH(&This->performance) = (IDispatch*)performance; + This->performance_initialized = TRUE; + } + + V_VT(p) = VT_NULL; + return VariantCopy(p, &This->performance); } static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 62879e0..e28ecbc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -199,6 +199,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLObjectElement2) \ XIID(IHTMLOptionElement) \ XIID(IHTMLOptionElementFactory) \ + XIID(IHTMLPerformance) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ XIID(IHTMLScreen) \ @@ -522,6 +523,9 @@ struct HTMLInnerWindow { OmHistory *history; IHTMLStorage *session_storage; + BOOL performance_initialized; + VARIANT performance; + unsigned parser_callback_cnt; struct list script_queue; @@ -870,6 +874,7 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFact HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; +HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(IHTMLDOMImplementation**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 406e7f5..faf15f0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1320,3 +1320,167 @@ IOmNavigator *OmNavigator_Create(void) return &ret->IOmNavigator_iface; } + +typedef struct { + DispatchEx dispex; + IHTMLPerformance IHTMLPerformance_iface; + LONG ref; +} HTMLPerformance; + +static inline HTMLPerformance *impl_from_IHTMLPerformance(IHTMLPerformance *iface) +{ + return CONTAINING_RECORD(iface, HTMLPerformance, IHTMLPerformance_iface); +} + +static HRESULT WINAPI HTMLPerformance_QueryInterface(IHTMLPerformance *iface, REFIID riid, void **ppv) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLPerformance_iface; + }else if(IsEqualGUID(&IID_IHTMLPerformance, riid)) { + *ppv = &This->IHTMLPerformance_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLPerformance_AddRef(IHTMLPerformance *iface) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLPerformance_Release(IHTMLPerformance *iface) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLPerformance_GetTypeInfoCount(IHTMLPerformance *iface, UINT *pctinfo) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_GetTypeInfo(IHTMLPerformance *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLPerformance_GetIDsOfNames(IHTMLPerformance *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLPerformance_Invoke(IHTMLPerformance *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, + IHTMLPerformanceNavigation **p) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLPerformanceTiming **p) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_toString(IHTMLPerformance *iface, BSTR *string) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, string); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPerformance_toJSON(IHTMLPerformance *iface, VARIANT *var) +{ + HTMLPerformance *This = impl_from_IHTMLPerformance(iface); + FIXME("(%p)->(%p)\n", This, var); + return E_NOTIMPL; +} + +static const IHTMLPerformanceVtbl HTMLPerformanceVtbl = { + HTMLPerformance_QueryInterface, + HTMLPerformance_AddRef, + HTMLPerformance_Release, + HTMLPerformance_GetTypeInfoCount, + HTMLPerformance_GetTypeInfo, + HTMLPerformance_GetIDsOfNames, + HTMLPerformance_Invoke, + HTMLPerformance_get_navigation, + HTMLPerformance_get_timing, + HTMLPerformance_toString, + HTMLPerformance_toJSON +}; + +static const tid_t HTMLPerformance_iface_tids[] = { + IHTMLPerformance_tid, + 0 +}; +static dispex_static_data_t HTMLPerformance_dispex = { + NULL, + IHTMLPerformance_tid, + HTMLPerformance_iface_tids +}; + +HRESULT create_performance(IHTMLPerformance **ret) +{ + HTMLPerformance *performance; + + performance = heap_alloc_zero(sizeof(*performance)); + if(!performance) + return E_OUTOFMEMORY; + + performance->IHTMLPerformance_iface.lpVtbl = &HTMLPerformanceVtbl; + performance->ref = 1; + + init_dispex(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, + &HTMLPerformance_dispex); + + *ret = &performance->IHTMLPerformance_iface; + return S_OK; +} diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3f08a23..69b6206 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6851,7 +6851,6 @@ static void test_window(IHTMLDocument2 *doc) ok(window7 != NULL, "window7 == NULL\n"); hres = IHTMLWindow7_get_performance(window7, &v); - todo_wine ok(hres == S_OK, "get_performance failed: %08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&v) == VT_DISPATCH, "V_VT(performance) = %u\n", V_VT(&v)); @@ -6861,6 +6860,18 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08x\n", hres); IHTMLPerformance_Release(performance); + + V_VT(&v) = VT_I2; + V_I2(&v) = 2; + hres = IHTMLWindow7_put_performance(window7, v); + ok(hres == S_OK, "put_performance failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLWindow7_get_performance(window7, &v); + ok(hres == S_OK, "get_performance failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(performance) = %u\n", V_VT(&v)); + ok(V_I2(&v) == 2, "V_I2(performance) = %d\n", V_I2(&v)); + IHTMLWindow7_Release(window7); } }else {

1 0

Piotr Caban : msvcp120: Add alloc/ free count validation tests in _Concurrent_vector_base_v4.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 0abe7b4e5487b358aa3dd15c3b5523249d2e262d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abe7b4e5487b358aa3dd15c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 12:39:10 2018 +0200 msvcp120: Add alloc/free count validation tests in _Concurrent_vector_base_v4. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 65f445f..1247222 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -25,6 +25,7 @@ #include "winbase.h" DWORD expect_idx; +static int vector_alloc_count; #define DEFINE_EXPECT(func) \ BOOL expect_ ## func, called_ ## func @@ -2451,6 +2452,7 @@ static DWORD WINAPI queue_pop_thread(void*arg) static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) { CHECK_EXPECT(concurrent_vector_int_alloc); + vector_alloc_count++; return malloc(n*sizeof(int)); } @@ -2474,6 +2476,7 @@ static void concurrent_vector_int_dtor(vector_base_v4 *this) blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, this, concurrent_vector_int_destroy); while(this->first_block && blocks >= this->first_block) { + vector_alloc_count--; free(this->segment[blocks - this->first_block]); blocks--; } @@ -2755,6 +2758,8 @@ static void test_vector_base_v4(void) ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n", (long)vector.early_size); concurrent_vector_int_dtor(&vector); + + ok(!vector_alloc_count, "vector_alloc_count = %d, expected 0\n", vector_alloc_count); } START_TEST(msvcp120)

1 0

Piotr Caban : msvcp120: Fix function passed to _Concurrent_vector_base_v4: :_Internal_clear.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 905aa3cb0df31eb645c0d81d0b274dbb6c7a7f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905aa3cb0df31eb645c0d81d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 12:38:56 2018 +0200 msvcp120: Fix function passed to _Concurrent_vector_base_v4::_Internal_clear. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 969902d..65f445f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -36,7 +36,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item); DEFINE_EXPECT(concurrent_vector_int_alloc); - DEFINE_EXPECT(concurrent_vector_int_free); + DEFINE_EXPECT(concurrent_vector_int_destroy); }; #define SET_EXPECT(func) \ @@ -2454,10 +2454,10 @@ static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) return malloc(n*sizeof(int)); } -static void __cdecl concurrent_vector_int_free(void *ptr, size_t n) +static void __cdecl concurrent_vector_int_destroy(void *ptr, size_t n) { - CHECK_EXPECT2(concurrent_vector_int_free); - free(ptr); + CHECK_EXPECT2(concurrent_vector_int_destroy); + memset(ptr, 0xff, sizeof(int)*n); } static void concurrent_vector_int_ctor(vector_base_v4 *this) @@ -2467,6 +2467,20 @@ static void concurrent_vector_int_ctor(vector_base_v4 *this) this->segment = &this->storage[0]; } +static void concurrent_vector_int_dtor(vector_base_v4 *this) +{ + size_t blocks; + + blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, + this, concurrent_vector_int_destroy); + while(this->first_block && blocks >= this->first_block) { + free(this->segment[blocks - this->first_block]); + blocks--; + } + + call_func1(p_vector_base_v4_dtor, this); +} + static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2731,16 +2745,16 @@ static void test_vector_base_v4(void) size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 8, "size of vector got %ld expected 8\n", (long)size); - SET_EXPECT(concurrent_vector_int_free); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, - &vector, concurrent_vector_int_free); - CHECK_CALLED(concurrent_vector_int_free); + &vector, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); ok(size == 3, "_Internal_clear returned %ld\n", (long)size); ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); ok(vector.early_size == 0, "vector.early_size got %ld expected 0\n", (long)vector.early_size); - call_func1(p_vector_base_v4_dtor, &vector); + concurrent_vector_int_dtor(&vector); } START_TEST(msvcp120)

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for hyperlink.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: c61a70be2f80133718adf667b07b551222197af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c61a70be2f80133718adf667… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:01:56 2018 +0800 comctl32/taskdialog: Add support for hyperlink. 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 | 53 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 59a9159..07c031b 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -222,7 +222,13 @@ static WCHAR *taskdialog_gettext(struct taskdialog_info *dialog_info, BOOL user_ return ret; } -static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND hwnd, LONG max_width, SIZE *size) +static BOOL taskdialog_hyperlink_enabled(struct taskdialog_info *dialog_info) +{ + return dialog_info->taskconfig->dwFlags & TDF_ENABLE_HYPERLINKS; +} + +static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND hwnd, LONG max_width, SIZE *size, + BOOL syslink) { DWORD style = DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK; HFONT hfont, old_hfont; @@ -231,6 +237,12 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND WCHAR text[1024]; INT text_length; + if (syslink) + { + SendMessageW(hwnd, LM_GETIDEALSIZE, max_width, (LPARAM)size); + return; + } + if (dialog_info->taskconfig->dwFlags & TDF_RTL_LAYOUT) style |= DT_RIGHT | DT_RTLREADING; else @@ -296,15 +308,19 @@ static void taskdialog_add_main_icon(struct taskdialog_info *dialog_info) taskdialog_set_icon(dialog_info, TDIE_ICON_MAIN, dialog_info->taskconfig->u.hMainIcon); } -static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const WCHAR *text, HFONT font) +static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const WCHAR *text, HFONT font, BOOL syslink) { WCHAR *textW; HWND hwnd; + const WCHAR *class; + DWORD style = WS_CHILD | WS_VISIBLE; if (!text) return NULL; + class = syslink ? WC_LINK : WC_STATICW; + if (syslink) style |= WS_TABSTOP; textW = taskdialog_gettext(dialog_info, TRUE, text); - hwnd = CreateWindowW(WC_STATICW, textW, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); + hwnd = CreateWindowW(class, textW, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); if (textW) Free(textW); SendMessageW(hwnd, WM_SETFONT, (WPARAM)font, 0); @@ -326,15 +342,16 @@ static void taskdialog_add_main_instruction(struct taskdialog_info *dialog_info) dialog_info->main_instruction_font = CreateFontIndirectW(&ncm.lfMessageFont); dialog_info->main_instruction = - taskdialog_create_label(dialog_info, taskconfig->pszMainInstruction, dialog_info->main_instruction_font); + taskdialog_create_label(dialog_info, taskconfig->pszMainInstruction, dialog_info->main_instruction_font, FALSE); } static void taskdialog_add_content(struct taskdialog_info *dialog_info) { - dialog_info->content = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszContent, dialog_info->font); + dialog_info->content = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszContent, dialog_info->font, + taskdialog_hyperlink_enabled(dialog_info)); } -static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT id, const WCHAR *text, +static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -387,7 +404,7 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) } static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, - LONG *dialog_height) + LONG *dialog_height, BOOL syslink) { LONG x, y, max_width; SIZE size; @@ -397,7 +414,7 @@ static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hw x = start_x + dialog_info->m.h_spacing; y = *dialog_height + dialog_info->m.v_spacing; max_width = dialog_width - x - dialog_info->m.h_spacing; - taskdialog_get_label_size(dialog_info, hwnd, max_width, &size); + taskdialog_get_label_size(dialog_info, hwnd, max_width, &size, syslink); SetWindowPos(hwnd, 0, x, y, size.cx, size.cy, SWP_NOZORDER); *dialog_height = y + size.cy; } @@ -405,6 +422,7 @@ static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hw static void taskdialog_layout(struct taskdialog_info *dialog_info) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); static BOOL first_time = TRUE; RECT ref_rect; LONG screen_width, dialog_width, dialog_height = 0; @@ -440,10 +458,11 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) } /* Main instruction */ - taskdialog_label_layout(dialog_info, dialog_info->main_instruction, main_icon_right, dialog_width, &dialog_height); + taskdialog_label_layout(dialog_info, dialog_info->main_instruction, main_icon_right, dialog_width, &dialog_height, + FALSE); /* Content */ - taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height); + taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height, syslink); dialog_height = max(dialog_height, main_icon_bottom); @@ -456,7 +475,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) taskdialog_du_to_px(dialog_info, &button_min_width, &button_height); for (i = 0; i < dialog_info->button_count; i++) { - taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - h_spacing * 2, &size); + taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - h_spacing * 2, &size, FALSE); button_layout_infos[i].width = max(size.cx, button_min_width); } @@ -643,6 +662,18 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR dialog_info->last_timer_tick = GetTickCount(); } break; + case WM_NOTIFY: + { + PNMLINK pnmLink = (PNMLINK)lParam; + HWND hwndFrom = pnmLink->hdr.hwndFrom; + if ((taskdialog_hyperlink_enabled(dialog_info)) && (hwndFrom == dialog_info->content) + && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) + { + taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl); + break; + } + return FALSE; + } case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for loading standard icons.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 629d9c56999ba6a4f56dc93fc919e2143e8bb62f URL: https://source.winehq.org/git/wine.git/?a=commit;h=629d9c56999ba6a4f56dc93f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:01:43 2018 +0800 comctl32/taskdialog: Add support for loading standard icons. 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 14c6ccb..59a9159 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -247,6 +247,20 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND ReleaseDC(hwnd, hdc); } +static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) +{ + if (icon == TD_WARNING_ICON) + return IDI_WARNING; + else if (icon == TD_ERROR_ICON) + return IDI_ERROR; + else if (icon == TD_INFORMATION_ICON) + return IDI_INFORMATION; + else if (icon == TD_SHIELD_ICON) + return IDI_SHIELD; + else + return (ULONG_PTR)icon; +} + static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; @@ -259,6 +273,9 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element else { hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (!hicon) + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE); } if (!hicon) return;

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for main icon.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 0e9346e978944607563cc00283b50016eb3f08d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9346e978944607563cc002… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:01:25 2018 +0800 comctl32/taskdialog: Add support for main 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 | 55 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index b6baffb..14c6ccb 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -54,6 +54,7 @@ struct taskdialog_info HFONT font; HFONT main_instruction_font; /* Control handles */ + HWND main_icon; HWND main_instruction; HWND content; HWND *buttons; @@ -246,6 +247,38 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND ReleaseDC(hwnd, hdc); } +static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) +{ + DWORD flags = dialog_info->taskconfig->dwFlags; + HICON hicon; + + if (!icon) return; + + if ((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + hicon = icon; + else + { + hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + } + + if (!hicon) return; + + if (element == TDIE_ICON_MAIN) + { + SendMessageW(dialog_info->hwnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hicon); + SendMessageW(dialog_info->main_icon, STM_SETICON, (WPARAM)hicon, 0); + } +} + +static void taskdialog_add_main_icon(struct taskdialog_info *dialog_info) +{ + if (!dialog_info->taskconfig->u.hMainIcon) return; + + dialog_info->main_icon = + CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); + taskdialog_set_icon(dialog_info, TDIE_ICON_MAIN, dialog_info->taskconfig->u.hMainIcon); +} + static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const WCHAR *text, HFONT font) { WCHAR *textW; @@ -359,6 +392,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) RECT ref_rect; LONG screen_width, dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; + LONG main_icon_right, main_icon_bottom; struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; @@ -374,11 +408,27 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) h_spacing = dialog_info->m.h_spacing; v_spacing = dialog_info->m.v_spacing; + /* Main icon */ + main_icon_right = 0; + main_icon_bottom = 0; + if (dialog_info->main_icon) + { + x = h_spacing; + y = dialog_height + v_spacing; + size.cx = GetSystemMetrics(SM_CXICON); + size.cy = GetSystemMetrics(SM_CYICON); + SetWindowPos(dialog_info->main_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + main_icon_right = x + size.cx; + main_icon_bottom = y + size.cy; + } + /* Main instruction */ - taskdialog_label_layout(dialog_info, dialog_info->main_instruction, 0, dialog_width, &dialog_height); + taskdialog_label_layout(dialog_info, dialog_info->main_instruction, main_icon_right, dialog_width, &dialog_height); /* Content */ - taskdialog_label_layout(dialog_info, dialog_info->content, 0, dialog_width, &dialog_height); + taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height); + + dialog_height = max(dialog_height, main_icon_bottom); /* Common and custom buttons */ button_layout_infos = Alloc(dialog_info->button_count * sizeof(*button_layout_infos)); @@ -509,6 +559,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) dialog_info->last_timer_tick = GetTickCount(); } + taskdialog_add_main_icon(dialog_info); taskdialog_add_main_instruction(dialog_info); taskdialog_add_content(dialog_info); taskdialog_add_buttons(dialog_info);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDM_ENABLE_BUTTON.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 9fa19e055c469e254010b3b438a104f5d9859851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa19e055c469e254010b3b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 14 16:00:57 2018 +0800 comctl32/taskdialog: Add support for TDM_ENABLE_BUTTON. 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 7a09b8a..b6baffb 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -163,6 +163,26 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi return template; } +static HWND taskdialog_find_button(HWND *buttons, INT count, INT id) +{ + INT button_id; + INT i; + + for (i = 0; i < count; i++) + { + button_id = GetWindowLongW(buttons[i], GWLP_ID); + if (button_id == id) return buttons[i]; + } + + return NULL; +} + +static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) +{ + HWND hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) EnableWindow(hwnd, enable); +} + static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -525,6 +545,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_CLICK_BUTTON: taskdialog_on_button_click(dialog_info, LOWORD(wParam)); break; + case TDM_ENABLE_BUTTON: + taskdialog_enable_button(dialog_info, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam;

1 0

Michael Stefaniuc : winmm/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 3f4906d19dcbcc5abaf7c7fe0417f4e6f46137ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4906d19dcbcc5abaf7c7fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:27 2018 +0200 winmm/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 4 ++-- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/tests/mmio.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 5714001..7531bd6 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -139,7 +139,7 @@ static void test_api(void) /* Try some unusual period values for joySetCapture and unusual threshold values for joySetThreshold. * Windows XP allows almost all test values, Windows 8 will return error on most test values, Windows * 98 allows anything but cuts the values to their maximum supported values internally. */ - for (i = 0; i < sizeof(period) / sizeof(period[0]); i++) + for (i = 0; i < ARRAY_SIZE(period); i++) { ret = joySetCapture(window, joyid, period[i], FALSE); if (win8 && ((1 << i) & period_win8_error)) @@ -190,7 +190,7 @@ static void test_api(void) ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); infoex.ex.dwSize = sizeof(infoex.ex); - for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) { infoex.ex.dwFlags = flags[i]; ret = joyGetPosEx(joyid, &infoex.ex); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index fe3cc5c..3b8bd22 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -549,7 +549,7 @@ static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR insta struct time_stamp_records *records = (struct time_stamp_records *)instance; switch (msg) { case MM_MOM_POSITIONCB: - if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) + if (records->count < ARRAY_SIZE(records->time_stamp)) records->time_stamp[records->count] = GetTickCount(); records->count++; break; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 48367ee..5501c31 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -606,7 +606,7 @@ static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM case MMIOM_OPEN: if (lpInfo->fccIOProc == FOURCC_DOS) lpInfo->fccIOProc = mmioFOURCC('F', 'A', 'I', 'L'); - for (i = 0; i < sizeof(lpInfo->adwInfo) / sizeof(*lpInfo->adwInfo); i++) + for (i = 0; i < ARRAY_SIZE(lpInfo->adwInfo); i++) ok(lpInfo->adwInfo[i] == 0, "[%d] Expected 0, got %u\n", i, lpInfo->adwInfo[i]); return MMSYSERR_NOERROR; case MMIOM_CLOSE:

1 0

Michael Stefaniuc : winmm/tests: Avoid and ARRAY_SIZE-like macro.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: b400d4326d33d43c78b5d3563ff8196b5e45c875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b400d4326d33d43c78b5d356… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:26 2018 +0200 winmm/tests: Avoid and ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/tests/winmm_test.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index fd4005c..ba71f9c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -398,7 +398,7 @@ static void wave_in_test_device(UINT_PTR device) HeapFree(GetProcessHeap(), 0, nameA); - for (f=0;f<NB_WIN_FORMATS;f++) { + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=win_formats[f][3]; format.wBitsPerSample=win_formats[f][2]; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8d7dfd6..b402e21 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1041,7 +1041,7 @@ static void wave_out_test_device(UINT_PTR device) CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); } - for (f=0;f<NB_WIN_FORMATS;f++) { + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=win_formats[f][3]; format.wBitsPerSample=win_formats[f][2]; diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h index 177dc2e..d5fb70a 100644 --- a/dlls/winmm/tests/winmm_test.h +++ b/dlls/winmm/tests/winmm_test.h @@ -68,7 +68,6 @@ static const unsigned int win_formats[][4] = { {WAVE_FORMAT_96M16, 96000, 16, 1}, {WAVE_FORMAT_96S16, 96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) extern const char* dev_name(int); extern const char* wave_open_flags(DWORD);

1 0

Michael Stefaniuc : dsound/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: fc0b157caac9bad5b41355f881e69190cec55bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc0b157caac9bad5b41355f8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:24 2018 +0200 dsound/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/dsound.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index d4356c2..1b44aff 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -139,7 +139,7 @@ const char * getDSBCAPS(DWORD xmask) { buffer[0] = 0; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) { + for (i = 0; i < ARRAY_SIZE(flags); i++) { if ((flags[i].mask & xmask) == flags[i].mask) { if (first) first = FALSE; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 375abc8..0807d43 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1004,8 +1004,8 @@ static HRESULT test_frequency(LPGUID lpGuid) if (rc!=DS_OK) goto EXIT1; - for (f=0;f<sizeof(fmts)/sizeof(fmts[0]);f++) { - for (r=0;r<sizeof(rates)/sizeof(rates[0]);r++) { + for (f = 0; f < ARRAY_SIZE(fmts); f++) { + for (r = 0; r < ARRAY_SIZE(rates); r++) { init_format(&wfx,WAVE_FORMAT_PCM,11025,fmts[f].bits, fmts[f].channels); secondary=NULL; @@ -1135,7 +1135,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) int i; /* Prepare notify events */ - for (i=0;i<sizeof(event)/sizeof(event[0]);i++) { + for (i = 0; i < ARRAY_SIZE(event); i++) { event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); } @@ -1174,8 +1174,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) "IDirectSound_DuplicateSoundBuffer failed %08x\n",rc); trace("testing duplicated buffer without notifications.\n"); - test_notify(duplicated,sizeof(event)/sizeof(event[0]), - event,WAIT_TIMEOUT); + test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_TIMEOUT); rc=IDirectSoundBuffer_QueryInterface(duplicated, &IID_IDirectSoundNotify, @@ -1192,8 +1191,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) "failed %08x\n",rc); trace("testing duplicated buffer with a notification.\n"); - test_notify(duplicated,sizeof(event)/sizeof(event[0]), - event,WAIT_OBJECT_0+1); + test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_OBJECT_0 + 1); ref=IDirectSoundNotify_Release(dup_notify); ok(ref==0,"IDirectSoundNotify_Release() has %d references, " @@ -1204,8 +1202,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) "should have 0\n",ref); trace("testing original buffer with a notification.\n"); - test_notify(original,sizeof(event)/sizeof(event[0]), - event,WAIT_OBJECT_0); + test_notify(original, ARRAY_SIZE(event), event, WAIT_OBJECT_0); ref=IDirectSoundBuffer_Release(duplicated); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, "

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
63
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 June 2018