November 2015 - Wine-Commits

Hugh McMaster : po: Fix some format specifiers in the Turkish translation.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: a3f943f03f6917f5ce8a02e87a6effd0f1b6cd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f943f03f6917f5ce8a02e87… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 2 18:34:03 2015 +1100 po: Fix some format specifiers in the Turkish translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9a66490..0ee7f0e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11952,11 +11952,11 @@ msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok.\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "regsvr32: '%!' DLL dosyası kaydedilemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi.\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "regsvr32: '%!' DLL dosyası başarıyla kaydedildi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi.\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" @@ -12874,7 +12874,7 @@ msgstr "" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: '%c' geçersiz seçenek.\n" +msgstr "uninstaller: '%1' geçersiz seçenek.\n" #: uninstaller.rc:35 msgid ""

1 0

Thomas Faller : kernel32: Fix invalid write.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Vincent Povirk : gdiplus: Use reference device to determine created metafile resolution.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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 Nov. 2, 2015

Nov. 2, 2015

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 Nov. 2, 2015

Nov. 2, 2015

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

Vincent Povirk : gdiplus: Skip the EMR_HEADER record when looking for the EMF+ header.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 198acf7e8c023fd9a0ca713d77c297b7df61281c URL: http://source.winehq.org/git/wine.git/?a=commit;h=198acf7e8c023fd9a0ca713d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 29 15:39:41 2015 -0500 gdiplus: Skip the EMR_HEADER record when looking for the EMF+ header. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index edbbb34..c46be76 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -908,6 +908,8 @@ static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const else *result = MetafileTypeEmf; } + else if (lpEMFR->iType == EMR_HEADER) + return TRUE; else *result = MetafileTypeEmf;

1 0

Stefan Dösinger : user32: Silently ignore temporary foreground loss.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: ccf430eb52fb9a3a7c8bfdcbe7805025fb6f5dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf430eb52fb9a3a7c8bfdcbe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 30 18:17:02 2015 +0100 user32: Silently ignore temporary foreground loss. The basic problem is this: Thread A has a window W1 that is it's focus window and the system-global foreground window. At some point thread A stops processing messages. After that, thread B creates a window W2 and makes it the foreground window. Thread B later on makes W1 (from Thread A) the foreground window again. After restoring W1 as the foreground window, Thread A processes window messages again. Two WM_WINE_SETACTIVEWINDOW messages are in the queue, one for losing the foreground thread propery and one for restoring it. The first one will generates a WM_ACTIVATEAPP(0) message, which causes D3D to minimize the game window. The included test shows that Windows doesn't deliver any WM_ACTIVATEAPP messages if the thread stopped being the foreground thread and re-gained that property between two message processing calls. It isn't implemented with a plain WM_ACTIVATEAPP filter, the manually injected message in the test still gets through. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 1 + dlls/user32/tests/win.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccf430eb52fb9a3a7c8bf…

1 0

Marcus Meissner : quartz: Avoid endless loop (Coverity).
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Bruno Jesus : msvfw32: Derive frame dimension from bitmap info when not available.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Alex Henrie : opengl32: Check the minor version when determining extension support.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: b4eb8e846b7e9f06e76c8c9edfe1a5cdc774321c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4eb8e846b7e9f06e76c8c9ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 29 21:30:19 2015 -0600 opengl32: Check the minor version when determining extension support. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9482c75..acfb243 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -827,7 +827,7 @@ static BOOL is_extension_supported(const char* extension) /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { + if( (gl_version[0] > version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { return TRUE; } WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]);

1 0