wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Michael Stefaniuc : explorerframe/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 6eb70eea1b2d4a8cfcacaf7c6eb4e8bda3a23ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb70eea1b2d4a8cfcacaf7c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:57:20 2016 +0200 explorerframe/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f8c44b6..83ee892 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -862,7 +862,7 @@ static void test_basics(void) process_msgs(); /* Initialize the control */ - rc.top = rc.left = 0; rc.right = rc.bottom = 200; + SetRect(&rc, 0, 0, 200, 200); hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, &rc, 0); ok(hr == S_OK, "Got (0x%08x)\n", hr); @@ -1563,7 +1563,7 @@ static void test_basics(void) ok(hr == S_OK, "Got (0x%08x)\n", hr); /* GetItemRect */ - rc.top = rc.left = rc.bottom = rc.right = 0; + SetRectEmpty(&rc); if(0) { /* Crashes under win 7 */

1 0

Michael Stefaniuc : explorerframe: Use the proper RECT APIs.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 15c55ff7bde8c3343eccf70da7f99328f8e7d754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c55ff7bde8c3343eccf70da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 9 13:56:47 2016 +0200 explorerframe: Use the proper RECT APIs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 87a7200..95b0a99 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -910,9 +910,9 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, window_ex_style = nstcsFlags & NSTCS_TABSTOP ? WS_EX_CONTROLPARENT : 0; if(prc) - CopyRect(&rc, prc); + rc = *prc; else - rc.left = rc.right = rc.top = rc.bottom = 0; + SetRectEmpty(&rc); This->hwnd_main = CreateWindowExW(window_ex_style, NSTC2_CLASS_NAME, NULL, window_style, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,

1 0

Michael Stefaniuc : comctl32: Use InflateRect() too when expanding in just one axis.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 8258d900ca5f1404ff49d3b26de0ac81663da4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8258d900ca5f1404ff49d3b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:18:39 2016 +0200 comctl32: Use InflateRect() too when expanding in just one axis. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 6 ++---- dlls/comctl32/tab.c | 11 +++-------- dlls/comctl32/theme_button.c | 3 +-- dlls/comctl32/toolbar.c | 3 +-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 3089378..a6243a9 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -730,8 +730,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) lpBand->fDraw |= DRAW_GRIPPER; lpBand->rcGripper.left += REBAR_PRE_GRIPPER; lpBand->rcGripper.right = lpBand->rcGripper.left + GRIPPER_WIDTH; - lpBand->rcGripper.top += 2; - lpBand->rcGripper.bottom -= 2; + InflateRect(&lpBand->rcGripper, 0, -2); SetRect (&lpBand->rcCapImage, lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.top, @@ -859,8 +858,7 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } else { /* horizontal gripper */ - lpBand->rcGripper.left += 2; - lpBand->rcGripper.right -= 2; + InflateRect(&lpBand->rcGripper, -2, 0); lpBand->rcGripper.top += REBAR_PRE_GRIPPER; lpBand->rcGripper.bottom = lpBand->rcGripper.top + GRIPPER_WIDTH; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index d228c07..9806783 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1618,8 +1618,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if (iItem != infoPtr->iSelected) { drawRect->left += 2; - drawRect->top += 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_VERTICAL) @@ -1630,9 +1629,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } else { - drawRect->top += 2; drawRect->right -= 2; - drawRect->bottom -= 2; + InflateRect(drawRect, 0, -2); } } else if (infoPtr->dwStyle & TCS_BOTTOM) @@ -1715,10 +1713,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect drawRect->top += 2; drawRect->right -= 1; if ( iItem == infoPtr->iSelected ) - { - drawRect->right -= 1; - drawRect->left += 1; - } + InflateRect(drawRect, -1, 0); id = (UINT)GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID ); diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index edb31e6..f136b5d 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -278,8 +278,7 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (text) { - textRect.left += 2; - textRect.right -= 2; + InflateRect(&textRect, -2, 0); DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); HeapFree(GetProcessHeap(), 0, text); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 3b32e91..422845c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -957,8 +957,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, /* calculate text position */ if (lpText) { - rcText.left += GetSystemMetrics(SM_CXEDGE); - rcText.right -= GetSystemMetrics(SM_CXEDGE); + InflateRect(&rcText, -GetSystemMetrics(SM_CXEDGE), 0); if (dwStyle & TBSTYLE_LIST) { rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2;

1 0

Kirill Smirnov : winex11.drv: Avoid passing NULL to memcpy (clang).
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 1b4e193473153dc9f4d4f4237b9a67564ada95d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e193473153dc9f4d4f4237… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Fri Jul 8 01:50:27 2016 +0300 winex11.drv: Avoid passing NULL to memcpy (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e0548b8..e51169d 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -92,7 +92,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, ptr_new = CompositionString + byte_offset; memmove(ptr_new + byte_length, ptr_new + byte_selection, dwCompStringLength - byte_offset - byte_selection); - memcpy(ptr_new, lpComp, byte_length); + if (lpComp) memcpy(ptr_new, lpComp, byte_length); dwCompStringLength += byte_expansion; IME_SetCompositionString(SCS_SETSTR, CompositionString,

1 0

Huw Davies : gdi32: Add back the extents test.
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: 622c01c5e1fb72bf4ddcc78ea90bc36ff7d540ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=622c01c5e1fb72bf4ddcc78ea… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 8 15:57:36 2016 +0100 gdi32: Add back the extents test. Spotted by Sebastian Lackner. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cea2dab..db21c02 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1038,7 +1038,8 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - region_find_pt( obj, x, y, &ret ); + if (obj->numRects > 0 && is_in_rect( &obj->extents, x, y )) + region_find_pt( obj, x, y, &ret ); GDI_ReleaseObj( hrgn ); } return ret;

1 0

Michael Stefaniuc : winepulse: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: cd9aa35f680ac11be96ecc955be0c14e59877c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9aa35f680ac11be96ecc955… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:06:30 2016 +0200 winepulse: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1c38e58..5bf534e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1443,8 +1443,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, exit: if (FAILED(hr)) { - if(This->local_buffer) - HeapFree(GetProcessHeap(), 0, This->local_buffer); + HeapFree(GetProcessHeap(), 0, This->local_buffer); This->local_buffer = NULL; if (This->stream) { pa_stream_disconnect(This->stream);

1 0

Michael Stefaniuc : windowscodecs: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard 10 Jul '16

10 Jul '16

Module: wine Branch: master Commit: da5dfe7e80989c4dbdeb2fc3a933b8cc8fe66609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5dfe7e80989c4dbdeb2fc3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:06:02 2016 +0200 windowscodecs: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icnsformat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index d4c5004..552fa39 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -175,8 +175,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) This->encoder->outstanding_commits--; LeaveCriticalSection(&This->encoder->lock); } - if (This->icns_image != NULL) - HeapFree(GetProcessHeap(), 0, This->icns_image); + HeapFree(GetProcessHeap(), 0, This->icns_image); IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); HeapFree(GetProcessHeap(), 0, This);

1 0

Alexandre Julliard : Wine release 1.9.14
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: website Branch: master Commit: 1362bf1abc83a65ea2075d69a5565f495d0d6c10 URL: http://source.winehq.org/git/website.git/?a=commit;h=1362bf1abc83a65ea2075d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 00:02:16 2016 +0900 Wine release 1.9.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016070901.xml b/news/en/2016070901.xml new file mode 100644 index 0000000..9a91dcb --- /dev/null +++ b/news/en/2016070901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 9, 2016</date> +<title>Wine 1.9.14 Released</title> +<body> + The Wine development release 1.9.14 is now available. + <a href="{$root}/announce/1.9.14">What's new</a> in this release: +<ul> + <li>More Shader Model 5 support in Direct3D.</li> + <li>Some more write support in WebServices.</li> + <li>Performance improvements in GDI.</li> + <li>Some more progress towards the Direct3D command stream.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.14.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>. +</body></news>

1 0

Tag wine-1.9.14 : Alexandre Julliard : Release 1.9.14
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: refs/tags/wine-1.9.14 Tag: df8b70b2adbbbaab4610a600fe59b71e51c23f2d URL: http://source.winehq.org/git/wine.git/?a=tag;h=df8b70b2adbbbaab4610a600fe59… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14

1 0

Alexandre Julliard : Release 1.9.14.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: abb221fa81b60f53c14f6864bbfb9453455aeeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb221fa81b60f53c14f6864b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 778 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 382 insertions(+), 419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abb221fa81b60f53c14f6…

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016