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

Roderick Colenbrander : wgl: GetPixelFormat fix for offscreen formats.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 219269c0f1e2b5be78b88f490741be2f6123f361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219269c0f1e2b5be78b88f490… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 1 14:38:49 2007 +0200 wgl: GetPixelFormat fix for offscreen formats. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/opengl32/tests/Makefile.in | 13 +++ dlls/opengl32/tests/opengl.c | 211 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 20 ++++- programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 10 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=219269c0f1e2b5be78b88…

1 0

Roderick Colenbrander : wgl: SetPixelFormat should fail on the root window.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 323d9e428c02aa2f3ae5b637ae1f16fad27e431c URL: http://source.winehq.org/git/wine.git/?a=commit;h=323d9e428c02aa2f3ae5b637a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 1 15:58:51 2007 +0200 wgl: SetPixelFormat should fail on the root window. --- dlls/opengl32/tests/opengl.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 7 +++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ca2710c..17ca54a 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -151,6 +151,43 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } +static void test_setpixelformat(void) +{ + int res = 0; + int pf; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + HDC hdc = GetDC(0); + ok(hdc != 0, "GetDC(0) failed!\n"); + + /* This should pass even on the main device context */ + pf = ChoosePixelFormat(hdc, &pfd); + ok(pf != 0, "ChoosePixelFormat failed on main device context"); + + /* SetPixelFormat on the main device context 'X root window' should fail */ + res = SetPixelFormat(hdc, pf, &pfd); + ok(res == 0, "SetPixelFormat on main device context should fail\n"); +} + START_TEST(opengl) { HWND hwnd; @@ -198,6 +235,8 @@ START_TEST(opengl) ok(res, "wglMakeCurrent failed!\n"); init_functions(); + test_setpixelformat(); + wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 265e67f..b3cbeef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1298,6 +1298,13 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, return 0; } + /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ + if(get_glxdrawable(physDev) == root_window) + { + ERR("Invalid operation on root_window\n"); + return 0; + } + /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &value); if(!fmt) {

1 0

Maarten Lankhorst : dsound: Move resampling away from mixer thread.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 36e90546298e8c096926330dd75f4e373a415171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e90546298e8c096926330dd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 29 23:47:01 2007 +0200 dsound: Move resampling away from mixer thread. --- dlls/dsound/buffer.c | 125 ++++++---- dlls/dsound/dsound_private.h | 21 ++- dlls/dsound/mixer.c | 537 ++++++++++++++++++++++-------------------- dlls/dsound/primary.c | 13 +- dlls/dsound/sound3d.c | 4 +- 5 files changed, 390 insertions(+), 310 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36e90546298e8c0969263…

1 0

Evan Stade : gdiplus: Extend GdipDrawImagePointsRect.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 6e0c574fb9ad6f778730a3ae6f74b8d8cbe266af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0c574fb9ad6f778730a3ae6… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:16:23 2007 -0700 gdiplus: Extend GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 52d6c5f..7ba2d52 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1040,6 +1040,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { GpPointF ptf[3]; POINT pti[3]; + REAL dx, dy; TRACE("%p %p %p %d %f %f %f %f %d %p %p %p\n", graphics, image, points, count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, @@ -1048,20 +1049,33 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if(!graphics || !image || !points || !imageAttributes || count != 3) return InvalidParameter; - if(image->type != ImageTypeMetafile) - return NotImplemented; - if((points[0].X != points[2].X) || (points[0].Y != points[1].Y)) - return NotImplemented; - if(srcUnit != UnitInch) + if(srcUnit == UnitInch) + dx = dy = (REAL) INCH_HIMETRIC; + else if(srcUnit == UnitPixel){ + dx = ((REAL) INCH_HIMETRIC) / + ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSX)); + dy = ((REAL) INCH_HIMETRIC) / + ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSY)); + } + else return NotImplemented; memcpy(ptf, points, 3 * sizeof(GpPointF)); transform_and_round_points(graphics, pti, ptf, 3); + /* IPicture renders bitmaps with the y-axis reversed + * FIXME: flipping for unknown image type might not be correct. */ + if(image->type != ImageTypeMetafile){ + INT temp; + temp = pti[0].y; + pti[0].y = pti[2].y; + pti[2].y = temp; + } + if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, - srcx * INCH_HIMETRIC, srcy * INCH_HIMETRIC, - srcwidth * INCH_HIMETRIC, srcheight * INCH_HIMETRIC, + srcx * dx, srcy * dy, + srcwidth * dx, srcheight * dy, NULL) != S_OK){ if(callback) callback(callbackData);

1 0

Alexandre Julliard : configure: Add -m32 flag for C++ compiler too.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: e06016fae0a638d01cf2498bcdbddccbfeca981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06016fae0a638d01cf2498bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 1 12:13:41 2007 +0200 configure: Add -m32 flag for C++ compiler too. --- configure | 1 + configure.ac | 1 + tools/winegcc/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 14b4aa6..b590457 100755 --- a/configure +++ b/configure @@ -1967,6 +1967,7 @@ case $host in if test "x$enable_win64" != "xyes" then test -n "$CC" || CC="gcc -m32" + test -n "$CXX"|| CXX="g++ -m32" test -n "$LD" || LD="ld -m elf_i386" test -n "$AS" || AS="as --32" host_cpu="i386" diff --git a/configure.ac b/configure.ac index 9a1ec62..7f52da6 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ case $host in if test "x$enable_win64" != "xyes" then test -n "$CC" || CC="gcc -m32" + test -n "$CXX"|| CXX="g++ -m32" test -n "$LD" || LD="ld -m elf_i386" test -n "$AS" || AS="as --32" host_cpu="i386" diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index c2640e2..31c3a5b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -7,7 +7,7 @@ DEFS = \ -DAS="\"$(AS)\"" \ -DCC="\"$(CC)\"" \ -DCPP="\"@CPPBIN@\"" \ - -DCXX="\"$(CXX)\"" \ + -DCXX="\"@CXX@\"" \ -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\""

1 0

Marcus Meissner : kernel32/tests: Fixed size to MultiByteToWideChar.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 1ad6abfbbc9762442feee2bc092ca2f0a110a422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad6abfbbc9762442feee2bc0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Aug 1 08:13:07 2007 +0200 kernel32/tests: Fixed size to MultiByteToWideChar. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 417f4d4..054f034 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -171,7 +171,7 @@ static int strcmp_aw(LPCWSTR strw, const char *stra) WCHAR buf[1024]; if (!stra) return 1; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); return lstrcmpW(strw, buf); }

1 0

Evan Stade : gdiplus: Added GdipSetImageAttributesColorKeys stub.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: fcbb2111551ee668e88222721190c75dbe9144c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbb2111551ee668e88222721… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:16:16 2007 -0700 gdiplus: Added GdipSetImageAttributesColorKeys stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/gdiplus.h | 2 ++ include/gdipluscolormatrix.h | 39 +++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 6 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 68e9c16..e1878e9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -522,7 +522,7 @@ @ stub GdipSetEffectParameters @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground -@ stub GdipSetImageAttributesColorKeys +@ stdcall GdipSetImageAttributesColorKeys(ptr long long long) @ stub GdipSetImageAttributesColorMatrix @ stub GdipSetImageAttributesGamma @ stub GdipSetImageAttributesNoOp diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 29b8549..bfef8b3 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -48,6 +48,20 @@ GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) return Ok; } +GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, + ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) +{ + static int calls; + + if(!imageattr) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp) { diff --git a/include/Makefile.in b/include/Makefile.in index 05dc60e..9fb456a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -164,6 +164,7 @@ SRCDIR_INCLUDES = \ fci.h \ fdi.h \ gdiplus.h \ + gdipluscolormatrix.h \ gdiplusenums.h \ gdiplusflat.h \ gdiplusgpstubs.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index 1f4ae78..9e72f52 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -34,6 +34,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" namespace DllExports @@ -52,6 +53,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" #include "gdiplusflat.h" diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h new file mode 100644 index 0000000..893471c --- /dev/null +++ b/include/gdipluscolormatrix.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GDIPLUSCOLORMATRIX_H +#define _GDIPLUSCOLORMATRIX_H + +enum ColorAdjustType +{ + ColorAdjustTypeDefault, + ColorAdjustTypeBitmap, + ColorAdjustTypeBrush, + ColorAdjustTypePen, + ColorAdjustTypeText, + ColorAdjustTypeCount, + ColorAdjustTypeAny +}; + +#ifndef __cplusplus + +typedef enum ColorAdjustType ColorAdjustType; + +#endif /* end of c typedefs */ + +#endif /* _GDIPLUSCOLORMATRIX_H */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4f0d88d..e8b067d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -160,6 +160,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*, + ColorAdjustType,BOOL,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL);

1 0

Evan Stade : gdiplus: Track width and height of GpBitmaps.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 5cde960713de02e2864cadc7cadca2e95d37d84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cde960713de02e2864cadc7c… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:16:20 2007 -0700 gdiplus: Track width and height of GpBitmaps. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/image.c | 92 +++++++++++++++++++++++++++++++++------- 2 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 602ca2c..168f6ff 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -130,6 +130,8 @@ struct GpMetafile{ struct GpBitmap{ GpImage image; + INT width; + INT height; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d23d9bb..d649e03 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -36,6 +36,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); typedef void ImageItemData; +static INT ipicture_pixel_height(IPicture *pic) +{ + HDC hdcref; + OLE_YSIZE_HIMETRIC y; + + IPicture_get_Height(pic, &y); + + hdcref = GetDC(0); + + y = (UINT)(((REAL)y) * ((REAL)GetDeviceCaps(hdcref, LOGPIXELSY)) / + ((REAL)INCH_HIMETRIC)); + ReleaseDC(0, hdcref); + + return y; +} + +static INT ipicture_pixel_width(IPicture *pic) +{ + HDC hdcref; + OLE_XSIZE_HIMETRIC x; + + IPicture_get_Width(pic, &x); + + hdcref = GetDC(0); + + x = (UINT)(((REAL)x) * ((REAL)GetDeviceCaps(hdcref, LOGPIXELSX)) / + ((REAL)INCH_HIMETRIC)); + + ReleaseDC(0, hdcref); + + return x; +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { @@ -110,6 +143,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->width = width; + (*bitmap)->height = height; return Ok; } @@ -121,10 +156,14 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream, stat = GdipLoadImageFromStreamICM(stream, (GpImage**) bitmap); - if(stat == Ok) - (*bitmap)->image.type = ImageTypeBitmap; + if(stat != Ok) + return stat; + + (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); + (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); - return stat; + return Ok; } GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) @@ -155,25 +194,42 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, memcpy(srcRect, &((GpMetafile*)image)->bounds, sizeof(GpRectF)); *srcUnit = ((GpMetafile*)image)->unit; } + else if(image->type == ImageTypeBitmap){ + srcRect->X = srcRect->Y = 0.0; + srcRect->Width = (REAL) ((GpBitmap*)image)->width; + srcRect->Height = (REAL) ((GpBitmap*)image)->height; + *srcUnit = UnitPixel; + } else{ - FIXME("not implemented for bitmaps\n"); - return NotImplemented; + srcRect->X = srcRect->Y = 0.0; + srcRect->Width = ipicture_pixel_width(image->picture); + srcRect->Height = ipicture_pixel_height(image->picture); + *srcUnit = UnitPixel; } + TRACE("returning (%f, %f) (%f, %f) unit type %d\n", srcRect->X, srcRect->Y, + srcRect->Width, srcRect->Height, *srcUnit); + return Ok; } GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) { - static int calls; - if(!image || !height) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if(image->type == ImageTypeMetafile){ + FIXME("not implemented for metafiles\n"); + return NotImplemented; + } + else if(image->type == ImageTypeBitmap) + *height = ((GpBitmap*)image)->height; + else + *height = ipicture_pixel_height(image->picture); - return NotImplemented; + TRACE("returning %d\n", *height); + + return Ok; } GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) @@ -227,15 +283,21 @@ GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res) GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) { - static int calls; - if(!image || !width) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if(image->type == ImageTypeMetafile){ + FIXME("not implemented for metafiles\n"); + return NotImplemented; + } + else if(image->type == ImageTypeBitmap) + *width = ((GpBitmap*)image)->width; + else + *width = ipicture_pixel_width(image->picture); - return NotImplemented; + TRACE("returning %d\n", *width); + + return Ok; } GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile,

1 0

Evan Stade : gdiplus: Added GdipBitmapGetPixel stub.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 2b4b23cfa07f106747de74e1dc20387f0a9b19cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4b23cfa07f106747de74e1d… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:16:13 2007 -0700 gdiplus: Added GdipBitmapGetPixel stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 17 +++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5c4493c..68e9c16 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -40,7 +40,7 @@ @ stub GdipBitmapCreateApplyEffect @ stub GdipBitmapGetHistogram @ stub GdipBitmapGetHistogramSize -@ stub GdipBitmapGetPixel +@ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stub GdipBitmapLockBits @ stub GdipBitmapSetPixel @ stub GdipBitmapSetResolution diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bd11b2e..d23d9bb 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -36,6 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); typedef void ImageItemData; +GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, + ARGB *color) +{ + static int calls; + TRACE("%p %d %d %p\n", bitmap, x, y, color); + + if(!bitmap || !color) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + *color = 0xdeadbeef; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 122cbfa..4f0d88d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -138,6 +138,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); +GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**);

1 0

Evan Stade : gdiplus: Added GdipRemovePropertyItem stub.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 9a0405dc979e1ee9a971d4a0af1fd982bc2f4f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0405dc979e1ee9a971d4a0a… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:16:08 2007 -0700 gdiplus: Added GdipRemovePropertyItem stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 13 +++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fb14d56..5c4493c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -473,7 +473,7 @@ @ stub GdipRecordMetafileStream @ stub GdipRecordMetafileStreamI @ stub GdipReleaseDC -@ stub GdipRemovePropertyItem +@ stdcall GdipRemovePropertyItem(ptr long) @ stub GdipResetClip @ stub GdipResetImageAttributes @ stub GdipResetLineTransform diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1b986ae..bd11b2e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -287,6 +287,19 @@ GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) return Ok; } +GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) +{ + static int calls; + + if(!image) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 29ff401..122cbfa 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -153,6 +153,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**); +GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID); GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*);

1 0