June 2017 - wine-commits

Vincent Povirk : gdiplus: Set flatness more appropriately in GdipDrawPath.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

29 Jun '17

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

29 Jun '17

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 : regedit/tests: Correct out of sequence test numbering.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

Hugh McMaster : regedit/tests: Test comma placement when parsing hex data.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

Hugh McMaster : reg/tests: Test comma placement when parsing hex data.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

29 Jun '17

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: Handle text records with implicit end element.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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: Fix the empty text case for a couple of data types.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

Hans Leidekker : webservices/tests: Add more dictionary tests.
by Alexandre Julliard 29 Jun '17

29 Jun '17

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

Owen Rudge : wsdapi: Implement IWSDUdpAddress_SetTransportAddress.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 4f1dca9db07dc98223aedf479b1465612a88c9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1dca9db07dc98223aedf479… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:54 2017 +0100 wsdapi: Implement IWSDUdpAddress_SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/address.c | 30 ++++++++++++++++++++++++++++-- dlls/wsdapi/tests/address.c | 10 +++++----- dlls/wsdapi/tests/msgparams.c | 4 ++-- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 0f28ce5..5c95351 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi -IMPORTS = user32 +IMPORTS = user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 7efcac2..587d090 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -22,6 +22,8 @@ #define COBJMACROS +#include "winsock2.h" +#include "ws2tcpip.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -32,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); typedef struct IWSDUdpAddressImpl { IWSDUdpAddress IWSDUdpAddress_iface; LONG ref; + SOCKADDR_STORAGE sockAddr; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -132,8 +135,31 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) { - FIXME("(%p, %s)\n", This, debugstr_w(pszAddress)); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + ADDRINFOW *addrInfo = NULL; + ADDRINFOW hints; + int ret; + + TRACE("(%p, %s)\n", impl, debugstr_w(pszAddress)); + + if (pszAddress == NULL) + return E_INVALIDARG; + + ZeroMemory(&hints, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + + ret = GetAddrInfoW(pszAddress, NULL, &hints, &addrInfo); + + if (ret == 0) + { + ZeroMemory(&impl->sockAddr, sizeof(SOCKADDR_STORAGE)); + memcpy(&impl->sockAddr, addrInfo->ai_addr, addrInfo->ai_addrlen); + } + + if (addrInfo != NULL) + FreeAddrInfoW(addrInfo); + + return HRESULT_FROM_WIN32(ret); } static HRESULT WINAPI IWSDUdpAddressImpl_SetSockaddr(IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index fefc253..8861d2f 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -98,15 +98,15 @@ static void GetSetTransportAddress_udp_tests(void) /* Try setting a null address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); - todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); /* Try setting an invalid address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); - todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); /* Try setting an IPv4 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); - todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); @@ -118,7 +118,7 @@ static void GetSetTransportAddress_udp_tests(void) /* Try setting an IPv6 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); - todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); @@ -264,7 +264,7 @@ static void GetSetSockaddr_udp_tests(void) /* Try setting a transport address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); /* A socket address should be returned */ rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 0621950..9322ce1 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -96,7 +96,7 @@ static void LocalAddress_tests(void) ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); @@ -154,7 +154,7 @@ static void RemoteAddress_tests(void) ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); - todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc);

1 0

Owen Rudge : wsdapi: Implement Get/SetRetransmitParams.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 4373eb30a498412a8a49a220c9dd4569b0c462a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4373eb30a498412a8a49a220c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:49 2017 +0100 wsdapi: Implement Get/SetRetransmitParams. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 34 +++++++++++++++++++++++++++++---- dlls/wsdapi/tests/msgparams.c | 44 +++++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index 6675fa5..e5ec8b1 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -38,6 +38,7 @@ typedef struct IWSDMessageParametersImpl { typedef struct IWSDUdpMessageParametersImpl { IWSDMessageParametersImpl base; + WSDUdpRetransmitParams retransmitParams; } IWSDUdpMessageParametersImpl; static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMessageParameters *iface) @@ -248,14 +249,32 @@ static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLowerParameters(IWSDUdpMes static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRetransmitParams(IWSDUdpMessageParameters *This, const WSDUdpRetransmitParams *pParams) { - FIXME("(%p, %p)\n", This, pParams); - return E_NOTIMPL; + IWSDUdpMessageParametersImpl *impl = impl_from_IWSDUdpMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pParams); + + if (pParams == NULL) + { + return E_INVALIDARG; + } + + impl->retransmitParams = *pParams; + return S_OK; } static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRetransmitParams(IWSDUdpMessageParameters *This, WSDUdpRetransmitParams *pParams) { - FIXME("(%p, %p)\n", This, pParams); - return E_NOTIMPL; + IWSDUdpMessageParametersImpl *impl = impl_from_IWSDUdpMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pParams); + + if (pParams == NULL) + { + return E_POINTER; + } + + * pParams = impl->retransmitParams; + return S_OK; } static const IWSDUdpMessageParametersVtbl udpMsgParamsVtbl = @@ -297,6 +316,13 @@ HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxPara obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; obj->base.ref = 1; + /* Populate default retransmit parameters */ + obj->retransmitParams.ulSendDelay = 0; + obj->retransmitParams.ulRepeat = 1; + obj->retransmitParams.ulRepeatMinDelay = 50; + obj->retransmitParams.ulRepeatMaxDelay = 250; + obj->retransmitParams.ulRepeatUpperDelay = 450; + *ppTxParams = (IWSDUdpMessageParameters *)&obj->base.IWSDMessageParameters_iface; TRACE("Returning iface %p\n", *ppTxParams); diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 55ca7f3..0621950 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -197,17 +197,17 @@ static void RetransmitParams_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); /* Check if the default values are returned */ rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); /* Now try setting some custom parameters */ origParams.ulSendDelay = 100; @@ -217,18 +217,22 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 500; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); - todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Try setting a null parameter */ + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, NULL); + ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08x\n", rc); /* Now attempt to set some invalid parameters - these appear to be accepted */ origParams.ulSendDelay = INFINITE; @@ -238,18 +242,18 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 100; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); - todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0

Owen Rudge : wsdapi: Implement Get/SetRemoteAddress.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 7b3024a25504857abc8295a637e6569790bf628c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3024a25504857abc8295a63… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:45 2017 +0100 wsdapi: Implement Get/SetRemoteAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 46 +++++++++++++++++++++++++++++++++++++++---- dlls/wsdapi/tests/msgparams.c | 12 +++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index 2c59e3a..6675fa5 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -33,6 +33,7 @@ typedef struct IWSDMessageParametersImpl { IWSDMessageParameters IWSDMessageParameters_iface; LONG ref; IWSDAddress *localAddress; + IWSDAddress *remoteAddress; } IWSDMessageParametersImpl; typedef struct IWSDUdpMessageParametersImpl { @@ -74,6 +75,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa IWSDAddress_Release(This->localAddress); } + if (This->remoteAddress != NULL) + { + IWSDAddress_Release(This->remoteAddress); + } + HeapFree(GetProcessHeap(), 0, This); } @@ -126,14 +132,46 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { - FIXME("(%p, %p)\n", This, ppAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, ppAddress); + + if (ppAddress == NULL) + { + return E_POINTER; + } + + if (impl->remoteAddress == NULL) + { + return E_ABORT; + } + + *ppAddress = impl->remoteAddress; + IWSDAddress_AddRef(*ppAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { - FIXME("(%p, %p)\n", This, pAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pAddress); + + if (pAddress == NULL) + { + return E_POINTER; + } + + if (impl->remoteAddress != NULL) + { + IWSDAddress_Release(impl->remoteAddress); + } + + impl->remoteAddress = pAddress; + IWSDAddress_AddRef(pAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index a8f905d..55ca7f3 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -142,11 +142,11 @@ static void RemoteAddress_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); @@ -157,14 +157,14 @@ static void RemoteAddress_tests(void) todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - todo_wine ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetRemoteAddress returns the same object */ - todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0

Owen Rudge : wsdapi: Implement Get/SetLocalAddress.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 9ce9d73414198e91da261092c584f709c9365c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce9d73414198e91da261092c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 26 22:35:41 2017 +0100 wsdapi: Implement Get/SetLocalAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 48 ++++++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/msgparams.c | 12 +++++------ 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index a7a2f0a..2c59e3a 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); typedef struct IWSDMessageParametersImpl { IWSDMessageParameters IWSDMessageParameters_iface; LONG ref; + IWSDAddress *localAddress; } IWSDMessageParametersImpl; typedef struct IWSDUdpMessageParametersImpl { @@ -68,6 +69,11 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa if (ref == 0) { + if (This->localAddress != NULL) + { + IWSDAddress_Release(This->localAddress); + } + HeapFree(GetProcessHeap(), 0, This); } @@ -76,14 +82,46 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { - FIXME("(%p, %p)\n", This, ppAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, ppAddress); + + if (ppAddress == NULL) + { + return E_POINTER; + } + + if (impl->localAddress == NULL) + { + return E_ABORT; + } + + *ppAddress = impl->localAddress; + IWSDAddress_AddRef(*ppAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { - FIXME("(%p, %p)\n", This, pAddress); - return E_NOTIMPL; + IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); + + TRACE("(%p, %p)\n", impl, pAddress); + + if (pAddress == NULL) + { + return E_POINTER; + } + + if (impl->localAddress != NULL) + { + IWSDAddress_Release(impl->localAddress); + } + + impl->localAddress = pAddress; + IWSDAddress_AddRef(pAddress); + + return S_OK; } static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) @@ -215,7 +253,7 @@ HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxPara *ppTxParams = NULL; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); if (!obj) return E_OUTOFMEMORY; obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 246cfd6..a8f905d 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -84,11 +84,11 @@ static void LocalAddress_tests(void) ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); - todo_wine ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); @@ -99,14 +99,14 @@ static void LocalAddress_tests(void) todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - todo_wine ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - todo_wine ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetLocalAddress returns the same object */ - todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret);

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA265 hashes.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 524c632a82b58c5b505cdfdf361d019234686e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524c632a82b58c5b505cdfdf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:53 2017 +0200 rsaenh: Use bcrypt for SHA265 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 3 +- dlls/rsaenh/implglue.c | 10 +- dlls/rsaenh/implglue.h | 2 - dlls/rsaenh/sha2.c | 518 ------------------------------------------------ dlls/rsaenh/sha2.h | 64 ------ 5 files changed, 2 insertions(+), 595 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524c632a82b58c5b505cd…

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA384 hashes.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 78a5d660037a14dfb7d45764955ded0235f6fb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a5d660037a14dfb7d457649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:26 2017 +0200 rsaenh: Use bcrypt for SHA384 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 10 +- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/sha2.c | 414 ------------------------------------------------- dlls/rsaenh/sha2.h | 19 --- 4 files changed, 1 insertion(+), 443 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78a5d660037a14dfb7d45…

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA512 hashes.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 6aa5fdf9527620c46220050ccb2d6fe0e9c113ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa5fdf9527620c46220050cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 28 18:22:12 2017 +0200 rsaenh: Use bcrypt for SHA512 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/implglue.c | 32 +++++++++++++--------- dlls/rsaenh/implglue.h | 5 +++- dlls/rsaenh/rsaenh.c | 1 - dlls/rsaenh/sha2.c | 71 ------------------------------------------------- dlls/rsaenh/sha2.h | 6 ----- 6 files changed, 24 insertions(+), 93 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 5b6e2fe..0fdae10 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -1,6 +1,6 @@ MODULE = rsaenh.dll IMPORTLIB = rsaenh -IMPORTS = crypt32 advapi32 +IMPORTS = bcrypt crypt32 advapi32 C_SRCS = \ aes.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 77a0085..20ebddc 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -50,6 +50,8 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) { + const WCHAR *algid = NULL; + switch (aiAlgid) { case CALG_MD2: @@ -77,10 +79,22 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_SHA_512: - SHA512_Init(&pHashContext->sha512); + algid = BCRYPT_SHA512_ALGORITHM; break; } + if (algid) + { + BCRYPT_ALG_HANDLE provider; + NTSTATUS status; + + status = BCryptOpenAlgorithmProvider(&provider, algid, MS_PRIMITIVE_PROVIDER, 0); + if (status) return FALSE; + + status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + BCryptCloseAlgorithmProvider(provider, 0); + if (status) return FALSE; + } return TRUE; } @@ -113,13 +127,8 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb SHA384_Update(&pHashContext->sha384, pbData, dwDataLen); break; - case CALG_SHA_512: - SHA512_Update(&pHashContext->sha512, pbData, dwDataLen); - break; - default: - SetLastError(NTE_BAD_ALGID); - return FALSE; + BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); } return TRUE; @@ -155,13 +164,10 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash SHA384_Final(pbHashValue, &pHashContext->sha384); break; - case CALG_SHA_512: - SHA512_Final(pbHashValue, &pHashContext->sha512); - break; - default: - SetLastError(NTE_BAD_ALGID); - return FALSE; + BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(pHashContext->bcrypt_hash); + break; } return TRUE; diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 3ac7eef..4f53101 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -24,9 +24,12 @@ #ifndef __WINE_IMPLGLUE_H #define __WINE_IMPLGLUE_H +#include "bcrypt.h" #include "tomcrypt.h" #include "sha2.h" +#define RSAENH_MAX_HASH_SIZE 104 + /* Next typedef copied from dlls/advapi32/crypt_md4.c */ typedef struct tagMD4_CTX { unsigned int buf[4]; @@ -60,7 +63,7 @@ typedef union tagHASH_CONTEXT { SHA_CTX sha; SHA256_CTX sha256; SHA384_CTX sha384; - SHA512_CTX sha512; + BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT; typedef union tagKEY_CONTEXT { diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9af770d..98bba16 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -48,7 +48,6 @@ static HINSTANCE instance; * CRYPTHASH - hash objects */ #define RSAENH_MAGIC_HASH 0x85938417u -#define RSAENH_MAX_HASH_SIZE 104 #define RSAENH_HASHSTATE_HASHING 1 #define RSAENH_HASHSTATE_FINISHED 2 typedef struct _RSAENH_TLS1PRF_PARAMS diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index 76e7184..67933ce 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -599,16 +599,6 @@ char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_S } -/*** SHA-512: *********************************************************/ -void SHA512_Init(SHA512_CTX* context) { - if (context == NULL) { - return; - } - MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH); - MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH); - context->bitcount[0] = context->bitcount[1] = 0; -} - #ifdef SHA2_UNROLL_TRANSFORM /* Unrolled SHA-512 round macros: */ @@ -867,67 +857,6 @@ void SHA512_Last(SHA512_CTX* context) { SHA512_Transform(context, (sha2_word64*)context->buffer); } -void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { - sha2_word64 *d = (sha2_word64*)digest; - - /* Sanity check: */ - assert(context != NULL); - - /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != NULL) { - SHA512_Last(context); - - /* Save the hash data for output: */ -#ifndef WORDS_BIGENDIAN - { - /* Convert TO host byte order */ - int j; - for (j = 0; j < 8; j++) { - REVERSE64(context->state[j],context->state[j]); - *d++ = context->state[j]; - } - } -#else - MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH); -#endif - } - - /* Zero out state data */ - MEMSET_BZERO(context, sizeof(*context)); -} - -char *SHA512_End(SHA512_CTX* context, char buffer[]) { - sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest; - int i; - - /* Sanity check: */ - assert(context != NULL); - - if (buffer != NULL) { - SHA512_Final(digest, context); - - for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { - *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; - *buffer++ = sha2_hex_digits[*d & 0x0f]; - d++; - } - *buffer = 0; - } else { - MEMSET_BZERO(context, sizeof(*context)); - } - MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); - return buffer; -} - -char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { - SHA512_CTX context; - - SHA512_Init(&context); - SHA512_Update(&context, data, len); - return SHA512_End(&context, digest); -} - - /*** SHA-384: *********************************************************/ void SHA384_Init(SHA384_CTX* context) { if (context == NULL) { diff --git a/dlls/rsaenh/sha2.h b/dlls/rsaenh/sha2.h index 2dda412..342e838 100644 --- a/dlls/rsaenh/sha2.h +++ b/dlls/rsaenh/sha2.h @@ -80,10 +80,4 @@ void SHA384_Final(sha2_byte[SHA384_DIGEST_LENGTH], SHA384_CTX*); char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); char* SHA384_Data(const sha2_byte*, size_t, char[SHA384_DIGEST_STRING_LENGTH]); -void SHA512_Init(SHA512_CTX*); -void SHA512_Update(SHA512_CTX*, const sha2_byte*, size_t); -void SHA512_Final(sha2_byte[SHA512_DIGEST_LENGTH], SHA512_CTX*); -char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); -char* SHA512_Data(const sha2_byte*, size_t, char[SHA512_DIGEST_STRING_LENGTH]); - #endif /* __SHA2_H__ */

1 0

Alistair Leslie-Hughes : include: Add mftransform.idl.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 2164a4da3f472c6613119fd6af00b0198b4a02a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164a4da3f472c6613119fd6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 05:45:34 2017 +0000 include: Add mftransform.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfidl.idl | 1 + include/mftransform.idl | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d00defd..1dd6aaf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ IDL_SRCS = \ mfidl.idl \ mfobjects.idl \ mfreadwrite.idl \ + mftransform.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/mfidl.idl b/include/mfidl.idl index 45b4957..3c33806 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -17,6 +17,7 @@ */ import "mfobjects.idl"; +import "mftransform.idl"; typedef unsigned __int64 TOPOID; typedef LONGLONG MFTIME; diff --git a/include/mftransform.idl b/include/mftransform.idl new file mode 100644 index 0000000..165cad4 --- /dev/null +++ b/include/mftransform.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfobjects.idl"; + +typedef struct _MFT_INPUT_STREAM_INFO +{ + LONGLONG hnsMaxLatency; + DWORD dwFlags; + DWORD cbSize; + DWORD cbMaxLookahead; + DWORD cbAlignment; +} MFT_INPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_STREAM_INFO +{ + DWORD dwFlags; + DWORD cbSize; + DWORD cbAlignment; +} MFT_OUTPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_DATA_BUFFER +{ + DWORD dwStreamID; + IMFSample *pSample; + DWORD dwStatus; + IMFCollection *pEvents; +} MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; + +typedef enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +[ + object, + uuid(bf94c121-5b05-4e6f-8000-ba598961414d) +] +interface IMFTransform : IUnknown +{ + HRESULT GetStreamLimits([out] DWORD *input_minimum, [out] DWORD *input_maximum, [out] DWORD *output_minimum, + [out] DWORD *output_maximum); + + HRESULT GetStreamCount([out] DWORD *inputs, [out] DWORD *outputs); + + HRESULT GetStreamIDs([in] DWORD input_size, [out,size_is(input_size)] DWORD *inputs, + [in] DWORD output_size, [out,size_is(output_size)] DWORD *outputs); + + HRESULT GetInputStreamInfo([in] DWORD id, [out] MFT_INPUT_STREAM_INFO *info); + + HRESULT GetOutputStreamInfo([in] DWORD id, [out] MFT_OUTPUT_STREAM_INFO *info); + + HRESULT GetAttributes([out] IMFAttributes **attributes); + + HRESULT GetInputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT GetOutputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT DeleteInputStream([in] DWORD id); + + HRESULT AddInputStreams([in] DWORD streams, [in] DWORD *ids); + + HRESULT GetInputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT GetOutputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT SetInputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT SetOutputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT GetInputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetOutputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetInputStatus([in] DWORD id, [out] DWORD *flags); + + HRESULT GetOutputStatus([out] DWORD *flags); + + HRESULT SetOutputBounds([in] LONGLONG lower, [in] LONGLONG upper); + + HRESULT ProcessEvent([in] DWORD id, [in] IMFMediaEvent *event); + + HRESULT ProcessMessage([in] MFT_MESSAGE_TYPE message, [in] ULONG_PTR param); + + [local] HRESULT ProcessInput([in] DWORD id, [in] IMFSample *sample, [in] DWORD flags); + + [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, + [out] DWORD *status); +};

1 0

Alistair Leslie-Hughes : mfplat/tests: Added MFCreateMediaType test.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 9a06379d17f189440398ec0e3bab7af5fca2a075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a06379d17f189440398ec0e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 01:46:38 2017 +0000 mfplat/tests: Added MFCreateMediaType test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83e1538..edbce46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -191,6 +191,33 @@ static void init_functions(void) #undef X } +static void test_MFCreateMediaType(void) +{ + HRESULT hr; + IMFMediaType *mediatype; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + +if(0) +{ + /* Crash on Windows Vista/7 */ + hr = MFCreateMediaType(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaType_Release(mediatype); + + MFShutdown(); +} + + START_TEST(mfplat) { CoInitialize(NULL); @@ -199,6 +226,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); + test_MFCreateMediaType(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateMediaType.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 69bb5dc7144f12e1a950cc1d744c551310218e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bb5dc7144f12e1a950cc1d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 01:46:28 2017 +0000 mfplat: Implement MFCreateMediaType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 446 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 448 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69bb5dc7144f12e1a950c…

1 0

Nikolay Sivov : regedit: Remove explicit iIndent field initialization.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: f4e98d813fa483a7156a8c68237523b878ea8463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e98d813fa483a7156a8c682… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:55 2017 +0300 regedit: Remove explicit iIndent field initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4be7c94..c59d435 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -153,8 +153,8 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { + LVITEMW item = { 0 }; LINE_INFO* linfo; - LVITEMW item; int index; linfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); @@ -173,8 +173,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; - item.iSubItem = 0; - item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; @@ -192,10 +190,6 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.lParam = (LPARAM)linfo; -#if (_WIN32_IE >= 0x0300) - item.iIndent = 0; -#endif - if ((index = ListView_InsertItemW(hwndLV, &item)) != -1) format_value_data(hwndLV, index, dwValType, ValBuf, dwCount); return index;

1 0

Nikolay Sivov : regedit: Use notification message to clean up item data.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b84f228805f3cf121ee2e91b155ef077b092520f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84f228805f3cf121ee2e91b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 28 15:49:54 2017 +0300 regedit: Use notification message to clean up item data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b758564..4be7c94 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -411,6 +411,14 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR HeapFree(GetProcessHeap(), 0, oldName); return 0; } + case LVN_DELETEITEM: { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + LINE_INFO *info = (LINE_INFO *)nmlv->lParam; + + HeapFree(GetProcessHeap(), 0, info->name); + HeapFree(GetProcessHeap(), 0, info); + } + break; case NM_RETURN: { int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); if (cnt != -1) @@ -515,7 +523,6 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli BYTE* valBuf = 0; HKEY hKey = 0; LONG errCode; - INT count, i; LVITEMW item; if (!hwndLV) return FALSE; @@ -525,16 +532,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ, &hKey); if (errCode != ERROR_SUCCESS) goto done; - count = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); - for (i = 0; i < count; i++) { - item.mask = LVIF_PARAM; - item.iItem = i; - SendMessageW( hwndLV, LVM_GETITEMW, 0, (LPARAM)&item ); - HeapFree(GetProcessHeap(), 0, ((LINE_INFO*)item.lParam)->name); - HeapFree(GetProcessHeap(), 0, (void*)item.lParam); - } g_columnToSort = ~0U; - SendMessageW( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); + SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); /* get size information and resize the buffers if necessary */ errCode = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL,

1 0

Hugh McMaster : regedit: Free the binary data buffer after saving the new value (Coverity).
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b25337e6d6b7bfc9717d2c66f7c9b0b01a04929f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25337e6d6b7bfc9717d2c66f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 28 10:47:29 2017 +0000 regedit: Free the binary data buffer after saving the new value (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 403def4..2c47bdc 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -165,6 +165,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); + HeapFree(GetProcessHeap(), 0, pData); } else lRet = ERROR_OUTOFMEMORY;

1 0

Alistair Leslie-Hughes : dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: f62a891385f3f58925787283254171f2a25e215d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62a891385f3f589257872832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 10:50:52 2017 +0000 dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 21 ++++++++++----------- dlls/dmime/tests/dmime.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 04f0af0..cc7e4d1 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -137,17 +137,16 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_BUFFER: if (This->pDSBuffer) { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } + if (IsEqualIID (iidInterface, &IID_IUnknown) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || + IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || + IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + } + + WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); + *ppObject = NULL; + return E_NOINTERFACE; } break; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a154eac..62a977e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <dmusici.h> #include <audioclient.h> +#include <guiddef.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) @@ -45,8 +46,14 @@ static void test_COM_audiopath(void) IDirectMusicAudioPath *dmap; IUnknown *unk; IDirectMusicPerformance8 *performance; + IDirectSoundBuffer *dsound; + IDirectSoundBuffer8 *dsound8; + IDirectSoundNotify *notify; + IDirectSound3DBuffer *dsound3d; + IKsPropertySet *propset; ULONG refcount; HRESULT hr; + DWORD buffer = 0; hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); @@ -89,6 +96,39 @@ static void test_COM_audiopath(void) ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer, (void**)&dsound); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer_Release(dsound); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); + ok(hr == S_OK, "Failed: %08x\n", hr); + IDirectSoundBuffer8_Release(dsound8); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSoundNotify, (void**)&notify); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IKsPropertySet, (void**)&propset); + todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + if (propset) + IKsPropertySet_Release(propset); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Failed: %08x\n", hr); + IUnknown_Release(unk); + + hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, + 0, &GUID_NULL, (void**)&unk); + ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); IDirectMusicPerformance8_Release(performance);

1 0

Huw Davies : msvcrt: _difftime64() takes 64-bit args.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: b7bb360be363cca4ca14dbf88dfdbe8cd6621df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb360be363cca4ca14dbf88… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 28 13:49:58 2017 +0100 msvcrt: _difftime64() takes 64-bit args. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 6cd46b4..db36c29 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -15,7 +15,7 @@ @ cdecl _ctime64(ptr) ucrtbase._ctime64 @ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s @ cdecl _difftime32(long long) ucrtbase._difftime32 -@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _difftime64(int64 int64) ucrtbase._difftime64 @ cdecl _ftime32(ptr) ucrtbase._ftime32 @ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s @ cdecl _ftime64(ptr) ucrtbase._ftime64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 964f600..fcf235a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -768,7 +768,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2c5745..e0b7761 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1116,7 +1116,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d6f2110..5a2f9c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1108,7 +1108,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4bb1afb..5c6093c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1047,7 +1047,7 @@ @ extern _daylight msvcr120._daylight @ cdecl _dclass(double) msvcr120._dclass @ cdecl _difftime32(long long) msvcr120._difftime32 -@ cdecl _difftime64(long long) msvcr120._difftime64 +@ cdecl _difftime64(int64 int64) msvcr120._difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index de945d5..6c3c33c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -433,7 +433,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b4a77c..d0ce271 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -416,7 +416,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1a887d3..e2b72e8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -403,7 +403,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ extern _dstbias MSVCRT__dstbias @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 78ae7d6..5d13712 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -252,7 +252,7 @@ @ cdecl _dclass(double) MSVCR120__dclass @ stub _dexp @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm @ cdecl _dpcomp(double double) MSVCR120__dpcomp

1 0

Huw Davies : wineandroid: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 99069934f735fe57978b011f8a57792638de5047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069934f735fe57978b011f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:38 2017 +0100 wineandroid: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f7a13df..ff8b1e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1247,7 +1247,7 @@ BOOL CDECL ANDROID_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; @@ -1297,11 +1297,13 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); 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 ); + 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, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Huw Davies : winex11: Use logical co-ords to call GdiAlphaBlend().
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: daae0d6adc5dca126c43a143c460d1bb66336be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daae0d6adc5dca126c43a143c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 16:40:36 2017 +0100 winex11: Use logical co-ords to call GdiAlphaBlend(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea4933f..eaf6dcf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2583,7 +2583,7 @@ BOOL CDECL X11DRV_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; @@ -2631,11 +2631,13 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); 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 ); + 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, (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); if (ret) {

1 0

Jacek Caban : server: Remove no longer needed need_handle from queue_irp.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 84bc9c3d56225d0bdd9f4bbc76986ef4ef83e22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bc9c3d56225d0bdd9f4bbc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:27 2017 +0200 server: Remove no longer needed need_handle from queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/server/device.c b/server/device.c index cf405b8..fc5bcbe 100644 --- a/server/device.c +++ b/server/device.c @@ -462,22 +462,14 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, struct async *async, int need_handle ) +static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { - obj_handle_t handle = 0; + if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!need_handle) handle = 1; - else if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; - - if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) - { - if (need_handle && handle) close_handle( current->process, handle ); - return 0; - } irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); set_error( STATUS_PENDING ); - return handle; + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) @@ -501,7 +493,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +514,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +533,7 @@ static int device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -561,7 +553,7 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 0 ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0

Jacek Caban : server: Use create_request_async in flush request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 10c1f245e45a387046e2075e3a74dc3b450d47d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c1f245e45a387046e2075e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:20 2017 +0200 server: Use create_request_async in flush request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - server/device.c | 6 +++--- server/fd.c | 7 +++---- server/file.c | 12 ++++++++---- server/file.h | 4 ++-- server/named_pipe.c | 25 +++++++++++-------------- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 380b370..0381e55 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3424,7 +3424,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock if (hEvent) { NtWaitForSingleObject( hEvent, FALSE, NULL ); - NtClose( hEvent ); ret = STATUS_SUCCESS; } } diff --git a/server/device.c b/server/device.c index c19905b..cf405b8 100644 --- a/server/device.c +++ b/server/device.c @@ -176,7 +176,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_flush( struct fd *fd, struct async *async ); +static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops device_file_ops = @@ -527,7 +527,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) +static int device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; @@ -541,7 +541,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async ) irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index 5ab0ff0..f64c8c9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2172,7 +2172,7 @@ int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) } /* default flush() routine */ -obj_handle_t no_fd_flush( struct fd *fd, struct async *async ) +int no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2373,10 +2373,9 @@ DECL_HANDLER(flush) if (!fd) return; - async = create_async( fd, current, &req->async, NULL ); - if (async) + if ((async = create_request_async( fd, &req->async ))) { - reply->event = fd->fd_ops->flush( fd, async ); + reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); release_object( async ); } release_object( fd ); diff --git a/server/file.c b/server/file.c index 341c3c8..3809012 100644 --- a/server/file.c +++ b/server/file.c @@ -74,7 +74,7 @@ static struct object *file_open_file( struct object *obj, unsigned int access, static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static obj_handle_t file_flush( struct fd *fd, struct async *async ); +static int file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -295,11 +295,15 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static obj_handle_t file_flush( struct fd *fd, struct async *async ) +static int file_flush( struct fd *fd, struct async *async ) { int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1 && fsync( unix_fd ) == -1) file_set_error(); - return 0; + if (unix_fd != -1 && fsync( unix_fd ) == -1) + { + file_set_error(); + return 0; + } + return 1; } static enum server_fd_type file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 0dbf8d4..386f76c 100644 --- a/server/file.h +++ b/server/file.h @@ -56,7 +56,7 @@ struct fd_ops /* perform a write on the file */ int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - obj_handle_t (*flush)(struct fd *, struct async *); + int (*flush)(struct fd *, struct async *); /* perform an ioctl on the file */ int (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); /* queue an async operation */ @@ -102,7 +102,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async ); +extern int no_fd_flush( struct fd *fd, struct async *async ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1e51ce8..c0bfc2a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -163,7 +163,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ); +static int pipe_server_flush( struct fd *fd, struct async *async ); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -206,7 +206,7 @@ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ); +static int pipe_client_flush( struct fd *fd, struct async *async ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -648,28 +648,25 @@ static void check_flushed( void *arg ) } } -static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) +static int pipe_end_flush( struct pipe_end *pipe_end, struct async *async ) { - obj_handle_t handle = 0; - if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) - return 0; + return 1; if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; - if (!async_is_blocking( async ) || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) - set_error( STATUS_PENDING ); - return handle; + set_error( STATUS_PENDING ); + return 1; } -static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) +static int pipe_server_flush( struct fd *fd, struct async *async ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle; - if (!server || server->state != ps_connected_server) return 0; + if (!server || server->state != ps_connected_server) return 1; - if (!pipe_data_remaining( server )) return 0; + if (!pipe_data_remaining( server )) return 1; handle = pipe_end_flush( &server->pipe_end, async ); @@ -679,11 +676,11 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ) return handle; } -static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ) +static int pipe_client_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); /* FIXME: Support byte mode. */ - return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 0; + return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb )

1 0

Jacek Caban : server: Use create_request_async in ioctl request handler.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: c56c42ff79515a79b1913d31e21d6fecd7c11ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c42ff79515a79b1913d31e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:20:10 2017 +0200 server: Use create_request_async in ioctl request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 +++++--- dlls/ntdll/tests/pipe.c | 6 +++--- server/device.c | 6 +++--- server/fd.c | 19 +++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 44 ++++++++++++++++++++------------------------ server/serial.c | 47 +++++++++++++++++++++++++++-------------------- server/sock.c | 8 +++----- 8 files changed, 71 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c56c42ff79515a79b1913…

1 0

Jacek Caban : ntdll: Set iosb status in server_ioctl_file.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 4e02a3bb1383f7191226b6b03c07aee47151c80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e02a3bb1383f7191226b6b03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:56 2017 +0200 ntdll: Set iosb status in server_ioctl_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b73af7e..0d7efc3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1560,6 +1560,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtClose( wait_handle ); } + if (status != STATUS_PENDING && code != FSCTL_PIPE_LISTEN) io->u.Status = status; return status; } @@ -1644,8 +1645,8 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event, } if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); if (status != STATUS_PENDING) io->u.Status = status; return status; @@ -1694,7 +1695,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); if (!status) status = DIR_unmount_device( handle ); - break; + return status; case FSCTL_PIPE_PEEK: { @@ -1710,8 +1711,8 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if ((status = server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) { if (status == STATUS_BAD_DEVICE_TYPE) - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); break; } @@ -1767,11 +1768,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc int fd = server_remove_fd_from_cache( handle ); if (fd != -1) close( fd ); } - break; - - case FSCTL_PIPE_LISTEN: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); return status; case FSCTL_PIPE_IMPERSONATE: @@ -1814,11 +1810,9 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc io->Information = 0; status = STATUS_SUCCESS; break; - case FSCTL_PIPE_WAIT: default: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - break; + return server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); } if (status != STATUS_PENDING) io->u.Status = status;

1 0

Jacek Caban : server: Allow async_handoff users to set result themselves.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 74364ed0172ad91f0516cc95a4a5c1062a561e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74364ed0172ad91f0516cc95a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:40 2017 +0200 server: Allow async_handoff users to set result themselves. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 409c9b5..3a83a63 100644 --- a/server/async.c +++ b/server/async.c @@ -338,13 +338,23 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul return 0; } - if (async->iosb->status != STATUS_PENDING) + if (get_error() != STATUS_PENDING) + { + /* status and data are already set and returned */ + async_terminate( async, get_error() ); + } + else if (async->iosb->status != STATUS_PENDING) { + /* result is already available in iosb, return it */ if (async->iosb->out_data) { set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + } + + if (async->iosb->status != STATUS_PENDING) + { if (result) *result = async->iosb->result; async->signaled = 1; }

1 0

Jacek Caban : server: Store fd reference in async object for unqueued asyncs.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: fa0dfe5967087edf5e9f77975dc1ad5e0e01a963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0dfe5967087edf5e9f77975… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:19:28 2017 +0200 server: Store fd reference in async object for unqueued asyncs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 35 +++++++++++++++++++++++------------ server/change.c | 2 +- server/fd.c | 10 +++++----- server/file.h | 4 ++-- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/server/async.c b/server/async.c index b693c28..409c9b5 100644 --- a/server/async.c +++ b/server/async.c @@ -41,6 +41,7 @@ struct async struct list queue_entry; /* entry in async queue list */ struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ + struct fd *fd; /* fd associated with an unqueued async */ unsigned int status; /* current status */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ @@ -167,6 +168,7 @@ static void async_destroy( struct object *obj ) release_object( async->queue ); } + if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); @@ -257,8 +259,10 @@ void free_async_queue( struct async_queue *queue ) void queue_async( struct async_queue *queue, struct async *async ) { - async->queue = (struct async_queue *)grab_object( queue ); + release_object( async->fd ); + async->fd = NULL; + async->queue = (struct async_queue *)grab_object( queue ); grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); @@ -266,7 +270,7 @@ void queue_async( struct async_queue *queue, struct async *async ) } /* create an async on a given queue of a fd */ -struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ) +struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ) { struct event *event = NULL; struct async *async; @@ -286,6 +290,7 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str async->data = *data; async->timeout = NULL; async->queue = NULL; + async->fd = (struct fd *)grab_object( fd ); async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; @@ -301,7 +306,7 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str /* create an async associated with iosb for async-based requests * returned async must be passed to async_handoff */ -struct async *create_request_async( struct thread *thread, const async_data_t *data ) +struct async *create_request_async( struct fd *fd, const async_data_t *data ) { struct async *async; struct iosb *iosb; @@ -309,7 +314,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d if (!(iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) return NULL; - async = create_async( current, data, iosb ); + async = create_async( fd, current, data, iosb ); release_object( iosb ); if (async) { @@ -365,13 +370,15 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta async->timeout_status = status; } -static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, +static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (queue->fd) + struct fd *fd = async->queue ? async->queue->fd : async->fd; + + if (fd) { apc_param_t ckey; - struct completion *completion = fd_get_completion( queue->fd, &ckey ); + struct completion *completion = fd_get_completion( fd, &ckey ); if (completion) { @@ -379,8 +386,8 @@ static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, release_object( completion ); } } - else if (queue->completion) add_completion( queue->completion, queue->comp_key, - cvalue, status, information ); + else if (async->queue && async->queue->completion) + add_completion( async->queue->completion, async->queue->comp_key, cvalue, status, information ); } /* store the result of the client-side async callback */ @@ -410,8 +417,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->status = status; if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ - if (async->queue && !async->data.apc && async->data.apc_context) - add_async_completion( async->queue, async->data.apc_context, status, total ); if (async->data.apc) { apc_call_t data; @@ -423,7 +428,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); } + else if (async->data.apc_context) + add_async_completion( async, async->data.apc_context, status, total ); + if (async->event) set_event( async->event ); + else if (async->fd) set_fd_signaled( async->fd, 1 ); else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); if (!async->signaled) { @@ -454,13 +463,15 @@ int async_waiting( struct async_queue *queue ) static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { struct async *async; + struct fd *fd; int woken = 0; restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - if ((!obj || (async->queue && async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && + fd = async->queue ? async->queue->fd : async->fd; + if ((!obj || (fd && get_fd_user( fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { diff --git a/server/change.c b/server/change.c index 14fb2f1..88423fe 100644 --- a/server/change.c +++ b/server/change.c @@ -1246,7 +1246,7 @@ DECL_HANDLER(read_directory_changes) return; /* requests don't timeout */ - if (!(async = create_async( current, &req->async, NULL ))) goto end; + if (!(async = create_async( dir->fd, current, &req->async, NULL ))) goto end; if (!fd_queue_async( dir->fd, async, ASYNC_TYPE_WAIT )) goto end; /* assign it once */ diff --git a/server/fd.c b/server/fd.c index 0f1a15e..a073c54 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2373,7 +2373,7 @@ DECL_HANDLER(flush) if (!fd) return; - async = create_async( current, &req->async, NULL ); + async = create_async( fd, current, &req->async, NULL ); if (async) { reply->event = fd->fd_ops->flush( fd, async ); @@ -2449,7 +2449,7 @@ DECL_HANDLER(read) if (!fd) return; - if ((async = create_request_async( current, &req->async ))) + if ((async = create_request_async( fd, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; @@ -2466,7 +2466,7 @@ DECL_HANDLER(write) if (!fd) return; - if ((async = create_request_async( current, &req->async ))) + if ((async = create_request_async( fd, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); reply->options = fd->options; @@ -2487,7 +2487,7 @@ DECL_HANDLER(ioctl) if ((iosb = create_iosb( get_req_data(), get_req_data_size(), get_reply_max_size() ))) { - if ((async = create_async( current, &req->async, iosb ))) + if ((async = create_async( fd, current, &req->async, iosb ))) { reply->wait = fd->fd_ops->ioctl( fd, req->code, async ); reply->options = fd->options; @@ -2520,7 +2520,7 @@ DECL_HANDLER(register_async) if ((fd = get_handle_fd_obj( current->process, req->async.handle, access ))) { - if (get_unix_fd( fd ) != -1 && (async = create_async( current, &req->async, NULL ))) + if (get_unix_fd( fd ) != -1 && (async = create_async( fd, current, &req->async, NULL ))) { fd->fd_ops->queue_async( fd, async, req->type, req->count ); release_object( async ); diff --git a/server/file.h b/server/file.h index 96c1d23..1e5ea7a 100644 --- a/server/file.h +++ b/server/file.h @@ -175,8 +175,8 @@ extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); -extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); -extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); +extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); +extern struct async *create_request_async( struct fd *fd, const async_data_t *data ); extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status );

1 0

Jacek Caban : server: Use create_request_async for write requests.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 2bd828b13cf0307ca087d098e67f192dd236c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd828b13cf0307ca087d098e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:18:23 2017 +0200 server: Use create_request_async for write requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++++- server/async.c | 3 ++- server/device.c | 6 +++--- server/fd.c | 18 ++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 26 ++++---------------------- 6 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d9840f..b73af7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -624,6 +624,11 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if (wait_handle && status != STATUS_PENDING) + { + io->u.Status = status; + io->Information = reply->size; + } } SERVER_END_REQ; @@ -633,7 +638,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; - NtClose( wait_handle ); } return status; diff --git a/server/async.c b/server/async.c index 7f2bcf5..b693c28 100644 --- a/server/async.c +++ b/server/async.c @@ -324,7 +324,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d } /* return async object status and wait handle to client */ -obj_handle_t async_handoff( struct async *async, int success ) +obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ) { if (!success) { @@ -340,6 +340,7 @@ obj_handle_t async_handoff( struct async *async, int success ) set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + if (result) *result = async->iosb->result; async->signaled = 1; } else diff --git a/server/device.c b/server/device.c index 4aa605b..4c7aa16 100644 --- a/server/device.c +++ b/server/device.c @@ -175,7 +175,7 @@ static int device_file_close_handle( struct object *obj, struct process *process static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); +static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, struct async *async ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -506,7 +506,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; @@ -522,7 +522,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_ irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index f6eb57d..0f1a15e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2165,7 +2165,7 @@ int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) } /* default write() routine */ -obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) +int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2451,7 +2451,7 @@ DECL_HANDLER(read) if ((async = create_request_async( current, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ) ); + reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; release_object( async ); } @@ -2463,20 +2463,14 @@ DECL_HANDLER(write) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_WRITE_DATA ); struct async *async; - struct iosb *iosb; if (!fd) return; - if ((iosb = create_iosb( get_req_data(), get_req_data_size(), 0 ))) + if ((async = create_request_async( current, &req->async ))) { - async = create_async( current, &req->async, iosb ); - if (async) - { - reply->wait = fd->fd_ops->write( fd, async, req->pos ); - reply->options = fd->options; - release_object( async ); - } - release_object( iosb ); + reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); + reply->options = fd->options; + release_object( async ); } release_object( fd ); } diff --git a/server/file.h b/server/file.h index 8cc4d3b..96c1d23 100644 --- a/server/file.h +++ b/server/file.h @@ -54,7 +54,7 @@ struct fd_ops /* perform a read on the file */ int (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); + int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, struct async *); /* perform an ioctl on the file */ @@ -101,7 +101,7 @@ extern int fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); +extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -177,7 +177,7 @@ extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern struct async *create_request_async( struct thread *thread, const async_data_t *data ); -extern obj_handle_t async_handoff( struct async *async, int success ); +extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 07ec006..f33daf8 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -155,7 +155,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); +static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -830,12 +830,11 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) return 1; } -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *write_end = get_fd_user( fd ); struct pipe_end *read_end = write_end->connection; struct pipe_message *message; - obj_handle_t handle = 0; if (!use_server_io( write_end )) return no_fd_write( fd, async, pos ); @@ -846,13 +845,8 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos } if (!write_end->write_q && !(write_end->write_q = create_async_queue( fd ))) return 0; - if (!(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; - if (!(message = mem_alloc( sizeof(*message) ))) - { - close_handle( current->process, handle ); - return 0; - } + if (!(message = mem_alloc( sizeof(*message) ))) return 0; message->async = (struct async *)grab_object( async ); message->iosb = async_get_iosb( async ); message->read_pos = 0; @@ -861,19 +855,7 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos queue_async( write_end->write_q, async ); reselect_write_queue( write_end ); set_error( STATUS_PENDING ); - - if (!async_is_blocking( async )) - { - struct iosb *iosb; - iosb = async_get_iosb( async ); - if (iosb->status == STATUS_PENDING) - { - close_handle( current->process, handle ); - handle = 0; - } - release_object( iosb ); - } - return handle; + return 1; } static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count )

1 0

Jacek Caban : server: Return async result directly instead of via APCs if it's available.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 879d46e45644147a14269bf46829b44c2a374ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879d46e45644147a14269bf46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:18:08 2017 +0200 server: Return async result directly instead of via APCs if it's available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 ++++ server/async.c | 76 +++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5329c79..3d9840f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -580,6 +580,11 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if (wait_handle && status != STATUS_PENDING) + { + io->u.Status = status; + io->Information = wine_server_reply_size( reply ); + } } SERVER_END_REQ; diff --git a/server/async.c b/server/async.c index f50cdc5..7f2bcf5 100644 --- a/server/async.c +++ b/server/async.c @@ -49,6 +49,7 @@ struct async async_data_t data; /* data for async I/O call */ struct iosb *iosb; /* I/O status block */ obj_handle_t wait_handle; /* pre-allocated wait handle */ + int direct_result; /* a flag if we're passing result directly from request instead of APC */ }; static void async_dump( struct object *obj, int verbose ); @@ -138,6 +139,12 @@ static void async_satisfied( struct object *obj, struct wait_queue_entry *entry struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); + if (async->direct_result) + { + async_set_result( &async->obj, async->iosb->status, async->iosb->result ); + async->direct_result = 0; + } + /* close wait handle here to avoid extra server round trip */ if (async->wait_handle) { @@ -195,18 +202,21 @@ void async_terminate( struct async *async, unsigned int status ) async->status = status; if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; - if (async->data.user) + if (!async->direct_result) { - apc_call_t data; - - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.user = async->data.user; - data.async_io.sb = async->data.iosb; - data.async_io.status = status; - thread_queue_apc( async->thread, &async->obj, &data ); + if (async->data.user) + { + apc_call_t data; + + memset( &data, 0, sizeof(data) ); + data.type = APC_ASYNC_IO; + data.async_io.user = async->data.user; + data.async_io.sb = async->data.iosb; + data.async_io.status = status; + thread_queue_apc( async->thread, &async->obj, &data ); + } + else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); } - else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); async_reselect( async ); if (async->queue) release_object( async ); /* so that it gets destroyed when the async is done */ @@ -270,14 +280,15 @@ struct async *create_async( struct thread *thread, const async_data_t *data, str return NULL; } - async->thread = (struct thread *)grab_object( thread ); - async->event = event; - async->status = STATUS_PENDING; - async->data = *data; - async->timeout = NULL; - async->queue = NULL; - async->signaled = 0; - async->wait_handle = 0; + async->thread = (struct thread *)grab_object( thread ); + async->event = event; + async->status = STATUS_PENDING; + async->data = *data; + async->timeout = NULL; + async->queue = NULL; + async->signaled = 0; + async->wait_handle = 0; + async->direct_result = 0; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -307,6 +318,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d release_object( async ); return NULL; } + async->direct_result = 1; } return async; } @@ -321,12 +333,25 @@ obj_handle_t async_handoff( struct async *async, int success ) return 0; } - if (async->iosb->status == STATUS_PENDING && !async_is_blocking( async )) + if (async->iosb->status != STATUS_PENDING) { - close_handle( async->thread->process, async->wait_handle); - async->wait_handle = 0; + if (async->iosb->out_data) + { + set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); + async->iosb->out_data = NULL; + } + async->signaled = 1; + } + else + { + async->direct_result = 0; + if (!async_is_blocking( async )) + { + close_handle( async->thread->process, async->wait_handle); + async->wait_handle = 0; + } } - set_error( STATUS_PENDING ); + set_error( async->iosb->status ); return async->wait_handle; } @@ -399,8 +424,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota } if (async->event) set_event( async->event ); else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); - async->signaled = 1; - wake_up( &async->obj, 0 ); + if (!async->signaled) + { + async->signaled = 1; + wake_up( &async->obj, 0 ); + } } }

1 0

Jacek Caban : server: Close async wait handle when wait is satisfied.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 0e0834ae92291e9857ed01f3cb116240abda642b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0834ae92291e9857ed01f3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:17:51 2017 +0200 server: Close async wait handle when wait is satisfied. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - server/async.c | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd5a690..5329c79 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -589,7 +589,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; - NtClose( wait_handle ); } return status; diff --git a/server/async.c b/server/async.c index 4c6c6a9..f50cdc5 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async static void async_dump( struct object *obj, int verbose ); static int async_signaled( struct object *obj, struct wait_queue_entry *entry ); +static void async_satisfied( struct object * obj, struct wait_queue_entry *entry ); static void async_destroy( struct object *obj ); static const struct object_ops async_ops = @@ -63,7 +64,7 @@ static const struct object_ops async_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ async_signaled, /* signaled */ - no_satisfied, /* satisfied */ + async_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ no_map_access, /* map_access */ @@ -132,6 +133,19 @@ static int async_signaled( struct object *obj, struct wait_queue_entry *entry ) return async->signaled; } +static void async_satisfied( struct object *obj, struct wait_queue_entry *entry ) +{ + struct async *async = (struct async *)obj; + assert( obj->ops == &async_ops ); + + /* close wait handle here to avoid extra server round trip */ + if (async->wait_handle) + { + close_handle( async->thread->process, async->wait_handle ); + async->wait_handle = 0; + } +} + static void async_destroy( struct object *obj ) { struct async *async = (struct async *)obj; @@ -300,7 +314,6 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success ) { - obj_handle_t handle; if (!success) { close_handle( async->thread->process, async->wait_handle ); @@ -313,10 +326,8 @@ obj_handle_t async_handoff( struct async *async, int success ) close_handle( async->thread->process, async->wait_handle); async->wait_handle = 0; } - handle = async->wait_handle; - async->wait_handle = 0; set_error( STATUS_PENDING ); - return handle; + return async->wait_handle; } /* set the timeout of an async operation */

1 0

Jacek Caban : server: Preallocate wait handle in create_request_async and return it in read request.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 0fb6099b01df30a7bb55112fa1d29a079570cb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb6099b01df30a7bb55112fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:17:36 2017 +0200 server: Preallocate wait handle in create_request_async and return it in read request. alloc_handle is failable and when we're returning the handle, handling error properly is not really possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 35 ++++++++++++++++++++++++++++++++++- server/device.c | 19 ++++++++++--------- server/fd.c | 4 ++-- server/file.h | 5 +++-- server/named_pipe.c | 20 +++----------------- 5 files changed, 52 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb6099b01df30a7bb551…

1 0

Alexandre Julliard : server: Call the satisfied methods after removing the thread wait.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: e0760ce933c4216bdb388a832be6792dccd7784c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0760ce933c4216bdb388a832… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 28 12:23:00 2017 +0200 server: Call the satisfied methods after removing the thread wait. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/server/thread.c b/server/thread.c index 10a5bf1..70f5f28 100644 --- a/server/thread.c +++ b/server/thread.c @@ -583,7 +583,7 @@ void make_wait_abandoned( struct wait_queue_entry *entry ) } /* finish waiting */ -static void end_wait( struct thread *thread ) +static unsigned int end_wait( struct thread *thread, unsigned int status ) { struct thread_wait *wait = thread->wait; struct wait_queue_entry *entry; @@ -591,10 +591,26 @@ static void end_wait( struct thread *thread ) assert( wait ); thread->wait = wait->next; + + if (status < wait->count) /* wait satisfied, tell it to the objects */ + { + if (wait->select == SELECT_WAIT_ALL) + { + for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) + entry->obj->ops->satisfied( entry->obj, entry ); + } + else + { + entry = wait->queues + status; + entry->obj->ops->satisfied( entry->obj, entry ); + } + if (wait->abandoned) status += STATUS_ABANDONED_WAIT_0; + } for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) entry->obj->ops->remove_queue( entry->obj, entry ); if (wait->user) remove_timeout_user( wait->user ); free( wait ); + return status; } /* build the thread wait structure */ @@ -624,7 +640,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj if (!obj->ops->add_queue( obj, entry )) { wait->count = i; - end_wait( current ); + end_wait( current, get_error() ); return 0; } } @@ -672,25 +688,14 @@ static int check_wait( struct thread *thread ) * want to do something when signaled, even if others are not */ for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) not_ok |= !entry->obj->ops->signaled( entry->obj, entry ); - if (not_ok) goto other_checks; - /* Wait satisfied: tell it to all objects */ - for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) - entry->obj->ops->satisfied( entry->obj, entry ); - return wait->abandoned ? STATUS_ABANDONED_WAIT_0 : STATUS_WAIT_0; + if (!not_ok) return STATUS_WAIT_0; } else { for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) - { - if (!entry->obj->ops->signaled( entry->obj, entry )) continue; - /* Wait satisfied: tell it to the object */ - entry->obj->ops->satisfied( entry->obj, entry ); - if (wait->abandoned) i += STATUS_ABANDONED_WAIT_0; - return i; - } + if (entry->obj->ops->signaled( entry->obj, entry )) return i; } - other_checks: if ((wait->flags & SELECT_ALERTABLE) && !list_empty(&thread->user_apc)) return STATUS_USER_APC; if (wait->timeout <= current_time) return STATUS_TIMEOUT; return -1; @@ -728,8 +733,8 @@ int wake_thread( struct thread *thread ) if ((signaled = check_wait( thread )) == -1) break; cookie = thread->wait->cookie; + signaled = end_wait( thread, signaled ); if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); - end_wait( thread ); if (cookie && send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ { if (!count) count = -1; @@ -752,13 +757,9 @@ int wake_thread_queue_entry( struct wait_queue_entry *entry ) assert( wait->select != SELECT_WAIT_ALL ); - signaled = entry - wait->queues; - entry->obj->ops->satisfied( entry->obj, entry ); - if (wait->abandoned) signaled += STATUS_ABANDONED_WAIT_0; - cookie = wait->cookie; + signaled = end_wait( thread, entry - wait->queues ); if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); - end_wait( thread ); if (!cookie || send_thread_wakeup( thread, cookie, signaled ) != -1) wake_thread( thread ); /* check other waits too */ @@ -778,7 +779,7 @@ static void thread_timeout( void *ptr ) if (thread->suspend + thread->process->suspend > 0) return; /* suspended, ignore it */ if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); - end_wait( thread ); + end_wait( thread, STATUS_TIMEOUT ); assert( cookie ); if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return; @@ -836,7 +837,7 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c { if (!signal_object( select_op->signal_and_wait.signal )) { - end_wait( current ); + end_wait( current, get_error() ); return timeout; } /* check if we woke ourselves up */ @@ -863,8 +864,7 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c if ((ret = check_wait( current )) != -1) { /* condition is already satisfied */ - end_wait( current ); - set_error( ret ); + set_error( end_wait( current, ret )); return timeout; } @@ -874,7 +874,7 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c if (!(current->wait->user = add_timeout_user( current->wait->timeout, thread_timeout, current->wait ))) { - end_wait( current ); + end_wait( current, get_error() ); return timeout; } } @@ -1106,7 +1106,7 @@ void kill_thread( struct thread *thread, int violent_death ) thread->id, thread->exit_code ); if (thread->wait) { - while (thread->wait) end_wait( thread ); + while (thread->wait) end_wait( thread, STATUS_THREAD_IS_TERMINATING ); send_thread_wakeup( thread, 0, thread->exit_code ); /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0;

1 0

Alistair Leslie-Hughes : dmime: Add TRACE to IDirectMusicSegment8 QueryInterface.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: d5380f0d008ede8da5fdb403830c7345d93591ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5380f0d008ede8da5fdb4038… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 06:50:51 2017 +0000 dmime: Add TRACE to IDirectMusicSegment8 QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index dd07971..ad8561f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -46,6 +46,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegmen { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + *ret_iface = NULL; if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicSegment) ||

1 0

Alistair Leslie-Hughes : oledb32: Support DBTYPE_DBTIMESTAMP to DBTYPE_WSTR in DataConvert.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 70d54d8c67d757ade9a2d2209de44ff2c4ff078d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d54d8c67d757ade9a2d2209… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 02:10:56 2017 +0000 oledb32: Support DBTYPE_DBTIMESTAMP to DBTYPE_WSTR in DataConvert. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 19 +++++++++++++++ dlls/oledb32/tests/convert.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 91de291..7fa4c81 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -641,6 +641,25 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } } break; + case DBTYPE_DBTIMESTAMP: + { + WCHAR szBuff[64]; + static const WCHAR format1[] = { + '%','0','4','d','-','%','0','2','d','-','%','0','2','d',' ','%','0','2','d',':','%','0','2','d', + ':','%','0','2','d', 0}; + static const WCHAR format2[] = { + '%','0','4','d','-','%','0','2','d','-','%','0','2','d',' ','%','0','2','d',':','%','0','2','d', + ':','%','0','2','d','.','%','0','9','d', 0}; + DBTIMESTAMP *ts = (DBTIMESTAMP *)src; + + if(ts->fraction == 0) + wsprintfW(szBuff, format1, ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second); + else + wsprintfW(szBuff, format2, ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second, ts->fraction ); + *d = SysAllocString(szBuff); + hr = *d ? S_OK : E_OUTOFMEMORY; + break; + } case DBTYPE_VARIANT: VariantInit(&tmp); if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 813c72a..708471b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -955,6 +955,10 @@ static void test_converttobstr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const WCHAR tsW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR ts1W[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2','.','0','0','0','0','0','0','0','0','3',0}; + static const WCHAR ts2W[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2','.','0','0','0','0','0','0','2','0','0',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; VARIANT v; BSTR b; @@ -1016,6 +1020,32 @@ static void test_converttobstr(void) ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 33, "got %ld\n", dst_len); ok(dst == (void*)0x1234, "got %p\n", dst); + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_BSTR, 0, &dst_len, &ts, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(!lstrcmpW(tsW, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); + + dst_len = 0x1234; + ts.fraction = 3; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_BSTR, 0, &dst_len, &ts, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(!lstrcmpW(ts1W, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); + + dst_len = 0x1234; + ts.fraction = 200; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_BSTR, 0, &dst_len, &ts, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(!lstrcmpW(ts2W, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); } static void test_converttowstr(void) @@ -1032,6 +1062,10 @@ static void test_converttowstr(void) 'A','D','E','5','-','0','0','A','A','0','0','4','4','7','7','3','D','}',0}; static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 }; static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 }; + static const WCHAR tsW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR ts1W[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2','.','0','0','0','0','0','0','0','0','3',0}; + static const WCHAR ts2W[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2','.','0','0','0','0','0','0','2','0','0',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; BSTR b; VARIANT v; @@ -1413,7 +1447,28 @@ static void test_converttowstr(void) ok(dst_len == 4, "got %ld\n", dst_len); ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, 0, &dst_len, &ts, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 38, "got %ld\n", dst_len); + ok(!lstrcmpW(tsW, dst), "got %s\n", wine_dbgstr_w(dst)); + + dst_len = 0x1234; + ts.fraction = 3; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, 0, &dst_len, &ts, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 58, "got %ld\n", dst_len); + ok(!lstrcmpW(ts1W, dst), "got %s\n", wine_dbgstr_w(dst)); + dst_len = 0x1234; + ts.fraction = 200; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, 0, &dst_len, &ts, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 58, "got %ld\n", dst_len); + ok(!lstrcmpW(ts2W, dst), "got %s\n", wine_dbgstr_w(dst)); /* DBTYPE_BYTES to DBTYPE_*STR unpacks binary data into a hex string */ memcpy(src, hexpacked_w, sizeof(hexpacked_w));

1 0

Nikolay Sivov : d3drm: Store animation options.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 1f38c0b165da739e791bea9ed8ade4259c201128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f38c0b165da739e791bea9ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 17:36:33 2017 +0300 d3drm: Store animation options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 55 +++++++++++++++++++++++++++++++++------------- dlls/d3drm/tests/d3drm.c | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 802a171..e4ffd2b 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -214,6 +214,7 @@ struct d3drm_animation LONG ref; IDirect3DRM *d3drm; IDirect3DRMFrame3 *frame; + D3DRMANIMATIONOPTIONS options; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index c95c5df..79a3cb0 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3238,11 +3238,38 @@ static HRESULT WINAPI d3drm_animation1_GetClassName(IDirect3DRMAnimation *iface, return d3drm_animation2_GetClassName(&animation->IDirect3DRMAnimation2_iface, size, name); } +static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONOPTIONS options) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); + static const DWORD supported_options = D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION + | D3DRMANIMATION_SPLINEPOSITION | D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION; + + TRACE("iface %p, options %#x.\n", iface, options); + + if (!(options & supported_options)) + return D3DRMERR_BADVALUE; + + if ((options & (D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED)) == (D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED) || + (options & (D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION)) == + (D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION) || + (options & (D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION)) == + (D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION)) + { + return D3DRMERR_BADVALUE; + } + + animation->options = options; + + return D3DRM_OK; +} + static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D3DRMANIMATIONOPTIONS options) { - FIXME("iface %p, %#x.\n", iface, options); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, %#x.\n", iface, options); + + return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); } static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) @@ -3301,18 +3328,22 @@ static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DV return E_NOTIMPL; } -static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnimation *iface) +static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnimation2 *iface) { - FIXME("iface %p.\n", iface); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->options; } -static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONOPTIONS options) +static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnimation *iface) { - FIXME("iface %p, options %#x.\n", iface, options); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); } static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) @@ -3363,13 +3394,6 @@ static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3D return E_NOTIMPL; } -static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnimation2 *iface) -{ - FIXME("iface %p.\n", iface); - - return 0; -} - static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); @@ -3481,6 +3505,7 @@ HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM * object->IDirect3DRMAnimation2_iface.lpVtbl = &d3drm_animation2_vtbl; object->d3drm = d3drm; object->ref = 1; + object->options = D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION; d3drm_object_init(&object->obj, classname); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 051f8cb..9b166aa 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6706,6 +6706,7 @@ static void test_animation(void) { IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; + D3DRMANIMATIONOPTIONS options; IDirect3DRMObject *obj, *obj2; IDirect3DRMFrame3 *frame3; IDirect3DRMFrame *frame; @@ -6776,6 +6777,51 @@ static void test_animation(void) IDirect3DRMFrame3_Release(frame3); IDirect3DRMFrame_Release(frame); + /* Animation options. */ + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + /* Undefined mask value */ + hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + /* Ambiguous mask */ + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, 0); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 9c84b06524b62012c775d3f0a5b2b42ff0c35547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c84b06524b62012c775d3f0a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 28 09:48:23 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 284 +++++++++++++++++++++++---------------------------------------- 1 file changed, 102 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c84b06524b62012c775d…

1 0

Francois Gouget : testbot/WineRunTask: Always take a screenshot.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: tools Branch: master Commit: 36e720d046620ec65da53adf8ee1593b7bb3906a URL: http://source.winehq.org/git/tools.git/?a=commit;h=36e720d046620ec65da53adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 28 09:49:04 2017 +0200 testbot/WineRunTask: Always take a screenshot. Even if we were not able to send the test file. Maybe the screenshot will show a helpful Windows error message like "network connection lost". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 615d898..1663c10 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -64,7 +64,7 @@ sub TakeScreenshot($$) my ($VM, $FullScreenshotFileName) = @_; my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); - if (! defined($ErrMessage)) + if (!defined $ErrMessage) { my $OldUMask = umask(002); if (open(my $Screenshot, ">", $FullScreenshotFileName)) @@ -78,9 +78,9 @@ sub TakeScreenshot($$) } umask($OldUMask); } - else + elsif ($VM->IsPoweredOn()) { - Error "Can't capture screenshot: $ErrMessage\n"; + Error "Could not capture a screenshot: $ErrMessage\n"; } } @@ -222,6 +222,9 @@ sub WrapUpAndExit($;$$) my ($Status, $TestFailures, $Retry) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + Debug(Elapsed($Start), " Taking a screenshot\n"); + TakeScreenshot($VM, $FullScreenshotFileName); + my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -755,10 +758,6 @@ elsif (!defined $TAError) } $TA->Disconnect(); - -Debug(Elapsed($Start), " Taking a screenshot\n"); -TakeScreenshot($VM, $FullScreenshotFileName); - FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError);

1 0

Paul Gofman : d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 08df007e802dfa2845a5b4f33bbf8a04202258bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df007e802dfa2845a5b4f33… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:56 2017 +0300 d3dx9: Move transpose 'if' outside of the inner loop in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 25374a3..911ca79 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1141,7 +1141,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; unsigned int element, i, j, start_offset; - unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; enum pres_value_type param_type; @@ -1181,24 +1180,20 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. * All the supported types of parameters and table values have the same size. */ - for (i = 0; i < info.major_count; ++i) - { - for (j = 0; j < info.minor; ++j) - { - if (info.transpose) - param_offset = i + j * info.major; - else - param_offset = i * info.minor + j; - out[i * info.major_stride + j] = data[param_offset]; - } - } if (info.transpose) { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i + j * info.major]; + for (j = 0; j < info.minor_remainder; ++j) - { - param_offset = i + j * info.major; - out[i * info.major_stride + j] = data[param_offset]; - } + out[i * info.major_stride + j] = data[i + j * info.major]; + } + else + { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i * info.minor + j]; } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns;

1 0

Paul Gofman : d3dx9: Get rid of constant' s length checking for matrix in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 0029128464922a6d714fd33709b0a2e4a8c5eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029128464922a6d714fd3370… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:55 2017 +0300 d3dx9: Get rid of constant's length checking for matrix in set_constants(). When count in const_upload_info is calculated precisely (considering actual constant set length), boolean matrix setting fall in direct copy path, unless transpose is required. The case of incomplete last row for matrix should be handled in set_constants() for transposed boolean constant only. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3b06f66..25374a3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -269,6 +269,7 @@ struct const_upload_info unsigned int major_stride; unsigned int major_count; unsigned int count; + unsigned int minor_remainder; }; static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) @@ -1038,10 +1039,22 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_reg_components(table)); - info->major_count = min(info->major * info->major_stride, - get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; - info->count = info->major_count * info->minor; + + if (get_reg_components(table) == 1) + { + unsigned int const_length = get_offset_reg(table, const_set->register_count); + + info->major_stride = info->minor; + info->major_count = const_length / info->major_stride; + info->minor_remainder = const_length % info->major_stride; + } + else + { + info->major_stride = get_reg_components(table); + info->major_count = const_set->register_count; + info->minor_remainder = 0; + } + info->count = info->major_count * info->minor + info->minor_remainder; } static void pres_int_from_float(void *out, const void *in, unsigned int count) @@ -1172,16 +1185,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const { for (j = 0; j < info.minor; ++j) { - unsigned int offset; - - offset = i * info.major_stride + j; - if (get_reg_offset(table, offset) >= const_set->register_count) - break; if (info.transpose) param_offset = i + j * info.major; else param_offset = i * info.minor + j; - out[offset] = data[param_offset]; + out[i * info.major_stride + j] = data[param_offset]; + } + } + if (info.transpose) + { + for (j = 0; j < info.minor_remainder; ++j) + { + param_offset = i + j * info.major; + out[i * info.major_stride + j] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); @@ -1417,6 +1433,16 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(const_set.table, const_set.register_count) && info.count * sizeof(unsigned int) <= param->bytes; + if (info.minor_remainder && !const_set.direct_copy && !info.transpose) + FIXME("Incomplete last row for not transposed matrix which cannot be directly copied, parameter %s.\n", + debugstr_a(param->name)); + + if (info.major_count > info.major + || (info.major_count == info.major && info.minor_remainder)) + { + WARN("Constant dimensions exceed parameter size.\n"); + return D3DERR_INVALIDCALL; + } if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Remove redundant parameter size check in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ed7e27ad8db2c08afbf222d80ec0d6d093ad4498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7e27ad8db2c08afbf222d80… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:54 2017 +0300 d3dx9: Remove redundant parameter size check in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7ca0c8f..3b06f66 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1181,11 +1181,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const param_offset = i + j * info.major; else param_offset = i * info.minor + j; - if (param_offset * sizeof(unsigned int) >= param->bytes) - { - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); - break; - } out[offset] = data[param_offset]; } }

1 0

Nikolay Sivov : d3drm: Store animated frame pointer in animation object.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9b35d5c6d47d1956ff687c5f4440876e03266b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b35d5c6d47d1956ff687c5f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 11:17:11 2017 +0300 d3drm: Store animated frame pointer in animation object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 37 +++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f2a6131..802a171 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -213,6 +213,7 @@ struct d3drm_animation IDirect3DRMAnimation IDirect3DRMAnimation_iface; LONG ref; IDirect3DRM *d3drm; + IDirect3DRMFrame3 *frame; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5969b50..c95c5df 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3277,9 +3277,21 @@ static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3 static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + HRESULT hr = D3DRM_OK; - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (frame) + { + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&animation->frame); + if (SUCCEEDED(hr)) + IDirect3DRMFrame3_Release(animation->frame); + } + else + animation->frame = NULL; + + return hr; } static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3335,9 +3347,13 @@ static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + animation->frame = frame; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3DVALUE time) @@ -3356,9 +3372,18 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnima static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (!frame) + return D3DRMERR_BADVALUE; + + *frame = animation->frame; + if (*frame) + IDirect3DRMFrame3_AddRef(*frame); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff1aadd..051f8cb 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6707,6 +6707,8 @@ static void test_animation(void) IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; IDirect3DRMObject *obj, *obj2; + IDirect3DRMFrame3 *frame3; + IDirect3DRMFrame *frame; IDirect3DRM *d3drm1; HRESULT hr; @@ -6738,6 +6740,42 @@ static void test_animation(void) IDirect3DRMObject_Release(obj); IDirect3DRMObject_Release(obj2); + /* Set animated frame, get it back. */ + hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame); + ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame, 1); + hr = IDirect3DRMAnimation_SetFrame(animation, frame); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame, 1); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3); + ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr); + ok(frame3 != (void *)frame, "Unexpected interface pointer.\n"); + CHECK_REFCOUNT(frame, 2); + + IDirect3DRMFrame3_Release(frame3); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame3, 2); + hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame3, 2); + + IDirect3DRMFrame3_Release(frame3); + IDirect3DRMFrame_Release(frame); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Alistair Leslie-Hughes : dsound: Free MMDevice on Release.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a731eaa705dc844f484f4e8153e73ddb9dcade52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a731eaa705dc844f484f4e815… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 25 10:42:46 2017 +0000 dsound: Free MMDevice on Release. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e8c10a7..a8b20b1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -232,7 +232,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioRenderClient_Release(device->render); if(device->volume) IAudioStreamVolume_Release(device->volume); - + if(device->mmdevice) + IMMDevice_Release(device->mmdevice); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

Hugh McMaster : regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ec0043f0839d6a9b617858ce8512194805d5754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0043f0839d6a9b617858ce8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:37:12 2017 +0000 regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79213c6..fec6e3e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -486,6 +486,15 @@ static void test_basic_import(void) " 25,48,4f,4d,45,25,00\n\n"); verify_reg(hkey, "Wine16", REG_EXPAND_SZ, "%HOME%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\"); + lr = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", lr); + if (lr == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1021,6 +1030,11 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine30a"); verify_reg_nonexist(hkey, "Wine30b"); + 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"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 82d3be80948390c84d8528078eb3d6eadc349bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d3be80948390c84d8528078… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:33:11 2017 +0000 regedit/tests: Test whether a forward slash can be used as a concatenation marker. 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 f7334e4..79213c6 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1012,6 +1012,15 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Wine29a"); todo_wine verify_reg_nonexist(hkey, "Wine29b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine30a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine30b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine30a"); + verify_reg_nonexist(hkey, "Wine30b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 81fa51743605b34881047962f48651e06217fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fa51743605b34881047962f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:24 2017 +0000 regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c293f4a..f7334e4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1266,6 +1266,42 @@ static void test_comments(void) todo_wine verify_reg(hkey, "Wine28e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); verify_reg_nonexist(hkey, "Wine28f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + ";comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " ;comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + "#comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29c"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " #comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1394,6 +1430,15 @@ static void test_import_with_whitespace(void) "\t@\t=\tdword:\t00000008\t\n\n"); verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n\n" + " 63,61,74,\\\n\n\n" + " 65,6e,\\\n\n\n\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine10", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a9726d0b902e3d48b7c1c96029a2a7fe891f6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9726d0b902e3d48b7c1c9602… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:15 2017 +0000 regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ba372b4..c293f4a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1001,6 +1001,17 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine28e"); verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine29b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine29a"); + todo_wine verify_reg_nonexist(hkey, "Wine29b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a31f070adaf8e3ecd3c42e651054ac09a1d1fe58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31f070adaf8e3ecd3c42e651… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:08 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 706b987..ba372b4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -559,7 +559,7 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg_nonexist(hkey, "TestNoEndQuote"); @@ -961,6 +961,46 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27i"); todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n"); + verify_reg_nonexist(hkey, "Wine28a"); + verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n"); + verify_reg_nonexist(hkey, "Wine28b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n"); + verify_reg_nonexist(hkey, "Wine28c"); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + lr = RegDeleteValueW(hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine28d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n"); + verify_reg_nonexist(hkey, "Wine28e"); + verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: db9e4199e0c4de248a927df0d0f3577d00d5ce2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9e4199e0c4de248a927df0d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:59 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 88 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e2aea48..706b987 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -551,6 +551,7 @@ static void test_invalid_import(void) { LONG lr; HKEY hkey; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -873,6 +874,93 @@ static void test_invalid_import(void) lr = RegDeleteKeyA(hkey, "Subkey2"); todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine25a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine25b\"=\"Test value\"\n" + + "\"Wine25c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine25d\"=\"Test value\"\n" + + "\"Wine25e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine25f\"=\"Test value\"\n" + + "\"Wine25g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine25h\"=\"Test value\"\n" + + "\"Wine25i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine25j\"=\"Test value\"\n\n"); + verify_reg_nonexist(hkey, "Wine25a"); + verify_reg_nonexist(hkey, "Wine25b"); + verify_reg_nonexist(hkey, "Wine25c"); + todo_wine verify_reg_nonexist(hkey, "Wine25d"); + verify_reg_nonexist(hkey, "Wine25e"); + verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine25g"); + todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25i"); + todo_wine verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine26a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine26b\"=dword:00000008\n" + + "\"Wine26c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine26d\"=dword:00000008\n" + + "\"Wine26e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine26f\"=dword:00000008\n" + + "\"Wine26g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine26h\"=dword:00000008\n" + + "\"Wine26i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine26j\"=dword:00000008\n\n"); + verify_reg_nonexist(hkey, "Wine26a"); + verify_reg_nonexist(hkey, "Wine26b"); + verify_reg_nonexist(hkey, "Wine26c"); + todo_wine verify_reg_nonexist(hkey, "Wine26d"); + verify_reg_nonexist(hkey, "Wine26e"); + verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine26g"); + todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26i"); + todo_wine verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine27a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "\"Wine27b\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27c\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + ";comment\n" + "\"Wine27d\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27e\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "#comment\n" + "\"Wine27f\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27g\"=hex(2):25,48,4f,4d,45,25,5c,\\\n\n" + "\"Wine27h\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27i\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + "\"Wine27j\"=hex(2):25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine27a"); + verify_reg_nonexist(hkey, "Wine27b"); + verify_reg_nonexist(hkey, "Wine27c"); + todo_wine verify_reg_nonexist(hkey, "Wine27d"); + verify_reg_nonexist(hkey, "Wine27e"); + verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine27g"); + todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27i"); + todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 82263293f6a9362b4110e7eb26da4f84dd000764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82263293f6a9362b4110e7eb2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:50 2017 +0000 regedit/tests: Test line concatenation with a new registry key on the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79740c4..e2aea48 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -856,6 +856,23 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine23j"); verify_reg_nonexist(hkey, "Wine23k"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24a\"=hex(2):4c,69,6e,65,20,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n"); + verify_reg_nonexist(hkey, "Wine24a"); + verify_key_nonexist(hkey, "Subkey1"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24b\"=hex(2):4c,69,6e,65,20\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n"); + verify_reg_nonexist(hkey, "Wine24b"); + todo_wine verify_key(hkey, "Subkey2"); + + lr = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 6b36ce329d9d0a0118ef4f0e5fe375cb3fed9b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b36ce329d9d0a0118ef4f0e5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:41 2017 +0000 regedit/tests: Test backslashes with whitespace variations and comma placement. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 83fe725..79740c4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1089,6 +1089,27 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Wine27c"); verify_reg_nonexist(hkey, "Wine27d"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg(hkey, "Wine28a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28b"); + todo_wine verify_reg(hkey, "Wine28c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28d"); + todo_wine verify_reg(hkey, "Wine28e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28f"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 3d47e94f44817a58693678b72aa33166f38cd1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47e94f44817a58693678b72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:48 2017 +0000 reg/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9735f59..8d9dbfa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2073,6 +2073,22 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine verify_reg_nonexist(hkey, "Wine61b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3331,6 +3347,22 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine verify_reg_nonexist(hkey, "Wine61b"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 09b600cdaf01452b91055716532f9f8f6fb8d4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b600cdaf01452b910557165… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:40 2017 +0000 reg/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fea7403..9735f59 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2063,6 +2063,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(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,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, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3311,6 +3321,16 @@ 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(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,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, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test the effects of comments and new lines that appear between valid hex data lines.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: b5b1ed2c856a43e9c4201b9fc4cb7f7f4cb73eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b1ed2c856a43e9c4201b9fc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:31 2017 +0000 reg/tests: Test the effects of comments and new lines that appear between valid hex data lines. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 931e089..fea7403 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2013,6 +2013,56 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine59a"); todo_wine verify_reg_nonexist(hkey, "Wine59b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60a\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + ";comment\n" + " 65,6e,\\;comment\n" + " 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(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " ;comment\n" + " 65,6e,\\;comment\n" + " 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(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + "#comment\n" + " 65,6e,\\;comment\n" + " 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, "Wine60c"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " #comment\n" + " 65,6e,\\;comment\n" + " 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, "Wine60d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60e\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n\n" + " 63,61,74,\\\n\n\n" + " 65,6e,\\\n\n\n\n" + " 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(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3211,6 +3261,56 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine59a"); todo_wine verify_reg_nonexist(hkey, "Wine59b"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + ";comment\n" + " 65,00,6e,00,\\;comment\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(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " ;comment\n" + " 65,00,6e,00,\\;comment\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(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + "#comment\n" + " 65,00,6e,00,\\;comment\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, "Wine60c"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " #comment\n" + " 65,00,6e,00,\\;comment\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, "Wine60d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60e\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\\n\n" + " 63,00,61,00,74,00,\\\n\n\n" + " 65,00,6e,00,\\\n\n\n\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(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 2a992c0caae42f9502f64782f948ec032e72e3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a992c0caae42f9502f64782f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:22 2017 +0000 reg/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 49d810f..931e089 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2001,6 +2001,18 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine58e"); todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine59a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine59b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine59a"); + todo_wine verify_reg_nonexist(hkey, "Wine59b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3187,6 +3199,18 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine58e"); todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine59a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine59b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine59a"); + todo_wine verify_reg_nonexist(hkey, "Wine59b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 72ecfe55074b826632722e9b695a324e67a20cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ecfe55074b826632722e9b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:12 2017 +0000 reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0d69d44..49d810f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -892,7 +892,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT3\n\n" @@ -1953,6 +1953,54 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2002,7 +2050,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" @@ -3091,6 +3139,54 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "@=\"Default value 1\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "@=\"Default value 5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: c7ca2d81082cc28525f316d50d1af51306f9a888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca2d81082cc28525f316d50… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:03 2017 +0000 reg/tests: Test line concatenation with comments, new lines and comma variations before a new registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 46f7529..0d69d44 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1863,6 +1863,96 @@ static void test_import(void) err = RegDeleteKeyA(hkey, "Subkey2"); todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine55a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine55b\"=\"Test value\"\n" + + "\"Wine55c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine55d\"=\"Test value\"\n" + + "\"Wine55e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine55f\"=\"Test value\"\n" + + "\"Wine55g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine55h\"=\"Test value\"\n" + + "\"Wine55i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine55j\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine55a"); + todo_wine verify_reg_nonexist(hkey, "Wine55b"); + todo_wine verify_reg_nonexist(hkey, "Wine55c"); + todo_wine verify_reg_nonexist(hkey, "Wine55d"); + todo_wine verify_reg_nonexist(hkey, "Wine55e"); + todo_wine verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine55g"); + todo_wine verify_reg_nonexist(hkey, "Wine55h"); + todo_wine verify_reg_nonexist(hkey, "Wine55i"); + todo_wine verify_reg(hkey, "Wine55j", REG_SZ, "Test value", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine56a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine56b\"=dword:00000008\n" + + "\"Wine56c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine56d\"=dword:00000008\n" + + "\"Wine56e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine56f\"=dword:00000008\n" + + "\"Wine56g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine56h\"=dword:00000008\n" + + "\"Wine56i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine56j\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine56a"); + todo_wine verify_reg_nonexist(hkey, "Wine56b"); + todo_wine verify_reg_nonexist(hkey, "Wine56c"); + todo_wine verify_reg_nonexist(hkey, "Wine56d"); + todo_wine verify_reg_nonexist(hkey, "Wine56e"); + todo_wine verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine56g"); + todo_wine verify_reg_nonexist(hkey, "Wine56h"); + todo_wine verify_reg_nonexist(hkey, "Wine56i"); + todo_wine verify_reg(hkey, "Wine56j", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine57a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "\"Wine57b\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57c\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + ";comment\n" + "\"Wine57d\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57e\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "#comment\n" + "\"Wine57f\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57g\"=hex(2):25,48,4f,4d,45,25,5c,\\\n\n" + "\"Wine57h\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57i\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + "\"Wine57j\"=hex(2):25,50,41,54,48,25,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, "Wine57a"); + todo_wine verify_reg_nonexist(hkey, "Wine57b"); + todo_wine verify_reg_nonexist(hkey, "Wine57c"); + todo_wine verify_reg_nonexist(hkey, "Wine57d"); + todo_wine verify_reg_nonexist(hkey, "Wine57e"); + todo_wine verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine57g"); + todo_wine verify_reg_nonexist(hkey, "Wine57h"); + todo_wine verify_reg_nonexist(hkey, "Wine57i"); + todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2911,6 +3001,96 @@ static void test_unicode_import(void) err = RegDeleteKeyA(hkey, "Subkey2"); todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine55a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "\"Wine55b\"=\"Test value\"\n" + + "\"Wine55c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "\"Wine55d\"=\"Test value\"\n" + + "\"Wine55e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "\"Wine55f\"=\"Test value\"\n" + + "\"Wine55g\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "\"Wine55h\"=\"Test value\"\n" + + "\"Wine55i\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "\"Wine55j\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine55a"); + todo_wine verify_reg_nonexist(hkey, "Wine55b"); + todo_wine verify_reg_nonexist(hkey, "Wine55c"); + todo_wine verify_reg_nonexist(hkey, "Wine55d"); + todo_wine verify_reg_nonexist(hkey, "Wine55e"); + todo_wine verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine55g"); + todo_wine verify_reg_nonexist(hkey, "Wine55h"); + todo_wine verify_reg_nonexist(hkey, "Wine55i"); + todo_wine verify_reg(hkey, "Wine55j", REG_SZ, "Test value", 11, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine56a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "\"Wine56b\"=dword:00000008\n" + + "\"Wine56c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "\"Wine56d\"=dword:00000008\n" + + "\"Wine56e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "\"Wine56f\"=dword:00000008\n" + + "\"Wine56g\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "\"Wine56h\"=dword:00000008\n" + + "\"Wine56i\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "\"Wine56j\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine56a"); + todo_wine verify_reg_nonexist(hkey, "Wine56b"); + todo_wine verify_reg_nonexist(hkey, "Wine56c"); + todo_wine verify_reg_nonexist(hkey, "Wine56d"); + todo_wine verify_reg_nonexist(hkey, "Wine56e"); + todo_wine verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine56g"); + todo_wine verify_reg_nonexist(hkey, "Wine56h"); + todo_wine verify_reg_nonexist(hkey, "Wine56i"); + todo_wine verify_reg(hkey, "Wine56j", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine57a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + "\"Wine57b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + ";comment\n" + "\"Wine57d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + "#comment\n" + "\"Wine57f\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57g\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n\n" + "\"Wine57h\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57i\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + "\"Wine57j\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,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, "Wine57a"); + todo_wine verify_reg_nonexist(hkey, "Wine57b"); + todo_wine verify_reg_nonexist(hkey, "Wine57c"); + todo_wine verify_reg_nonexist(hkey, "Wine57d"); + todo_wine verify_reg_nonexist(hkey, "Wine57e"); + todo_wine verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine57g"); + todo_wine verify_reg_nonexist(hkey, "Wine57h"); + todo_wine verify_reg_nonexist(hkey, "Wine57i"); + todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 6731faa5adc85d7b1adddd9cc3664b335c815704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6731faa5adc85d7b1adddd9cc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:05:54 2017 +0000 reg/tests: Test line concatenation with a new registry key on the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5076ad1..46f7529 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1844,6 +1844,25 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); todo_wine verify_reg_nonexist(hkey, "Wine53f"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54a\"=hex(2):4c,69,6e,65,20,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54a"); + todo_wine verify_key_nonexist(hkey, "Subkey1"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54b\"=hex(2):4c,69,6e,65,20\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54b"); + todo_wine verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2873,6 +2892,25 @@ static void test_unicode_import(void) todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); todo_wine verify_reg_nonexist(hkey, "Wine53f"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54a"); + todo_wine verify_key_nonexist(hkey, "Subkey1"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54b"); + todo_wine verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 5e0d406120e00e8415df1fd789cfaac169f74065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0d406120e00e8415df1fd78… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:05:45 2017 +0000 reg/tests: Test backslashes with whitespace variations and comma placement. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6262635..5076ad1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1822,6 +1822,28 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2829,6 +2851,28 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53b\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00, \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53d\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00 \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53f\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,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(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alexandre Julliard : winetest: Don' t require a tag or email address when only running a few tests.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 8e3d381419319b32692086947aae97471aad460a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3d381419319b32692086947… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:23 2017 +0200 winetest: Don't require a tag or email address when only running a few tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c8ff102..bfac17b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1405,6 +1405,12 @@ int main( int argc, char *argv[] ) SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } + if (nb_filters && !exclude_tests) + { + run_tests( logname, outdir ); + exit(0); + } + while (!tag) { if (!interactive) report (R_FATAL, "Please specify a tag (-t option) if "

1 0

Alexandre Julliard : ws2_32/tests: Print IP addresses as unsigned.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 33a4d90138c10345e68a98c6af7460a77b28e2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a4d90138c10345e68a98c6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:10 2017 +0200 ws2_32/tests: Print IP addresses as unsigned. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 23464ac..f3ba11c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4757,7 +4757,7 @@ static void test_gethostbyname_hack(void) } ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, - "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + "gethostbyname(\"localhost\") returned %u.%u.%u.%u\n", he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); } @@ -4781,7 +4781,7 @@ static void test_gethostbyname_hack(void) if (he->h_addr_list[0][0] == 127) { ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, - "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + "gethostbyname(\"%s\") returned %u.%u.%u.%u not 127.12.34.56\n", name, he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); }

1 0

Alexandre Julliard : secur32/tests: Add some braces to silence a clang warning.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9d38b8ee6f85e3241b58619fed7bd89025201958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d38b8ee6f85e3241b58619fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 12:12:40 2017 +0200 secur32/tests: Add some braces to silence a clang warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d11cef7..254b668 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -574,7 +574,7 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; - SspiData client = {0}; + SspiData client = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; ULONG req_attr, ctxt_attr; TimeStamp ttl; @@ -794,7 +794,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; @@ -923,7 +923,7 @@ static void testSignSeal(void) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt;

1 0

Zebediah Figura : msi: Implement UI messages in MsiOpenPackage().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9032279c728186d81d4d965b769f7de7eaf634c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9032279c728186d81d4d965b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:02 2017 -0500 msi: Implement UI messages in MsiOpenPackage(). 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/msi.rc | 2 + dlls/msi/package.c | 53 +++++++++++++ dlls/msi/resource.h | 2 + dlls/msi/tests/format.c | 18 +++++ po/ar.po | 196 +++++++++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++++++++----------------------- po/es.po | 196 +++++++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++++++++----------------------- po/fi.po | 196 +++++++++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++++++++----------------------- po/hr.po | 196 +++++++++++++++++++++++++----------------------- po/hu.po | 196 +++++++++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 196 +++++++++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++++++++----------------------- po/zh_CN.po | 196 +++++++++++++++++++++++++----------------------- po/zh_TW.po | 196 +++++++++++++++++++++++++----------------------- 50 files changed, 4767 insertions(+), 4324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9032279c728186d81d4d9…

1 0

Zebediah Figura : msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: bcc4a0475491d7672ffbf4ec7376d1165ad1b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc4a0475491d7672ffbf4ec7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:01 2017 -0500 msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE. 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 | 29 +++++++++++++++++++++-------- dlls/msi/tests/format.c | 3 +++ dlls/msi/tests/package.c | 4 ++-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7c537d4..00a8283 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -352,6 +352,7 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); + MSI_ProcessMessage(NULL, INSTALLMESSAGE_TERMINATE, 0); } static UINT create_temp_property_table(MSIPACKAGE *package) @@ -1477,6 +1478,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("%s %p\n", debugstr_w(szPackage), pPackage); + MSI_ProcessMessage(NULL, INSTALLMESSAGE_INITIALIZE, 0); + localfile[0] = 0; if( szPackage[0] == '#' ) { @@ -1638,6 +1641,8 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &package->hdr ); } + else + MSI_ProcessMessage(NULL, INSTALLMESSAGE_TERMINATE, 0); return ret; } @@ -1787,13 +1792,17 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msi_free(template); } - res = MSI_FormatRecordW(package, record, message, &len); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) - return res; - len++; - message = msi_alloc(len * sizeof(WCHAR)); - if (!message) return ERROR_OUTOFMEMORY; - MSI_FormatRecordW(package, record, message, &len); + if (!package || !record) + message = NULL; + else { + res = MSI_FormatRecordW(package, record, message, &len); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) + return res; + len++; + message = msi_alloc(len * sizeof(WCHAR)); + if (!message) return ERROR_OUTOFMEMORY; + MSI_FormatRecordW(package, record, message, &len); + } /* convert it to ASCII */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); @@ -1821,7 +1830,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC rc = gUIHandlerA( gUIContext, eMessageType, msg ); } - if (!rc && package->log_file != INVALID_HANDLE_VALUE && + if (!rc && package && package->log_file != INVALID_HANDLE_VALUE && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) { DWORD written; @@ -1883,6 +1892,10 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, MSIPACKAGE *package = NULL; MSIRECORD *record = NULL; + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INITIALIZE || + (eMessageType & 0xff000000) == INSTALLMESSAGE_TERMINATE) + return -1; + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if( !package ) { diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index b035cfa..d86a252 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2782,6 +2782,9 @@ static void test_processmessage(void) todo_wine ok( r == IDOK, "expected IDOK, got %i\n", r); + r = MsiProcessMessage(package, INSTALLMESSAGE_INITIALIZE, hrec); + ok( r == -1, "expected -1, got %i\n", r); + MsiCloseHandle(hrec); MsiCloseHandle(package); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9934c00..a46bb20 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9384,7 +9384,7 @@ static void test_externalui_message(void) r = MsiOpenPackageA("nonexistent", &hpkg); ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", TRUE); + ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", FALSE); r = package_from_db(hdb, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -9408,7 +9408,7 @@ static void test_externalui_message(void) /* close the package */ MsiCloseHandle(hpkg); - ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE); CoUninitialize(); DeleteFileA(msifile);

1 0

Zebediah Figura : msi: Send the correct UI messages upon calling MsiDoAction().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a388906a1a963b77125dc0f184484c0993b9fb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a388906a1a963b77125dc0f18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:00 2017 -0500 msi: Send the correct UI messages upon calling MsiDoAction(). 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/action.c | 218 ++++++++++++++++++++++++----------------------- dlls/msi/msi.rc | 140 ++++++++++++++++++++++++++++++ dlls/msi/package.c | 73 +++++++++------- dlls/msi/resource.h | 140 ++++++++++++++++++++++++++++++ dlls/msi/tests/format.c | 1 + dlls/msi/tests/package.c | 2 +- 6 files changed, 437 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a388906a1a963b77125dc…

1 0

Zebediah Figura : msi/tests: Add tests for external UI callback.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 358ed0d8367338c05fdafa86fb322f04f0313e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358ed0d8367338c05fdafa86f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 27 00:05:34 2017 -0500 msi/tests: Add tests for external UI callback. 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/tests/package.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 240 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 146d1fc..1196412 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <assert.h> #include <stdio.h> #include <windows.h> #include <msidefs.h> @@ -841,18 +842,27 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) return ERROR_SUCCESS; } -static void create_test_file(const CHAR *name) +static void create_file_data(LPCSTR name, LPCSTR data) { HANDLE file; DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, strlen(data), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); } +static void create_test_file(const CHAR *name) +{ + create_file_data(name, name); +} + typedef struct _tagVS_VERSIONINFO { WORD wLength; @@ -9179,6 +9189,232 @@ static void test_externalui(void) DeleteFileA(msifile); } +struct externalui_message { + UINT message; + int field_count; + char field[4][100]; + int match[4]; /* should we test for a match */ + int optional; +}; + +static struct externalui_message *sequence; +static int sequence_count, sequence_size; + +static void add_message(const struct externalui_message *msg) +{ + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_count == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + + assert(sequence); + + sequence[sequence_count++] = *msg; +} + +static void flush_sequence(void) +{ + HeapFree(GetProcessHeap(), 0, sequence); + sequence = NULL; + sequence_count = sequence_size = 0; +} + +static void ok_sequence_(const struct externalui_message *expected, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct externalui_message end_of_sequence = {0}; + const struct externalui_message *actual; + int failcount = 0; + int i; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->field_count != actual->field_count) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", + context, expected->message, expected->field_count, actual->field_count); + failcount++; + } + + for (i = 0; i <= actual->field_count; i++) + { + if (expected->match[i] && strcmp(expected->field[i], actual->field[i])) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x field %d: expected \"%s\", got \"%s\"\n", + context, expected->message, i, expected->field[i], actual->field[i]); + failcount++; + } + } + + expected++; + actual++; + } + else + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg 0x%08x was expected, but got msg 0x%08x instead\n", + context, expected->message, actual->message); + failcount++; + if (todo) + goto done; + expected++; + actual++; + } + } + + if (expected->message || actual->message) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %08x - actual %08x\n", + context, expected->message, actual->message); + failcount++; + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + todo_wine + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + flush_sequence(); +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + +static const struct externalui_message empty_sequence[] = { + {0} +}; + +static const struct externalui_message openpackage_nonexistent_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static const struct externalui_message openpackage_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {1, 1, 1, 1}}, + {INSTALLMESSAGE_INFO|MB_ICONHAND, 0, {""}, {0}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "1", "", ""}, {0, 1, 0, 0}}, + {0} +}; + +static const struct externalui_message doaction_costinitialize_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "", ""}, {0, 1, 0, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message closehandle_sequence[] = { + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) +{ + struct externalui_message msg; + char buffer[100]; + DWORD length = 100; + int i; + + msg.message = message; + msg.field_count = MsiRecordGetFieldCount(hrecord); + for (i = 0; i <= msg.field_count; i++) + { + length = 100; + MsiRecordGetStringA(hrecord, i, buffer, &length); + memcpy(msg.field[i], buffer, length+1); + } + + add_message(&msg); + + return 1; +} + +static void test_externalui_message(void) +{ + /* test that events trigger the correct sequence of messages */ + + INSTALLUI_HANDLER_RECORD prev; + const struct externalui_message *sequence = NULL; + MSIHANDLE hdb, hpkg; + UINT r; + + r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS, &sequence, &prev); + + flush_sequence(); + + CoInitialize(NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d", r); + + r = MsiOpenPackageA(NULL, &hpkg); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE); + + r = MsiOpenPackageA("nonexistent", &hpkg); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); + ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", TRUE); + + r = package_from_db(hdb, &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage with valid db", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_custom_sequence, "MsiDoAction(\"custom\")", TRUE); + + /* close the package */ + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); + + CoUninitialize(); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9237,6 +9473,8 @@ START_TEST(package) test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); test_externalui(); + if (pMsiSetExternalUIRecord) + test_externalui_message(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Alistair Leslie-Hughes : oledb32: Support DB/DATE/TIME/ TIMESTAMP in GetConversionSize for W/STR.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9d11f0f9624b03c1148922180429cf43923567da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d11f0f9624b03c1148922180… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 26 00:48:29 2017 +0000 oledb32: Support DB/DATE/TIME/TIMESTAMP in GetConversionSize for W/STR. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 6 ++++ dlls/oledb32/tests/convert.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index d959f65..91de291 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1409,6 +1409,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, case DBTYPE_I8: case DBTYPE_UI8: case DBTYPE_R4: + case DBTYPE_DBDATE: + case DBTYPE_DBTIMESTAMP: + case DBTYPE_DBTIME: break; default: FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); @@ -1453,6 +1456,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, case DBTYPE_I8: case DBTYPE_UI8: case DBTYPE_R4: + case DBTYPE_DBDATE: + case DBTYPE_DBTIMESTAMP: + case DBTYPE_DBTIME: break; default: FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 82afb59..813c72a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2722,6 +2722,9 @@ static void test_getconversionsize(void) LONGLONG i8 = 202; DATE dbdate; DECIMAL dec; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIME dbtime; + DBDATE dbdate1; /* same way as CanConvert fails here */ dst_len = 0; @@ -2993,6 +2996,39 @@ static void test_getconversionsize(void) ok(dst_len == 110, "%ld\n", dst_len); dst_len = 0; + src_len = sizeof(ts); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, &src_len, &dst_len, &ts); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbtime); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_WSTR, &src_len, &dst_len, &dbtime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbdate1); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_WSTR, &src_len, &dst_len, &dbdate1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_WSTR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; src_len = sizeof(i4); hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_STR, &src_len, &dst_len, &i4); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3112,6 +3148,39 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_EMPTY, DBTYPE_STR, NULL, &dst_len, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(ts); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_STR, &src_len, &dst_len, &ts); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIMESTAMP, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbtime); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_STR, &src_len, &dst_len, &dbtime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBTIME, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + src_len = sizeof(dbdate1); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_STR, &src_len, &dst_len, &dbdate1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_DBDATE, DBTYPE_STR, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 110, "%ld\n", dst_len); } static void test_converttobytes(void)

1 0

Zebediah Figura : winedbg: Add support for printing SSE (XMM) registers.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ad79c1eed222f0c52b665dba4c2cd3d1e2787646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad79c1eed222f0c52b665dba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 14:48:15 2017 -0500 winedbg: Add support for printing SSE (XMM) registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 60 +++++++++++++++++++++++++++++++++++++++++++- programs/winedbg/be_x86_64.c | 17 +++++++++++++ programs/winedbg/debugger.h | 1 + programs/winedbg/types.c | 9 +++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 154d4e7..4d22708 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -33,6 +33,30 @@ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display); #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) +typedef struct DECLSPEC_ALIGN(16) _M128A { + ULONGLONG Low; + LONGLONG High; +} M128A, *PM128A; + +typedef struct _XMM_SAVE_AREA32 { + WORD ControlWord; /* 000 */ + WORD StatusWord; /* 002 */ + BYTE TagWord; /* 004 */ + BYTE Reserved1; /* 005 */ + WORD ErrorOpcode; /* 006 */ + DWORD ErrorOffset; /* 008 */ + WORD ErrorSelector; /* 00c */ + WORD Reserved2; /* 00e */ + DWORD DataOffset; /* 010 */ + WORD DataSelector; /* 014 */ + WORD Reserved3; /* 016 */ + DWORD MxCsr; /* 018 */ + DWORD MxCsr_Mask; /* 01c */ + M128A FloatRegisters[8]; /* 020 */ + M128A XmmRegisters[16]; /* 0a0 */ + BYTE Reserved4[96]; /* 1a0 */ +} XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; + static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD sel) { LDT_ENTRY le; @@ -129,6 +153,9 @@ static void be_i386_single_step(CONTEXT* ctx, BOOL enable) static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) { + static const char mxcsr_flags[16][4] = { "IE", "DE", "ZE", "OE", "UE", "PE", "DAZ", "IM", + "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; + XMM_SAVE_AREA32 *xmm_area; long double ST[8]; /* These are for floating regs */ int cnt; @@ -192,6 +219,29 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); } + + xmm_area = (XMM_SAVE_AREA32 *) &ctx->ExtendedRegisters; + + dbg_printf(" mxcsr: %04x (", xmm_area->MxCsr ); + for (cnt = 0; cnt < 16; cnt++) + if (xmm_area->MxCsr & (1 << cnt)) dbg_printf( " %s", mxcsr_flags[cnt] ); + dbg_printf(" )\n"); + + for (cnt = 0; cnt < 8; cnt++) + { + dbg_printf( " xmm%u: uint=%08x%08x%08x%08x", cnt, + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 3), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 2), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 1), + *((unsigned int *)&xmm_area->XmmRegisters[cnt] + 0)); + dbg_printf( " double={%g; %g}", *(double *)&xmm_area->XmmRegisters[cnt].Low, + *(double *)&xmm_area->XmmRegisters[cnt].High ); + dbg_printf( " float={%g; %g; %g; %g}\n", + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 0), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 1), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 2), + (double)*((float *)&xmm_area->XmmRegisters[cnt] + 3) ); + } dbg_printf("\n"); } @@ -295,6 +345,14 @@ static struct dbg_internal_var be_i386_ctx[] = {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[0])), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[1])), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[2])), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[3])), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[4])), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[5])), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[6])), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XMM_SAVE_AREA32, XmmRegisters[7])), dbg_itype_m128a}, {0, NULL, 0, dbg_itype_none} }; @@ -747,7 +805,7 @@ static int be_i386_adjust_pc_for_break(CONTEXT* ctx, BOOL way) static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG* ret) { - if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) return FALSE; memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ /* FIXME: this assumes that debuggee and debugger use the same diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index abb4140..280cdec 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSSTRUCT #define NONAMELESSUNION #include "debugger.h" @@ -245,6 +246,22 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm0), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm1), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm2), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm3), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm4), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm5), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm6), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm7), dbg_itype_m128a}, + {CV_AMD64_XMM8, "XMM8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm8), dbg_itype_m128a}, + {CV_AMD64_XMM8+1, "XMM9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm9), dbg_itype_m128a}, + {CV_AMD64_XMM8+2, "XMM10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm10), dbg_itype_m128a}, + {CV_AMD64_XMM8+3, "XMM11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm11), dbg_itype_m128a}, + {CV_AMD64_XMM8+4, "XMM12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm12), dbg_itype_m128a}, + {CV_AMD64_XMM8+5, "XMM13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm13), dbg_itype_m128a}, + {CV_AMD64_XMM8+6, "XMM14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm14), dbg_itype_m128a}, + {CV_AMD64_XMM8+7, "XMM15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm15), dbg_itype_m128a}, {0, NULL, 0, dbg_itype_none} }; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e8a4d73..a4ffd70 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -84,6 +84,7 @@ enum dbg_internal_types dbg_itype_astring, dbg_itype_ustring, dbg_itype_segptr, /* hack for segmented pointers */ + dbg_itype_m128a, /* 128-bit (XMM) registers */ dbg_itype_none = 0xffffffff }; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index f050db5..3268d7e 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -921,6 +921,15 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for long real\n", ti); return FALSE; } break; + case dbg_itype_m128a: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 16; break; + case TI_GET_BASETYPE: X(DWORD) = btUInt; break; + default: WINE_FIXME("unsupported %u for XMM register\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }

1 0

Zebediah Figura : winedbg: Add support for printing floating point registers.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 8314cdc45eeed61629688d0e841090b373e79dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8314cdc45eeed61629688d0e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 14:48:14 2017 -0500 winedbg: Add support for printing floating point registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 14 +++++++++++--- programs/winedbg/be_x86_64.c | 14 +++++++++++--- programs/winedbg/types.c | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 99e3b29..154d4e7 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -287,6 +287,14 @@ static struct dbg_internal_var be_i386_ctx[] = {CV_REG_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, {CV_REG_EIP, "EIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Eip), dbg_itype_unsigned_int}, {CV_REG_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, + {CV_REG_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, + {CV_REG_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, + {CV_REG_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, + {CV_REG_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, + {CV_REG_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, + {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, + {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, + {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -767,9 +775,9 @@ static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 17feb88..abb4140 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -237,6 +237,14 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, + {CV_AMD64_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[0]), dbg_itype_long_real}, + {CV_AMD64_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[1]), dbg_itype_long_real}, + {CV_AMD64_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[2]), dbg_itype_long_real}, + {CV_AMD64_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[3]), dbg_itype_long_real}, + {CV_AMD64_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[4]), dbg_itype_long_real}, + {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, + {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, + {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -631,9 +639,9 @@ static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 2df7572..f050db5 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -894,6 +894,33 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for seg-ptr\n", ti); return FALSE; } break; + case dbg_itype_short_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for short real\n", ti); return FALSE; + } + break; + case dbg_itype_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 8; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for real\n", ti); return FALSE; + } + break; + case dbg_itype_long_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 10; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for long real\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }

1 0

Dmitry Timoshkov : windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ad76bbec2264f6b759fb7c64e9e358aee7b2ad30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad76bbec2264f6b759fb7c64e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:30 2017 +0800 windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName. 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/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/metadata.c | 619 +++++++++++++++++++++++++++++++++++ po/ar.po | 480 ++++++++++++++++++++++++++- po/bg.po | 437 ++++++++++++++++++++++++- po/ca.po | 482 ++++++++++++++++++++++++++- po/cs.po | 478 ++++++++++++++++++++++++++- po/da.po | 482 ++++++++++++++++++++++++++- po/de.po | 482 ++++++++++++++++++++++++++- po/el.po | 422 +++++++++++++++++++++++- po/en.po | 402 ++++++++++++++++++++++- po/en_US.po | 402 ++++++++++++++++++++++- po/eo.po | 456 +++++++++++++++++++++++++- po/es.po | 482 ++++++++++++++++++++++++++- po/fa.po | 415 ++++++++++++++++++++++- po/fi.po | 482 ++++++++++++++++++++++++++- po/fr.po | 482 ++++++++++++++++++++++++++- po/he.po | 455 ++++++++++++++++++++++++- po/hi.po | 410 ++++++++++++++++++++++- po/hr.po | 476 ++++++++++++++++++++++++++- po/hu.po | 482 ++++++++++++++++++++++++++- po/it.po | 482 ++++++++++++++++++++++++++- po/ja.po | 482 ++++++++++++++++++++++++++- po/ko.po | 482 ++++++++++++++++++++++++++- po/lt.po | 482 ++++++++++++++++++++++++++- po/ml.po | 410 ++++++++++++++++++++++- po/nb_NO.po | 482 ++++++++++++++++++++++++++- po/nl.po | 482 ++++++++++++++++++++++++++- po/or.po | 410 ++++++++++++++++++++++- po/pa.po | 410 ++++++++++++++++++++++- po/pl.po | 482 ++++++++++++++++++++++++++- po/pt_BR.po | 482 ++++++++++++++++++++++++++- po/pt_PT.po | 482 ++++++++++++++++++++++++++- po/rm.po | 416 ++++++++++++++++++++++- po/ro.po | 479 ++++++++++++++++++++++++++- po/ru.po | 482 ++++++++++++++++++++++++++- po/sk.po | 450 ++++++++++++++++++++++++- po/sl.po | 482 ++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 443 ++++++++++++++++++++++++- po/sr_RS(a)latin.po | 458 +++++++++++++++++++++++++- po/sv.po | 482 ++++++++++++++++++++++++++- po/te.po | 410 ++++++++++++++++++++++- po/th.po | 423 +++++++++++++++++++++++- po/tr.po | 482 ++++++++++++++++++++++++++- po/uk.po | 480 ++++++++++++++++++++++++++- po/wa.po | 419 +++++++++++++++++++++++- po/wine.pot | 402 ++++++++++++++++++++++- po/zh_CN.po | 482 ++++++++++++++++++++++++++- po/zh_TW.po | 482 ++++++++++++++++++++++++++- 48 files changed, 21253 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad76bbec2264f6b759fb7…

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for IWICMetadataQueryReader.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: c092f1a45ab75eeda06f6fff26352c54d4ae25af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c092f1a45ab75eeda06f6fff2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:26 2017 +0800 windowscodecs: Add some tests for IWICMetadataQueryReader. 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/tests/metadata.c | 201 +++++++++++++++++++++++++++++++++++- 1 file changed, 197 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c092f1a45ab75eeda06f6…

1 0

Dmitry Timoshkov : windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 2271ba87132b588492175d89f532b147e4e8b358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271ba87132b588492175d89f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:23 2017 +0800 windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName. 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 | 490 ++++++++++++++++++++++++++++++++++++- include/propidl.idl | 2 + 2 files changed, 488 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2271ba87132b588492175…

1 0

Jeremy Newman : update to RSVP form for 2017
by Jeremy Newman 27 Jun '17

27 Jun '17

Module: website Branch: master Commit: b63e46bfc436d0d7aa628b74253bf1e5a225b5c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=b63e46bfc436d0d7aa628b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 27 10:05:30 2017 -0500 update to RSVP form for 2017 --- templates/en/wineconf/rsvp.template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 7df2564..5891b75 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,4 +1,3 @@ - - -<iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe> + +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf5eAdYjHyQg13cndWcQFTIS4Wym5fyjV0…" width="90%" height="1200" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>

1 0

Francois Gouget : testbot: Rerun the task in case of a TestBot error.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: tools Branch: master Commit: 8cce3d3bad2a581403ae2ee7814825b8db1a8eca URL: http://source.winehq.org/git/tools.git/?a=commit;h=8cce3d3bad2a581403ae2ee7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:00:44 2017 +0200 testbot: Rerun the task in case of a TestBot error. This improves the robustness in the face of network or virtualization errors. Set the $MaxTaskTries setting to configure the number of attempts. Note that this does not impact regular failures and thus flaky tests, these should be handled in TestLauncher. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 52 +++++++++++++++++++++++++++-------- testbot/bin/WineRunReconfig.pl | 57 +++++++++++++++++++++++++++++--------- testbot/bin/WineRunTask.pl | 58 +++++++++++++++++++++++++++------------ testbot/lib/WineTestBot/Config.pm | 8 ++++-- testbot/lib/WineTestBot/Tasks.pm | 6 ++++ 5 files changed, 138 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=8cce3d3bad2a581403ae…

1 0

Hugh McMaster : regedit/tests: Use the verify_key*() functions where possible.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 73af2479c7107f6157cabdd24dc1e0fe47fbbb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73af2479c7107f6157cabdd24… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:19 2017 +0000 regedit/tests: Use the verify_key*() functions where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bc2fe46..83fe725 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -550,7 +550,7 @@ static void test_basic_import_31(void) static void test_invalid_import(void) { LONG lr; - HKEY hkey, subkey; + HKEY hkey; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -725,14 +725,12 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n"); - lr = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + verify_key_nonexist(hkey, "Subkey1"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n"); - lr = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + verify_key_nonexist(hkey, "Subkey2"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f0e21863c9811407ce85d0ce99c155678f0d7933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e21863c9811407ce85d0ce9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:10 2017 +0000 regedit/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0cb2959..bc2fe46 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -160,8 +160,8 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam (value_name && *value_name) ? value_name : "(Default)", lr); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG lr; @@ -1256,13 +1256,13 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); - verify_key_exist(hkey, "Subkey1c "); + verify_key(hkey, "Subkey1c "); lr = RegDeleteKeyA(hkey, "Subkey1c "); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); - verify_key_exist(hkey, "Subkey1d\t"); + verify_key(hkey, "Subkey1d\t"); lr = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); @@ -1270,24 +1270,24 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); - verify_key_exist(hkey, "Subkey2a"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1299,8 +1299,8 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - verify_key_exist(hkey, "Subkey3a"); - verify_key_exist(hkey, "Subkey3b"); + verify_key(hkey, "Subkey3a"); + verify_key(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0

Hugh McMaster : reg/tests: Use the verify_key*() functions where possible.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: e8b260f02a6ced08dbb63b3b1d30171b82d1895d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b260f02a6ced08dbb63b3b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:01 2017 +0000 reg/tests: Use the verify_key*() functions where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1161914..6262635 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -120,7 +120,7 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke static void test_add(void) { - HKEY hkey, subkey; + HKEY hkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -134,8 +134,7 @@ static void test_add(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -167,18 +166,14 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); + verify_key(hkey, "keytest3"); + err = RegDeleteKeyA(hkey, "keytest3"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); + verify_key(hkey, "keytest4"); + err = RegDeleteKeyA(hkey, "keytest4"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ @@ -545,15 +540,13 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "foo"); - err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); - ok(err == ERROR_SUCCESS, "got %d\n", err); - RegCloseKey(hsubkey); + verify_key(hkey, "subkey"); + RegCloseKey(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -1435,15 +1428,13 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey1"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2441,15 +2432,13 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey1"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ceebbfc1ca75f002973c94bf955555f312efef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceebbfc1ca75f002973c94bf9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:52 2017 +0000 reg/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e23586c..1161914 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,8 +91,8 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -1643,14 +1643,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1659,28 +1659,28 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1694,8 +1694,8 @@ static void test_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" @@ -2649,14 +2649,14 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2665,28 +2665,28 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -2700,8 +2700,8 @@ static void test_unicode_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0

Hugh McMaster : reg/tests: Separate Unicode import tests from the combined import tests.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 22f57c788837df566d7563e915208c712ac43f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f57c788837df566d7563e91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:42 2017 +0000 reg/tests: Separate Unicode import tests from the combined import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba36d54..e23586c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1836,8 +1836,16 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); +} + +static void test_unicode_import(void) +{ + DWORD r, dword = 0x123, type, size; + HKEY hkey, subkey; + LONG err; + char buffer[8]; + BYTE hex[8]; - /* Test file contents - Unicode */ test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -2984,6 +2992,13 @@ static void test_import_with_whitespace(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); +} + +static void test_unicode_import_with_whitespace(void) +{ + HKEY hkey; + DWORD r, dword; + LONG err; test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -3139,5 +3154,7 @@ START_TEST(reg) test_query(); test_v_flags(); test_import(); + test_unicode_import(); test_import_with_whitespace(); + test_unicode_import_with_whitespace(); }

1 0

Hugh McMaster : regedit: Free the buffer and reset data information on error and after setting the value.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 758340a6e1bc045fa4a7ba06b6da8e94243ee871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758340a6e1bc045fa4a7ba06b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:16 2017 +0000 regedit: Free the buffer and reset data information on error and after setting the value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bc488d3..d6ea5c7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -758,6 +758,9 @@ static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -781,6 +784,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) invalid: HeapFree(GetProcessHeap(), 0, parser->data); parser->data = NULL; + parser->data_size = 0; set_state(parser, LINE_START); return line; @@ -807,6 +811,10 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -827,10 +835,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) parser->data, parser->data_size); if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - { HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - } + + parser->data = NULL; + parser->data_size = 0; if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE);

1 0

Jacek Caban : wininet: Return an error on redirect with no host name specified.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: cee99826b62b62acb7a8cf1ff32d27633c078e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee99826b62b62acb7a8cf1ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:50 2017 +0200 wininet: Return an error on redirect with no host name specified. Inspired by Michael Müller's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e0bc55d..02f6609 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4058,6 +4058,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) urlComponents.dwUrlPathLength = 1; if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + + if(!urlComponents.dwHostNameLength) + return ERROR_INTERNET_INVALID_URL; } INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a3a0980..a2890d3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5269,6 +5269,31 @@ static void test_redirect(int port) close_connection(); close_async_handle(req.session, 2); + trace("Test redirect to http URL with no host name...\n"); + + open_socket_request(port, &req); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: http:///nohost\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_INTERNET_INVALID_URL, "expected ERROR_INTERNET_INVALID_URL, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + skip_receive_notification_tests = FALSE; }

1 0

Jacek Caban : wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 61e28c01c60cfe27f13a957ef940c36ef827c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e28c01c60cfe27f13a957ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:35 2017 +0200 wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 17a1919..e0bc55d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4039,27 +4039,33 @@ static WCHAR *get_redirect_url(http_request_t *request) /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) +static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) { + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; http_session_t *session = request->session; - WCHAR *path; + size_t url_len = strlenW(url); - if(lpszUrl[0]=='/') + if(url[0] == '/') { /* if it's an absolute path, keep the same session info */ - path = heap_strdupW(lpszUrl); + urlComponents.lpszUrlPath = url; + urlComponents.dwUrlPathLength = url_len; } else { - URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; - BOOL custom_port = FALSE; - substr_t host; - urlComponents.dwHostNameLength = 1; urlComponents.dwUserNameLength = 1; urlComponents.dwUrlPathLength = 1; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + } + + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + url, (url_len + 1) * sizeof(WCHAR)); + + if(urlComponents.dwHostNameLength) { + BOOL custom_port = FALSE; + substr_t host; if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { @@ -4106,23 +4112,25 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - - path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); } + heap_free(request->path); request->path = NULL; - if (*path) + if(urlComponents.dwUrlPathLength) { DWORD needed = 1; HRESULT rc; WCHAR dummy = 0; + WCHAR *path; + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); + heap_free(path); if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); @@ -4130,8 +4138,6 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } } - heap_free(path); - /* Remove custom content-type/length headers on redirects. */ remove_header(request, szContent_Type, TRUE); remove_header(request, szContent_Length, TRUE); @@ -5040,8 +5046,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) { @@ -5238,8 +5242,6 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS)

1 0

Alexandre Julliard : wineandroid: Allow putting libraries in the native library directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 0a2aac8dcaf9a53ef3abbede35e45d7d232fc77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2aac8dcaf9a53ef3abbede3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:13:35 2017 +0200 wineandroid: Allow putting libraries in the native library directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++++++-- dlls/wineandroid.drv/build.gradle.in | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 295ecc4..6c6edd5 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -88,7 +88,7 @@ public class WineActivity extends Activity HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); - env.put( "LD_LIBRARY_PATH", libdir.toString() ); + env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale ); @@ -111,7 +111,14 @@ public class WineActivity extends Activity createProgressDialog( 0, "Setting up the Windows environment..." ); - System.load( libdir.toString() + "/libwine.so" ); + try + { + System.loadLibrary( "wine" ); + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.load( libdir.toString() + "/libwine.so" ); + } prefix.mkdirs(); runWine( cmdline, env ); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 8f02a12..53633b7 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -74,6 +74,7 @@ android { main.assets.srcDirs = [ "assets" ] main.java.srcDirs = [ "@srcdir@" ] + main.jniLibs.srcDirs = [ "lib" ] main.java.excludes = [ "build" ] main.res.srcDirs = [ "res" ] main.manifest.srcFile "@srcdir@/AndroidManifest.xml"

1 0

Alexandre Julliard : wineandroid: Work around the Android N restriction on loading libhardware.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 9065fd259776f07dc9a31de9dedd464c4f51de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9065fd259776f07dc9a31de9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:44 2017 +0200 wineandroid: Work around the Android N restriction on loading libhardware. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 126 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5626ad0..47ef4a2 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <string.h> +#include <link.h> #include "windef.h" #include "winbase.h" @@ -492,6 +493,115 @@ DECL_FUNCPTR( hw_get_module ); struct gralloc_module_t *gralloc_module = NULL; +#ifndef DT_GNU_HASH +#define DT_GNU_HASH 0x6ffffef5 +#endif + +static unsigned int gnu_hash( const char *name ) +{ + unsigned int h = 5381; + while (*name) h = h * 33 + (unsigned char)*name++; + return h; +} + +static unsigned int hash_symbol( const char *name ) +{ + unsigned int hi, hash = 0; + while (*name) + { + hash = (hash << 4) + (unsigned char)*name++; + hi = hash & 0xf0000000; + hash ^= hi; + hash ^= hi >> 24; + } + return hash; +} + +static void *find_symbol( const struct dl_phdr_info* info, const char *var, int type ) +{ + const ElfW(Dyn) *dyn = NULL; + const ElfW(Phdr) *ph; + const ElfW(Sym) *symtab = NULL; + const Elf32_Word *hashtab = NULL; + const Elf32_Word *gnu_hashtab = NULL; + const char *strings = NULL; + Elf32_Word idx; + + for (ph = info->dlpi_phdr; ph < &info->dlpi_phdr[info->dlpi_phnum]; ++ph) + { + if (PT_DYNAMIC == ph->p_type) + { + dyn = (const ElfW(Dyn) *)(info->dlpi_addr + ph->p_vaddr); + break; + } + } + if (!dyn) return NULL; + + while (dyn->d_tag) + { + if (dyn->d_tag == DT_STRTAB) + strings = (const char*)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_SYMTAB) + symtab = (const ElfW(Sym) *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_HASH) + hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_GNU_HASH) + gnu_hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + dyn++; + } + + if (!symtab || !strings) return NULL; + + if (gnu_hashtab) /* new style hash table */ + { + const unsigned int hash = gnu_hash(var); + const Elf32_Word nbuckets = gnu_hashtab[0]; + const Elf32_Word symbias = gnu_hashtab[1]; + const Elf32_Word nwords = gnu_hashtab[2]; + const ElfW(Addr) *bitmask = (const ElfW(Addr) *)(gnu_hashtab + 4); + const Elf32_Word *buckets = (const Elf32_Word *)(bitmask + nwords); + const Elf32_Word *chains = buckets + nbuckets - symbias; + + if (!(idx = buckets[hash % nbuckets])) return NULL; + do + { + if ((chains[idx] & ~1u) == (hash & ~1u) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } while (!(chains[idx++] & 1u)); + } + else if (hashtab) /* old style hash table */ + { + const unsigned int hash = hash_symbol( var ); + const Elf32_Word nbuckets = hashtab[0]; + const Elf32_Word *buckets = hashtab + 2; + const Elf32_Word *chains = buckets + nbuckets; + + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) + { + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } + } + return NULL; +} + +static int enum_libs( struct dl_phdr_info* info, size_t size, void* data ) +{ + const char *p; + + if (!info->dlpi_name) return 0; + if (!(p = strrchr( info->dlpi_name, '/' ))) return 0; + if (strcmp( p, "/libhardware.so" )) return 0; + TRACE( "found libhardware at %p\n", info->dlpi_phdr ); + phw_get_module = find_symbol( info, "hw_get_module", STT_FUNC ); + return 1; +} + static void load_hardware_libs(void) { const struct hw_module_t *module; @@ -504,8 +614,20 @@ static void load_hardware_libs(void) } else { - ERR( "failed to load libhardware: %s\n", error ); - return; + /* Android >= N disallows loading libhardware, so we load libandroid (which imports + * libhardware), and then we can find libhardware in the list of loaded libraries. + */ + if (!wine_dlopen( "libandroid.so", RTLD_GLOBAL, error, sizeof(error) )) + { + ERR( "failed to load libandroid.so: %s\n", error ); + return; + } + dl_iterate_phdr( enum_libs, 0 ); + if (!phw_get_module) + { + ERR( "failed to find hw_get_module\n" ); + return; + } } if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0)

1 0

Alexandre Julliard : wineandroid: Fix handling of Caps Lock with non-alphabetic keys.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ab006d00854f694e63778ac891f9e19d13450c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab006d00854f694e63778ac89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:10 2017 +0200 wineandroid: Fix handling of Caps Lock with non-alphabetic keys. Spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index e6e1d02..3d459cd 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -757,7 +757,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR buf, int size, UINT flags, HKL hkl ) { WCHAR buffer[2]; - BOOL shift = (state[VK_SHIFT] & 0x80) || (state[VK_CAPITAL] & 0x01); + BOOL shift = state[VK_SHIFT] & 0x80; BOOL ctrl = state[VK_CONTROL] & 0x80; BOOL numlock = state[VK_NUMLOCK] & 0x01; @@ -798,7 +798,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, } if (virt >= 'A' && virt <= 'Z') { - buffer[0] = shift ? virt : virt + 'a' - 'A'; + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; break; } if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift)

1 0

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