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

Vincent Povirk : gdiplus: Set flatness more appropriately in GdipDrawPath.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 6ec3cd9434488ba5bc0fd271a47b7d46827477c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec3cd9434488ba5bc0fd271a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 29 13:41:05 2017 -0500 gdiplus: Set flatness more appropriately in GdipDrawPath. If the path is going to be scaled before rendering, 1.0 does not make sense as an error value. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 815ffb0..a6df52c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3715,6 +3715,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * GpStatus stat; GpPath *wide_path; GpMatrix *transform=NULL; + REAL flatness=1.0; /* Check if the final pen thickness in pixels is too thin. */ if (pen->unit == UnitPixel) @@ -3756,9 +3757,24 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * stat = get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, transform); } + else + { + /* Set flatness based on the final coordinate space */ + GpMatrix t; + + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, &t); + + if (stat != Ok) + return stat; + + flatness = 1.0/sqrt(fmax( + t.matrix[0] * t.matrix[0] + t.matrix[1] * t.matrix[1], + t.matrix[2] * t.matrix[2] + t.matrix[3] * t.matrix[3])); + } if (stat == Ok) - stat = GdipWidenPath(wide_path, pen, transform, 1.0); + stat = GdipWidenPath(wide_path, pen, transform, flatness); if (pen->unit == UnitPixel) {

1 0

Dmitry Timoshkov : windowscodecs: Fix a memory leak.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 2eeef78e8d9a8b3cd4b1272e5bce05d7c27d5f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeef78e8d9a8b3cd4b1272e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 29 12:03:59 2017 +0800 windowscodecs: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 473836f..e338848 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -212,7 +212,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc hr = get_token(&next_elem, id, schema, idx); if (hr != S_OK) { - TRACE("parse_elem error %#x\n", hr); + TRACE("get_token error %#x\n", hr); return hr; } elem->len = (end - start) + next_elem.len; @@ -248,7 +248,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc if (*end == '\\') end++; *bstr++ = *end++; } - if (!*end || *end != '}') + if (*end != '}') { PropVariantClear(&next_token); return WINCODEC_ERR_INVALIDQUERYREQUEST; @@ -260,7 +260,11 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc { id->vt = VT_CLSID; id->u.puuid = CoTaskMemAlloc(sizeof(GUID)); - if (!id->u.puuid) return E_OUTOFMEMORY; + if (!id->u.puuid) + { + PropVariantClear(&next_token); + return E_OUTOFMEMORY; + } hr = UuidFromStringW(next_token.u.bstrVal, id->u.puuid); }

1 0

Huw Davies : winemac: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 97546cfbb7abc63fe75048f82da5a63cdba3d9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97546cfbb7abc63fe75048f82… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:37 2017 +0100 winemac: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bdd623d..2e24405 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1837,7 +1837,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; void *src_bits, *dst_bits; - RECT rect; + RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; @@ -1899,11 +1899,13 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * surface->funcs->unlock(surface); PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS); } + src_rect = rect; + if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); + DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 ); + if (!(ret = GdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, src_rect.left, src_rect.top, + src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, blend))) goto done;

1 0

Hugh McMaster : reg/tests: Test comma placement when parsing hex data.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 60c0372223f419650e1e6fcf7d2156a23fcebcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c0372223f419650e1e6fcf7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:26 2017 +0000 reg/tests: Test comma placement when parsing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8d9dbfa..9a974b4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2089,6 +2089,16 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine62b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,69,6e,65,20,\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine63b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine63a"); + todo_wine verify_reg_nonexist(hkey, "Wine63b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3363,6 +3373,22 @@ static void test_unicode_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine62b"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " ,63,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine63b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine63a"); + todo_wine verify_reg_nonexist(hkey, "Wine63b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: ecfe83265abebc945b184820f9dcf6438bfb534a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfe83265abebc945b184820f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 29 17:04:42 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 281 +++++++++++++++++++++++---------------------------------------- 1 file changed, 100 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecfe83265abebc945b184…

1 0

Hans Leidekker : webservices: Fix reading byte records with 2 and 4 byte length.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 119afbd1510467b43ff5b0d9fe0f05cf5e3d8698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119afbd1510467b43ff5b0d9f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:02 2017 +0200 webservices: Fix reading byte records with 2 and 4 byte length. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9ecc59a..af1aa3f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1427,7 +1427,7 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE break; case RECORD_BYTES16_TEXT: - if ((hr = read_byte( reader, (unsigned char *)&val_uint16 )) != S_OK) return hr; + if ((hr = read_bytes( reader, (unsigned char *)&val_uint16, sizeof(val_uint16) )) != S_OK) return hr; if (!(utf8 = alloc_utf8_text( NULL, ((4 * val_uint16 / 3) + 3) & ~3 ))) return E_OUTOFMEMORY; if ((hr = read_encode_base64( reader, val_uint16, utf8->value.bytes, &utf8->value.length )) != S_OK) { @@ -1437,7 +1437,7 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE break; case RECORD_BYTES32_TEXT: - if ((hr = read_byte( reader, (unsigned char *)&val_int32 )) != S_OK) return hr; + if ((hr = read_bytes( reader, (unsigned char *)&val_int32, sizeof(val_int32) )) != S_OK) return hr; if (val_int32 < 0) return WS_E_INVALID_FORMAT; if (!(utf8 = alloc_utf8_text( NULL, ((4 * val_int32 / 3) + 3) & ~3 ))) return E_OUTOFMEMORY; if ((hr = read_encode_base64( reader, val_int32, utf8->value.bytes, &utf8->value.length )) != S_OK) @@ -2095,7 +2095,7 @@ static HRESULT read_text_bin( struct reader *reader ) case RECORD_BYTES16_TEXT: case RECORD_BYTES16_TEXT_WITH_ENDELEMENT: - if ((hr = read_byte( reader, (unsigned char *)&val_uint16 )) != S_OK) return hr; + if ((hr = read_bytes( reader, (unsigned char *)&val_uint16, sizeof(val_uint16) )) != S_OK) return hr; if (!(node = alloc_text_node( NULL, ((4 * val_uint16 / 3) + 3) & ~3, &utf8 ))) return E_OUTOFMEMORY; if ((hr = read_encode_base64( reader, val_uint16, utf8->value.bytes, &utf8->value.length )) != S_OK) { @@ -2106,7 +2106,7 @@ static HRESULT read_text_bin( struct reader *reader ) case RECORD_BYTES32_TEXT: case RECORD_BYTES32_TEXT_WITH_ENDELEMENT: - if ((hr = read_byte( reader, (unsigned char *)&val_int32 )) != S_OK) return hr; + if ((hr = read_bytes( reader, (unsigned char *)&val_int32, sizeof(val_int32) )) != S_OK) return hr; if (val_int32 < 0) return WS_E_INVALID_FORMAT; if (!(node = alloc_text_node( NULL, ((4 * val_int32 / 3) + 3) & ~3, &utf8 ))) return E_OUTOFMEMORY; if ((hr = read_encode_base64( reader, val_int32, utf8->value.bytes, &utf8->value.length )) != S_OK)

1 0

Zebediah Figura : msi: Fix a buffer overrun.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 39b841d18920ab3a31f3176ec0327f8643023343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b841d18920ab3a31f3176ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 29 00:09:50 2017 -0500 msi: Fix a buffer overrun. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bf6ae10..3a75a1c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1812,17 +1812,17 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC { WCHAR template_s[1024]; WCHAR *template_rec, *template; - DWORD length; LoadStringW(msi_hInstance, IDS_INFO, template_s, 1024); - res = MSI_RecordGetStringW(record, 0, NULL, &length); + res = MSI_RecordGetStringW(record, 0, NULL, &len); if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) return res; len++; template_rec = msi_alloc(len * sizeof(WCHAR)); if (!template_rec) return ERROR_OUTOFMEMORY; - MSI_RecordGetStringW(record, 0, template_rec, &length); + MSI_RecordGetStringW(record, 0, template_rec, &len); + len++; template = msi_alloc((len + strlenW(template_s)) * sizeof(WCHAR)); if (!template) return ERROR_OUTOFMEMORY;

1 0

Piotr Caban : gdiplus: Add GdipDrawImagePointsRect test on EmfTypeEmfPlusOnly file.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 4884815505701bc84b8068e86c21dbd16ce8fe9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4884815505701bc84b8068e86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 28 20:47:31 2017 +0200 gdiplus: Add GdipDrawImagePointsRect test on EmfTypeEmfPlusOnly file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f73dc42..0f5be7b 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2322,6 +2322,73 @@ static void test_gditransform(void) expect(Ok, stat); } +static const emfplus_record draw_image_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {1, EmfPlusRecordTypeObject}, + {1, EmfPlusRecordTypeDrawImagePoints}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_drawimage(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpPointF dst_points[3] = {{10.0,10.0},{25.0,15.0},{10.0,20.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + BITMAPINFO info; + BYTE buff[400]; + GpBitmap *bm; + HDC hdc; + + memset(buff, 0x80, sizeof(buff)); + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = 10; + info.bmiHeader.biHeight = 10; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + stat = GdipCreateBitmapFromGdiDib(&info, buff, &bm); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)bm, dst_points, 3, + 0.0, 0.0, 10.0, 10.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + GdipDisposeImage((GpImage*)bm); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_image.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_image_records, "draw image"); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2359,6 +2426,7 @@ START_TEST(metafile) test_containers(); test_clipping(); test_gditransform(); + test_drawimage(); GdiplusShutdown(gdiplusToken); }

1 0

Piotr Caban : gdiplus: Add GdipDrawLine test on EmfTypeEmfOnly metafile.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 33993218282290a92f51aea36299730e5ede2346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33993218282290a92f51aea36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 28 20:47:21 2017 +0200 gdiplus: Add GdipDrawLine test on EmfTypeEmfOnly metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a61206d..f73dc42 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -640,6 +640,26 @@ static const emfplus_record emfonly_records[] = { {0} }; +static const emfplus_record emfonly_draw_records[] = { + {0, EMR_HEADER}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_SETMITERLIMIT}, + {1, EMR_MODIFYWORLDTRANSFORM}, + {1, EMR_EXTCREATEPEN}, + {1, EMR_SELECTOBJECT}, + {1, EMR_SELECTOBJECT}, + {1, EMR_POLYLINE16}, + {1, EMR_SELECTOBJECT}, + {1, EMR_SELECTOBJECT}, + {1, EMR_MODIFYWORLDTRANSFORM}, + {1, EMR_DELETEOBJECT}, + {1, EMR_SETMITERLIMIT}, + {1, EMR_RESTOREDC}, + {0, EMR_EOF}, + {1} +}; + static void test_emfonly(void) { GpStatus stat; @@ -658,6 +678,7 @@ static void test_emfonly(void) HBRUSH hbrush, holdbrush; GpBitmap *bitmap; ARGB color; + GpPen *pen; hdc = CreateCompatibleDC(0); @@ -900,6 +921,35 @@ static void test_emfonly(void) stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + /* test drawing to metafile with gdi+ functions */ + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + stat = GdipDrawLineI(graphics, pen, 0, 0, 10, 10); + expect(Ok, stat); + GdipDeletePen(pen); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, emfonly_draw_records, "emfonly draw metafile", dst_points, &frame, UnitPixel); + sync_metafile(&metafile, "emfonly_draw.emf"); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record fillrect_records[] = {

1 0

Hugh McMaster : regedit/tests: Correct out of sequence test numbering.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 817cd2ac593a8d9c2ce65bf8a4c59e2159421d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=817cd2ac593a8d9c2ce65bf8a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:43 2017 +0000 regedit/tests: Correct out of sequence test numbering. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 968b09b..4eaaeb3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1032,8 +1032,8 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); - verify_reg_nonexist(hkey, "Wine62b"); + "\"Wine31\"=hex(7):4c,69,6e,65,20\\"); + verify_reg_nonexist(hkey, "Wine31"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0