wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Bruno Jesus : iccvid: Implement inverted frame decompressing.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: e75f2282ba209c15a0183ac44676ae36ccbf3dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75f2282ba209c15a0183ac44… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 2 03:02:46 2015 +0800 iccvid: Implement inverted frame decompressing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 183 +++++++++++++++++++++++++-------------------- dlls/msvfw32/tests/msvfw.c | 6 +- 2 files changed, 105 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e75f2282ba209c15a0183…

1 0

Thomas Faller : kernel32: Fix invalid write.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 9178d037d71e823f5d5eaa5008a3cdd574377bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9178d037d71e823f5d5eaa500… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun Nov 1 19:54:34 2015 +0100 kernel32: Fix invalid write. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index bc417bd..d8977f9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -506,6 +506,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl { tmpshortpath[sp++] = *p++; tmpshortpath[sp++] = *p++; + lp += 2; } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (longpath + lp);

1 0

Bruno Jesus : mcicda: Improve CD drive IOCTL tracing.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 755991162aff75d0f1e76d0b99a17a9155a7c321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755991162aff75d0f1e76d0b9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 2 00:32:34 2015 +0800 mcicda: Improve CD drive IOCTL tracing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/mcicda.c | 71 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=755991162aff75d0f1e76…

1 0

Bruno Jesus : msvfw32: Make it clear why a DrawDibBegin call is required.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 560b13c273e456757bd18380085b126a0d292883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560b13c273e456757bd183800… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Nov 1 01:22:54 2015 +0800 msvfw32: Make it clear why a DrawDibBegin call is required. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/drawdib.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index e96b0f2..27ac3b5 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -313,7 +313,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, UINT wFlags) { WINE_HDD *whdd; - BOOL ret = TRUE; + BOOL ret; + int reopen = 0; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); @@ -335,11 +336,25 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, #define CHANGED(x) (whdd->x != x) - if ((!whdd->begun) || - (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || - (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) + /* Check if anything changed from the parameters passed and our struct. + * If anything changed we need to run DrawDibBegin again to ensure we + * can support the changes. + */ + if (!whdd->begun) + reopen = 1; + else if (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) + reopen = 2; + else if (!(wFlags & DDF_SAME_DRAW)) { - TRACE("Something changed!\n"); + if (CHANGED(lpbi) && memcmp(lpbi, whdd->lpbi, sizeof(*lpbi))) reopen = 3; + else if (CHANGED(dxSrc)) reopen = 4; + else if (CHANGED(dySrc)) reopen = 5; + else if (CHANGED(dxDst)) reopen = 6; + else if (CHANGED(dyDst)) reopen = 7; + } + if (reopen) + { + TRACE("Something changed (reason %d)!\n", reopen); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); if (!ret) return ret; @@ -388,9 +403,10 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, SelectPalette(hdc, whdd->hpal, FALSE); } - if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY))) - ret = FALSE; - + ret = StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY); + TRACE("Painting %dx%d at %d,%d from %dx%d at %d,%d -> %d\n", + dxDst, dyDst, xDst, yDst, dxSrc, dySrc, xSrc, ySrc, ret); + return ret; }

1 0

Bruno Jesus : msvfw32: Derive frame dimension from bitmap info when not available.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 2ccba1cf14aaab5cd2bb3585429450300e70e941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccba1cf14aaab5cd2bb35854… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Nov 1 01:22:46 2015 +0800 msvfw32: Derive frame dimension from bitmap info when not available. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/drawdib.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index a6af90f..e96b0f2 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -347,7 +347,14 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, #undef CHANGED - if ((dxDst == -1) && (dyDst == -1)) + /* If source dimensions are not specified derive them from bitmap header */ + if (dxSrc == -1 && dySrc == -1) + { + dxSrc = lpbi->biWidth; + dySrc = lpbi->biHeight; + } + /* If destination dimensions are not specified derive them from source */ + if (dxDst == -1 && dyDst == -1) { dxDst = dxSrc; dyDst = dySrc;

1 0

Marcus Meissner : quartz: Avoid endless loop (Coverity).
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 5bc57faf86a476524cf6355b94fa3d6da0226e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc57faf86a476524cf6355b9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 31 10:43:25 2015 +0100 quartz: Avoid endless loop (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 10b9dff..3538ddb 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3085,6 +3085,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren D3DDISPLAYMODE mode; hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ } while (FAILED(hr)); if (FAILED(hr)) ERR("HR: %08x\n", hr);

1 0

Vincent Povirk : gdiplus: Use GdipGetMetafileHeaderFromEmf when opening metafiles.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 592533bd72aa9046c64117fa3258937611939f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592533bd72aa9046c64117fa3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 30 14:55:32 2015 -0500 gdiplus: Use GdipGetMetafileHeaderFromEmf when opening metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 70 +++++++++---------------------------------- dlls/gdiplus/tests/metafile.c | 20 ++++++------- 2 files changed, 24 insertions(+), 66 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ca9889b..6d7048a 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -887,46 +887,6 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics, return GdipEnumerateMetafileDestPoint(graphics, metafile, &ptf, callback, cb_data, attrs); } -static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, - int nObj, LPARAM lpData) -{ - MetafileType *result = (MetafileType*)lpData; - - if (lpEMFR->iType == EMR_GDICOMMENT) - { - const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; - - if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) - { - const EmfPlusRecordHeader *header = (const EmfPlusRecordHeader*)&comment->Data[4]; - - if (4 + sizeof(EmfPlusRecordHeader) <= comment->cbData && - header->Type == EmfPlusRecordTypeHeader) - { - if ((header->Flags & 1) == 1) - *result = MetafileTypeEmfPlusDual; - else - *result = MetafileTypeEmfPlusOnly; - } - } - else - *result = MetafileTypeEmf; - } - else if (lpEMFR->iType == EMR_HEADER) - return TRUE; - else - *result = MetafileTypeEmf; - - return FALSE; -} - -static MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) -{ - MetafileType result = MetafileTypeInvalid; - EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL); - return result; -} - GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, MetafileHeader * header) { @@ -1069,21 +1029,17 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { - ENHMETAHEADER header; - MetafileType metafile_type; + GpStatus stat; + MetafileHeader header; TRACE("(%p,%i,%p)\n", hemf, delete, metafile); if(!hemf || !metafile) return InvalidParameter; - if (GetEnhMetaFileHeader(hemf, sizeof(header), &header) == 0) - return GenericError; - - metafile_type = METAFILE_GetEmfType(hemf); - - if (metafile_type == MetafileTypeInvalid) - return GenericError; + stat = GdipGetMetafileHeaderFromEmf(hemf, &header); + if (stat != Ok) + return stat; *metafile = heap_alloc_zero(sizeof(GpMetafile)); if (!*metafile) @@ -1092,14 +1048,16 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.type = ImageTypeMetafile; (*metafile)->image.format = ImageFormatEMF; (*metafile)->image.frame_count = 1; - (*metafile)->image.xres = (REAL)header.szlDevice.cx; - (*metafile)->image.yres = (REAL)header.szlDevice.cy; - (*metafile)->bounds.X = (REAL)header.rclBounds.left; - (*metafile)->bounds.Y = (REAL)header.rclBounds.top; - (*metafile)->bounds.Width = (REAL)(header.rclBounds.right - header.rclBounds.left); - (*metafile)->bounds.Height = (REAL)(header.rclBounds.bottom - header.rclBounds.top); + (*metafile)->image.xres = header.DpiX; + (*metafile)->image.yres = header.DpiY; + (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) + / 2540.0 * header.DpiX; + (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) + / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; - (*metafile)->metafile_type = metafile_type; + (*metafile)->metafile_type = header.Type; (*metafile)->hemf = hemf; (*metafile)->preserve_hemf = !delete; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 5a7d037..a4b3f59 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -401,17 +401,17 @@ static void test_empty(void) expect(Ok, stat); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - todo_wine expectf_(100.0, bounds.Width, 0.05); - todo_wine expectf_(100.0, bounds.Height, 0.05); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); expect(UnitPixel, unit); stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); expect(Ok, stat); - todo_wine expectf(header.DpiX, xres); + expectf(header.DpiX, xres); stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); - todo_wine expectf(header.DpiY, yres); + expectf(header.DpiY, yres); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); @@ -746,19 +746,19 @@ static void test_emfonly(void) stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); - todo_wine expectf(0.0, bounds.X); - todo_wine expectf(0.0, bounds.Y); - todo_wine expectf_(100.0, bounds.Width, 0.05); - todo_wine expectf_(100.0, bounds.Height, 0.05); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); expect(UnitPixel, unit); stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); expect(Ok, stat); - todo_wine expectf(header.DpiX, xres); + expectf(header.DpiX, xres); stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); - todo_wine expectf(header.DpiY, yres); + expectf(header.DpiY, yres); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Use reference device to determine created metafile resolution.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 1735a7240e2bbad6507149fc44c1a59e931947da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1735a7240e2bbad6507149fc4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 30 14:28:12 2015 -0500 gdiplus: Use reference device to determine created metafile resolution. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 12 ++++++++---- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 20b8e20..ca9889b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -193,6 +193,7 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { HDC record_dc; + REAL dpix, dpiy; REAL framerect_factor_x, framerect_factor_y; RECT rc; GpStatus stat; @@ -208,11 +209,14 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF return NotImplemented; } + dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; + dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; + switch (frameUnit) { case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / GetDeviceCaps(hdc, LOGPIXELSX); - framerect_factor_y = 2540.0 / GetDeviceCaps(hdc, LOGPIXELSY); + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; break; case MetafileFrameUnitPoint: framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; @@ -254,8 +258,8 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.picture = NULL; (*metafile)->image.flags = ImageFlagsNone; (*metafile)->image.palette = NULL; - (*metafile)->image.xres = 72.0; - (*metafile)->image.yres = 72.0; + (*metafile)->image.xres = dpix; + (*metafile)->image.yres = dpiy; (*metafile)->bounds = *frameRect; (*metafile)->unit = frameUnit; (*metafile)->metafile_type = type; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 82e803d..5a7d037 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -373,10 +373,10 @@ static void test_empty(void) expect(U(header).EmfHeader.nBytes, header.Size); ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ - todo_wine expectf(xres, header.DpiX); - todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); - todo_wine expectf(yres, header.DpiY); - todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); expect(0, header.X); expect(0, header.Y); expect(100, header.Width); @@ -391,8 +391,8 @@ static void test_empty(void) expect(-1, U(header).EmfHeader.rclBounds.bottom); expect(0, U(header).EmfHeader.rclFrame.left); expect(0, U(header).EmfHeader.rclFrame.top); - todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); - todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); expect(Ok, stat); @@ -720,10 +720,10 @@ static void test_emfonly(void) expect(U(header).EmfHeader.nBytes, header.Size); expect(0x10000, header.Version); expect(0, header.EmfPlusFlags); - todo_wine expectf(xres, header.DpiX); - todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); - todo_wine expectf(yres, header.DpiY); - todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); expect(0, header.X); expect(0, header.Y); expect(100, header.Width); @@ -738,8 +738,8 @@ static void test_emfonly(void) expect(74, U(header).EmfHeader.rclBounds.bottom); expect(0, U(header).EmfHeader.rclFrame.left); expect(0, U(header).EmfHeader.rclFrame.top); - todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); - todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Add initial GdipGetMetafileHeaderFromEmf implementation.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 233f1c1b8807eed6a9b1c2b65664d717efe72596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233f1c1b8807eed6a9b1c2b65… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 30 13:54:05 2015 -0500 gdiplus: Add initial GdipGetMetafileHeaderFromEmf implementation. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 81 +++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/metafile.c | 40 ++++++++++----------- 2 files changed, 95 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c46be76..20b8e20 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -941,18 +941,87 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, return Ok; } -GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hEmf, +static int CALLBACK get_emfplus_header_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + EmfPlusHeader *dst_header = (EmfPlusHeader*)lpData; + + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + const EmfPlusRecordHeader *header = (const EmfPlusRecordHeader*)&comment->Data[4]; + + if (4 + sizeof(EmfPlusHeader) <= comment->cbData && + header->Type == EmfPlusRecordTypeHeader) + { + memcpy(dst_header, header, sizeof(*dst_header)); + } + } + } + else if (lpEMFR->iType == EMR_HEADER) + return TRUE; + + return FALSE; +} + +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, MetafileHeader *header) { - static int calls; + ENHMETAHEADER3 emfheader; + EmfPlusHeader emfplusheader; + MetafileType metafile_type; + + TRACE("(%p,%p)\n", hemf, header); - if(!hEmf || !header) + if(!hemf || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (GetEnhMetaFileHeader(hemf, sizeof(emfheader), (ENHMETAHEADER*)&emfheader) == 0) + return GenericError; - memset(header, 0, sizeof(MetafileHeader)); + emfplusheader.Header.Type = 0; + + EnumEnhMetaFile(NULL, hemf, get_emfplus_header_proc, &emfplusheader, NULL); + + if (emfplusheader.Header.Type == EmfPlusRecordTypeHeader) + { + if ((emfplusheader.Header.Flags & 1) == 1) + metafile_type = MetafileTypeEmfPlusDual; + else + metafile_type = MetafileTypeEmfPlusOnly; + } + else + metafile_type = MetafileTypeEmf; + + header->Type = metafile_type; + header->Size = emfheader.nBytes; + header->DpiX = (REAL)emfheader.szlDevice.cx * 25.4 / emfheader.szlMillimeters.cx; + header->DpiY = (REAL)emfheader.szlDevice.cy * 25.4 / emfheader.szlMillimeters.cy; + header->X = gdip_round((REAL)emfheader.rclFrame.left / 2540.0 * header->DpiX); + header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); + header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); + header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); + header->EmfHeader = emfheader; + + if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) + { + header->Version = emfplusheader.Version; + header->EmfPlusFlags = emfplusheader.EmfPlusFlags; + header->EmfPlusHeaderSize = emfplusheader.Header.Size; + header->LogicalDpiX = emfplusheader.LogicalDpiX; + header->LogicalDpiY = emfplusheader.LogicalDpiY; + } + else + { + header->Version = emfheader.nVersion; + header->EmfPlusFlags = 0; + header->EmfPlusHeaderSize = 0; + header->LogicalDpiX = 0; + header->LogicalDpiY = 0; + } return Ok; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index ae4c713..82e803d 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -369,26 +369,26 @@ static void test_empty(void) memset(&header, 0xaa, sizeof(header)); stat = GdipGetMetafileHeaderFromEmf(hemf, &header); expect(Ok, stat); - todo_wine expect(MetafileTypeEmfPlusOnly, header.Type); + expect(MetafileTypeEmfPlusOnly, header.Type); expect(U(header).EmfHeader.nBytes, header.Size); - todo_wine ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); - todo_wine expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ todo_wine expectf(xres, header.DpiX); todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); todo_wine expectf(yres, header.DpiY); todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); expect(0, header.X); expect(0, header.Y); - todo_wine expect(100, header.Width); - todo_wine expect(100, header.Height); - todo_wine expect(28, header.EmfPlusHeaderSize); - todo_wine expect(96, header.LogicalDpiX); - todo_wine expect(96, header.LogicalDpiX); - todo_wine expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); - todo_wine expect(-1, U(header).EmfHeader.rclBounds.right); - todo_wine expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); expect(0, U(header).EmfHeader.rclFrame.left); expect(0, U(header).EmfHeader.rclFrame.top); todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); @@ -716,9 +716,9 @@ static void test_emfonly(void) memset(&header, 0xaa, sizeof(header)); stat = GdipGetMetafileHeaderFromEmf(hemf, &header); expect(Ok, stat); - todo_wine expect(MetafileTypeEmf, header.Type); + expect(MetafileTypeEmf, header.Type); expect(U(header).EmfHeader.nBytes, header.Size); - todo_wine expect(0x10000, header.Version); + expect(0x10000, header.Version); expect(0, header.EmfPlusFlags); todo_wine expectf(xres, header.DpiX); todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); @@ -726,16 +726,16 @@ static void test_emfonly(void) todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); expect(0, header.X); expect(0, header.Y); - todo_wine expect(100, header.Width); - todo_wine expect(100, header.Height); + expect(100, header.Width); + expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiX); - todo_wine expect(EMR_HEADER, U(header).EmfHeader.iType); - todo_wine expect(25, U(header).EmfHeader.rclBounds.left); - todo_wine expect(25, U(header).EmfHeader.rclBounds.top); - todo_wine expect(74, U(header).EmfHeader.rclBounds.right); - todo_wine expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); expect(0, U(header).EmfHeader.rclFrame.left); expect(0, U(header).EmfHeader.rclFrame.top); todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);

1 0

Vincent Povirk : gdiplus/tests: Add tests for metafile headers and image information.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 09c16eb5d372749b18ad5ab4f23a34c020636a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c16eb5d372749b18ad5ab4f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 30 14:12:49 2015 -0500 gdiplus/tests: Add tests for metafile headers and image information. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 143 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3df4ae5..ae4c713 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -25,7 +25,8 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) +#define expectf(expected, got) expectf_((expected), (got), 0.001) static BOOL save_metafiles; @@ -287,8 +288,11 @@ static void test_empty(void) GpMetafile *metafile; GpGraphics *graphics; HDC hdc; + GpRectF bounds; + GpUnit unit; + REAL xres, yres; HENHMETAFILE hemf, dummy; - BOOL ret; + MetafileHeader header; 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}; @@ -337,6 +341,20 @@ static void test_empty(void) save_metafile(metafile, "empty.emf"); + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -348,8 +366,55 @@ static void test_empty(void) check_emfplus(hemf, empty_records, "empty emf"); - ret = DeleteEnhMetaFile(hemf); - ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromEmf(hemf, &header); + expect(Ok, stat); + todo_wine expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + todo_wine ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + todo_wine expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + todo_wine expectf(xres, header.DpiX); + todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + todo_wine expectf(yres, header.DpiY); + todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + todo_wine expect(100, header.Width); + todo_wine expect(100, header.Height); + todo_wine expect(28, header.EmfPlusHeaderSize); + todo_wine expect(96, header.LogicalDpiX); + todo_wine expect(96, header.LogicalDpiX); + todo_wine expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + todo_wine expect(-1, U(header).EmfHeader.rclBounds.right); + todo_wine expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + todo_wine expectf_(100.0, bounds.Width, 0.05); + todo_wine expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + todo_wine expectf(header.DpiX, xres); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + todo_wine expectf(header.DpiY, yres); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record getdc_records[] = { @@ -508,8 +573,11 @@ static void test_emfonly(void) GpImage *clone; GpGraphics *graphics; HDC hdc, metafile_dc; + GpRectF bounds; + GpUnit unit; + REAL xres, yres; HENHMETAFILE hemf; - BOOL ret; + MetafileHeader header; 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}; @@ -563,6 +631,20 @@ static void test_emfonly(void) save_metafile(metafile, "emfonly.emf"); + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(100.0, bounds.Width, 0.05); + expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -631,8 +713,55 @@ static void test_emfonly(void) check_emfplus(hemf, emfonly_records, "emfonly emf"); - ret = DeleteEnhMetaFile(hemf); - ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromEmf(hemf, &header); + expect(Ok, stat); + todo_wine expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + todo_wine expect(0x10000, header.Version); + expect(0, header.EmfPlusFlags); + todo_wine expectf(xres, header.DpiX); + todo_wine expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + todo_wine expectf(yres, header.DpiY); + todo_wine expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + todo_wine expect(100, header.Width); + todo_wine expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + todo_wine expect(EMR_HEADER, U(header).EmfHeader.iType); + todo_wine expect(25, U(header).EmfHeader.rclBounds.left); + todo_wine expect(25, U(header).EmfHeader.rclBounds.top); + todo_wine expect(74, U(header).EmfHeader.rclBounds.right); + todo_wine expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + todo_wine expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + todo_wine expectf(0.0, bounds.X); + todo_wine expectf(0.0, bounds.Y); + todo_wine expectf_(100.0, bounds.Width, 0.05); + todo_wine expectf_(100.0, bounds.Height, 0.05); + expect(UnitPixel, unit); + + stat = GdipGetImageHorizontalResolution((GpImage*)metafile, &xres); + expect(Ok, stat); + todo_wine expectf(header.DpiX, xres); + + stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); + expect(Ok, stat); + todo_wine expectf(header.DpiY, yres); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record fillrect_records[] = {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015