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

Peter Dons Tychsen : x11drv: Fix the special case where windows have WS_CHILD and WS_POPUP.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: d0b21abe81f9722defc4fc0cb7ca596f7815a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b21abe81f9722defc4fc0cb… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Jul 25 04:09:50 2007 +0200 x11drv: Fix the special case where windows have WS_CHILD and WS_POPUP. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index be5d114..c571684 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -76,7 +76,7 @@ static inline BOOL is_window_managed( HWND hwnd ) if (ex_style & WS_EX_TRAYWINDOW) return TRUE; /* child windows are not managed */ style = GetWindowLongW( hwnd, GWL_STYLE ); - if (style & WS_CHILD) return FALSE; + if ((style & (WS_CHILD|WS_POPUP)) == WS_CHILD) return FALSE; /* windows with caption are managed */ if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; /* tool windows are not managed */

1 0

Matt Jones : server: Only commit SetThreadPriority if new priority is correct.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 6763742090f10d953f12d2e4a866f653f89ba529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6763742090f10d953f12d2e4a… Author: Matt Jones <mattj(a)google.com> Date: Tue Jul 24 13:23:56 2007 -0700 server: Only commit SetThreadPriority if new priority is correct. --- dlls/kernel32/tests/thread.c | 24 ++++++++++-------------- server/thread.c | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9ba9242..38692d4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -594,25 +594,21 @@ static VOID test_thread_priority(void) SetLastError(0xdeadbeef); rc = SetThreadPriority(curthread,min_priority-1); - todo_wine { - ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); - ok(GetThreadPriority(curthread)==min_priority, - "GetThreadPriority didn't return min_priority\n"); - } + ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetThreadPriority(curthread)==min_priority, + "GetThreadPriority didn't return min_priority\n"); SetThreadPriority(curthread,max_priority); SetLastError(0xdeadbeef); rc = SetThreadPriority(curthread,max_priority+1); - todo_wine { - ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); - ok(GetThreadPriority(curthread)==max_priority, - "GetThreadPriority didn't return max_priority\n"); - } + ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetThreadPriority(curthread)==max_priority, + "GetThreadPriority didn't return max_priority\n"); /* Check thread priority boost */ if (!pGetThreadPriorityBoost || !pSetThreadPriorityBoost) diff --git a/server/thread.c b/server/thread.c index 62d50b5..2ae78c9 100644 --- a/server/thread.c +++ b/server/thread.c @@ -383,12 +383,29 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } +#define THREAD_PRIORITY_REALTIME_HIGHEST 6 +#define THREAD_PRIORITY_REALTIME_LOWEST -7 + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) - thread->priority = req->priority; + { + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + if ((req->priority >= min && req->priority <= max) || + req->priority == THREAD_PRIORITY_IDLE || + req->priority == THREAD_PRIORITY_TIME_CRITICAL) + thread->priority = req->priority; + else + set_error( STATUS_INVALID_PARAMETER ); + } if (req->mask & SET_THREAD_INFO_AFFINITY) { if (req->affinity != 1) set_error( STATUS_INVALID_PARAMETER );

1 0

Evan Stade : gdiplus: Added GdipLoadImageFromStreamICM stub.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 875a56ec398a42dd9576ae93b8b753e2f7091bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875a56ec398a42dd9576ae93b… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:21 2007 -0700 gdiplus: Added GdipLoadImageFromStreamICM stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d21fd80..74ba047 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -419,7 +419,7 @@ @ stub GdipLoadImageFromFile @ stub GdipLoadImageFromFileICM @ stub GdipLoadImageFromStream -@ stub GdipLoadImageFromStreamICM +@ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges @ stub GdipMeasureDriverString @ stub GdipMeasureString diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2bb4396..f7c56a3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -16,8 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include "windef.h" +#include "winbase.h" #include "wingdi.h" +#include "objbase.h" + #include "gdiplus.h" #include "gdiplus_private.h" #include "wine/debug.h" @@ -128,3 +133,16 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, return NotImplemented; } + +GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) +{ + static int calls; + + if(!stream || !image) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Matt Jones : kernel32: Added test for bad arguments to SetThreadPriority, test for correct error value.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: f204ed1d192655d8443437266af937bd91fe11f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f204ed1d192655d8443437266… Author: Matt Jones <mattj(a)google.com> Date: Tue Jul 24 13:20:40 2007 -0700 kernel32: Added test for bad arguments to SetThreadPriority, test for correct error value. --- dlls/kernel32/tests/thread.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index bbda00e..9ba9242 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -588,6 +588,32 @@ static VOID test_thread_priority(void) "GetThreadPriority Failed\n"); ok(SetThreadPriority(curthread,0)!=0,"SetThreadPriority Failed\n"); +/* Check that the thread priority is not changed if SetThreadPriority + is called with a value outside of the max/min range */ + SetThreadPriority(curthread,min_priority); + SetLastError(0xdeadbeef); + rc = SetThreadPriority(curthread,min_priority-1); + + todo_wine { + ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetThreadPriority(curthread)==min_priority, + "GetThreadPriority didn't return min_priority\n"); + } + + SetThreadPriority(curthread,max_priority); + SetLastError(0xdeadbeef); + rc = SetThreadPriority(curthread,max_priority+1); + + todo_wine { + ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetThreadPriority(curthread)==max_priority, + "GetThreadPriority didn't return max_priority\n"); + } + /* Check thread priority boost */ if (!pGetThreadPriorityBoost || !pSetThreadPriorityBoost) return; /* Win9x */

1 0

Evan Stade : gdiplus: Added GdipDisposeImage stub.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: fba5a59b610c7b1aa658ce597e44ccb148223f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba5a59b610c7b1aa658ce597… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:18 2007 -0700 gdiplus: Added GdipDisposeImage 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 5d2c3bd..d21fd80 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -140,7 +140,7 @@ @ stub GdipDeletePrivateFontCollection @ stub GdipDeleteRegion @ stub GdipDeleteStringFormat -@ stub GdipDisposeImage +@ stdcall GdipDisposeImage(ptr) @ stub GdipDisposeImageAttributes @ stdcall GdipDrawArc(ptr ptr long long long long long long) @ stub GdipDrawArcI diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1ff0d49..2bb4396 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -24,6 +24,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) +{ + static int calls; + + if(!image) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bfa2c41..816f32d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -128,6 +128,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); +GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);

1 0

Evan Stade : gdiplus: Added GdipCreateMetafileFromWmf stub.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 021997fa636391f8b694cec76cba783b1b1b70f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021997fa636391f8b694cec76… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:15 2007 -0700 gdiplus: Added GdipCreateMetafileFromWmf stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 14 +++++++++++++ include/Makefile.in | 1 + include/gdiplus.h | 2 + include/gdiplusflat.h | 2 + include/gdiplusmetaheader.h | 44 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 52179ec..5d2c3bd 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -102,7 +102,7 @@ @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) @ stub GdipCreateMetafileFromFile @ stub GdipCreateMetafileFromStream -@ stub GdipCreateMetafileFromWmf +@ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stub GdipCreateMetafileFromWmfFile @ stub GdipCreatePath2 @ stub GdipCreatePath2I diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a29d3a1..f53ea4c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -818,6 +818,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, return NotImplemented; } +GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, + GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) +{ + static int calls; + + if(!hwmf || !metafile || !placeable) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { if(!graphics) return InvalidParameter; diff --git a/include/Makefile.in b/include/Makefile.in index 782e671..44ef893 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -169,6 +169,7 @@ SRCDIR_INCLUDES = \ gdiplusgpstubs.h \ gdiplusinit.h \ gdiplusmem.h \ + gdiplusmetaheader.h \ gdipluspixelformats.h \ gdiplustypes.h \ guiddef.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index e5da625..6b42093 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -32,6 +32,7 @@ namespace Gdiplus #include "gdiplusenums.h" #include "gdiplusinit.h" #include "gdipluspixelformats.h" +#include "gdiplusmetaheader.h" #include "gdiplusgpstubs.h" namespace DllExports @@ -48,6 +49,7 @@ namespace Gdiplus #include "gdiplusenums.h" #include "gdiplusinit.h" #include "gdipluspixelformats.h" +#include "gdiplusmetaheader.h" #include "gdiplusgpstubs.h" #include "gdiplusflat.h" diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2df7b7c..bfa2c41 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -47,6 +47,8 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**); +GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL, + GDIPCONST WmfPlaceableFileHeader*,GpMetafile**); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, diff --git a/include/gdiplusmetaheader.h b/include/gdiplusmetaheader.h new file mode 100644 index 0000000..2b4adf6 --- /dev/null +++ b/include/gdiplusmetaheader.h @@ -0,0 +1,44 @@ +/* + * 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 _GDIPLUSMETAHEADER_H +#define _GDIPLUSMETAHEADER_H + +#include <pshpack2.h> + +typedef struct +{ + INT16 Left; + INT16 Top; + INT16 Right; + INT16 Bottom; +} PWMFRect16; + +typedef struct +{ + UINT32 Key; + INT16 Hmf; + PWMFRect16 BoundingBox; + INT16 Inch; + UINT32 Reserved; + INT16 Checksum; +} WmfPlaceableFileHeader; + +#include <poppack.h> + +#endif /* _GDIPLUSMETAHEADER_H */

1 0

Evan Stade : gdiplus: Added GdipGetImageType stub.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 8770b6e8215d98fd0eb31189d639dc8044e3b621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8770b6e8215d98fd0eb31189d… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:12 2007 -0700 gdiplus: Added GdipGetImageType stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 13 +++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 1 + 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fa0560e..52179ec 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -280,7 +280,7 @@ @ stub GdipGetImagePixelFormat @ stdcall GdipGetImageRawFormat(ptr ptr) @ stub GdipGetImageThumbnail -@ stub GdipGetImageType +@ stdcall GdipGetImageType(ptr ptr) @ stdcall GdipGetImageVerticalResolution(ptr ptr) @ stdcall GdipGetImageWidth(ptr ptr) @ stdcall GdipGetInterpolationMode(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 465ba0d..1ff0d49 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -63,6 +63,19 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) +{ + static int calls; + + if(!image || !type) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res) { static int calls; diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index eb807ce..ac9de4b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -157,6 +157,13 @@ enum MatrixOrder MatrixOrderAppend = 1 }; +enum ImageType +{ + ImageTypeUnknown, + ImageTypeBitmap, + ImageTypeMetafile +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -173,6 +180,7 @@ typedef enum PixelOffsetMode PixelOffsetMode; typedef enum DashCap DashCap; typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; +typedef enum ImageType ImageType; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5614fa0..2df7b7c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -129,6 +129,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); +GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*);

1 0

Evan Stade : gdiplus: Image getter stubs.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 45c24bbef3e914aaf4ffae5baef896fa2c0db311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c24bbef3e914aaf4ffae5ba… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:02 2007 -0700 gdiplus: Image getter stubs. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 12 +++--- dlls/gdiplus/image.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 7 +++ 4 files changed, 118 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index c47b6a6..dc4e2e0 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ gdiplus.c \ graphics.c \ graphicspath.c \ + image.c \ matrix.c \ pathiterator.c \ pen.c diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5481670..fa0560e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -273,16 +273,16 @@ @ stub GdipGetImageEncodersSize @ stub GdipGetImageFlags @ stub GdipGetImageGraphicsContext -@ stub GdipGetImageHeight -@ stub GdipGetImageHorizontalResolution +@ stdcall GdipGetImageHeight(ptr ptr) +@ stdcall GdipGetImageHorizontalResolution(ptr ptr) @ stub GdipGetImagePalette @ stub GdipGetImagePaletteSize @ stub GdipGetImagePixelFormat -@ stub GdipGetImageRawFormat +@ stdcall GdipGetImageRawFormat(ptr ptr) @ stub GdipGetImageThumbnail @ stub GdipGetImageType -@ stub GdipGetImageVerticalResolution -@ stub GdipGetImageWidth +@ stdcall GdipGetImageVerticalResolution(ptr ptr) +@ stdcall GdipGetImageWidth(ptr ptr) @ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount @@ -389,7 +389,7 @@ @ stdcall GdipGetWorldTransform(ptr ptr) @ stub GdipGraphicsClear @ stub GdipImageForceValidation -@ stub GdipImageGetFrameCount +@ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stub GdipImageGetFrameDimensionsCount @ stub GdipImageGetFrameDimensionsList @ stub GdipImageRotateFlip diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c new file mode 100644 index 0000000..465ba0d --- /dev/null +++ b/dlls/gdiplus/image.c @@ -0,0 +1,104 @@ +/* + * 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 + */ + +#include "windef.h" +#include "wingdi.h" +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) +{ + static int calls; + + if(!image || !height) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) +{ + static int calls; + + if(!image || !res) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) +{ + static int calls; + + if(!image || !format) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res) +{ + static int calls; + + if(!image || !res) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) +{ + static int calls; + + if(!image || !width) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, + GDIPCONST GUID* dimensionID, UINT* count) +{ + static int calls; + + if(!image || !dimensionID || !count) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e493df5..5614fa0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -126,6 +126,13 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpCustomLineCap**); GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); +GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); +GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); +GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); +GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); + #ifdef __cplusplus } #endif

1 0

Evan Stade : gdiplus: Limit fixme output.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: b0acdb8389f9f52d89075d898d1ed342aa036dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0acdb8389f9f52d89075d898… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:09 2007 -0700 gdiplus: Limit fixme output. --- dlls/gdiplus/graphics.c | 10 ++++++++-- dlls/gdiplus/pen.c | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f024d7c..a29d3a1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1200,20 +1200,26 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) { + static int calls; + if(!graphics) return InvalidParameter; - FIXME("graphics state not implemented\n"); + if(!(calls++)) + FIXME("graphics state not implemented\n"); return NotImplemented; } GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) { + static int calls; + if(!graphics || !state) return InvalidParameter; - FIXME("graphics state not implemented\n"); + if(!(calls++)) + FIXME("graphics state not implemented\n"); return NotImplemented; } diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index b088ac9..3026d52 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static DWORD gdip_to_gdi_dash(GpDashStyle dash) { + static int calls; + switch(dash){ case DashStyleSolid: return PS_SOLID; @@ -41,7 +43,8 @@ static DWORD gdip_to_gdi_dash(GpDashStyle dash) case DashStyleDashDotDot: return PS_DASHDOTDOT; case DashStyleCustom: - FIXME("DashStyleCustom not implemented\n"); + if(!(calls++)) + FIXME("DashStyleCustom not implemented\n"); return PS_SOLID; default: ERR("Not a member of GpDashStyle enumeration\n");

1 0

Evan Stade : gdiplus: Added GdipCreateMetafileFromEmf stub.
by Alexandre Julliard July 25, 2007

July 25, 2007

Module: wine Branch: master Commit: 5cc8c10e0e8930edbba5ec29603a1a17d02131b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc8c10e0e8930edbba5ec296… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 24 17:19:05 2007 -0700 gdiplus: Added GdipCreateMetafileFromEmf stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 4 ++++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 49732db..5481670 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -99,7 +99,7 @@ @ stub GdipCreateMatrix3 @ stub GdipCreateMatrix3I @ stdcall GdipCreateMatrix(ptr) -@ stub GdipCreateMetafileFromEmf +@ stdcall GdipCreateMetafileFromEmf(ptr long ptr) @ stub GdipCreateMetafileFromFile @ stub GdipCreateMetafileFromStream @ stub GdipCreateMetafileFromWmf diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c8f13e..f024d7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -804,6 +804,20 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) return Ok; } +GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, + GpMetafile **metafile) +{ + static int calls; + + if(!hemf || !metafile) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { if(!graphics) return InvalidParameter; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1143195..e493df5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -46,6 +46,7 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 70da065..9d57648 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -29,6 +29,8 @@ class GpPath {}; class GpMatrix {}; class GpPathIterator {}; class GpCustomLineCap {}; +class GpImage {}; +class GpMetafile : public GpImage {}; #else /* end of c++ declarations */ @@ -40,6 +42,8 @@ typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix; typedef struct GpPathIterator GpPathIterator; typedef struct GpCustomLineCap GpCustomLineCap; +typedef struct GpImage GpImage; +typedef struct GpMetafile GpMetafile; #endif /* end of c declarations */

1 0