January 2018 - Wine-commits

Nikolay Sivov : ole2disp: Implement SafeArrayDestroyData().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: da3b5129a58309cb7435fc74a65bcbd9e4d7f366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3b5129a58309cb7435fc74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:55:39 2018 +0300 ole2disp: Implement SafeArrayDestroyData(). Based on patch by Vijay Kiran Kamuju. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 19 +++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 98aca3d..b981485 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -270,6 +270,25 @@ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyData [OLE2DISP.41] + */ +HRESULT WINAPI SafeArrayDestroyData16(SAFEARRAY16 *sa) +{ + TRACE("%p\n", sa); + + if (!sa) + return S_OK; + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + if (!(sa->fFeatures & FADF_STATIC)) + safearray_free(sa->pvData); + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 7b00ac3..57d2254 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -38,7 +38,7 @@ 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 -41 stub SAFEARRAYDESTROYDATA +41 pascal SafeArrayDestroyData(ptr) SafeArrayDestroyData16 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4 44 stub VARI2FROMR4

1 0

Stefan Dösinger : ws2_32/tests: Fix the printed value in a few ok lines.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 5c421e5fccad5e551bfe603db2dc27eee740c346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c421e5fccad5e551bfe603d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 21 18:44:17 2018 +0100 ws2_32/tests: Fix the printed value in a few ok lines. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631ae..e188724 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err);

1 0

André Hentschel : ntdll: Determine write fault based on failed instruction on ARM64.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: dfe813e34fe5389dc1af024ca58ab8e0df87f480 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe813e34fe5389dc1af024c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 21 20:22:55 2018 +0100 ntdll: Determine write fault based on failed instruction on ARM64. Based on code from Qemu. Reported by Stefan Dösinger. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a04fe93..57ec13a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -568,6 +568,23 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } +static inline DWORD is_write_fault( ucontext_t *context ) +{ + DWORD inst = *(DWORD *)PC_sig(context); + if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || + (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || + (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || + (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || + (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || + (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || + (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || + (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || + (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || + (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ + return EXCEPTION_WRITE_FAULT; + return EXCEPTION_READ_FAULT; +} + /********************************************************************** * segv_handler * @@ -604,8 +621,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - /* FIXME: Currently the kernel provides no way to determine if it's read or write */ - rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[0] = is_write_fault(context); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */

1 0

Huw Davies : ole32: Implement saving of view cache entries.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 47967b7c0871c409c49ca93b308335fdb20d684c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47967b7c0871c409c49ca93b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 08:54:11 2018 +0000 ole32: Implement saving of view cache entries. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 23 +++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 19 +++++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 4ba0826..e2ff928 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -506,7 +506,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) HRESULT hr; char format_name[256]; - if (clipformat < 0xc000) + if (clipformat == 0) + length = 0; + else if (clipformat < 0xc000) length = -1; else { @@ -515,8 +517,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) if (length) length++; } hr = IStream_Write(stream, &length, sizeof(length), NULL); - if (FAILED(hr)) + if (FAILED(hr) || clipformat == 0) return hr; + if (clipformat < 0xc000) { DWORD cf = clipformat; @@ -993,6 +996,19 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) return hr; } +static HRESULT save_view_cache(DataCacheEntry *entry, IStream *stream) +{ + HRESULT hr; + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &header, FIELD_OFFSET(PresentationDataHeader, unknown7), NULL); + + return hr; +} + static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, BOOL contents, IStream **stream) @@ -1037,6 +1053,9 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag case CF_ENHMETAFILE: hr = save_emf(cache_entry, contents, stream); break; + case 0: + hr = save_view_cache(cache_entry, stream); + break; default: FIXME("got unsupported clipboard format %x\n", cache_entry->fmtetc.cfFormat); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index fe45c6a..7fcb1aa 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -3986,13 +3986,18 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); ok(hr == S_OK, "unexpected %#x\n", hr); - if (!memcmp(name, "\2OlePres", 7)) + if (!memcmp(name, "\2OlePres", 8)) { + ULONG header_size = sizeof(header); + clipformat = read_clipformat(stream); - hr = IStream_Read(stream, &header, sizeof(header), &bytes); + if (clipformat == 0) /* view cache */ + header_size = FIELD_OFFSET(PresentationDataHeader, unknown7); + + hr = IStream_Read(stream, &header, header_size, &bytes); ok(hr == S_OK, "unexpected %#x\n", hr); - ok(bytes >= 24, "read %u bytes\n", bytes); + ok(bytes == header_size, "read %u bytes, expected %u\n", bytes, header_size); if (winetest_debug > 1) trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", @@ -4228,12 +4233,14 @@ static void test_data_cache_save_data(void) { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + { 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, }, - 3, 3, &CLSID_WineTest, + 4, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + &CLSID_WineTestOld, 4, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, - { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres003", 0, DVASPECT_DOCPRINT, 0, NULL, 0 } } } }, /* without setting data */

1 0

Huw Davies : oleaut32/tests: Remove some no longer needed test work-arounds.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 138f75f19f2ac9f774fb5a1e06fdd6db87dc23a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=138f75f19f2ac9f774fb5a1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:41 2018 +0000 oleaut32/tests: Remove some no longer needed test work-arounds. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 47 ++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=138f75f19f2ac9f774fb…

1 0

Huw Davies : oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: dd012af92a93fdf77ec648e422b4fb96369b42eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd012af92a93fdf77ec648e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:42 2018 +0000 oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 46 ++++++++++++++----------------------------- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 17 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd012af92a93fdf77ec6…

1 0

Hans Leidekker : dnsapi: Use default server list if passed in array is empty.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: dfe48bab07aee196284b2c02641d353eb390f08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe48bab07aee196284b2c02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:05 2018 +0100 dnsapi: Use default server list if passed in array is empty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a66db37..74b7096 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { int i; + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; if (addrs->AddrCount > MAXNS) { WARN( "too many servers: %d only using the first: %d\n", @@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser initialise_resolver(); _res.options |= dns_map_options( options ); - if (servers && (ret = dns_set_serverlist( servers ))) - return ret; + if ((ret = dns_set_serverlist( servers ))) return ret; ret = dns_do_query( name, type, options, result );

1 0

Francois Gouget : winetest: Remove unneeded colons in titles.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: tools Branch: master Commit: f62cc452a9165ad577465957b27250963a20bf4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f62cc452a9165ad57746595… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 22 03:02:02 2018 +0100 winetest: Remove unneeded colons in titles. Removing the colon makes the titles flow more naturally and improves the chance they are fully visible when multiple tabs are open. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index ac6c350..a894377 100755 --- a/winetest/gather +++ b/winetest/gather @@ -732,14 +732,14 @@ sub write_build_index_and_summary($) { $group_name = $group->{name}; $header_footer = build_header_footer($group->{reports}); - $title = "$short_date: $group_name results"; + $title = "$short_date $group_name results"; $filename = "index_$group_name.html"; } else { $group_name = "global"; $header_footer = build_header_footer(\@groups); - $title = "$short_date: Summary"; + $title = "$short_date Summary"; $filename = "index.html"; } @@ -773,7 +773,7 @@ EOF print OUT " | <a href=\"..\">index</a>\n"; print OUT "</div>\n"; print OUT "<div class=\"group\">\n"; - print OUT "<h1>$short_date: $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; + print OUT "<h1>$short_date $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } else @@ -784,7 +784,7 @@ EOF print OUT " | <a href=\"..\">index</a>"; print OUT "</div>\n"; print OUT "<div class=\"main\">\n"; - print OUT "<h1>$short_date: Summary for build $short_build</h1>\n"; + print OUT "<h1>$short_date Summary for build $short_build</h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; }

1 0

Francois Gouget : testbot: Try to reconnect to the database in case of error.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: tools Branch: master Commit: ab9ab58d52ec99e12b2098cf81578020a9776bc5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab9ab58d52ec99e12b2098c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 22 03:04:32 2018 +0100 testbot: Try to reconnect to the database in case of error. We set RaiseError in our DBI options so programming errors are easier to debug and have a better chance of being caught. However this means DBI::connect() will raise an exception if the database server is not running (like if it's being upgraded just at the wrong time). Furthermore the higher layers cannot meaningfully deal with a broken connection. So catch these exceptions and try reconnecting until successful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 4082a0a..0594951 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -53,9 +53,18 @@ sub GetDb($) } if (!defined $self->{Db}) { - $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}); + while (1) + { + # Protect this call so we can retry in case RaiseError is set + eval { $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}) }; + last if ($self->{Db}); + + # Prints errors on stderr like DBI normally does + $@ ||= "DBI::connect() returned undef without setting an error"; + print STDERR "$@\n"; + sleep(30); + } } - return $self->{Db}; }

1 0

Andrey Gusev : d3d8/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 8aac7a224db5721e0f3d9dc586f2fe24daf2f0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aac7a224db5721e0f3d9dc5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 15 19:55:04 2018 +0200 d3d8/tests: Use GetModuleHandleA instead of LoadLibraryA. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0..9efa943 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8494,7 +8494,7 @@ static void test_clip_planes_limits(void) START_TEST(device) { - HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + HMODULE d3d8_handle = GetModuleHandleA( "d3d8.dll" ); WNDCLASSA wc = {0}; IDirect3D8 *d3d8; DEVMODEW current_mode;

1 0