September 2010 - Wine-commits

Alexandre Julliard : winex11: Properly support BitBlt and LAYOUT_BITMAPORIENTATIONPRESERVED in mirrored contexts .
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: ebcd07a98b6ea9234152cbb311f85b18f79a8f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcd07a98b6ea9234152cbb31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 10:51:31 2010 +0200 winex11: Properly support BitBlt and LAYOUT_BITMAPORIENTATIONPRESERVED in mirrored contexts. --- dlls/winex11.drv/bitblt.c | 41 +++++++++++++++++++++++++++-------------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 653e418..7d37d76 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1187,8 +1187,14 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE dst->y = rect.top; dst->width = rect.right - rect.left; dst->height = rect.bottom - rect.top; - if (dst->width < 0) SWAP_INT32( &rect.left, &rect.right ); - if (dst->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + SWAP_INT32( &rect.left, &rect.right ); + dst->x = rect.left; + dst->width = rect.right - rect.left; + } + if (rect.left > rect.right) { SWAP_INT32( &rect.left, &rect.right ); rect.left++; rect.right++; } + if (rect.top > rect.bottom) { SWAP_INT32( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } GetRgnBox( physDevDst->region, &clipRect ); if (!IntersectRect( &dst->visrect, &rect, &clipRect )) return FALSE; @@ -1206,8 +1212,14 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE src->y = rect.top; src->width = rect.right - rect.left; src->height = rect.bottom - rect.top; - if (src->width < 0) SWAP_INT32( &rect.left, &rect.right ); - if (src->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + if (src->layout & LAYOUT_RTL && src->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + SWAP_INT32( &rect.left, &rect.right ); + src->x = rect.left; + src->width = rect.right - rect.left; + } + if (rect.left > rect.right) { SWAP_INT32( &rect.left, &rect.right ); rect.left++; rect.right++; } + if (rect.top > rect.bottom) { SWAP_INT32( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } /* Apparently the clipping and visible regions are only for output, so just check against dc extent here to avoid BadMatch errors */ @@ -1407,16 +1419,6 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN Pixmap pixmaps[3] = { 0, 0, 0 }; /* pixmaps for DST, SRC, TMP */ GC tmpGC = 0; - /* compensate for off-by-one shifting for negative widths and heights */ - if (widthDst < 0) - ++xDst; - if (heightDst < 0) - ++yDst; - if (widthSrc < 0) - ++xSrc; - if (heightSrc < 0) - ++ySrc; - usePat = (((rop >> 4) & 0x0f0000) != (rop & 0x0f0000)); useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); useDst = (((rop >> 1) & 0x550000) != (rop & 0x550000)); @@ -1426,10 +1428,19 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN src.y = ySrc; src.width = widthSrc; src.height = heightSrc; + src.layout = physDevSrc ? GetLayout( physDevSrc->hdc ) : 0; dst.x = xDst; dst.y = yDst; dst.width = widthDst; dst.height = heightDst; + dst.layout = GetLayout( physDevDst->hdc ); + + if (rop & NOMIRRORBITMAP) + { + src.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + rop &= ~NOMIRRORBITMAP; + } if (useSrc) { @@ -1684,10 +1695,12 @@ BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN src.y = ySrc; src.width = widthSrc; src.height = heightSrc; + src.layout = GetLayout( physDevSrc->hdc ); dst.x = xDst; dst.y = yDst; dst.width = widthDst; dst.height = heightDst; + dst.layout = GetLayout( physDevDst->hdc ); if (!BITBLT_GetVisRectangles( physDevDst, physDevSrc, &dst, &src )) return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4aaab35..3590d44 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -174,6 +174,7 @@ struct bitblt_coords int width; int height; RECT visrect; /* rectangle clipped to the visible part */ + DWORD layout; /* DC layout */ };

1 0

Alexandre Julliard : user32: Don' t disable DrawFrameControl for non-text mapping modes.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 05375a2a9634c7484a817182feb66f3f80f49b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05375a2a9634c7484a817182f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 11:00:45 2010 +0200 user32: Don't disable DrawFrameControl for non-text mapping modes. --- dlls/user32/uitools.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 9fe2044..919589b 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1210,10 +1210,6 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType, UINT uState ) { - /* Win95 doesn't support drawing in other mapping modes */ - if(GetMapMode(hdc) != MM_TEXT) - return FALSE; - switch(uType) { case DFC_BUTTON:

1 0

Alexandre Julliard : user32: Add a common helper to set controls clip region, and make it behave correctly when mirrored.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 0f90053575c26407efd1b0775fcceb7abd45d6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f90053575c26407efd1b0775… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 2 11:35:14 2010 +0200 user32: Add a common helper to set controls clip region, and make it behave correctly when mirrored. --- dlls/user32/button.c | 54 ++++++++++++++++++++++++----------------------- dlls/user32/combo.c | 23 ++----------------- dlls/user32/controls.h | 2 + dlls/user32/listbox.c | 6 ++-- dlls/user32/static.c | 43 ++++++++------------------------------ dlls/user32/uitools.c | 27 ++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f90053575c26407efd1b…

1 0

Piotr Caban : msvcrt: Fix _splitpath and _wsplitpath implementation.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 1861c2162d9cc61403bd1f6aa649b8a676055569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1861c2162d9cc61403bd1f6aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 1 18:21:24 2010 +0200 msvcrt: Fix _splitpath and _wsplitpath implementation. --- dlls/msvcrt/dir.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5beb91b..5b5f641 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -831,8 +831,8 @@ do_error: void CDECL _splitpath(const char *inpath, char *drv, char *dir, char *fname, char *ext) { - _splitpath_s(inpath, drv, MSVCRT__MAX_DRIVE, dir, MSVCRT__MAX_DIR, - fname, MSVCRT__MAX_FNAME, ext, MSVCRT__MAX_EXT); + _splitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0, + fname, fname?MSVCRT__MAX_FNAME:0, ext, ext?MSVCRT__MAX_EXT:0); } /****************************************************************** @@ -925,8 +925,8 @@ do_error: void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar_t *dir, MSVCRT_wchar_t *fname, MSVCRT_wchar_t *ext) { - _wsplitpath_s(inpath, drv, MSVCRT__MAX_DRIVE, dir, MSVCRT__MAX_DIR, - fname, MSVCRT__MAX_FNAME, ext, MSVCRT__MAX_EXT); + _wsplitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0, + fname, fname?MSVCRT__MAX_FNAME:0, ext, ext?MSVCRT__MAX_EXT:0); } /*********************************************************************

1 0

Henri Verbeet : d3d9: Merge vertex and pixel shader implementations into a single file.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: c35b85a78d0fef3bcb1f1cf89072ce9759e1d85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35b85a78d0fef3bcb1f1cf89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:02 2010 +0200 d3d9: Merge vertex and pixel shader implementations into a single file. --- dlls/d3d9/Makefile.in | 3 +- dlls/d3d9/pixelshader.c | 152 ------------------------- dlls/d3d9/shader.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/vertexshader.c | 152 ------------------------- 4 files changed, 279 insertions(+), 306 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c35b85a78d0fef3bcb1f1…

1 0

Henri Verbeet : d3d8: Merge vertex and pixel shader implementations into a single file.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 29ed11e55f1ed2153537c892af4d7c6d8e4b2eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ed11e55f1ed2153537c892a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:03 2010 +0200 d3d8: Merge vertex and pixel shader implementations into a single file. --- dlls/d3d8/Makefile.in | 3 +- dlls/d3d8/pixelshader.c | 113 ------------------- dlls/d3d8/shader.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/vertexshader.c | 186 ------------------------------ 4 files changed, 281 insertions(+), 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29ed11e55f1ed2153537c…

1 0

Henri Verbeet : d3d9: Merge vertex and index buffer implementations into a single file.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 1549180daaec4867e3b64594106f53495cb80cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1549180daaec4867e3b645941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:04 2010 +0200 d3d9: Merge vertex and index buffer implementations into a single file. --- dlls/d3d9/Makefile.in | 3 +- dlls/d3d9/buffer.c | 559 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/indexbuffer.c | 286 ----------------------- dlls/d3d9/vertexbuffer.c | 288 ------------------------ 4 files changed, 560 insertions(+), 576 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1549180daaec4867e3b64…

1 0

Henri Verbeet : d3d8: Merge vertex and index buffer implementations into a single file.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: c9c034fb557a5c3f0497f3748bf838ed1d036dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c034fb557a5c3f0497f3748… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:05 2010 +0200 d3d8: Merge vertex and index buffer implementations into a single file. --- dlls/d3d8/Makefile.in | 3 +- dlls/d3d8/buffer.c | 557 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/indexbuffer.c | 284 ----------------------- dlls/d3d8/vertexbuffer.c | 287 ------------------------ 4 files changed, 558 insertions(+), 573 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9c034fb557a5c3f0497f…

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: a8841eb1ddb12da177b86db8970267eeebe0b648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8841eb1ddb12da177b86db89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:06 2010 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/directx.c | 193 +++++++++++++++++++++++++----------------------- 1 files changed, 102 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8841eb1ddb12da177b86…

1 0

Octavian Voicu : winmm: Replace return types with symbolic constants in mci command resources.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 3324614ed3d8ca12da7c65ded50f89e2431ac23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3324614ed3d8ca12da7c65ded… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 1 20:07:08 2010 +0300 winmm: Replace return types with symbolic constants in mci command resources. --- dlls/mciavi32/mciavi_res.rc | 12 +++++----- dlls/mciqtz32/mciavi_res.rc | 12 +++++----- dlls/winmm/winmm_res.rc | 52 +++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3324614ed3d8ca12da7c6…

1 0