July 2021 - Wine-commits - list.winehq.org

Zebediah Figura : server: Explicitly return whether a select request was immediately signaled.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: bedd92ca068434eea7cb6b445a3fcf21b51acbaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedd92ca068434eea7cb6b44… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 11:20:01 2021 -0500 server: Explicitly return whether a select request was immediately signaled. This fixes a regression introduced by 97afac469fbe012e22acc1f1045c88b1004a241f. If we make a request on an asynchronous device handle, and the IRP handler returns STATUS_PENDING, wait_async() will return STATUS_PENDING, as intended. However, if the async object is signaled before the user has a chance to call wait_async() [e.g. if get_next_device_request is called quickly enough], select will return STATUS_PENDING immediately, which causes server_select() to think the object is not signaled, and wait for a select reply forever. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51277 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51295 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 4 +++- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/thread.c | 32 ++++++++++++++++---------------- server/trace.c | 1 + 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 567f50d0ad7..1d82e806e17 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -603,6 +603,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT apc_call_t call; apc_result_t result; sigset_t old_set; + int signaled; memset( &result, 0, sizeof(result) ); @@ -628,6 +629,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } if (context) wine_server_set_reply( req, context, 2 * sizeof(*context) ); ret = server_call_unlocked( req ); + signaled = reply->signaled; apc_handle = reply->apc_handle; call = reply->call; } @@ -646,7 +648,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT mutex_unlock( mutex ); mutex = NULL; } - if (ret != STATUS_PENDING) break; + if (signaled) break; ret = wait_select_reply( &cookie ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 867f99a7627..4611f38c5c4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1313,8 +1313,8 @@ struct select_reply struct reply_header __header; apc_call_t call; obj_handle_t apc_handle; + int signaled; /* VARARG(contexts,contexts); */ - char __pad_60[4]; }; #define SELECT_ALERTABLE 1 #define SELECT_INTERRUPTIBLE 2 @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 724 +#define SERVER_PROTOCOL_VERSION 725 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 10402ca2db3..b4049eb90e7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1160,6 +1160,7 @@ typedef struct @REPLY apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ + int signaled; /* were the handles immediately signaled? */ VARARG(contexts,contexts); /* suspend context(s) */ @END #define SELECT_ALERTABLE 1 diff --git a/server/request.h b/server/request.h index a5490fd215a..18a6a2df3c7 100644 --- a/server/request.h +++ b/server/request.h @@ -896,6 +896,7 @@ C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 36 ); C_ASSERT( sizeof(struct select_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct select_reply, call) == 8 ); C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 56 ); +C_ASSERT( FIELD_OFFSET(struct select_reply, signaled) == 60 ); C_ASSERT( sizeof(struct select_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_event_request, manual_reset) == 16 ); diff --git a/server/thread.c b/server/thread.c index e0c520ee37c..e23412c6033 100644 --- a/server/thread.c +++ b/server/thread.c @@ -974,8 +974,8 @@ static int signal_object( obj_handle_t handle ) } /* select on a list of handles */ -static void select_on( const select_op_t *select_op, data_size_t op_size, client_ptr_t cookie, - int flags, abstime_t when ) +static int select_on( const select_op_t *select_op, data_size_t op_size, client_ptr_t cookie, + int flags, abstime_t when ) { int ret; unsigned int count; @@ -984,7 +984,7 @@ static void select_on( const select_op_t *select_op, data_size_t op_size, client switch (select_op->op) { case SELECT_NONE: - if (!wait_on( select_op, 0, NULL, flags, when )) return; + if (!wait_on( select_op, 0, NULL, flags, when )) return 1; break; case SELECT_WAIT: @@ -993,24 +993,24 @@ static void select_on( const select_op_t *select_op, data_size_t op_size, client if (op_size < offsetof( select_op_t, wait.handles ) || count > MAXIMUM_WAIT_OBJECTS) { set_error( STATUS_INVALID_PARAMETER ); - return; + return 1; } if (!wait_on_handles( select_op, count, select_op->wait.handles, flags, when )) - return; + return 1; break; case SELECT_SIGNAL_AND_WAIT: if (!wait_on_handles( select_op, 1, &select_op->signal_and_wait.wait, flags, when )) - return; + return 1; if (select_op->signal_and_wait.signal) { if (!signal_object( select_op->signal_and_wait.signal )) { end_wait( current, get_error() ); - return; + return 1; } /* check if we woke ourselves up */ - if (!current->wait) return; + if (!current->wait) return 1; } break; @@ -1018,23 +1018,23 @@ static void select_on( const select_op_t *select_op, data_size_t op_size, client case SELECT_KEYED_EVENT_RELEASE: object = (struct object *)get_keyed_event_obj( current->process, select_op->keyed_event.handle, select_op->op == SELECT_KEYED_EVENT_WAIT ? KEYEDEVENT_WAIT : KEYEDEVENT_WAKE ); - if (!object) return; + if (!object) return 1; ret = wait_on( select_op, 1, &object, flags, when ); release_object( object ); - if (!ret) return; + if (!ret) return 1; current->wait->key = select_op->keyed_event.key; break; default: set_error( STATUS_INVALID_PARAMETER ); - return; + return 1; } if ((ret = check_wait( current )) != -1) { /* condition is already satisfied */ set_error( end_wait( current, ret )); - return; + return 1; } /* now we need to wait */ @@ -1044,12 +1044,12 @@ static void select_on( const select_op_t *select_op, data_size_t op_size, client thread_timeout, current->wait ))) { end_wait( current, get_error() ); - return; + return 1; } } current->wait->cookie = cookie; set_error( STATUS_PENDING ); - return; + return 0; } /* attempt to wake threads sleeping on the object wait queue */ @@ -1664,7 +1664,7 @@ DECL_HANDLER(select) release_object( apc ); } - select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); + reply->signaled = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); if (get_error() == STATUS_USER_APC) { @@ -1684,7 +1684,7 @@ DECL_HANDLER(select) } release_object( apc ); } - else if (get_error() != STATUS_PENDING && get_reply_max_size() >= sizeof(context_t) && + else if (reply->signaled && get_reply_max_size() >= sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { ctx = current->context; diff --git a/server/trace.c b/server/trace.c index c65694ad644..447710e8f80 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1803,6 +1803,7 @@ static void dump_select_reply( const struct select_reply *req ) { dump_apc_call( " call=", &req->call ); fprintf( stderr, ", apc_handle=%04x", req->apc_handle ); + fprintf( stderr, ", signaled=%d", req->signaled ); dump_varargs_contexts( ", contexts=", cur_size ); }

1 0

Zebediah Figura : server: Remove special handling of STATUS_MORE_PROCESSING_REQUIRED.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: e2b9131bd9b019b6d6867ad741eb7e4f1916ca9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2b9131bd9b019b6d6867ad7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 11:20:02 2021 -0500 server: Remove special handling of STATUS_MORE_PROCESSING_REQUIRED. This was used to implement AcceptEx() using multiple APCs, and made obsolete by 0bbd3f66178abdc6ea15d30d2eb3b033367f8407. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/async.c b/server/async.c index 0425e4eddf7..dbd4859edc4 100644 --- a/server/async.c +++ b/server/async.c @@ -396,7 +396,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; - if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ if (async->data.apc) {

1 0

Francois Gouget : winetest: Report GetLastError() when CreateProcess() fails.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 37ea62f674401735adbbdd12cef1e5fbb551e513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ea62f674401735adbbdd12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 19:07:19 2021 +0200 winetest: Report GetLastError() when CreateProcess() fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 64a807b6c73..81c7de2a020 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -811,6 +811,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); + if (status == -2) status = -GetLastError(); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++;

1 0

Francois Gouget : ntdll/tests: TZinfo sometimes does not get a MUI string.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 4e9118047171f4ca608612c8cd428f3bb40df715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9118047171f4ca608612c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 18:09:37 2021 +0200 ntdll/tests: TZinfo sometimes does not get a MUI string. RtlQuery*TimeZoneInformation() should return a MUI string but there are rare cases where it does not in Windows 10 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 90737521a4d..ee683e9a0aa 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -234,10 +234,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryDynamicTimeZoneInformation(&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryDynamicTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -251,10 +253,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -262,10 +266,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName));

1 0

Francois Gouget : ntdll/tests: Improve the RtlWaitOnAddress() timeout checks.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: e72c71d27d67462480026edc2b756a66578db7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72c71d27d67462480026edc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 18:10:39 2021 +0200 ntdll/tests: Improve the RtlWaitOnAddress() timeout checks. GetTickCount()'s granularity represents 15% of the time we want to mesure, making it hard to not get failures. So use NtQuerySystemTime() instead since we already depend on it. Narrow down the acceptable range again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 82f8188d176..81be7de00f6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2266,10 +2266,10 @@ static void test_semaphore(void) static void test_wait_on_address(void) { - DWORD ticks; SIZE_T size; NTSTATUS status; - LARGE_INTEGER timeout; + LARGE_INTEGER start, end, timeout; + DWORD elapsed; LONG64 address, compare; if (!pRtlWaitOnAddress) @@ -2298,13 +2298,13 @@ static void test_wait_on_address(void) /* values match */ address = 0; compare = 0; - pNtQuerySystemTime(&timeout); - timeout.QuadPart += 100*10000; - ticks = GetTickCount(); + pNtQuerySystemTime(&start); + timeout.QuadPart = start.QuadPart + 100 * 10000; status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2314,12 +2314,13 @@ static void test_wait_on_address(void) compare = ~0; compare <<= size * 8; + pNtQuerySystemTime(&start); timeout.QuadPart = -100 * 10000; - ticks = GetTickCount(); status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Only count test driver load notify.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 7c7e77da9d4d133e992fbbde1f1f27b0c2c8fe5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7e77da9d4d133e992fbbde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 5 11:38:23 2021 +0200 ntoskrnl.exe/tests: Only count test driver load notify. Sometimes Windows loads other drivers when we don't expect it, and this causes spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..225699df402 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -313,8 +313,7 @@ static WCHAR test_load_image_name[MAX_PATH]; static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, IMAGE_INFO *image_info) { - if (test_load_image_notify_count == -1 - || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + if (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp")) { ++test_load_image_notify_count; test_image_info = *image_info; @@ -380,7 +379,7 @@ static void test_load_driver(void) || !wcscmp(test_load_image_name, full_name->Name.Buffer), "Expected image path name %ls, got %ls.\n", full_name->Name.Buffer, test_load_image_name); - test_load_image_notify_count = -1; + test_load_image_notify_count = 0; ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); @@ -395,7 +394,7 @@ static void test_load_driver(void) ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); - ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + ok(test_load_image_notify_count == 0, "Got unexpected test_load_image_notify_count %u.\n", test_load_image_notify_count); RtlFreeUnicodeString(&image_path); }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: ebb161243e9d3e6bba3ea5e484e3b706383a192c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb161243e9d3e6bba3ea5e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 5 10:44:51 2021 +0200 ntoskrnl.exe/tests: Sync test utils with wine/test.h. Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 ++-- dlls/ntoskrnl.exe/tests/driver.h | 10 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/utils.h | 290 ++++++++++++++++++++++++++------- 6 files changed, 258 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb161243e9d3e6bba3e…

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in.h before if_ether.h.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: cefe9f6b9132e5166a381dd2b085f1f80cf8150c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefe9f6b9132e5166a381dd2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 3 09:02:43 2021 +0200 nsiproxy: Include netinet/in.h before if_ether.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 38e6802e3bd..332df7159b9 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -38,6 +38,10 @@ #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif

1 0

Huw Davies : maintainers: Add a Network Store Interface section.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 151ae36abc1f5529d1e8931f9832c68a915400e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151ae36abc1f5529d1e8931f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 5 08:51:11 2021 +0100 maintainers: Add a Network Store Interface section. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bc8658e02..e85151e9bd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,9 +181,14 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -F: dlls/iphlpapi/ F: dlls/ws2_32/ +Network Store Interface +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/iphlpapi/ +F: dlls/nsi/ +F: dlls/nsiproxy.sys/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c

1 0

Francois Gouget : user32/tests: Use WineTest contexts to simplify test_mdi().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: ce0b7342c0eecc814ab75497bd111e1c02939f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0b7342c0eecc814ab75497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:40:06 2021 +0200 user32/tests: Use WineTest contexts to simplify test_mdi(). This also fixes the many ok() calls that were missing context information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1a9ba50df1..228395e0469 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2145,6 +2145,7 @@ static void test_mdi(void) SCROLLINFO si; BOOL ret, gotit; + winetest_push_context("style %#x", style[i]); mdi_client = CreateWindowExA(0, "mdiclient", NULL, WS_CHILD | style[i], 0, 0, rc.right, rc.bottom, @@ -2183,7 +2184,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2191,12 +2192,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2204,7 +2205,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); @@ -2213,7 +2214,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2221,12 +2222,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2234,7 +2235,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); gotit = FALSE; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) @@ -2261,7 +2262,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2270,12 +2271,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2284,11 +2285,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); DestroyMenu(child_menu); DestroyWindow(mdi_child); DestroyWindow(mdi_client); + winetest_pop_context(); } SetMenu(mdi_hwndMain, frame_menu);

1 0