June 2009 - Wine-Commits - list.winehq.org

Michael Stefaniuc : oleaut32: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: da01cf93acba848e4120e34b3b187c565bc7a507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da01cf93acba848e4120e34b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:14:36 2009 +0200 oleaut32: Build language resource files separately. Instead of including them from an other rc file. --- dlls/oleaut32/Makefile.in | 27 +++++++++++++++++++- dlls/oleaut32/oleaut32.rc | 57 ------------------------------------------ dlls/oleaut32/oleaut32_Bg.rc | 2 + dlls/oleaut32/oleaut32_Cz.rc | 2 + dlls/oleaut32/oleaut32_Da.rc | 2 + dlls/oleaut32/oleaut32_De.rc | 2 + dlls/oleaut32/oleaut32_El.rc | 2 + dlls/oleaut32/oleaut32_En.rc | 2 + dlls/oleaut32/oleaut32_Eo.rc | 2 + dlls/oleaut32/oleaut32_Es.rc | 2 + dlls/oleaut32/oleaut32_Fr.rc | 2 + dlls/oleaut32/oleaut32_Hu.rc | 2 + dlls/oleaut32/oleaut32_It.rc | 2 + dlls/oleaut32/oleaut32_Ko.rc | 2 + dlls/oleaut32/oleaut32_Lt.rc | 4 +- dlls/oleaut32/oleaut32_Nl.rc | 2 + dlls/oleaut32/oleaut32_No.rc | 2 + dlls/oleaut32/oleaut32_Pl.rc | 2 + dlls/oleaut32/oleaut32_Pt.rc | 2 + dlls/oleaut32/oleaut32_Ro.rc | 4 +- dlls/oleaut32/oleaut32_Ru.rc | 2 + dlls/oleaut32/oleaut32_Si.rc | 4 +- dlls/oleaut32/oleaut32_Sv.rc | 2 + dlls/oleaut32/oleaut32_Th.rc | 2 + dlls/oleaut32/oleaut32_Tr.rc | 2 + dlls/oleaut32/oleaut32_Zh.rc | 4 +- dlls/oleaut32/resource.h | 2 + 27 files changed, 76 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da01cf93acba848e4120e…

1 0

Hans Leidekker : msi: Support opening transform databases.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 60b7604aa18089fcec5b336a06901f7f4cef80f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b7604aa18089fcec5b336a0… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Tue Jun 30 13:20:38 2009 +0200 msi: Support opening transform databases. --- dlls/msi/database.c | 8 ++------ dlls/msi/msipriv.h | 4 ++++ dlls/msi/msiquery.c | 2 -- dlls/msi/tests/install.c | 20 ++++---------------- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index bc9319e..4c21876 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -41,11 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -DEFINE_GUID( CLSID_MsiDatabase, 0x000c1084, 0x0000, 0x0000, - 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID( CLSID_MsiPatch, 0x000c1086, 0x0000, 0x0000, - 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - /* * .MSI file format * @@ -163,7 +158,8 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) } if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiDatabase ) && - !IsEqualGUID( &stat.clsid, &CLSID_MsiPatch ) ) + !IsEqualGUID( &stat.clsid, &CLSID_MsiPatch ) && + !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) { ERR("storage GUID is not a MSI database GUID %s\n", debugstr_guid(&stat.clsid) ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8c4bd3a..b61d7b6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -605,6 +605,10 @@ DEFINE_GUID(CLSID_IMsiServerMessage, 0x000C101D,0x0000,0x0000,0xC0,0x00,0x00,0x0 DEFINE_GUID(CLSID_IWineMsiRemoteCustomAction,0xBA26E6FA,0x4F27,0x4f56,0x95,0x3A,0x3F,0x90,0x27,0x20,0x18,0xAA); DEFINE_GUID(CLSID_IWineMsiRemotePackage,0x902b3592,0x9d08,0x4dfd,0xa5,0x93,0xd0,0x7c,0x52,0x54,0x64,0x21); +DEFINE_GUID(CLSID_MsiTransform, 0x000c1082,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiDatabase, 0x000c1084,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiPatch, 0x000c1086,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + /* handle unicode/ascii output in the Msi* API functions */ typedef struct { BOOL unicode; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 43c7b4d..5a46f9b 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -716,8 +716,6 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) return 0; } -DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4912f8c..e6c22fb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4386,31 +4386,19 @@ static void set_transform_summary_info(void) /* build summary info */ r = MsiGetSummaryInformation(0, mstfile, 3, &suminfo); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to open summaryinfo\n"); - } + ok(r == ERROR_SUCCESS , "Failed to open summaryinfo\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL, "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;" "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;" "{4C0EAA15-0264-4E5A-8758-609EF142B92D}"); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS , "Failed to set summary info\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_PAGECOUNT, VT_I4, 100, NULL, NULL); - todo_wine - { - ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoPersist(suminfo); todo_wine

1 0

Michael Stefaniuc : uninstaller: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: d10ea237a9bae13ea484b02543e0e23b8bb446c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10ea237a9bae13ea484b0254… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:15:20 2009 +0200 uninstaller: Build language resource files separately. Instead of including them from an other rc file. --- programs/uninstaller/Bg.rc | 2 + programs/uninstaller/Cs.rc | 2 + programs/uninstaller/Da.rc | 2 + programs/uninstaller/De.rc | 2 + programs/uninstaller/En.rc | 2 + programs/uninstaller/Eo.rc | 2 + programs/uninstaller/Es.rc | 2 + programs/uninstaller/Fi.rc | 2 + programs/uninstaller/Fr.rc | 2 + programs/uninstaller/Hu.rc | 2 + programs/uninstaller/It.rc | 2 + programs/uninstaller/Ko.rc | 2 + programs/uninstaller/Lt.rc | 4 +- programs/uninstaller/Makefile.in | 25 ++++++++++++++++++- programs/uninstaller/Nl.rc | 2 + programs/uninstaller/No.rc | 2 + programs/uninstaller/Pl.rc | 2 + programs/uninstaller/Pt.rc | 2 + programs/uninstaller/Ro.rc | 4 +- programs/uninstaller/Ru.rc | 2 + programs/uninstaller/Si.rc | 4 +- programs/uninstaller/Sv.rc | 2 + programs/uninstaller/Tr.rc | 2 + programs/uninstaller/Zh.rc | 4 +- programs/uninstaller/resource.h | 2 + programs/uninstaller/rsrc.rc | 51 -------------------------------------- 26 files changed, 72 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d10ea237a9bae13ea484b…

1 0

Michael Stefaniuc : mpr: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 90d5a4b693338319500d175b7d58f0dfd9dd3b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d5a4b693338319500d175b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:13:16 2009 +0200 mpr: Build language resource files separately. Instead of including them from an other rc file. --- dlls/mpr/Makefile.in | 26 +++++++++++++++++++++++++- dlls/mpr/mpr.rc | 49 ------------------------------------------------- dlls/mpr/mpr_Bg.rc | 2 ++ dlls/mpr/mpr_Cs.rc | 2 ++ dlls/mpr/mpr_Da.rc | 2 ++ dlls/mpr/mpr_De.rc | 2 ++ dlls/mpr/mpr_En.rc | 2 ++ dlls/mpr/mpr_Eo.rc | 2 ++ dlls/mpr/mpr_Es.rc | 2 ++ dlls/mpr/mpr_Fr.rc | 2 ++ dlls/mpr/mpr_Hu.rc | 2 ++ dlls/mpr/mpr_It.rc | 2 ++ dlls/mpr/mpr_Ja.rc | 4 ++-- dlls/mpr/mpr_Ko.rc | 2 ++ dlls/mpr/mpr_Lt.rc | 4 ++-- dlls/mpr/mpr_Nl.rc | 2 ++ dlls/mpr/mpr_No.rc | 2 ++ dlls/mpr/mpr_Pl.rc | 2 ++ dlls/mpr/mpr_Pt.rc | 2 ++ dlls/mpr/mpr_Ro.rc | 4 ++-- dlls/mpr/mpr_Ru.rc | 2 ++ dlls/mpr/mpr_Si.rc | 4 ++-- dlls/mpr/mpr_Sv.rc | 2 ++ dlls/mpr/mpr_Tr.rc | 2 ++ dlls/mpr/mpr_Zh.rc | 4 ++-- dlls/mpr/mprres.h | 3 +++ 26 files changed, 74 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90d5a4b693338319500d1…

1 0

Andrew Eikum : gdiplus: Implement GdipDrawCurve3 and GdipDrawCurve3I.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 4c0edba681181418e4ede547da49ec3dc903c704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0edba681181418e4ede547d… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 29 22:12:40 2009 -0500 gdiplus: Implement GdipDrawCurve3 and GdipDrawCurve3I. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 30 ++++++++ dlls/gdiplus/tests/graphics.c | 162 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 196 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b93d5f6..008841d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -165,8 +165,8 @@ @ stdcall GdipDrawClosedCurveI(ptr ptr ptr long) @ stdcall GdipDrawCurve2(ptr ptr ptr long long) @ stdcall GdipDrawCurve2I(ptr ptr ptr long long) -@ stub GdipDrawCurve3 -@ stub GdipDrawCurve3I +@ stdcall GdipDrawCurve3(ptr ptr ptr long long long long) +@ stdcall GdipDrawCurve3I(ptr ptr ptr long long long long) @ stdcall GdipDrawCurve(ptr ptr ptr long) @ stdcall GdipDrawCurveI(ptr ptr ptr long) @ stdcall GdipDrawDriverString(ptr ptr long ptr ptr ptr long ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 152d590..2be64c7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1532,6 +1532,36 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, return ret; } +GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count, INT offset, INT numberOfSegments, + REAL tension) +{ + TRACE("(%p, %p, %p, %d, %d, %d, %.2f)\n", graphics, pen, points, count, offset, numberOfSegments, tension); + + if(offset >= count || numberOfSegments > count - offset - 1 || numberOfSegments <= 0){ + return InvalidParameter; + } + + return GdipDrawCurve2(graphics, pen, points + offset, numberOfSegments + 1, tension); +} + +GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPoint *points, INT count, INT offset, INT numberOfSegments, + REAL tension) +{ + TRACE("(%p, %p, %p, %d, %d, %d, %.2f)\n", graphics, pen, points, count, offset, numberOfSegments, tension); + + if(count < 0){ + return OutOfMemory; + } + + if(offset >= count || numberOfSegments > count - offset - 1 || numberOfSegments <= 0){ + return InvalidParameter; + } + + return GdipDrawCurve2I(graphics, pen, points + offset, numberOfSegments + 1, tension); +} + GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e42044a..ad7f2d3 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -361,6 +361,166 @@ static void test_GdipDrawBezierI(void) ReleaseDC(0, hdc); } +static void test_GdipDrawCurve3(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPointF points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurve3(NULL, NULL, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, NULL, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(NULL, pen, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurve3(graphics, pen, points, -1, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, pen, points, 0, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, pen, points, 1, 0, 0, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, pen, points, 3, 4, 2, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid number of segments */ + status = GdipDrawCurve3(graphics, pen, points, 3, 0, -1, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, pen, points, 3, 1, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3(graphics, pen, points, 2, 0, 2, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurve3(graphics, pen, points, 2, 0, 1, 1); + expect(Ok, status); + + status = GdipDrawCurve3(graphics, pen, points, 3, 0, 2, 2); + expect(Ok, status); + + status = GdipDrawCurve3(graphics, pen, points, 2, 0, 1, -2); + expect(Ok, status); + + status = GdipDrawCurve3(graphics, pen, points, 3, 1, 1, 0); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + +static void test_GdipDrawCurve3I(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurve3I(NULL, NULL, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(graphics, NULL, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(NULL, pen, points, 3, 0, 2, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurve3I(graphics, pen, points, -1, -1, -1, 1); + expect(OutOfMemory, status); + + status = GdipDrawCurve3I(graphics, pen, points, 0, 0, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(graphics, pen, points, 1, 0, 0, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(graphics, pen, points, 3, 4, 2, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid number of segments */ + status = GdipDrawCurve3I(graphics, pen, points, 3, 0, -1, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(graphics, pen, points, 3, 1, 2, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve3I(graphics, pen, points, 2, 0, 2, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurve3I(graphics, pen, points, 2, 0, 1, 1); + expect(Ok, status); + + status = GdipDrawCurve3I(graphics, pen, points, 3, 0, 2, 2); + expect(Ok, status); + + status = GdipDrawCurve3I(graphics, pen, points, 2, 0, 1, -2); + expect(Ok, status); + + status = GdipDrawCurve3I(graphics, pen, points, 3, 1, 1, 0); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + static void test_GdipDrawCurve2(void) { GpStatus status; @@ -1345,6 +1505,8 @@ START_TEST(graphics) test_GdipDrawCurveI(); test_GdipDrawCurve2(); test_GdipDrawCurve2I(); + test_GdipDrawCurve3(); + test_GdipDrawCurve3I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4e830b5..48c188b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -147,6 +147,8 @@ GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,INT,INT,REAL); +GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,INT,INT,REAL); GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL);

1 0

Huw Davies : gdi32: Add tests for the GetWinMetaFileBits MFCOMMENT record.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: d6bb2b75914f093556e1436530f86757936c7492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bb2b75914f093556e143653… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 30 11:47:59 2009 +0100 gdi32: Add tests for the GetWinMetaFileBits MFCOMMENT record. --- dlls/gdi32/tests/metafile.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6164050..237f2f4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2302,6 +2302,85 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } +static void test_GetWinMetaFileBits(void) +{ + HENHMETAFILE emf; + HDC display_dc, emf_dc; + RECT rc; + ENHMETAHEADER *enh_header; + UINT size, emf_size, i, mode; + WORD check = 0; + DWORD rec_num = 0; + METAHEADER *mh; + METARECORD *rec; + + display_dc = GetDC(NULL); + + SetRect(&rc, 1000, 2000, 3000, 6000); + emf_dc = CreateEnhMetaFileA(display_dc, NULL, &rc, NULL); + for(i = 0; i < 3000; i++) /* This is enough to take emf_size > 0xffff */ + Rectangle(emf_dc, 0, 0, 1000, 20); + emf = CloseEnhMetaFile(emf_dc); + + emf_size = GetEnhMetaFileBits(emf, 0, NULL); + enh_header = HeapAlloc(GetProcessHeap(), 0, emf_size); + emf_size = GetEnhMetaFileBits(emf, emf_size, (BYTE*)enh_header); + + mode = MM_ANISOTROPIC; + size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); + mh = HeapAlloc(GetProcessHeap(), 0, size); + GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc); + + for(i = 0; i < size / 2; i++) check += ((WORD*)mh)[i]; + ok(check == 0, "check %04x\n", check); + + rec = (METARECORD*)(mh + 1); + + while(rec->rdSize && rec->rdFunction) + { + const DWORD chunk_size = 0x2000; + DWORD mfcomment_chunks = (emf_size + chunk_size - 1) / chunk_size; + + if(rec_num < mfcomment_chunks) + { + DWORD this_chunk_size = chunk_size; + + if(rec_num == mfcomment_chunks - 1) + this_chunk_size = emf_size - rec_num * chunk_size; + + ok(rec->rdFunction == META_ESCAPE, "got %04x\n", rec->rdFunction); + ok(rec->rdParm[0] == MFCOMMENT, "got %04x\n", rec->rdParm[0]); + ok(rec->rdParm[1] == this_chunk_size + 34, "got %04x %x\n", rec->rdParm[1], emf_size + 34); + ok(rec->rdParm[2] == 0x4d57, "got %04x\n", rec->rdParm[2]); /* WMFC */ + ok(rec->rdParm[3] == 0x4346, "got %04x\n", rec->rdParm[3]); /* " */ + ok(rec->rdParm[4] == 1, "got %04x\n", rec->rdParm[4]); + ok(rec->rdParm[5] == 0, "got %04x\n", rec->rdParm[5]); + ok(rec->rdParm[6] == 0, "got %04x\n", rec->rdParm[6]); + ok(rec->rdParm[7] == 1, "got %04x\n", rec->rdParm[7]); + /* parm[8] is the checksum, tested above */ + if(rec_num > 0) ok(rec->rdParm[8] == 0, "got %04x\n", rec->rdParm[8]); + ok(rec->rdParm[9] == 0, "got %04x\n", rec->rdParm[9]); + ok(rec->rdParm[10] == 0, "got %04x\n", rec->rdParm[10]); + ok(rec->rdParm[11] == mfcomment_chunks, "got %04x\n", rec->rdParm[11]); /* num chunks */ + ok(rec->rdParm[12] == 0, "got %04x\n", rec->rdParm[12]); + ok(rec->rdParm[13] == this_chunk_size, "got %04x expected %04x\n", rec->rdParm[13], this_chunk_size); + ok(rec->rdParm[14] == 0, "got %04x\n", rec->rdParm[14]); + ok(*(DWORD*)(rec->rdParm + 15) == emf_size - this_chunk_size - rec_num * chunk_size, "got %08x\n", *(DWORD*)(rec->rdParm + 15)); /* DWORD size remaining after current chunk */ + ok(*(DWORD*)(rec->rdParm + 17) == emf_size, "got %08x emf_size %08x\n", *(DWORD*)(rec->rdParm + 17), emf_size); + ok(!memcmp(rec->rdParm + 19, (char*)enh_header + rec_num * chunk_size, this_chunk_size), "bits mismatch\n"); + } + + rec_num++; + rec = (METARECORD*)((WORD*)rec + rec->rdSize); + } + + HeapFree(GetProcessHeap(), 0, mh); + HeapFree(GetProcessHeap(), 0, enh_header); + DeleteEnhMetaFile(emf); + + ReleaseDC(NULL, display_dc); +} + static BOOL (WINAPI *pGdiIsMetaPrintDC)(HDC); static BOOL (WINAPI *pGdiIsMetaFileDC)(HDC); static BOOL (WINAPI *pGdiIsPlayMetafileDC)(HDC); @@ -2425,6 +2504,7 @@ START_TEST(metafile) /* For metafile conversions */ test_mf_conversions(); test_SetWinMetaFileBits(); + test_GetWinMetaFileBits(); test_gdiis(); test_SetEnhMetaFileBits();

1 0

Huw Davies : gdi32: Use the unicode version of CreateMetaFile.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: d7af14f1b57a17e538b764d9575980134753df83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7af14f1b57a17e538b764d95… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 29 13:46:33 2009 +0100 gdi32: Use the unicode version of CreateMetaFile. --- dlls/gdi32/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index ea75ae8..ed3d16b 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1166,7 +1166,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, TRACE("(%p,%d,%p,%d,%p) rc=%s\n", hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef, wine_dbgstr_rect(&rc)); - hdcmf = CreateMetaFileA(NULL); + hdcmf = CreateMetaFileW(NULL); PlayEnhMetaFile(hdcmf, hemf, &rc); hmf = CloseMetaFile(hdcmf); ret = GetMetaFileBitsEx(hmf, cbBuffer, lpbBuffer);

1 0

Henri Verbeet : wined3d: Consolidate "color0_mov" handling a bit.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 1911adcea5d8ab2bd023cac9920b62960dbdf43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1911adcea5d8ab2bd023cac99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 10:58:15 2009 +0200 wined3d: Consolidate "color0_mov" handling a bit. --- dlls/wined3d/baseshader.c | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ebd0688..52e0813 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -608,6 +608,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 fe->shader_read_dst_param(fe_data, &pToken, &dst_param, &dst_rel_addr); + shader_record_register_usage(This, reg_maps, &dst_param.reg, shader_version.type); + /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ @@ -615,14 +617,24 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->texcoord_mask[dst_param.reg.idx] |= dst_param.write_mask; } - else + + if (pshader && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) { - if(pshader && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to + * COLOROUT 0. If we know this in advance, the ARB shader backend can skip + * the mov and perform the sRGB write correction from the source register. + * + * However, if the mov is only partial, we can't do this, and if the write + * comes from an instruction other than MOV it is hard to do as well. If + * COLOROUT 0 is overwritten partially later, the marker is dropped again. */ + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)This; + + ps->color0_mov = FALSE; + if (ins.handler_idx == WINED3DSIH_MOV) { - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; - ps->color0_mov = FALSE; + /* Used later when the source register is read. */ + color0_mov = TRUE; } - shader_record_register_usage(This, reg_maps, &dst_param.reg, shader_version.type); } /* Declare 1.X samplers implicitly, based on the destination reg. number */ @@ -660,22 +672,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->bumpmat[dst_param.reg.idx] = TRUE; } - else if (ins.handler_idx == WINED3DSIH_MOV) - { - /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to - * COLOROUT 0. If we know this in advance, the ARB shader backend can skip - * the mov and perform the sRGB write correction from the source register. - * - * However, if the mov is only partial, we can't do this, and if the write - * comes from an instruction other than MOV it is hard to do as well. If - * COLOROUT 0 is overwritten partially later, the marker is dropped again - */ - if(dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) - { - /* Used later when the source register is read */ - color0_mov = TRUE; - } - } } if (ins.handler_idx == WINED3DSIH_NRM)

1 0

Huw Davies : gdi32: Remove obviously incorrect calls to SetMapMode.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: db6a9e6f75d03edab6fb5d7860568fddf8f5cf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6a9e6f75d03edab6fb5d786… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 29 16:01:06 2009 +0100 gdi32: Remove obviously incorrect calls to SetMapMode. --- dlls/gdi32/metafile.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index ed3d16b..53ceceb 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1158,10 +1158,8 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, HMETAFILE hmf; UINT ret; RECT rc; - INT oldMapMode; GetClipBox(hdcRef, &rc); - oldMapMode = SetMapMode(hdcRef, fnMapMode); TRACE("(%p,%d,%p,%d,%p) rc=%s\n", hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef, wine_dbgstr_rect(&rc)); @@ -1172,8 +1170,6 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, ret = GetMetaFileBitsEx(hmf, cbBuffer, lpbBuffer); DeleteMetaFile(hmf); - SetMapMode(hdcRef, oldMapMode); - return ret; }

1 0

Huw Davies : gdi32: Store the original emf as a sequence of MFCOMMENT records.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 41bbc007a468c3c91baa404e8d838b30868b9ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41bbc007a468c3c91baa404e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 29 16:06:40 2009 +0100 gdi32: Store the original emf as a sequence of MFCOMMENT records. --- dlls/gdi32/metafile.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 53ceceb..d0c55ce 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1147,6 +1147,81 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) return mfSize; } +#include <pshpack2.h> +typedef struct +{ + DWORD magic; /* WMFC */ + WORD unk04; /* 1 */ + WORD unk06; /* 0 */ + WORD unk08; /* 0 */ + WORD unk0a; /* 1 */ + WORD checksum; + DWORD unk0e; /* 0 */ + DWORD num_chunks; + DWORD chunk_size; + DWORD remaining_size; + DWORD emf_size; + BYTE *emf_data; +} mf_comment_chunk; +#include <poppack.h> + +static const DWORD wmfc_magic = 0x43464d57; + +/****************************************************************** + * add_mf_comment + * + * Helper for GetWinMetaFileBits + * + * Add the MFCOMMENT record[s] which is essentially a copy + * of the original emf. + */ +static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) +{ + DWORD size = GetEnhMetaFileBits(emf, 0, NULL), i; + BYTE *bits, *chunk_data; + mf_comment_chunk *chunk = NULL; + BOOL ret = FALSE; + static const DWORD max_chunk_size = 0x2000; + + if(!size) return FALSE; + chunk_data = bits = HeapAlloc(GetProcessHeap(), 0, size); + if(!bits) return FALSE; + if(!GetEnhMetaFileBits(emf, size, bits)) goto end; + + chunk = HeapAlloc(GetProcessHeap(), 0, max_chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data)); + if(!chunk) goto end; + + chunk->magic = wmfc_magic; + chunk->unk04 = 1; + chunk->unk06 = 0; + chunk->unk08 = 0; + chunk->unk0a = 1; + chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ + chunk->unk0e = 0; + chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; + chunk->chunk_size = max_chunk_size; + chunk->remaining_size = size; + chunk->emf_size = size; + + for(i = 0; i < chunk->num_chunks; i++) + { + if(i == chunk->num_chunks - 1) /* last chunk */ + chunk->chunk_size = chunk->remaining_size; + + chunk->remaining_size -= chunk->chunk_size; + memcpy(&chunk->emf_data, chunk_data, chunk->chunk_size); + chunk_data += chunk->chunk_size; + + if(!Escape(hdc, MFCOMMENT, chunk->chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data), (char*)chunk, NULL)) + goto end; + } + ret = TRUE; +end: + HeapFree(GetProcessHeap(), 0, chunk); + HeapFree(GetProcessHeap(), 0, bits); + return ret; +} + /****************************************************************** * GetWinMetaFileBits [GDI32.@] */ @@ -1156,7 +1231,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, { HDC hdcmf; HMETAFILE hmf; - UINT ret; + UINT ret, full_size; RECT rc; GetClipBox(hdcRef, &rc); @@ -1165,11 +1240,25 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, fnMapMode, hdcRef, wine_dbgstr_rect(&rc)); hdcmf = CreateMetaFileW(NULL); + + add_mf_comment(hdcmf, hemf); + PlayEnhMetaFile(hdcmf, hemf, &rc); hmf = CloseMetaFile(hdcmf); + full_size = GetMetaFileBitsEx(hmf, 0, NULL); ret = GetMetaFileBitsEx(hmf, cbBuffer, lpbBuffer); DeleteMetaFile(hmf); + if(ret && ret == full_size && lpbBuffer) /* fixup checksum, but only if retrieving all of the bits */ + { + WORD checksum = 0; + METARECORD *comment_rec = (METARECORD*)(lpbBuffer + sizeof(METAHEADER)); + UINT i; + + for(i = 0; i < full_size / 2; i++) + checksum += ((WORD*)lpbBuffer)[i]; + comment_rec->rdParm[8] = ~checksum + 1; + } return ret; }

1 0