June 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi32: Implement PolylineTo in enhanced metafiles.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 91ef88a9e3272bdb2ad602c3d6c20e5808cb9da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ef88a9e3272bdb2ad602c3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 14:00:17 2016 +0900 gdi32: Implement PolylineTo in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 14 ++++++++++++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 28 +++++++++++++++++----------- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index aa24913..f4ed165 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -98,6 +98,7 @@ extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* cou extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 6724c10..98be711 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -389,7 +389,7 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) return ret; } - if(iType == EMR_POLYBEZIERTO) { + if(iType == EMR_POLYBEZIERTO || iType == EMR_POLYLINETO) { POINT cur_pt; GetCurrentPositionEx( dev->hdc, &cur_pt ); @@ -467,7 +467,7 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) return ret; } - if(iType == EMR_POLYBEZIERTO16) { + if(iType == EMR_POLYBEZIERTO16 || iType == EMR_POLYLINETO16) { POINT cur_pt; GetCurrentPositionEx( dev->hdc, &cur_pt ); @@ -512,6 +512,16 @@ BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) } /********************************************************************** + * EMFDRV_PolylineTo + */ +BOOL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt, INT count ) +{ + if( EMFDRV_Polylinegon16( dev, pt, count, EMR_POLYLINETO16 ) ) + return TRUE; + return EMFDRV_Polylinegon( dev, pt, count, EMR_POLYLINETO ); +} + +/********************************************************************** * EMFDRV_Polygon */ BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 4d13c2b..8d6acf2 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -111,7 +111,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_PolyPolyline, /* pPolyPolyline */ EMFDRV_Polygon, /* pPolygon */ EMFDRV_Polyline, /* pPolyline */ - NULL, /* pPolylineTo */ + EMFDRV_PolylineTo, /* pPolylineTo */ NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4cf61a2..f90a747 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3601,7 +3601,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x34, 0x02, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, + 0x60, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, @@ -3655,17 +3655,22 @@ static const unsigned char EMF_PATH_BITS[] = 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, - 0x5a, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x59, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, - 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, - 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00 + 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, + 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x14, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, + 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x14, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) @@ -3700,11 +3705,12 @@ static void test_emf_GetPath(void) Ellipse(hdcMetafile, 10, 10, 20, 20); RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); Polyline(hdcMetafile, pts, 4); + PolylineTo(hdcMetafile, pts, 4); PolyPolyline(hdcMetafile, pts, counts, 2); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 88, "GetPath returned %d.\n", size); + todo_wine ok( size == 93, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alex Henrie : ucrtbase: Implement _malloc_base.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 5325b8c95112be75f4fa0e2e2e45bcc88434fb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5325b8c95112be75f4fa0e2e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:24 2016 -0600 ucrtbase: Implement _malloc_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 85b2b83..6dbd207 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin @ cdecl _heapwalk(ptr) ucrtbase._heapwalk -@ stub _malloc_base +@ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize @ stub _query_new_handler @ stub _query_new_mode diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ae663de..5803f4a 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -433,6 +433,14 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) } /********************************************************************* + * _malloc_base (UCRTBASE.@) + */ +void* CDECL _malloc_base(MSVCRT_size_t size) +{ + return MSVCRT_malloc(size); +} + +/********************************************************************* * realloc (MSVCRT.@) */ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4ebf2c6..551fcd7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -580,7 +580,7 @@ @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s -@ stub _malloc_base +@ cdecl _malloc_base(long) @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long)

1 0

Alexandre Julliard : explorer: Fix hiding the taskbar when there are no system tray items.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 5e1e682a173e009cfdbc7947ff9493550dba0fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1e682a173e009cfdbc7947f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 12:08:03 2016 +0900 explorer: Fix hiding the taskbar when there are no system tray items. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index fe8af86..97cffbc 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -118,6 +118,7 @@ static HWND balloon_window; #define WM_POPUPSYSTEMMENU 0x0313 +static void do_hide_systray(void); static void do_show_systray(void); /* Retrieves icon record by owner window and ID */ @@ -366,7 +367,7 @@ static BOOL hide_icon(struct icon *icon) invalidate_icons( icon->display, nb_displayed ); icon->display = -1; - if (!nb_displayed && !enable_shell) ShowWindow( tray_window, SW_HIDE ); + if (!nb_displayed && !enable_shell) do_hide_systray(); update_balloon( icon ); update_tooltip_position( icon ); @@ -747,7 +748,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); case WM_DISPLAYCHANGE: - if (hide_systray) do_hide_systray(); + if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); else do_show_systray(); break;

1 0

Jacek Caban : mshtml: Added IElementSelector interface stub implementation.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: ba9da24d7cff5601b6482f7dc66787ccd8297948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9da24d7cff5601b6482f7dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:29:46 2016 +0200 mshtml: Added IElementSelector interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 5 ++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 67c8460..8aac47b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4020,6 +4020,83 @@ static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { HTMLUniqueName_get_uniqueID }; +static inline HTMLElement *impl_from_IElementSelector(IElementSelector *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IElementSelector_iface); +} + +static HRESULT WINAPI ElementSelector_QueryInterface(IElementSelector *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI ElementSelector_AddRef(IElementSelector *iface) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI ElementSelector_Release(IElementSelector *iface) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI ElementSelector_GetTypeInfoCount(IElementSelector *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI ElementSelector_GetTypeInfo(IElementSelector *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI ElementSelector_GetIDsOfNames(IElementSelector *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI ElementSelector_Invoke(IElementSelector *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BSTR v, IHTMLElement **pel) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static const IElementSelectorVtbl ElementSelectorVtbl = { + ElementSelector_QueryInterface, + ElementSelector_AddRef, + ElementSelector_Release, + ElementSelector_GetTypeInfoCount, + ElementSelector_GetTypeInfo, + ElementSelector_GetIDsOfNames, + ElementSelector_Invoke, + ElementSelector_querySelector, + ElementSelector_querySelectorAll +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -4043,6 +4120,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLElement4_iface; }else if(IsEqualGUID(&IID_IHTMLUniqueName, riid)) { *ppv = &This->IHTMLUniqueName_iface; + }else if(IsEqualGUID(&IID_IElementSelector, riid)) { + *ppv = &This->IElementSelector_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else { @@ -4313,6 +4392,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement3_iface.lpVtbl = &HTMLElement3Vtbl; This->IHTMLElement4_iface.lpVtbl = &HTMLElement4Vtbl; This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; + This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d378bdd..9d07047 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -125,6 +125,7 @@ typedef struct event_target_t event_target_t; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDocumentSelector) \ + XIID(IElementSelector) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -717,6 +718,7 @@ typedef struct { IHTMLElement3 IHTMLElement3_iface; IHTMLElement4 IHTMLElement4_iface; IHTMLUniqueName IHTMLUniqueName_iface; + IElementSelector IElementSelector_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style; @@ -733,7 +735,8 @@ typedef struct { IHTMLElement2_tid, \ IHTMLElement3_tid, \ IHTMLElement4_tid, \ - IHTMLUniqueName_tid + IHTMLUniqueName_tid, \ + IElementSelector_tid extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data}

1 0

Michael Stefaniuc : user32/tests: Add some IsRectEmpty() tests.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 41d01871fef296dc717cf2c4f0bdbb07f5266acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d01871fef296dc717cf2c4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 14:44:04 2016 +0200 user32/tests: Add some IsRectEmpty() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index f3365ba..27a4179 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -146,6 +146,42 @@ static void test_EqualRect(void) ok(ret, "got %d\n", ret); } +static void test_IsRectEmpty(void) +{ + BOOL ret; + unsigned int i; + static const struct { + RECT rect; + BOOL ret; + } rtest[] = { + {{0, 0, 0, 0}, TRUE}, + {{127, 131, 127, 131}, TRUE}, + {{MAXLONG, MAXLONG, MAXLONG, MAXLONG}, TRUE}, + {{-1, -1, -1, -1}, TRUE}, + {{-2011, -2017, -2011, -2017}, TRUE}, + {{MINLONG, MINLONG, MINLONG, MINLONG}, TRUE}, + /* Only width or height are 0 */ + {{31, 37, 31, 41}, TRUE}, + {{881, 883, 887, 883}, TRUE}, + {{-1721, 1723, -1721, 7213}, TRUE}, + /* Negative width and/or height */ + {{11, 13, 5, 7}, TRUE}, + {{-11, -13, -19, -23}, TRUE}, + {{11, 13, -17, 19}, TRUE}, + {{11, 13, 17, 11}, TRUE}, + /* Non emty rects */ + {{101, 103, 107, 109}, FALSE}, + {{1, -9, 7, 3}, FALSE}, + {{-109, -107, -103, -101}, FALSE}, + }; + + for (i = 0; i < sizeof(rtest)/sizeof(rtest[0]); i++) { + ret = IsRectEmpty(&rtest[i].rect); + ok(ret == rtest[i].ret, "Test %d: IsRectEmpty returned %s for %s\n", i, + ret ? "TRUE" : "FALSE", wine_dbgstr_rect(&rtest[i].rect)); + } +} + static void test_SetRect(void) { RECT rect; @@ -170,5 +206,6 @@ START_TEST(uitools) test_FillRect(); test_SubtractRect(); test_EqualRect(); + test_IsRectEmpty(); test_SetRect(); }

1 0

Alex Henrie : ucrtbase: Implement _(un)lock_locales.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: c044cf410d10a78c76a2ea7e8e07d602713f9616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c044cf410d10a78c76a2ea7e8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 14 12:28:12 2016 -0600 ucrtbase: Implement _(un)lock_locales. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 4 ++-- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 9749808..c7e5aae 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -11,9 +11,9 @@ @ cdecl _free_locale(ptr) ucrtbase._free_locale @ cdecl _get_current_locale() ucrtbase._get_current_locale @ cdecl _getmbcp() ucrtbase._getmbcp -@ stub _lock_locales +@ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp -@ stub _unlock_locales +@ cdecl _unlock_locales() ucrtbase._unlock_locales @ stub _wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index eed5a37..74da555 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1592,6 +1592,22 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } /********************************************************************* + * _lock_locales (UCRTBASE.@) + */ +void CDECL _lock_locales(void) +{ + LOCK_LOCALE +} + +/********************************************************************* + * _unlock_locales (UCRTBASE.@) + */ +void CDECL _unlock_locales(void) +{ + UNLOCK_LOCALE +} + +/********************************************************************* * _create_locale (MSVCRT.@) */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 14ffa63..690072b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -563,7 +563,7 @@ @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock_file(ptr) MSVCRT__lock_file -@ stub _lock_locales +@ cdecl _lock_locales() @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @@ -2000,7 +2000,7 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock_file(ptr) MSVCRT__unlock_file -@ stub _unlock_locales +@ cdecl _unlock_locales() @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _waccess(wstr long) MSVCRT__waccess

1 0

Alexandre Julliard : msvcrt: Get rid of the LOCK_LOCALE macros.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 1edd0f4d1dfb73230efea006be69edee8698ea35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edd0f4d1dfb73230efea006b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 23:44:41 2016 +0900 msvcrt: Get rid of the LOCK_LOCALE macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 74da555..024ec99 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -49,10 +49,6 @@ LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; -/* MT */ -#define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); -#define UNLOCK_LOCALE _munlock(_SETLOCALE_LOCK); - #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1596,7 +1592,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, */ void CDECL _lock_locales(void) { - LOCK_LOCALE + _mlock(_SETLOCALE_LOCK); } /********************************************************************* @@ -1604,7 +1600,7 @@ void CDECL _lock_locales(void) */ void CDECL _unlock_locales(void) { - UNLOCK_LOCALE + _munlock(_SETLOCALE_LOCK); } /********************************************************************* @@ -1661,7 +1657,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) return NULL; } - LOCK_LOCALE; + _lock_locales(); if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { @@ -1816,7 +1812,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) } free_locinfo(newlocinfo); - UNLOCK_LOCALE; + _unlock_locales(); if(locinfo == MSVCRT_locale->locinfo) { int i; @@ -1858,14 +1854,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo MSVCRT_wcstombs(locale, wlocale, len); } - LOCK_LOCALE; + _lock_locales(); ret = MSVCRT_setlocale(category, locale); MSVCRT_free(locale); if(ret && MSVCRT_mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) ret = NULL; - UNLOCK_LOCALE; + _unlock_locales(); return ret ? current_lc_all : NULL; } @@ -1921,9 +1917,9 @@ BOOL msvcrt_init_locale(void) { int i; - LOCK_LOCALE; + _lock_locales(); MSVCRT_locale = MSVCRT__create_locale(0, "C"); - UNLOCK_LOCALE; + _unlock_locales(); if(!MSVCRT_locale) return FALSE;

1 0

Józef Kucia : d3d11/tests: Add test for invalid RTV descriptions.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 2b221b3f9cd272a7541c9b569911e3146d6c3390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b221b3f9cd272a7541c9b569… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:41 2016 +0200 d3d11/tests: Add test for invalid RTV descriptions. 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/d3d11/tests/d3d11.c | 157 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 144 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b221b3f9cd272a7541c9…

1 0

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 7f5adb69cd0e9abcc23d1c715545a2aef1b83020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5adb69cd0e9abcc23d1c715… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 10:32:02 2016 +0200 user32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 54 +++++++++++++++++++++--------------------- dlls/user32/tests/edit.c | 10 ++++---- dlls/user32/tests/listbox.c | 12 ++++------ dlls/user32/tests/menu.c | 24 +++++++------------ dlls/user32/tests/monitor.c | 34 +++++++++++---------------- dlls/user32/tests/msg.c | 57 +++++++++++++++++++++------------------------ dlls/user32/tests/text.c | 3 +-- dlls/user32/tests/uitools.c | 20 ++++++++-------- 8 files changed, 94 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f5adb69cd0e9abcc23d1…

1 0

Michael Stefaniuc : user32/tests: Remove an unused macro.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 82fa7dea2a86a43af51f7d4b3f459acd54e4e2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fa7dea2a86a43af51f7d4b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 10:28:13 2016 +0200 user32/tests: Remove an unused macro. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 841889d..929b50d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -33,9 +33,6 @@ static HWND hMainWnd; #define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " fmt " got " fmt "\n", (value), val); } -#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ - r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ - r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); static int g_nReceivedColorStatic = 0;

1 0