October 2017 - Wine-commits

Jacek Caban : server: Return error for FSCTL_PIPE_PEEK calls on disconnected pipes.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 688c7a99d2ce9dd60d39efb60138bdebb4fceace URL: http://source.winehq.org/git/wine.git/?a=commit;h=688c7a99d2ce9dd60d39efb60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:17:35 2017 +0200 server: Return error for FSCTL_PIPE_PEEK calls on disconnected pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 37 +++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 6 ++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 84db14e..18ffa7a 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -209,6 +209,11 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); test_signaled(hnp); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ret = WaitNamedPipeA(PIPENAME, 2000); ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError()); @@ -1387,10 +1392,20 @@ static int test_DisconnectNamedPipe(void) ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL) == 0 && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile from disconnected pipe with bytes waiting\n"); + ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "DisconnectNamedPipe worked twice\n"); ret = WaitForSingleObject(hFile, 0); ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); + + ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); ok(CloseHandle(hFile), "CloseHandle\n"); } @@ -1502,6 +1517,11 @@ static void test_CloseHandle(void) ok(numbytes == 0, "expected 0, got %u\n", numbytes); numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL); + ok(ret, "PeekNamedPipe failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL); ok(ret, "ReadFile failed with %u\n", GetLastError()); @@ -1518,6 +1538,12 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL); + ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes); + SetLastError(0xdeadbeef); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); @@ -1601,6 +1627,11 @@ static void test_CloseHandle(void) ok(numbytes == 0, "expected 0, got %u\n", numbytes); numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL); + ok(ret, "PeekNamedPipe failed with %u\n", GetLastError()); + ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes); + + numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL); ok(ret, "ReadFile failed with %u\n", GetLastError()); @@ -1617,6 +1648,12 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + numbytes = 0xdeadbeef; + ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL); + ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n", + ret, GetLastError()); + ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes); + SetLastError(0xdeadbeef); ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); diff --git a/server/named_pipe.c b/server/named_pipe.c index d0ec38f..1ec1ff4 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -922,6 +922,12 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data ); + if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + { + set_error( STATUS_PIPE_BROKEN ); + return 0; + } + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) avail += message->iosb->in_size - message->read_pos;

1 0

Jacek Caban : server: Support FSCTL_PIPE_PEEK in byte mode.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: f68bea526f0edf5abab1e677aaa968dff1c2e51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68bea526f0edf5abab1e677a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 4 15:17:52 2017 +0200 server: Support FSCTL_PIPE_PEEK in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ec1ff4..2141f44 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -930,21 +930,33 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) avail += message->iosb->in_size - message->read_pos; + reply_size = min( reply_size, avail ); - if (avail) + if (avail && (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE)) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); message_length = message->iosb->in_size - message->read_pos; reply_size = min( reply_size, message_length ); } - else reply_size = 0; if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return 0; buffer->NamedPipeState = 0; /* FIXME */ buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ buffer->MessageLength = message_length; - if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); + + if (reply_size) + { + data_size_t write_pos = 0, writing; + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) + { + writing = min( reply_size - write_pos, message->iosb->in_size - message->read_pos ); + memcpy( buffer->Data + write_pos, (const char *)message->iosb->in_data + message->read_pos, + writing ); + write_pos += writing; + if (write_pos == reply_size) break; + } + } return 1; }

1 0

Julian Rüger : German translation for release 2.15
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 5d8e3374f3961beb2dfd279379f727348795fda0 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d8e3374f3961beb2dfd27… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:28:21 2017 +0200 German translation for release 2.15 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017082001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2017082001.xml b/news/de/2017082001.xml new file mode 100644 index 0000000..d642e53 --- /dev/null +++ b/news/de/2017082001.xml @@ -0,0 +1,15 @@ +<news> +<date>20. August 2017</date> +<title>Wine 2.15 freigegeben</title> +<body> + Die Entwicklungsversion 2.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für AES-Verschlüsselung.</li> + <li>Verbesserte Bezier-Unterstützung in Direct2D.</li> + <li>Chunked-Transfer-Verbesserungen in WinInet.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.16
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 040c68c57317e3f2a66da2fb472638757afd6b38 URL: http://source.winehq.org/git/website.git/?a=commit;h=040c68c57317e3f2a66da2… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:32:43 2017 +0200 German translation for release 2.16 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017090101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017090101.xml b/news/de/2017090101.xml new file mode 100644 index 0000000..2707612 --- /dev/null +++ b/news/de/2017090101.xml @@ -0,0 +1,17 @@ +<news> +<date>1. September 2017</date> +<title>Wine 2.16 freigegeben</title> +<body> + Die Entwicklungsversion 2.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für das Einfügen von Metafiles in RichEdit.</li> + <li>Bessere Unterstützung von PNG-Graustufenbildern.</li> + <li>Unterstützung der Sicherheitsfeatures beim Laden von Bibliotheken.</li> + <li>Bessere Verarbeitung von Transformationen in GdiPlus.</li> + <li>Rendering-Verbesserungen in DirectWrite.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.17
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 041ebc1e408027def4dcacf298abfb36aff4c601 URL: http://source.winehq.org/git/website.git/?a=commit;h=041ebc1e408027def4dcac… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:37:57 2017 +0200 German translation for release 2.17 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017091501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017091501.xml b/news/de/2017091501.xml new file mode 100644 index 0000000..4ed13d3 --- /dev/null +++ b/news/de/2017091501.xml @@ -0,0 +1,17 @@ +<news> +<date>15. September 2017</date> +<title>Wine 2.17 freigegeben</title> +<body> + Die Entwicklungsversion 2.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Unterstützung des Graustufenmodus in DirectWrite.</li> + <li>Per-Anwendung StartupWMClass in Desktopdateien.</li> + <li>Kompatibilitätsverbesserungen des virtuellen Speichers.</li> + <li>Verbesserte Palettenbehandlung in WindowsCodecs.</li> + <li>Verbesserungen für Antwortnachrichten in den WebServices.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.18
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 8270d9549e17768160f5be8b8a389f62a71879a8 URL: http://source.winehq.org/git/website.git/?a=commit;h=8270d9549e17768160f5be… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:42:05 2017 +0200 German translation for release 2.18 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017092901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017092901.xml b/news/de/2017092901.xml new file mode 100644 index 0000000..47eb416 --- /dev/null +++ b/news/de/2017092901.xml @@ -0,0 +1,16 @@ +<news> +<date>29. September 2017</date> +<title>Wine 2.18 freigegeben</title> +<body> + Die Entwicklungsversion 2.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Radiale Gradienten in Direct2D.</li> + <li>Unterstützung von asynchronen Nachrichten in den WebServices.</li> + <li>Verbesserungen an den Virtual-Memory-Write-Watches.</li> + <li>Kompatibilitätskorrekturen für FreeType 2.8.1.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Trace the revert time.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: tools Branch: master Commit: 860dfa0119265290122e1b49ced90a1d44950cc6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=860dfa0119265290122e1b49… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 4 12:32:12 2017 +0200 testbot: Trace the revert time. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/RevertVM.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index f84082f..00a8721 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -222,6 +222,6 @@ if (defined($ErrMessage)) FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; } -LogMsg "Revert of $VMKey completed\n"; +LogMsg "Revert of $VMKey completed in ", Elapsed($Start), " s\n"; exit 0;

1 0

Francois Gouget : testbot: Separate the Libvirt operations from the VM class.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: tools Branch: master Commit: c98fb895228afaddebcbf5cb0847ed146b362280 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c98fb895228afaddebcbf5cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 4 12:37:57 2017 +0200 testbot: Separate the Libvirt operations from the VM class. Libvirt operations can be slow and should be avoided in the single-threaded Engine server. Separating them from the VM class makes the issues more apparent. The new architecture also resets the Libvirt connection whenever a Libvirt error occurs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 9 +- testbot/bin/RevertVM.pl | 5 +- testbot/bin/WineRunBuild.pl | 4 +- testbot/bin/WineRunReconfig.pl | 8 +- testbot/bin/WineRunTask.pl | 9 +- testbot/lib/WineTestBot/Jobs.pm | 8 +- testbot/lib/WineTestBot/LibvirtDomain.pm | 336 +++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 295 ++------------------------- 8 files changed, 377 insertions(+), 297 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c98fb895228afaddebcb…

1 0

Hans Leidekker : webservices: Always create a copy of strings to insert in the dictionary.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 3076f5e3fbcf610320a37b6673a48553fe27b9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=3076f5e3fbcf610320a37b667… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:44 2017 +0200 webservices: Always create a copy of strings to insert in the dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index ef37095..92569fd 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1208,14 +1208,24 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo { struct dictionary *dict = state; HRESULT hr = S_OK; + BYTE *bytes; int index; - if ((index = find_string( dict, str->bytes, str->length, id )) == -1 || - (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) + if ((index = find_string( dict, str->bytes, str->length, id )) == -1) + { + *found = TRUE; + return S_OK; + } + + if (!(bytes = heap_alloc( str->length ))) return E_OUTOFMEMORY; + memcpy( bytes, str->bytes, str->length ); + if ((hr = insert_string( dict, bytes, str->length, index, id )) == S_OK) { *found = TRUE; return S_OK; } + heap_free( bytes ); + *found = FALSE; return hr; } @@ -1672,6 +1682,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic } if ((hr = insert_string( dict, bytes, size, index, NULL )) != S_OK) { + heap_free( bytes ); clear_dict( dict ); return hr; }

1 0

Hans Leidekker : webservices: Get rid of insert_string_cb.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: c80c45127e9027fca9d1e42111be72949398722c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80c45127e9027fca9d1e4211… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:45 2017 +0200 webservices: Get rid of insert_string_cb. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/string.c | 12 ------------ dlls/webservices/webservices_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 75e8b75..45a5512 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -152,18 +152,6 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, return S_OK; } -HRESULT CALLBACK insert_string_cb( void *state, const WS_XML_STRING *str, BOOL *found, ULONG *id, WS_ERROR *error ) -{ - struct dictionary *dict = state; - int index = find_string( dict, str->bytes, str->length, id ); - HRESULT hr = S_OK; - - assert( !dict->dict.isConst ); - if (index == -1 || (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) *found = TRUE; - else *found = FALSE; - return hr; -} - HRESULT add_xml_string( WS_XML_STRING *str ) { HRESULT hr = S_OK; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d30f7a3..f8cc6d9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -49,7 +49,6 @@ const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; -HRESULT CALLBACK insert_string_cb( void *, const WS_XML_STRING *, BOOL *, ULONG *, WS_ERROR * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; HRESULT writer_enable_lookup( WS_XML_WRITER * ) DECLSPEC_HIDDEN;

1 0