wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : user32/tests: Skip some tests if not privileged enough to call CreateWindowStation().
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 3baf73aa8e5790f4d554bd530c135b17d0ff04c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baf73aa8e5790f4d554bd530… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:39:41 2011 +0200 user32/tests: Skip some tests if not privileged enough to call CreateWindowStation(). --- dlls/user32/tests/winstation.c | 96 ++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7be74f2..30eeff1 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -108,7 +108,7 @@ static void test_handles(void) HWINSTA w1, w2, w3; HDESK d1, d2, d3; HANDLE hthread; - DWORD id, flags; + DWORD id, flags, le; ATOM atom; char buffer[20]; @@ -137,16 +137,22 @@ static void test_handles(void) ok( CloseHandle(w2), "closing dup win station handle failed\n" ); w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "CreateWindowStation failed\n" ); - ok( w2 != w1, "CreateWindowStation returned default handle\n" ); - SetLastError( 0xdeadbeef ); - ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - - w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", le ); + if (w2 != 0) + { + ok( w2 != w1, "CreateWindowStation returned default handle\n" ); + SetLastError( 0xdeadbeef ); + ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ + "bad last error %d\n", GetLastError() ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + + w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); + ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); w2 = OpenWindowStation("winsta0", TRUE, WINSTA_ALL_ACCESS ); ok( w2 != 0, "OpenWindowStation failed\n" ); @@ -158,38 +164,43 @@ static void test_handles(void) CreateMutexA( NULL, 0, "foobar" ); w2 = CreateWindowStation("foobar", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( w3 != 0, "open foobar station failed\n" ); - ok( w3 != w2, "open foobar station returned same handle\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%u)\n", le ); - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( !w3, "open foobar station succeeded\n" ); - - w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w3 != 0, "create foobar station failed\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w2 ); - register_class(); - atom = GlobalAddAtomA("foo"); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); - - ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w3 ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + if (w2 != 0) + { + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( w3 != 0, "open foobar station failed\n" ); + ok( w3 != w2, "open foobar station returned same handle\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); + + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( !w3, "open foobar station succeeded\n" ); + + w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create foobar station failed\n" ); + w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w3 != 0, "create foobar station failed\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w2 ); + atom = GlobalAddAtomA("foo"); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + + ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w3 ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); @@ -251,6 +262,7 @@ static void test_handles(void) d2 = GetThreadDesktop(GetCurrentThreadId()); ok( d1 == d2, "got different handles after close\n" ); + register_class(); trace( "thread 1 desktop: %p\n", d1 ); print_object( d1 ); hthread = CreateThread( NULL, 0, thread, (LPVOID)2, 0, &id );

1 0

Andrew Talbot : avifil32: Fix use of wrong variable in expression.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: f2a0f05082cd2004f83c2f0d20d8f219a0417538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a0f05082cd2004f83c2f0d2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 20 21:36:30 2011 +0100 avifil32: Fix use of wrong variable in expression. --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f37395f..885d239 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1339,7 +1339,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, /* ckid,size => 2 * sizeof(DWORD) */ dwPos += 2 * sizeof(DWORD) + size; - if (size >= This->paf->dwMoviChunkPos - 2 * sizeof(DWORD)) + if (dwPos >= This->paf->dwMoviChunkPos - 2 * sizeof(DWORD)) return AVIERR_UNSUPPORTED; /* not enough space left */ }

1 0

Stefan Dösinger : d3dx9_36/tests: Account for NP2 limitations in a texture test.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 3b9f88555f222cbded0ce5913f19e6ae5b50e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9f88555f222cbded0ce5913… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:18:28 2011 +0200 d3dx9_36/tests: Account for NP2 limitations in a texture test. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c575346..38b87db 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -100,7 +100,10 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) width = caps.MaxTextureWidth-1; hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + ok(width == caps.MaxTextureWidth, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth); + else + ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); /* mipmaps */ width = 64; height = 63;

1 0

Stefan Dösinger : d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: b97b577e9fde609c7c9644e6f189ef84c3a530b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97b577e9fde609c7c9644e6f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:10:28 2011 +0200 d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits. --- dlls/d3dx9_36/tests/math.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c26a523..fcf0a99 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2219,7 +2219,9 @@ static void test_D3DXVec_Array(void) static void test_D3DXFloat_Array(void) { static const float z = 0.0f; - float nnan = 0.0f/z; + /* Compilers set different sign bits on 0.0 / 0.0, pick the right ones for NaN and -NaN */ + float tmpnan = 0.0f/z; + float nnan = copysignf(1, tmpnan) < 0.0f ? tmpnan : -tmpnan; float nan = -nnan; unsigned int i; void *out = NULL;

1 0

Alexandre Julliard : winex11: Forward AlphaBlend with a DIB section as source to the null driver.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: ff2805cae00ebf854e2fd80c2a34af18e275180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2805cae00ebf854e2fd80c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 11:35:36 2011 +0200 winex11: Forward AlphaBlend with a DIB section as source to the null driver. --- dlls/winex11.drv/xrender.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b83a9c9..e3fa09a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2856,7 +2856,17 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } - if (physdev_src != physdev_dst) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) + { + int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); + if (status == DIB_Status_AppMod || status == DIB_Status_InSync) + { + X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); + dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); + return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); + } + X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + } X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect );

1 0

Alexandre Julliard : winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 094d9fe48e6dd343246cc1b2ddda9d0f33517be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d9fe48e6dd343246cc1b2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:23:18 2011 +0200 winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 370d5f3..b83a9c9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2845,6 +2845,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); Picture dst_pict, src_pict = 0, mask_pict = 0, tmp_pict = 0; + XRenderPictureAttributes pa; + Pixmap tmp_pixmap = 0; double xscale, yscale; BOOL use_repeat; @@ -2867,25 +2869,47 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->format) + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + + if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) + { + /* mono -> color blending needs an intermediate color pixmap */ + XRenderColor fg, bg; + int width = src->visrect.right - src->visrect.left; + int height = src->visrect.bottom - src->visrect.top; + + /* blending doesn't use the destination DC colors */ + fg.red = fg.green = fg.blue = 0; + bg.red = bg.green = bg.blue = 0xffff; + fg.alpha = bg.alpha = 0xffff; + + wine_tsx11_lock(); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, width, height, + physdev_dst->pict_format->depth ); + pa.repeat = use_repeat ? RepeatNormal : RepeatNone; + tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, + CPRepeat, &pa ); + wine_tsx11_unlock(); + + xrender_mono_blit( src_pict, tmp_pict, physdev_dst->format, &fg, &bg, + src->visrect.left, src->visrect.top, 0, 0, 1, 1, width, height ); + } + else if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->pict_format) { /* we need a source picture with no alpha */ enum wxr_format format = get_format_without_alpha( physdev_src->format ); if (format != physdev_src->format) { - XRenderPictureAttributes pa; - wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; pa.repeat = use_repeat ? RepeatNormal : RepeatNone; tmp_pict = pXRenderCreatePicture( gdi_display, physdev_src->x11dev->drawable, pict_formats[format], CPSubwindowMode|CPRepeat, &pa ); wine_tsx11_unlock(); - src_pict = tmp_pict; } } - if (!src_pict) src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + if (tmp_pict) src_pict = tmp_pict; EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); @@ -2899,6 +2923,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); + if (tmp_pixmap) XFreePixmap( gdi_display, tmp_pixmap ); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs );

1 0

Alexandre Julliard : winex11: Move locking and handling of fg/ bg colors into xrender_mono_blit.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 4ad9e7bbcdf210e81c7deeeb61be509015e19324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9e7bbcdf210e81c7deeeb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:22:34 2011 +0200 winex11: Move locking and handling of fg/bg colors into xrender_mono_blit. --- dlls/winex11.drv/xrender.c | 68 +++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cdd71e8..370d5f3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2288,6 +2288,7 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ + wine_tsx11_lock(); if(xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2305,21 +2306,28 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d } pXRenderComposite( gdi_display, op, src_pict, mask_pict, dst_pict, x_offset, y_offset, 0, 0, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); } /* Helper function for (stretched) mono->color blitting using xrender */ -static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, +static void xrender_mono_blit( Picture src_pict, Picture dst_pict, + enum wxr_format dst_format, XRenderColor *fg, XRenderColor *bg, int x_src, int y_src, int x_dst, int y_dst, double xscale, double yscale, int width, int height ) { + Picture tile_pict; int x_offset, y_offset; - /* When doing a mono->color blit, 'src_pict' contains a 1x1 picture for tiling, the actual - * source data is in mask_pict. The 'mask_pict' data effectively acts as an alpha channel to the - * tile data. We need PictOpOver for correct rendering. - * Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using - * mask_x / mask_y + /* When doing a mono->color blit, the source data is used as mask, and the source picture + * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to + * the tile data. */ + EnterCriticalSection( &xrender_cs ); + tile_pict = get_tile_pict( dst_format, bg ); + + wine_tsx11_lock(); + pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, fg, x_dst, y_dst, width, height ); + if (xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2327,16 +2335,18 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ */ x_offset = (xscale < 0) ? -width : 0; y_offset = (yscale < 0) ? -height : 0; - set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); + set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); } else { x_offset = x_src; y_offset = y_src; - set_xrender_transformation(mask_pict, 1, 1, 0, 0); + set_xrender_transformation(src_pict, 1, 1, 0, 0); } - pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, + pXRenderComposite(gdi_display, PictOpOver, tile_pict, src_pict, dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); + LeaveCriticalSection( &xrender_cs ); } static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, @@ -2456,6 +2466,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2464,35 +2476,16 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr get_colors( physdev_src, physdev_dst, &fg, &bg ); fg.alpha = bg.alpha = 0; - /* We use the source drawable as a mask */ - mask_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - /* Use backgroundPixel as the foreground color */ - EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict( physdev_dst->format, &bg ); - - /* Create a destination picture and fill it with textPixel color as the background color */ - wine_tsx11_lock(); - pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, &fg, x_dst, y_dst, width, height ); - - xrender_mono_blit( src_pict, mask_pict, dst_pict, x_src, y_src, - x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); - LeaveCriticalSection( &xrender_cs ); + xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg, + x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); } else /* color -> color (can be at different depths) or mono -> mono */ { if (physdev_dst->x11dev->depth == 32 && physdev_src->x11dev->depth < 32) mask_pict = get_no_alpha_mask(); - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); } if (drawable) @@ -2551,12 +2544,15 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); - if (drawable) pXRenderFreePicture( gdi_display, dst_pict ); - wine_tsx11_unlock(); + if (drawable) + { + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, dst_pict ); + wine_tsx11_unlock(); + } } @@ -2817,11 +2813,12 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, src->x, src->y, physdev->x11dev->dc_rect.left + dst->x, physdev->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); pXRenderFreePicture( gdi_display, src_pict ); XFreePixmap( gdi_display, src_pixmap ); wine_tsx11_unlock(); @@ -2893,13 +2890,14 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, physdev_src->x11dev->dc_rect.left + src->x, physdev_src->x11dev->dc_rect.top + src->y, physdev_dst->x11dev->dc_rect.left + dst->x, physdev_dst->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); wine_tsx11_unlock();

1 0

Alexandre Julliard : gdi32/tests: Add a test for alpha channel handling in StretchBlt.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: b6153354dd28c57fb1f92f85df1f1ba751794fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6153354dd28c57fb1f92f85d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 17:58:12 2011 +0200 gdi32/tests: Add a test for alpha channel handling in StretchBlt. --- dlls/gdi32/tests/bitmap.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 14d7f7f..92d8181 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2942,7 +2942,39 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); - /* Tidy up */ + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + biSrc.bmiHeader.biHeight = -2; + biSrc.bmiHeader.biBitCount = 24; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(dstBuffer, expected, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcSrc, 0, 0, 2, 2, hdcDst, 0, 0, 2, 2, SRCCOPY ); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, 2, 2, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00FED00D; + expected[2] = 0x00543210, expected[3] = 0x00DCBA98; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(srcBuffer, expected, 4 * sizeof(*dstBuffer)); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, 2, 2, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00D00DFE; + expected[2] = 0x00543210, expected[3] = 0x00BA9876; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + SelectObject(hdcSrc, oldSrc); DeleteObject(bmpSrc); DeleteDC(hdcSrc);

1 0

Alistair Leslie-Hughes : mscoree: Add missing typedefs.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: e331b0c89287494827e8df804d305488a9af7fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e331b0c89287494827e8df804… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 19 13:07:13 2011 +1000 mscoree: Add missing typedefs. --- include/corhdr.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/corhdr.h b/include/corhdr.h index 4064efd6..5ca84fe 100644 --- a/include/corhdr.h +++ b/include/corhdr.h @@ -49,10 +49,82 @@ typedef enum CorTokenType mdtBaseType = 0x72000000, } CorTokenType; +typedef enum CorElementType +{ + ELEMENT_TYPE_END = 0x00, + ELEMENT_TYPE_VOID = 0x01, + ELEMENT_TYPE_BOOLEAN = 0x02, + ELEMENT_TYPE_CHAR = 0x03, + ELEMENT_TYPE_I1 = 0x04, + ELEMENT_TYPE_U1 = 0x05, + ELEMENT_TYPE_I2 = 0x06, + ELEMENT_TYPE_U2 = 0x07, + ELEMENT_TYPE_I4 = 0x08, + ELEMENT_TYPE_U4 = 0x09, + ELEMENT_TYPE_I8 = 0x0a, + ELEMENT_TYPE_U8 = 0x0b, + ELEMENT_TYPE_R4 = 0x0c, + ELEMENT_TYPE_R8 = 0x0d, + ELEMENT_TYPE_STRING = 0x0e, + ELEMENT_TYPE_PTR = 0x0f, + ELEMENT_TYPE_BYREF = 0x10, + ELEMENT_TYPE_VALUETYPE = 0x11, + ELEMENT_TYPE_CLASS = 0x12, + ELEMENT_TYPE_VAR = 0x13, + ELEMENT_TYPE_ARRAY = 0x14, + ELEMENT_TYPE_GENERICINST = 0x15, + ELEMENT_TYPE_TYPEDBYREF = 0x16, + ELEMENT_TYPE_I = 0x18, + ELEMENT_TYPE_U = 0x19, + ELEMENT_TYPE_FNPTR = 0x1b, + ELEMENT_TYPE_OBJECT = 0x1c, + ELEMENT_TYPE_SZARRAY = 0x1d, + ELEMENT_TYPE_MVAR = 0x1e, + ELEMENT_TYPE_CMOD_REQD = 0x1f, + ELEMENT_TYPE_CMOD_OPT = 0x20, + ELEMENT_TYPE_INTERNAL = 0x21, + ELEMENT_TYPE_MAX = 0x22, + ELEMENT_TYPE_MODIFIER = 0x40, + ELEMENT_TYPE_SENTINEL = 0x01 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_R4_HFA = 0x06 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_R8_HFA = 0x07 | ELEMENT_TYPE_MODIFIER, + +} CorElementType; + #define RidToToken(rid,tktype) ((rid) |= (tktype)) #define TokenFromRid(rid,tktype) ((rid) | (tktype)) #define RidFromToken(tk) ((RID)((tk) & 0x00ffffff)) #define TypeFromToken(tk) ((ULONG32)((tk) & 0xff000000)) #define IsNilToken(tk) ((RidFromToken(tk)) == 0) +typedef LPVOID mdScope; +typedef ULONG32 mdToken; + +typedef mdToken mdModule; +typedef mdToken mdTypeRef; +typedef mdToken mdTypeDef; +typedef mdToken mdFieldDef; +typedef mdToken mdMethodDef; +typedef mdToken mdParamDef; +typedef mdToken mdInterfaceImpl; +typedef mdToken mdMemberRef; +typedef mdToken mdCustomAttribute; +typedef mdToken mdPermission; +typedef mdToken mdSignature; +typedef mdToken mdEvent; +typedef mdToken mdProperty; +typedef mdToken mdModuleRef; +typedef mdToken mdAssembly; +typedef mdToken mdAssemblyRef; +typedef mdToken mdFile; +typedef mdToken mdExportedType; +typedef mdToken mdManifestResource; +typedef mdToken mdTypeSpec; +typedef mdToken mdGenericParam; +typedef mdToken mdMethodSpec; +typedef mdToken mdGenericParamConstraint; +typedef mdToken mdString; +typedef mdToken mdCPToken; + #endif /* __WINE_CORHDR_H */

1 0

Alistair Leslie-Hughes : mscoree: Add .Net debugging interfaces.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 4072d20f6e6272f3ca17ede39bc8fffba090facb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4072d20f6e6272f3ca17ede39… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 19 12:11:13 2011 +1000 mscoree: Add .Net debugging interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/cordebug.idl | 951 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 953 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4072d20f6e6272f3ca17e…

1 0

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 September 2011