[ros-diffs] [cwittich] 46317: [GDIPLUS] sync gdiplus with wine 1.1.41

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Mar 21 20:20:42 2010
New Revision: 46317

URL: http://svn.reactos.org/svn/reactos?rev=46317&view=rev
Log:
[GDIPLUS]
sync gdiplus with wine 1.1.41

Modified:
    trunk/reactos/dll/win32/gdiplus/brush.c
    trunk/reactos/dll/win32/gdiplus/image.c

Modified: trunk/reactos/dll/win32/gdiplus/brush.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?rev=46317&r1=46316&r2=46317&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Sun Mar 21 20:20:42 2010
@@ -865,7 +865,10 @@
 
     (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb);
     (*texture)->brush.bt = BrushTypeTextureFill;
-    (*texture)->wrap = imageattr->wrap;
+    if (imageattr)
+        (*texture)->wrap = imageattr->wrap;
+    else
+        (*texture)->wrap = WrapModeTile;
     (*texture)->image = new_image;
 
 exit:

Modified: trunk/reactos/dll/win32/gdiplus/image.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?rev=46317&r1=46316&r2=46317&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Mar 21 20:20:42 2010
@@ -2108,6 +2108,8 @@
     if(!(calls++))
         FIXME("not implemented\n");
 
+    memset(header, 0, sizeof(MetafileHeader));
+
     return Ok;
 }
 
@@ -2194,6 +2196,7 @@
     {NULL}
 };
 
+/* FIXME: Need to handle multi-framed images */
 GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image,
     GDIPCONST GUID* dimensionID, UINT* count)
 {
@@ -2201,13 +2204,15 @@
 
     TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count);
 
-    if(!image || !dimensionID || !count)
+    if(!image || !count)
         return InvalidParameter;
 
     if(!(calls++))
-        FIXME("not implemented\n");
-
-    return NotImplemented;
+        FIXME("returning frame count of 1\n");
+
+    *count = 1;
+
+    return Ok;
 }
 
 GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image,