August 2010 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Stub GdipGetPathGradientTransform.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 1a710ac36f4f6b7dfe56cf1f4a47b48e62cd9caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a710ac36f4f6b7dfe56cf1f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:27:30 2010 -0500 gdiplus: Stub GdipGetPathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 39e78fb..c31ed4d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1627,6 +1627,19 @@ GpStatus WINGDIPAPI GdipSetPathGradientTransform(GpPathGradient *grad, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad, + GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", grad, matrix); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c4309e5..4a98a43 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -340,7 +340,7 @@ @ stdcall GdipGetPathGradientRectI(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorCount(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) -@ stub GdipGetPathGradientTransform +@ stdcall GdipGetPathGradientTransform(ptr ptr) @ stdcall GdipGetPathGradientWrapMode(ptr ptr) @ stdcall GdipGetPathLastPoint(ptr ptr) @ stdcall GdipGetPathPoints(ptr ptr long)

1 0

Vincent Povirk : gdiplus: Use the software method to draw HBITMAP-less bitmaps.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 2a345f36e3548a91611f0ed219a3024983128dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a345f36e3548a91611f0ed21… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 16 14:53:07 2010 -0500 gdiplus: Use the software method to draw HBITMAP-less bitmaps. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e748477..8850110 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2046,7 +2046,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return GenericError; } } - else if (image->type == ImageTypeBitmap && ((GpBitmap*)image)->hbitmap) + else if (image->type == ImageTypeBitmap) { GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; @@ -2060,6 +2060,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || + !((GpBitmap*)image)->hbitmap || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) use_software = 1;

1 0

Vincent Povirk : gdiplus: Add tests for the HDC' s we get from bitmap objects.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 728aaf2902840a3eccfb9e462e8e2a4bde7f652d URL: http://source.winehq.org/git/wine.git/?a=commit;h=728aaf2902840a3eccfb9e462… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 16 15:47:17 2010 -0500 gdiplus: Add tests for the HDC's we get from bitmap objects. --- dlls/gdiplus/tests/graphics.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 609f426..9fae06c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2157,6 +2157,8 @@ static void test_fromMemoryBitmap(void) GpGraphics *graphics = NULL; GpBitmap *bitmap = NULL; BYTE bits[48] = {0}; + HDC hdc=NULL; + COLORREF color; status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, bits, &bitmap); expect(Ok, status); @@ -2172,6 +2174,50 @@ static void test_fromMemoryBitmap(void) /* drawing writes to the memory provided */ todo_wine expect(0x68, bits[10]); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + /* The HDC is write-only, and native fills with a solid color to figure out + * which pixels have changed. */ + todo_wine expect(0x0c0b0d, color); + + SetPixel(hdc, 0, 0, 0x797979); + SetPixel(hdc, 1, 0, 0x0c0b0d); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + todo_wine expect(0x79, bits[0]); + todo_wine expect(0x68, bits[3]); + + GdipDisposeImage((GpImage*)bitmap); + + /* We get the same kind of write-only HDC for a "normal" bitmap */ + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + todo_wine expect(0x0c0b0d, color); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); }

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 80e85cdb89a7e44c842dff30f188512bdd2b309f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e85cdb89a7e44c842dff30f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 16 21:10:00 2010 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index a5247a8..7d62eb6 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -1,7 +1,7 @@ /* * French resources for jscript * - * Copyright 2009 Frédéric Delanoy + * Copyright 2009-2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +31,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" IDS_CREATE_OBJ_ERROR "Le serveur d'automatisation ne peut créer l'objet" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" + IDS_UNSUPPORTED_ACTION "Cet objet ne supporte pas cette action" IDS_ARG_NOT_OPT "Argument non optionnel" IDS_SYNTAX_ERROR "Erreur de syntaxe" IDS_SEMICOLON "« ; » attendu"

1 0

Henri Verbeet : mmdevapi: Remove the useless CINTERFACE definitions.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 5c99f4ec6d4e89c213489352ba97dda363054db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c99f4ec6d4e89c213489352b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:29 2010 +0200 mmdevapi: Remove the useless CINTERFACE definitions. --- dlls/mmdevapi/audio.c | 1 - dlls/mmdevapi/audiovolume.c | 1 - dlls/mmdevapi/devenum.c | 1 - dlls/mmdevapi/main.c | 1 - dlls/mmdevapi/tests/capture.c | 1 - dlls/mmdevapi/tests/dependency.c | 1 - dlls/mmdevapi/tests/mmdevenum.c | 1 - dlls/mmdevapi/tests/propstore.c | 1 - dlls/mmdevapi/tests/render.c | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index ddd97e8..ea9305a 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -17,7 +17,6 @@ */ #define NONAMELESSUNION -#define CINTERFACE #define COBJMACROS #include "config.h" diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 5e8994a..0a0dbc4 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -18,7 +18,6 @@ #define NONAMELESSUNION -#define CINTERFACE #define COBJMACROS #include "config.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6fa637f..79e004d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -29,7 +29,6 @@ #endif #define NONAMELESSUNION -#define CINTERFACE #define COBJMACROS #include "windef.h" #include "winbase.h" diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index c8fcea0..b916df0 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -29,7 +29,6 @@ #include <OpenAL/alc.h> #endif -#define CINTERFACE #define COBJMACROS #include "windef.h" #include "winbase.h" diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 724753c..a1d36e6 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -23,7 +23,6 @@ #include "wine/test.h" -#define CINTERFACE #define COBJMACROS #ifdef STANDALONE diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 62bc4e6..c14208e 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -18,7 +18,6 @@ #include "wine/test.h" -#define CINTERFACE #define COBJMACROS #ifdef STANDALONE diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index f2b8f13..2ccaa81 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -18,7 +18,6 @@ #include "wine/test.h" -#define CINTERFACE #define COBJMACROS #include "initguid.h" diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 13d6f75..d0a0c86 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -19,7 +19,6 @@ #define NONAMELESSUNION #include "wine/test.h" -#define CINTERFACE #define COBJMACROS #ifdef STANDALONE diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 43cb341..254c94d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -23,7 +23,6 @@ #include "wine/test.h" -#define CINTERFACE #define COBJMACROS #ifdef STANDALONE

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: e2b4d4e71329cb5328aeadef9cfe57f815e532fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b4d4e71329cb5328aeadef9… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 16 20:52:56 2010 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 70e0d96..0b3fbcd 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +29,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" IDS_CREATE_OBJ_ERROR "Automatizacijos serveriui nepavyko sukurti objekto" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" + IDS_UNSUPPORTED_ACTION "Objektas nepalaiko šio veiksmo" IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" IDS_SYNTAX_ERROR "Sintaksės klaida" IDS_SEMICOLON "Tikėtasi „;“"

1 0

Vincent Povirk : gdiplus: Don' t require an HDC for the convert_unit function.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 85a57106881158ef7c7399cf2d10da445cfd529c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a57106881158ef7c7399cf2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Aug 8 15:24:45 2010 -0500 gdiplus: Don't require an HDC for the convert_unit function. --- dlls/gdiplus/gdiplus.c | 10 +++++----- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 12 +++++++++--- dlls/gdiplus/image.c | 23 +++++++++++++---------- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 383f536..9bb9fab 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -314,18 +314,18 @@ GpStatus hresult_to_status(HRESULT res) } /* converts a given unit to its value in pixels */ -REAL convert_unit(HDC hdc, GpUnit unit) +REAL convert_unit(REAL logpixels, GpUnit unit) { switch(unit) { case UnitInch: - return (REAL) GetDeviceCaps(hdc, LOGPIXELSX); + return logpixels; case UnitPoint: - return ((REAL)GetDeviceCaps(hdc, LOGPIXELSX)) / 72.0; + return logpixels / 72.0; case UnitDocument: - return ((REAL)GetDeviceCaps(hdc, LOGPIXELSX)) / 300.0; + return logpixels / 300.0; case UnitMillimeter: - return ((REAL)GetDeviceCaps(hdc, LOGPIXELSX)) / 25.4; + return logpixels / 25.4; case UnitWorld: ERR("cannot convert UnitWorld\n"); return 0.0; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index eafed7c..908a1b7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -47,7 +47,7 @@ extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle); extern REAL gdiplus_atan2(REAL dy, REAL dx); extern GpStatus hresult_to_status(HRESULT res); -extern REAL convert_unit(HDC hdc, GpUnit unit); +extern REAL convert_unit(REAL logpixels, GpUnit unit); extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ada2c58..094ed61 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -84,6 +84,12 @@ static BYTE convert_path_point_type(BYTE type) return ret; } +static REAL graphics_res(GpGraphics *graphics) +{ + if (graphics->image) return graphics->image->xres; + else return (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); +} + static INT prepare_dc(GpGraphics *graphics, GpPen *pen) { HPEN gdipen; @@ -108,7 +114,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); - width *= pen->width * convert_unit(graphics->hdc, + width *= pen->width * convert_unit(graphics_res(graphics), pen->unit == UnitWorld ? graphics->unit : pen->unit); } @@ -156,7 +162,7 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GpMatrix *matrix; int i; - unitscale = convert_unit(graphics->hdc, graphics->unit); + unitscale = convert_unit(graphics_res(graphics), graphics->unit); /* apply page scale */ if(graphics->unit != UnitDisplay) @@ -4602,7 +4608,7 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace stat = GdipCreateMatrix(&matrix); if (stat == Ok) { - unitscale = convert_unit(graphics->hdc, graphics->unit); + unitscale = convert_unit(graphics_res(graphics), graphics->unit); if(graphics->unit != UnitDisplay) unitscale *= graphics->scale; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d72ae8d..57c9f83 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2008,14 +2008,15 @@ GpStatus WINGDIPAPI GdipGetImageDimension(GpImage *image, REAL *width, if(image->type == ImageTypeMetafile){ HDC hdc = GetDC(0); + REAL res = (REAL)GetDeviceCaps(hdc, LOGPIXELSX); - *height = convert_unit(hdc, ((GpMetafile*)image)->unit) * + ReleaseDC(0, hdc); + + *height = convert_unit(res, ((GpMetafile*)image)->unit) * ((GpMetafile*)image)->bounds.Height; - *width = convert_unit(hdc, ((GpMetafile*)image)->unit) * + *width = convert_unit(res, ((GpMetafile*)image)->unit) * ((GpMetafile*)image)->bounds.Width; - - ReleaseDC(0, hdc); } else if(image->type == ImageTypeBitmap){ @@ -2072,11 +2073,12 @@ GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) if(image->type == ImageTypeMetafile){ HDC hdc = GetDC(0); - - *height = roundr(convert_unit(hdc, ((GpMetafile*)image)->unit) * - ((GpMetafile*)image)->bounds.Height); + REAL res = (REAL)GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(0, hdc); + + *height = roundr(convert_unit(res, ((GpMetafile*)image)->unit) * + ((GpMetafile*)image)->bounds.Height); } else if(image->type == ImageTypeBitmap) *height = ((GpBitmap*)image)->height; @@ -2178,11 +2180,12 @@ GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) if(image->type == ImageTypeMetafile){ HDC hdc = GetDC(0); - - *width = roundr(convert_unit(hdc, ((GpMetafile*)image)->unit) * - ((GpMetafile*)image)->bounds.Width); + REAL res = (REAL)GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(0, hdc); + + *width = roundr(convert_unit(res, ((GpMetafile*)image)->unit) * + ((GpMetafile*)image)->bounds.Width); } else if(image->type == ImageTypeBitmap) *width = ((GpBitmap*)image)->width;

1 0

Vincent Povirk : gdiplus: Don't require an HDC in get_graphics_bounds.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 5601860b76fe61ae8d6a1ea18ad737674f91256b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5601860b76fe61ae8d6a1ea18… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Aug 8 15:31:03 2010 -0500 gdiplus: Don't require an HDC in get_graphics_bounds. --- dlls/gdiplus/graphics.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 094ed61..ced0d40 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1137,6 +1137,8 @@ static GpStatus restore_container(GpGraphics* graphics, static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) { RECT wnd_rect; + GpStatus stat=Ok; + GpUnit unit; if(graphics->hwnd) { if(!GetClientRect(graphics->hwnd, &wnd_rect)) @@ -1146,6 +1148,10 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Y = wnd_rect.top; rect->Width = wnd_rect.right - wnd_rect.left; rect->Height = wnd_rect.bottom - wnd_rect.top; + }else if (graphics->image){ + stat = GdipGetImageBounds(graphics->image, rect, &unit); + if (stat == Ok && unit != UnitPixel) + FIXME("need to convert from unit %i\n", unit); }else{ rect->X = 0; rect->Y = 0; @@ -1153,7 +1159,7 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - return Ok; + return stat; } /* on success, rgn will contain the region of the graphics object which

1 0

Vincent Povirk : gdiplus: Give a nice warning when we try to draw to an HDC-less graphics.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: c3ca6be2b9e51faeb2469ed2d064e49a88c02cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ca6be2b9e51faeb2469ed2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Aug 8 15:34:23 2010 -0500 gdiplus: Give a nice warning when we try to draw to an HDC-less graphics. --- dlls/gdiplus/graphics.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ced0d40..ccec25d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -94,10 +94,17 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) { HPEN gdipen; REAL width; - INT save_state = SaveDC(graphics->hdc), i, numdashes; + INT save_state, i, numdashes; GpPointF pt[2]; DWORD dash_array[MAX_DASHLEN]; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + } + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); if(pen->unit == UnitPixel){ @@ -1973,6 +1980,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (image->picture) { + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + } + /* FIXME: partially implemented (only works for rectangular parallelograms) */ if(srcUnit == UnitInch) dx = dy = (REAL) INCH_HIMETRIC; @@ -2772,6 +2784,12 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -2814,6 +2832,12 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE @@ -2851,6 +2875,12 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -2890,6 +2920,12 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf = GdipAlloc(count * sizeof(GpPointF)); pti = GdipAlloc(count * sizeof(POINT)); if(!ptf || !pti){ @@ -2937,6 +2973,12 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf = GdipAlloc(count * sizeof(GpPointF)); pti = GdipAlloc(count * sizeof(POINT)); if(!ptf || !pti){ @@ -3002,6 +3044,12 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -3042,6 +3090,12 @@ GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -3134,6 +3188,12 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if(graphics->busy) return ObjectBusy; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + status = GdipGetRegionHRgn(region, graphics, &hrgn); if(status != Ok) return status; @@ -3744,6 +3804,12 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return NotImplemented; + } + if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); @@ -3813,6 +3879,12 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect || !bounds) return InvalidParameter; + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return NotImplemented; + } + if(linesfilled) *linesfilled = 0; if(codepointsfitted) *codepointsfitted = 0; @@ -3886,6 +3958,12 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string return NotImplemented; } + if(!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return NotImplemented; + } + if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); @@ -4549,6 +4627,13 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + WARN("no HDC for this graphics\n"); + *hdc = NULL; + return GenericError; + } + *hdc = graphics->hdc; graphics->busy = TRUE;

1 0

Vincent Povirk : gdiplus: Don' t require an HDC to get the resolution of a graphics object.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 963c7090d558a7bd2991e13620b1112348a921df URL: http://source.winehq.org/git/wine.git/?a=commit;h=963c7090d558a7bd2991e1362… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Aug 8 15:53:08 2010 -0500 gdiplus: Don't require an HDC to get the resolution of a graphics object. --- dlls/gdiplus/graphics.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ccec25d..79290b5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4574,7 +4574,10 @@ GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics *graphics, REAL* dpi) if(graphics->busy) return ObjectBusy; - *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); + if (graphics->image) + *dpi = graphics->image->xres; + else + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); return Ok; } @@ -4589,7 +4592,10 @@ GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics *graphics, REAL* dpi) if(graphics->busy) return ObjectBusy; - *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSY); + if (graphics->image) + *dpi = graphics->image->yres; + else + *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSY); return Ok; }

1 0