Alexandre Julliard : winex11: Remove BITBLT_InternalStretchBlt now that it' s identical to X11DRV_StretchBlt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 89c91ac0b184ff6d92a8fd7b68382647d897199f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=89c91ac0b184ff6d92a8fd7b68382647d897199f

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 30 20:56:56 2009 +0200

winex11: Remove BITBLT_InternalStretchBlt now that it's identical to X11DRV_StretchBlt.

---

 dlls/winex11.drv/bitblt.c         |   46 +++---------------------------------
 dlls/winex11.drv/winex11.drv.spec |    2 -
 dlls/winex11.drv/x11drv.h         |    5 ----
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index bfbcaaf..435e2c2 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -1352,15 +1352,11 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc
 
 
 /***********************************************************************
- *           BITBLT_InternalStretchBlt
- *
- * Implementation of PatBlt(), BitBlt() and StretchBlt().
+ *           X11DRV_StretchBlt
  */
-static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
-                                       INT widthDst, INT heightDst,
-                                       X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
-                                       INT widthSrc, INT heightSrc,
-                                       DWORD rop )
+BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst,
+                              X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc,
+                              DWORD rop )
 {
     BOOL usePat, useSrc, useDst, destUsed, fStretch, fNullBrush;
     RECT visRectDst, visRectSrc;
@@ -1662,37 +1658,3 @@ done:
     X11DRV_UnlockDIBSection( physDevDst, TRUE );
     return TRUE;
 }
-
-
-/***********************************************************************
- *           X11DRV_PatBlt
- */
-BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop )
-{
-    return BITBLT_InternalStretchBlt( physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop );
-}
-
-
-/***********************************************************************
- *           X11DRV_BitBlt
- */
-BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
-                    INT width, INT height, X11DRV_PDEVICE *physDevSrc,
-                    INT xSrc, INT ySrc, DWORD rop )
-{
-    return BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, width, height,
-                                      physDevSrc, xSrc, ySrc, width, height, rop );
-}
-
-
-/***********************************************************************
- *           X11DRV_StretchBlt
- */
-BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
-                              INT widthDst, INT heightDst,
-                              X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
-                              INT widthSrc, INT heightSrc, DWORD rop )
-{
-    return BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, widthDst, heightDst,
-                                      physDevSrc, xSrc, ySrc, widthSrc, heightSrc, rop );
-}
diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
index fdd32b3..6fd8831 100644
--- a/dlls/winex11.drv/winex11.drv.spec
+++ b/dlls/winex11.drv/winex11.drv.spec
@@ -2,7 +2,6 @@
 
 @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) X11DRV_AlphaBlend
 @ cdecl Arc(ptr long long long long long long long long) X11DRV_Arc
-@ cdecl BitBlt(ptr long long long long ptr long long long) X11DRV_BitBlt
 @ cdecl ChoosePixelFormat(ptr ptr) X11DRV_ChoosePixelFormat
 @ cdecl Chord(ptr long long long long long long long long) X11DRV_Chord
 @ cdecl CreateBitmap(ptr long ptr) X11DRV_CreateBitmap
@@ -31,7 +30,6 @@
 @ cdecl GetTextMetrics(ptr ptr) X11DRV_GetTextMetrics
 @ cdecl LineTo(ptr long long) X11DRV_LineTo
 @ cdecl PaintRgn(ptr long) X11DRV_PaintRgn
-@ cdecl PatBlt(ptr long long long long long) X11DRV_PatBlt
 @ cdecl Pie(ptr long long long long long long long long) X11DRV_Pie
 @ cdecl PolyPolygon(ptr ptr ptr long) X11DRV_PolyPolygon
 @ cdecl PolyPolyline(ptr ptr ptr long) X11DRV_PolyPolyline
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index e97bbea..8f0764d 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -178,9 +178,6 @@ extern BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT y
                                      INT widthDst, INT heightDst,
                                      X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
                                      INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn );
-extern BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
-                                 INT width, INT height, X11DRV_PDEVICE *physDevSrc,
-                                 INT xSrc, INT ySrc, DWORD rop );
 extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
                                           FONTENUMPROCW dfeproc, LPARAM lp );
 extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count );
@@ -190,8 +187,6 @@ extern BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp );
 extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count,
                                                INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size );
 extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics);
-extern BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top,
-                                 INT width, INT height, DWORD rop );
 extern BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
                                      INT widthDst, INT heightDst,
                                      X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,