wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hans Leidekker : webservices: Fix reading byte records with 2 and 4 byte length.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

Hans Leidekker : webservices: Make sure to use the right dictionary to look up text values.
by Alexandre Julliard 29 Jun '17

29 Jun '17

Module: wine Branch: master Commit: c59dd19c4e7511a3fe57e25c4c41fe0b47c52baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59dd19c4e7511a3fe57e25c4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:01 2017 +0200 webservices: Make sure to use the right dictionary to look up text values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 787f75b..9ecc59a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1314,11 +1314,20 @@ static HRESULT read_encode_base64( struct reader *reader, ULONG len, unsigned ch return S_OK; } +static HRESULT lookup_string( struct reader *reader, ULONG id, const WS_XML_STRING **ret ) +{ + const WS_XML_DICTIONARY *dict = (id & 1) ? reader->dict : reader->dict_static; + if (!dict || (id >>= 1) >= dict->stringCount) return WS_E_INVALID_FORMAT; + *ret = &dict->strings[id]; + return S_OK; +} + static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { static const unsigned char zero[] = {'0'}, one[] = {'1'}; static const unsigned char false[] = {'f','a','l','s','e'}, true[] = {'t','r','u','e'}; WS_XML_UTF8_TEXT *utf8 = NULL; + const WS_XML_STRING *str; unsigned char type, buf[46]; BOOL val_bool; INT8 val_int8; @@ -1444,9 +1453,8 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE case RECORD_DICTIONARY_TEXT: if ((hr = read_int31( reader, &id )) != S_OK) return hr; - if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; - if (!(utf8 = alloc_utf8_text( reader->dict->strings[id].bytes, reader->dict->strings[id].length ))) - return E_OUTOFMEMORY; + if ((hr = lookup_string( reader, id, &str )) != S_OK) return hr; + if (!(utf8 = alloc_utf8_text( str->bytes, str->length ))) return E_OUTOFMEMORY; break; case RECORD_UNIQUEID_TEXT: @@ -1973,6 +1981,7 @@ static HRESULT read_text_bin( struct reader *reader ) unsigned char type, buf[46]; struct node *node = NULL, *parent; WS_XML_UTF8_TEXT *utf8; + const WS_XML_STRING *str; BOOL val_bool; INT8 val_int8; INT16 val_int16; @@ -2115,9 +2124,8 @@ static HRESULT read_text_bin( struct reader *reader ) case RECORD_DICTIONARY_TEXT: case RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT: if ((hr = read_int31( reader, &id )) != S_OK) return hr; - if (!reader->dict || (id >>= 1) >= reader->dict->stringCount) return WS_E_INVALID_FORMAT; - if (!(node = alloc_text_node( reader->dict->strings[id].bytes, reader->dict->strings[id].length, NULL ))) - return E_OUTOFMEMORY; + if ((hr = lookup_string( reader, id, &str )) != S_OK) return hr; + if (!(node = alloc_text_node( str->bytes, str->length, NULL ))) return E_OUTOFMEMORY; break; case RECORD_UNIQUEID_TEXT:

1 0

Hans Leidekker : webservices: Add an index to the static dictionary.
by Alexandre Julliard 29 Jun '17

29 Jun '17

Module: wine Branch: master Commit: 5c24d4497387befc3a8f08a41a33290d39926d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c24d4497387befc3a8f08a41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:00 2017 +0200 webservices: Add an index to the static dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/string.c | 34 +++++++++++++++++++++++++++++++--- dlls/webservices/webservices_private.h | 2 +- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index f9df48f..8fc2b6a 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -723,12 +723,40 @@ static const WS_XML_STRING dict_strings[] = #undef X }; +static const ULONG dict_sorted[] = +{ + 81, 91, 129, 314, 185, 164, 346, 66, 235, 305, 14, 6, 114, 97, 96, 94, 11, 95, 110, 451, + 443, 121, 213, 7, 71, 82, 431, 343, 74, 75, 73, 59, 447, 445, 467, 163, 472, 463, 453, 409, + 69, 286, 466, 444, 383, 67, 117, 26, 40, 345, 465, 90, 25, 77, 482, 455, 470, 344, 353, 80, + 70, 449, 299, 331, 251, 330, 5, 253, 224, 390, 120, 76, 281, 4, 276, 56, 118, 436, 72, 394, + 232, 464, 486, 456, 473, 459, 357, 393, 21, 269, 209, 54, 204, 55, 83, 35, 317, 196, 221, 321, + 433, 387, 22, 78, 288, 419, 461, 446, 457, 474, 261, 272, 424, 308, 1, 274, 322, 93, 319, 202, + 277, 416, 104, 318, 309, 165, 87, 85, 388, 389, 364, 300, 391, 52, 31, 227, 301, 167, 323, 458, + 462, 411, 194, 8, 198, 179, 256, 392, 270, 418, 303, 337, 296, 13, 283, 284, 311, 12, 9, 41, + 287, 53, 187, 18, 58, 483, 471, 468, 425, 49, 271, 295, 410, 116, 15, 379, 112, 119, 109, 42, + 17, 485, 469, 254, 50, 206, 415, 20, 228, 339, 430, 435, 320, 127, 242, 208, 86, 484, 452, 420, + 328, 210, 243, 200, 19, 170, 312, 429, 376, 275, 247, 313, 278, 279, 285, 166, 417, 460, 448, 454, + 257, 199, 267, 46, 47, 421, 171, 32, 282, 79, 57, 226, 347, 168, 450, 252, 260, 201, 310, 380, + 332, 361, 225, 414, 413, 68, 280, 438, 45, 325, 0, 128, 27, 306, 39, 60, 377, 184, 44, 294, + 351, 327, 476, 475, 266, 362, 48, 354, 355, 365, 89, 297, 324, 326, 479, 381, 84, 378, 349, 98, + 258, 259, 291, 412, 366, 348, 423, 478, 477, 169, 360, 406, 273, 229, 113, 407, 100, 88, 363, 205, + 289, 24, 255, 264, 231, 182, 183, 101, 207, 115, 263, 334, 342, 186, 43, 480, 335, 338, 203, 30, + 265, 244, 197, 23, 290, 230, 358, 408, 341, 367, 368, 245, 262, 195, 246, 374, 404, 405, 422, 268, + 375, 442, 359, 37, 33, 3, 180, 487, 62, 155, 156, 157, 111, 2, 122, 16, 38, 316, 315, 144, + 154, 481, 441, 103, 28, 382, 145, 152, 139, 141, 143, 150, 99, 102, 298, 214, 130, 63, 147, 138, + 140, 142, 428, 356, 131, 292, 434, 159, 293, 307, 158, 10, 437, 151, 352, 162, 105, 403, 395, 402, + 238, 241, 248, 153, 108, 398, 399, 373, 149, 249, 211, 148, 400, 401, 396, 132, 212, 146, 65, 123, + 397, 340, 240, 133, 440, 124, 223, 384, 385, 371, 329, 250, 236, 34, 432, 107, 386, 237, 304, 234, + 439, 333, 161, 222, 64, 239, 92, 233, 160, 134, 217, 220, 350, 136, 135, 137, 125, 426, 218, 126, + 372, 215, 216, 106, 336, 29, 219, 61, 302, 193, 369, 191, 192, 181, 370, 178, 189, 36, 188, 51, + 190, 174, 427, 176, 173, 177, 172, 175, +}; + const struct dictionary dict_builtin_static = { {{0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, - (WS_XML_STRING *)dict_strings, - sizeof(dict_strings) / sizeof(dict_strings[0]), - TRUE} + (WS_XML_STRING *)dict_strings, sizeof(dict_strings)/sizeof(dict_strings[0]), TRUE}, + (ULONG *)dict_sorted }; /************************************************************************** diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cf6e1c4..4894223 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -38,8 +38,8 @@ void free_xmlbuf( struct xmlbuf * ) DECLSPEC_HIDDEN; struct dictionary { WS_XML_DICTIONARY dict; - ULONG size; ULONG *sorted; + ULONG size; }; struct dictionary dict_builtin DECLSPEC_HIDDEN; const struct dictionary dict_builtin_static DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Fix write option mapping in write_type_struct_field.
by Alexandre Julliard 29 Jun '17

29 Jun '17

Module: wine Branch: master Commit: 2f2a23a9bdb51a9069693f103484b9abbb4e3e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2a23a9bdb51a9069693f103… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:21:59 2017 +0200 webservices: Fix write option mapping in write_type_struct_field. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9c479b2..95ebd7c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2954,7 +2954,11 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE if (field_options & WS_FIELD_POINTER) option = WS_WRITE_NILLABLE_POINTER; else option = WS_WRITE_NILLABLE_VALUE; } - else return E_INVALIDARG; + else + { + if (field_options & WS_FIELD_POINTER) option = WS_WRITE_REQUIRED_POINTER; + else option = WS_WRITE_REQUIRED_VALUE; + } } else {

1 0

Zebediah Figura : msi: Fix a buffer overrun.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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 29 Jun '17

29 Jun '17

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 29 Jun '17

29 Jun '17

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

Jeremy Newman : update for PHP7 compat
by Jeremy Newman 29 Jun '17

29 Jun '17

Module: website Branch: master Commit: 7e0d01533f584b6df4381ea3ed5c461dc4207d28 URL: http://source.winehq.org/git/website.git/?a=commit;h=7e0d01533f584b6df4381e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jun 29 10:56:12 2017 -0500 update for PHP7 compat --- include/config.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/include/config.php b/include/config.php index 80f3311..c3fbed8 100644 --- a/include/config.php +++ b/include/config.php @@ -13,7 +13,6 @@ class config { // get files passed $files = func_get_args(); - // loop and parse files foreach ($files as $path) { @@ -28,47 +27,52 @@ class config if (file_exists($file)) { $fd = fopen ($file, "r"); - while (!feof ($fd)) { + while (!feof ($fd)) + { $buffer = trim(fgets($fd, 4096)); - if (preg_match('/^\#/', $buffer)) continue; - if ($buffer == "") continue; + if (empty($buffer)) + continue; + if (preg_match('/^\#/', $buffer)) + continue; $arr = preg_split('/:\s+/',$buffer,2); - $arr[1] = preg_replace("/<br>/","\n",$arr[1]); + if (empty($arr) or empty($arr[0])) + continue; + $arr[0] = preg_replace('/:/','',$arr[0]); if (preg_match('/^\@/', $arr[0])) { // array $arr[0] = preg_replace('/\@/', '', $arr[0]); - $this->$arr[0] = preg_split('/,\s+/', $arr[1]); + $this->{$arr[0]} = preg_split('/,\s+/', $arr[1]); } else if (preg_match('/^\%/', $arr[0])) { // assoc array $arr[0] = preg_replace('/\%/', '', $arr[0]); - $this->$arr[0] = array(); + $this->{$arr[0]} = array(); $params = preg_split('/,\s+/', $arr[1]); while (list($n, $m) = each($params)) { list($key, $val) = preg_split('/\|/', $m, 2); - $this->$arr[0] = array_merge($this->$arr[0], array($key => $val)); + $this->{$arr[0]} = array_merge($this->{$arr[0]}, array($key => $val)); } } else { // string - if (preg_match('/\{\$[a-z0-9_]+\}/', $arr[1])) + if (!empty($arr[1]) and preg_match('/\{\$[a-z0-9_]+\}/', $arr[1])) { // load other vars into existing var $arr[1] = preg_replace('/(.*)\{\$([a-z0-9_]+)\}(.*)/', "\\1,\\2,\\3", $arr[1]); list($a,$b,$c) = preg_split("/\,/", $arr[1], 3); - if ($b and isset($this->$b)) - $arr[1] = $a.$this->$b.$c; + if ($b and isset($this->{$b})) + $arr[1] = $a.$this->{$b}.$c; else $arr[1] = $a.$c; } - $this->$arr[0] = $arr[1]; + $this->{$arr[0]} = (!empty($arr[1]) ? $arr[1] : ''); } } - fclose ($fd); + fclose($fd); } else { @@ -78,6 +82,7 @@ class config // end of readConfig } -// done +// end of class config } + ?>

1 0

Zebediah Figura : gdiplus: Scale widened dashes to the pen width.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 7e1522cdd69587b59f97a3b3c755cef40a52070e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1522cdd69587b59f97a3b3c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 27 17:27:18 2017 -0500 gdiplus: Scale widened dashes to the pen width. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 14 ++++++++++---- dlls/gdiplus/tests/graphicspath.c | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5fedd07..5d82a77 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2063,6 +2063,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, REAL dash_pos=0.0; int dash_index=0; const REAL *dash_pattern; + REAL *dash_pattern_scaled; int dash_count; GpPointF *tmp_points; REAL segment_dy; @@ -2101,6 +2102,12 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, break; } + dash_pattern_scaled = heap_alloc(dash_count * sizeof(REAL)); + if (!dash_pattern_scaled) return; + + for (i = 0; i < dash_count; i++) + dash_pattern_scaled[i] = pen->width * dash_pattern[i]; + tmp_points = heap_alloc_zero((end - start + 2) * sizeof(GpPoint)); if (!tmp_points) return; /* FIXME */ @@ -2149,7 +2156,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, } } - if (dash_pattern[dash_index] - dash_pos > segment_length - segment_pos) + if (dash_pattern_scaled[dash_index] - dash_pos > segment_length - segment_pos) { /* advance to next segment */ if ((dash_index % 2) == 0) @@ -2163,7 +2170,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, else { /* advance to next dash in pattern */ - segment_pos += dash_pattern[dash_index] - dash_pos; + segment_pos += dash_pattern_scaled[dash_index] - dash_pos; dash_pos = 0.0; if (++dash_index == dash_count) dash_index = 0; @@ -2175,8 +2182,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, if (dash_index % 2 == 0 && num_tmp_points != 0) { /* last dash overflows last segment */ - tmp_points[num_tmp_points] = path->pathdata.Points[end]; - widen_open_figure(tmp_points, pen, 0, num_tmp_points, + widen_open_figure(tmp_points, pen, 0, num_tmp_points-1, draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, closed ? LineCapFlat : pen->endcap, pen->customend, last_point); } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index c44ed5e..2a94e84 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1065,6 +1065,17 @@ static path_test_t widenline_wide_path[] = { {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ }; +static path_test_t widenline_dash_path[] = { + {5.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {35.0, 0.0, PathPointTypeLine, 0, 0}, /*1*/ + {35.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {45.0, 0.0, PathPointTypeStart, 0, 0}, /*4*/ + {50.0, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {50.0, 10.0, PathPointTypeLine, 0, 0}, /*6*/ + {45.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + }; + static void test_widen(void) { GpStatus status; @@ -1139,6 +1150,22 @@ static void test_widen(void) status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); expect(Ok, status); + /* dashed line */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 5.0, 50.0, 5.0); + expect(Ok, status); + + status = GdipSetPenDashStyle(pen, DashStyleDash); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_dash_path, sizeof(widenline_dash_path)/sizeof(path_test_t), FALSE); + + status = GdipSetPenDashStyle(pen, DashStyleSolid); + expect(Ok, status); + /* pen width in UnitWorld */ GdipDeletePen(pen); status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen);

1 0

Owen Rudge : wsdapi/tests: Add additional SetTransportAddress tests with port numbers.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 860deac1c7a80ba3c087cc0ec05d1e4b46b3b93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=860deac1c7a80ba3c087cc0ec… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:58 2017 +0100 wsdapi/tests: Add additional SetTransportAddress tests with port numbers. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 8861d2f..b26a3b9 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -79,6 +79,8 @@ static void GetSetTransportAddress_udp_tests(void) IWSDUdpAddress *udpAddress = NULL; const WCHAR ipv4Address[] = {'1','0','.','2','0','.','3','0','.','4','0',0}; const WCHAR ipv6Address[] = {'a','a','b','b',':','c','d',':',':','a','b','c',0}; + const WCHAR ipv4AddressWithPort[] = {'1','0','.','2','0','.','3','0','.','4','0',':','1','2','4',0}; + const WCHAR ipv6AddressWithPort[] = {'[','a','a','b','b',':','c','d',':',':','a','b','c',':','5','6','7',']',':','1','2','4',0}; const WCHAR invalidAddress[] = {'n','o','t','/','v','a','l','i','d',0}; LPCWSTR returnedAddress = NULL; WSADATA wsaData; @@ -116,6 +118,10 @@ static void GetSetTransportAddress_udp_tests(void) todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + /* Try setting an IPv4 address with a port number */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4AddressWithPort); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + /* Try setting an IPv6 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); @@ -125,6 +131,15 @@ static void GetSetTransportAddress_udp_tests(void) todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + /* Try setting an IPv6 address with a port number */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6AddressWithPort); + ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv6AddressWithPort) == 0, "Returned address != ipv6AddressWithPort (%s)\n", wine_dbgstr_w(returnedAddress)); + /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); @@ -239,11 +254,14 @@ static void GetSetSockaddr_udp_tests(void) const char *ipv4Address = "1.2.3.4"; const short ipv4Port = 1234; const WCHAR expectedIpv4TransportAddr[] = {'1','.','2','.','3','.','4',':','1','2','3','4',0}; + const WCHAR expectedIpv4TransportAddrNoPort[] = {'1','.','2','.','3','.','4',0}; const char *ipv6Address = "2a00:1234:5678:dead:beef::aaaa"; const short ipv6Port = 2345; const WCHAR expectedIpv6TransportAddr[] = {'[','2','a','0','0',':','1','2','3','4',':','5','6','7','8',':','d','e','a','d',':', 'b','e','e','f',':',':','a','a','a','a',']',':','2','3','4','5',0}; + const WCHAR expectedIpv6TransportAddrNoPort[] = {'2','a','0','0',':','1','2','3','4',':','5','6','7','8',':','d','e','a','d',':', + 'b','e','e','f',':',':','a','a','a','a',0}; ZeroMemory(&storage1, sizeof(SOCKADDR_STORAGE)); ZeroMemory(&storage2, sizeof(SOCKADDR_STORAGE)); @@ -315,6 +333,18 @@ static void GetSetSockaddr_udp_tests(void) todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); + /* Try setting an IPv4 address without a port */ + sockAddrPtr->sin_port = 0; + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + /* Try setting an IPv6 address */ sockAddr6Ptr = (struct sockaddr_in6 *) &storage2; sockAddr6Ptr->sin6_family = AF_INET6; @@ -343,6 +373,21 @@ static void GetSetSockaddr_udp_tests(void) todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); + /* Try setting an IPv6 address without a port */ + sockAddr6Ptr->sin6_port = 0; + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017