Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59077: [RTL] Comparison is always true due to limited range of data type. Patch by Samuel Serapion. CORE-7178 #resolve #comment Committed in r59077.
by ekohl＠svn.reactos.org 24 May '13

24 May '13

Author: ekohl Date: Fri May 24 12:10:12 2013 New Revision: 59077 URL: http://svn.reactos.org/svn/reactos?rev=59077&view=rev Log: [RTL] Comparison is always true due to limited range of data type. Patch by Samuel Serapion. CORE-7178 #resolve #comment Committed in r59077. Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=59077&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Fri May 24 12:10:12 2013 @@ -308,9 +308,6 @@ } else { - /* Fail if ResourceName2 is an ID */ - if (Entry->Id <= USHRT_MAX) return -1; - /* Get the resource string */ ResourceString = (PIMAGE_RESOURCE_DIR_STRING_U)(ResourceData + Entry->NameOffset);

1 0

[ekohl] 59076: [RTL] Comparison is always true due to limited range of data type. Patch by Samuel Serapion. CORE-7177 #resolve #comment Committed in r59076.
by ekohl＠svn.reactos.org 24 May '13

24 May '13

Author: ekohl Date: Fri May 24 09:50:49 2013 New Revision: 59076 URL: http://svn.reactos.org/svn/reactos?rev=59076&view=rev Log: [RTL] Comparison is always true due to limited range of data type. Patch by Samuel Serapion. CORE-7177 #resolve #comment Committed in r59076. Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=59076&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Fri May 24 09:50:49 2013 @@ -889,8 +889,7 @@ } /* Check what kind of ACE this is */ - if ((Ace->AceType >= ACCESS_MIN_MS_ACE_TYPE) || - (Ace->AceType <= ACCESS_MAX_MS_V2_ACE_TYPE)) + if (Ace->AceType <= ACCESS_MAX_MS_V2_ACE_TYPE) { /* Validate the length of this ACE */ if (ROUND_DOWN(Ace->AceSize, sizeof(ULONG)) != Ace->AceSize) @@ -932,7 +931,7 @@ { DPRINT1("Unsupported ACE in ReactOS, assuming valid\n"); } - else if ((Ace->AceType >= ACCESS_MIN_MS_OBJECT_ACE_TYPE) || + else if ((Ace->AceType >= ACCESS_MIN_MS_OBJECT_ACE_TYPE) && (Ace->AceType <= ACCESS_MAX_MS_OBJECT_ACE_TYPE)) { DPRINT1("Unsupported ACE in ReactOS, assuming valid\n");

1 0

[ekohl] 59075: [NTOSKRNL] SeValidSecurityDescriptor does not correctly check for invalid DACL revision numbers. Patch by Samuel Serapion. CORE-7209 #resolve #comment Committed in r59075.
by ekohl＠svn.reactos.org 24 May '13

24 May '13

Author: ekohl Date: Fri May 24 09:07:46 2013 New Revision: 59075 URL: http://svn.reactos.org/svn/reactos?rev=59075&view=rev Log: [NTOSKRNL] SeValidSecurityDescriptor does not correctly check for invalid DACL revision numbers. Patch by Samuel Serapion. CORE-7209 #resolve #comment Committed in r59075. Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=59075… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Fri May 24 09:07:46 2013 @@ -1088,7 +1088,7 @@ } Acl = (PACL)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Dacl); - if ((Acl->AclRevision < MIN_ACL_REVISION) && + if ((Acl->AclRevision < MIN_ACL_REVISION) || (Acl->AclRevision > MAX_ACL_REVISION)) { DPRINT1("Invalid DACL revision\n");

1 0

[akhaldi] 59074: [GDIPLUS_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 23 May '13

23 May '13

Author: akhaldi Date: Thu May 23 17:23:10 2013 New Revision: 59074 URL: http://svn.reactos.org/svn/reactos?rev=59074&view=rev Log: [GDIPLUS_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/gdiplus/brush.c trunk/rostests/winetests/gdiplus/customlinecap.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/matrix.c trunk/rostests/winetests/gdiplus/metafile.c trunk/rostests/winetests/gdiplus/pathiterator.c trunk/rostests/winetests/gdiplus/pen.c trunk/rostests/winetests/gdiplus/region.c trunk/rostests/winetests/gdiplus/stringformat.c trunk/rostests/winetests/gdiplus/testlist.c Modified: trunk/rostests/winetests/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/brush.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/brush.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/customl… ============================================================================== --- trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(got == expected, "Expected %.2f, got %.2f\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -21,9 +21,16 @@ #include <math.h> -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <winnls.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %d\n", (expected), (got)) Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -22,10 +22,15 @@ #include <math.h> #include <assert.h> -#include "windows.h" -#include "gdiplus.h" -#include "wingdi.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) @@ -3056,7 +3061,7 @@ expect(3, linesfilled); /* Cut off everything including the first space. */ - rc.Width = char_bounds.Width + char_width * 1.5; + rc.Width = char_bounds.Width + char_width * 1.7; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); @@ -3068,14 +3073,14 @@ expect(3, linesfilled); /* Cut off everything after the first character. */ - rc.Width = char_bounds.Width + char_width * 0.5; + rc.Width = char_bounds.Width + char_width * 0.8; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(char_bounds.Width, bounds.Width, 0.01); - todo_wine expectf_(char_bounds.Height + char_height * 3, bounds.Height, 0.05); + expectf_(char_bounds.Height + char_height * 3, bounds.Height, 0.05); expect(6, codepointsfitted); todo_wine expect(4, linesfilled); @@ -3911,15 +3916,22 @@ static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; + CharacterRange range; + GpRegion *region; GpGraphics *graphics; GpFontFamily *family; GpFont *font; GpStatus status; RectF bounds, rect; REAL width, height, width_1, width_2; + REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); + expect(Ok, status); + expect(Ok, status); + + status = GdipCreateRegion(&region); expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); @@ -3930,6 +3942,9 @@ status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); expect(Ok, status); + + margin_x = 20.0 / 6.0; + margin_y = 20.0 / 8.0; set_rect_empty(&rect); set_rect_empty(&bounds); @@ -3937,6 +3952,8 @@ expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); width = bounds.Width; height = bounds.Height; @@ -3947,16 +3964,139 @@ expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf(width, bounds.Width); todo_wine expectf(height / 2.0, bounds.Height); + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + range.First = 0; + range.Length = 1; + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, 1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(margin_x, bounds.X, 1.0); + expectf(0.0, bounds.Y); + ok(bounds.Width < width_rgn / 2.0, "width of 1 glyph is wrong\n"); + expectf(height_rgn, bounds.Height); + width_1 = bounds.Width; + + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf(width_rgn, bounds.Width); + expectf(height_rgn, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width_1, bounds.Width, 1.0); + expectf(height_rgn, bounds.Height); + + set_rect_empty(&rect); + rect.Height = height / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); +todo_wine + expectf(height, bounds.Height); + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); expectf(height, bounds.Height); width_1 = bounds.Width; @@ -3967,6 +4107,8 @@ expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width, "width of 2 glyphs is wrong\n"); ok(bounds.Width > width_1, "width of 2 glyphs is wrong\n"); expectf(height, bounds.Height); @@ -3979,6 +4121,8 @@ expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3990,6 +4134,8 @@ expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4001,9 +4147,180 @@ expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + /* Default (Near) alignment */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(5.0, bounds.X); + expectf(5.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + /* Center alignment */ + GdipSetStringFormatAlign(format, StringAlignmentCenter); + GdipSetStringFormatLineAlign(format, StringAlignmentCenter); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 + width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 + height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 - height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + /* Far alignment */ + GdipSetStringFormatAlign(format, StringAlignmentFar); + GdipSetStringFormatLineAlign(format, StringAlignmentFar); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 + width, bounds.X, 0.01); +todo_wine + expectf(5.0 + height, bounds.Y); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width, bounds.X, 0.01); +todo_wine + expectf(5.0 - height, bounds.Y); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 + height_rgn, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 - height_rgn, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4012,6 +4329,7 @@ DeleteDC(hdc); GdipDeleteFontFamily(family); + GdipDeleteRegion(region); GdipDeleteStringFormat(format); } @@ -4140,6 +4458,58 @@ DeleteObject(hbm); DeleteDC(hdc); +} + +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); } START_TEST(graphics) @@ -4211,6 +4581,7 @@ test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphicspath.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -25,10 +25,17 @@ #include <assert.h> #include <stdio.h> -#include "initguid.h" -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#include <initguid.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <winnls.h> +#include <ole2.h> +#include <gdiplus.h> #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -3106,8 +3113,11 @@ PropertyItem *prop_item; image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipImageGetFrameDimensionsCount(image, &dim_count); expect(Ok, status); @@ -3361,8 +3371,11 @@ /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipGetImagePixelFormat(image, &format); expect(Ok, status); @@ -4108,6 +4121,76 @@ GdipDisposeImage(image); } +static void test_ARGB_conversion(void) +{ + BYTE argb[8] = { 0x11,0x22,0x33,0x80, 0xff,0xff,0xff,0 }; + BYTE pargb[8] = { 0x09,0x11,0x1a,0x80, 0,0,0,0 }; + BYTE rgb32_xp[8] = { 0x11,0x22,0x33,0xff, 0xff,0xff,0xff,0xff }; + BYTE rgb24[6] = { 0x11,0x22,0x33, 0xff,0xff,0xff }; + BYTE *bits; + GpBitmap *bitmap; + BitmapData data; + GpStatus status; + int match; + + status = GdipCreateBitmapFromScan0(2, 1, 8, PixelFormat32bppARGB, argb, &bitmap); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppPARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, pargb, sizeof(pargb)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppPARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppRGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppRGB, "expected PixelFormat32bppRGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, argb, sizeof(argb)) || + !memcmp(data.Scan0, rgb32_xp, sizeof(rgb32_xp)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppRGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat24bppRGB, "expected PixelFormat24bppRGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, rgb24, sizeof(rgb24)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat24bppRGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4120,6 +4203,7 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_ARGB_conversion(); test_DrawImage_scale(); test_image_format(); test_DrawImage(); Modified: trunk/rostests/winetests/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/matrix.… ============================================================================== --- trunk/rostests/winetests/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/matrix.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -20,10 +20,16 @@ #include <math.h> -#include "windows.h" -#include <stdio.h> -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> +#include <wine/test.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/metafil… ============================================================================== --- trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,10 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include <stdio.h> -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pathite… ============================================================================== --- trunk/rostests/winetests/gdiplus/pathiterator.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pathiterator.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… ============================================================================== --- trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -20,9 +20,15 @@ #include <math.h> -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(got - expected) < 0.1, "Expected %.2f, got %.2f\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,10 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wingdi.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #include <math.h> #define RGNDATA_RECT 0x10000000 Modified: trunk/rostests/winetests/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/stringf… ============================================================================== --- trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/stringformat.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -18,9 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" -#include "gdiplus.h" -#include "wine/test.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include "windows.h" +#include <wine/test.h> +#include <wingdi.h> +#include <objbase.h> +#include <gdiplus.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(got == expected, "Expected %.2f, got %.2f\n", expected, got) Modified: trunk/rostests/winetests/gdiplus/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/testlis… ============================================================================== --- trunk/rostests/winetests/gdiplus/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/testlist.c [iso-8859-1] Thu May 23 17:23:10 2013 @@ -1,7 +1,4 @@ /* Automatically generated file; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> #define STANDALONE #include "wine/test.h"

1 0

[akhaldi] 59073: [GDIPLUS] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 23 May '13

23 May '13

Author: akhaldi Date: Thu May 23 17:23:00 2013 New Revision: 59073 URL: http://svn.reactos.org/svn/reactos?rev=59073&view=rev Log: [GDIPLUS] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -973,7 +973,7 @@ { TRACE("(%p, %p)\n", brush, wrapmode); - if(!brush || !wrapmode) + if(!brush || !wrapmode || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; *wrapmode = brush->wrap; @@ -986,7 +986,7 @@ { TRACE("(%p, %p, %p, %d)\n", brush, blend, positions, count); - if(!brush || !blend || !positions || count <= 0) + if(!brush || !blend || !positions || count <= 0 || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; if(count < brush->blendcount) @@ -1004,7 +1004,7 @@ { TRACE("(%p, %p)\n", brush, count); - if(!brush || !count) + if(!brush || !count || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; *count = brush->blendcount; @@ -1017,7 +1017,7 @@ { TRACE("(%p, %p)\n", grad, point); - if(!grad || !point) + if(!grad || !point || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; point->X = grad->center.X; @@ -1052,7 +1052,7 @@ { TRACE("(%p,%p)\n", grad, colors); - if (!grad || !colors) + if (!grad || !colors || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; *colors = grad->centercolor; @@ -1065,7 +1065,7 @@ { TRACE("(%p, %p, %p)\n", grad, x, y); - if(!grad || !x || !y) + if(!grad || !x || !y || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; *x = grad->focus.X; @@ -1079,7 +1079,7 @@ { TRACE("(%p, %p)\n", grad, gamma); - if(!grad || !gamma) + if(!grad || !gamma || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; *gamma = grad->gamma; @@ -1104,7 +1104,7 @@ { TRACE("(%p, %p)\n", grad, count); - if(!grad || !count) + if(!grad || !count || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; *count = grad->path->pathdata.Count; @@ -1118,7 +1118,7 @@ TRACE("(%p, %p)\n", brush, rect); - if(!brush || !rect) + if(!brush || !rect || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; stat = GdipGetPathWorldBounds(brush->path, rect, NULL, NULL); @@ -1154,7 +1154,7 @@ TRACE("(%p,%p,%p)\n", grad, argb, count); - if(!grad || !argb || !count || (*count < grad->path->pathdata.Count)) + if(!grad || !argb || !count || (*count < grad->path->pathdata.Count) || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; for (i=0; i<grad->path->pathdata.Count; i++) @@ -1174,7 +1174,7 @@ { TRACE("(%p, %p)\n", brush, count); - if (!brush || !count) + if (!brush || !count || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; /* Yes, this actually returns the number of points in the path (which is the @@ -1191,7 +1191,7 @@ { TRACE("(%p, %p)\n", brush, wrapmode); - if(!brush || !wrapmode) + if(!brush || !wrapmode || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; *wrapmode = brush->wrap; @@ -1302,7 +1302,7 @@ TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); - if(!brush || !factors || !positions || count <= 0 || + if(!brush || !factors || !positions || count <= 0 || brush->brush.bt != BrushTypeLinearGradient || (count >= 2 && (positions[0] != 0.0f || positions[count-1] != 1.0f))) return InvalidParameter; @@ -1334,7 +1334,7 @@ { TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); - if (!brush || !factors || !positions || count <= 0) + if (!brush || !factors || !positions || count <= 0 || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; if (count < brush->blendcount) @@ -1350,7 +1350,7 @@ { TRACE("(%p, %p)\n", brush, count); - if (!brush || !count) + if (!brush || !count || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; *count = brush->blendcount; @@ -1363,7 +1363,7 @@ { TRACE("(%p, %d)\n", line, usegamma); - if(!line) + if(!line || line->brush.bt != BrushTypeLinearGradient) return InvalidParameter; line->gamma = usegamma; @@ -1385,7 +1385,7 @@ TRACE("(%p, %0.2f, %0.2f)\n", line, focus, scale); - if(!line || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) + if(!line || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0 || line->brush.bt != BrushTypeLinearGradient) return InvalidParameter; /* we want 2 standard deviations */ @@ -1432,7 +1432,7 @@ { TRACE("(%p, %d)\n", line, wrap); - if(!line || wrap == WrapModeClamp) + if(!line || wrap == WrapModeClamp || line->brush.bt != BrushTypeLinearGradient) return InvalidParameter; line->wrap = wrap; @@ -1447,7 +1447,7 @@ TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); - if(!brush || !blend || !pos || count <= 0 || + if(!brush || !blend || !pos || count <= 0 || brush->brush.bt != BrushTypePathGradient || (count >= 2 && (pos[0] != 0.0f || pos[count-1] != 1.0f))) return InvalidParameter; @@ -1483,7 +1483,8 @@ TRACE("(%p,%0.2f,%0.2f)\n", brush, focus, scale); - if (!brush) return InvalidParameter; + if (!brush || brush->brush.bt != BrushTypePathGradient) + return InvalidParameter; if (focus != 0.0) { @@ -1513,7 +1514,7 @@ REAL *new_pos; TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); - if (!brush || !blend || !pos || count < 2 || + if (!brush || !blend || !pos || count < 2 || brush->brush.bt != BrushTypePathGradient || pos[0] != 0.0f || pos[count-1] != 1.0f) { return InvalidParameter; @@ -1549,7 +1550,7 @@ if (count < 0) return OutOfMemory; - if (!brush || !blend || !pos || count < 2) + if (!brush || !blend || !pos || count < 2 || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; if (brush->pblendcount == 0) @@ -1573,7 +1574,7 @@ { TRACE("(%p,%p)\n", brush, count); - if (!brush || !count) + if (!brush || !count || brush->brush.bt != BrushTypePathGradient) return InvalidParameter; *count = brush->pblendcount; @@ -1586,7 +1587,7 @@ { TRACE("(%p, %x)\n", grad, argb); - if(!grad) + if(!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->centercolor = argb; @@ -1598,7 +1599,7 @@ { TRACE("(%p, %s)\n", grad, debugstr_pointf(point)); - if(!grad || !point) + if(!grad || !point || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->center.X = point->X; @@ -1628,7 +1629,7 @@ { TRACE("(%p, %.2f, %.2f)\n", grad, x, y); - if(!grad) + if(!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->focus.X = x; @@ -1642,7 +1643,7 @@ { TRACE("(%p, %d)\n", grad, gamma); - if(!grad) + if(!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->gamma = gamma; @@ -1664,7 +1665,7 @@ TRACE("(%p,%0.2f,%0.2f)\n", grad, focus, scale); - if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) + if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0 || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; /* we want 2 standard deviations */ @@ -1714,7 +1715,7 @@ TRACE("(%p,%p,%p)\n", grad, argb, count); - if(!grad || !argb || !count || (*count <= 0) || + if(!grad || !argb || !count || (*count <= 0) || grad->brush.bt != BrushTypePathGradient || (*count > grad->path->pathdata.Count)) return InvalidParameter; @@ -1750,7 +1751,7 @@ { TRACE("(%p, %d)\n", grad, wrap); - if(!grad) + if(!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->wrap = wrap; @@ -1763,7 +1764,7 @@ { TRACE("(%p,%p)\n", grad, matrix); - if (!grad || !matrix) + if (!grad || !matrix || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; grad->transform = *matrix; @@ -1776,7 +1777,7 @@ { TRACE("(%p,%p)\n", grad, matrix); - if (!grad || !matrix) + if (!grad || !matrix || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; *matrix = grad->transform; @@ -1789,7 +1790,7 @@ { TRACE("(%p,%p,%i)\n", grad, matrix, order); - if (!grad) + if (!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; return GdipMultiplyMatrix(&grad->transform, matrix, order); @@ -1799,7 +1800,7 @@ { TRACE("(%p)\n", grad); - if (!grad) + if (!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; return GdipSetMatrixElements(&grad->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); @@ -1810,7 +1811,7 @@ { TRACE("(%p,%0.2f,%i)\n", grad, angle, order); - if (!grad) + if (!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; return GdipRotateMatrix(&grad->transform, angle, order); @@ -1821,7 +1822,7 @@ { TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, sx, sy, order); - if (!grad) + if (!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; return GdipScaleMatrix(&grad->transform, sx, sy, order); @@ -1832,7 +1833,7 @@ { TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, dx, dy, order); - if (!grad) + if (!grad || grad->brush.bt != BrushTypePathGradient) return InvalidParameter; return GdipTranslateMatrix(&grad->transform, dx, dy, order); @@ -1887,7 +1888,7 @@ { TRACE("(%p, %x, %x)\n", brush, color1, color2); - if(!brush) + if(!brush || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; brush->startcolor = color1; @@ -1900,7 +1901,7 @@ { TRACE("(%p, %p)\n", brush, colors); - if(!brush || !colors) + if(!brush || !colors || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; colors[0] = brush->startcolor; @@ -1962,7 +1963,7 @@ REAL *new_pos; TRACE("(%p,%p,%p,%i)\n", brush, blend, positions, count); - if (!brush || !blend || !positions || count < 2 || + if (!brush || !blend || !positions || count < 2 || brush->brush.bt != BrushTypeLinearGradient || positions[0] != 0.0f || positions[count-1] != 1.0f) { return InvalidParameter; @@ -1993,7 +1994,7 @@ GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient *brush, ARGB *blend, REAL* positions, INT count) { - if (!brush || !blend || !positions || count < 2) + if (!brush || !blend || !positions || count < 2 || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; if (brush->pblendcount == 0) @@ -2011,7 +2012,7 @@ GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient *brush, INT *count) { - if (!brush || !count) + if (!brush || !count || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; *count = brush->pblendcount; @@ -2113,7 +2114,7 @@ { TRACE("(%p, %p)\n", brush, rect); - if(!brush || !rect) + if(!brush || !rect || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; *rect = brush->rect; @@ -2150,7 +2151,7 @@ TRACE("(%p,%0.2f,%u)\n", brush, angle, order); - if(!brush) + if(!brush || brush->brush.bt != BrushTypeLinearGradient) return InvalidParameter; if(!(calls++)) Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -979,12 +979,12 @@ *IsStyleAvailable = FALSE; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); if(!EnumFontFamiliesW(hdc, family->FamilyName, font_has_style_proc, (LPARAM)style)) *IsStyleAvailable = TRUE; - ReleaseDC(0, hdc); + DeleteDC(hdc); return Ok; } @@ -1276,7 +1276,7 @@ HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lstrcpyW(lfw.lfFaceName, name); @@ -1288,7 +1288,7 @@ return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } return Ok; } @@ -1403,7 +1403,7 @@ HDC hdc; LOGFONTW lfw; - hdc = GetDC(0); + hdc = CreateCompatibleDC(0); lfw.lfCharSet = DEFAULT_CHARSET; lfw.lfFaceName[0] = 0; @@ -1416,7 +1416,7 @@ return OutOfMemory; } - ReleaseDC(0, hdc); + DeleteDC(hdc); } *fontCollection = &installedFontCollection; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -442,9 +442,9 @@ for (x=0; x<width; x++) { BYTE alpha=src[3]; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; *dst++ = *src++; } } Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Thu May 23 17:23:00 2013 @@ -187,7 +187,7 @@ 187 stdcall GdipDrawRectangleI(ptr ptr long long long long) 188 stdcall GdipDrawRectangles(ptr ptr ptr long) 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) -190 stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) +190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) 193 stub GdipEnumerateMetafileDestPoint Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Thu May 23 17:23:00 2013 @@ -158,6 +158,7 @@ BOOL owndc; BOOL alpha_hdc; GpImage *image; + ImageType image_type; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; @@ -445,7 +446,7 @@ GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -68,18 +68,6 @@ GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix); -/* Converts angle (in degrees) to x/y coordinates */ -static void deg2xy(REAL angle, REAL x_0, REAL y_0, REAL *x, REAL *y) -{ - REAL radAngle, hypotenuse; - - radAngle = deg2rad(angle); - hypotenuse = 50.0; /* arbitrary */ - - *x = x_0 + cos(radAngle) * hypotenuse; - *y = y_0 + sin(radAngle) * hypotenuse; -} - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -378,7 +366,7 @@ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); + return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */ @@ -427,8 +415,11 @@ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + memcpy(temp_bits, src, src_width * src_height * 4); + else + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, @@ -446,7 +437,8 @@ if (graphics->image && graphics->image->type == ImageTypeBitmap) { - int i, size; + DWORD i; + int size; RGNDATA *rgndata; RECT *rects; HRGN hrgn, visible_rgn; @@ -659,7 +651,8 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { - UINT x, y, i; + UINT x, y; + INT i; if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) @@ -1471,27 +1464,6 @@ } } -/* GdipDrawPie/GdipFillPie helper function */ -static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, - REAL height, REAL startAngle, REAL sweepAngle) -{ - GpPointF ptf[4]; - POINT pti[4]; - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - deg2xy(startAngle+sweepAngle, x + width / 2.0, y + width / 2.0, &ptf[2].X, &ptf[2].Y); - deg2xy(startAngle, x + width / 2.0, y + width / 2.0, &ptf[3].X, &ptf[3].Y); - - transform_and_round_points(graphics, pti, ptf, 4); - - Pie(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y, pti[2].x, - pti[2].y, pti[3].x, pti[3].y); -} - /* Draws the linecap the specified color and size on the hdc. The linecap is in * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. Probably * should not be called on an hdc that has a path you care about. */ @@ -1728,63 +1700,6 @@ shorten_line_percent(x1, y1, x2, y2, percent); } -/* Draws lines between the given points, and if caps is true then draws an endcap - * at the end of the last line. */ -static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti = NULL; - GpPointF *ptcopy = NULL; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, pen->width); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, - pen->customend->inset * pen->width); - - if(pen->startcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, pen->width); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, - pen->customstart->inset * pen->width); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - if(Polyline(graphics->hdc, pti, count)) - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Conducts a linear search to find the bezier points that will back off * the endpoint of the curve by a distance of amt. Linear search works * better than binary in this case because there are multiple solutions, @@ -1826,66 +1741,6 @@ diff = sqrt(dx * dx + dy * dy); percent += 0.0005 * amt; } -} - -/* Draws bezier curves between given points, and if caps is true then draws an - * endcap at the end of the last line. */ -static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti; - GpPointF *ptcopy; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_bezier_amt(&ptcopy[count-4], pen->width * pen->customend->inset, - FALSE); - - if(pen->startcap == LineCapArrowAnchor) - shorten_bezier_amt(ptcopy, pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_bezier_amt(ptcopy, pen->width * pen->customstart->inset, TRUE); - - /* the direction of the line cap is parallel to the direction at the - * end of the bezier (which, if it has been shortened, is not the same - * as the direction from pt[count-2] to pt[count-1]) */ - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), - pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), - pt[count - 1].X, pt[count - 1].Y); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[0].X - (ptcopy[0].X - ptcopy[1].X), - pt[0].Y - (ptcopy[0].Y - ptcopy[1].Y), pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - PolyBezier(graphics->hdc, pti, count); - - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; } /* Draws a combination of bezier curves and lines between points. */ @@ -2291,10 +2146,8 @@ TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); - if(hDevice != NULL) { + if(hDevice != NULL) FIXME("Don't know how to handle parameter hDevice\n"); - return NotImplemented; - } if(hdc == NULL) return OutOfMemory; @@ -2359,6 +2212,9 @@ (*graphics)->hwnd = NULL; (*graphics)->owndc = FALSE; (*graphics)->image = image; + /* We have to store the image type here because the image may be freed + * before GdipDeleteGraphics is called, and metafiles need special treatment. */ + (*graphics)->image_type = image->type; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeBilinear; @@ -2553,7 +2409,7 @@ if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (graphics->image && graphics->image->type == ImageTypeMetafile) + if (graphics->image && graphics->image_type == ImageTypeMetafile) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); if (stat != Ok) @@ -2577,9 +2433,8 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -2590,21 +2445,15 @@ if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); - - restore_dc(graphics, save_state); - - return retval; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathArc(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, @@ -2619,9 +2468,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT save_state; GpPointF pt[4]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); @@ -2631,12 +2478,6 @@ if(graphics->busy) return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } pt[0].X = x1; pt[0].Y = y1; @@ -2646,81 +2487,41 @@ pt[2].Y = y3; pt[3].X = x4; pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBeziers(graphics, pen, pt, 4); } GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - INT save_state; - GpPointF pt[4]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); - if(!graphics || !pen) + return GdipDrawBezier(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2, (REAL)x3, (REAL)y3, (REAL)x4, (REAL)y4); +} + +GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count) +{ + GpStatus status; + GpPath *path; + + TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); + + if(!graphics || !pen || !points || (count <= 0)) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = x1; - pt[0].Y = y1; - pt[1].X = x2; - pt[1].Y = y2; - pt[2].X = x3; - pt[2].Y = y3; - pt[3].X = x4; - pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; -} - -GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF *points, INT count) -{ - INT i; - GpStatus ret; - - TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - - if(!graphics || !pen || !points || (count <= 0)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - for(i = 0; i < floor(count / 4); i++){ - ret = GdipDrawBezier(graphics, pen, - points[4*i].X, points[4*i].Y, - points[4*i + 1].X, points[4*i + 1].Y, - points[4*i + 2].X, points[4*i + 2].Y, - points[4*i + 3].X, points[4*i + 3].Y); - if(ret != Ok) - return ret; - } - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathBeziers(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen, @@ -2774,7 +2575,7 @@ GDIPCONST GpPointF *points, INT count, REAL tension) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2784,20 +2585,16 @@ if(graphics->busy) return ObjectBusy; - if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok) - return stat; - - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } - - stat = GdipDrawPath(graphics, pen, path); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); GdipDeletePath(path); - return stat; + return status; } GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics *graphics, GpPen *pen, @@ -2867,11 +2664,8 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - /* PolyBezier expects count*3-2 points. */ - INT i, len_pt = count*3-2, save_state; - GpPointF *pt; - REAL x1, x2, y1, y2; - GpStatus retval; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2884,53 +2678,15 @@ if(count < 2) return InvalidParameter; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt = GdipAlloc(len_pt * sizeof(GpPointF)); - if(!pt) - return OutOfMemory; - - tension = tension * TENSION_CONST; - - calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, - tension, &x1, &y1); - - pt[0].X = points[0].X; - pt[0].Y = points[0].Y; - pt[1].X = x1; - pt[1].Y = y1; - - for(i = 0; i < count-2; i++){ - calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); - - pt[3*i+2].X = x1; - pt[3*i+2].Y = y1; - pt[3*i+3].X = points[i+1].X; - pt[3*i+3].Y = points[i+1].Y; - pt[3*i+4].X = x2; - pt[3*i+4].Y = y2; - } - - calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, - points[count-2].X, points[count-2].Y, tension, &x1, &y1); - - pt[len_pt-2].X = x1; - pt[len_pt-2].Y = y1; - pt[len_pt-1].X = points[count-1].X; - pt[len_pt-1].Y = points[count-1].Y; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, len_pt, TRUE); - - GdipFree(pt); - restore_dc(graphics, save_state); - - return retval; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, @@ -2993,9 +2749,8 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -3005,27 +2760,15 @@ 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; - ptf[1].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 2); - - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); - - restore_dc(graphics, save_state); - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathEllipse(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x, @@ -3069,6 +2812,8 @@ REAL scale_x, scale_y, width, height; TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + + if (!graphics || !image) return InvalidParameter; scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); scale_x *= graphics->xres / image->xres; @@ -3542,123 +3287,58 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { - INT save_state; GpPointF pt[2]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2); - - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; pt[1].Y = y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawLines(graphics, pen, pt, 2); } GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { - INT save_state; - GpPointF pt[2]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2); - if(!pen || !graphics) + return GdipDrawLine(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2); +} + +GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST + GpPointF *points, INT count) +{ + GpStatus status; + GpPath *path; + + TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); + + if(!pen || !graphics || (count < 2)) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = (REAL)x1; - pt[0].Y = (REAL)y1; - pt[1].X = (REAL)x2; - pt[1].Y = (REAL)y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; -} - -GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST - GpPointF *points, INT count) -{ - INT save_state; - GpStatus retval; - - TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - - if(!pen || !graphics || (count < 2)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, points, count, TRUE); - - restore_dc(graphics, save_state); - - return retval; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathLine2(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count) { - INT save_state; GpStatus retval; - GpPointF *ptf = NULL; + GpPointF *ptf; int i; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - - if(!pen || !graphics || (count < 2)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } ptf = GdipAlloc(count * sizeof(GpPointF)); if(!ptf) return OutOfMemory; @@ -3668,11 +3348,7 @@ ptf[i].Y = (REAL) points[i].Y; } - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, ptf, count, TRUE); - - restore_dc(graphics, save_state); + retval = GdipDrawLines(graphics, pen, ptf, count); GdipFree(ptf); return retval; @@ -3710,7 +3386,8 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -3721,20 +3398,15 @@ if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); - - restore_dc(graphics, save_state); - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathPie(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, @@ -3749,9 +3421,8 @@ GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -3761,30 +3432,15 @@ 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; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 4); - Polygon(graphics->hdc, pti, 4); - - restore_dc(graphics, save_state); - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathRectangle(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, @@ -3798,9 +3454,8 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, GDIPCONST GpRectF* rects, INT count) { - GpPointF *ptf; - POINT *pti; - INT save_state, i; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, rects, count); @@ -3810,42 +3465,15 @@ if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf = GdipAlloc(4 * count * sizeof(GpPointF)); - pti = GdipAlloc(4 * count * sizeof(POINT)); - - if(!ptf || !pti){ - GdipFree(ptf); - GdipFree(pti); - return OutOfMemory; - } - - for(i = 0; i < count; i++){ - ptf[4 * i + 3].X = ptf[4 * i].X = rects[i].X; - ptf[4 * i + 1].Y = ptf[4 * i].Y = rects[i].Y; - ptf[4 * i + 2].X = ptf[4 * i + 1].X = rects[i].X + rects[i].Width; - ptf[4 * i + 3].Y = ptf[4 * i + 2].Y = rects[i].Y + rects[i].Height; - } - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 4 * count); - - for(i = 0; i < count; i++) - Polygon(graphics->hdc, &pti[4 * i], 4); - - restore_dc(graphics, save_state); - - GdipFree(ptf); - GdipFree(pti); - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathRectangles(path, rects, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics *graphics, GpPen *pen, @@ -3881,7 +3509,7 @@ GDIPCONST GpPointF *points, INT count, REAL tension, GpFillMode fill) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f, %d)\n", graphics, brush, points, count, tension, fill); @@ -3895,25 +3523,15 @@ if(count == 1) /* Do nothing */ return Ok; - stat = GdipCreatePath(fill, &path); - if(stat != Ok) - return stat; - - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } - - stat = GdipFillPath(graphics, brush, path); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } + status = GdipCreatePath(fill, &path); + if (status != Ok) return status; + + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipFillPath(graphics, brush, path); GdipDeletePath(path); - - return Ok; + return status; } GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics *graphics, GpBrush *brush, @@ -4234,20 +3852,23 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, INT count) { - GpStatus ret; - INT i; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, brush, rects, count); if(!rects) return InvalidParameter; - for(i = 0; i < count; i++){ - ret = GdipFillRectangle(graphics, brush, rects[i].X, rects[i].Y, rects[i].Width, rects[i].Height); - if(ret != Ok) return ret; - } - - return Ok; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; + + status = GdipAddPathRectangles(path, rects, count); + if (status == Ok) + status = GdipFillPath(graphics, brush, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRect *rects, @@ -4814,7 +4435,7 @@ GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) { WCHAR* stringdup; @@ -4837,6 +4458,11 @@ nwidth = rect->Width; nheight = rect->Height; + if (ignore_empty_clip) + { + if (!nwidth) nwidth = INT_MAX; + if (!nheight) nheight = INT_MAX; + } if (format) hkprefix = format->hkprefix; @@ -5078,21 +4704,8 @@ scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; - if (stringFormat->attr & StringFormatFlagsNoClip) - { - scaled_rect.Width = (REAL)(1 << 23); - scaled_rect.Height = (REAL)(1 << 23); - } - else - { - scaled_rect.Width = layoutRect->Width * args.rel_width; - scaled_rect.Height = layoutRect->Height * args.rel_height; - } - if (scaled_rect.Width >= 0.5) - { - scaled_rect.Width -= margin_x * 2.0 * args.rel_width; - if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ - } + scaled_rect.Width = layoutRect->Width * args.rel_width; + scaled_rect.Height = layoutRect->Height * args.rel_height; get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -5107,7 +4720,7 @@ args.regions = regions; stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, - measure_ranges_callback, &args); + (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -5167,7 +4780,7 @@ GpPointF pt[3]; RectF scaled_rect; REAL margin_x; - INT lines, glyphs, format_flags = format ? format->attr : 0; + INT lines, glyphs; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5209,20 +4822,14 @@ scaled_rect.Y = rect->Y * args.rel_height; scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -5237,7 +4844,7 @@ args.linesfilled = &lines; lines = glyphs = 0; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); if (linesfilled) *linesfilled = lines; @@ -5388,20 +4995,14 @@ scaled_rect.Y = 0.0; scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * rel_width; if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) @@ -5426,7 +5027,7 @@ GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); DeleteObject(rgn); Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -1009,7 +1009,8 @@ args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); + status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, + format, TRUE, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont); @@ -1701,6 +1702,13 @@ REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); REAL distance = pen->width/2.0; REAL bevel_dx, bevel_dy; + + if (segment_length == 0.0) + { + *last_point = add_path_list_node(*last_point, endpoint->X, + endpoint->Y, PathPointTypeLine); + return; + } if (right_side) { Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -17,20 +17,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> +#include <stdarg.h> #include <assert.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" +#include <windef.h> +#include <winbase.h> //#include "winuser.h" //#include "wingdi.h" #define COBJMACROS //#include "objbase.h" +#include <ole2.h> #include <olectl.h> -//#include "ole2.h" #include <initguid.h> //#include "wincodec.h" @@ -116,10 +120,9 @@ IPicture_get_Height(pic, &y); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); y = MulDiv(y, GetDeviceCaps(hdcref, LOGPIXELSY), INCH_HIMETRIC); - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return y; } @@ -131,11 +134,9 @@ IPicture_get_Width(pic, &x); - hdcref = GetDC(0); - + hdcref = CreateCompatibleDC(0); x = MulDiv(x, GetDeviceCaps(hdcref, LOGPIXELSX), INCH_HIMETRIC); - - ReleaseDC(0, hdcref); + DeleteDC(hdcref); return x; } @@ -300,7 +301,6 @@ BYTE r, g, b, a; BYTE index; BYTE *row; - TRACE("%p %d %d %p\n", bitmap, x, y, color); if(!bitmap || !color || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) @@ -370,7 +370,7 @@ BYTE index = 0; int best_distance = 0x7fff; int distance; - int i; + UINT i; if (!palette) return 0; /* This algorithm scans entire palette, @@ -506,7 +506,6 @@ { BYTE a, r, g, b; BYTE *row; - TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); if(!bitmap || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) return InvalidParameter; @@ -1600,12 +1599,9 @@ 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, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1613,11 +1609,14 @@ if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } return ret; } @@ -1628,13 +1627,12 @@ ICONINFO iinfo; BITMAP bm; int ret; - UINT width, height; + UINT width, height, stride; GpRect rect; BitmapData lockeddata; HDC screendc; BOOL has_alpha; int x, y; - BYTE *bits; BITMAPINFOHEADER bih; DWORD *src; BYTE *dst_row; @@ -1654,24 +1652,13 @@ } width = bm.bmWidth; - - if (iinfo.hbmColor) - height = abs(bm.bmHeight); - else /* combined bitmap + mask */ - height = abs(bm.bmHeight) / 2; - - bits = HeapAlloc(GetProcessHeap(), 0, 4*width*height); - if (!bits) { - DeleteObject(iinfo.hbmColor); - DeleteObject(iinfo.hbmMask); - return OutOfMemory; - } - - stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, NULL, bitmap); + height = iinfo.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; + + stat = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat32bppARGB, NULL, bitmap); if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - HeapFree(GetProcessHeap(), 0, bits); return stat; } @@ -1684,14 +1671,13 @@ if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - HeapFree(GetProcessHeap(), 0, bits); GdipDisposeImage((GpImage*)*bitmap); return stat; } bih.biSize = sizeof(bih); bih.biWidth = width; - bih.biHeight = -height; + bih.biHeight = iinfo.hbmColor ? -height: -height * 2; bih.biPlanes = 1; bih.biBitCount = 32; bih.biCompression = BI_RGB; @@ -1701,17 +1687,17 @@ bih.biClrUsed = 0; bih.biClrImportant = 0; - screendc = GetDC(0); + screendc = CreateCompatibleDC(0); if (iinfo.hbmColor) { - GetDIBits(screendc, iinfo.hbmColor, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); if (bm.bmBitsPixel == 32) { has_alpha = FALSE; /* If any pixel has a non-zero alpha, ignore hbmMask */ - src = (DWORD*)bits; + src = (DWORD*)lockeddata.Scan0; for (x=0; x<width && !has_alpha; x++) for (y=0; y<height && !has_alpha; y++) if ((*src++ & 0xff000000) != 0) @@ -1721,24 +1707,16 @@ } else { - GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + GetDIBits(screendc, iinfo.hbmMask, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); has_alpha = FALSE; } - /* copy the image data to the Bitmap */ - src = (DWORD*)bits; - dst_row = lockeddata.Scan0; - for (y=0; y<height; y++) - { - memcpy(dst_row, src, width*4); - src += width; - dst_row += lockeddata.Stride; - } - if (!has_alpha) { if (iinfo.hbmMask) { + BYTE *bits = HeapAlloc(GetProcessHeap(), 0, height * stride); + /* read alpha data from the mask */ if (iinfo.hbmColor) GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); @@ -1760,11 +1738,13 @@ } dst_row += lockeddata.Stride; } + + HeapFree(GetProcessHeap(), 0, bits); } else { /* set constant alpha of 255 */ - dst_row = bits; + dst_row = lockeddata.Scan0; for (y=0; y<height; y++) { dst = (DWORD*)dst_row; @@ -1775,14 +1755,12 @@ } } - ReleaseDC(0, screendc); + DeleteDC(screendc); DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); GdipBitmapUnlockBits(*bitmap, &lockeddata); - - HeapFree(GetProcessHeap(), 0, bits); return Ok; } @@ -1827,14 +1805,14 @@ static GpStatus get_screen_resolution(REAL *xres, REAL *yres) { - HDC screendc = GetDC(0); + HDC screendc = CreateCompatibleDC(0); if (!screendc) return GenericError; *xres = (REAL)GetDeviceCaps(screendc, LOGPIXELSX); *yres = (REAL)GetDeviceCaps(screendc, LOGPIXELSY); - ReleaseDC(0, screendc); + DeleteDC(screendc); return Ok; } @@ -3814,7 +3792,8 @@ LARGE_INTEGER seek; HRESULT hr; UINT bytesread; - int i, j, sig; + int i; + DWORD j, sig; /* seek to the start of the stream */ seek.QuadPart = 0; @@ -4724,28 +4703,17 @@ if (retval == Ok && hpal) { - WORD num_palette_entries; - PALETTEENTRY *palette_entries=NULL; + PALETTEENTRY entry[256]; ColorPalette *palette=NULL; - int i; - - if (!GetObjectW(hpal, sizeof(num_palette_entries), &num_palette_entries)) + int i, num_palette_entries; + + num_palette_entries = GetPaletteEntries(hpal, 0, 256, entry); + if (!num_palette_entries) retval = GenericError; - if (retval == Ok) - { - palette_entries = GdipAlloc(sizeof(PALETTEENTRY) * num_palette_entries); - palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); - - if (!palette_entries || !palette) - retval = OutOfMemory; - } - - if (retval == Ok) - { - if (!GetPaletteEntries(hpal, 0, num_palette_entries, palette_entries)) - retval = GenericError; - } + palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); + if (!palette) + retval = OutOfMemory; if (retval == Ok) { @@ -4754,15 +4722,13 @@ for (i=0; i<num_palette_entries; i++) { - PALETTEENTRY * entry = &palette_entries[i]; - palette->Entries[i] = 0xff000000 | entry->peRed << 16 | - entry->peGreen << 8 | entry->peBlue; + palette->Entries[i] = 0xff000000 | entry[i].peRed << 16 | + entry[i].peGreen << 8 | entry[i].peBlue; } retval = GdipSetImagePalette((GpImage*)*bitmap, palette); } - GdipFree(palette_entries); GdipFree(palette); } Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -410,7 +410,7 @@ if (record) { record->iType = recordType; - record->nSize = dataSize; + record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, @@ -536,7 +536,9 @@ memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); if (stat == Ok) Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Thu May 23 17:23:00 2013 @@ -282,7 +282,7 @@ region_element *left, *right = NULL; GpStatus stat; - TRACE("%p %p %d\n", region, rect, mode); + TRACE("%p %s %d\n", region, debugstr_rectf(rect), mode); if (!(region && rect)) return InvalidParameter; @@ -588,7 +588,7 @@ GpStatus stat; GpPath* path; GpRegion* local; - int i; + DWORD i; TRACE("(%p, %p)\n", hrgn, region); @@ -894,7 +894,7 @@ if (!graphics) { - new_hdc = GetDC(0); + new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; @@ -902,13 +902,13 @@ graphics = new_graphics; if (stat != Ok) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); return stat; } } else if (!graphics->hdc) { - graphics->hdc = new_hdc = GetDC(0); + graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; } @@ -929,7 +929,7 @@ RestoreDC(graphics->hdc, save_state); if (new_hdc) { - ReleaseDC(0, new_hdc); + DeleteDC(new_hdc); if (new_graphics) GdipDeleteGraphics(new_graphics); else @@ -1467,7 +1467,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects; @@ -1501,7 +1501,7 @@ GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu May 23 17:23:00 2013 @@ -63,7 +63,7 @@ reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.26 -reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 +reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26 reactos/dll/win32/hlink # Synced to Wine-1.5.4 reactos/dll/win32/hnetcfg # Synced to Wine-1.5.4

1 0

[akhaldi] 59072: [WINDOWSCODECS_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 23 May '13

23 May '13

Author: akhaldi Date: Thu May 23 16:40:21 2013 New Revision: 59072 URL: http://svn.reactos.org/svn/reactos?rev=59072&view=rev Log: [WINDOWSCODECS_WINETEST] * Sync with Wine 1.5.26. Added: trunk/rostests/winetests/windowscodecs/propertybag.c (with props) Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt trunk/rostests/winetests/windowscodecs/bitmap.c trunk/rostests/winetests/windowscodecs/bmpformat.c trunk/rostests/winetests/windowscodecs/converter.c trunk/rostests/winetests/windowscodecs/gifformat.c trunk/rostests/winetests/windowscodecs/icoformat.c trunk/rostests/winetests/windowscodecs/info.c trunk/rostests/winetests/windowscodecs/metadata.c trunk/rostests/winetests/windowscodecs/palette.c trunk/rostests/winetests/windowscodecs/pngformat.c trunk/rostests/winetests/windowscodecs/stream.c trunk/rostests/winetests/windowscodecs/testlist.c trunk/rostests/winetests/windowscodecs/tiffformat.c Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/C… ============================================================================== --- trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] Thu May 23 16:40:21 2013 @@ -11,6 +11,7 @@ metadata.c palette.c pngformat.c + propertybag.c stream.c testlist.c tiffformat.c) @@ -18,5 +19,5 @@ add_executable(windowscodecs_winetest ${SOURCE}) target_link_libraries(windowscodecs_winetest wine) set_module_type(windowscodecs_winetest win32cui) -add_importlibs(windowscodecs_winetest windowscodecs ole32 msvcrt kernel32 ntdll) -add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all) +add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET windowscodecs_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/b… ============================================================================== --- trunk/rostests/winetests/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/bitmap.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -1,5 +1,6 @@ /* * Copyright 2012 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,17 +17,82 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <math.h> +//#include <stdarg.h> +#include <stdio.h> +#include <assert.h> +//#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <wincodec.h> +#include <wine/test.h> static IWICImagingFactory *factory; + +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + +static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const void *data) +{ + char bmibuf[sizeof(BITMAPINFO) + sizeof(RGBQUAD) * 255]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + void *bits; + HBITMAP hdib; + BITMAP bm; + + memset(bmibuf, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biBitCount = bpp; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + if (pal) + { + WORD i; + + assert(pal->palNumEntries <= 256); + for (i = 0; i < pal->palNumEntries; i++) + { + bmi->bmiColors[i].rgbRed = pal->palPalEntry[i].peRed; + bmi->bmiColors[i].rgbGreen = pal->palPalEntry[i].peGreen; + bmi->bmiColors[i].rgbBlue = pal->palPalEntry[i].peBlue; + bmi->bmiColors[i].rgbReserved = 0; + } + + bmi->bmiHeader.biClrUsed = pal->palNumEntries; + bmi->bmiHeader.biClrImportant = pal->palNumEntries; + } + hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height, bpp); + + GetObject(hdib, sizeof(bm), &bm); + ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth); + ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight); + ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes); + ok(bm.bmBitsPixel == bpp, "expected %d, got %d\n", bpp, bm.bmBitsPixel); + + if (data) memcpy(bits, data, bm.bmWidthBytes * bm.bmHeight); + + return hdib; +} static void test_createbitmap(void) { @@ -418,6 +484,297 @@ IWICBitmap_Release(bitmap2); } +static void test_CreateBitmapFromMemory(void) +{ + BYTE orig_data3x3[27] = { + 128,128,255, 128,128,128, 128,255,128, + 128,128,128, 128,128,128, 255,255,255, + 255,128,128, 255,255,255, 255,255,255 }; + BYTE data3x3[27]; + BYTE data3x2[27] = { + 128,128,255, 128,128,128, 128,255,128, + 0,0,0, 0,128,128, 255,255,255, + 255,128,128, 255,0,0, 0,0,0 }; + BYTE data[27]; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height, i; + + memcpy(data3x3, orig_data3x3, sizeof(data3x3)); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 0, 0, NULL, &bitmap); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 0, sizeof(data3x3), data3x3, &bitmap); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 6, sizeof(data3x3), data3x3, &bitmap); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 12, sizeof(data3x3), data3x3, &bitmap); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 9, sizeof(data3x3) - 1, data3x3, &bitmap); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 9, sizeof(data3x3), data3x3, &bitmap); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + data3x3[2] = 192; + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == orig_data3x3[i], "%u: expected %u, got %u\n", i, data[i], data3x3[i]); + + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 2, &GUID_WICPixelFormat24bppBGR, + 13, sizeof(orig_data3x3), orig_data3x3, &bitmap); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 2, "expected 2, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + + IWICBitmap_Release(bitmap); +} + +static void test_CreateBitmapFromHICON(void) +{ + static const char bits[4096]; + HICON icon; + ICONINFO info; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height; + WICPixelFormatGUID format; + + /* 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = 0; + info.hbmMask = CreateBitmap(16, 32, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); + + /* 24 bpp color, 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = CreateBitmap(16, 16, 1, 24, bits); + ok(info.hbmColor != 0, "CreateBitmap failed\n"); + info.hbmMask = CreateBitmap(16, 16, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); +} + +static void test_CreateBitmapFromHBITMAP(void) +{ + /* 8 bpp data must be aligned to a DWORD boundary for a DIB */ + static const BYTE data_8bpp_pal_dib[12] = { 0,1,2,0, 1,2,0,0, 2,1,0,0 }; + static const BYTE data_8bpp_rgb_dib[12] = { 0xf0,0x0f,0xff,0, 0x0f,0xff,0xf0,0, 0xf0,0x0f,0xff,0 }; + static const BYTE data_8bpp_pal_wic[12] = { 0xd,0xe,0x10,0, 0xe,0x10,0xd,0, 0x10,0xe,0xd,0 }; + static const PALETTEENTRY pal_data[3] = { {0xff,0,0,0}, {0,0xff,0,0}, {0,0,0xff,0} }; + char pal_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *pal = (LOGPALETTE *)pal_buf; + HBITMAP hbmp; + HPALETTE hpal; + BYTE data[12]; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height, i, count; + WICPixelFormatGUID format; + IWICPalette *palette; + WICBitmapPaletteType type; + + /* 8 bpp without palette */ + hbmp = create_dib(3, 3, 8, NULL, data_8bpp_rgb_dib); + ok(hbmp != 0, "failed to create bitmap\n"); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, 0, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == WINCODEC_ERR_WIN32ERROR || hr == 0x88980003 /*XP*/, "expected WINCODEC_ERR_WIN32ERROR, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, 0, WICBitmapCacheOnLoad, &bitmap); +todo_wine + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_rgb_dib[i], "%u: expected %#x, got %#x\n", i, data_8bpp_rgb_dib[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + + /* 8 bpp with a 3 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 3; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + + IWICPalette_Release(palette); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); + + /* 8 bpp with a 256 entries palette */ + memset(pal_buf, 0, sizeof(pal_buf)); + pal->palVersion = 0x300; + pal->palNumEntries = 256; + memcpy(pal->palPalEntry, pal_data, sizeof(pal_data)); + hpal = CreatePalette(pal); + ok(hpal != 0, "CreatePalette failed\n"); + + hbmp = create_dib(3, 3, 8, pal, data_8bpp_pal_dib); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, hpal, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmap_CopyPalette(bitmap, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + IWICPalette_Release(palette); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); + DeleteObject(hpal); +} + START_TEST(bitmap) { HRESULT hr; @@ -430,6 +787,9 @@ test_createbitmap(); test_createbitmapfromsource(); + test_CreateBitmapFromMemory(); + test_CreateBitmapFromHICON(); + test_CreateBitmapFromHBITMAP(); IWICImagingFactory_Release(factory); Modified: trunk/rostests/winetests/windowscodecs/bmpformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/b… ============================================================================== --- trunk/rostests/winetests/windowscodecs/bmpformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/bmpformat.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -19,27 +19,38 @@ #include <stdarg.h> #include <math.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "initguid.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ole2.h> +//#include "wincodec.h" +#include <wincodecsdk.h> +#include <wine/test.h> static const char testbmp_24bpp[] = { /* BITMAPFILEHEADER */ 66,77, /* "BM" */ - 50,0,0,0, /* file size */ + 78,0,0,0, /* file size */ 0,0,0,0, /* reserved */ - 26,0,0,0, /* offset to bits */ - /* BITMAPCOREHEADER */ - 12,0,0,0, /* header size */ - 2,0, /* width */ - 3,0, /* height */ + 54,0,0,0, /* offset to bits */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 2,0,0,0, /* width */ + 3,0,0,0, /* height */ 1,0, /* planes */ 24,0, /* bit count */ + 0,0,0,0, /* compression */ + 0,0,0,0, /* image size */ + 0x74,0x12,0,0, /* X pels per meter => 120 dpi */ + 0,0,0,0, /* Y pels per meter */ + 0,0,0,0, /* colors used */ + 0,0,0,0, /* colors important */ /* bits */ 0,0,0, 0,255,0, 0,0, 255,0,0, 255,255,0, 0,0, @@ -86,7 +97,14 @@ if (SUCCEEDED(hr)) { hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + ok(hr == S_OK || broken(hr == WINCODEC_ERR_BADIMAGE) /* XP */, "Initialize failed, hr=%x\n", hr); + if (FAILED(hr)) + { + win_skip("BMP decoder failed to initialize\n"); + GlobalFree(hbmpdata); + IWICBitmapDecoder_Release(decoder); + return; + } hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); Modified: trunk/rostests/winetests/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/c… ============================================================================== --- trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -19,13 +19,18 @@ #include <stdarg.h> #include <math.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define CONST_VTABLE -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <wincodec.h> +#include <wine/test.h> typedef struct bitmap_data { const WICPixelFormatGUID *format; @@ -277,6 +282,12 @@ static const struct bitmap_data testdata_24bppBGR = { &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR, 4, 2, 96.0, 96.0}; +static const BYTE bits_24bppRGB[] = { + 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 255,255,0, 255,0,255, 0,255,255, 255,255,255}; +static const struct bitmap_data testdata_24bppRGB = { + &GUID_WICPixelFormat24bppRGB, 24, bits_24bppRGB, 4, 2, 96.0, 96.0}; + static const BYTE bits_32bppBGR[] = { 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; @@ -499,6 +510,16 @@ test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", 0); test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", 0); test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", 0); + + test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", 0); + test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", 0); + + test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", 0); + test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", 0); + + test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", 0); + test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", 0); + test_invalid_conversion(); test_default_converter(); Modified: trunk/rostests/winetests/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/g… ============================================================================== --- trunk/rostests/winetests/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/gifformat.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -19,11 +19,17 @@ #include <stdarg.h> #include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <wincodec.h> +#include <wine/test.h> static const char gif_global_palette[] = { /* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0xa1,0x02,0x00, Modified: trunk/rostests/winetests/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/i… ============================================================================== --- trunk/rostests/winetests/windowscodecs/icoformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/icoformat.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -17,14 +17,19 @@ */ #include <stdarg.h> -#include <math.h> +//#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wincodec.h> +#include <wine/test.h> static unsigned char testico_bad_icondirentry_size[] = { /* ICONDIR */ @@ -133,17 +138,24 @@ if (SUCCEEDED(hr)) { - UINT width = 0, height = 0; - IWICBitmapSource *thumbnail = NULL; + UINT width, height; + IWICBitmapSource *thumbnail; + width = height = 0; hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); - todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); - - if (thumbnail) IWICBitmapSource_Release(thumbnail); + ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + if (hr == S_OK) + { + width = height = 0; + hr = IWICBitmapSource_GetSize(thumbnail, &width, &height); + ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); + ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + IWICBitmapSource_Release(thumbnail); + } IWICBitmapFrameDecode_Release(framedecode); } Modified: trunk/rostests/winetests/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/i… ============================================================================== --- trunk/rostests/winetests/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/info.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -17,18 +17,23 @@ */ #include <stdio.h> -#include <stdarg.h> -#include <math.h> +//#include <stdarg.h> +//#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" -#include "wine/test.h" - -#include "initguid.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +//#include "wincodec.h" +#include <wincodecsdk.h> +#include <wine/test.h> + +#include <initguid.h> DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const char *debugstr_guid(GUID *guid) Modified: trunk/rostests/winetests/windowscodecs/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/m… ============================================================================== --- trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -18,17 +18,22 @@ */ #include <stdio.h> -#include <stdarg.h> -#include <math.h> +//#include <stdarg.h> +//#include <math.h> #include <assert.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wincodecsdk.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +//#include "wincodec.h" +#include <wincodecsdk.h> +#include <wine/test.h> #define expect_blob(propvar, data, length) do { \ ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ Modified: trunk/rostests/winetests/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/p… ============================================================================== --- trunk/rostests/winetests/windowscodecs/palette.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/palette.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -20,12 +20,17 @@ #include <stdarg.h> #include <assert.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "objbase.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wincodec.h> +#include <wine/test.h> static void test_custom_palette(void) { Modified: trunk/rostests/winetests/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/p… ============================================================================== --- trunk/rostests/winetests/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/pngformat.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -17,14 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <wincodec.h> +#include <wine/test.h> /* 1x1 pixel PNG image */ static const char png_no_color_profile[] = { @@ -317,6 +323,27 @@ return decoder; } +static WCHAR *save_profile( BYTE *buffer, UINT size ) +{ + static const WCHAR tstW[] = {'t','s','t',0}; + WCHAR path[MAX_PATH], filename[MAX_PATH], *ret; + HANDLE handle; + DWORD count; + + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, tstW, 0, filename); + + handle = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + WriteFile(handle, buffer, size, &count, NULL); + CloseHandle( handle ); + + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); + lstrcpyW(ret, filename); + return ret; +} + static void test_color_contexts(void) { HRESULT hr; @@ -325,7 +352,9 @@ IWICColorContext *context; WICColorContextType type; UINT count, colorspace, size; + WCHAR *tmpfile; BYTE *buffer; + BOOL ret; decoder = create_decoder(png_no_color_profile, sizeof(png_no_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); @@ -453,6 +482,8 @@ buffer = HeapAlloc(GetProcessHeap(), 0, size); hr = IWICColorContext_GetProfileBytes(context, size, buffer, &size); ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + + tmpfile = save_profile( buffer, size ); HeapFree(GetProcessHeap(), 0, buffer); type = 0xdeadbeef; @@ -468,7 +499,94 @@ hr = IWICColorContext_InitializeFromExifColorSpace(context, 1); ok(hr == WINCODEC_ERR_WRONGSTATE, "InitializeFromExifColorSpace error %#x\n", hr); + if (tmpfile) + { + hr = IWICColorContext_InitializeFromFilename(context, NULL); + ok(hr == E_INVALIDARG, "InitializeFromFilename error %#x\n", hr); + + hr = IWICColorContext_InitializeFromFilename(context, tmpfile); + ok(hr == S_OK, "InitializeFromFilename error %#x\n", hr); + + ret = DeleteFileW(tmpfile); + ok(ret, "DeleteFileW failed %u\n", GetLastError()); + + type = 0xdeadbeef; + hr = IWICColorContext_GetType(context, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICColorContextProfile, "unexpected type %u\n", type); + + colorspace = 0xdeadbeef; + hr = IWICColorContext_GetExifColorSpace(context, &colorspace); + ok(hr == S_OK, "GetExifColorSpace error %#x\n", hr); + ok(colorspace == 0xffffffff, "unexpected color space %u\n", colorspace); + + hr = IWICColorContext_InitializeFromExifColorSpace(context, 1); + ok(hr == WINCODEC_ERR_WRONGSTATE, "InitializeFromExifColorSpace error %#x\n", hr); + + size = 0; + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); + ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + ok(size, "unexpected size %u\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + hr = IWICColorContext_GetProfileBytes(context, size, buffer, &size); + ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, tmpfile); + } IWICColorContext_Release(context); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + +/* 1 bpp 1x1 pixel PNG image with PLTE and tRNS chunks */ +static const char png_PLTE_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x03,0x00,0x00,0x00,0x25,0xdb,0x56,0xca, + 0x00,0x00,0x00,0x06,'P','L','T','E',0x01,0x02,0x03,0x04,0x05,0x06,0x95,0x53,0x6f,0x48, + 0x00,0x00,0x00,0x02,'t','R','N','S',0xff,0x00,0xe5,0xb7,0x30,0x4a, + 0x00,0x00,0x00,0x0a,'I','D','A','T',0x18,0xd3,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0xa7,0x01,0xba,0x10, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); + ok(decoder != 0, "Failed to load PNG image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed), + "got wrong format %s\n", debugstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + + IWICPalette_Release(palette); IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder); } @@ -484,6 +602,7 @@ if (FAILED(hr)) return; test_color_contexts(); + test_png_palette(); IWICImagingFactory_Release(factory); CoUninitialize(); Added: trunk/rostests/winetests/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/p… ============================================================================== --- trunk/rostests/winetests/windowscodecs/propertybag.c (added) +++ trunk/rostests/winetests/windowscodecs/propertybag.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -0,0 +1,295 @@ +/* + * Copyright 2013 Ludger Sprenker + * + * 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 <stdarg.h> +//#include <math.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +//#include "wincodec.h" +#include <wincodecsdk.h> +#include <wine/test.h> + +static const WCHAR wszTestProperty1[] = {'P','r','o','p','e','r','t','y','1',0}; +static const WCHAR wszTestProperty2[] = {'P','r','o','p','e','r','t','y','2',0}; +static const WCHAR wszTestInvalidProperty[] = {'I','n','v','a','l','i','d',0}; + +static void test_propertybag_getpropertyinfo(IPropertyBag2 *property, ULONG expected_count) +{ + HRESULT hr; + PROPBAG2 pb[2]; + ULONG out_count; + + /* iProperty: Out of bounce */ + hr = IPropertyBag2_GetPropertyInfo(property, expected_count, 1, pb, &out_count); + ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, + "GetPropertyInfo handled iProperty out of bounce wrong, hr=%x\n", hr); + + /* cProperty: Out of bounce */ + hr = IPropertyBag2_GetPropertyInfo(property, 0, expected_count+1, pb, &out_count); + ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, + "GetPropertyInfo handled cProperty out of bounce wrong, hr=%x\n", hr); + + /* GetPropertyInfo can be called for zero items on Windows 8 but not on Windows 7 (wine behaves like Win8) */ + if (expected_count == 0) + return; + + hr = IPropertyBag2_GetPropertyInfo(property, 0, expected_count, pb, &out_count); + ok(hr == S_OK, "GetPropertyInfo failed, hr=%x\n", hr); + if (FAILED(hr)) + return; + + ok(expected_count == out_count, + "GetPropertyInfo returned unexpected property count, %i != %i)\n", + expected_count, out_count); + + if(expected_count != 2) + return; + + ok(pb[0].vt == VT_UI1, "Invalid variant type, pb[0].vt=%x\n", pb[0].vt); + ok(pb[0].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[0].dwType=%x\n", pb[0].dwType); + ok(lstrcmpW(pb[0].pstrName, wszTestProperty1) == 0, "Invalid property name, pb[0].pstrName=%s\n", wine_dbgstr_w(pb[0].pstrName)); + + ok(pb[1].vt == VT_R4, "Invalid variant type, pb[1].vt=%x\n", pb[1].vt); + ok(pb[1].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[1].dwType=%x\n", pb[1].dwType); + ok(lstrcmpW(pb[1].pstrName, wszTestProperty2) == 0, "Invalid property name, pb[1].pstrName=%s\n", wine_dbgstr_w(pb[1].pstrName)); +} + +static void test_propertybag_countproperties(IPropertyBag2 *property, ULONG expected_count) +{ + ULONG count = (ULONG)-1; + HRESULT hr; + + hr = IPropertyBag2_CountProperties(property, NULL); + ok(hr == E_INVALIDARG, "CountProperties returned unexpected result, hr=%x\n", hr); + + hr = IPropertyBag2_CountProperties(property, &count); + ok(hr == S_OK, "CountProperties failed, hr=%x\n", hr); + + if (FAILED(hr)) + return; + + ok(count == expected_count, "CountProperties returned invalid value, count=%i\n", count); +} + +static void test_propertybag_read(IPropertyBag2 *property) +{ + HRESULT hr; + PROPBAG2 options[3] = {{0}}; + VARIANT values[3]; + HRESULT itm_hr[3] = {S_OK, S_OK, S_OK}; + + /* 1. One unknown property */ + options[0].pstrName = (LPOLESTR)wszTestInvalidProperty; + hr = IPropertyBag2_Read(property, 1, options, NULL, values, itm_hr); + ok(hr == E_FAIL, + "Read for an unknown property did not fail with expected code, hr=%x\n", hr); + + /* 2. One known property */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + itm_hr[0] = E_FAIL; + hr = IPropertyBag2_Read(property, 1, options, NULL, values, itm_hr); + ok(hr == S_OK, "Read failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + ok(itm_hr[0] == S_OK, + "Read failed, itm_hr[0]=%x\n", itm_hr[0]); + ok(V_VT(&values[0]) == VT_UI1, + "Read failed, V_VT(&values[0])=%x\n", V_VT(&values[0])); + ok(V_UNION(&values[0], bVal) == 12, + "Read failed, &values[0]=%i\n", V_UNION(&values[0], bVal)); + + VariantClear(&values[0]); + } + + /* 3. Two known properties */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + options[1].pstrName = (LPOLESTR)wszTestProperty2; + itm_hr[0] = E_FAIL; + itm_hr[1] = E_FAIL; + hr = IPropertyBag2_Read(property, 2, options, NULL, values, itm_hr); + ok(hr == S_OK, "Read failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + ok(itm_hr[0] == S_OK, "Read failed, itm_hr[0]=%x\n", itm_hr[0]); + ok(V_VT(&values[0]) == VT_UI1, "Read failed, V_VT(&values[0])=%x\n", V_VT(&values[0])); + ok(V_UNION(&values[0], bVal) == 12, "Read failed, &values[0]=%i\n", V_UNION(&values[0], bVal)); + + ok(itm_hr[1] == S_OK, "Read failed, itm_hr[1]=%x\n", itm_hr[1]); + ok(V_VT(&values[1]) == VT_R4, "Read failed, V_VT(&values[1])=%x\n", V_VT(&values[1])); + ok(V_UNION(&values[1], fltVal) == (float)3.14, "Read failed, &values[1]=%f\n", V_UNION(&values[1], fltVal)); + + VariantClear(&values[0]); + VariantClear(&values[1]); + } + + + /* 4. One unknown property between two valid */ + + /* Exotic initializations so we can detect what is unchanged */ + itm_hr[0] = -1; itm_hr[1] = -1; itm_hr[2] = -1; + V_VT(&values[0]) = VT_NULL; + V_VT(&values[1]) = VT_NULL; + V_VT(&values[2]) = VT_NULL; + V_UNION(&values[0], bVal) = 254; + V_UNION(&values[1], bVal) = 254; + V_UNION(&values[2], bVal) = 254; + + options[0].pstrName = (LPOLESTR)wszTestProperty1; + options[1].pstrName = (LPOLESTR)wszTestInvalidProperty; + options[2].pstrName = (LPOLESTR)wszTestProperty2; + + hr = IPropertyBag2_Read(property, 3, options, NULL, values, itm_hr); + ok(hr == E_FAIL, "Read failed, hr=%x\n", hr); + if (hr == E_FAIL) + { + ok(itm_hr[0] == S_OK, "Read error code has unexpected value, itm_hr[0]=%x\n", itm_hr[0]); + ok(itm_hr[1] == -1, "Read error code has unexpected value, itm_hr[1]=%x\n", itm_hr[1]); + ok(itm_hr[2] == -1, "Read error code has unexpected value, itm_hr[2]=%x\n", itm_hr[2]); + + ok(V_VT(&values[0]) == VT_UI1, "Read variant has unexpected type, V_VT(&values[0])=%x\n", V_VT(&values[0])); + ok(V_VT(&values[1]) == VT_NULL, "Read variant has unexpected type, V_VT(&values[1])=%x\n", V_VT(&values[1])); + ok(V_VT(&values[2]) == VT_NULL, "Read variant has unexpected type, V_VT(&values[2])=%x\n", V_VT(&values[2])); + + ok(V_UNION(&values[0], bVal) == 12, "Read variant has unexpected value, V_UNION(&values[0])=%i\n", V_UNION(&values[0], bVal)); + ok(V_UNION(&values[1], bVal) == 254, "Read variant has unexpected value, V_UNION(&values[1])=%i\n", V_UNION(&values[1], bVal)); + ok(V_UNION(&values[2], bVal) == 254, "Read variant has unexpected value, V_UNION(&values[2])=%i\n", V_UNION(&values[2], bVal)); + } +} + +static void test_propertybag_write(IPropertyBag2 *property) +{ + HRESULT hr; + PROPBAG2 options[2] = {{0}}; + VARIANT values[2]; + + VariantInit(&values[0]); + VariantInit(&values[1]); + + /* 1. One unknown property */ + options[0].pstrName = (LPOLESTR)wszTestInvalidProperty; + hr = IPropertyBag2_Write(property, 1, options, values); + ok(hr == E_FAIL, "Write for an unknown property did not fail with expected code, hr=%x\n", hr); + + /* 2. One property without correct type */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + V_VT(&values[0]) = VT_UI1; + V_UNION(&values[0], bVal) = 1; + hr = IPropertyBag2_Write(property, 1, options, values); + ok(hr == S_OK, "Write for one property failed, hr=%x\n", hr); + + /* 3. One property with mismatching type */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + V_VT(&values[0]) = VT_I1; + V_UNION(&values[0], bVal) = 2; + hr = IPropertyBag2_Write(property, 1, options, values); + ok(hr == WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE, + "Write with mismatching type did not fail with expected code hr=%x\n", hr); + + /* 4. Reset one property to empty */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + VariantClear(&values[0]); + hr = IPropertyBag2_Write(property, 1, options, values); + ok(hr == WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE, + "Write to reset to empty value does not fail with expected code, hr=%x\n", hr); + + /* 5. Set two properties */ + options[0].pstrName = (LPOLESTR)wszTestProperty1; + V_VT(&values[0]) = VT_UI1; + V_UNION(&values[0], bVal) = 12; + options[1].pstrName = (LPOLESTR)wszTestProperty2; + V_VT(&values[1]) = VT_R4; + V_UNION(&values[1], fltVal) = (float)3.14; + hr = IPropertyBag2_Write(property, 2, options, values); + ok(hr == S_OK, "Write for two properties failed, hr=%x\n", hr); +} + +static void test_empty_propertybag(void) +{ + HRESULT hr; + IWICComponentFactory *factory; + IPropertyBag2 *property; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, NULL, 0, &property); + + ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + test_propertybag_countproperties(property, 0); + + test_propertybag_getpropertyinfo(property, 0); + + IPropertyBag2_Release(property); + + IWICComponentFactory_Release(factory); +} + +static void test_filled_propertybag(void) +{ + HRESULT hr; + IWICComponentFactory *factory; + IPropertyBag2 *property; + PROPBAG2 opts[2]= { + {PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTestProperty1, {0}}, + {PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszTestProperty2, {0}} + }; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateEncoderPropertyBag(factory, opts, 2, &property); + + ok(hr == S_OK, "Creating EncoderPropertyBag failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + test_propertybag_countproperties(property, 2); + + test_propertybag_getpropertyinfo(property, 2); + + test_propertybag_write(property); + + test_propertybag_read(property); + + IPropertyBag2_Release(property); + + IWICComponentFactory_Release(factory); +} + +START_TEST(propertybag) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_empty_propertybag(); + + test_filled_propertybag(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/windowscodecs/propertybag.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/s… ============================================================================== --- trunk/rostests/winetests/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/stream.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <wine/test.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define COBJMACROS -#include "wincodec.h" +#include <ole2.h> +#include <wincodec.h> static void test_StreamOnMemory(void) { Modified: trunk/rostests/winetests/windowscodecs/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/t… ============================================================================== --- trunk/rostests/winetests/windowscodecs/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/testlist.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -1,7 +1,4 @@ /* Automatically generated file; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> #define STANDALONE #include "wine/test.h" @@ -15,6 +12,7 @@ extern void func_metadata(void); extern void func_palette(void); extern void func_pngformat(void); +extern void func_propertybag(void); extern void func_stream(void); extern void func_tiffformat(void); @@ -29,6 +27,7 @@ { "metadata", func_metadata }, { "palette", func_palette }, { "pngformat", func_pngformat }, + { "propertybag", func_propertybag }, { "stream", func_stream }, { "tiffformat", func_tiffformat }, { 0, 0 } Modified: trunk/rostests/winetests/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/t… ============================================================================== --- trunk/rostests/winetests/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/tiffformat.c [iso-8859-1] Thu May 23 16:40:21 2013 @@ -16,14 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include "windef.h" -#include "wincodec.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <wincodec.h> +#include <wine/test.h> #define IFD_BYTE 1 #define IFD_ASCII 2 @@ -38,7 +44,7 @@ #define IFD_FLOAT 11 #define IFD_DOUBLE 12 -#include "pshpack2.h" +#include <pshpack2.h> struct IFD_entry { SHORT id; @@ -92,7 +98,7 @@ { 900, 3 }, { 0x11, 0x22, 0x33, 0 } }; -#include "poppack.h" +#include <poppack.h> static IWICImagingFactory *factory;

1 0

[akhaldi] 59071: [WINDOWSCODECS] * Sync with Wine 1.5.26. [PSDK] * Update wincodec.idl.
by akhaldi＠svn.reactos.org 23 May '13

23 May '13

Author: akhaldi Date: Thu May 23 16:39:54 2013 New Revision: 59071 URL: http://svn.reactos.org/svn/reactos?rev=59071&view=rev Log: [WINDOWSCODECS] * Sync with Wine 1.5.26. [PSDK] * Update wincodec.idl. Added: trunk/reactos/dll/win32/windowscodecs/colortransform.c (with props) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/bitmap.c trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/colorcontext.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/icnsformat.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/main.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/palette.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/scaler.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/typeof.h trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/include/psdk/wincodec.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Thu May 23 16:39:54 2013 @@ -29,6 +29,7 @@ bmpencode.c clsfactory.c colorcontext.c + colortransform.c converter.c fliprotate.c gifformat.c @@ -63,5 +64,5 @@ add_library(windowscodecs SHARED ${SOURCE} version.rc) set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine uuid ${PSEH_LIB}) -add_importlibs(windowscodecs ole32 oleaut32 shlwapi advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(windowscodecs ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -451,19 +451,23 @@ }; HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - UINT bpp, stride, datasize; BYTE *data; + UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); if (FAILED(hr)) return hr; - stride = (((bpp*uiWidth)+31)/32)*4; - datasize = stride * uiHeight; + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; + if (!datasize) datasize = stride * uiHeight; + + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; + if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); @@ -473,6 +477,7 @@ HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY; } + if (bits) memcpy(data, bits, datasize); This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->ref = 1; Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -167,22 +167,35 @@ static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, double *pDpiY) { + LONG resx = 0, resy = 0; + switch (bih->bV5Size) { + default: case sizeof(BITMAPCOREHEADER): - *pDpiX = 96.0; - *pDpiY = 96.0; - return S_OK; + break; + case sizeof(BITMAPCOREHEADER2): case sizeof(BITMAPINFOHEADER): case sizeof(BITMAPV4HEADER): case sizeof(BITMAPV5HEADER): - *pDpiX = bih->bV5XPelsPerMeter * 0.0254; - *pDpiY = bih->bV5YPelsPerMeter * 0.0254; - return S_OK; - default: - return E_FAIL; - } + resx = bih->bV5XPelsPerMeter; + resy = bih->bV5YPelsPerMeter; + break; + } + + if (!resx || !resy) + { + *pDpiX = 96.0; + *pDpiY = 96.0; + } + else + { + *pDpiX = resx * 0.0254; + *pDpiY = resy * 0.0254; + } + + return S_OK; } static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -542,7 +542,7 @@ if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) return hr; encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); Modified: trunk/reactos/dll/win32/windowscodecs/colorcontext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -100,27 +100,82 @@ return ref; } +static HRESULT load_profile(const WCHAR *filename, BYTE **profile, UINT *len) +{ + HANDLE handle; + DWORD count; + LARGE_INTEGER size; + BOOL ret; + + *len = 0; + *profile = NULL; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); + + if (!(GetFileSizeEx(handle, &size))) + { + CloseHandle(handle); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (size.u.HighPart) + { + WARN("file too large\n"); + CloseHandle(handle); + return E_FAIL; + } + if (!(*profile = HeapAlloc(GetProcessHeap(), 0, size.u.LowPart))) + { + CloseHandle(handle); + return E_OUTOFMEMORY; + } + ret = ReadFile(handle, *profile, size.u.LowPart, &count, NULL); + CloseHandle(handle); + if (!ret) return HRESULT_FROM_WIN32(GetLastError()); + if (count != size.u.LowPart) return E_FAIL; + *len = count; + return S_OK; +} + static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *iface, LPCWSTR wzFilename) { - FIXME("(%p,%s)\n", iface, debugstr_w(wzFilename)); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + BYTE *profile; + UINT len; + HRESULT hr; + TRACE("(%p,%s)\n", iface, debugstr_w(wzFilename)); + + if (This->type != WICColorContextUninitialized && This->type != WICColorContextProfile) + return WINCODEC_ERR_WRONGSTATE; + + if (!wzFilename) return E_INVALIDARG; + + hr = load_profile(wzFilename, &profile, &len); + if (FAILED(hr)) return hr; + + HeapFree(GetProcessHeap(), 0, This->profile); + This->profile = profile; + This->profile_len = len; + This->type = WICColorContextProfile; + + return S_OK; } static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { ColorContext *This = impl_from_IWICColorContext(iface); + BYTE *profile; TRACE("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); - if (This->type != WICColorContextUninitialized) + if (This->type != WICColorContextUninitialized && This->type != WICColorContextProfile) return WINCODEC_ERR_WRONGSTATE; + if (!(profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) return E_OUTOFMEMORY; + memcpy(profile, pbBuffer, cbBufferSize); + HeapFree(GetProcessHeap(), 0, This->profile); - if (!(This->profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) - return E_OUTOFMEMORY; - - memcpy(This->profile, pbBuffer, cbBufferSize); + This->profile = profile; This->profile_len = cbBufferSize; This->type = WICColorContextProfile; Added: trunk/reactos/dll/win32/windowscodecs/colortransform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colortransform.c (added) +++ trunk/reactos/dll/win32/windowscodecs/colortransform.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -0,0 +1,195 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <config.h> + +#include <stdarg.h> + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wincodec.h> + +//#include "wincodecs_private.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct ColorTransform { + IWICColorTransform IWICColorTransform_iface; + LONG ref; + IWICBitmapSource *dst; +} ColorTransform; + +static inline ColorTransform *impl_from_IWICColorTransform(IWICColorTransform *iface) +{ + return CONTAINING_RECORD(iface, ColorTransform, IWICColorTransform_iface); +} + +static HRESULT WINAPI ColorTransform_QueryInterface(IWICColorTransform *iface, REFIID iid, + void **ppv) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICColorTransform, iid)) + { + *ppv = &This->IWICColorTransform_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->dst) IWICBitmapSource_Release(This->dst); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ColorTransform_GetSize(IWICColorTransform *iface, + UINT *puiWidth, UINT *puiHeight) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return IWICBitmapSource_GetSize(This->dst, puiWidth, puiHeight); +} + +static HRESULT WINAPI ColorTransform_GetPixelFormat(IWICColorTransform *iface, + WICPixelFormatGUID *pPixelFormat) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + return IWICBitmapSource_GetPixelFormat(This->dst, pPixelFormat); +} + +static HRESULT WINAPI ColorTransform_GetResolution(IWICColorTransform *iface, + double *pDpiX, double *pDpiY) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return IWICBitmapSource_GetResolution(This->dst, pDpiX, pDpiY); +} + +static HRESULT WINAPI ColorTransform_CopyPalette(IWICColorTransform *iface, + IWICPalette *pIPalette) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pIPalette); + + return IWICBitmapSource_CopyPalette(This->dst, pIPalette); +} + +static HRESULT WINAPI ColorTransform_CopyPixels(IWICColorTransform *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return IWICBitmapSource_CopyPixels(This->dst, prc, cbStride, cbBufferSize, pbBuffer); +} + +static HRESULT WINAPI ColorTransform_Initialize(IWICColorTransform *iface, + IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, + IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + IWICBitmapSource *dst; + HRESULT hr; + + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, + pIContextDest, debugstr_guid(pixelFmtDest)); + + FIXME("ignoring color contexts\n"); + + hr = WICConvertBitmapSource(pixelFmtDest, pIBitmapSource, &dst); + if (FAILED(hr)) return hr; + + if (This->dst) IWICBitmapSource_Release(This->dst); + This->dst = dst; + return S_OK; +} + +static const IWICColorTransformVtbl ColorTransform_Vtbl = { + ColorTransform_QueryInterface, + ColorTransform_AddRef, + ColorTransform_Release, + ColorTransform_GetSize, + ColorTransform_GetPixelFormat, + ColorTransform_GetResolution, + ColorTransform_CopyPalette, + ColorTransform_CopyPixels, + ColorTransform_Initialize +}; + +HRESULT ColorTransform_Create(IWICColorTransform **colortransform) +{ + ColorTransform *This; + + if (!colortransform) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorTransform)); + if (!This) return E_OUTOFMEMORY; + + This->IWICColorTransform_iface.lpVtbl = &ColorTransform_Vtbl; + This->ref = 1; + This->dst = NULL; + + *colortransform = &This->IWICColorTransform_iface; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/windowscodecs/colortransform.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -53,6 +53,7 @@ format_16bppBGR565, format_16bppBGRA5551, format_24bppBGR, + format_24bppRGB, format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, @@ -96,7 +97,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -163,7 +164,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -226,7 +227,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -286,7 +287,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -328,7 +329,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -381,7 +382,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -423,7 +424,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -471,7 +472,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -519,7 +520,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -567,7 +568,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -606,11 +607,59 @@ return res; } return S_OK; + case format_24bppRGB: + if (prc) + { + HRESULT res; + INT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + BYTE tmppixel[3]; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + tmppixel[0]=*srcpixel++; /* red */ + tmppixel[1]=*srcpixel++; /* green */ + tmppixel[2]=*srcpixel++; /* blue */ + + *dstpixel++=tmppixel[2]; /* blue */ + *dstpixel++=tmppixel[1]; /* green */ + *dstpixel++=tmppixel[0]; /* red */ + *dstpixel++=255; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_32bppBGR: if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -629,7 +678,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); if (FAILED(res)) return res; @@ -651,7 +700,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -695,7 +744,7 @@ if (prc) { HRESULT res; - UINT x, y; + INT x, y; BYTE *srcdata; UINT srcstride, srcdatasize; const BYTE *srcrow; @@ -793,7 +842,7 @@ hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); if (SUCCEEDED(hr) && prc) { - UINT x, y; + INT x, y; for (y=0; y<prc->Height; y++) for (x=0; x<prc->Width; x++) @@ -808,6 +857,144 @@ } } return hr; + } +} + +static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_24bppBGR: + case format_24bppRGB: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (SUCCEEDED(hr) && source_format == format_24bppRGB) + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + return hr; + } + return S_OK; + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + INT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + *dstpixel++=*srcpixel++; /* blue */ + *dstpixel++=*srcpixel++; /* green */ + *dstpixel++=*srcpixel++; /* red */ + srcpixel++; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + default: + FIXME("Unimplemented conversion path!\n"); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } +} + +static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_24bppBGR: + case format_24bppRGB: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (SUCCEEDED(hr) && source_format == format_24bppBGR) + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + return hr; + } + return S_OK; + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + INT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + *dstpixel++=*srcpixel++; /* blue */ + *dstpixel++=*srcpixel++; /* green */ + *dstpixel++=*srcpixel++; /* red */ + srcpixel++; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + default: + FIXME("Unimplemented conversion path!\n"); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } } @@ -824,7 +1011,8 @@ {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, NULL}, - {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, + {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, copypixels_to_24bppBGR}, + {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1145,7 +1145,7 @@ seek.QuadPart = 0; IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - IStream_Read(pIStream, &This->LSD_data, sizeof(This->LSD_data), NULL); + IStream_Read(pIStream, This->LSD_data, sizeof(This->LSD_data), NULL); This->initialized = TRUE; Modified: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -667,7 +667,7 @@ goto end; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) goto end; Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -203,8 +203,8 @@ static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p)\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return IWICBitmapFrameDecode_QueryInterface(iface, &IID_IWICBitmapSource, (void **)ppIThumbnail); } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { @@ -296,7 +296,7 @@ { /* If the alpha channel is fully transparent, we should ignore it. */ int nonzero_alpha = 0; - int i; + UINT i; for (i=0; i<(result->height*result->width); i++) { Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +29,7 @@ #include <windef.h> #include <winbase.h> +#include <wingdi.h> //#include "winreg.h" #include <objbase.h> //#include "shellapi.h" @@ -241,9 +243,24 @@ IWICComponentFactory *iface, ULONG_PTR hFile, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%lx,%s,%u,%p): stub\n", iface, hFile, debugstr_guid(pguidVendor), + IWICStream *stream; + HRESULT hr; + + TRACE("(%p,%lx,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); - return E_NOTIMPL; + + hr = StreamImpl_Create(&stream); + if (SUCCEEDED(hr)) + { + hr = stream_initialize_from_filehandle(stream, (HANDLE)hFile); + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateDecoderFromStream(iface, (IStream*)stream, + pguidVendor, metadataOptions, ppIDecoder); + } + IWICStream_Release(stream); + } + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentInfo(IWICComponentFactory *iface, @@ -453,8 +470,8 @@ static HRESULT WINAPI ComponentFactory_CreateColorTransformer(IWICComponentFactory *iface, IWICColorTransform **ppIColorTransform) { - FIXME("(%p,%p): stub\n", iface, ppIColorTransform); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIColorTransform); + return ColorTransform_Create(ppIColorTransform); } static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, @@ -463,7 +480,7 @@ { TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, @@ -510,7 +527,7 @@ } if (SUCCEEDED(hr)) - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); if (SUCCEEDED(hr)) { @@ -580,12 +597,15 @@ } static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) -{ - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); - return E_NOTIMPL; + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, + UINT size, BYTE *buffer, IWICBitmap **bitmap) +{ + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, + debugstr_guid(format), stride, size, buffer, bitmap); + + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; + + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, @@ -597,10 +617,140 @@ } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactory *iface, - HICON hIcon, IWICBitmap **ppIBitmap) -{ - FIXME("(%p,%p,%p): stub\n", iface, hIcon, ppIBitmap); - return E_NOTIMPL; + HICON hicon, IWICBitmap **bitmap) +{ + IWICBitmapLock *lock; + ICONINFO info; + BITMAP bm; + int width, height, x, y; + UINT stride, size; + BYTE *buffer; + DWORD *bits; + BITMAPINFO bi; + HDC hdc; + BOOL has_alpha; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, hicon, bitmap); + + if (!bitmap) return E_INVALIDARG; + + if (!GetIconInfo(hicon, &info)) + return HRESULT_FROM_WIN32(GetLastError()); + + GetObjectW(info.hbmColor ? info.hbmColor : info.hbmMask, sizeof(bm), &bm); + + width = bm.bmWidth; + height = info.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; + size = stride * height; + + hr = BitmapImpl_Create(width, height, stride, size, NULL, + &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); + if (hr != S_OK) goto failed; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (hr != S_OK) + { + IWICBitmap_Release(*bitmap); + goto failed; + } + IWICBitmapLock_GetDataPointer(lock, &size, &buffer); + + hdc = CreateCompatibleDC(0); + + memset(&bi, 0, sizeof(bi)); + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = width; + bi.bmiHeader.biHeight = info.hbmColor ? -height: -height * 2; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + + has_alpha = FALSE; + + if (info.hbmColor) + { + GetDIBits(hdc, info.hbmColor, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (bm.bmBitsPixel == 32) + { + /* If any pixel has a non-zero alpha, ignore hbmMask */ + bits = (DWORD *)buffer; + for (x = 0; x < width && !has_alpha; x++, bits++) + { + for (y = 0; y < height; y++) + { + if (*bits & 0xff000000) + { + has_alpha = TRUE; + break; + } + } + } + } + } + else + GetDIBits(hdc, info.hbmMask, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (!has_alpha) + { + DWORD *rgba; + + if (info.hbmMask) + { + BYTE *mask; + + mask = HeapAlloc(GetProcessHeap(), 0, size); + if (!mask) + { + IWICBitmapLock_Release(lock); + IWICBitmap_Release(*bitmap); + DeleteDC(hdc); + hr = E_OUTOFMEMORY; + goto failed; + } + + /* read alpha data from the mask */ + GetDIBits(hdc, info.hbmMask, info.hbmColor ? 0 : height, height, mask, &bi, DIB_RGB_COLORS); + + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + bits = (DWORD *)(mask + y * stride); + + for (x = 0; x < width; x++, rgba++, bits++) + { + if (*bits) + *rgba = 0; + else + *rgba |= 0xff000000; + } + } + + HeapFree(GetProcessHeap(), 0, mask); + } + else + { + /* set constant alpha of 255 */ + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + for (x = 0; x < width; x++, rgba++) + *rgba |= 0xff000000; + } + } + + } + + IWICBitmapLock_Release(lock); + DeleteDC(hdc); + +failed: + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentEnumerator(IWICComponentFactory *iface, @@ -691,8 +841,8 @@ static HRESULT WINAPI ComponentFactory_CreateEncoderPropertyBag(IWICComponentFactory *iface, PROPBAG2 *options, UINT count, IPropertyBag2 **property) { - FIXME("%p,%p,%u,%p: stub\n", iface, options, count, property); - return E_NOTIMPL; + TRACE("(%p,%p,%u,%p)\n", iface, options, count, property); + return CreatePropertyBag2(options, count, property); } static const IWICComponentFactoryVtbl ComponentFactory_Vtbl = { Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -543,7 +543,8 @@ WICBitmapPattern *patterns; UINT pattern_count=0, patterns_size=0; HRESULT hr; - int i, pos; + UINT i; + ULONG pos; BYTE *data=NULL; ULONG datasize=0; ULONG bytesread; @@ -1904,7 +1905,7 @@ IUnknown **rgelt, ULONG *pceltFetched) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched=0; + ULONG num_fetched=0; ComponentEnumItem *item; HRESULT hr=S_OK; @@ -1933,7 +1934,7 @@ static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int i; + ULONG i; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1002,7 +1002,8 @@ JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; BYTE *swapped_data = NULL, *current_row; - int line, row_size; + UINT line; + int row_size; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); EnterCriticalSection(&This->lock); @@ -1065,7 +1066,7 @@ { if (This->format->swap_rgb) { - int x; + UINT x; memcpy(swapped_data, pbPixels + (cbStride * line), row_size); @@ -1393,7 +1394,7 @@ return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ma… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -89,7 +89,8 @@ return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ - if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && srcstride == dststride) + if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && + srcstride == dststride && srcstride == bytesperrow) { memcpy(dstbuffer, srcbuffer, srcstride * srcheight); return S_OK; @@ -100,7 +101,7 @@ if (row_offset % 8 == 0) { /* everything lines up on a byte boundary */ - UINT row; + INT row; const BYTE *src; BYTE *dst; Modified: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -64,7 +64,7 @@ static void MetadataHandler_FreeItems(MetadataHandler *This) { - int i; + DWORD i; for (i=0; i<This->item_count; i++) { @@ -559,7 +559,7 @@ MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG new_index; HRESULT hr=S_FALSE; - int i; + ULONG i; TRACE("(%p,%i)\n", iface, celt); Modified: trunk/reactos/dll/win32/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pa… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -596,7 +596,7 @@ static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { PaletteImpl *This = impl_from_IWICPalette(iface); - int i; + UINT i; TRACE("(%p,%p)\n", iface, pfHasAlpha); Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -80,7 +80,7 @@ return hr; } - /* FIXME: Verify the CRC? */ + /* Windows ignores CRC of the chunk */ } return S_OK; @@ -178,6 +178,7 @@ MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -226,6 +227,7 @@ LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -442,6 +444,7 @@ goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(This->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); /* seek to the start of the stream */ seek.QuadPart = 0; @@ -634,8 +637,12 @@ static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + + if (!ppIBitmapSource) return E_INVALIDARG; + + *ppIBitmapSource = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, @@ -649,6 +656,10 @@ IWICBitmapSource **ppIThumbnail) { TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; return WINCODEC_ERR_CODECNOTHUMBNAIL; } @@ -791,7 +802,7 @@ png_colorp png_palette; int num_palette; WICColor palette[256]; - png_bytep trans; + png_bytep trans_alpha; int num_trans; png_color_16p trans_values; int i; @@ -815,21 +826,16 @@ goto end; } + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); + if (!ret) num_trans = 0; + for (i=0; i<num_palette; i++) { - palette[i] = (0xff000000| + BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; + palette[i] = (alpha << 24 | png_palette[i].red << 16| png_palette[i].green << 8| png_palette[i].blue); - } - - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - if (ret) - { - for (i=0; i<num_trans; i++) - { - palette[trans[i]] = 0x00000000; - } } end: @@ -899,8 +905,12 @@ static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { @@ -1607,7 +1617,7 @@ return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2013 Ludger Sprenker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,8 +29,9 @@ #include <windef.h> #include <winbase.h> -#include <objbase.h> +#include <ole2.h> #include <wincodec.h> +#include <wine/unicode.h> //#include "wincodecs_private.h" @@ -40,6 +42,9 @@ typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref; + UINT prop_count; + PROPBAG2 *properties; + VARIANT *values; } PropertyBag; static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) @@ -89,37 +94,179 @@ if (ref == 0) { + ULONG i; + if (This->properties && This->values) + { + for (i=0; i < This->prop_count; i++) + { + HeapFree(GetProcessHeap(), 0, This->properties[i].pstrName); + VariantClear( This->values+i ); + } + } + + HeapFree(GetProcessHeap(), 0, This->properties); + HeapFree(GetProcessHeap(), 0, This->values); HeapFree(GetProcessHeap(), 0, This); } return ref; +} + +static LONG find_item(PropertyBag *This, LPCOLESTR name) +{ + LONG i; + if (!This->properties) + return -1; + if (!name) + return -1; + + for (i=0; i < This->prop_count; i++) + { + if (strcmpW(name, This->properties[i].pstrName) == 0) + return i; + } + + return -1; } static HRESULT WINAPI PropertyBag_Read(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) { - FIXME("(%p,%u,%p,%p,%p,%p): stub\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%p,%p,%p,%p)\n", iface, cProperties, pPropBag, pErrLog, pvarValue, phrError); + + for (i=0; i < cProperties; i++) + { + LONG idx; + if (pPropBag[i].dwHint && pPropBag[i].dwHint <= This->prop_count) + idx = pPropBag[i].dwHint-1; + else + idx = find_item(This, pPropBag[i].pstrName); + + if (idx > -1) + { + VariantInit(pvarValue+i); + res = VariantCopy(pvarValue+i, This->values+idx); + if (FAILED(res)) + break; + phrError[i] = res; + } + else + { + res = E_FAIL; + break; + } + } + + return res; } static HRESULT WINAPI PropertyBag_Write(IPropertyBag2 *iface, ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cProperties, pPropBag, pvarValue); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cProperties, pPropBag, pvarValue); + + for (i=0; i < cProperties; i++) + { + LONG idx; + if (pPropBag[i].dwHint && pPropBag[i].dwHint <= This->prop_count) + idx = pPropBag[i].dwHint-1; + else + idx = find_item(This, pPropBag[i].pstrName); + + if (idx > -1) + { + if (This->properties[idx].vt != V_VT(pvarValue+i)) + return WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE; + res = VariantCopy(This->values+idx, pvarValue+i); + if (FAILED(res)) + return E_FAIL; + } + else + { + if (pPropBag[i].pstrName) + FIXME("Application tried to set the unknown option %s.\n", + debugstr_w(pPropBag[i].pstrName)); + + /* FIXME: Function is not atomar on error, but MSDN does not say anything about it + * (no reset of items between 0 and i-1) */ + return E_FAIL; + } + } + + return res; } static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *pcProperties) { - FIXME("(%p,%p): stub\n", iface, pcProperties); - return E_NOTIMPL; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%p)\n", iface, pcProperties); + + if (!pcProperties) + return E_INVALIDARG; + + *pcProperties = This->prop_count; + + return S_OK; +} + +static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src, BOOL useCoAlloc) +{ + dest->cfType = src->cfType; + dest->clsid = src->clsid; + dest->dwHint = src->dwHint; + dest->dwType = src->dwType; + dest->vt = src->vt; + if(useCoAlloc) + dest->pstrName = CoTaskMemAlloc((strlenW(src->pstrName)+1) * sizeof(WCHAR)); + else + dest->pstrName = HeapAlloc(GetProcessHeap(), 0, (strlenW(src->pstrName)+1) * sizeof(WCHAR)); + + if(!dest->pstrName) + return E_OUTOFMEMORY; + + strcpyW(dest->pstrName, src->pstrName); + + return S_OK; } static HRESULT WINAPI PropertyBag_GetPropertyInfo(IPropertyBag2 *iface, ULONG iProperty, ULONG cProperties, PROPBAG2 *pPropBag, ULONG *pcProperties) { - FIXME("(%p,%u,%u,%p,%p): stub\n", iface, iProperty, cProperties, pPropBag, pcProperties); - return E_NOTIMPL; + HRESULT res = S_OK; + ULONG i; + PropertyBag *This = impl_from_IPropertyBag2(iface); + + TRACE("(%p,%u,%u,%p,%p)\n", iface, iProperty, cProperties, pPropBag, pcProperties); + + if (iProperty >= This->prop_count && iProperty > 0) + return WINCODEC_ERR_VALUEOUTOFRANGE; + if (iProperty+cProperties > This->prop_count ) + return WINCODEC_ERR_VALUEOUTOFRANGE; + + *pcProperties = max(cProperties, This->prop_count-iProperty); + + for (i=0; i < *pcProperties; i++) + { + res = copy_propbag2(pPropBag+i, This->properties+iProperty+i, TRUE); + if (FAILED(res)) + { + do { + CoTaskMemFree( pPropBag[--i].pstrName ); + } while (i); + break; + } + } + + return res; } static HRESULT WINAPI PropertyBag_LoadObject(IPropertyBag2 *iface, LPCOLESTR pstrName, @@ -140,8 +287,11 @@ PropertyBag_LoadObject }; -HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) -{ +HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **ppPropertyBag2) +{ + UINT i; + HRESULT res = S_OK; PropertyBag *This; This = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyBag)); @@ -149,8 +299,37 @@ This->IPropertyBag2_iface.lpVtbl = &PropertyBag_Vtbl; This->ref = 1; - - *ppPropertyBag2 = &This->IPropertyBag2_iface; - - return S_OK; -} + This->prop_count = count; + + if (count == 0) + { + This->properties = NULL; + This->values = NULL; + } + else + { + This->properties = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROPBAG2)*count); + This->values = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*count); + + if (!This->properties || !This->values) + res = E_OUTOFMEMORY; + else + for (i=0; i < count; i++) + { + res = copy_propbag2(This->properties+i, options+i, FALSE); + if (FAILED(res)) + break; + This->properties[i].dwHint = i+1; /* 0 means unset, so we start with 1 */ + } + } + + if (FAILED(res)) + { + PropertyBag_Release(&This->IPropertyBag2_iface); + *ppPropertyBag2 = NULL; + } + else + *ppPropertyBag2 = &This->IPropertyBag2_iface; + + return res; +} Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1471,6 +1471,7 @@ &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat16bppBGRA5551, &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat24bppRGB, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, @@ -1852,6 +1853,17 @@ { &GUID_WICPixelFormat24bppBGR, "The Wine Project", "24bpp BGR", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 24, /* bitsperpixel */ + 3, /* channel count */ + channel_masks_8bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 0 + }, + { &GUID_WICPixelFormat24bppRGB, + "The Wine Project", + "24bpp RGB", NULL, /* no version */ &GUID_VendorMicrosoft, 24, /* bitsperpixel */ Modified: trunk/reactos/dll/win32/windowscodecs/scaler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/sc… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -182,7 +182,7 @@ UINT dst_x, UINT dst_y, UINT dst_width, BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) { - int i; + UINT i; UINT bytesperpixel = This->bpp/8; UINT src_x, src_y; Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -29,7 +29,7 @@ #include <objbase.h> #include <shlwapi.h> #include <wincodec.h> -//#include "wincodecs_private.h" +#include "wincodecs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -268,6 +268,175 @@ }; /****************************************** + * StreamOnFileHandle implementation (internal) + * + */ +typedef struct StreamOnFileHandle { + IStream IStream_iface; + LONG ref; + + HANDLE map; + void *mem; + IWICStream *stream; +} StreamOnFileHandle; + +static inline StreamOnFileHandle *StreamOnFileHandle_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, StreamOnFileHandle, IStream_iface); +} + +static HRESULT WINAPI StreamOnFileHandle_QueryInterface(IStream *iface, + REFIID iid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || + IsEqualIID(&IID_ISequentialStream, iid)) + { + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI StreamOnFileHandle_AddRef(IStream *iface) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI StreamOnFileHandle_Release(IStream *iface) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) { + IWICStream_Release(This->stream); + UnmapViewOfFile(This->mem); + CloseHandle(This->map); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface, + void *pv, ULONG cb, ULONG *pcbRead) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Read(This->stream, pv, cb, pcbRead); +} + +static HRESULT WINAPI StreamOnFileHandle_Write(IStream *iface, + void const *pv, ULONG cb, ULONG *pcbWritten) +{ + ERR("(%p)\n", iface); + return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED); +} + +static HRESULT WINAPI StreamOnFileHandle_Seek(IStream *iface, + LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Seek(This->stream, dlibMove, dwOrigin, plibNewPosition); +} + +static HRESULT WINAPI StreamOnFileHandle_SetSize(IStream *iface, + ULARGE_INTEGER libNewSize) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_CopyTo(IStream *iface, + IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface, + DWORD grfCommitFlags) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Revert(IStream *iface) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Stat(IStream *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Stat(This->stream, pstatstg, grfStatFlag); +} + +static HRESULT WINAPI StreamOnFileHandle_Clone(IStream *iface, + IStream **ppstm) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + + +static const IStreamVtbl StreamOnFileHandle_Vtbl = +{ + /*** IUnknown methods ***/ + StreamOnFileHandle_QueryInterface, + StreamOnFileHandle_AddRef, + StreamOnFileHandle_Release, + /*** ISequentialStream methods ***/ + StreamOnFileHandle_Read, + StreamOnFileHandle_Write, + /*** IStream methods ***/ + StreamOnFileHandle_Seek, + StreamOnFileHandle_SetSize, + StreamOnFileHandle_CopyTo, + StreamOnFileHandle_Commit, + StreamOnFileHandle_Revert, + StreamOnFileHandle_LockRegion, + StreamOnFileHandle_UnlockRegion, + StreamOnFileHandle_Stat, + StreamOnFileHandle_Clone, +}; + +/****************************************** * StreamOnStreamRange implementation * * Used by IWICStream_InitializeFromIStreamRegion @@ -827,6 +996,76 @@ } return S_OK; +} + +static HRESULT map_file(HANDLE file, HANDLE *map, void **mem, LARGE_INTEGER *size) +{ + *map = NULL; + if (!GetFileSizeEx(file, size)) return HRESULT_FROM_WIN32(GetLastError()); + if (size->u.HighPart) + { + WARN("file too large\n"); + return E_FAIL; + } + if (!(*map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, size->u.LowPart, NULL))) + { + return HRESULT_FROM_WIN32(GetLastError()); + } + if (!(*mem = MapViewOfFile(*map, FILE_MAP_READ, 0, 0, size->u.LowPart))) + { + CloseHandle(*map); + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; +} + +HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE file) +{ + IWICStreamImpl *This = impl_from_IWICStream(iface); + StreamOnFileHandle *pObject; + IWICStream *stream = NULL; + HANDLE map; + void *mem; + LARGE_INTEGER size; + HRESULT hr; + TRACE("(%p,%p)\n", iface, file); + + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + hr = map_file(file, &map, &mem, &size); + if (FAILED(hr)) return hr; + + hr = StreamImpl_Create(&stream); + if (FAILED(hr)) goto error; + + hr = IWICStreamImpl_InitializeFromMemory(stream, mem, size.u.LowPart); + if (FAILED(hr)) goto error; + + pObject = HeapAlloc(GetProcessHeap(), 0, sizeof(StreamOnFileHandle)); + if (!pObject) + { + hr = E_OUTOFMEMORY; + goto error; + } + pObject->IStream_iface.lpVtbl = &StreamOnFileHandle_Vtbl; + pObject->ref = 1; + pObject->map = map; + pObject->mem = mem; + pObject->stream = stream; + + if (InterlockedCompareExchangePointer((void**)&This->pStream, pObject, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(&pObject->IStream_iface); + return WINCODEC_ERR_WRONGSTATE; + } + return S_OK; + +error: + if (stream) IWICStream_Release(stream); + UnmapViewOfFile(mem); + CloseHandle(map); + return hr; } static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *iface, Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Thu May 23 16:39:54 2013 @@ -1109,8 +1109,34 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + const BYTE *profile; + UINT len; + HRESULT hr; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + EnterCriticalSection(&This->parent->lock); + + if (pTIFFGetField(This->parent->tiff, TIFFTAG_ICCPROFILE, &len, &profile)) + { + if (cCount && ppIColorContexts) + { + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->parent->lock); + return hr; + } + } + *pcActualCount = 1; + } + else + *pcActualCount = 0; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, @@ -1308,6 +1334,7 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormat24bppRGB, 2, 8, 3, 24, 0, 0, 0}, {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, @@ -1886,7 +1913,7 @@ if (SUCCEEDED(hr)) { - hr = CreatePropertyBag2(ppIEncoderOptions); + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); } if (SUCCEEDED(hr)) Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Thu May 23 16:39:54 2013 @@ -68,6 +68,7 @@ typedef void (__cdecl typeof(png_write_info))(struct png_struct_def *, struct png_info_def *); typedef void (__cdecl typeof(png_write_rows))(struct png_struct_def *, unsigned char **row, unsigned int); typedef unsigned int (__cdecl typeof(png_get_iCCP))(struct png_struct_def *, struct png_info_def *, char **, int *, char **, unsigned int *); +typedef void (__cdecl typeof(png_set_crc_action))(struct png_struct_def *, int, int); typedef void *thandle_t_1; typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, int); Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Thu May 23 16:39:54 2013 @@ -45,6 +45,7 @@ extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; @@ -52,6 +53,7 @@ extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; +extern HRESULT ColorTransform_Create(IWICColorTransform **transform) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, @@ -61,7 +63,8 @@ extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) DECLSPEC_HIDDEN; +extern HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, + IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; @@ -102,4 +105,6 @@ extern HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; + #endif /* WINCODECS_PRIVATE_H */ Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… ============================================================================== --- trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] Thu May 23 16:39:54 2013 @@ -156,6 +156,18 @@ WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = CODEC_FORCE_DWORD } WICPixelFormatNumericRepresentation; +typedef enum WICTiffCompressionOption { + WICTiffCompressionDontCare = 0x00000000, + WICTiffCompressionNone = 0x00000001, + WICTiffCompressionCCITT3 = 0x00000002, + WICTiffCompressionCCITT4 = 0x00000003, + WICTiffCompressionLZW = 0x00000004, + WICTiffCompressionRLE = 0x00000005, + WICTiffCompressionZIP = 0x00000006, + WICTiffCompressionLZWHDifferencing = 0x00000007, + WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICTiffCompressionOption; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -177,6 +189,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGRA5551, 0x05ec7c2b,0xf1e6,0x4961,0xad,0x46,0xe1,0xcc,0x81,0x0a,0x87,0xd2);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0d);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") @@ -212,11 +225,14 @@ cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") +cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") +cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e") +cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") interface IWICPalette; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu May 23 16:39:54 2013 @@ -187,7 +187,7 @@ reactos/dll/win32/vbscript # Synced to Wine-1.5.26 reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync -reactos/dll/win32/windowscodecs # Synced to Wine-1.5.19 +reactos/dll/win32/windowscodecs # Synced to Wine-1.5.26 reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.19 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to Wine-1.5.26

1 0

[ekohl] 59070: [NETAPI32] - Add stubs for missing NetGroup functions. - Update header file.
by ekohl＠svn.reactos.org 23 May '13

23 May '13

Author: ekohl Date: Thu May 23 15:20:29 2013 New Revision: 59070 URL: http://svn.reactos.org/svn/reactos?rev=59070&view=rev Log: [NETAPI32] - Add stubs for missing NetGroup functions. - Update header file. Modified: trunk/reactos/dll/win32/netapi32/group.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/include/psdk/lmaccess.h Modified: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Thu May 23 15:20:29 2013 @@ -22,12 +22,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -/* -@ stub NetGroupAdd -@ stub NetGroupAddUser -@ stub NetGroupDel -@ stub NetGroupDelUser -*/ + +/************************************************************ + * NetGroupAdd (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupAdd(IN LPCWSTR servername, + IN DWORD level, + IN LPBYTE buf, + OUT LPDWORD parm_err) +{ + FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), + level, buf, parm_err); + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetGroupAddUser (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupAddUser(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN LPCWSTR username) +{ + FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), + debugstr_w(groupname), debugstr_w(username)); + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetGroupDel (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupDel(IN LPCWSTR servername, + IN LPCWSTR groupname) +{ + FIXME("(%s, %s) stub!\n", debugstr_w(servername), + debugstr_w(groupname)); + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetGroupDelUser (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupDelUser(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN LPCWSTR username) +{ + FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), + debugstr_w(groupname), debugstr_w(username)); + return ERROR_ACCESS_DENIED; +} + /************************************************************ * NetGroupEnum (NETAPI32.@) @@ -35,18 +93,19 @@ */ NET_API_STATUS WINAPI -NetGroupEnum(LPCWSTR servername, - DWORD level, - LPBYTE *bufptr, - DWORD prefmaxlen, - LPDWORD entriesread, - LPDWORD totalentries, - LPDWORD resume_handle) +NetGroupEnum(IN LPCWSTR servername, + IN DWORD level, + OUT LPBYTE *bufptr, + IN DWORD prefmaxlen, + OUT LPDWORD entriesread, + OUT LPDWORD totalentries, + IN OUT PDWORD_PTR resume_handle) { FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); return ERROR_ACCESS_DENIED; } + /************************************************************ * NetGroupGetInfo (NETAPI32.@) @@ -54,17 +113,72 @@ */ NET_API_STATUS WINAPI -NetGroupGetInfo(LPCWSTR servername, - LPCWSTR groupname, - DWORD level, - LPBYTE *bufptr) +NetGroupGetInfo(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN DWORD level, + OUT LPBYTE *bufptr) { - FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); + FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), + debugstr_w(groupname), level, bufptr); return ERROR_ACCESS_DENIED; } -/* -@ stub NetGroupGetUsers -@ stub NetGroupSetInfo -@ stub NetGroupSetUsers -*/ + +/************************************************************ + * NetGroupGetUsers (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupGetUsers(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN DWORD level, + OUT LPBYTE *bufptr, + IN DWORD prefmaxlen, + OUT LPDWORD entriesread, + OUT LPDWORD totalentries, + IN OUT PDWORD_PTR resume_handle) +{ + FIXME("(%s, %s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), + debugstr_w(groupname), level, bufptr, prefmaxlen, entriesread, + totalentries, resume_handle); + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetGroupSetInfo (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupSetInfo(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN DWORD level, + IN LPBYTE buf, + OUT LPDWORD parm_err) +{ + FIXME("(%s, %s, %d, %p, %p) stub!\n", debugstr_w(servername), + debugstr_w(groupname), level, buf, parm_err); + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetGroupSetUsers (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupSetUsers(IN LPCWSTR servername, + IN LPCWSTR groupname, + IN DWORD level, + IN LPBYTE buf, + IN DWORD totalentries) +{ + FIXME("(%s, %s, %d, %p, %d) stub!\n", debugstr_w(servername), + debugstr_w(groupname), level, buf, totalentries); + return ERROR_ACCESS_DENIED; +} + +/* EOF */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Thu May 23 15:20:29 2013 @@ -94,15 +94,15 @@ @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr) -@ stub NetGroupAdd -@ stub NetGroupAddUser -@ stub NetGroupDel -@ stub NetGroupDelUser +@ stdcall NetGroupAdd(wstr long ptr ptr) +@ stdcall NetGroupAddUser(wstr wstr wstr) +@ stdcall NetGroupDel(wstr wstr) +@ stdcall NetGroupDelUser(wstr wstr wstr) @ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetGroupGetInfo(wstr wstr long ptr) -@ stub NetGroupGetUsers -@ stub NetGroupSetInfo -@ stub NetGroupSetUsers +@ stdcall NetGroupGetUsers(wstr wstr long ptr long ptr ptr ptr) +@ stdcall NetGroupSetInfo(wstr wstr long ptr ptr) +@ stdcall NetGroupSetUsers(wstr wstr long ptr long) @ stdcall NetLocalGroupAdd(wstr long ptr ptr) @ stdcall NetLocalGroupAddMember(wstr wstr ptr) @ stdcall NetLocalGroupAddMembers(wstr wstr long ptr long) Modified: trunk/reactos/include/psdk/lmaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmaccess.h?re… ============================================================================== --- trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmaccess.h [iso-8859-1] Thu May 23 15:20:29 2013 @@ -614,12 +614,12 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetGroupAddUser(LPCWSTR,LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); +NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR); NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); NET_API_STATUS WINAPI NetGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetGroupDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetGroupDelUser(LPCWSTR,LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetGroupGetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); +NET_API_STATUS WINAPI NetGroupGetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD_PTR); NET_API_STATUS WINAPI NetGroupSetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD); NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD); NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID);

1 0

[ekohl] 59069: [SAMSRV] Move some alias-specific code to alias.c, for later use by the setup code.
by ekohl＠svn.reactos.org 23 May '13

23 May '13

Author: ekohl Date: Thu May 23 09:42:25 2013 New Revision: 59069 URL: http://svn.reactos.org/svn/reactos?rev=59069&view=rev Log: [SAMSRV] Move some alias-specific code to alias.c, for later use by the setup code. Modified: trunk/reactos/dll/win32/samsrv/alias.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Thu May 23 09:42:25 2013 @@ -39,4 +39,191 @@ AliasObject); } + +NTSTATUS +SampAddMemberToAlias(IN PSAM_DB_OBJECT AliasObject, + IN PRPC_SID MemberId) +{ + LPWSTR MemberIdString = NULL; + HANDLE MembersKeyHandle = NULL; + HANDLE MemberKeyHandle = NULL; + ULONG MemberIdLength; + NTSTATUS Status; + + TRACE("(%p %p)\n", + AliasObject, MemberId); + + ConvertSidToStringSidW(MemberId, &MemberIdString); + TRACE("Member SID: %S\n", MemberIdString); + + MemberIdLength = RtlLengthSid(MemberId); + + Status = SampRegCreateKey(AliasObject->KeyHandle, + L"Members", + KEY_WRITE, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegSetValue(MembersKeyHandle, + MemberIdString, + REG_BINARY, + MemberId, + MemberIdLength); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegCreateKey(AliasObject->MembersKeyHandle, + MemberIdString, + KEY_WRITE, + &MemberKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegSetValue(MemberKeyHandle, + AliasObject->Name, + REG_BINARY, + MemberId, + MemberIdLength); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); + goto done; + } + +done: + if (MemberKeyHandle != NULL) + SampRegCloseKey(MemberKeyHandle); + + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (MemberIdString != NULL) + LocalFree(MemberIdString); + + return Status; +} + + +NTSTATUS +NTAPI +SampRemoveMemberFromAlias(IN PSAM_DB_OBJECT AliasObject, + IN PRPC_SID MemberId) +{ + LPWSTR MemberIdString = NULL; + HANDLE MembersKeyHandle = NULL; + HANDLE MemberKeyHandle = NULL; + ULONG ulValueCount; + NTSTATUS Status; + + TRACE("(%p %p)\n", + AliasObject, MemberId); + + ConvertSidToStringSidW(MemberId, &MemberIdString); + TRACE("Member SID: %S\n", MemberIdString); + + Status = SampRegOpenKey(AliasObject->MembersKeyHandle, + MemberIdString, + KEY_WRITE | KEY_QUERY_VALUE, + &MemberKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegDeleteValue(MemberKeyHandle, + AliasObject->Name); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegQueryKeyInfo(MemberKeyHandle, + NULL, + &ulValueCount); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + if (ulValueCount == 0) + { + SampRegCloseKey(MemberKeyHandle); + MemberKeyHandle = NULL; + + Status = SampRegDeleteKey(AliasObject->MembersKeyHandle, + MemberIdString); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); + goto done; + } + } + + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_WRITE | KEY_QUERY_VALUE, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegDeleteValue(MembersKeyHandle, + MemberIdString); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &ulValueCount); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + if (ulValueCount == 0) + { + SampRegCloseKey(MembersKeyHandle); + MembersKeyHandle = NULL; + + Status = SampRegDeleteKey(AliasObject->KeyHandle, + L"Members"); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); + goto done; + } + } + +done: + if (MemberKeyHandle != NULL) + SampRegCloseKey(MemberKeyHandle); + + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (MemberIdString != NULL) + LocalFree(MemberIdString); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Thu May 23 09:42:25 2013 @@ -4669,7 +4669,7 @@ &AliasObject); if (!NT_SUCCESS(Status)) { - TRACE("failed with status 0x%08lx\n", Status); + TRACE("SampValidateDbObject failed (Status 0x%08lx)\n", Status); return Status; } @@ -4704,14 +4704,9 @@ IN PRPC_SID MemberId) { PSAM_DB_OBJECT AliasObject; - LPWSTR MemberIdString = NULL; - HANDLE MembersKeyHandle = NULL; - HANDLE MemberKeyHandle = NULL; - ULONG MemberIdLength; - NTSTATUS Status; - - TRACE("SamrAddMemberToAlias(%p %p)\n", - AliasHandle, MemberId); + NTSTATUS Status; + + TRACE("(%p %p)\n", AliasHandle, MemberId); /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, @@ -4724,62 +4719,12 @@ return Status; } - ConvertSidToStringSidW(MemberId, &MemberIdString); - TRACE("Member SID: %S\n", MemberIdString); - - MemberIdLength = RtlLengthSid(MemberId); - - Status = SampRegCreateKey(AliasObject->KeyHandle, - L"Members", - KEY_WRITE, - &MembersKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegSetValue(MembersKeyHandle, - MemberIdString, - REG_BINARY, - MemberId, - MemberIdLength); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegCreateKey(AliasObject->MembersKeyHandle, - MemberIdString, - KEY_WRITE, - &MemberKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegSetValue(MemberKeyHandle, - AliasObject->Name, - REG_BINARY, - MemberId, - MemberIdLength); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); - goto done; - } - -done: - if (MemberKeyHandle != NULL) - SampRegCloseKey(MemberKeyHandle); - - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - - if (MemberIdString != NULL) - LocalFree(MemberIdString); + Status = SampAddMemberToAlias(AliasObject, + MemberId); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + } return Status; } @@ -4792,14 +4737,9 @@ IN PRPC_SID MemberId) { PSAM_DB_OBJECT AliasObject; - LPWSTR MemberIdString = NULL; - HANDLE MembersKeyHandle = NULL; - HANDLE MemberKeyHandle = NULL; - ULONG ulValueCount; - NTSTATUS Status; - - TRACE("SamrRemoveMemberFromAlias(%p %p)\n", - AliasHandle, MemberId); + NTSTATUS Status; + + TRACE("(%p %p)\n", AliasHandle, MemberId); /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, @@ -4812,100 +4752,12 @@ return Status; } - ConvertSidToStringSidW(MemberId, &MemberIdString); - TRACE("Member SID: %S\n", MemberIdString); - - Status = SampRegOpenKey(AliasObject->MembersKeyHandle, - MemberIdString, - KEY_WRITE | KEY_QUERY_VALUE, - &MemberKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegDeleteValue(MemberKeyHandle, - AliasObject->Name); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegQueryKeyInfo(MemberKeyHandle, - NULL, - &ulValueCount); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); - goto done; - } - - if (ulValueCount == 0) - { - SampRegCloseKey(MemberKeyHandle); - MemberKeyHandle = NULL; - - Status = SampRegDeleteKey(AliasObject->MembersKeyHandle, - MemberIdString); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); - goto done; - } - } - - Status = SampRegOpenKey(AliasObject->KeyHandle, - L"Members", - KEY_WRITE | KEY_QUERY_VALUE, - &MembersKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegOpenKey failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegDeleteValue(MembersKeyHandle, - MemberIdString); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegDeleteValue failed with status 0x%08lx\n", Status); - goto done; - } - - Status = SampRegQueryKeyInfo(MembersKeyHandle, - NULL, - &ulValueCount); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); - goto done; - } - - if (ulValueCount == 0) - { - SampRegCloseKey(MembersKeyHandle); - MembersKeyHandle = NULL; - - Status = SampRegDeleteKey(AliasObject->KeyHandle, - L"Members"); - if (!NT_SUCCESS(Status)) - { - TRACE("SampRegDeleteKey failed with status 0x%08lx\n", Status); - goto done; - } - } - -done: - if (MemberKeyHandle != NULL) - SampRegCloseKey(MemberKeyHandle); - - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - - if (MemberIdString != NULL) - LocalFree(MemberIdString); + Status = SampRemoveMemberFromAlias(AliasObject, + MemberId); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + } return Status; } Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Thu May 23 09:42:25 2013 @@ -128,6 +128,15 @@ IN ACCESS_MASK DesiredAccess, OUT PSAM_DB_OBJECT *AliasObject); +NTSTATUS +SampAddMemberToAlias(IN PSAM_DB_OBJECT AliasObject, + IN PRPC_SID MemberId); + +NTSTATUS +NTAPI +SampRemoveMemberFromAlias(IN PSAM_DB_OBJECT AliasObject, + IN PRPC_SID MemberId); + /* database.c */

1 0

[ekohl] 59068: [SAMSRV] Rename internal setup functions in order to avoid naming conflicts.
by ekohl＠svn.reactos.org 23 May '13

23 May '13

Author: ekohl Date: Thu May 23 09:07:12 2013 New Revision: 59068 URL: http://svn.reactos.org/svn/reactos?rev=59068&view=rev Log: [SAMSRV] Rename internal setup functions in order to avoid naming conflicts. Modified: trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Thu May 23 09:07:12 2013 @@ -24,9 +24,9 @@ /* FUNCTIONS ***************************************************************/ static BOOL -SampAddMemberToAlias(HKEY hDomainKey, - ULONG AliasId, - PSID MemberSid) +SampSetupAddMemberToAlias(HKEY hDomainKey, + ULONG AliasId, + PSID MemberSid) { DWORD dwDisposition; LPWSTR MemberSidString = NULL; @@ -89,10 +89,10 @@ static BOOL -SampCreateAliasAccount(HKEY hDomainKey, - LPCWSTR lpAccountName, - LPCWSTR lpDescription, - ULONG ulRelativeId) +SampSetupCreateAliasAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + LPCWSTR lpDescription, + ULONG ulRelativeId) { DWORD dwDisposition; WCHAR szAccountKeyName[32]; @@ -150,9 +150,9 @@ #if 0 static BOOL -SampCreateGroupAccount(HKEY hDomainKey, - LPCWSTR lpAccountName, - ULONG ulRelativeId) +SampSetupCreateGroupAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + ULONG ulRelativeId) { return FALSE; @@ -161,11 +161,11 @@ static BOOL -SampCreateUserAccount(HKEY hDomainKey, - LPCWSTR lpAccountName, - LPCWSTR lpComment, - ULONG ulRelativeId, - ULONG UserAccountControl) +SampSetupCreateUserAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + LPCWSTR lpComment, + ULONG ulRelativeId, + ULONG UserAccountControl) { SAM_USER_FIXED_DATA FixedUserData; UCHAR LogonHours[23]; @@ -354,11 +354,11 @@ static BOOL -SampCreateDomain(IN HKEY hDomainsKey, - IN LPCWSTR lpKeyName, - IN LPCWSTR lpDomainName, - IN PSID lpDomainSid, - OUT PHKEY lpDomainKey) +SampSetupCreateDomain(IN HKEY hDomainsKey, + IN LPCWSTR lpKeyName, + IN LPCWSTR lpDomainName, + IN PSID lpDomainSid, + OUT PHKEY lpDomainKey) { SAM_DOMAIN_FIXED_DATA FixedData; LPWSTR lpEmptyString = L""; @@ -634,52 +634,52 @@ SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80); /* Create the Builtin domain */ - if (SampCreateDomain(hDomainsKey, - L"Builtin", - szName, - pBuiltinSid, - &hDomainKey)) + if (SampSetupCreateDomain(hDomainsKey, + L"Builtin", + szName, + pBuiltinSid, + &hDomainKey)) { SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256); - SampCreateAliasAccount(hDomainKey, - szName, - szComment, - DOMAIN_ALIAS_RID_ADMINS); + SampSetupCreateAliasAccount(hDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_ADMINS); SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256); - SampCreateAliasAccount(hDomainKey, - szName, - szComment, - DOMAIN_ALIAS_RID_USERS); + SampSetupCreateAliasAccount(hDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_USERS); SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256); - SampCreateAliasAccount(hDomainKey, - szName, - szComment, - DOMAIN_ALIAS_RID_GUESTS); + SampSetupCreateAliasAccount(hDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_GUESTS); SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256); - SampCreateAliasAccount(hDomainKey, - szName, - szComment, - DOMAIN_ALIAS_RID_POWER_USERS); + SampSetupCreateAliasAccount(hDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_POWER_USERS); pSid = AppendRidToSid(AccountDomainInfo->DomainSid, DOMAIN_USER_RID_ADMIN); if (pSid != NULL) { - SampAddMemberToAlias(hDomainKey, - DOMAIN_ALIAS_RID_ADMINS, - pSid); + SampSetupAddMemberToAlias(hDomainKey, + DOMAIN_ALIAS_RID_ADMINS, + pSid); RtlFreeHeap(RtlGetProcessHeap(), 0, pSid); } @@ -689,29 +689,29 @@ } /* Create the Account domain */ - if (SampCreateDomain(hDomainsKey, - L"Account", - L"", - AccountDomainInfo->DomainSid, - &hDomainKey)) + if (SampSetupCreateDomain(hDomainsKey, + L"Account", + L"", + AccountDomainInfo->DomainSid, + &hDomainKey)) { SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256); - SampCreateUserAccount(hDomainKey, - szName, - szComment, - DOMAIN_USER_RID_ADMIN, - USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); + SampSetupCreateUserAccount(hDomainKey, + szName, + szComment, + DOMAIN_USER_RID_ADMIN, + USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80); SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256); - SampCreateUserAccount(hDomainKey, - szName, - szComment, - DOMAIN_USER_RID_GUEST, - USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); + SampSetupCreateUserAccount(hDomainKey, + szName, + szComment, + DOMAIN_USER_RID_GUEST, + USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); RegCloseKey(hDomainKey); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs