July 2011 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Stub GdipPlayMetafileRecord.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: fd7475546b46648234870d2ecd8959c8c26c367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7475546b46648234870d2ec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 11:02:33 2011 -0500 gdiplus: Stub GdipPlayMetafileRecord. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 8 ++++++++ include/gdiplusflat.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 533bf0f..9398658 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -443,7 +443,7 @@ 443 stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) 444 stdcall GdipPathIterNextSubpathPath(ptr ptr ptr ptr) 445 stdcall GdipPathIterRewind(ptr) -446 stub GdipPlayMetafileRecord +446 stdcall GdipPlayMetafileRecord(ptr long long long ptr) 447 stdcall GdipPrivateAddFontFile(ptr wstr) 448 stdcall GdipPrivateAddMemoryFont(ptr ptr long) 449 stdcall GdipRecordMetafile(long long ptr long wstr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 322aecf..3d26b5c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -327,6 +327,14 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, + EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) +{ + FIXME("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + + return NotImplemented; +} + struct enum_metafile_data { EnumerateMetafileProc callback; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 676a78e..6792004 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -527,6 +527,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);

1 0

Vincent Povirk : gdiplus: Implement GetDC for metafiles.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 44c57121ea017adfc16def03ca8f3799bebc040f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c57121ea017adfc16def03c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 11:30:06 2011 -0500 gdiplus: Implement GetDC for metafiles. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 36 +++++++++++++++++++++++++----------- dlls/gdiplus/metafile.c | 30 ++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 6 +++--- 4 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9cae489..d6888d9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -52,6 +52,8 @@ extern REAL convert_unit(REAL logpixels, GpUnit unit) DECLSPEC_HIDDEN; extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index be25653..1e3f946 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5311,6 +5311,8 @@ static const COLORREF DC_BACKGROUND_KEY = 0x0c0b0d; GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { + GpStatus stat=Ok; + TRACE("(%p, %p)\n", graphics, hdc); if(!graphics || !hdc) @@ -5319,13 +5321,16 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) if(graphics->busy) return ObjectBusy; - if (!graphics->hdc || + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); + } + else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { /* Create a fake HDC and fill it with a constant color. */ HDC temp_hdc; HBITMAP hbitmap; - GpStatus stat; GpRectF bounds; BITMAPINFOHEADER bmih; int i; @@ -5374,22 +5379,26 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) *hdc = graphics->hdc; } - graphics->busy = TRUE; + if (stat == Ok) + graphics->busy = TRUE; - return Ok; + return stat; } GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { - TRACE("(%p, %p)\n", graphics, hdc); + GpStatus stat=Ok; - if(!graphics || !hdc) - return InvalidParameter; + TRACE("(%p, %p)\n", graphics, hdc); - if((graphics->hdc != hdc && graphics->temp_hdc != hdc) || !(graphics->busy)) + if(!graphics || !hdc || !graphics->busy) return InvalidParameter; - if (graphics->temp_hdc == hdc) + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_ReleaseDC((GpMetafile*)graphics->image, hdc); + } + else if (graphics->temp_hdc == hdc) { DWORD* pos; int i; @@ -5416,10 +5425,15 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) graphics->temp_hdc = NULL; graphics->temp_hbitmap = NULL; } + else if (hdc != graphics->hdc) + { + stat = InvalidParameter; + } - graphics->busy = FALSE; + if (stat == Ok) + graphics->busy = FALSE; - return Ok; + return stat; } GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3d26b5c..3e79eb7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -297,6 +297,36 @@ GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) return stat; } +GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusRecordHeader *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusRecordHeader), (void**)&record); + if (stat != Ok) + return stat; + + record->Type = EmfPlusRecordTypeGetDC; + record->Flags = 0; + + METAFILE_WriteRecords(metafile); + } + + *hdc = metafile->record_dc; + + return Ok; +} + +GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) +{ + if (hdc != metafile->record_dc) + return InvalidParameter; + + return Ok; +} + GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) { GpStatus stat; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index c85de00..1a0da15 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -278,9 +278,9 @@ static void test_empty(void) static const emfplus_record getdc_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, - {1, EmfPlusRecordTypeGetDC}, - {1, EMR_CREATEBRUSHINDIRECT}, - {1, EMR_SELECTOBJECT}, + {0, EmfPlusRecordTypeGetDC}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, {0, EMR_RECTANGLE}, {0, EMR_SELECTOBJECT}, {0, EMR_DELETEOBJECT},

1 0

Vincent Povirk : gdiplus: Add test for recording emf-only metafiles.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 351a78bb4a85ceff41f4577e901dfe67faeb9669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351a78bb4a85ceff41f4577e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 11:37:07 2011 -0500 gdiplus: Add test for recording emf-only metafiles. --- dlls/gdiplus/tests/metafile.c | 81 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1a0da15..66e504f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -358,6 +358,86 @@ static void test_getdc(void) ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); } +static const emfplus_record emfonly_records[] = { + {0, EMR_HEADER}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EMR_EOF}, + {0} +}; + +static void test_emfonly(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + HENHMETAFILE hemf; + BOOL ret; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + HBRUSH hbrush, holdbrush; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, emfonly_records, "emfonly metafile", dst_points, &frame, UnitPixel); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, emfonly_records, "emfonly emf"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -372,6 +452,7 @@ START_TEST(metafile) test_empty(); test_getdc(); + test_emfonly(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Add tests for GdipPlayMetafileRecord.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 71325800dc0d26c70229858e70a11d689972869a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71325800dc0d26c70229858e7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 13:31:55 2011 -0500 gdiplus: Add tests for GdipPlayMetafileRecord. --- dlls/gdiplus/tests/metafile.c | 144 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 127 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 66e504f..5323751 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -29,6 +29,7 @@ typedef struct emfplus_record { ULONG todo; ULONG record_type; + ULONG playback_todo; } emfplus_record; typedef struct emfplus_check_state @@ -36,6 +37,7 @@ typedef struct emfplus_check_state const char *desc; int count; const struct emfplus_record *expected; + GpMetafile *metafile; } emfplus_check_state; static void check_record(int count, const char *desc, const struct emfplus_record *expected, const struct emfplus_record *actual) @@ -178,6 +180,7 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, state.desc = desc; state.count = 0; state.expected = expected; + state.metafile = metafile; hdc = CreateCompatibleDC(0); @@ -198,6 +201,51 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, DeleteDC(hdc); } +static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, + unsigned int dataSize, const unsigned char *pStr, void *userdata) +{ + emfplus_check_state *state = (emfplus_check_state*)userdata; + GpStatus stat; + + stat = GdipPlayMetafileRecord(state->metafile, record_type, flags, dataSize, pStr); + + if (state->expected[state->count].record_type) + { + if (state->expected[state->count].playback_todo) + todo_wine ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + else + ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + state->count++; + } + else + { + if (state->expected[state->count].playback_todo) + todo_wine ok(0, "%s: too many records\n", state->desc); + else + ok(0, "%s: too many records\n", state->desc); + + return FALSE; + } + + return TRUE; +} + +static void play_metafile(GpMetafile *metafile, GpGraphics *graphics, const emfplus_record *expected, + const char *desc, const GpPointF *dst_points, const GpRectF *src_rect, Unit src_unit) +{ + GpStatus stat; + emfplus_check_state state; + + state.desc = desc; + state.count = 0; + state.expected = expected; + state.metafile = metafile; + + stat = GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, dst_points, + 3, src_rect, src_unit, play_metafile_proc, &state, NULL); + expect(Ok, stat); +} + static const emfplus_record empty_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, @@ -276,16 +324,16 @@ static void test_empty(void) } static const emfplus_record getdc_records[] = { - {0, EMR_HEADER}, - {0, EmfPlusRecordTypeHeader}, - {0, EmfPlusRecordTypeGetDC}, - {0, EMR_CREATEBRUSHINDIRECT}, - {0, EMR_SELECTOBJECT}, - {0, EMR_RECTANGLE}, - {0, EMR_SELECTOBJECT}, - {0, EMR_DELETEOBJECT}, - {0, EmfPlusRecordTypeEndOfFile}, - {0, EMR_EOF}, + {0, EMR_HEADER, 1}, + {0, EmfPlusRecordTypeHeader, 1}, + {0, EmfPlusRecordTypeGetDC, 1}, + {0, EMR_CREATEBRUSHINDIRECT, 1}, + {0, EMR_SELECTOBJECT, 1}, + {0, EMR_RECTANGLE, 1}, + {0, EMR_SELECTOBJECT, 1}, + {0, EMR_DELETEOBJECT, 1}, + {0, EmfPlusRecordTypeEndOfFile, 1}, + {0, EMR_EOF, 1}, {0} }; @@ -299,8 +347,11 @@ static void test_getdc(void) BOOL ret; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; + GpBitmap *bitmap; + ARGB color; hdc = CreateCompatibleDC(0); @@ -346,6 +397,41 @@ static void test_getdc(void) check_metafile(metafile, getdc_records, "getdc metafile", dst_points, &frame, UnitPixel); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, getdc_records, "getdc playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + play_metafile(metafile, graphics, getdc_records, "getdc playback", dst_points_half, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -359,13 +445,13 @@ static void test_getdc(void) } static const emfplus_record emfonly_records[] = { - {0, EMR_HEADER}, - {0, EMR_CREATEBRUSHINDIRECT}, - {0, EMR_SELECTOBJECT}, - {0, EMR_RECTANGLE}, - {0, EMR_SELECTOBJECT}, - {0, EMR_DELETEOBJECT}, - {0, EMR_EOF}, + {0, EMR_HEADER, 1}, + {0, EMR_CREATEBRUSHINDIRECT, 1}, + {0, EMR_SELECTOBJECT, 1}, + {0, EMR_RECTANGLE, 1}, + {0, EMR_SELECTOBJECT, 1}, + {0, EMR_DELETEOBJECT, 1}, + {0, EMR_EOF, 1}, {0} }; @@ -381,6 +467,8 @@ static void test_emfonly(void) static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; HBRUSH hbrush, holdbrush; + GpBitmap *bitmap; + ARGB color; hdc = CreateCompatibleDC(0); @@ -426,6 +514,28 @@ static void test_emfonly(void) check_metafile(metafile, emfonly_records, "emfonly metafile", dst_points, &frame, UnitPixel); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, emfonly_records, "emfonly playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Add test showing scaling does not affect returned HDC objects.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 3a6ba940115519472dda94aae19f71e9361617d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6ba940115519472dda94aae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 14:51:35 2011 -0500 gdiplus: Add test showing scaling does not affect returned HDC objects. --- dlls/gdiplus/tests/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index bbca69f..3df57f1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3251,6 +3251,54 @@ static void test_get_set_textrenderinghint(void) ReleaseDC(hwnd, hdc); } +static void test_getdc_scaled(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpBitmap *bitmap = NULL; + HDC hdc=NULL; + HBRUSH hbrush, holdbrush; + ARGB color; + + status = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + hbrush = CreateSolidBrush(RGB(255, 0, 0)); + + holdbrush = SelectObject(hdc, hbrush); + + Rectangle(hdc, 2, 2, 6, 6); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + status = GdipBitmapGetPixel(bitmap, 3, 3, &color); + expect(Ok, status); + expect(0xffff0000, color); + + status = GdipBitmapGetPixel(bitmap, 8, 8, &color); + expect(Ok, status); + expect(0xff000000, color); + + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3311,6 +3359,7 @@ START_TEST(graphics) test_string_functions(); test_get_set_interpolation(); test_get_set_textrenderinghint(); + test_getdc_scaled(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Vincent Povirk : gdiplus: Implement GdipPlayMetafileRecord for EMF records.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: fda2fc7684bc73a1dc89cad53e0a05bfee5c2826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda2fc7684bc73a1dc89cad53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 16:25:25 2011 -0500 gdiplus: Implement GdipPlayMetafileRecord for EMF records. --- dlls/gdiplus/gdiplus_private.h | 11 ++++- dlls/gdiplus/metafile.c | 113 ++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 44 ++++++++-------- 3 files changed, 141 insertions(+), 27 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d6888d9..9afe15b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -274,12 +274,21 @@ struct GpMetafile{ GpRectF bounds; GpUnit unit; MetafileType metafile_type; + HENHMETAFILE hemf; + + /* recording */ HDC record_dc; GpGraphics *record_graphics; BYTE *comment_data; DWORD comment_data_size; DWORD comment_data_length; - HENHMETAFILE hemf; + + /* playback */ + GpGraphics *playback_graphics; + HDC playback_dc; + GpPointF playback_points[3]; + HANDLETABLE *handle_table; + int handle_count; }; struct GpBitmap{ diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3e79eb7..38923a0 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -357,18 +357,100 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +static GpStatus METAFILE_PlaybackGetDC(GpMetafile *metafile) +{ + GpStatus stat = Ok; + + stat = GdipGetDC(metafile->playback_graphics, &metafile->playback_dc); + + if (stat == Ok) + { + /* The result of GdipGetDC always expects device co-ordinates, but the + * device co-ordinates of the source metafile do not correspond to + * device co-ordinates of the destination. Therefore, we set up the DC + * so that the metafile's bounds map to the destination points where we + * are drawing this metafile. */ + SetMapMode(metafile->playback_dc, MM_ANISOTROPIC); + + SetWindowOrgEx(metafile->playback_dc, metafile->bounds.X, metafile->bounds.Y, NULL); + SetWindowExtEx(metafile->playback_dc, metafile->bounds.Width, metafile->bounds.Height, NULL); + + SetViewportOrgEx(metafile->playback_dc, metafile->playback_points[0].X, metafile->playback_points[0].Y, NULL); + SetViewportExtEx(metafile->playback_dc, + metafile->playback_points[1].X - metafile->playback_points[0].X, + metafile->playback_points[2].Y - metafile->playback_points[0].Y, NULL); + } + + return stat; +} + +static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) +{ + if (metafile->playback_dc) + { + GdipReleaseDC(metafile->playback_graphics, metafile->playback_dc); + metafile->playback_dc = NULL; + } +} + GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { - FIXME("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + + if (!metafile || (dataSize && !data) || !metafile->playback_graphics) + return InvalidParameter; + + if (recordType >= 1 && recordType <= 0x7a) + { + /* regular EMF record */ + if (metafile->playback_dc) + { + ENHMETARECORD *record; + + record = GdipAlloc(dataSize + 8); + + if (record) + { + record->iType = recordType; + record->nSize = dataSize; + memcpy(record->dParm, data, dataSize); - return NotImplemented; + PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, + record, metafile->handle_count); + + GdipFree(record); + } + else + return OutOfMemory; + } + } + else + { + METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); + + switch(recordType) + { + case EmfPlusRecordTypeHeader: + case EmfPlusRecordTypeEndOfFile: + break; + case EmfPlusRecordTypeGetDC: + METAFILE_PlaybackGetDC((GpMetafile*)metafile); + break; + default: + FIXME("Not implemented for record type %x\n", recordType); + return NotImplemented; + } + } + + return Ok; } struct enum_metafile_data { EnumerateMetafileProc callback; void *callback_data; + GpMetafile *metafile; }; static int CALLBACK enum_metafile_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, @@ -378,6 +460,9 @@ static int CALLBACK enum_metafile_proc(HDC hDC, HANDLETABLE *lpHTable, const ENH struct enum_metafile_data *data = (struct enum_metafile_data*)lpData; const BYTE* pStr; + data->metafile->handle_table = lpHTable; + data->metafile->handle_count = nObj; + /* First check for an EMF+ record. */ if (lpEMFR->iType == EMR_GDICOMMENT) { @@ -424,6 +509,8 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes) { struct enum_metafile_data data; + GpStatus stat; + GpMetafile *real_metafile = (GpMetafile*)metafile; /* whoever made this const was joking */ TRACE("(%p,%p,%p,%i,%p,%i,%p,%p,%p)\n", graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, @@ -435,14 +522,32 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, if (!metafile->hemf) return InvalidParameter; + if (metafile->playback_graphics) + return ObjectBusy; + TRACE("%s %i -> %s %s %s\n", debugstr_rectf(srcRect), srcUnit, debugstr_pointf(&destPoints[0]), debugstr_pointf(&destPoints[1]), debugstr_pointf(&destPoints[2])); data.callback = callback; data.callback_data = callbackData; + data.metafile = real_metafile; - EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + real_metafile->playback_graphics = graphics; + real_metafile->playback_dc = NULL; - return Ok; + 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) + stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); + + if (stat == Ok) + EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + + METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); + + real_metafile->playback_graphics = NULL; + + return stat; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 5323751..9530b0c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -212,9 +212,9 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned if (state->expected[state->count].record_type) { if (state->expected[state->count].playback_todo) - todo_wine ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + todo_wine ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); else - ok(stat == Ok, "%s: GdipPlayMetafileRecord failed with stat %i\n", state->desc, stat); + ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); state->count++; } else @@ -324,16 +324,16 @@ static void test_empty(void) } static const emfplus_record getdc_records[] = { - {0, EMR_HEADER, 1}, - {0, EmfPlusRecordTypeHeader, 1}, - {0, EmfPlusRecordTypeGetDC, 1}, - {0, EMR_CREATEBRUSHINDIRECT, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_RECTANGLE, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_DELETEOBJECT, 1}, - {0, EmfPlusRecordTypeEndOfFile, 1}, - {0, EMR_EOF, 1}, + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeGetDC}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, {0} }; @@ -411,7 +411,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); expect(Ok, stat); @@ -420,7 +420,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); @@ -445,13 +445,13 @@ static void test_getdc(void) } static const emfplus_record emfonly_records[] = { - {0, EMR_HEADER, 1}, - {0, EMR_CREATEBRUSHINDIRECT, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_RECTANGLE, 1}, - {0, EMR_SELECTOBJECT, 1}, - {0, EMR_DELETEOBJECT, 1}, - {0, EMR_EOF, 1}, + {0, EMR_HEADER}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EMR_EOF}, {0} }; @@ -528,7 +528,7 @@ static void test_emfonly(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Alexandre Julliard : usp10: Make the various lookup tables more compact.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: b99b9565e808652e8f50204aafdff587f6948a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99b9565e808652e8f50204aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 17:30:35 2011 +0200 usp10: Make the various lookup tables more compact. --- dlls/usp10/breaking.c | 2 +- dlls/usp10/indicsyllable.c | 495 ++---------- dlls/usp10/linebreak.c | 1825 +++++-------------------------------------- dlls/usp10/shape.c | 6 +- dlls/usp10/shaping.c | 1113 +++----------------------- dlls/usp10/usp10_internal.h | 5 + tools/make_unicode | 46 +- 7 files changed, 438 insertions(+), 3054 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b99b9565e808652e8f502…

1 0

Jacek Caban : widl: Use proper calling convention attributes.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: f8c517978bf5c5f164ff91cb1b277e1e7433e422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c517978bf5c5f164ff91cb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 15:09:15 2011 +0200 widl: Use proper calling convention attributes. --- tools/widl/parser.y | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f034074..d4852d1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -588,10 +588,10 @@ uuid_string: $$ = parse_uuid($1); } ; -callconv: tCDECL { $$ = $<str>1; } - | tFASTCALL { $$ = $<str>1; } - | tPASCAL { $$ = $<str>1; } - | tSTDCALL { $$ = $<str>1; } +callconv: tCDECL { $$ = xstrdup("__cdecl"); } + | tFASTCALL { $$ = xstrdup("__fastcall"); } + | tPASCAL { $$ = xstrdup("__pascal"); } + | tSTDCALL { $$ = xstrdup("__stdcall"); } ; cases: { $$ = NULL; }

1 0

Jacek Caban : mshtml: Mark some functions as cdecl.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 9f333b71b67dd6e79397d18c2c75adab33a7c63e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f333b71b67dd6e79397d18c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 15:09:27 2011 +0200 mshtml: Mark some functions as cdecl. --- dlls/mshtml/nsiface.idl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8c11032..502fb30 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3013,13 +3013,13 @@ interface nsIParser : nsISupports PRInt32 aContextNamespace, PRBool aQuirks); nsresult BuildModel(); nsresult CancelParsingEvents(); - void Reset(); - PRBool CanInterrupt(); - PRBool IsInsertionPointDefined(); - void BeginEvaluatingParserInsertedScript(); - void EndEvaluatingParserInsertedScript(); - void MarkAsNotScriptCreated(); - PRBool IsScriptCreated(); + void cdecl Reset(); + PRBool cdecl CanInterrupt(); + PRBool cdecl IsInsertionPointDefined(); + void cdecl BeginEvaluatingParserInsertedScript(); + void cdecl EndEvaluatingParserInsertedScript(); + void cdecl MarkAsNotScriptCreated(); + PRBool cdecl IsScriptCreated(); } [

1 0

Alistair Leslie-Hughes : oledb32: Add DBTYPE_UI2 support to DataConvert.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: d911374b9c009a389c19d1d618c21db6e3a99abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d911374b9c009a389c19d1d61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 28 20:41:04 2011 +1000 oledb32: Add DBTYPE_UI2 support to DataConvert. --- dlls/oledb32/convert.c | 25 ++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3bb663f..1691792 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -533,6 +533,31 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_UI2: + { + WORD *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI2FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarUI2FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarUI2FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI2FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI2FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI2FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI2FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI2FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI2FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI2FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarUI2FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: *d = *(WORD*)src; hr = S_OK; break; + case DBTYPE_UI4: hr = VarUI2FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarUI2FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarUI2FromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> UI2\n", src_type); return E_NOTIMPL; + } + break; + } case DBTYPE_UI4: { diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a5ccdb9..1a1ea9a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -610,6 +610,49 @@ todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(dst == 10, "got %08x\n", dst); + /* */ + dst_len = dst = 0x1234; + *(WORD*)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0xabcd1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); +todo_wine + ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x1234, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0x1234abcd; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); +todo_wine + ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x1234, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + + dst_len = dst = 0x1234; + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 10, "got %08x\n", dst); + IDataConvert_Release(convert); }

1 0