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

Austin English : windowscodecs: Only declare jpeg debug channel if jpeg is supported.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: bceb274c94daacb9fef790490aa1dfa7069a7188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bceb274c94daacb9fef790490… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Apr 10 15:41:04 2011 -0500 windowscodecs: Only declare jpeg debug channel if jpeg is supported. --- dlls/windowscodecs/jpegformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 789a60b..ab21fbf 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -55,9 +55,9 @@ #include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -WINE_DECLARE_DEBUG_CHANNEL(jpeg); #ifdef SONAME_LIBJPEG +WINE_DECLARE_DEBUG_CHANNEL(jpeg); static void *libjpeg_handle;

1 0

Huw Davies : gdi32: Implement SelectBrush for solid brushes.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 44f530275afcdde9febc06bc110631c0d5a56f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f530275afcdde9febc06bc1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:00:28 2011 +0100 gdi32: Implement SelectBrush for solid brushes. --- dlls/gdi32/dibdrv/dc.c | 5 ++- dlls/gdi32/dibdrv/dibdrv.h | 13 +++++++ dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 83 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 6 +++ 5 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 78248dd..9c2aca4 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -137,6 +137,7 @@ static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); calc_and_xor_masks(rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + update_brush_rop(pdev, rop); return next->funcs->pSetROP2( next, rop ); } @@ -219,7 +220,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */ dibdrv_SelectBitmap, /* pSelectBitmap */ - NULL, /* pSelectBrush */ + dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ NULL, /* pSelectPalette */ @@ -228,7 +229,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ - NULL, /* pSetDCBrushColor */ + dibdrv_SetDCBrushColor, /* pSetDCBrushColor */ dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b7408ac..e62536f 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,7 +19,9 @@ */ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) @@ -43,3 +45,14 @@ 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; +extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; + +static inline BOOL defer_pen(dibdrv_physdev *pdev) +{ + return pdev->defer & (DEFER_FORMAT | DEFER_PEN); +} + +static inline BOOL defer_brush(dibdrv_physdev *pdev) +{ + return pdev->defer & (DEFER_FORMAT | DEFER_BRUSH); +} diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 1e0de2f..1b4ccb3 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -40,7 +40,7 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) LPtoDP(dev->hdc, pts, 2); - if(pdev->defer || !pdev->pen_line(pdev, pts, pts + 1)) + if(defer_pen(pdev) || !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 a26785a..4ebeee1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -207,3 +207,86 @@ COLORREF CDECL 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, int num, RECT *rects) +{ + int i; + DC *dc = get_dibdrv_dc( &pdev->dev ); + + if(get_clip_region(dc)) return FALSE; + + for(i = 0; i < num; i++) /* simple clip to extents */ + { + if(rects[i].left < dc->vis_rect.left) rects[i].left = dc->vis_rect.left; + if(rects[i].top < dc->vis_rect.top) rects[i].top = dc->vis_rect.top; + if(rects[i].right > dc->vis_rect.right) rects[i].right = dc->vis_rect.right; + if(rects[i].bottom > dc->vis_rect.bottom) rects[i].bottom = dc->vis_rect.bottom; + } + + pdev->dib.funcs->solid_rects(&pdev->dib, num, rects, pdev->brush_and, pdev->brush_xor); + return TRUE; +} + +void update_brush_rop( dibdrv_physdev *pdev, INT rop ) +{ + if(pdev->brush_style == BS_SOLID) + calc_and_xor_masks(rop, pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); +} + +/*********************************************************************** + * dibdrv_SelectBrush + */ +HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBrush ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + LOGBRUSH logbrush; + + TRACE("(%p, %p)\n", dev, hbrush); + + if (!GetObjectW( hbrush, sizeof(logbrush), &logbrush )) return 0; + + if (hbrush == GetStockObject( DC_BRUSH )) + logbrush.lbColor = GetDCBrushColor( dev->hdc ); + + pdev->brush_style = logbrush.lbStyle; + + pdev->defer |= DEFER_BRUSH; + + switch(logbrush.lbStyle) + { + case BS_SOLID: + pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logbrush.lbColor); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + pdev->brush_rects = solid_brush; + pdev->defer &= ~DEFER_BRUSH; + break; + default: + break; + } + + return next->funcs->pSelectBrush( next, hbrush ); +} + +/*********************************************************************** + * dibdrv_SetDCBrushColor + */ +COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCBrushColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) + { + pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + } + + return next->funcs->pSetDCBrushColor( next, color ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fc86b32..91f4acb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -102,10 +102,16 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); + + /* brush */ + UINT brush_style; + DWORD brush_color, brush_and, brush_xor; + BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); } dibdrv_physdev; #define DEFER_FORMAT 1 #define DEFER_PEN 2 +#define DEFER_BRUSH 4 typedef struct tagDC_FUNCS {

1 0

Huw Davies : gdi32: Implement PatBlt.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 91ff1440184eb57fa7cdfc9b1ed998eeb32685d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ff1440184eb57fa7cdfc9b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:07:12 2011 +0100 gdi32: Implement PatBlt. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9c2aca4..d784c94 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -200,7 +200,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ NULL, /* pPaintRgn */ - NULL, /* pPatBlt */ + dibdrv_PatBlt, /* pPatBlt */ NULL, /* pPie */ NULL, /* pPolyBezier */ NULL, /* pPolyBezierTo */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e62536f..c6cdd62 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,6 +19,7 @@ */ extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) DECLSPEC_HIDDEN; extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 1b4ccb3..7d0f2e9 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -25,6 +25,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + /*********************************************************************** * dibdrv_LineTo */ @@ -45,3 +76,42 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) return TRUE; } + +/*********************************************************************** + * get_rop2_from_rop + * + * Returns the binary rop that is equivalent to the provided ternary rop + * if the src bits are ignored. + */ +static inline INT get_rop2_from_rop(INT rop) +{ + return (((rop >> 18) & 0x0c) | ((rop >> 16) & 0x03)) + 1; +} + +/*********************************************************************** + * dibdrv_PatBlt + */ +BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, INT x, INT y, INT width, INT height, DWORD rop ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPatBlt ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + INT rop2 = get_rop2_from_rop(rop); + RECT rect = get_device_rect( dev->hdc, x, y, x + width, y + height ); + BOOL done; + + TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, x, y, width, height, rop); + + if(defer_brush(pdev)) + return next->funcs->pPatBlt( next, x, y, width, height, rop ); + + update_brush_rop( pdev, rop2 ); + + done = pdev->brush_rects( pdev, 1, &rect ); + + update_brush_rop( pdev, GetROP2(dev->hdc) ); + + if(!done) + return next->funcs->pPatBlt( next, x, y, width, height, rop ); + + return TRUE; +}

1 0

Huw Davies : gdi32/tests: Add PatBlt tests.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 16008856904bba4b6836e6a9b701da70be721712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16008856904bba4b6836e6a9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 11 10:11:10 2011 +0100 gdi32/tests: Add PatBlt tests. --- dlls/gdi32/tests/dib.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d882da4..784f0dd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -31,10 +31,52 @@ static HCRYPTPROV crypt_prov; +static const DWORD rop3[256] = +{ + 0x000042, 0x010289, 0x020C89, 0x0300AA, 0x040C88, 0x0500A9, 0x060865, 0x0702C5, + 0x080F08, 0x090245, 0x0A0329, 0x0B0B2A, 0x0C0324, 0x0D0B25, 0x0E08A5, 0x0F0001, + 0x100C85, 0x1100A6, 0x120868, 0x1302C8, 0x140869, 0x1502C9, 0x165CCA, 0x171D54, + 0x180D59, 0x191CC8, 0x1A06C5, 0x1B0768, 0x1C06CA, 0x1D0766, 0x1E01A5, 0x1F0385, + 0x200F09, 0x210248, 0x220326, 0x230B24, 0x240D55, 0x251CC5, 0x2606C8, 0x271868, + 0x280369, 0x2916CA, 0x2A0CC9, 0x2B1D58, 0x2C0784, 0x2D060A, 0x2E064A, 0x2F0E2A, + 0x30032A, 0x310B28, 0x320688, 0x330008, 0x3406C4, 0x351864, 0x3601A8, 0x370388, + 0x38078A, 0x390604, 0x3A0644, 0x3B0E24, 0x3C004A, 0x3D18A4, 0x3E1B24, 0x3F00EA, + 0x400F0A, 0x410249, 0x420D5D, 0x431CC4, 0x440328, 0x450B29, 0x4606C6, 0x47076A, + 0x480368, 0x4916C5, 0x4A0789, 0x4B0605, 0x4C0CC8, 0x4D1954, 0x4E0645, 0x4F0E25, + 0x500325, 0x510B26, 0x5206C9, 0x530764, 0x5408A9, 0x550009, 0x5601A9, 0x570389, + 0x580785, 0x590609, 0x5A0049, 0x5B18A9, 0x5C0649, 0x5D0E29, 0x5E1B29, 0x5F00E9, + 0x600365, 0x6116C6, 0x620786, 0x630608, 0x640788, 0x650606, 0x660046, 0x6718A8, + 0x6858A6, 0x690145, 0x6A01E9, 0x6B178A, 0x6C01E8, 0x6D1785, 0x6E1E28, 0x6F0C65, + 0x700CC5, 0x711D5C, 0x720648, 0x730E28, 0x740646, 0x750E26, 0x761B28, 0x7700E6, + 0x7801E5, 0x791786, 0x7A1E29, 0x7B0C68, 0x7C1E24, 0x7D0C69, 0x7E0955, 0x7F03C9, + 0x8003E9, 0x810975, 0x820C49, 0x831E04, 0x840C48, 0x851E05, 0x8617A6, 0x8701C5, + 0x8800C6, 0x891B08, 0x8A0E06, 0x8B0666, 0x8C0E08, 0x8D0668, 0x8E1D7C, 0x8F0CE5, + 0x900C45, 0x911E08, 0x9217A9, 0x9301C4, 0x9417AA, 0x9501C9, 0x960169, 0x97588A, + 0x981888, 0x990066, 0x9A0709, 0x9B07A8, 0x9C0704, 0x9D07A6, 0x9E16E6, 0x9F0345, + 0xA000C9, 0xA11B05, 0xA20E09, 0xA30669, 0xA41885, 0xA50065, 0xA60706, 0xA707A5, + 0xA803A9, 0xA90189, 0xAA0029, 0xAB0889, 0xAC0744, 0xAD06E9, 0xAE0B06, 0xAF0229, + 0xB00E05, 0xB10665, 0xB21974, 0xB30CE8, 0xB4070A, 0xB507A9, 0xB616E9, 0xB70348, + 0xB8074A, 0xB906E6, 0xBA0B09, 0xBB0226, 0xBC1CE4, 0xBD0D7D, 0xBE0269, 0xBF08C9, + 0xC000CA, 0xC11B04, 0xC21884, 0xC3006A, 0xC40E04, 0xC50664, 0xC60708, 0xC707AA, + 0xC803A8, 0xC90184, 0xCA0749, 0xCB06E4, 0xCC0020, 0xCD0888, 0xCE0B08, 0xCF0224, + 0xD00E0A, 0xD1066A, 0xD20705, 0xD307A4, 0xD41D78, 0xD50CE9, 0xD616EA, 0xD70349, + 0xD80745, 0xD906E8, 0xDA1CE9, 0xDB0D75, 0xDC0B04, 0xDD0228, 0xDE0268, 0xDF08C8, + 0xE003A5, 0xE10185, 0xE20746, 0xE306EA, 0xE40748, 0xE506E5, 0xE61CE8, 0xE70D79, + 0xE81D74, 0xE95CE6, 0xEA02E9, 0xEB0849, 0xEC02E8, 0xED0848, 0xEE0086, 0xEF0A08, + 0xF00021, 0xF10885, 0xF20B05, 0xF3022A, 0xF40B0A, 0xF50225, 0xF60265, 0xF708C5, + 0xF802E5, 0xF90845, 0xFA0089, 0xFB0A09, 0xFC008A, 0xFD0A0A, 0xFE02A9, 0xFF0062 +}; + +static inline BOOL rop_uses_src(DWORD rop) +{ + return (((rop & 0xcc0000) >> 2) != (rop & 0x330000)); +} + static const char *sha1_graphics_a8r8g8b8[] = { "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", + "17b2c177bdce5e94433574a928bda5c94a8cdfa5", NULL }; @@ -107,7 +149,8 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh { DWORD dib_size = get_dib_size(bmi); HPEN solid_pen, orig_pen; - INT i; + HBRUSH solid_brush, orig_brush; + INT i, y; memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); @@ -129,8 +172,31 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh LineTo(hdc, 170 + i * 3, 10); /* b -> t */ } compare_hash(bmi, bits, sha1, "h and v solid lines"); + memset(bits, 0xcc, dib_size); + + solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); + orig_brush = SelectObject(hdc, solid_brush); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + + if(rop_uses_src(rop3[i])) + ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); + else + { + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 20; + } + + } + compare_hash(bmi, bits, sha1, "solid patblt"); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); + DeleteObject(solid_brush); DeleteObject(solid_pen); }

1 0

Alexandre Julliard : gdi32: Fix a compiler warning on 64-bit.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 7c06fef8b636a897923a559d07e11f17f66402d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06fef8b636a897923a559d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 13:45:23 2011 +0200 gdi32: Fix a compiler warning on 64-bit. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 03a4cbd..b329b33 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3974,7 +3974,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l CHARSETINFO csi; DWORD n = 0; - if (TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET) && + if (TranslateCharsetInfo(ULongToPtr(charset), &csi, TCI_SRCCHARSET) && csi.fs.fsCsb[0] != 0) { list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset;

1 0

Jörg Höhle : winmm: Trace DriverCallback once upon entry.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: e6a501bbd6286b05b37bf6183113b35f4a1e6c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a501bbd6286b05b37bf6183… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 29 20:51:15 2011 +0200 winmm: Trace DriverCallback once upon entry. --- dlls/winmm/driver.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 23338d2..8620fe6 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -531,34 +531,44 @@ LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, } /************************************************************************** + * DRIVER_getCallback [internal] + */ +static const char* DRIVER_getCallback(DWORD uFlags) +{ + switch(uFlags & DCB_TYPEMASK) { + case DCB_NULL: return "null"; + case DCB_WINDOW: return "window"; + case DCB_TASK: return "task"; + case DCB_EVENT: return "event"; + case DCB_FUNCTION: return "32bit function"; + default: return "UNKNOWN"; + } +} + +/************************************************************************** * DriverCallback [WINMM.@] */ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n", - dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", + dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: - TRACE("Null !\n"); break; case DCB_WINDOW: - TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - TRACE("Task(%04lx) !\n", dwCallBack); PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: - TRACE("Function (32 bit) !\n"); if (dwCallBack) ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); break; case DCB_EVENT: - TRACE("Event(%08lx) !\n", dwCallBack); SetEvent((HANDLE)dwCallBack); break; #if 0

1 0

Francois Gouget : mmdevapi: Reorder a couple of functions to avoid forward declarations and make MMDevice_SetPropValue () static.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: fc4014454b299a203ee12f3e8d305c9d10ae2eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4014454b299a203ee12f3e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 10 18:46:13 2011 +0200 mmdevapi: Reorder a couple of functions to avoid forward declarations and make MMDevice_SetPropValue() static. --- dlls/mmdevapi/devenum.c | 266 +++++++++++++++++++++++----------------------- dlls/mmdevapi/mmdevapi.h | 1 - 2 files changed, 133 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc4014454b299a203ee12…

1 0

Dmitry Timoshkov : user32: Use symbolic names for values returned by WM_MENUCHAR handler.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: a859e73d5f192da5605134bae413886520f6eda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a859e73d5f192da5605134bae… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 11 13:44:53 2011 +0900 user32: Use symbolic names for values returned by WM_MENUCHAR handler. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 6385476..c92eeb1 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1464,7 +1464,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, return 0; case WM_MENUCHAR: - return 0x00010000; /* MDI children don't have menu bars */ + return MAKELRESULT( 0, MNC_CLOSE ); /* MDI children don't have menu bars */ case WM_CLOSE: SendMessageW( client, WM_MDIDESTROY, (WPARAM)hwnd, 0 );

1 0

Michael Stefaniuc : riched20: COM cleanup for the ITextHost iface.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: e18ae2139bdc88dd0b7a5b1360e428c3bfe361ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18ae2139bdc88dd0b7a5b136… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 10 21:42:53 2011 +0200 riched20: COM cleanup for the ITextHost iface. --- dlls/riched20/txthost.c | 151 +++++++++++++++++++---------------------------- 1 files changed, 60 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e18ae2139bdc88dd0b7a5…

1 0

Michael Stefaniuc : riched20: COM cleanup for the ITextServices iface.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: c52c15ef99daa8d664bf791df9640f8628478e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52c15ef99daa8d664bf791df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 10 21:44:44 2011 +0200 riched20: COM cleanup for the ITextServices iface. --- dlls/riched20/txtsrv.c | 162 +++++++++++++++++------------------------------- 1 files changed, 58 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c52c15ef99daa8d664bf7…

1 0