October 2009 - Wine-commits

Gerald Pfeifer : winebuild: Add support for PLATFORM_FREEBSD to get_ld_command.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 2cc7fe219201e91334ce8ec841595d389dd224de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc7fe219201e91334ce8ec84… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Oct 15 00:20:39 2009 +0200 winebuild: Add support for PLATFORM_FREEBSD to get_ld_command. --- tools/winebuild/utils.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index e0cd8bc..bbf23f4 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -297,9 +297,20 @@ const char *get_ld_command(void) if (force_pointer_size) { - const char *args = (target_platform == PLATFORM_APPLE) ? - ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") : - ((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"); + const char *args; + + switch (target_platform) + { + case PLATFORM_APPLE: + args = (force_pointer_size == 8) ? " -arch x86_64" : " -arch i386"; + break; + case PLATFORM_FREEBSD: + args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386_fbsd"; + break; + default: + args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"; + break; + } ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 ); strcat( ld_command, args ); }

1 0

James Helferty : d3d9/tests: Fix position of EndScene in visual test.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 2b5ff0916098a7ac89c8a7053440d13d0052370f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5ff0916098a7ac89c8a7053… Author: James Helferty <jlh(a)transgaming.com> Date: Wed Oct 14 10:57:36 2009 -0400 d3d9/tests: Fix position of EndScene in visual test. --- dlls/d3d9/tests/visual.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f12983d..c087f8b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9112,11 +9112,10 @@ static void tssargtemp_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr = %08x\n", hr); if(SUCCEEDED(hr)) { - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %08x\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed with %08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %08x\n", hr); } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 320, 240);

1 0

Vincent Povirk : urlmon: Add CoInternetGetSecurityUrl stub.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 8643bae3642934dd7a91647b44c852cf9d150e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8643bae3642934dd7a91647b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 14 11:06:14 2009 -0500 urlmon: Add CoInternetGetSecurityUrl stub. --- dlls/urlmon/sec_mgr.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7a1255a..968a987 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1228,3 +1228,12 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM TRACE("(%p %p %x)\n", pSP, ppZM, dwReserved); return ZoneMgrImpl_Construct(NULL, (void**)ppZM); } + +/******************************************************************** + * CoInternetGetSecurityUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) +{ + FIXME("(%p,%p,%u,%u): stub\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 2ed9988..cc40c36 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -15,7 +15,7 @@ @ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags -@ stub CoInternetGetSecurityUrl +@ stdcall CoInternetGetSecurityUrl(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)

1 0

Markus Stockhausen : dinput8: Ensure balance of CoInitialize/CoUninitialize .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 70ae1ba4b552be732a5f627f62ec3521c4234988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ae1ba4b552be732a5f627f6… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Wed Oct 14 19:47:45 2009 +0200 dinput8: Ensure balance of CoInitialize/CoUninitialize. --- dlls/dinput8/dinput8_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 77f7f64..87dd07b 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -51,7 +51,7 @@ static void UnlockModule(void) * DirectInput8Create (DINPUT8.@) */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - HRESULT hr; + HRESULT hr, hrCo; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); @@ -62,7 +62,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer if( !(IsEqualGUID(&IID_IDirectInput8A, riid) || IsEqualGUID(&IID_IDirectInput8W, riid) || IsEqualGUID(&IID_IUnknown, riid)) ) return DIERR_INVALIDPARAM; - CoInitialize(NULL); + hrCo = CoInitialize(NULL); hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { @@ -70,7 +70,9 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer return DIERR_INVALIDPARAM; } - CoUninitialize(); + /* ensure balance of calls */ + if(hrCo == S_OK || hrCo == S_FALSE) + CoUninitialize(); /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) {

1 0

Jacek Caban : msxml3: Store xmlnode structure instead of pointer in node implementations.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 04eff32bbb526fa35642f1b2bae3fc75b52d289f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eff32bbb526fa35642f1b2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 20:01:42 2009 +0200 msxml3: Store xmlnode structure instead of pointer in node implementations. --- dlls/msxml3/attribute.c | 91 +++++++++++++++++------------------- dlls/msxml3/cdata.c | 99 +++++++++++++++++++--------------------- dlls/msxml3/comment.c | 103 ++++++++++++++++++++---------------------- dlls/msxml3/docfrag.c | 85 ++++++++++++++++------------------ dlls/msxml3/domdoc.c | 107 ++++++++++++++++++++---------------------- dlls/msxml3/element.c | 92 +++++++++++++++++-------------------- dlls/msxml3/entityref.c | 85 ++++++++++++++++------------------ dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 39 +++++++-------- dlls/msxml3/pi.c | 91 +++++++++++++++++------------------- dlls/msxml3/text.c | 99 +++++++++++++++++++--------------------- 11 files changed, 421 insertions(+), 472 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04eff32bbb526fa35642f…

1 0

Eric Pouech : mmsystem: Move the 16bit mmio code into a dedicated file ( mmio16.c).
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: f4c561746c577912181ebaef83105709c6e61147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c561746c577912181ebaef8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:55:57 2009 +0200 mmsystem: Move the 16bit mmio code into a dedicated file (mmio16.c). --- dlls/winmm/Makefile.in | 1 + dlls/winmm/mmio16.c | 449 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/mmsystem.c | 411 +------------------------------------------- 3 files changed, 451 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c561746c577912181eb…

1 0

Eric Pouech : winmm: Create real 16<>32 thunks for mmio support in MMSystem .
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: e5b4559d2ea80d198a6f755de574756923264b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b4559d2ea80d198a6f755de… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:56:05 2009 +0200 winmm: Create real 16<>32 thunks for mmio support in MMSystem. --- dlls/winmm/mmio.c | 22 +--- dlls/winmm/mmio16.c | 271 +++++++++++++++++++++++++++++++++++++++++------- dlls/winmm/mmsystem.c | 3 - dlls/winmm/winemm.h | 12 +-- 4 files changed, 238 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b4559d2ea80d198a6f7…

1 0

Eric Pouech : winmm: Transform the mmio proc kind into a boolean ( to distinguish between ANSI and Unicode).
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 99c4b22bab34a36f81cc20750cb42010b7e8e23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c4b22bab34a36f81cc20750… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:56:13 2009 +0200 winmm: Transform the mmio proc kind into a boolean (to distinguish between ANSI and Unicode). --- dlls/winmm/mmio.c | 101 ++++++++++++++++++++++----------------------------- dlls/winmm/winemm.h | 4 +-- 2 files changed, 44 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99c4b22bab34a36f81cc2…

1 0

Roderick Colenbrander : winex11: Add X11DRV_XRender_SetDeviceClipping for syncing the clipping region with XRender pictures .
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 14e21d955a1e3562a898cd5a325d3b0c0d025e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e21d955a1e3562a898cd5a3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Oct 14 12:33:40 2009 +0200 winex11: Add X11DRV_XRender_SetDeviceClipping for syncing the clipping region with XRender pictures. --- dlls/winex11.drv/graphics.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 38 +++++++++++++++++++++++++++----------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index af1e74c..e6cedfb 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -166,6 +166,9 @@ void CDECL X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); wine_tsx11_unlock(); + + if (physDev->xrender) X11DRV_XRender_SetDeviceClipping(physDev, data); + HeapFree( GetProcessHeap(), 0, data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index eee5849..11f8e0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -281,6 +281,7 @@ extern int using_client_side_fonts; extern void X11DRV_XRender_Init(void); extern void X11DRV_XRender_Finalize(void); extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT); +extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data); extern void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE*); extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height); extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index efced85..7d4250c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -506,13 +506,19 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) if (!info->pict && info->format) { XRenderPictureAttributes pa; + RGNDATA *clip = X11DRV_GetRegionData( physDev->region, 0 ); wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; info->pict = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, CPSubwindowMode, &pa); + if (info->pict && clip) + pXRenderSetPictureClipRectangles( gdi_display, info->pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)clip->Buffer, clip->rdh.nCount ); wine_tsx11_unlock(); TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); + HeapFree( GetProcessHeap(), 0, clip ); } return info->pict; @@ -872,6 +878,21 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) } /*********************************************************************** +* X11DRV_XRender_SetDeviceClipping +*/ +void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) +{ + if (physDev->xrender->pict) + { + wine_tsx11_lock(); + pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)data->Buffer, data->rdh.nCount ); + wine_tsx11_unlock(); + } +} + +/*********************************************************************** * X11DRV_XRender_DeleteDC */ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) @@ -1465,7 +1486,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { - RGNDATA *data; XGCValues xgcval; gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; @@ -1586,16 +1606,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag int render_op = PictOpOver; Picture pict = get_xrender_picture(physDev); - if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) - { - wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, pict, - physDev->dc_rect.left, physDev->dc_rect.top, - (XRectangle *)data->Buffer, data->rdh.nCount ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, data ); - } - /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first element of the elts array. */ @@ -2186,6 +2196,12 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } +void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev) +{ + assert(0); + return; +} + BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx )

1 0

Roderick Colenbrander : winex11: Use get_xrender_picture in X11DRV_XRender_GetSrcAreaStretch.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: a70525739359bb4bbcb7779b337fb7582dd15005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70525739359bb4bbcb7779b3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Oct 14 13:15:01 2009 +0200 winex11: Use get_xrender_picture in X11DRV_XRender_GetSrcAreaStretch. --- dlls/winex11.drv/xrender.c | 61 +++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7d4250c..d83c53d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -144,6 +144,7 @@ struct xrender_info { int cache_index; Picture pict; + Picture pict_src; const WineXRenderFormat *format; }; @@ -524,6 +525,27 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) return info->pict; } +static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev) +{ + struct xrender_info *info = get_xrender_info(physDev); + if (!info) return 0; + + if (!info->pict_src && info->format) + { + XRenderPictureAttributes pa; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + info->pict_src = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, + CPSubwindowMode, &pa); + wine_tsx11_unlock(); + + TRACE("Allocing pict_src=%lx dc=%p drawable=%08lx\n", info->pict_src, physDev->hdc, physDev->drawable); + } + + return info->pict_src; +} + static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; @@ -943,18 +965,28 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTIO */ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) { - wine_tsx11_lock(); + struct xrender_info *info = physDev->xrender; - if(physDev->xrender->pict) + if (info->pict || info->pict_src) { - TRACE("freeing pict = %lx dc = %p\n", physDev->xrender->pict, physDev->hdc); - XFlush(gdi_display); - pXRenderFreePicture(gdi_display, physDev->xrender->pict); - physDev->xrender->pict = 0; + wine_tsx11_lock(); + XFlush( gdi_display ); + if (info->pict) + { + TRACE("freeing pict = %lx dc = %p\n", info->pict, physDev->hdc); + pXRenderFreePicture(gdi_display, info->pict); + info->pict = 0; + } + if(info->pict_src) + { + TRACE("freeing pict = %lx dc = %p\n", info->pict_src, physDev->hdc); + pXRenderFreePicture(gdi_display, info->pict_src); + info->pict_src = 0; + } + wine_tsx11_unlock(); } - wine_tsx11_unlock(); - physDev->xrender->format = NULL; + info->format = NULL; } /************************************************************************ @@ -2091,7 +2123,6 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; - const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; @@ -2136,36 +2167,32 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE get_xrender_color(dst_format, physDevDst->textPixel, &col); /* We use the source drawable as a mask */ - wine_tsx11_lock(); - mask_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); + mask_pict = get_xrender_picture_source(physDevSrc); /* Use backgroundPixel as the foreground color */ src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); /* Create a destination picture and fill it with textPixel color as the background color */ + wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); xrender_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); - if(mask_pict) pXRenderFreePicture(gdi_display, mask_pict); wine_tsx11_unlock(); } else /* color -> color but with different depths */ { - wine_tsx11_lock(); - src_pict = pXRenderCreatePicture(gdi_display, - physDevSrc->drawable, src_format->pict_format, - CPSubwindowMode|CPRepeat, &pa); + src_pict = get_xrender_picture_source(physDevSrc); + wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); xrender_blit(src_pict, 0, dst_pict, x_src, y_src, xscale, yscale, width, height); - if(src_pict) pXRenderFreePicture(gdi_display, src_pict); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); }

1 0