November 2011 - Wine-commits

Francois Gouget : dmloader: Remove an unused critical section.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 2b54a7ee723906a9f98b4fe4d290947219ecd05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b54a7ee723906a9f98b4fe4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 12:32:50 2011 +0100 dmloader: Remove an unused critical section. --- dlls/dmloader/dmloader_private.h | 2 -- dlls/dmloader/loader.c | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index a6de708..47a794c 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -99,8 +99,6 @@ struct IDirectMusicLoaderImpl { struct list *pObjects; /* settings for certain object classes */ struct list *pClassSettings; - /* critical section */ - CRITICAL_SECTION CritSect; }; /* contained object entry */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index e83444d..868f4e0 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -100,9 +100,6 @@ static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTM /* firstly, release the cache */ IDirectMusicLoader8_ClearCache (iface, &GUID_DirectMusicAllTypes); /* FIXME: release all allocated entries */ - /* destroy critical section */ - /*This->CritSect.DebugInfo->Spare[0] = 0; - DeleteCriticalSection (&This->CritSect); */ HeapFree (GetProcessHeap(), 0, This); unlock_module(); } @@ -864,10 +861,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob } obj->LoaderVtbl = &DirectMusicLoader_Loader_Vtbl; obj->dwRef = 0; /* will be inited with QueryInterface */ - /* init critical section */ /* init cache/alias list */ - /*InitializeCriticalSection (&obj->CritSect); - obj->CritSect.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicLoaderImpl.CritSect"); */ obj->pObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); list_init (obj->pObjects); /* init settings */

1 0

Francois Gouget : msvcp90: Remove an unneeded cast.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 9ceac318e0adb3d5fc0f5bf9622d293e80e442f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceac318e0adb3d5fc0f5bf96… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 12:33:11 2011 +0100 msvcp90: Remove an unneeded cast. --- dlls/msvcp90/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index bb3b52b..122c7fa 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -100,7 +100,7 @@ void __cdecl _Lockit_init(int locktype) { /* ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z */ void __cdecl _Lockit_free(int locktype) { - lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)0; + lockit_cs[locktype].DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lockit_cs[locktype]); }

1 0

Marcus Meissner : urlmon: Fixed an array overread (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 6a629710ce02012defed1cfa30f8c3c91298ab99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a629710ce02012defed1cfa3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 14 12:31:11 2011 +0100 urlmon: Fixed an array overread (Coverity). --- dlls/urlmon/tests/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2f33f02..2509d84 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -423,8 +423,8 @@ static void test_SecurityManager(void) ok(size == sizeof(secid10) || size == sizeof(secid10_2), /* win2k3 */ "size=%d\n", size); - ok(!memcmp(buf, secid10, size) || - !memcmp(buf, secid10_2, size), /* win2k3 */ + ok(!memcmp(buf, secid10, sizeof(secid10)) || + !memcmp(buf, secid10_2, sizeof(secid10_2)), /* win2k3 */ "wrong secid\n"); zone = 100;

1 0

Huw Davies : gdi32: Keep track of the text pixel color.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 15fabcdefe1de1aa62945a5625070cdb424bc7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fabcdefe1de1aa62945a562… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:02 2011 +0000 gdi32: Keep track of the text pixel color. --- dlls/gdi32/dibdrv/dc.c | 16 +++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 3 +++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a91de78..274d586 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -319,6 +319,7 @@ static void update_fg_colors( dibdrv_physdev *pdev ) { pdev->pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); + pdev->text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); } static void update_masks( dibdrv_physdev *pdev, INT rop ) @@ -518,6 +519,19 @@ static INT dibdrv_SetROP2( PHYSDEV dev, INT rop ) return next->funcs->pSetROP2( next, rop ); } +/*********************************************************************** + * dibdrv_SetTextColor + */ +static COLORREF dibdrv_SetTextColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetTextColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + pdev->text_color = get_pixel_color( pdev, color, TRUE ); + + return next->funcs->pSetTextColor( next, color ); +} + const struct gdi_dc_funcs dib_driver = { NULL, /* pAbortDoc */ @@ -638,7 +652,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ NULL, /* pSetTextCharacterExtra */ - NULL, /* pSetTextColor */ + dibdrv_SetTextColor, /* pSetTextColor */ NULL, /* pSetTextJustification */ NULL, /* pSetViewportExt */ NULL, /* pSetViewportOrg */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6ef0d94..93753aa 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -97,6 +97,9 @@ typedef struct dibdrv_physdev /* background */ DWORD bkgnd_color, bkgnd_and, bkgnd_xor; + + /* text */ + DWORD text_color; } dibdrv_physdev; #define DEFER_FORMAT 1

1 0

Huw Davies : gdi32: Expose a solid_rects function.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 5990091bbfd2061e47648c0a22f3731829f46b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5990091bbfd2061e47648c0a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:03 2011 +0000 gdi32: Expose a solid_rects function. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 57 +++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 93753aa..bb52156 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -211,6 +211,7 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; +extern void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *color, HRGN region ) DECLSPEC_HIDDEN; extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ddd3563..3de6cb9 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1094,52 +1094,45 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCPenColor( next, color ); } -/********************************************************************** - * solid_brush - * - * Fill a number of rectangles with the solid brush - * FIXME: Should we insist l < r && t < b? Currently we assume this. - */ -static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) +void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *color, HRGN region ) { int i, j; - const WINEREGION *clip = get_wine_region( region ); + const WINEREGION *clip; - if (!clip) + if (!region) { - dib->funcs->solid_rects( dib, num, rects, pdev->brush_and, pdev->brush_xor ); - return TRUE; + dib->funcs->solid_rects( dib, num, rects, color->and, color->xor ); + return; } + clip = get_wine_region( region ); + for(i = 0; i < num; i++) { for(j = 0; j < clip->numRects; j++) { - RECT rect = rects[i]; + RECT clipped_rect; - /* Optimize unclipped case */ - if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && - clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) - { - dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); - break; - } - - if(clip->rects[j].top >= rect.bottom) break; - if(clip->rects[j].bottom <= rect.top) continue; - - if(clip->rects[j].right > rect.left && clip->rects[j].left < rect.right) - { - rect.left = max(rect.left, clip->rects[j].left); - rect.top = max(rect.top, clip->rects[j].top); - rect.right = min(rect.right, clip->rects[j].right); - rect.bottom = min(rect.bottom, clip->rects[j].bottom); - - dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); - } + if (intersect_rect( &clipped_rect, rects + i, clip->rects + j )) + dib->funcs->solid_rects( dib, 1, &clipped_rect, color->and, color->xor ); } } release_wine_region( region ); +} + +/********************************************************************** + * solid_brush + * + * Fill a number of rectangles with the solid brush + */ +static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) +{ + rop_mask brush_color; + + brush_color.and = pdev->brush_and; + brush_color.xor = pdev->brush_xor; + + solid_rects( dib, num, rects, &brush_color, region ); return TRUE; }

1 0

Huw Davies : gdi32: Move the ETO_OPAQUE rectangle drawing to the dib driver .
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: f284f5970a2a0c48830db72f643bc6393dff75cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f284f5970a2a0c48830db72f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:04 2011 +0000 gdi32: Move the ETO_OPAQUE rectangle drawing to the dib driver. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 ++ dlls/gdi32/dibdrv/graphics.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 274d586..3ccdd04 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -566,7 +566,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ - NULL, /* pExtTextOut */ + dibdrv_ExtTextOut, /* pExtTextOut */ NULL, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index bb52156..2e7ac01 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -110,6 +110,8 @@ extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD dibdrv_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 dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 65f5b9a..82aaafa 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -56,6 +56,47 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, return rect; } +/********************************************************************** + * get_text_bkgnd_masks + * + * See the comment above get_pen_bkgnd_masks + */ +static inline void get_text_bkgnd_masks( const dibdrv_physdev *pdev, rop_mask *mask ) +{ + mask->and = 0; + + if (pdev->dib.bit_count != 1) + mask->xor = pdev->bkgnd_color; + else + { + mask->xor = ~pdev->text_color; + if (GetTextColor( pdev->dev.hdc ) == GetBkColor( pdev->dev.hdc )) + mask->xor = pdev->text_color; + } +} + +/*********************************************************************** + * dibdrv_ExtTextOut + */ +BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtTextOut ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (flags & ETO_OPAQUE) + { + rop_mask bkgnd_color; + get_text_bkgnd_masks( pdev, &bkgnd_color ); + solid_rects( &pdev->dib, 1, rect, &bkgnd_color, pdev->clip ); + } + + if (count == 0) return TRUE; + + flags &= ~ETO_OPAQUE; + return next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx ); +} + /*********************************************************************** * dibdrv_GetPixel */

1 0

Huw Davies : gdi32: Calculate the min/ max color component intensities for 17 glyph levels.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 18520f2e6389643cb01d37c1330de78389d9e2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18520f2e6389643cb01d37c13… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:05 2011 +0000 gdi32: Calculate the min/max color component intensities for 17 glyph levels. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 9 ++++++++ dlls/gdi32/dibdrv/graphics.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3ccdd04..0a75bd2 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -528,6 +528,7 @@ static COLORREF dibdrv_SetTextColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); pdev->text_color = get_pixel_color( pdev, color, TRUE ); + update_aa_ranges( pdev ); return next->funcs->pSetTextColor( next, color ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2e7ac01..46ce004 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -67,6 +67,13 @@ typedef struct void *xor; } rop_mask_bits; +struct intensity_range +{ + BYTE r_min, r_max; + BYTE g_min, g_max; + BYTE b_min, b_max; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -100,6 +107,7 @@ typedef struct dibdrv_physdev /* text */ DWORD text_color; + struct intensity_range glyph_intensities[17]; } dibdrv_physdev; #define DEFER_FORMAT 1 @@ -218,6 +226,7 @@ extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; +extern void update_aa_ranges( dibdrv_physdev *pdev ) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 82aaafa..343dd0d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -56,6 +56,53 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, return rect; } +/* Intensities of the 17 glyph levels when drawn with text component of 0xff on a + black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ +static const BYTE ramp[17] = +{ + 0, 0x4d, 0x68, 0x7c, + 0x8c, 0x9a, 0xa7, 0xb2, + 0xbd, 0xc7, 0xd0, 0xd9, + 0xe1, 0xe9, 0xf0, 0xf8, + 0xff +}; + +/* For a give text-color component and a glyph level, calculate the + range of dst intensities, the min/max corresponding to 0/0xff bkgnd + components respectively. + + The minimum is a linear interpolation between 0 and the value in + the ramp table. + + The maximum is a linear interpolation between the value from the + ramp table read in reverse and 0xff. + + To find the resulting pixel intensity, we note that if the text and + bkgnd intensities are the same then the result must be that + intensity. Otherwise we linearly interpolate between either the + min or the max value and this intermediate value depending on which + side of the inequality we lie. +*/ + +static inline void get_range( BYTE aa, DWORD text_comp, BYTE *min_comp, BYTE *max_comp ) +{ + *min_comp = (ramp[aa] * text_comp) / 0xff; + *max_comp = ramp[16 - aa] + ((0xff - ramp[16 - aa]) * text_comp) / 0xff; +} + +void update_aa_ranges( dibdrv_physdev *pdev ) +{ + int i; + COLORREF text = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pdev->text_color ); + + for (i = 0; i < 17; i++) + { + get_range( i, GetRValue(text), &pdev->glyph_intensities[i].r_min, &pdev->glyph_intensities[i].r_max ); + get_range( i, GetGValue(text), &pdev->glyph_intensities[i].g_min, &pdev->glyph_intensities[i].g_max ); + get_range( i, GetBValue(text), &pdev->glyph_intensities[i].b_min, &pdev->glyph_intensities[i].b_max ); + } +} + /********************************************************************** * get_text_bkgnd_masks *

1 0

Huw Davies : gdi32: Add draw_glyph primitives.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 5c6f630b989658e7183ec07d15aa30b7f3a07edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6f630b989658e7183ec07d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:06 2011 +0000 gdi32: Add draw_glyph primitives. --- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/primitives.c | 246 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c6f630b989658e7183ec…

1 0

Huw Davies : gdi32: Add support for drawing text in the dib driver.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: e9612c1af06d09dbf03745535288575e05cacb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9612c1af06d09dbf03745535… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:07 2011 +0000 gdi32: Add support for drawing text in the dib driver. --- dlls/gdi32/dibdrv/graphics.c | 170 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 343dd0d..be78e1a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -122,14 +122,141 @@ static inline void get_text_bkgnd_masks( const dibdrv_physdev *pdev, rop_mask *m } } +static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, + const struct gdi_image_bits *image ) +{ + const WINEREGION *clip = get_wine_region( pdev->clip ); + int i; + RECT rect, clipped_rect; + POINT src_origin; + static dib_info glyph_dib; + + glyph_dib.bit_count = 8; + glyph_dib.width = metrics->gmBlackBoxX; + glyph_dib.height = metrics->gmBlackBoxY; + glyph_dib.stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); + glyph_dib.bits = *image; + + rect.left = origin->x + metrics->gmptGlyphOrigin.x; + rect.top = origin->y - metrics->gmptGlyphOrigin.y; + rect.right = rect.left + metrics->gmBlackBoxX; + rect.bottom = rect.top + metrics->gmBlackBoxY; + + for (i = 0; i < clip->numRects; i++) + { + if (intersect_rect( &clipped_rect, &rect, clip->rects + i )) + { + src_origin.x = clipped_rect.left - rect.left; + src_origin.y = clipped_rect.top - rect.top; + + pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, &glyph_dib, &src_origin, + pdev->text_color, pdev->glyph_intensities ); + } + } + + release_wine_region( pdev->clip ); +} + +static inline UINT get_aa_flags( dibdrv_physdev *pdev ) +{ + LOGFONTW lf; + + if (pdev->dib.bit_count <= 8) return GGO_BITMAP; + + GetObjectW( GetCurrentObject( pdev->dev.hdc, OBJ_FONT ), sizeof(lf), &lf ); + if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; + + /* FIXME, check gasp and user prefs */ + return GGO_GRAY4_BITMAP; +} + +static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; +static const int padding[4] = {0, 3, 2, 1}; + +/*********************************************************************** + * get_glyph_bitmap + * + * Retrieve a 17-level bitmap for the appropiate glyph. + * + * For non-antialiased bitmaps convert them to the 17-level format + * using only values 0 or 16. + */ +static DWORD get_glyph_bitmap( dibdrv_physdev *pdev, UINT index, GLYPHMETRICS *metrics, + struct gdi_image_bits *image ) +{ + UINT aa_flags = get_aa_flags( pdev ), ggo_flags = aa_flags | GGO_GLYPH_INDEX; + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + UINT indices[3] = {0, 0, 0x20}; + int i, x, y; + DWORD ret, size; + BYTE *buf, *dst, *src; + int pad, stride; + + image->ptr = NULL; + image->is_copy = FALSE; + image->free = free_heap_bits; + image->param = NULL; + + indices[0] = index; + + for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i]) + { + ret = GetGlyphOutlineW( pdev->dev.hdc, index, ggo_flags, metrics, 0, NULL, &identity ); + if (ret != GDI_ERROR) break; + } + + if (ret == GDI_ERROR) return ERROR_NOT_FOUND; + if (!ret) return ERROR_SUCCESS; /* empty glyph */ + + /* We'll convert non-antialiased 1-bpp bitmaps to 8-bpp, so these sizes relate to 8-bpp */ + pad = padding[ metrics->gmBlackBoxX % 4 ]; + stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); + size = metrics->gmBlackBoxY * stride; + + buf = HeapAlloc( GetProcessHeap(), 0, size ); + if (!buf) return ERROR_OUTOFMEMORY; + + ret = GetGlyphOutlineW( pdev->dev.hdc, index, ggo_flags, metrics, size, buf, &identity ); + if (ret == GDI_ERROR) + { + HeapFree( GetProcessHeap(), 0, buf ); + return ERROR_NOT_FOUND; + } + + if (aa_flags == GGO_BITMAP) + { + for (y = metrics->gmBlackBoxY - 1; y >= 0; y--) + { + src = buf + y * get_dib_stride( metrics->gmBlackBoxX, 1 ); + dst = buf + y * stride; + + if (pad) memset( dst + metrics->gmBlackBoxX, 0, pad ); + + for (x = metrics->gmBlackBoxX - 1; x >= 0; x--) + dst[x] = (src[x / 8] & masks[x % 8]) ? 0x10 : 0; + } + } + else if (pad) + { + for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += stride) + memset( dst + metrics->gmBlackBoxX, 0, pad ); + } + + image->ptr = buf; + return ERROR_SUCCESS; +} + /*********************************************************************** * dibdrv_ExtTextOut */ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtTextOut ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + UINT i; + POINT origin; + DWORD err; + HRGN saved_clip = NULL; if (flags & ETO_OPAQUE) { @@ -140,8 +267,45 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (count == 0) return TRUE; - flags &= ~ETO_OPAQUE; - return next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx ); + if (flags & ETO_CLIPPED) + { + HRGN clip = CreateRectRgnIndirect( rect ); + saved_clip = add_extra_clipping_region( pdev, clip ); + DeleteObject( clip ); + } + + origin.x = x; + origin.y = y; + for (i = 0; i < count; i++) + { + GLYPHMETRICS metrics; + struct gdi_image_bits image; + + err = get_glyph_bitmap( pdev, (UINT)str[i], &metrics, &image ); + if (err) continue; + + if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image ); + if (image.free) image.free( &image ); + + if (dx) + { + if (flags & ETO_PDY) + { + origin.x += dx[ i * 2 ]; + origin.y += dx[ i * 2 + 1]; + } + else + origin.x += dx[ i ]; + } + else + { + origin.x += metrics.gmCellIncX; + origin.y += metrics.gmCellIncY; + } + } + + restore_clipping_region( pdev, saved_clip ); + return TRUE; } /***********************************************************************

1 0

Henri Verbeet : ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a2963b662c52d909f085888d31bf4b07cdb01620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2963b662c52d909f085888d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:24 2011 +0100 ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking. --- dlls/ddraw/clipper.c | 30 ++-- dlls/ddraw/ddraw.c | 219 +++++++++++++------------ dlls/ddraw/ddraw_private.h | 3 - dlls/ddraw/device.c | 386 ++++++++++++++++++++++++-------------------- dlls/ddraw/light.c | 9 +- dlls/ddraw/main.c | 30 ++--- dlls/ddraw/material.c | 18 +- dlls/ddraw/palette.c | 19 ++- dlls/ddraw/surface.c | 284 ++++++++++++++++++--------------- dlls/ddraw/vertexbuffer.c | 33 +++-- dlls/ddraw/viewport.c | 73 +++++---- 11 files changed, 597 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2963b662c52d909f0858…

1 0