September 2019 - Wine-commits

Francois Gouget : testbot/WineRunReconfig: Restart the TestAgent server if it was updated.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: tools Branch: master Commit: 54fe37c9538d3a30804aec4fcc47e94dded828a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54fe37c9538d3a30804aec4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:04:27 2019 +0200 testbot/WineRunReconfig: Restart the TestAgent server if it was updated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 20 ++++++++++++++++++++ testbot/lib/Build/Utils.pm | 9 ++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0a5e606..edbafbc 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -487,6 +487,26 @@ if ($NewStatus eq "completed") FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$BaseName'"); } } + + if ($Summary->{"testagentd"}) + { + # Restart the TestAgent server from the new binary + # Note that the privileged TestAgent server is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + Debug(Elapsed($Start), " Upgrading testagentd from ". $TA->GetVersion() ."\n"); + $TA->Restart(undef); + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); + } + Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + } } $TA->Disconnect(); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9a45906..5014630 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -196,9 +196,8 @@ sub GetCPUCount() sub BuildNativeTestAgentd() { - # If testagentd already exists it's likely already running - # so don't rebuild it. - return 1 if (-x "$BinDir/build/testagentd"); + my $NativeTestAgentd = "$::RootDir/bin/build/testagentd"; + my $Before = GetMTime($NativeTestAgentd); InfoMsg "\nBuilding the native testagentd\n"; my $CPUCount = GetCPUCount(); @@ -210,6 +209,10 @@ sub BuildNativeTestAgentd() return !1; } + if ($Before != GetMTime($NativeTestAgentd)) + { + LogMsg "Updated testagentd\n"; + } return 1; }

1 0

Francois Gouget : testbot/SpecialJobs: Don't create jobs if given no VM.
by Alexandre Julliard 27 Sep '19

27 Sep '19

Module: tools Branch: master Commit: 8fd5b0f126a222e3b55a932d899571735a35af20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fd5b0f126a222e3b55a932… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:03:24 2019 +0200 testbot/SpecialJobs: Don't create jobs if given no VM. The jobs would have no task! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/SpecialJobs.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index d709e48..c313567 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -61,6 +61,7 @@ sub GetReconfigVMs($$) sub AddReconfigJob($$$) { my ($VMs, $VMKey, $VMType) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -138,6 +139,7 @@ sub GetWindowsTestVMs($$$) sub AddWindowsTestJob($$$$$) { my ($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -221,6 +223,7 @@ sub GetWineTestVMs($) sub AddWineTestJob($$) { my ($VMs, $VMKey) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs();

1 0

Jacek Caban : scrobj: Improve debug traces.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: aa503dac9c7505ee36b54d526626c71379156a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa503dac9c7505ee36b54d52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:55 2019 +0200 scrobj: Improve debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 944bff0de9..8aa1eeb793 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, } else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; } @@ -1325,6 +1325,8 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) { HRESULT hres; + TRACE("\n"); + if (factory->have_registration) { FIXME("duplicated registration element\n");

1 0

Jacek Caban : scrobj: Ignore processing instructions in scriptlet files.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 142ef8a7e8fd4cb5a7859286deb8a9c4726d8e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=142ef8a7e8fd4cb5a7859286… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:48 2019 +0200 scrobj: Ignore processing instructions in scriptlet files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 14 ++++++++++++-- dlls/scrobj/tests/scrobj.wsc | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 8aa1eeb793..ce5a3dedd1 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1261,8 +1261,18 @@ static const char *debugstr_xml_name(struct scriptlet_factory *factory) static HRESULT next_xml_node(struct scriptlet_factory *factory, XmlNodeType *node_type) { HRESULT hres; - do hres = IXmlReader_Read(factory->xml_reader, node_type); - while (hres == S_OK && *node_type == XmlNodeType_Whitespace); + for (;;) + { + hres = IXmlReader_Read(factory->xml_reader, node_type); + if (FAILED(hres)) break; + if (*node_type == XmlNodeType_Whitespace) continue; + if (*node_type == XmlNodeType_ProcessingInstruction) + { + FIXME("Ignoring processing instruction\n"); + continue; + } + break; + } return hres; } diff --git a/dlls/scrobj/tests/scrobj.wsc b/dlls/scrobj/tests/scrobj.wsc index 4cc4224dd7..fe32901138 100644 --- a/dlls/scrobj/tests/scrobj.wsc +++ b/dlls/scrobj/tests/scrobj.wsc @@ -4,7 +4,9 @@ </registration> <public> <method name="vbAddOne"> - <PARAMETER name="n"></PARAMETER> + <PARAMETER name="n"> + <?pi xxx="yyy"?> + </PARAMETER> </method> <method name="jsAddTwo" /> <method name="wtTest">

1 0

Sven Baars : httpapi: Fix a memory leak (Valgrind).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: bbd1e80d8176c751a69ed6962c138176c0b9f5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd1e80d8176c751a69ed696… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:25 2019 +0200 httpapi: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 0d6895b998..03511d6c9f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -230,6 +230,7 @@ static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) ret = GetLastError(); CloseHandle(ovl.hEvent); + heap_free(params); return ret; }

1 0

Sven Baars : httpapi/tests: Initialize response_buffer to 0 (Valgrind).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: a1953e4e2cc9ef51b315c3d7c3543944368268ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1953e4e2cc9ef51b315c3d7… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:26 2019 +0200 httpapi/tests: Initialize response_buffer to 0 (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5da7101417..b19a590147 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -614,6 +614,8 @@ static void test_v1_entity_body(void) ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, NULL, NULL); ok(!ret, "Got error %u.\n", ret); + memset(response_buffer, 0, sizeof(response_buffer)); + ret = recv(s, response_buffer, sizeof(response_buffer), 0); ok(ret > 0, "recv() failed.\n"); if (winetest_debug > 1)

1 0

Sven Baars : httpapi/tests: Cancel a pending receive request (Valgrind).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: fea609c0d085d2f4c362ff63952ae8459b959be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea609c0d085d2f4c362ff63… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:27 2019 +0200 httpapi/tests: Cancel a pending receive request (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b19a590147..abc5c95f0c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -534,6 +534,8 @@ static void test_v1_short_buffer(void) ok(!ret, "Got error %u.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + CancelIoEx(queue, &ovl); + ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); closesocket(s);

1 0

Zebediah Figura : ntdll: Implement NtQueryInformationFile(FileAttributeTagInformation).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: d1a259d1a6367133b4062fdcbfc1cc1d1b235357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a259d1a6367133b4062fdc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 13:34:33 2019 -0500 ntdll: Implement NtQueryInformationFile(FileAttributeTagInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47813 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 11 ++++++++++- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cd1775a98c..655dcb2eaf 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2253,7 +2253,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileQuotaInformation */ 0, /* FileReparsePointInformation */ sizeof(FILE_NETWORK_OPEN_INFORMATION), /* FileNetworkOpenInformation */ - 0, /* FileAttributeTagInformation */ + sizeof(FILE_ATTRIBUTE_TAG_INFORMATION), /* FileAttributeTagInformation */ 0, /* FileTrackingInformation */ 0, /* FileIdBothDirectoryInformation */ 0, /* FileIdFullDirectoryInformation */ @@ -2471,6 +2471,15 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, *(ULONGLONG *)&info->FileId = st.st_ino; } break; + case FileAttributeTagInformation: + if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + else + { + FILE_ATTRIBUTE_TAG_INFORMATION *info = ptr; + info->FileAttributes = attr; + info->ReparseTag = 0; /* FIXME */ + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31fc7ae7b0..539ce44e0a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3673,6 +3673,52 @@ static void test_file_access_information(void) CloseHandle( h ); } +static void test_file_attribute_tag_information(void) +{ + FILE_ATTRIBUTE_TAG_INFORMATION info; + FILE_BASIC_INFORMATION fbi = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE h; + + if (!(h = create_temp_file(0))) return; + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAttributeTagInformation ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + + status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + info.FileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + fbi.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + status = pNtSetInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN; + status = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + CloseHandle( h ); +} + static void test_file_mode(void) { UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; @@ -4917,6 +4963,7 @@ START_TEST(file) test_file_completion_information(); test_file_id_information(); test_file_access_information(); + test_file_attribute_tag_information(); test_file_mode(); test_file_readonly_access(); test_query_volume_information_file();

1 0

Zebediah Figura : kernelbase: Implement GetFileInformationByHandleEx(FileAttributeTagInfo).
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 1669956966fd1af9e8195576089ef9af3368be72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1669956966fd1af9e8195576… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 13:34:34 2019 -0500 kernelbase: Implement GetFileInformationByHandleEx(FileAttributeTagInfo). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47813 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 74d166b6b9..7a6f843f43 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1534,7 +1534,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ { case FileStreamInfo: case FileCompressionInfo: - case FileAttributeTagInfo: case FileRemoteProtocolInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: @@ -1546,6 +1545,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileAttributeTagInfo: + status = NtQueryInformationFile( handle, &io, info, size, FileAttributeTagInformation ); + break; + case FileBasicInfo: status = NtQueryInformationFile( handle, &io, info, size, FileBasicInformation ); break;

1 0

Ken Thomases : include: Always generate CFI directives on macOS.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: wine Branch: master Commit: 021c5054f6c9eb6773ef99cfaac0fb8c48beea97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021c5054f6c9eb6773ef99cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 13:38:16 2019 -0500 include: Always generate CFI directives on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47736 Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 01dfdb1deb..8c664476ef 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,7 +33,7 @@ # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif -#ifdef __GCC_HAVE_DWARF2_CFI_ASM +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0