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

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

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

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

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

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

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

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

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

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