April 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add a solid_rects primitive.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: f382478377037eae92c2b8722b8066f5d85d21dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f382478377037eae92c2b8722… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:46:11 2011 +0100 gdi32: Add a solid_rects primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 9ed7661..346b17a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -25,6 +25,7 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) typedef struct primitive_funcs { + void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); } primitive_funcs; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 92559d2..c8d60cb 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -21,6 +21,35 @@ #include "gdi_private.h" #include "dibdrv.h" +static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y) +{ + return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4); +} + +static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) +{ + *ptr = (*ptr & and) ^ xor; +} + +static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +{ + DWORD *ptr, *start; + int x, y, i; + + for(i = 0; i < num; i++, rc++) + { + start = ptr = get_pixel_ptr_32(dib, rc->left, rc->top); + for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 4) + for(x = rc->left, ptr = start; x < rc->right; x++) + do_rop_32(ptr++, and, xor); + } +} + +static void solid_rects_null(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +{ + return; +} + static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) { return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); @@ -58,15 +87,18 @@ static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) const primitive_funcs funcs_8888 = { + solid_rects_32, colorref_to_pixel_888 }; const primitive_funcs funcs_32 = { + solid_rects_32, colorref_to_pixel_masks }; const primitive_funcs funcs_null = { + solid_rects_null, colorref_to_pixel_null };

1 0

Huw Davies : gdi32: Initial SelectPen support.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: ed23e3de5c42f107f2f7a14c0ed7848d21a6f1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed23e3de5c42f107f2f7a14c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:46:33 2011 +0100 gdi32: Initial SelectPen support. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/objects.c | 62 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 ++ 5 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 9753ef4..4b070ac 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ dc.c \ dib.c \ dibdrv/dc.c \ + dibdrv/objects.c \ dibdrv/primitives.c \ driver.c \ enhmetafile.c \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 473bf82..b8b401d 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -207,7 +207,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ NULL, /* pSelectPalette */ - NULL, /* pSelectPen */ + dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 346b17a..766ca6c 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; + static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { return (dibdrv_physdev *)dev; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c new file mode 100644 index 0000000..ce3c1b2 --- /dev/null +++ b/dlls/gdi32/dibdrv/objects.c @@ -0,0 +1,62 @@ +/* + * DIB driver GDI objects. + * + * Copyright 2011 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gdi_private.h" +#include "dibdrv.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dib); + +/*********************************************************************** + * dibdrv_SelectPen + */ +HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + LOGPEN logpen; + + TRACE("(%p, %p)\n", dev, hpen); + + if (!GetObjectW( hpen, sizeof(logpen), &logpen )) + { + /* must be an extended pen */ + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; + logpen.lopnWidth.y = 0; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); + } + + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + + return next->funcs->pSelectPen( next, hpen ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5f27106..6629ee6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -96,6 +96,9 @@ typedef struct dibdrv_physdev { struct gdi_physdev dev; dib_info dib; + + /* pen */ + DWORD pen_color; } dibdrv_physdev; typedef struct tagDC_FUNCS

1 0

Huw Davies : gdi32: Add the ability to track whether we should defer to the graphics driver.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 842d49939d6d76010c5ced4e9eb371e0bb986b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842d49939d6d76010c5ced4e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:47:18 2011 +0100 gdi32: Add the ability to track whether we should defer to the graphics driver. --- dlls/gdi32/dibdrv/dc.c | 17 ++++++++++------- dlls/gdi32/dibdrv/objects.c | 13 +++++++++++++ dlls/gdi32/gdi_private.h | 5 +++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b8b401d..d24ef37 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -90,12 +90,12 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit switch(dib->bit_count) { case 32: - init_bit_fields(dib, bit_fields); - if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) - dib->funcs = &funcs_8888; - else - dib->funcs = &funcs_32; - break; + init_bit_fields(dib, bit_fields); + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + dib->funcs = &funcs_8888; + else + dib->funcs = &funcs_32; + break; default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); @@ -118,7 +118,10 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); - init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits); + pdev->defer = 0; + + if(!init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) + pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce3c1b2..c9862dc 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -58,5 +58,18 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + pdev->defer |= DEFER_PEN; + + switch(logpen.lopnStyle & PS_STYLE_MASK) + { + case PS_SOLID: + if(logpen.lopnStyle & PS_GEOMETRIC) break; + if(logpen.lopnWidth.x > 1) break; + pdev->defer &= ~DEFER_PEN; + break; + default: + break; + } + return next->funcs->pSelectPen( next, hpen ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6629ee6..79fdb26 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -97,10 +97,15 @@ typedef struct dibdrv_physdev struct gdi_physdev dev; dib_info dib; + DWORD defer; + /* pen */ DWORD pen_color; } dibdrv_physdev; +#define DEFER_FORMAT 1 +#define DEFER_PEN 2 + typedef struct tagDC_FUNCS { INT (CDECL *pAbortDoc)(PHYSDEV);

1 0

Huw Davies : gdi32: Add support for DC pens.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 15ef394159790eadbc7ba7ba178b6f5d28006c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ef394159790eadbc7ba7ba1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:47:59 2011 +0100 gdi32: Add support for DC pens. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d24ef37..806f089 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -216,7 +216,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ NULL, /* pSetDCBrushColor */ - NULL, /* pSetDCPenColor */ + dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 766ca6c..d33bf88 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,6 +19,7 @@ */ extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c9862dc..02df7cf 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -56,6 +56,9 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) HeapFree( GetProcessHeap(), 0, elp ); } + if (hpen == GetStockObject( DC_PEN )) + logpen.lopnColor = GetDCPenColor( dev->hdc ); + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); pdev->defer |= DEFER_PEN; @@ -73,3 +76,17 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) return next->funcs->pSelectPen( next, hpen ); } + +/*********************************************************************** + * dibdrv_SetDCPenColor + */ +COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCPenColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + + return next->funcs->pSetDCPenColor( next, color ); +}

1 0

Huw Davies : gdi32: Calculate AND and XOR masks corresponding to the current pen colour and rop2 .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: d5d46030624abde05cdde89b0616143dff90278b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d46030624abde05cdde89b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:48:39 2011 +0100 gdi32: Calculate AND and XOR masks corresponding to the current pen colour and rop2. --- dlls/gdi32/dibdrv/dc.c | 15 +++++++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/objects.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 806f089..1a16260 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -128,6 +128,19 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) return next->funcs->pSelectBitmap( next, bitmap ); } +/*********************************************************************** + * dibdrv_SetROP2 + */ +static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetROP2 ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + calc_and_xor_masks(rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + + return next->funcs->pSetROP2( next, rop ); +} + const DC_FUNCTIONS dib_driver = { NULL, /* pAbortDoc */ @@ -228,7 +241,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetPixel */ NULL, /* pSetPixelFormat */ NULL, /* pSetPolyFillMode */ - NULL, /* pSetROP2 */ + dibdrv_SetROP2, /* pSetROP2 */ NULL, /* pSetRelAbs */ NULL, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index d33bf88..2620e38 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -35,3 +35,5 @@ typedef struct primitive_funcs extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; + +extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 02df7cf..88c9581 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -25,6 +25,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +/* + * + * Decompose the 16 ROP2s into an expression of the form + * + * D = (D & A) ^ X + * + * Where A and X depend only on P (and so can be precomputed). + * + * A X + * + * R2_BLACK 0 0 0 + * R2_NOTMERGEPEN ~(D | P) ~P ~P + * R2_MASKNOTPEN ~P & D ~P 0 + * R2_NOTCOPYPEN ~P 0 ~P + * R2_MASKPENNOT P & ~D P P + * R2_NOT ~D 1 1 + * R2_XORPEN P ^ D 1 P + * R2_NOTMASKPEN ~(P & D) P 1 + * R2_MASKPEN P & D P 0 + * R2_NOTXORPEN ~(P ^ D) 1 ~P + * R2_NOP D 1 0 + * R2_MERGENOTPEN ~P | D P ~P + * R2_COPYPEN P 0 P + * R2_MERGEPENNOT P | ~D ~P 1 + * R2_MERGEPEN P | D ~P P + * R2_WHITE 1 0 1 + * + */ + +/* A = (P & A1) | (~P & A2) */ +#define ZERO {0, 0} +#define ONE {0xffffffff, 0xffffffff} +#define P {0xffffffff, 0} +#define NOT_P {0, 0xffffffff} + +static const DWORD rop2_and_array[16][2] = +{ + ZERO, NOT_P, NOT_P, ZERO, + P, ONE, ONE, P, + P, ONE, ONE, P, + ZERO, NOT_P, NOT_P, ZERO +}; + +/* X = (P & X1) | (~P & X2) */ +static const DWORD rop2_xor_array[16][2] = +{ + ZERO, NOT_P, ZERO, NOT_P, + P, ONE, P, ONE, + ZERO, NOT_P, ZERO, NOT_P, + P, ONE, P, ONE +}; + +#undef NOT_P +#undef P +#undef ONE +#undef ZERO + +void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) +{ + /* NB The ROP2 codes start at one and the arrays are zero-based */ + *and = (color & rop2_and_array[rop-1][0]) | ((~color) & rop2_and_array[rop-1][1]); + *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -60,6 +124,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); pdev->defer |= DEFER_PEN; @@ -86,7 +151,10 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + { pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + } return next->funcs->pSetDCPenColor( next, color ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79fdb26..9a81afd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -100,7 +100,7 @@ typedef struct dibdrv_physdev DWORD defer; /* pen */ - DWORD pen_color; + DWORD pen_color, pen_and, pen_xor; } dibdrv_physdev; #define DEFER_FORMAT 1

1 0

Huw Davies : gdi32: Draw single pixel wide, horizontal or vertical lines with the dib driver.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 1e27c9512527e5382599a7ecc91ca607b9ccaaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e27c9512527e5382599a7ecc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:49:33 2011 +0100 gdi32: Draw single pixel wide, horizontal or vertical lines with the dib driver. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/clipping.c | 13 ----------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 6 +++++ dlls/gdi32/dibdrv/graphics.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/objects.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 9 +++++++ 7 files changed, 113 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 4b070ac..6a04742 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ dc.c \ dib.c \ dibdrv/dc.c \ + dibdrv/graphics.c \ dibdrv/objects.c \ dibdrv/primitives.c \ driver.c \ diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 9d529ac..86b19f1 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -30,19 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); /*********************************************************************** - * get_clip_region - * - * Return the total clip region (if any). - */ -static inline HRGN get_clip_region( DC * dc ) -{ - if (dc->hMetaClipRgn) return dc->hMetaClipRgn; - if (dc->hMetaRgn) return dc->hMetaRgn; - return dc->hClipRgn; -} - - -/*********************************************************************** * get_clip_rect * * Compute a clip rectangle from its logical coordinates. diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1a16260..78248dd 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -192,7 +192,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - NULL, /* pLineTo */ + dibdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2620e38..b7408ac 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; @@ -26,6 +27,11 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } +static inline DC *get_dibdrv_dc( PHYSDEV dev ) +{ + return CONTAINING_RECORD( dev, DC, dibdrv ); +} + typedef struct primitive_funcs { void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c new file mode 100644 index 0000000..1e0de2f --- /dev/null +++ b/dlls/gdi32/dibdrv/graphics.c @@ -0,0 +1,47 @@ +/* + * DIB driver graphics operations. + * + * Copyright 2011 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gdi_private.h" +#include "dibdrv.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dib); + +/*********************************************************************** + * dibdrv_LineTo + */ +BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + POINT pts[2]; + + GetCurrentPositionEx(dev->hdc, pts); + pts[1].x = x; + pts[1].y = y; + + LPtoDP(dev->hdc, pts, 2); + + if(pdev->defer || !pdev->pen_line(pdev, pts, pts + 1)) + return next->funcs->pLineTo( next, x, y ); + + return TRUE; +} diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 88c9581..a26785a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -89,6 +89,54 @@ void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); } +static inline void order_end_points(int *s, int *e) +{ + if(*s > *e) + { + int tmp; + tmp = *s + 1; + *s = *e + 1; + *e = tmp; + } +} + +static inline BOOL pt_in_rect( const RECT *rect, POINT pt ) +{ + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + +static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +{ + RECT rc; + DC *dc = get_dibdrv_dc( &pdev->dev ); + + if(get_clip_region(dc) || !pt_in_rect(&dc->vis_rect, *start) || !pt_in_rect(&dc->vis_rect, *end)) + return FALSE; + + rc.left = start->x; + rc.top = start->y; + rc.right = end->x; + rc.bottom = end->y; + + if(rc.top == rc.bottom) + { + order_end_points(&rc.left, &rc.right); + rc.bottom++; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); + return TRUE; + } + else if(rc.left == rc.right) + { + order_end_points(&rc.top, &rc.bottom); + rc.right++; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); + return TRUE; + } + + return FALSE; +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -133,6 +181,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; + pdev->pen_line = solid_pen_line; pdev->defer &= ~DEFER_PEN; break; default: diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9a81afd..fc86b32 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -101,6 +101,7 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; + BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); } dibdrv_physdev; #define DEFER_FORMAT 1 @@ -399,6 +400,14 @@ extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; /* clipping.c */ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; +/* Return the total clip region (if any) */ +static inline HRGN get_clip_region( DC * dc ) +{ + if (dc->hMetaClipRgn) return dc->hMetaClipRgn; + if (dc->hMetaRgn) return dc->hMetaRgn; + return dc->hClipRgn; +} + /* dc.c */ extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;

1 0

Huw Davies : gdi32/tests: Add horizontal and vertical solid line tests.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: b4ae69749609280972e71bb1fbfd9c99e1839ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ae69749609280972e71bb1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:50:01 2011 +0100 gdi32/tests: Add horizontal and vertical solid line tests. --- dlls/gdi32/tests/dib.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 7dd1ba3..d882da4 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -34,6 +34,7 @@ static HCRYPTPROV crypt_prov; static const char *sha1_graphics_a8r8g8b8[] = { "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", + "2426172d9e8fec27d9228088f382ef3c93717da9", NULL }; @@ -105,9 +106,32 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); + HPEN solid_pen, orig_pen; + INT i; memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); + + solid_pen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0xff)); + orig_pen = SelectObject(hdc, solid_pen); + + /* horizontal and vertical lines */ + for(i = 1; i <= 16; i++) + { + SetROP2(hdc, i); + MoveToEx(hdc, 10, i * 3, NULL); + LineTo(hdc, 100, i * 3); /* l -> r */ + MoveToEx(hdc, 100, 50 + i * 3, NULL); + LineTo(hdc, 10, 50 + i * 3); /* r -> l */ + MoveToEx(hdc, 120 + i * 3, 10, NULL); + LineTo(hdc, 120 + i * 3, 100); /* t -> b */ + MoveToEx(hdc, 170 + i * 3, 100, NULL); + LineTo(hdc, 170 + i * 3, 10); /* b -> t */ + } + compare_hash(bmi, bits, sha1, "h and v solid lines"); + + SelectObject(hdc, orig_pen); + DeleteObject(solid_pen); } static void test_simple_graphics(void)

1 0

Henri Verbeet : wined3d: Don' t unregister windows with the wrong window proc on unload either.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 9d405473d091ee7e8f9319cbaf4d35146c982ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d405473d091ee7e8f9319cba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:51 2011 +0200 wined3d: Don't unregister windows with the wrong window proc on unload either. This is the same issue as 7a354177b38c9451c938389576890a14d5c543fa, just on wined3d unload this time. --- dlls/wined3d/wined3d_main.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 532314c..63cc677 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -355,8 +355,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) for (i = 0; i < wndproc_table.count; ++i) { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - SetWindowLongPtrW(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + /* Trying to unregister these would be futile. These entries can only + * exist if either we skipped them in wined3d_unregister_window() due + * to the application replacing the wndproc after the entry was + * registered, or if the application still has an active wined3d + * device. In the latter case the application has bigger problems than + * these entries. */ + WARN("Leftover wndproc table entry %p.\n", &wndproc_table.entries[i]); } HeapFree(GetProcessHeap(), 0, wndproc_table.entries);

1 0

Henri Verbeet : wined3d: Rename "NumberOfPalettes" to "palette_count".
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 55555319505cddafa5a016e323c09b46444062b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55555319505cddafa5a016e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:52 2011 +0200 wined3d: Rename "NumberOfPalettes" to "palette_count". --- dlls/wined3d/device.c | 41 +++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e91a078..3569f94 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1910,7 +1910,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->render_targets) * gl_info->limits.buffers); - This->NumberOfPalettes = 1; + This->palette_count = 1; This->palettes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PALETTEENTRY*)); if (!This->palettes || !This->render_targets) { @@ -2059,8 +2059,9 @@ err_out: HeapFree(GetProcessHeap(), 0, This->palettes[0]); HeapFree(GetProcessHeap(), 0, This->palettes); } - This->NumberOfPalettes = 0; - if(swapchain) { + This->palette_count = 0; + if (swapchain) + { IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); } if (This->stateBlock) @@ -2271,10 +2272,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->swapchains = NULL; This->NumberOfSwapChains = 0; - for (i = 0; i < This->NumberOfPalettes; i++) HeapFree(GetProcessHeap(), 0, This->palettes[i]); + for (i = 0; i < This->palette_count; ++i) + HeapFree(GetProcessHeap(), 0, This->palettes[i]); HeapFree(GetProcessHeap(), 0, This->palettes); This->palettes = NULL; - This->NumberOfPalettes = 0; + This->palette_count = 0; HeapFree(GetProcessHeap(), 0, This->render_targets); This->render_targets = NULL; @@ -5319,7 +5321,9 @@ static void dirtify_p8_texture_samplers(IWineD3DDeviceImpl *device) } } -static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *iface, + UINT PaletteNumber, const PALETTEENTRY *pEntries) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; UINT NewSize; @@ -5332,8 +5336,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return WINED3DERR_INVALIDCALL; } - if (PaletteNumber >= This->NumberOfPalettes) { - NewSize = This->NumberOfPalettes; + if (PaletteNumber >= This->palette_count) + { + NewSize = This->palette_count; do { NewSize *= 2; } while(PaletteNumber >= NewSize); @@ -5343,7 +5348,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return E_OUTOFMEMORY; } This->palettes = palettes; - This->NumberOfPalettes = NewSize; + This->palette_count = NewSize; } if (!This->palettes[PaletteNumber]) { @@ -5365,14 +5370,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *iface, + UINT PaletteNumber, PALETTEENTRY *pEntries) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { + + if (PaletteNumber >= This->palette_count || !This->palettes[PaletteNumber]) + { /* What happens in such situation isn't documented; Native seems to silently abort on such conditions. Return Invalid Call. */ - ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + ERR("(%p) : (%u) Nonexistent palette. Palette count %u.\n", This, PaletteNumber, This->palette_count); return WINED3DERR_INVALIDCALL; } for (j = 0; j < 256; ++j) { @@ -5385,13 +5394,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); /* Native appears to silently abort on attempt to make an uninitialized palette current and render. (tested with reference rasterizer). Return Invalid Call. */ - if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { - ERR("(%p) : (%u) Nonexistent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); + if (PaletteNumber >= This->palette_count || !This->palettes[PaletteNumber]) + { + ERR("(%p) : (%u) Nonexistent palette. Palette count %u.\n", This, PaletteNumber, This->palette_count); return WINED3DERR_INVALIDCALL; } /*TODO: stateblocks */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 992ede4..1a9e4ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1721,9 +1721,9 @@ struct IWineD3DDeviceImpl IWineD3DSurfaceImpl *depth_stencil; /* palettes texture management */ - UINT NumberOfPalettes; - PALETTEENTRY **palettes; - UINT currentPalette; + PALETTEENTRY **palettes; + UINT palette_count; + UINT currentPalette; /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture;

1 0

Henri Verbeet : wined3d: Rename "NumberOfSwapChains" to "swapchain_count".
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: fb4c7e9f9b8caaec1770687c68fbac58393df302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4c7e9f9b8caaec1770687c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:53 2011 +0200 wined3d: Rename "NumberOfSwapChains" to "swapchain_count". --- dlls/wined3d/device.c | 38 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3569f94..44b81c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1308,19 +1308,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, return WINED3D_OK; } -/** NOTE: These are ahead of the other getters and setters to save using a forward declaration **/ -static UINT WINAPI IWineD3DDeviceImpl_GetNumberOfSwapChains(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p)\n", This); +static UINT WINAPI IWineD3DDeviceImpl_GetNumberOfSwapChains(IWineD3DDevice *iface) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - return This->NumberOfSwapChains; + TRACE("iface %p.\n", iface); + + return device->swapchain_count; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, UINT iSwapChain, IWineD3DSwapChain **pSwapChain) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, + UINT iSwapChain, IWineD3DSwapChain **pSwapChain) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : swapchain %d\n", This, iSwapChain); - if (iSwapChain < This->NumberOfSwapChains) + if (iSwapChain < This->swapchain_count) { *pSwapChain = (IWineD3DSwapChain *)This->swapchains[iSwapChain]; IWineD3DSwapChain_AddRef(*pSwapChain); @@ -1955,8 +1958,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, goto err_out; } - This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + This->swapchain_count = 1; + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->swapchain_count * sizeof(*This->swapchains)); if (!This->swapchains) { ERR("Out of memory!\n"); @@ -2054,8 +2057,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, err_out: HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->swapchains); - This->NumberOfSwapChains = 0; - if(This->palettes) { + This->swapchain_count = 0; + if (This->palettes) + { HeapFree(GetProcessHeap(), 0, This->palettes[0]); HeapFree(GetProcessHeap(), 0, This->palettes); } @@ -2098,8 +2102,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_InitGDI(IWineD3DDevice *iface, goto err_out; } - This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + This->swapchain_count = 1; + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->swapchain_count * sizeof(*This->swapchains)); if (!This->swapchains) { ERR("Out of memory!\n"); @@ -2259,7 +2263,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, context_release(context); - for (i = 0; i < This->NumberOfSwapChains; ++i) + for (i = 0; i < This->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i); if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) @@ -2270,7 +2274,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, HeapFree(GetProcessHeap(), 0, This->swapchains); This->swapchains = NULL; - This->NumberOfSwapChains = 0; + This->swapchain_count = 0; for (i = 0; i < This->palette_count; ++i) HeapFree(GetProcessHeap(), 0, This->palettes[i]); @@ -2290,7 +2294,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UninitGDI(IWineD3DDevice *iface, D3DCB_ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; unsigned int i; - for (i = 0; i < This->NumberOfSwapChains; ++i) + for (i = 0; i < This->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i); if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) @@ -2301,7 +2305,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UninitGDI(IWineD3DDevice *iface, D3DCB_ HeapFree(GetProcessHeap(), 0, This->swapchains); This->swapchains = NULL; - This->NumberOfSwapChains = 0; + This->swapchain_count = 0; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a9e4ae..47d8631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1708,7 +1708,7 @@ struct IWineD3DDeviceImpl HWND focus_window; IWineD3DSwapChainImpl **swapchains; - UINT NumberOfSwapChains; + UINT swapchain_count; struct list resources; /* a linked list to track resources created by the device */ struct list shaders; /* a linked list to track shaders (pixel and vertex) */

1 0