May 2011 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Remove is_emfplus field from test structure, as it's redundant.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 06b23138e233957b69d31e7d34bc9c06784cff77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b23138e233957b69d31e7d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 21 18:36:22 2011 -0500 gdiplus: Remove is_emfplus field from test structure, as it's redundant. --- dlls/gdiplus/tests/metafile.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 8b13c20..ff9c346 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -29,7 +29,6 @@ typedef struct emfplus_record { ULONG todo; ULONG record_type; - int is_emfplus; } emfplus_record; typedef struct emfplus_check_state @@ -44,10 +43,6 @@ static void check_record(int count, const char *desc, const struct emfplus_recor ok(expected->record_type == actual->record_type, "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, expected->record_type, actual->record_type); - - ok(expected->is_emfplus == actual->is_emfplus, - "%s.%i: Expected is_emfplus %i, got %i\n", desc, count, - expected->record_type, actual->record_type); } typedef struct EmfPlusRecordHeader @@ -89,7 +84,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR { actual.todo = 0; actual.record_type = record->Type; - actual.is_emfplus = 1; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -113,7 +107,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR { actual.todo = 0; actual.record_type = lpEMFR->iType; - actual.is_emfplus = 0; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -148,7 +141,6 @@ static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned actual.todo = 0; actual.record_type = record_type; - actual.is_emfplus = ((record_type & GDIP_EMFPLUS_RECORD_BASE) == GDIP_EMFPLUS_RECORD_BASE); if (dataSize == 0) ok(pStr == NULL, "non-NULL pStr\n"); @@ -196,10 +188,10 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, } static const emfplus_record empty_records[] = { - {0, EMR_HEADER, 0}, - {0, EmfPlusRecordTypeHeader, 1}, - {0, EmfPlusRecordTypeEndOfFile, 1}, - {0, EMR_EOF, 0}, + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, {0} };

1 0

André Hentschel : ntdll: Improved ARM little endianess detection.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 4e26336eae0c7132b3e3ca068eed590eab8f066f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e26336eae0c7132b3e3ca068… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 20 18:26:24 2011 +0200 ntdll: Improved ARM little endianess detection. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d88b734..aba9a71 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1054,7 +1054,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) WARN( "loading 32-bit dll in 64-bit mode will fail\n" ); return STATUS_INVALID_IMAGE_FORMAT; } -#elif defined(__ARMEL__) +#elif defined(__arm__) && !defined(__ARMEB__) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS;

1 0

Vincent Povirk : gdiplus: Add basic metafile recording support.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: d436e51872ad9ff8810d6339f98a8e8bf507738c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d436e51872ad9ff8810d6339f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 1 17:09:23 2011 -0500 gdiplus: Add basic metafile recording support. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus_private.h | 10 ++ dlls/gdiplus/graphics.c | 42 ++---- dlls/gdiplus/image.c | 9 +- dlls/gdiplus/metafile.c | 324 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 20 +++- 6 files changed, 370 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d436e51872ad9ff8810d6…

1 0

Vincent Povirk : gdiplus: Add test for metafile enumeration.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 11248262be5af8478e68430e0260450e4312ba83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11248262be5af8478e68430e0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 21 17:22:12 2011 -0500 gdiplus: Add test for metafile enumeration. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 19 +++++++++++++ dlls/gdiplus/tests/metafile.c | 60 ++++++++++++++++++++++++++++++++++++++++- include/gdiplus.h | 4 +- include/gdiplusflat.h | 3 ++ include/gdiplustypes.h | 2 + 6 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c583996..533bf0f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -198,7 +198,7 @@ 198 stub GdipEnumerateMetafileDestRectI 199 stub GdipEnumerateMetafileSrcRectDestPoint 200 stub GdipEnumerateMetafileSrcRectDestPointI -201 stub GdipEnumerateMetafileSrcRectDestPoints +201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) 202 stub GdipEnumerateMetafileSrcRectDestPointsI 203 stub GdipEnumerateMetafileSrcRectDestRect 204 stub GdipEnumerateMetafileSrcRectDestRectI diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 99b1621..665d1a3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -322,3 +322,22 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } + +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpPointF *destPoints, INT count, + GDIPCONST GpRectF *srcRect, Unit srcUnit, EnumerateMetafileProc callback, + VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes) +{ + FIXME("(%p,%p,%p,%i,%p,%i,%p,%p,%p): stub\n", graphics, metafile, + destPoints, count, srcRect, srcUnit, callback, callbackData, + imageAttributes); + + if (!graphics || !metafile || !destPoints || count != 3 || !srcRect) + return InvalidParameter; + + TRACE("%s %i -> %s %s %s\n", debugstr_rectf(srcRect), srcUnit, + debugstr_pointf(&destPoints[0]), debugstr_pointf(&destPoints[1]), + debugstr_pointf(&destPoints[2])); + + return NotImplemented; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 8dcda25..8b13c20 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -140,6 +140,61 @@ static void check_emfplus(HENHMETAFILE hemf, const emfplus_record *expected, con ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); } +static BOOL CALLBACK enum_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; + emfplus_record actual; + + actual.todo = 0; + actual.record_type = record_type; + actual.is_emfplus = ((record_type & GDIP_EMFPLUS_RECORD_BASE) == GDIP_EMFPLUS_RECORD_BASE); + + if (dataSize == 0) + ok(pStr == NULL, "non-NULL pStr\n"); + + if (state->expected[state->count].record_type) + { + check_record(state->count, state->desc, &state->expected[state->count], &actual); + + state->count++; + } + else + { + ok(0, "%s: Unexpected EMF 0x%x record\n", state->desc, record_type); + } + + return TRUE; +} + +static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, const char *desc, + const GpPointF *dst_points, const GpRectF *src_rect, Unit src_unit) +{ + GpStatus stat; + HDC hdc; + GpGraphics *graphics; + emfplus_check_state state; + + state.desc = desc; + state.count = 0; + state.expected = expected; + + hdc = CreateCompatibleDC(0); + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, dst_points, + 3, src_rect, src_unit, enum_metafile_proc, &state, NULL); + todo_wine expect(Ok, stat); + + todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + + GdipDeleteGraphics(graphics); + + DeleteDC(hdc); +} + static const emfplus_record empty_records[] = { {0, EMR_HEADER, 0}, {0, EmfPlusRecordTypeHeader, 1}, @@ -157,6 +212,7 @@ static void test_empty(void) HENHMETAFILE hemf, dummy; 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}; hdc = CreateCompatibleDC(0); @@ -199,6 +255,8 @@ static void test_empty(void) stat = GdipDeleteGraphics(graphics); expect(Ok, stat); + check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -208,7 +266,7 @@ static void test_empty(void) stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); - check_emfplus(hemf, empty_records, "empty"); + check_emfplus(hemf, empty_records, "empty emf"); ret = DeleteEnhMetaFile(hemf); ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); diff --git a/include/gdiplus.h b/include/gdiplus.h index c8385db..f063b3e 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -28,8 +28,8 @@ namespace Gdiplus #include "gdiplusmem.h" }; -#include "gdiplustypes.h" #include "gdiplusenums.h" +#include "gdiplustypes.h" #include "gdiplusinit.h" #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" @@ -48,8 +48,8 @@ namespace Gdiplus #include "gdiplusmem.h" -#include "gdiplustypes.h" #include "gdiplusenums.h" +#include "gdiplustypes.h" #include "gdiplusinit.h" #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b35048f..676a78e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -206,6 +206,9 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*, + GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit, + EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT, REAL,GpFillMode); GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 816dba8..2e46bb4 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -55,6 +55,8 @@ typedef BOOL (CALLBACK * ImageAbort)(VOID *); typedef ImageAbort DrawImageAbort; typedef ImageAbort GetThumbnailImageAbort; +typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*); + #ifdef __cplusplus } #endif

1 0

Vincent Povirk : gdiplus: Add test for GdipGetDC on metafiles.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 29b6b75edb2844c9d6f4a42492dd70024c8bfe6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b6b75edb2844c9d6f4a4249… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 21 18:32:23 2011 -0500 gdiplus: Add test for GdipGetDC on metafiles. --- dlls/gdiplus/tests/metafile.c | 105 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 30fdf64..c85de00 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -40,9 +40,14 @@ typedef struct emfplus_check_state static void check_record(int count, const char *desc, const struct emfplus_record *expected, const struct emfplus_record *actual) { - ok(expected->record_type == actual->record_type, - "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, - expected->record_type, actual->record_type); + if (expected->todo) + todo_wine ok(expected->record_type == actual->record_type, + "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, + expected->record_type, actual->record_type); + else + ok(expected->record_type == actual->record_type, + "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, + expected->record_type, actual->record_type); } typedef struct EmfPlusRecordHeader @@ -130,7 +135,10 @@ static void check_emfplus(HENHMETAFILE hemf, const emfplus_record *expected, con EnumEnhMetaFile(0, hemf, enum_emf_proc, &state, NULL); - ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + if (expected[state.count].todo) + todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + else + ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); } static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, @@ -180,7 +188,10 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, 3, src_rect, src_unit, enum_metafile_proc, &state, NULL); expect(Ok, stat); - ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + if (expected[state.count].todo) + todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + else + ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); GdipDeleteGraphics(graphics); @@ -264,6 +275,89 @@ static void test_empty(void) ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); } +static const emfplus_record getdc_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {1, EmfPlusRecordTypeGetDC}, + {1, EMR_CREATEBRUSHINDIRECT}, + {1, EMR_SELECTOBJECT}, + {0, EMR_RECTANGLE}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_getdc(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, EmfTypeEmfPlusOnly, &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, getdc_records, "getdc metafile", dst_points, &frame, UnitPixel); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + check_emfplus(hemf, getdc_records, "getdc emf"); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -277,6 +371,7 @@ START_TEST(metafile) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_empty(); + test_getdc(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Implement GdipEnumerateMetafileSrcRectDestPoints.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: fd9c5d7d01d3a484c51f0d96ce802f67adb3abcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9c5d7d01d3a484c51f0d96c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 21 17:48:32 2011 -0500 gdiplus: Implement GdipEnumerateMetafileSrcRectDestPoints. --- dlls/gdiplus/metafile.c | 67 +++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/metafile.c | 4 +- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 665d1a3..26dba93 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -323,21 +323,84 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +struct enum_metafile_data +{ + EnumerateMetafileProc callback; + void *callback_data; +}; + +static int CALLBACK enum_metafile_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + BOOL ret; + struct enum_metafile_data *data = (struct enum_metafile_data*)lpData; + const BYTE* pStr; + + /* First check for an EMF+ record. */ + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + int offset = 4; + + while (offset + sizeof(EmfPlusRecordHeader) <= comment->cbData) + { + const EmfPlusRecordHeader *record = (const EmfPlusRecordHeader*)&comment->Data[offset]; + + if (record->DataSize) + pStr = (const BYTE*)(record+1); + else + pStr = NULL; + + ret = data->callback(record->Type, record->Flags, record->DataSize, + pStr, data->callback_data); + + if (!ret) + return 0; + + offset += record->Size; + } + + return 1; + } + } + + if (lpEMFR->nSize != 8) + pStr = (const BYTE*)lpEMFR->dParm; + else + pStr = NULL; + + return data->callback(lpEMFR->iType, 0, lpEMFR->nSize-8, + pStr, data->callback_data); +} + GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST GpPointF *destPoints, INT count, GDIPCONST GpRectF *srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes) { - FIXME("(%p,%p,%p,%i,%p,%i,%p,%p,%p): stub\n", graphics, metafile, + struct enum_metafile_data data; + + TRACE("(%p,%p,%p,%i,%p,%i,%p,%p,%p)\n", graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, imageAttributes); if (!graphics || !metafile || !destPoints || count != 3 || !srcRect) return InvalidParameter; + if (!metafile->hemf) + return InvalidParameter; + TRACE("%s %i -> %s %s %s\n", debugstr_rectf(srcRect), srcUnit, debugstr_pointf(&destPoints[0]), debugstr_pointf(&destPoints[1]), debugstr_pointf(&destPoints[2])); - return NotImplemented; + data.callback = callback; + data.callback_data = callbackData; + + EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + + return Ok; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index ff9c346..30fdf64 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -178,9 +178,9 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, stat = GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, dst_points, 3, src_rect, src_unit, enum_metafile_proc, &state, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); - todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); + ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); GdipDeleteGraphics(graphics);

1 0

Marcus Meissner : oledlg: Mark internal variables with hidden visibility.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 3026862f35027d2f0c94be3f855c99e4f5462b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3026862f35027d2f0c94be3f8… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:43:46 2011 +0200 oledlg: Mark internal variables with hidden visibility. --- dlls/oledlg/oledlg_private.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/oledlg/oledlg_private.h b/dlls/oledlg/oledlg_private.h index 4ff3bb6..8be1d6b 100644 --- a/dlls/oledlg/oledlg_private.h +++ b/dlls/oledlg/oledlg_private.h @@ -21,18 +21,18 @@ #ifndef __OLEDLG_PRIVATE_H__ #define __OLEDLG_PRIVATE_H__ -extern HINSTANCE OLEDLG_hInstance; +extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN; -extern UINT cf_embed_source; -extern UINT cf_embedded_object; -extern UINT cf_link_source; -extern UINT cf_object_descriptor; -extern UINT cf_link_src_descriptor; -extern UINT cf_ownerlink; -extern UINT cf_filename; -extern UINT cf_filenamew; +extern UINT cf_embed_source DECLSPEC_HIDDEN; +extern UINT cf_embedded_object DECLSPEC_HIDDEN; +extern UINT cf_link_source DECLSPEC_HIDDEN; +extern UINT cf_object_descriptor DECLSPEC_HIDDEN; +extern UINT cf_link_src_descriptor DECLSPEC_HIDDEN; +extern UINT cf_ownerlink DECLSPEC_HIDDEN; +extern UINT cf_filename DECLSPEC_HIDDEN; +extern UINT cf_filenamew DECLSPEC_HIDDEN; -extern UINT oleui_msg_help; -extern UINT oleui_msg_enddialog; +extern UINT oleui_msg_help DECLSPEC_HIDDEN; +extern UINT oleui_msg_enddialog DECLSPEC_HIDDEN; #endif /* __OLEDLG_PRIVATE_H__ */

1 0

Marcus Meissner : oledb32: Mark internal symbol with hidden visibility.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: 5113a7da1bdddfd1d8ee67851a1d48fd91c940ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5113a7da1bdddfd1d8ee67851… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:43:01 2011 +0200 oledb32: Mark internal symbol with hidden visibility. --- dlls/oledb32/oledb_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 1c98fa0..a79d251 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -17,4 +17,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_oledb_convert(IUnknown *outer, void **obj); +HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : netapi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: d6c0dec1588dd327030c1b6e8527f4234ff2db48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c0dec1588dd327030c1b6e8… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:39:17 2011 +0200 netapi32: Mark internal symbols with hidden visibility. --- dlls/netapi32/nbcmdqueue.h | 12 ++++++------ dlls/netapi32/nbnamecache.h | 8 ++++---- dlls/netapi32/netbios.h | 18 +++++++++--------- dlls/netapi32/wksta.c | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.h b/dlls/netapi32/nbcmdqueue.h index 9eb7075..57e6411 100644 --- a/dlls/netapi32/nbcmdqueue.h +++ b/dlls/netapi32/nbcmdqueue.h @@ -30,12 +30,12 @@ struct NBCmdQueue; /* Allocates a new command queue from heap. */ -struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap); +struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) DECLSPEC_HIDDEN; /* Adds ncb to queue. Assumes queue is not NULL, and ncb is not already in the * queue. If ncb is already in the queue, returns NRC_TOOMANY. */ -UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb); +UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; /* Cancels the given ncb. Blocks until the command completes. Implicitly * removes ncb from the queue. Assumes queue and ncb are not NULL, and that @@ -44,23 +44,23 @@ UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb); * completed before it could be cancelled, and various other return values for * different failures. */ -UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb); +UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; /* Sets the return code of the given ncb, and implicitly removes the command * from the queue. Assumes queue and ncb are not NULL, and that ncb has been * added to queue previously. * Returns NRC_GOODRET on success. */ -UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode); +UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode) DECLSPEC_HIDDEN; /* Cancels all pending commands in the queue (useful for a RESET or a shutdown). * Returns when all commands have been completed. */ -UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue); +UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; /* Frees all memory associated with the queue. Blocks until all commands * pending in the queue have been completed. */ -void NBCmdQueueDestroy(struct NBCmdQueue *queue); +void NBCmdQueueDestroy(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; #endif /* __NBCMDQUEUE_H__ */ diff --git a/dlls/netapi32/nbnamecache.h b/dlls/netapi32/nbnamecache.h index ffefbc5..233f800 100644 --- a/dlls/netapi32/nbnamecache.h +++ b/dlls/netapi32/nbnamecache.h @@ -51,7 +51,7 @@ typedef struct _NBNameCacheEntry /* Allocates a new name cache from heap, and sets the expire time on new * entries to entryExpireTimeMS after a cache entry is added. */ -struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS); +struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) DECLSPEC_HIDDEN; /* Adds an entry to the cache. The entry is assumed to have been allocated * from the same heap as the name cache; the name cache will own the entry @@ -60,14 +60,14 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS); * same name was in the cache, the entry is replaced. Returns TRUE on success * or FALSE on failure. */ -BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry); +BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry) DECLSPEC_HIDDEN; /* Finds the entry with name name in the cache and returns a pointer to it, or * NULL if it isn't found. */ const NBNameCacheEntry *NBNameCacheFindEntry(struct NBNameCache *cache, - const UCHAR name[NCBNAMSZ]); + const UCHAR name[NCBNAMSZ]) DECLSPEC_HIDDEN; -void NBNameCacheDestroy(struct NBNameCache *cache); +void NBNameCacheDestroy(struct NBNameCache *cache) DECLSPEC_HIDDEN; #endif /* ndef __WINE_NBNAMECACHE_H */ diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h index 1279a5a..4cc9b2e 100644 --- a/dlls/netapi32/netbios.h +++ b/dlls/netapi32/netbios.h @@ -32,8 +32,8 @@ * Public functions */ -void NetBIOSInit(void); -void NetBIOSShutdown(void); +void NetBIOSInit(void) DECLSPEC_HIDDEN; +void NetBIOSShutdown(void) DECLSPEC_HIDDEN; struct _NetBIOSTransport; @@ -41,7 +41,7 @@ struct _NetBIOSTransport; * a unique id (the transport_id of ACTION_HEADER, for example) and an * implementation. Returns TRUE on success, and FALSE on failure. */ -BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport); +BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport) DECLSPEC_HIDDEN; /* Registers an adapter with the given transport and ifIndex with NetBIOS. * ifIndex is an interface index usable by the IpHlpApi. ifIndex is not @@ -51,7 +51,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport); * FIXME: need functions for retrieving the name and hardware index, rather * than assuming a correlation with IpHlpApi. */ -BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter); +BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter) DECLSPEC_HIDDEN; /* During enumeration, all adapters from your transport are disabled * internally. If an adapter is still valid, reenable it with this function. @@ -59,13 +59,13 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter); * function (see below) called on them, and will be removed from the table. * (This is to deal with lack of plug-and-play--sorry.) */ -void NetBIOSEnableAdapter(UCHAR lana); +void NetBIOSEnableAdapter(UCHAR lana) DECLSPEC_HIDDEN; /* Gets a quick count of the number of NetBIOS adapters. Not guaranteed not * to change from one call to the next, depending on what's been enumerated * lately. See also NetBIOSEnumAdapters. */ -UCHAR NetBIOSNumAdapters(void); +UCHAR NetBIOSNumAdapters(void) DECLSPEC_HIDDEN; typedef struct _NetBIOSAdapterImpl { UCHAR lana; @@ -84,7 +84,7 @@ typedef BOOL (*NetBIOSEnumAdaptersCallback)(UCHAR totalLANAs, UCHAR lanaIndex, * Your callback should return FALSE if it no longer wishes to be called. */ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, - void *closure); + void *closure) DECLSPEC_HIDDEN; /* Hangs up the session identified in the NCB; the NCB need not be a NCBHANGUP. * Will result in the transport's hangup function being called, so release any @@ -92,7 +92,7 @@ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, * This function is intended for use by a transport, if the session is closed * by some error in the transport layer. */ -void NetBIOSHangupSession(const NCB *ncb); +void NetBIOSHangupSession(const NCB *ncb) DECLSPEC_HIDDEN; /** * Functions a transport implementation must implement @@ -178,6 +178,6 @@ typedef struct _NetBIOSTransport /* Not defined by MS, so make my own private define: */ #define TRANSPORT_NBT "MNBT" -void NetBTInit(void); +void NetBTInit(void) DECLSPEC_HIDDEN; #endif /* ndef __WINE_NETBIOS_H__ */ diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 122a685..ad8d87e 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); * * Checks whether the server name indicates local machine. */ -BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) +DECLSPEC_HIDDEN BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) { if (!ServerName) {

1 0

Marcus Meissner : mstask: Mark internal symbol with hidden visibility.
by Alexandre Julliard May 23, 2011

May 23, 2011

Module: wine Branch: master Commit: e7fc8583283574f5f7522a45273105ba11e0a21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc8583283574f5f7522a452… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:34:18 2011 +0200 mstask: Mark internal symbol with hidden visibility. --- dlls/mstask/mstask_private.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 28c579d..17c20fe 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -29,13 +29,13 @@ #include "ole2.h" #include "mstask.h" -extern LONG dll_ref; +extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; -extern ClassFactoryImpl MSTASK_ClassFactory; +extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; -extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); -extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); -extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); +extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) DECLSPEC_HIDDEN; #endif /* __MSTASK_PRIVATE_H__ */

1 0