January 2016 - Wine-Commits

Jacek Caban : mshtml: Expose IHTMLUniqueName for IDispatch of all element objects.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 0987f7fdea8190b2a9ec32327b543519362009f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987f7fdea8190b2a9ec32327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:11 2016 +0100 mshtml: Expose IHTMLUniqueName for IDispatch of all element objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 684f3ae..6405f9f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -801,7 +801,6 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, HTMLELEMENT_TIDS, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e4b7990..39b1faf 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -871,7 +871,6 @@ static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement2_tid, HTMLELEMENT_TIDS, IHTMLTextContainer_tid, - IHTMLUniqueName_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51adb38..2f03501 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -722,7 +722,8 @@ typedef struct { IHTMLElement_tid, \ IHTMLElement2_tid, \ IHTMLElement3_tid, \ - IHTMLElement4_tid + IHTMLElement4_tid, \ + IHTMLUniqueName_tid extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data}

1 0

Jacek Caban : mshtml/tests: Added IHTMLUniqueName tests.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: eb54df637470048212763e1e440b68e97c93cd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb54df637470048212763e1e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:02:02 2016 +0100 mshtml/tests: Added IHTMLUniqueName tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9a9cc85..2940cee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6209,10 +6209,13 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } -static void test_unique_id(IHTMLDocument2 *doc) +static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDocument3 *doc3 = get_doc3_iface(doc); + IHTMLUniqueName *unique_name; + char buf[32]; BSTR id, id2; + LONG num; HRESULT hres; static const WCHAR prefixW[] = {'m','s','_','_','i','d',0}; @@ -6235,6 +6238,30 @@ static void test_unique_id(IHTMLDocument2 *doc) SysFreeString(id); SysFreeString(id2); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLUniqueName, (void**)&unique_name); + ok(hres == S_OK, "Could not get IHTMLUniqueName iface: %08x\n", hres); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + trace("id %s\n", wine_dbgstr_w(id)); + + hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(!lstrcmpW(id, id2), "unique names differ\n"); + trace("id %s\n", wine_dbgstr_w(id2)); + + hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); + ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(num, "num = 0\n"); + + sprintf(buf, "ms__id%u", num); + ok(!strcmp_wa(id, buf), "unexpected id %s\n", wine_dbgstr_w(id)); + trace("num %d\n", num); + + SysFreeString(id); + SysFreeString(id2); + + IHTMLUniqueName_Release(unique_name); IHTMLDocument3_Release(doc3); } @@ -6272,10 +6299,9 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLDocument2_Release(doc_node); test_elem_client_rect((IUnknown*)elem); + test_unique_id(doc, elem); IHTMLElement_Release(elem); - - test_unique_id(doc); } static void test_default_body(IHTMLBodyElement *body)

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle4:: get_maxHeight implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 27182667ccbe6f903ab1986bf89f9e4b392c9fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27182667ccbe6f903ab1986bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:52:07 2016 +0100 mshtml: Added IHTMLCurrentStyle4::get_maxHeight implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index b7f9731..df3281d 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1281,8 +1281,8 @@ static HRESULT WINAPI HTMLCurrentStyle4_get_maxHeight(IHTMLCurrentStyle4 *iface, static HRESULT WINAPI HTMLCurrentStyle4_get_minWidth(IHTMLCurrentStyle4 *iface, VARIANT *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle4_get_maxWidth(IHTMLCurrentStyle4 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d568a2f..94ccc76 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2634,6 +2634,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) { IHTMLCurrentStyle2 *current_style2; IHTMLCurrentStyle3 *current_style3; + IHTMLCurrentStyle4 *current_style4; VARIANT_BOOL b; BSTR str; HRESULT hres; @@ -2932,6 +2933,16 @@ static void test_current_style(IHTMLCurrentStyle *current_style) SysFreeString(str); IHTMLCurrentStyle3_Release(current_style3); + + hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)&current_style4); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v); + + IHTMLCurrentStyle4_Release(current_style4); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle::overflowX implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 9e8be69d7bca79f842258a619e06338b8fc5e62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8be69d7bca79f842258a619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:51:48 2016 +0100 mshtml: Added IHTMLCurrentStyle::overflowX implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 4257074..cace5ba 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -781,8 +781,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_accelerator(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 18905b1..e5f9619 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2904,6 +2904,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "none"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_overflowX(current_style, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Alexandre Julliard : makedep: Generate testlist.c directly from the makefile data.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: da9381cea5fe8b1477ddbad7572921302b9202e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9381cea5fe8b1477ddbad75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 18:19:18 2016 +0900 makedep: Generate testlist.c directly from the makefile data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index aa6e161..fd661b2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2025,7 +2025,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct /******************************************************************* * output_sources */ -static struct strarray output_sources( const struct makefile *make, struct strarray *testlist_files ) +static struct strarray output_sources( const struct makefile *make ) { struct incl_file *source; unsigned int i, j; @@ -2736,7 +2736,6 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &phony_targets, "check" ); strarray_add( &phony_targets, "test" ); strarray_add( &phony_targets, "testclean" ); - *testlist_files = strarray_replace_extension( &ok_files, ".ok", "" ); } for (i = 0; i < make->programs.count; i++) @@ -2947,9 +2946,19 @@ static void rename_temp_file_if_changed( const char *dest ) /******************************************************************* * output_testlist */ -static void output_testlist( const char *dest, struct strarray files ) +static void output_testlist( const struct makefile *make ) { - int i; + const char *dest = base_dir_path( make, "testlist.c" ); + struct strarray files = empty_strarray; + struct incl_file *source; + unsigned int i; + + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) + { + if (source->file->flags & FLAG_GENERATED) continue; + if (!strendswith( source->name, ".c" )) continue; + strarray_add( &files, replace_extension( source->name, ".c", "" )); + } output_file = create_temp_file( dest ); @@ -3022,7 +3031,7 @@ static void output_top_variables( const struct makefile *make ) static void output_dependencies( const struct makefile *make ) { static const char separator[] = "### Dependencies"; - struct strarray targets, testlist_files = empty_strarray, ignore_files = empty_strarray; + struct strarray targets, ignore_files = empty_strarray; char buffer[1024]; FILE *src_file; int found = 0; @@ -3042,7 +3051,7 @@ static void output_dependencies( const struct makefile *make ) input_file_name = NULL; if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); - targets = output_sources( make, &testlist_files ); + targets = output_sources( make ); fclose( output_file ); output_file = NULL; @@ -3050,11 +3059,12 @@ static void output_dependencies( const struct makefile *make ) strarray_add( &ignore_files, ".gitignore" ); strarray_add( &ignore_files, "Makefile" ); - if (testlist_files.count) strarray_add( &ignore_files, "testlist.c" ); + if (make->testdll) + { + output_testlist( make ); + strarray_add( &ignore_files, "testlist.c" ); + } strarray_addall( &ignore_files, targets ); - - if (testlist_files.count) - output_testlist( base_dir_path( make, "testlist.c" ), testlist_files ); if (!make->src_dir && make->base_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files );

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAllocDescriptor().
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: d8287b55009890c63adf15f7809b527a5c5885c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8287b55009890c63adf15f78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:47:06 2016 +0300 ole2disp: Implement SafeArrayAllocDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 51 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 43336c4..1774211 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "oleauto.h" #include "winerror.h" +#include "wownt32.h" #include "wine/windef16.h" #include "wine/winbase16.h" @@ -39,6 +40,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define E_OUTOFMEMORY16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 2) +#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3) + +/* 16-bit SAFEARRAY implementation */ +typedef struct tagSAFEARRAYBOUND16 +{ + ULONG cElements; + LONG lLbound; +} SAFEARRAYBOUND16; + +typedef struct tagSAFEARRAY16 +{ + USHORT cDims; + USHORT fFeatures; + USHORT cbElements; + USHORT cLocks; + ULONG handle; + SEGPTR pvData; + SAFEARRAYBOUND16 rgsabound[1]; +} SAFEARRAY16; + +static SEGPTR safearray_alloc(ULONG size) +{ + HANDLE16 h; + return WOWGlobalAllocLock16(GPTR, size, &h); +} + +/****************************************************************************** + * SafeArrayAllocDescriptor [OLE2DISP.38] + */ +HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) +{ + SAFEARRAY16 *sa; + ULONG size; + + TRACE("%u, %p\n", dims, ret); + + if (!dims) + return E_INVALIDARG16; + + size = sizeof(SAFEARRAY16) + sizeof(SAFEARRAYBOUND16) * (dims - 1); + *ret = safearray_alloc(size); + if (!*ret) + return E_OUTOFMEMORY16; + + sa = MapSL(*ret); + sa->cDims = dims; + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index e4655f0..08372c5 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -35,7 +35,7 @@ 35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT -38 stub SAFEARRAYALLOCDESCRIPTOR +38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 stub SAFEARRAYALLOCDATA 40 stub SAFEARRAYDESTROYDESCRIPTOR 41 stub SAFEARRAYDESTROYDATA

1 0

Nikolay Sivov : comdlg32: Don' t use BOOL constants for regular integer type.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 2f6393bfa064f8e69a028108511065391c589fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6393bfa064f8e69a0281085… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:12:36 2016 +0300 comdlg32: Don't use BOOL constants for regular integer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f9a7707..43261f4 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -370,13 +370,13 @@ static UINT get_file_name(FileDialogImpl *This, LPWSTR *str) lstrcpyW(*str, This->set_filename); return len; } - return FALSE; + return 0; } len = SendMessageW(hwnd_edit, WM_GETTEXTLENGTH, 0, 0); *str = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); if(!*str) - return FALSE; + return 0; SendMessageW(hwnd_edit, WM_GETTEXT, len+1, (LPARAM)*str); return len;

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on TBM_SETPOS.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: a65ddbf153b8865e0565bf210e637bf2b0053196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ddbf153b8865e0565bf210… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 9 23:45:20 2016 +0300 comctl32/trackbar: Update thumb immediately on TBM_SETPOS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 7 ++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e496572..7c04d15 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -32,6 +32,16 @@ static const DWORD defaultstyle = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; static HWND hWndParent; +static LRESULT WINAPI trackbar_no_wmpaint_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == WM_PAINT) + return 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; static const struct message empty_seq[] = { @@ -465,6 +475,15 @@ static HWND create_trackbar(DWORD style, HWND parent){ return hWndTrack; } +static HWND create_trackbar2(DWORD style, HWND parent) +{ + RECT rect; + GetClientRect(parent, &rect); + return CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", style, + rect.right, rect.bottom, 100, 50, + parent, NULL, GetModuleHandleA(NULL), NULL); +} + /* test functions for setters, getters, and sequences */ static void test_trackbar_buddy(void) @@ -595,6 +614,8 @@ static void test_page_size(void) static void test_position(void) { HWND hWndTrackbar; + RECT rect, rect2; + WNDPROC oldproc; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -626,6 +647,34 @@ static void test_position(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_position_test_seq, "parent position test sequence", TRUE); DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar2(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + /* subclassing procedure blocks WM_PAINT */ + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + memset(&rect, 0, sizeof(rect)); + memset(&rect2, 0, sizeof(rect2)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + + /* without repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left == rect2.left, "got %d\n", rect.left); + + /* with repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 30); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 30, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left != rect2.left, "got %d\n", rect.left); + + DestroyWindow(hWndTrackbar); } static void test_range(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6d092a3..c0f58db 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1229,9 +1229,12 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition && oldPos != lPosition) + { + TRACKBAR_UpdateThumb(infoPtr); + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + } return 0; }

1 0

Alexandre Julliard : Wine release 1.9.1
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: website Branch: master Commit: 1b148c2a6658a5276b555edfa5b7ed2797329356 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b148c2a6658a5276b555e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 9 18:32:28 2016 +0900 Wine release 1.9.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016010901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016010901.xml b/news/en/2016010901.xml new file mode 100644 index 0000000..f84c468 --- /dev/null +++ b/news/en/2016010901.xml @@ -0,0 +1,16 @@ +<news> +<date>January 9, 2016</date> +<title>Wine 1.9.1 Released</title> +<body> +<p> The Wine development release 1.9.1 is now available.</p> +<p> <a href="{$root}/announce/1.9.1">What's new</a> in this release: +<ul> + <li>A few more deferred fixes.</li> + <li>Support for debug registers on x86-64.</li> + <li>More Shader Model 4 instructions.</li> + <li>Support for the Mingw ARM toolchain.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Nikolay Sivov : dwrite: Store locale name in lower case for text format.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: b1094bc7d7c9c22118b8fd07ffad85b79bec0dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1094bc7d7c9c22118b8fd07f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 12:55:37 2016 +0300 dwrite: Store locale name in lower case for text format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 +++++++- dlls/dwrite/tests/layout.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ef8d8bf..d4b3557 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3923,7 +3923,11 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.locale = heap_strdupW(textformat->format.locale); layout->format.family_name = heap_strdupW(textformat->format.family_name); if (!layout->format.locale || !layout->format.family_name) + { + heap_free(layout->format.locale); + heap_free(layout->format.family_name); return E_OUTOFMEMORY; + } if (layout->format.trimmingsign) IDWriteInlineObject_AddRef(layout->format.trimmingsign); @@ -4662,6 +4666,8 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.family_len = strlenW(family_name); This->format.locale = heap_strdupW(locale); This->format.locale_len = strlenW(locale); + /* force locale name to lower case, layout will inherit this modified value */ + strlwrW(This->format.locale); This->format.weight = weight; This->format.style = style; This->format.fontsize = size; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 888edb9..bb5963f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1999,7 +1999,7 @@ static void test_SetLocaleName(void) static const WCHAR eNuSW[] = {'e','N','-','u','S',0}; static const WCHAR strW[] = {'a','b','c','d',0}; WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; - IDWriteTextFormat *format; + IDWriteTextFormat *format, *format2; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; @@ -2007,6 +2007,33 @@ static void test_SetLocaleName(void) factory = create_factory(); + /* create format with mixed case locale name, get it back */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, eNuSW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetLocaleName(format, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetLocaleName(format2, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + + IDWriteTextFormat_Release(format2); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0