November 2011 - Wine-commits

Hans Leidekker : winhttp: Fix sending data with synchronous requests.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 82965248d141042ad712a2b6aedd80010ce8a12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82965248d141042ad712a2b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:41 2011 +0100 winhttp: Fix sending data with synchronous requests. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d9e60a..899e8b5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2931,9 +2931,9 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return S_OK; } + request->data = body; if (request->wait) /* async request */ { - request->data = body; if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) { LeaveCriticalSection( &request->cs );

1 0

Hans Leidekker : winhttp: Use a separate function to set request parameters .
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 5d6425498695ca26791301f23af5f2ef95f1b07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6425498695ca26791301f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:05:07 2011 +0100 winhttp: Use a separate function to set request parameters. --- dlls/winhttp/request.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 899e8b5..51c433e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2841,6 +2841,25 @@ error: return HRESULT_FROM_WIN32( err ); } +static DWORD request_set_parameters( struct winhttp_request *request ) +{ + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, + sizeof(request->proxy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, + sizeof(request->logon_policy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, + sizeof(request->disable_feature) )) return get_last_error(); + + if (!WinHttpSetTimeouts( request->hrequest, + request->resolve_timeout, + request->connect_timeout, + request->send_timeout, + request->receive_timeout )) return get_last_error(); + return ERROR_SUCCESS; +} + static HRESULT request_send( struct winhttp_request *request ) { SAFEARRAY *sa = NULL; @@ -2851,28 +2870,7 @@ static HRESULT request_send( struct winhttp_request *request ) BOOL ret; DWORD err; - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, sizeof(request->proxy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, - sizeof(request->logon_policy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, - sizeof(request->disable_feature) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetTimeouts( request->hrequest, - request->resolve_timeout, - request->connect_timeout, - request->send_timeout, - request->receive_timeout )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } + if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); VariantInit( &data ); if (strcmpW( request->verb, getW ) && VariantChangeType( &data, &request->data, 0, VT_ARRAY|VT_UI1 ) == S_OK) {

1 0

Hans Leidekker : imm32: Validate the window handle passed to ImmGetContext.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 21a477e161589630ed94e5561a595c63155e0e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a477e161589630ed94e5561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:06:49 2011 +0100 imm32: Validate the window handle passed to ImmGetContext. --- dlls/imm32/imm.c | 8 +++++++- dlls/imm32/tests/imm32.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index a8392ff..decdcae 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1360,9 +1360,15 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { - HIMC rc = NULL; + HIMC rc; TRACE("%p\n", hWnd); + + if (!IsWindow(hWnd)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return NULL; + } if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 39bedb2..eca4d5e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -557,6 +557,22 @@ static void test_ImmIsUIMessage(void) } } +static void test_ImmGetContext(void) +{ + HIMC himc; + DWORD err; + + SetLastError(0xdeadbeef); + himc = ImmGetContext((HWND)0xffffffff); + err = GetLastError(); + ok(himc == NULL, "ImmGetContext succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "got %u\n", err); + + himc = ImmGetContext(hwnd); + ok(himc != NULL, "ImmGetContext failed\n"); + ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); +} + START_TEST(imm32) { if (init()) { @@ -567,6 +583,7 @@ START_TEST(imm32) { test_ImmAssociateContextEx(); test_ImmThreads(); test_ImmIsUIMessage(); + test_ImmGetContext(); } cleanup(); }

1 0

Octavian Voicu : ddraw: Make IDirectDrawClipperImpl_[GS] etHWnd function names consistent with SDK.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 8a6a1570745dfa823de6d90119ff98741f9d7b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6a1570745dfa823de6d9011… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Nov 9 17:17:13 2011 +0200 ddraw: Make IDirectDrawClipperImpl_[GS]etHWnd function names consistent with SDK. --- dlls/ddraw/clipper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8fd248..43d50ca 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -106,7 +106,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) } /***************************************************************************** - * IDirectDrawClipper::SetHwnd + * IDirectDrawClipper::SetHWnd * * Assigns a hWnd to the clipper interface. * @@ -120,7 +120,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) * *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(IDirectDrawClipper *iface, DWORD dwFlags, +static HRESULT WINAPI IDirectDrawClipperImpl_SetHWnd(IDirectDrawClipper *iface, DWORD dwFlags, HWND hWnd) { IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); @@ -200,9 +200,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(IDirectDrawClipper *ifa } /***************************************************************************** - * IDirectDrawClipper::GetHwnd + * IDirectDrawClipper::GetHWnd * - * Returns the hwnd assigned with SetHwnd + * Returns the hwnd assigned with SetHWnd * * Arguments: * hWndPtr: Address to store the HWND at @@ -292,7 +292,7 @@ static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = IDirectDrawClipperImpl_Initialize, IDirectDrawClipperImpl_IsClipListChanged, IDirectDrawClipperImpl_SetClipList, - IDirectDrawClipperImpl_SetHwnd + IDirectDrawClipperImpl_SetHWnd }; HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper)

1 0

Jacek Caban : mshtml: Wine Gecko 1.4 release.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 2e5f73e4d75cc510d761fb2bd3adf58c8ca72a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5f73e4d75cc510d761fb2bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:42 2011 +0100 mshtml: Wine Gecko 1.4 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/editor.c | 12 +-- dlls/mshtml/htmldoc.c | 37 ++--- dlls/mshtml/htmldoc3.c | 16 +-- dlls/mshtml/htmldoc5.c | 11 +- dlls/mshtml/htmlimg.c | 4 +- dlls/mshtml/htmlwindow.c | 17 +-- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsiface.idl | 439 ++++++++++++++++++++++++++++------------------ dlls/mshtml/nsio.c | 26 +++- 10 files changed, 318 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5f73e4d75cc510d761f…

1 0

Alexandre Julliard : gdi32: Get rid of the get_bitmap_image helper.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: c88f4d452fe56088b317fce165818513a05da4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88f4d452fe56088b317fce16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:06:32 2011 +0100 gdi32: Get rid of the get_bitmap_image helper. --- dlls/gdi32/bitmap.c | 21 --------------------- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a158735..7407906 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -297,27 +297,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } -/* convenience wrapper for GetImage to retrieve the full contents of a bitmap */ -BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) -{ - struct bitblt_coords src; - BOOL ret = FALSE; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (bmp) - { - const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); - src.visrect.left = src.x = 0; - src.visrect.top = src.y = 0; - src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); - GDI_ReleaseObj( hbitmap ); - } - return ret; -} - - /*********************************************************************** * GetBitmapBits [GDI32.@] * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3dfd9a5..9e40fc5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap .
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: cc673f44c7696fd38c6bd23266fda1b76065849e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc673f44c7696fd38c6bd2326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 21:14:42 2011 +0100 gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap. --- dlls/gdi32/brush.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5cbae61..ccd1369 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,44 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) +{ + BITMAPINFO *info; + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + + if (!bmp) return FALSE; + + if (!bmp->dib) + { + GDI_ReleaseObj( bitmap ); + brush->bitmap = BITMAP_CopyBitmap( bitmap ); + return brush->bitmap != 0; + } + + info = HeapAlloc( GetProcessHeap(), 0, + bitmap_info_size( (BITMAPINFO *)&bmp->dib->dsBmih, DIB_RGB_COLORS )); + if (!info) goto done; + info->bmiHeader = bmp->dib->dsBmih; + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); + else if (bmp->nb_colors) + memcpy( &info->bmiHeader + 1, bmp->color_table, bmp->nb_colors * sizeof(RGBQUAD) ); + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) + { + HeapFree( GetProcessHeap(), 0, info ); + goto done; + } + memcpy( brush->bits.ptr, bmp->dib->dsBm.bmBits, get_dib_image_size( info )); + brush->bits.is_copy = TRUE; + brush->bits.free = free_heap_bits; + brush->info = info; + brush->usage = DIB_RGB_COLORS; + +done: + GDI_ReleaseObj( bitmap ); + return brush->info != NULL; +} + BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) { BRUSHOBJ *brush; @@ -159,8 +197,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); - if (!ptr->bitmap) goto error; + if (!copy_bitmap( ptr, (HBITMAP)ptr->logbrush.lbHatch )) goto error; ptr->logbrush.lbColor = 0; break;

1 0

Alexandre Julliard : gdi32: Add a CopyBitmap driver entry point.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 9391c6a757bb9441064c27250d8733ab596b3563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9391c6a757bb9441064c27250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 21:46:25 2011 +0100 gdi32: Add a CopyBitmap driver entry point. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 10 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5a7d011..3adf246 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0986d68..b72d6d7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } +static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return TRUE; +} + static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; @@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ nulldrv_CloseFigure, /* pCloseFigure */ + nulldrv_CopyBitmap, /* pCopyBitmap */ nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 11918c1..f4fa4d3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pChoosePixelFormat */ EMFDRV_Chord, /* pChord */ EMFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1fedc74..9137322 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ freetype_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d738725..b837d84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index d908774..dfe15ed 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pChoosePixelFormat */ pathdrv_Chord, /* pChord */ pathdrv_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e6a0254..e61df3e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pChoosePixelFormat */ PSDRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 484ab7f..6574270 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a61568e..30b9553 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index cb12145..d996fb4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -65,6 +65,7 @@ struct gdi_dc_funcs INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pCloseFigure)(PHYSDEV); + BOOL (*pCopyBitmap)(HBITMAP,HBITMAP); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); @@ -204,7 +205,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 18 +#define WINE_GDI_DRIVER_VERSION 19 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Implement the CopyBitmap entry point in the null driver.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 26f5e2c6e74832bcbdcf9fc0e0718b73be204201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f5e2c6e74832bcbdcf9fc0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:14:50 2011 +0100 gdi32: Implement the CopyBitmap entry point in the null driver. --- dlls/gdi32/bitmap.c | 21 +++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 10 +++++++++- dlls/gdi32/driver.c | 5 ----- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 7407906..9042b88 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -65,6 +65,27 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } +BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + BOOL ret = TRUE; + BITMAPOBJ *src_bmp = GDI_GetObjPtr( src, OBJ_BITMAP ); + + if (!src_bmp) return FALSE; + if (src_bmp->bitmap.bmBits) + { + BITMAPOBJ *dst_bmp = GDI_GetObjPtr( dst, OBJ_BITMAP ); + int stride = get_dib_stride( dst_bmp->bitmap.bmWidth, dst_bmp->bitmap.bmBitsPixel ); + dst_bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, dst_bmp->bitmap.bmHeight * stride ); + if (dst_bmp->bitmap.bmBits) + memcpy( dst_bmp->bitmap.bmBits, src_bmp->bitmap.bmBits, dst_bmp->bitmap.bmHeight * stride ); + else + ret = FALSE; + GDI_ReleaseObj( dst ); + } + GDI_ReleaseObj( src ); + return ret; +} + /****************************************************************************** * CreateBitmap [GDI32.@] diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3adf246..a91de78 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -391,6 +391,14 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_CopyBitmap + */ +static BOOL dibdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return nulldrv_CopyBitmap( src, dst ); +} + +/*********************************************************************** * dibdrv_DeleteBitmap */ static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) @@ -523,7 +531,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + dibdrv_CopyBitmap, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index b72d6d7..9b951d0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,11 +209,6 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } -static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) -{ - return TRUE; -} - static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9e40fc5..ab5cf25 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -357,6 +357,7 @@ extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Implement the CopyBitmap entry point.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: d9a45745a71f379d00aff0b06cf4923633a378e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a45745a71f379d00aff0b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:04:00 2011 +0100 winex11: Implement the CopyBitmap entry point. --- dlls/winex11.drv/bitmap.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 10 +++++++++- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index ea1c7ac..09da565 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -199,6 +199,42 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) } +/**************************************************************************** + * CopyBitmap (X11DRV.@) + */ +BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + X_PHYSBITMAP *phys_src, *phys_dst; + BITMAP bitmap; + + if (!(phys_src = X11DRV_get_phys_bitmap( src ))) return FALSE; + if (!GetObjectW( dst, sizeof(bitmap), &bitmap )) return FALSE; + + TRACE("%p->%p %dx%d %d bpp\n", src, dst, bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); + + if (!(phys_dst = X11DRV_init_phys_bitmap( dst ))) return FALSE; + + phys_dst->depth = phys_src->depth; + phys_dst->trueColor = phys_src->trueColor; + if (phys_dst->trueColor) phys_dst->color_shifts = phys_src->color_shifts; + + wine_tsx11_lock(); + phys_dst->pixmap = XCreatePixmap( gdi_display, root_window, + bitmap.bmWidth, bitmap.bmHeight, phys_dst->depth ); + XCopyArea( gdi_display, phys_src->pixmap, phys_dst->pixmap, + get_bitmap_gc(phys_dst->depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + wine_tsx11_unlock(); + + if (!phys_dst->pixmap) + { + WARN("Can't create Pixmap\n"); + HeapFree( GetProcessHeap(), 0, phys_dst ); + return FALSE; + } + return TRUE; +} + + /*********************************************************************** * DeleteBitmap (X11DRV.@) */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6574270..8d61b5b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,7 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + X11DRV_CopyBitmap, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1d6ce53..4967866 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -181,6 +181,7 @@ extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 30b9553..7ba61a3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1276,6 +1276,14 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID } /**************************************************************************** + * xrenderdrv_CopyBitmap + */ +static BOOL xrenderdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return X11DRV_CopyBitmap( src, dst ); +} + +/**************************************************************************** * xrenderdrv_CreateBitmap */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) @@ -3060,7 +3068,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + xrenderdrv_CopyBitmap, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */

1 0