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

Hans Leidekker : webservices: Add an index to the static dictionary.
by Alexandre Julliard June 29, 2017

June 29, 2017

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 June 29, 2017

June 29, 2017

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

Hans Leidekker : webservices/tests: Add more dictionary tests.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 5a0b3ff301af0417f5c49310a90d5acdb089d4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0b3ff301af0417f5c49310a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:03 2017 +0200 webservices/tests: Add more dictionary tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 57 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index cf8ab61..0a8d753 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3666,6 +3666,11 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo *found = TRUE; break; + case 'z': + *id = 3; + *found = TRUE; + break; + case 'v': *found = FALSE; return WS_E_OTHER; @@ -3693,6 +3698,12 @@ static void test_dictionary(void) {0x40,0x01,0x75,0x0a,0x05,0x01}; static const char res7[] = {0x40,0x01,0x76,0x0a,0x05,0x01}; + static const char res8[] = + {0x42,0x03,0x0a,0x05,0x01}; + static const char res9[] = + {0x42,0x07,0x0a,0x05,0x01}; + static const char res10[] = + {0x42,0xd6,0x03,0x0a,0x05,0x01}; static const char res100[] = {0x42,0x06,0x06,0x06,0x98,0x00,0x01}; static const char res101[] = @@ -3703,7 +3714,7 @@ static void test_dictionary(void) WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; WS_XML_STRING prefix, localname, ns, strings[6]; const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; - WS_XML_DICTIONARY dict; + WS_XML_DICTIONARY dict, *dict_builtin; WS_XML_WRITER *writer; HRESULT hr; ULONG i, call_count; @@ -3851,6 +3862,50 @@ static void test_dictionary(void) ok( call_count == 2, "got %u\n", call_count ); check_output_bin( writer, res7, sizeof(res7), __LINE__ ); + /* dictionary and callback */ + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict_builtin, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + bin.staticDictionary = dict_builtin; + + /* string in dictionary, no string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring( "t", &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 2, "got %u\n", call_count ); + check_output_bin( writer, res8, sizeof(res8), __LINE__ ); + + /* string not in dictionary, no string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring( "z", &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 2, "got %u\n", call_count ); + check_output_bin( writer, res9, sizeof(res9), __LINE__ ); + + /* string in dictionary, string dictionary set */ + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + init_xmlstring_dict( dict_builtin, 235, &localname ); + init_xmlstring( "ns", &ns ); + call_count = 0; + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( call_count == 1, "got %u\n", call_count ); + check_output_bin( writer, res10, sizeof(res10), __LINE__ ); + WsFreeWriter( writer ); }

1 0

Hans Leidekker : webservices: Fix the empty text case for a couple of data types.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: d29c0e2bdffb704cf6c8339b8ddcca6c7e21ad5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29c0e2bdffb704cf6c8339b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:04 2017 +0200 webservices: Fix the empty text case for a couple of data types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 130 ++++++++--------- dlls/webservices/tests/reader.c | 307 ++++++++++++++++++++++++++++++++++------ 2 files changed, 330 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d29c0e2bdffb704cf6c83…

1 0

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

June 29, 2017

Module: wine Branch: master Commit: a905b4d6ba4ac81e3d41f419b0c683d8dd108c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a905b4d6ba4ac81e3d41f419b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 29 13:32:35 2017 +0000 regedit/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/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index fec6e3e..968b09b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1035,6 +1035,15 @@ static void test_invalid_import(void) "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); verify_reg_nonexist(hkey, "Wine62b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=hex(7):4c,69,6e,65,20,\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine32b\"=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"); + verify_reg_nonexist(hkey, "Wine32a"); + verify_reg_nonexist(hkey, "Wine32b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hans Leidekker : webservices: Handle text records with implicit end element.
by Alexandre Julliard June 29, 2017

June 29, 2017

Module: wine Branch: master Commit: 28dd2e11d4837bbb9ec9abdd160540eb6f0d34e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28dd2e11d4837bbb9ec9abdd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 29 09:22:05 2017 +0200 webservices: Handle text records with implicit end element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 11 +++++++---- dlls/webservices/webservices_private.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index aec0d37..1024c85 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2171,6 +2171,7 @@ static HRESULT read_text_bin( struct reader *reader ) } } + if (type & 1) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT; reader->text_conv_offset = 0; @@ -2349,9 +2350,11 @@ static HRESULT read_endelement_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; - if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; - + if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) + { + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; reader->current = LIST_ENTRY( list_tail( &parent->children ), struct node, entry ); @@ -2559,7 +2562,7 @@ static HRESULT read_node_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) + if (reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT) { reader->current = LIST_ENTRY( list_tail( &reader->current->parent->children ), struct node, entry ); reader->last = reader->current; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 4894223..1938587 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -81,6 +81,7 @@ HRESULT read_output_params( WS_XML_READER *, WS_HEAP *, const WS_ELEMENT_DESCRIP enum node_flag { NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT = 0x1, + NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT = 0x2, }; struct node

1 0

Hans Leidekker : webservices: Make sure to use the right dictionary to look up text values.
by Alexandre Julliard June 29, 2017

June 29, 2017

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

Jeremy Newman : update for PHP7 compat
by Jeremy Newman June 29, 2017

June 29, 2017

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 June 28, 2017

June 28, 2017

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 June 28, 2017

June 28, 2017

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