May 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : ws2_32/tests: Add tests for IOCTL_AFD_POLL.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 5c1be1dbaee660c7e4646276518de402ad174932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c1be1dbaee660c7e4646276… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 23:13:42 2021 -0500 ws2_32/tests: Add tests for IOCTL_AFD_POLL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 683 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 683 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c1be1dbaee660c7e464…

1 0

Alexandre Julliard : ntdll: Fill the Wow64 PEB and process parameters.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 78cbc269572b4a7e5e7cfcf4e063a023fcff2cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=78cbc269572b4a7e5e7cfcf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 16:21:58 2021 +0200 ntdll: Fill the Wow64 PEB and process parameters. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 - dlls/ntdll/tests/env.c | 24 ++++---- dlls/ntdll/tests/info.c | 38 +++++++++++++ dlls/ntdll/unix/env.c | 136 ++++++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/unix/virtual.c | 21 +------ include/winternl.h | 106 +++++++++++++++++++++++++++++++++++- 6 files changed, 281 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78cbc269572b4a7e5e7c…

1 0

Alexandre Julliard : ntdll: Pass an extra context arguments to APC functions on 64-bit.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 72ace07c6ff61c6fd3443acefe82f51ec711f193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ace07c6ff61c6fd3443ace… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 14:08:54 2021 +0200 ntdll: Pass an extra context arguments to APC functions on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- dlls/ntdll/signal_x86_64.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index dc6b072fa6c..1e2d51b9630 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -552,10 +552,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, - PNTAPCFUNC func ) +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*) ) { - func( ctx, arg1, arg2 ); + func( arg1, arg2, arg3, context ); NtContinue( context, TRUE ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 55975093174..19146aea40b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -597,10 +597,10 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI dispatch_apc( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, - PNTAPCFUNC func ) +void WINAPI dispatch_apc( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*) ) { - func( ctx, arg1, arg2 ); + func( arg1, arg2, arg3, context ); NtContinue( context, TRUE ); }

1 0

Alexandre Julliard : ntdll: Implement NtTestAlert().
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 8e01e8763bc45d1ecb71a56a38f93187d1a4daa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e01e8763bc45d1ecb71a56a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 13:15:16 2021 +0200 ntdll: Implement NtTestAlert(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 20 ++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/server.c | 14 ++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index bde3e15fe26..827f4c53aa0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -64,6 +64,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); +static NTSTATUS (WINAPI *pNtTestAlert)(void); #ifdef __i386__ @@ -2712,8 +2713,11 @@ static DWORD WINAPI thread_proc(LPVOID unused) return 0; } +static int apc_count; + static void CALLBACK user_apc(ULONG_PTR unused) { + apc_count++; } static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) @@ -2726,6 +2730,7 @@ static void test_QueueUserAPC(void) { HANDLE thread; DWORD tid, ret; + NTSTATUS status; thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); ok(thread != NULL, "CreateThread error %u\n", GetLastError()); @@ -2748,15 +2753,29 @@ static void test_QueueUserAPC(void) CloseHandle(thread); + apc_count = 0; ret = QueueUserAPC(user_apc, GetCurrentThread(), 0); ok(ret, "QueueUserAPC failed err %u\n", GetLastError()); + ok(!apc_count, "APC count %u\n", apc_count); ret = SleepEx( 100, TRUE ); ok( ret == WAIT_IO_COMPLETION, "SleepEx returned %u\n", ret); + ok(apc_count == 1, "APC count %u\n", apc_count); ret = pNtQueueApcThread( GetCurrentThread(), NULL, 0, 0, 0 ); ok( !ret, "got %#x\n", ret); ret = SleepEx( 100, TRUE ); ok( ret == WAIT_OBJECT_0, "SleepEx returned %u\n", ret); + + apc_count = 0; + ret = QueueUserAPC(user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed err %u\n", GetLastError()); + ok(!apc_count, "APC count %u\n", apc_count); + status = pNtTestAlert(); + ok(!status, "got %x\n", status); + ok(apc_count == 1, "APC count %u\n", apc_count); + status = pNtTestAlert(); + ok(!status, "got %x\n", status); + ok(apc_count == 1, "APC count %u\n", apc_count); } START_TEST(sync) @@ -2790,6 +2809,7 @@ START_TEST(sync) pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); + pNtTestAlert = (void *)GetProcAddress(hntdll, "NtTestAlert"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4eb7aec1aa5..c092e7a9d78 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -412,7 +412,7 @@ @ stdcall -syscall NtTerminateJobObject(long long) @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) -@ stub NtTestAlert +@ stdcall -syscall NtTestAlert() # @ stub NtTraceEvent # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @@ -1425,7 +1425,7 @@ @ stdcall -private -syscall ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread -@ stub ZwTestAlert +@ stdcall -private -syscall ZwTestAlert() NtTestAlert # @ stub ZwTraceEvent # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e30f2dd683d..c0cf13b3cb4 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -720,6 +720,20 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) } +/*********************************************************************** + * NtTestAlert (NTDLL.@) + */ +NTSTATUS WINAPI NtTestAlert(void) +{ + user_apc_t apc; + NTSTATUS status; + + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + if (status == STATUS_USER_APC) invoke_user_apc( NULL, &apc, STATUS_SUCCESS ); + return STATUS_SUCCESS; +} + + /*********************************************************************** * server_queue_process_apc */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5897e793b3e..0b7dde1b931 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1973,7 +1973,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) */ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, - NSTATUS status ) + NTSTATUS status ) { CONTEXT c;

1 0

Alexandre Julliard : ntdll: Pass the result status to call_user_apc_dispatcher().
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 1364b11fd49bbe21624a3ce1c8471b72886af2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1364b11fd49bbe21624a3ce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 13:04:24 2021 +0200 ntdll: Pass the result status to call_user_apc_dispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 8 ++++---- dlls/ntdll/unix/signal_arm.c | 24 ++++++++++++------------ dlls/ntdll/unix/signal_arm64.c | 24 ++++++++++++------------ dlls/ntdll/unix/signal_i386.c | 16 +++++++++------- dlls/ntdll/unix/signal_x86_64.c | 19 +++++++++++-------- dlls/ntdll/unix/unix_private.h | 7 ++++--- 6 files changed, 52 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1364b11fd49bbe21624a…

1 0

Jacek Caban : winepulse: Simplify IAudioStreamVolume::SetChannelVolume implementation.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 6a6296562f536ed10d221f0df43ef30bbd674cb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6296562f536ed10d221f0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:22:02 2021 +0200 winepulse: Simplify IAudioStreamVolume::SetChannelVolume implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cac169567ea..84ab5b6adec 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1472,22 +1472,22 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT hr; - float volumes[PA_CHANNELS_MAX]; TRACE("(%p)->(%d, %f)\n", This, index, level); if (level < 0.f || level > 1.f) return E_INVALIDARG; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; if (index >= This->channel_count) return E_INVALIDARG; - hr = AudioStreamVolume_GetAllVolumes(iface, This->channel_count, volumes); - volumes[index] = level; - if (SUCCEEDED(hr)) - hr = AudioStreamVolume_SetAllVolumes(iface, This->channel_count, volumes); - return hr; + pulse->lock(); + This->vol[index] = level; + set_stream_volumes(This); + pulse->unlock(); + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume(

1 0

Francois Gouget : ucrtbase/tests: Add the trailing linefeed to an ok() message.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: dc6e90f7f8164b6e9f831a570fb654bd3e9c27e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6e90f7f8164b6e9f831a57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 25 11:02:32 2021 +0200 ucrtbase/tests: Add the trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index aaa8ada2a8a..96dd1acfe54 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1434,7 +1434,7 @@ static void test_fenv(void) ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); ret = fegetenv(&env2); ok(!ret, "fegetenv returned %x\n", ret); - ok(env._Fe_ctl != env2._Fe_ctl, "fesetround didn't change _Fe_ctl (%lx).", env._Fe_ctl); + ok(env._Fe_ctl != env2._Fe_ctl, "fesetround didn't change _Fe_ctl (%lx).\n", env._Fe_ctl); ret = fesetenv(&env); ok(!ret, "fesetenv returned %x\n", ret); ret = fegetround();

1 0

Francois Gouget : kernel32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 6c39e731f42dea544461e50dcf1f9a132d135c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c39e731f42dea544461e50d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 25 11:02:27 2021 +0200 kernel32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index beb69352e4d..9b91b6f0998 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4483,7 +4483,7 @@ static void test_nested_jobs_child(unsigned int index) if (index) { ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); - ok(!ret, "AssignProcessToJobObject succeded\n"); + ok(!ret, "AssignProcessToJobObject succeeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); }

1 0

Jacek Caban : winepulse: Simplify checks for stream being initialized.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: bf74f36350c92daae84623dc0bd0530c212bb908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf74f36350c92daae84623dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 24 18:21:52 2021 +0200 winepulse: Simplify checks for stream being initialized. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0178cdb9e7b..8e717f9d18f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -230,14 +230,6 @@ static char *get_application_name(void) return str; } -static HRESULT pulse_stream_valid(ACImpl *This) { - if (!This->pulse_stream) - return AUDCLNT_E_NOT_INITIALIZED; - if (pa_stream_get_state(This->pulse_stream->stream) != PA_STREAM_READY) - return AUDCLNT_E_DEVICE_INVALIDATED; - return S_OK; -} - static DWORD WINAPI pulse_timer_cb(void *user) { ACImpl *This = user; @@ -905,7 +897,6 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -913,11 +904,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - pulse->lock(); - hr = pulse_stream_valid(This); - pulse->unlock(); - if (FAILED(hr)) - return hr; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; if (IsEqualIID(riid, &IID_IAudioRenderClient)) { if (This->dataflow != eRender) @@ -1436,7 +1424,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT hr; int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -1444,28 +1431,24 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if (!levels) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; if (count != This->channel_count) return E_INVALIDARG; pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) - goto out; - for (i = 0; i < count; ++i) This->vol[i] = levels[i]; set_stream_volumes(This); -out: pulse->unlock(); - return hr; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT hr; int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -1473,20 +1456,16 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if (!levels) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; if (count != This->channel_count) return E_INVALIDARG; pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) - goto out; - for (i = 0; i < count; ++i) levels[i] = This->vol[i]; - -out: pulse->unlock(); - return hr; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_SetChannelVolume(

1 0

Zebediah Figura : server: Allow opening the Afd device with a file name.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 30fd3019e1b9f0e05d6da911a3605dd7956e696c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30fd3019e1b9f0e05d6da911… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 23:13:40 2021 -0500 server: Allow opening the Afd device with a file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50974 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index a02b4f3da27..48b177ee845 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -64,7 +64,7 @@ static void test_open_device(void) RtlInitUnicodeString(&string, L"\\Device\\Afd\\foobar"); InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); ret = NtOpenFile(&handle, SYNCHRONIZE, &attr, &io, 0, 0); - todo_wine ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#x\n", ret); CloseHandle(handle); s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); diff --git a/server/sock.c b/server/sock.c index 7f8d9760afb..ab5aa57a6cd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1981,6 +1981,7 @@ static void socket_device_dump( struct object *obj, int verbose ) static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr, struct object *root ) { + if (name) name->len = 0; return NULL; }

1 0