November 2015 - Wine-commits

Daniel Lehman : msvcp120: Implement _Thrd_current.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 498d8861e0378e3f3462256791b00598448b815e URL: http://source.winehq.org/git/wine.git/?a=commit;h=498d8861e0378e3f346225679… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 28 11:26:18 2015 -0700 msvcp120: Implement _Thrd_current. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index d227510..96ad84c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3857,7 +3857,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index f316114..32be6ea 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6cf8053..db14043 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -142,6 +142,20 @@ typedef struct static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); static void (__cdecl *p__Thrd_sleep)(const xtime*); +static _Thrd_t (__cdecl *p__Thrd_current)(void); + +#ifdef __i386__ +static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); +_Thrd_t __cdecl i386_Thrd_current(void) +{ + union { + _Thrd_t thr; + ULONGLONG ull; + } r; + r.ull = p_i386_Thrd_current(); + return r.thr; +} +#endif static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -220,6 +234,8 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); + SET(p__Thrd_current, + "_Thrd_current"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -265,6 +281,14 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); +#ifdef __i386__ + SET(p_i386_Thrd_current, + "_Thrd_current"); + p__Thrd_current = i386_Thrd_current; +#else + SET(p__Thrd_current, + "_Thrd_current"); +#endif } SET(p__Thrd_equal, "_Thrd_equal"); @@ -1151,6 +1175,7 @@ static void test_thrd(void) const HANDLE hnd2 = (HANDLE)0xdeadbeef; xtime xt, before, after; MSVCRT_long diff; + _Thrd_t ta, tb; struct test testeq[] = { { {0, 0}, {0, 0}, 1 }, @@ -1191,6 +1216,16 @@ static void test_thrd(void) p_xtime_get(&after, 1); diff = p__Xtime_diff_to_millis2(&after, &before); ok(diff > 2000 - TIMEDELTA, "got %d\n", diff); + + /* test for current */ + ta = p__Thrd_current(); + tb = p__Thrd_current(); + ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); + ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); + /* these can be different if new threads are created at same time */ + ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); + ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); } START_TEST(msvcp120) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b5d423b..fc77cfe 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() msvcp120._Thrd_current @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ccf1d04..4bcc716 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -714,4 +714,40 @@ void __cdecl _Thrd_yield(void) TRACE("()\n"); Sleep(0); } + +static _Thrd_t thread_current(void) +{ + _Thrd_t ret; + + if(DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), + GetCurrentProcess(), &ret.hnd, 0, FALSE, DUPLICATE_SAME_ACCESS)) { + CloseHandle(ret.hnd); + } else { + ret.hnd = 0; + } + ret.id = GetCurrentThreadId(); + + TRACE("(%p %u)\n", ret.hnd, ret.id); + return ret; +} + +#ifndef __i386__ +_Thrd_t __cdecl _Thrd_current(void) +{ + return thread_current(); +} +#else +ULONGLONG __cdecl _Thrd_current(void) +{ + union { + _Thrd_t thr; + ULONGLONG ull; + } ret; + + C_ASSERT(sizeof(_Thrd_t) <= sizeof(ULONGLONG)); + + ret.thr = thread_current(); + return ret.ull; +} +#endif #endif

1 0

Daniel Lehman : msvcp120: Implement _Thrd_create/join.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: f3a0ac8d53813e5d44b8ab3a9b38b894f20309fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a0ac8d53813e5d44b8ab3a9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 28 11:41:57 2015 -0700 msvcp120: Implement _Thrd_create/join. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 24 ++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 96ad84c..a739dd4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3856,12 +3856,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 32be6ea..e24268d 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3803,12 +3803,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index db14043..3f02051 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -139,10 +139,14 @@ typedef struct #define TIMEDELTA 150 /* 150 ms uncertainty allowed */ +typedef int (__cdecl *_Thrd_start_t)(void*); + static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); static void (__cdecl *p__Thrd_sleep)(const xtime*); static _Thrd_t (__cdecl *p__Thrd_current)(void); +static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); +static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); @@ -296,6 +300,10 @@ static BOOL init(void) "_Thrd_lt"); SET(p__Thrd_sleep, "_Thrd_sleep"); + SET(p__Thrd_create, + "_Thrd_create"); + SET(p__Thrd_join, + "_Thrd_join"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1163,9 +1171,17 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static int __cdecl thrd_thread(void *arg) +{ + _Thrd_t *thr = arg; + + *thr = p__Thrd_current(); + return 0x42; +} + static void test_thrd(void) { - int ret, i; + int ret, i, r; struct test { _Thrd_t a; _Thrd_t b; @@ -1226,6 +1242,22 @@ static void test_thrd(void) ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); + + /* test for create/join */ + if (0) /* crash on Windows */ + { + p__Thrd_create(NULL, thrd_thread, NULL); + p__Thrd_create(&ta, NULL, NULL); + } + r = -1; + ret = p__Thrd_create(&ta, thrd_thread, (void*)&tb); + ok(!ret, "failed to create thread, got %d\n", ret); + ret = p__Thrd_join(ta, &r); + ok(!ret, "failed to join thread, got %d\n", ret); + ok(ta.id == tb.id, "expected %d, got %d\n", ta.id, tb.id); + ok(ta.hnd != tb.hnd, "same handles, got %p\n", ta.hnd); + ok(r == 0x42, "expected 0x42, got %d\n", r); + ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); } START_TEST(msvcp120) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index fc77cfe..d0debd1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3803,12 +3803,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) msvcp120._Strcoll @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ stub _Thrd_start diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 4bcc716..25b3f23 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -691,6 +691,10 @@ typedef struct DWORD id; } _Thrd_t; +typedef int (__cdecl *_Thrd_start_t)(void*); + +#define _THRD_ERROR 4 + int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) { TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); @@ -750,4 +754,24 @@ ULONGLONG __cdecl _Thrd_current(void) return ret.ull; } #endif + +int __cdecl _Thrd_join(_Thrd_t thr, int *code) +{ + TRACE("(%p %u %p)\n", thr.hnd, thr.id, code); + if (WaitForSingleObject(thr.hnd, INFINITE)) + return _THRD_ERROR; + + if (code) + GetExitCodeThread(thr.hnd, (DWORD *)code); + + CloseHandle(thr.hnd); + return 0; +} + +int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) +{ + TRACE("(%p %p %p)\n", thr, proc, arg); + thr->hnd = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)proc, arg, 0, &thr->id); + return !thr->hnd; +} #endif

1 0

Stefan Dösinger : user32: Silently ignore temporary foreground loss.
by Alexandre Julliard 02 Nov '15

02 Nov '15

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

Vincent Povirk : gdiplus: Skip the EMR_HEADER record when looking for the EMF+ header.
by Alexandre Julliard 02 Nov '15

02 Nov '15

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

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

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: 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: 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

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

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