July 2023 - Wine-Commits - list.winehq.org

Piotr Caban : winedump: Add initial support for dumping Windows NT Registry Files (REGF).
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: b80ea4153b096970514f86f385a37c9ceaceada2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b80ea4153b096970514f86f385a37c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 27 14:47:59 2023 +0200 winedump: Add initial support for dumping Windows NT Registry Files (REGF). --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/reg.c | 341 +++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 346 insertions(+), 1 deletion(-)

1 0

Alistair Leslie-Hughes : webservices: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 17841cd5293b5268800bc000bad3fbeccd9621a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/17841cd5293b5268800bc000bad3fb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:14:52 2023 +1000 webservices: Remove DECLSPEC_HIDDEN usage. --- dlls/webservices/sock.h | 8 +- dlls/webservices/webservices_private.h | 162 ++++++++++++++++----------------- 2 files changed, 85 insertions(+), 85 deletions(-)

1 0

Yuxuan Shui : mshtml: Implement window.MutationObserver with MutationObserver stub.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 02994bdd108b6bcdea3f630a56133f754f04f5ec URL: https://gitlab.winehq.org/wine/wine/-/commit/02994bdd108b6bcdea3f630a56133f… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Jul 24 09:51:27 2023 +0100 mshtml: Implement window.MutationObserver with MutationObserver stub. --- dlls/mshtml/htmlwindow.c | 33 +++- dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/mshtml_private_iface.idl | 14 ++ dlls/mshtml/mutation.c | 293 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 58 +++++++ 5 files changed, 402 insertions(+), 2 deletions(-)

1 0

Yuxuan Shui : mshtml: Add stubs for MutationObserver methods.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 724e54d54faac1f3fd8ce8fd536aa19308275894 URL: https://gitlab.winehq.org/wine/wine/-/commit/724e54d54faac1f3fd8ce8fd536aa1… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Jul 25 23:53:11 2023 +0100 mshtml: Add stubs for MutationObserver methods. --- dlls/mshtml/mshtml_private_iface.idl | 7 +++++++ dlls/mshtml/mutation.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 10 +++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 46bae638fa5..e4d97361ce1 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -21,6 +21,7 @@ #include <mshtmdid.h> import "ocidl.idl"; +import "mshtml.idl"; [ version(1.0), @@ -85,6 +86,12 @@ interface IWineMSHTMLConsole : IDispatch ] interface IWineMSHTMLMutationObserver : IDispatch { + [id(1)] + HRESULT disconnect(); + [id(2)] + HRESULT observe([in] IHTMLDOMNode *target, [in] IDispatch *options); + [id(3)] + HRESULT takeRecords([retval, out] IDispatch **records); } [ diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 09b2098bcb3..e6d080cff16 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1172,6 +1172,34 @@ static HRESULT WINAPI MutationObserver_Invoke(IWineMSHTMLMutationObserver *iface pDispParams, pVarResult, pExcepInfo, puArgErr); } +static HRESULT WINAPI MutationObserver_disconnect(IWineMSHTMLMutationObserver *iface) +{ + struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); + + FIXME("(%p), stub\n", This); + + return S_OK; +} + +static HRESULT WINAPI MutationObserver_observe(IWineMSHTMLMutationObserver *iface, IHTMLDOMNode *target, + IDispatch *options) +{ + struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); + + FIXME("(%p)->(%p %p), stub\n", This, target, options); + + return S_OK; +} + +static HRESULT WINAPI MutationObserver_takeRecords(IWineMSHTMLMutationObserver *iface, IDispatch **ret) +{ + struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); + + FIXME("(%p)->(%p), stub\n", This, ret); + + return E_NOTIMPL; +} + static const IWineMSHTMLMutationObserverVtbl WineMSHTMLMutationObserverVtbl = { MutationObserver_QueryInterface, MutationObserver_AddRef, @@ -1180,6 +1208,9 @@ static const IWineMSHTMLMutationObserverVtbl WineMSHTMLMutationObserverVtbl = { MutationObserver_GetTypeInfo, MutationObserver_GetIDsOfNames, MutationObserver_Invoke, + MutationObserver_disconnect, + MutationObserver_observe, + MutationObserver_takeRecords }; static const tid_t mutation_observer_iface_tids[] = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 35921ca565f..9f46de12466 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2909,7 +2909,15 @@ sync_test("MutationObserver", function() { } catch(e) { ok(false, "MutationObserver with extra args threw exception " + e.number); } -}) + + var mutation_observer = new MutationObserver(function() {}); + function test_exposed(prop) { + ok(prop in mutation_observer, prop + " not found in MutationObserver."); + } + test_exposed("observe"); + test_exposed("disconnect"); + test_exposed("takeRecords"); +}); async_test("postMessage", function() { var v = document.documentMode;

1 0

Paul Gofman : winhttp: Skip unexpected completions in netconn_wait_overlapped_result().
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 3b69baaee85a99d3091b6fffdad0d8b8a95df6ec URL: https://gitlab.winehq.org/wine/wine/-/commit/3b69baaee85a99d3091b6fffdad0d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 28 15:35:02 2023 -0600 winhttp: Skip unexpected completions in netconn_wait_overlapped_result(). --- dlls/winhttp/net.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 3a5847865bf..e46f2023fae 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -56,15 +56,16 @@ BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, D OVERLAPPED *completion_ovr; ULONG_PTR key; - if (!GetQueuedCompletionStatus( conn->port, len, &key, &completion_ovr, INFINITE )) + while (1) { - WARN( "GetQueuedCompletionStatus failed, err %lu.\n", GetLastError() ); - return FALSE; - } - if ((key != conn->socket && conn->socket != -1) || completion_ovr != (OVERLAPPED *)ovr) - { - ERR( "Unexpected completion key %Ix, overlapped %p.\n", key, completion_ovr ); - return FALSE; + if (!GetQueuedCompletionStatus( conn->port, len, &key, &completion_ovr, INFINITE )) + { + WARN( "GetQueuedCompletionStatus failed, err %lu.\n", GetLastError() ); + return FALSE; + } + if (completion_ovr == (OVERLAPPED *)ovr && (key == conn->socket || conn->socket == -1)) + break; + ERR( "Unexpected completion key %Ix, completion ovr %p, ovr %p.\n", key, completion_ovr, ovr ); } return TRUE; }

1 0

Alistair Leslie-Hughes : wbemprox: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 273c7318bdbd336f4a8bdf97ac902f5b187200d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/273c7318bdbd336f4a8bdf97ac902f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:14:52 2023 +1000 wbemprox: Remove DECLSPEC_HIDDEN usage. --- dlls/wbemprox/wbemprox_private.h | 146 +++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 73 deletions(-)

1 0

Paul Gofman : winhttp: Set FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on sockets.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 96b6bf6111e841c2a0791c5d99045a1ef7062f48 URL: https://gitlab.winehq.org/wine/wine/-/commit/96b6bf6111e841c2a0791c5d99045a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 28 15:22:42 2023 -0600 winhttp: Set FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on sockets. --- dlls/winhttp/net.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6eeb1cb5ac9..3a5847865bf 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -25,6 +25,7 @@ #include "ws2tcpip.h" #include "winhttp.h" #include "schannel.h" +#include "winternl.h" #include "wine/debug.h" #include "winhttp_private.h" @@ -223,6 +224,8 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock free( conn ); return ret; } + if (!SetFileCompletionNotificationModes( (HANDLE)(UINT_PTR)conn->socket, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS )) + ERR( "SetFileCompletionNotificationModes failed.\n" ); switch (conn->sockaddr.ss_family) {

1 0

Francois Gouget : ntdll/tests: Fix the basic file informations failure messages.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: abdca2f74b3256f8c24bbcabdbc39e7a22ec1c50 URL: https://gitlab.winehq.org/wine/wine/-/commit/abdca2f74b3256f8c24bbcabdbc39e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 31 08:56:18 2023 +0200 ntdll/tests: Fix the basic file informations failure messages. Set the messages to accurately reflect what is being tested, make them unique and trace bad values. --- dlls/ntdll/tests/file.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4d3a3fc0395..556ba351809 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1350,36 +1350,42 @@ static void test_file_basic_information(void) fbi2.LastWriteTime.QuadPart = -1; io.Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( io.Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", io.Status ); + ok ( res == STATUS_SUCCESS, "can't set -1 write time, NtSetInformationFile returned %x\n", res ); + ok ( io.Status == STATUS_SUCCESS, "can't set -1 write time, io.Status is %lx\n", io.Status ); memset(&fbi2, 0, sizeof(fbi2)); fbi2.LastAccessTime.QuadPart = 0x200deadcafebeef; io.Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof(fbi2), FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( io.Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", io.Status ); + ok ( res == STATUS_SUCCESS, "can't set access time, NtSetInformationFile returned %x\n", res ); + ok ( io.Status == STATUS_SUCCESS, "can't set access time, io.Status is %lx\n", io.Status ); res = pNtQueryInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get system attribute, NtQueryInformationFile returned %x\n", res ); - ok ( io.Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %lx\n", io.Status ); + ok ( res == STATUS_SUCCESS, "can't get access time, NtQueryInformationFile returned %x\n", res ); + ok ( io.Status == STATUS_SUCCESS, "can't get access time, io.Status is %lx\n", io.Status ); ok ( fbi2.LastAccessTime.QuadPart == fbi.LastAccessTime.QuadPart, - "large access time set/get does not match.\n" ); + "access time mismatch, set: %s get: %s\n", + wine_dbgstr_longlong(fbi2.LastAccessTime.QuadPart), + wine_dbgstr_longlong(fbi.LastAccessTime.QuadPart) ); memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + ok ( res == STATUS_SUCCESS, "can't get write time 1, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "write time mismatch, %s != %s\n", + wine_dbgstr_longlong(fbi2.LastWriteTime.QuadPart), + wine_dbgstr_longlong(fbi.LastWriteTime.QuadPart) ); memset(&fbi2, 0, sizeof(fbi2)); io.Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( io.Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", io.Status ); + ok ( res == STATUS_SUCCESS, "can't set nothing, NtSetInformationFile returned %x\n", res ); + ok ( io.Status == STATUS_SUCCESS, "can't set nothing, io.Status is %lx\n", io.Status ); memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + ok ( res == STATUS_SUCCESS, "can't get write time 2, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "write time changed, %s != %s\n", + wine_dbgstr_longlong(fbi2.LastWriteTime.QuadPart), + wine_dbgstr_longlong(fbi.LastWriteTime.QuadPart) ); /* Then SYSTEM */ /* Clear fbi to avoid setting times */ @@ -1392,7 +1398,7 @@ static void test_file_basic_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + ok ( res == STATUS_SUCCESS, "can't get system attribute\n"); ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); /* Then HIDDEN */ @@ -1400,12 +1406,12 @@ static void test_file_basic_information(void) fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN; io.Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); - ok ( io.Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", io.Status ); + ok ( res == STATUS_SUCCESS, "can't set hidden attribute, NtSetInformationFile returned %x\n", res ); + ok ( io.Status == STATUS_SUCCESS, "can't set hidden attribute, io.Status is %lx\n", io.Status ); memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + ok ( res == STATUS_SUCCESS, "can't get hidden attribute\n"); ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ @@ -1418,7 +1424,7 @@ static void test_file_basic_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); - ok ( res == STATUS_SUCCESS, "can't get attributes\n"); + ok ( res == STATUS_SUCCESS, "can't get normal attribute\n"); todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %lx not 0\n", fbi.FileAttributes ); CloseHandle( h );

1 0

Alistair Leslie-Hughes : msxml3: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 39ca507d7a5b00cca4a3e83dfd97603fa258dd25 URL: https://gitlab.winehq.org/wine/wine/-/commit/39ca507d7a5b00cca4a3e83dfd9760… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:19 2023 +1000 msxml3: Remove DECLSPEC_HIDDEN usage. --- dlls/msxml3/msxml_dispex.h | 24 ++--- dlls/msxml3/msxml_private.h | 212 ++++++++++++++++++++++---------------------- dlls/msxml3/xslpattern.h | 10 +-- dlls/msxml3/xslpattern.l | 2 +- 4 files changed, 124 insertions(+), 124 deletions(-)

1 0

Alistair Leslie-Hughes : shell32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 1447471af0c473515c62e23cd306ca0982a84011 URL: https://gitlab.winehq.org/wine/wine/-/commit/1447471af0c473515c62e23cd306ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:15:53 2023 +1000 shell32: Remove DECLSPEC_HIDDEN usage. --- dlls/shell32/cpanel.h | 4 +- dlls/shell32/debughlp.h | 6 +- dlls/shell32/pidl.h | 88 +++++++++++------------ dlls/shell32/shell32_main.h | 166 ++++++++++++++++++++++---------------------- dlls/shell32/shfldr.h | 28 ++++---- 5 files changed, 146 insertions(+), 146 deletions(-)

1 0