August 2007 - Wine-Commits - list.winehq.org

Evan Stade : gdiplus: Added GdipConvertToEmfPlus stub.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: f8b2b77f69bad9d45f3648519d3ed95ab72c9ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b2b77f69bad9d45f3648519… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:37 2007 -0700 gdiplus: Added GdipConvertToEmfPlus stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3f2ceea..1f69314 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -66,7 +66,7 @@ @ stub GdipCombineRegionRectI @ stub GdipCombineRegionRegion @ stub GdipComment -@ stub GdipConvertToEmfPlus +@ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream @ stub GdipCreateAdjustableArrowCap diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 633b225..d5780bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -255,6 +255,24 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, + GpMetafile* metafile, BOOL* succ, EmfType emfType, + const WCHAR* description, GpMetafile** out_metafile) +{ + static int calls; + + if(!ref || !metafile || !out_metafile) + return InvalidParameter; + + *succ = FALSE; + *out_metafile = NULL; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + /* FIXME: this should create a bitmap in the given size with the attributes * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index a2fe1fb..7d71b6d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -191,6 +191,13 @@ enum LinearGradientMode LinearGradientModeBackwardDiagonal }; +enum EmfType +{ + EmfTypeEmfOnly = MetafileTypeEmf, + EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly, + EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -211,6 +218,7 @@ typedef enum ImageType ImageType; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; +typedef enum EmfType EmfType; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 61d2e6d..6b45368 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -191,6 +191,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); +GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,BOOL*, + EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,

1 0

Evan Stade : gdiplus: Added GdipTranslateWorldTransform.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 795b62216d6b0a9067e983e84f006c0c6bab2afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=795b62216d6b0a9067e983e84… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:31 2007 -0700 gdiplus: Added GdipTranslateWorldTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 +++++++++ include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a624a90..3f2ceea 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -618,7 +618,7 @@ @ stub GdipTranslateRegion @ stub GdipTranslateRegionI @ stub GdipTranslateTextureTransform -@ stub GdipTranslateWorldTransform +@ stdcall GdipTranslateWorldTransform(ptr long long long) @ stub GdipVectorTransformMatrixPoints @ stub GdipVectorTransformMatrixPointsI @ stub GdipWarpPath diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6be5de4..d9cf86f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1594,3 +1594,12 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix GdipDeleteMatrix(graphics->worldtrans); return GdipCloneMatrix(matrix, &graphics->worldtrans); } + +GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, + REAL dy, GpMatrixOrder order) +{ + if(!graphics) + return InvalidParameter; + + return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 231f918..61d2e6d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -97,6 +97,7 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); +GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**); GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,

1 0

Evan Stade : gdiplus: Added GdipSetTextureTransform stub.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 96a69f0508483546f9de505d37200cf656269aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a69f0508483546f9de505d3… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:22 2007 -0700 gdiplus: Added GdipSetTextureTransform stub. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ef60a4a..e91538e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -625,3 +625,17 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) return Ok; } + +GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, + GDIPCONST GpMatrix *matrix) +{ + static int calls; + + if(!texture || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c8059ca..a624a90 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -595,7 +595,7 @@ @ stub GdipSetStringFormatTrimming @ stub GdipSetTextContrast @ stub GdipSetTextRenderingHint -@ stub GdipSetTextureTransform +@ stdcall GdipSetTextureTransform(ptr ptr) @ stub GdipSetTextureWrapMode @ stdcall GdipSetWorldTransform(ptr ptr) @ stub GdipShearMatrix diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index aa05914..231f918 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -128,6 +128,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); +GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT);

1 0

Evan Stade : gdiplus: Updated GdipCloneBrush, GdipDeleteBrush.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 8254c37ad8813442b20d661e07e0bd8b4f6240a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8254c37ad8813442b20d661e0… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:18 2007 -0700 gdiplus: Updated GdipCloneBrush, GdipDeleteBrush. --- dlls/gdiplus/brush.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 9d8699d..ef60a4a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -85,7 +85,16 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) (*clone)->gdibrush = CreateSolidBrush((*clone)->lb.lbColor); break; + case BrushTypeTextureFill: + *clone = GdipAlloc(sizeof(GpTexture)); + if(!*clone) return OutOfMemory; + + memcpy(*clone, brush, sizeof(GpTexture)); + + (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + break; default: + ERR("not implemented for brush type %d\n", brush->bt); return NotImplemented; } @@ -385,6 +394,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) break; case BrushTypeSolidColor: case BrushTypeLinearGradient: + case BrushTypeTextureFill: default: break; }

1 0

Evan Stade : gdiplus: Added GdipCreateTextureIA.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: b9411ba374e9570f99bdc23b8769d7ccb64ad1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9411ba374e9570f99bdc23b8… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:14 2007 -0700 gdiplus: Added GdipCreateTextureIA. --- dlls/gdiplus/brush.c | 122 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 4 + include/gdiplusflat.h | 2 + include/gdiplusgpstubs.h | 2 + 5 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 1c17560..9d8699d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -16,10 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include "windef.h" +#include "winbase.h" +#include "winuser.h" #include "wingdi.h" +#define COBJMACROS #include "objbase.h" +#include "olectl.h" +#include "ole2.h" #include "gdiplus.h" #include "gdiplus_private.h" @@ -242,6 +249,121 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) return Ok; } +/* FIXME: imageattr ignored */ +GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, + GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, + REAL height, GpTexture **texture) +{ + HDC hdc; + OLE_HANDLE hbm; + HBITMAP old = NULL; + BITMAPINFO bmi; + BITMAPINFOHEADER *bmih; + INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; + BOOL bm_is_selected; + BYTE *dibits, *buff, *textbits; + + if(!image || !texture || x < 0.0 || y < 0.0 || width < 0.0 || height < 0.0) + return InvalidParameter; + + if(image->type != ImageTypeBitmap){ + FIXME("not implemented for image type %d\n", image->type); + return NotImplemented; + } + + n_x = roundr(x); + n_y = roundr(y); + n_width = roundr(width); + n_height = roundr(height); + + if(n_x + n_width > ((GpBitmap*)image)->width || + n_y + n_height > ((GpBitmap*)image)->height) + return InvalidParameter; + + IPicture_get_Handle(image->picture, &hbm); + if(!hbm) return GenericError; + IPicture_get_CurDC(image->picture, &hdc); + bm_is_selected = (hdc != 0); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biBitCount = 0; + + if(!bm_is_selected){ + hdc = CreateCompatibleDC(0); + old = SelectObject(hdc, (HBITMAP)hbm); + } + + /* fill out bmi */ + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + + bytespp = bmi.bmiHeader.biBitCount / 8; + abs_height = abs(bmi.bmiHeader.biHeight); + + if(n_x > bmi.bmiHeader.biWidth || n_x + n_width > bmi.bmiHeader.biWidth || + n_y > abs_height || n_y + n_height > abs_height) + return InvalidParameter; + + dibits = GdipAlloc(bmi.bmiHeader.biSizeImage); + + if(dibits) /* this is not a good place to error out */ + GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, dibits, &bmi, DIB_RGB_COLORS); + + if(!bm_is_selected){ + SelectObject(hdc, old); + DeleteDC(hdc); + } + + if(!dibits) + return OutOfMemory; + + image_stride = (bmi.bmiHeader.biWidth * bytespp + 3) & ~3; + stride = (n_width * bytespp + 3) & ~3; + buff = GdipAlloc(sizeof(BITMAPINFOHEADER) + stride * n_height); + if(!buff){ + GdipFree(dibits); + return OutOfMemory; + } + + bmih = (BITMAPINFOHEADER*)buff; + textbits = (BYTE*) (bmih + 1); + bmih->biSize = sizeof(BITMAPINFOHEADER); + bmih->biWidth = n_width; + bmih->biHeight = n_height; + bmih->biCompression = BI_RGB; + bmih->biSizeImage = stride * n_height; + bmih->biBitCount = bmi.bmiHeader.biBitCount; + bmih->biClrUsed = 0; + bmih->biPlanes = 1; + + /* image is flipped */ + if(bmi.bmiHeader.biHeight > 0){ + dibits += bmi.bmiHeader.biSizeImage; + image_stride *= -1; + textbits += stride * (n_height - 1); + stride *= -1; + } + + for(i = 0; i < n_height; i++) + memcpy(&textbits[i * stride], + &dibits[n_x * bytespp + (n_y + i) * image_stride], + abs(stride)); + + *texture = GdipAlloc(sizeof(GpTexture)); + if (!*texture) return OutOfMemory; + + (*texture)->brush.lb.lbStyle = BS_DIBPATTERNPT; + (*texture)->brush.lb.lbColor = DIB_RGB_COLORS; + (*texture)->brush.lb.lbHatch = (ULONG_PTR)buff; + + (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); + (*texture)->brush.bt = BrushTypeTextureFill; + + GdipFree(dibits); + GdipFree(buff); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type) { if(!brush || !type) return InvalidParameter; diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9296354..c8059ca 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -134,7 +134,7 @@ @ stub GdipCreateTexture2 @ stub GdipCreateTexture2I @ stub GdipCreateTexture -@ stub GdipCreateTextureIA +@ stdcall GdipCreateTextureIA(ptr ptr long long long long ptr) @ stub GdipCreateTextureIAI @ stdcall GdipDeleteBrush(ptr) @ stub GdipDeleteCachedBitmap diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8555db7..485394e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -115,6 +115,10 @@ struct GpLineGradient{ BOOL gamma; }; +struct GpTexture{ + GpBrush brush; +}; + struct GpPath{ GpFillMode fill; GpPathData pathdata; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2060e28..aa05914 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -104,6 +104,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode, GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); +GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*, + REAL,REAL,REAL,REAL,GpTexture**); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 6628dbc..253dd1f 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -35,6 +35,7 @@ class GpImageAttributes {}; class GpBitmap : public GpImage {}; class GpPathGradient : public GpBrush {}; class GpLineGradient : public GpBrush {}; +class GpTexture : public GpBrush {}; #else /* end of c++ declarations */ @@ -52,6 +53,7 @@ typedef struct GpImageAttributes GpImageAttributes; typedef struct GpBitmap GpBitmap; typedef struct GpPathGradient GpPathGradient; typedef struct GpLineGradient GpLineGradient; +typedef struct GpTexture GpTexture; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipDrawImageRectRect.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 04d4c2621cb31b6d844c021fde10bcdad30c1a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d4c2621cb31b6d844c021fd… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:09 2007 -0700 gdiplus: Added GdipDrawImageRectRect. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 21 ++++++++++++++++++++- include/gdiplusflat.h | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b09ca8e..9296354 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -183,7 +183,7 @@ @ stub GdipDrawImagePointsRectI @ stub GdipDrawImageRect @ stub GdipDrawImageRectI -@ stub GdipDrawImageRectRect +@ stdcall GdipDrawImageRectRect(ptr ptr long long long long long long long long long ptr long ptr) @ stub GdipDrawImageRectRectI @ stdcall GdipDrawLine(ptr ptr long long long long) @ stdcall GdipDrawLineI(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5946fa3..6be5de4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1018,7 +1018,7 @@ GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, return Ok; } -/* FIXME: partially implemented */ +/* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, @@ -1071,6 +1071,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return Ok; } +GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics *graphics, GpImage *image, + REAL dstx, REAL dsty, REAL dstwidth, REAL dstheight, REAL srcx, REAL srcy, + REAL srcwidth, REAL srcheight, GpUnit srcUnit, + GDIPCONST GpImageAttributes* imageattr, DrawImageAbort callback, + VOID * callbackData) +{ + GpPointF points[3]; + + points[0].X = dstx; + points[0].Y = dsty; + points[1].X = dstx + dstwidth; + points[1].Y = dsty; + points[2].X = dstx; + points[2].Y = dsty + dstheight; + + return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, + srcwidth, srcheight, srcUnit, imageattr, callback, callbackData); +} + GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b190492..2060e28 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -66,6 +66,9 @@ GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit, GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*); +GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics*,GpImage*,REAL,REAL,REAL, + REAL,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort, + VOID*); GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);

1 0

Evan Stade : gdiplus: Replace GetDC(0) with CreateCompatibleDC(0).
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 9c30236dee4b0fae1c3be5be23fd5b6002ebd15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c30236dee4b0fae1c3be5be2… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:05 2007 -0700 gdiplus: Replace GetDC(0) with CreateCompatibleDC(0). --- dlls/gdiplus/image.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d779907..a6cf671 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -130,7 +130,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bmi.bmiHeader.biBitCount = 0; if(!bm_is_selected){ - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); old = SelectObject(hdc, (HBITMAP)hbm); } @@ -149,7 +149,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(!bm_is_selected){ SelectObject(hdc, old); - ReleaseDC(0, hdc); + DeleteDC(hdc); } lockeddata->Width = rect->Width; @@ -210,7 +210,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, bmi.bmiHeader.biBitCount = 0; if(!bm_is_selected){ - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); old = SelectObject(hdc, (HBITMAP)hbm); } @@ -221,7 +221,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!bm_is_selected){ SelectObject(hdc, old); - ReleaseDC(0, hdc); + DeleteDC(hdc); } GdipFree(bitmap->bitmapbits); @@ -677,11 +677,11 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if(!hdc){ HBITMAP old; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); old = SelectObject(hdc, (HBITMAP)hbm); GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); SelectObject(hdc, old); - ReleaseDC(0, hdc); + DeleteDC(hdc); } else GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);

1 0

Evan Stade : gdiplus: Added GdipGetImageGraphicsContext.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 94a19d1f759b76de7d2127978a09e844b6026cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a19d1f759b76de7d2127978… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:01 2007 -0700 gdiplus: Added GdipGetImageGraphicsContext. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 50d2f6b..b09ca8e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -287,7 +287,7 @@ @ stub GdipGetImageEncoders @ stub GdipGetImageEncodersSize @ stub GdipGetImageFlags -@ stub GdipGetImageGraphicsContext +@ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) @ stub GdipGetImageItemData diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d813678..d779907 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -384,9 +384,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream, GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { + HDC hdc; + if(!image) return InvalidParameter; + IPicture_get_CurDC(image->picture, &hdc); + DeleteDC(hdc); IPicture_Release(image->picture); GdipFree(image); @@ -429,6 +433,29 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, return Ok; } +GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, + GpGraphics **graphics) +{ + HDC hdc; + + if(!image || !graphics) + return InvalidParameter; + + if(image->type != ImageTypeBitmap){ + FIXME("not implemented for image type %d\n", image->type); + return NotImplemented; + } + + IPicture_get_CurDC(image->picture, &hdc); + + if(!hdc){ + hdc = CreateCompatibleDC(0); + IPicture_SelectPicture(image->picture, hdc, NULL, NULL); + } + + return GdipCreateFromHDC(hdc, graphics); +} + GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) { if(!image || !height) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 33d0e33..b190492 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -192,6 +192,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); +GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*);

1 0

Detlef Riekenberg : comdlg32/tests: Add simple tests for PrintDlgA.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: ef7a7794ca8b160ec1e51f6d5debc769b420d73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7a7794ca8b160ec1e51f6d5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 9 19:11:20 2007 +0200 comdlg32/tests: Add simple tests for PrintDlgA. --- dlls/comdlg32/tests/printdlg.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 227c61f..27b0390 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -34,6 +34,51 @@ #include "wine/test.h" +/* ######## */ + +static void test_PageSetupDlgA(void) +{ + LPPAGESETUPDLGA pDlg; + DWORD res; + + pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PAGESETUPDLGA)) * 2); + if (!pDlg) return; + + SetLastError(0xdeadbeef); + res = PageSetupDlgA(NULL); + ok( !res && (CommDlgExtendedError() == CDERR_INITIALIZATION), + "returned %u with %u and 0x%x (expected '0' and " + "CDERR_INITIALIZATION)\n", res, GetLastError(), CommDlgExtendedError()); + + ZeroMemory(pDlg, sizeof(PAGESETUPDLGA)); + pDlg->lStructSize = sizeof(PAGESETUPDLGA) -1; + SetLastError(0xdeadbeef); + res = PageSetupDlgA(pDlg); + ok( !res && (CommDlgExtendedError() == CDERR_STRUCTSIZE), + "returned %u with %u and 0x%x (expected '0' and " + "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); + + + ZeroMemory(pDlg, sizeof(PAGESETUPDLGA)); + pDlg->lStructSize = sizeof(PAGESETUPDLGA); + pDlg->Flags = PSD_RETURNDEFAULT; + SetLastError(0xdeadbeef); + res = PageSetupDlgA(pDlg); + ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), + "returned %u with %u and 0x%x (expected '!= 0' or '0' and " + "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); + + ok( pDlg->hDevMode && pDlg->hDevNames, + "got %p and %p (expected '!= NULL' for both)\n", + pDlg->hDevMode, pDlg->hDevNames); + + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + HeapFree(GetProcessHeap(), 0, pDlg); + +} + /* ##### */ static void test_PrintDlgA(void) @@ -78,6 +123,7 @@ static void test_PrintDlgA(void) START_TEST(printdlg) { + test_PageSetupDlgA(); test_PrintDlgA(); }

1 0

Chris Robinson : winex11: Don' t add spaces to the beginning of the wglExtensions list.
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

Module: wine Branch: master Commit: 7959be38503abe9b25740419482d3b3900cddef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7959be38503abe9b257404194… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 9 18:18:48 2007 -0700 winex11: Don't add spaces to the beginning of the wglExtensions list. --- dlls/winex11.drv/opengl.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0881198..7ee99b1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3003,7 +3003,8 @@ static BOOL glxRequireExtension(const char *requiredExtension) static void register_extension_string(const char *ext) { - strcat(WineGLInfo.wglExtensions, " "); + if (WineGLInfo.wglExtensions[0]) + strcat(WineGLInfo.wglExtensions, " "); strcat(WineGLInfo.wglExtensions, ext); TRACE("'%s'\n", ext); @@ -3016,10 +3017,7 @@ static BOOL register_extension(const WineGLExtension * ext) assert( WineGLExtensionListSize < MAX_EXTENSIONS ); WineGLExtensionList[WineGLExtensionListSize++] = ext; - strcat(WineGLInfo.wglExtensions, " "); - strcat(WineGLInfo.wglExtensions, ext->extName); - - TRACE("'%s'\n", ext->extName); + register_extension_string(ext->extName); for (i = 0; ext->extEntryPoints[i].funcName; ++i) TRACE(" - '%s'\n", ext->extEntryPoints[i].funcName);

1 0