June 2020 - Wine-Commits - list.winehq.org

Paul Gofman : ntoskrnl.exe/tests: Add test for wsk_get_address_info().
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: e6425874510d067996e06ce9a1787c1a6081cfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6425874510d067996e06ce9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sun Jun 14 21:58:50 2020 +0300 ntoskrnl.exe/tests: Add test for wsk_get_address_info(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 86 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index d863d74836..5f45c770df 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -54,14 +54,23 @@ static POBJECT_TYPE *pIoDriverObjectType; static WSK_CLIENT_NPI client_npi; static WSK_REGISTRATION registration; static WSK_PROVIDER_NPI provider_npi; +static KEVENT irp_complete_event; +static IRP *wsk_irp; + +static NTSTATUS WINAPI irp_completion_routine(DEVICE_OBJECT *reserved, IRP *irp, void *context) +{ + KEVENT *event = context; + + KeSetEvent(event, 1, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} static void netio_init(void) { - const WSK_CLIENT_DISPATCH client_dispatch = + static const WSK_CLIENT_DISPATCH client_dispatch = { MAKE_WSK_VERSION(1, 0), 0, NULL }; - NTSTATUS status; client_npi.Dispatch = &client_dispatch; @@ -74,14 +83,86 @@ static void netio_init(void) ok(provider_npi.Dispatch->Version >= MAKE_WSK_VERSION(1, 0), "Got unexpected version %#x.\n", provider_npi.Dispatch->Version); ok(!!provider_npi.Client, "Got null WSK_CLIENT.\n"); + + KeInitializeEvent(&irp_complete_event, SynchronizationEvent, FALSE); + wsk_irp = IoAllocateIrp(1, FALSE); } static void netio_uninit(void) { + IoFreeIrp(wsk_irp); WskReleaseProviderNPI(&registration); WskDeregister(&registration); } +static void test_wsk_get_address_info(void) +{ + UNICODE_STRING node_name, service_name; + ADDRINFOEXW *result, *addr_info; + unsigned int count; + NTSTATUS status; + + RtlInitUnicodeString(&service_name, L"12345"); + + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = provider_npi.Dispatch->WskGetAddressInfo(provider_npi.Client, &node_name, &service_name, + NS_ALL, NULL, NULL, &result, NULL, NULL, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == 0xdeadbeef, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information == 0xdeadbeef, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + RtlInitUnicodeString(&node_name, L"dead.beef"); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = provider_npi.Dispatch->WskGetAddressInfo(provider_npi.Client, &node_name, &service_name, + NS_ALL, NULL, NULL, &result, NULL, NULL, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_NOT_FOUND + || broken(wsk_irp->IoStatus.Status == STATUS_NO_MATCH) /* Win7 */, + "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information == 0, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + RtlInitUnicodeString(&node_name, L"127.0.0.1"); + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = provider_npi.Dispatch->WskGetAddressInfo(provider_npi.Client, &node_name, &service_name, + NS_ALL, NULL, NULL, &result, NULL, NULL, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information == 0, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + count = 0; + addr_info = result; + while (addr_info) + { + struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; + + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); + ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); + ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", + ntohl(addr->sin_addr.s_addr)); + + ++count; + addr_info = addr_info->ai_next; + } + ok(count, "Got zero addr_info count.\n"); + provider_npi.Dispatch->WskFreeAddressInfo(provider_npi.Client, result); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -106,6 +187,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); netio_init(); + test_wsk_get_address_info(); if (winetest_debug) {

1 0

Alistair Leslie-Hughes : directmanipulation: Register the DirectManipulationManager and DirectManipulationSharedManager classes.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: f2cd77668ad77ef2f80166b6cf0625d44bdeebc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2cd77668ad77ef2f80166b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 12 16:43:06 2020 -0500 directmanipulation: Register the DirectManipulationManager and DirectManipulationSharedManager classes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/Makefile.in | 2 ++ dlls/directmanipulation/directmanip.idl | 38 +++++++++++++++++++++++++ dlls/directmanipulation/directmanipulation.c | 12 ++++++++ dlls/directmanipulation/directmanipulation.spec | 4 +-- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index d09d652b61..331c2a8420 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -2,5 +2,7 @@ MODULE = directmanipulation.dll EXTRADLLFLAGS = -mno-cygwin +IDL_SRCS = directmanip.idl + C_SRCS = \ directmanipulation.c diff --git a/dlls/directmanipulation/directmanip.idl b/dlls/directmanipulation/directmanip.idl new file mode 100644 index 0000000000..ff00668ba5 --- /dev/null +++ b/dlls/directmanipulation/directmanip.idl @@ -0,0 +1,38 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma makedep register + +[ + uuid(54e211b6-3650-4f75-8334-fa359598e1c5), + threading(both) +] +coclass DirectManipulationManager +{ + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; +} + +[ + uuid(99793286-77cc-4b57-96db-3b354f6f9fb5), + threading(both) +] +coclass DirectManipulationSharedManager +{ + interface IDirectManipulationManager2; + [default] interface IDirectManipulationManager; +} diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 21458ba1fe..f808bc1a33 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -20,6 +20,8 @@ #include "windef.h" #include "winbase.h" +#include "oleidl.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(manipulation); @@ -43,6 +45,16 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( dm_instance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( dm_instance ); +} + HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; diff --git a/dlls/directmanipulation/directmanipulation.spec b/dlls/directmanipulation/directmanipulation.spec index 6c8a107d5c..3f0004daeb 100644 --- a/dlls/directmanipulation/directmanipulation.spec +++ b/dlls/directmanipulation/directmanipulation.spec @@ -2,5 +2,5 @@ @ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer() -@ stub DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Akihiro Sagawa : winegstreamer: Also wait for EOS events when retrieving duration.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: bd28efb4c702f3119043d8d365fdc7ba98cd8b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd28efb4c702f3119043d8d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 13 10:34:22 2020 -0500 winegstreamer: Also wait for EOS events when retrieving duration. The mpegaudioparse element will not send a duration-changed message if no Xing or VBRI headers are present. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 8 ++++---- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mp3 | Bin 2349 -> 2157 bytes dlls/winegstreamer/gstdemux.c | 13 ++++++++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 9bfd7e3bb1..e407fe44ee 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -523,13 +523,13 @@ static void test_media_types(void) { MPEG1WAVEFORMAT expect_wfx = { - {WAVE_FORMAT_MPEG, 1, 48000, 8000, 192, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, - ACM_MPEG_LAYER3, 64000, ACM_MPEG_SINGLECHANNEL, 0, 1, ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 + {WAVE_FORMAT_MPEG, 1, 48000, 4000, 96, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + ACM_MPEG_LAYER3, 32000, ACM_MPEG_SINGLECHANNEL, 4096, 1, ACM_MPEG_ORIGINALHOME | ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 }; static const MPEGLAYER3WAVEFORMAT expect_mp3_wfx = { - {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 8000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, - MPEGLAYER3_ID_MPEG, 0, 192, 1, 0 + {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 4000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + MPEGLAYER3_ID_MPEG, 0, 96, 1, 0 }; const WCHAR *filename = load_resource(L"test.mp3"); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 753415cf8d..d28c2bd6ed 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -28,7 +28,7 @@ test.avi RCDATA "test.avi" /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" -/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ +/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 -write_xing 0 test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3 index 78d8dd2af6..b35e6b77d1 100644 Binary files a/dlls/quartz/tests/test.mp3 and b/dlls/quartz/tests/test.mp3 differ diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7d8a0b98c..b9c91245f8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -79,7 +79,7 @@ struct gstdemux_source GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; AM_MEDIA_TYPE mt; - HANDLE caps_event; + HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; }; @@ -699,6 +699,8 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_EOS: if (pin->pin.pin.peer) IPin_EndOfStream(pin->pin.pin.peer); + else + SetEvent(pin->eos_event); return TRUE; case GST_EVENT_FLUSH_START: if (impl_from_strmbase_filter(pin->pin.pin.filter)->ignore_flush) { @@ -2129,6 +2131,7 @@ static void free_source_pin(struct gstdemux_source *pin) } gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); + CloseHandle(pin->eos_event); FreeMediaType(&pin->mt); gst_segment_free(pin->segment); @@ -2161,6 +2164,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); + pin->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; @@ -2561,7 +2565,8 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static const WCHAR source_name[] = {'A','u','d','i','o',0}; struct gstdemux_source *pin; GstElement *element; - HANDLE events[2]; + HANDLE events[3]; + DWORD res; int ret; if (!(element = gst_element_factory_make("mpegaudioparse", NULL))) @@ -2600,7 +2605,9 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) events[0] = filter->duration_event; events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + events[2] = pin->eos_event; + res = WaitForMultipleObjects(3, events, FALSE, INFINITE); + if (res == 1) return FALSE; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src);

1 0

Gerald Pfeifer : ntdll: Include <signal.h> where needed in the Unix library.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: a20b997b3430bd7dc94ffd587cd299efa467420e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20b997b3430bd7dc94ffd58… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 14 17:58:33 2020 +0200 ntdll: Include <signal.h> where needed in the Unix library. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9f38f042de..58ba031421 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -28,6 +28,7 @@ #include <errno.h> #include <fcntl.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h>

1 0

Paul Gofman : ntoskrnl/tests: Add initial test for WSK listen socket.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: eea911a58b8d71f86973741477c124230e4710cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea911a58b8d71f869737414… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sun Jun 14 21:58:55 2020 +0300 ntoskrnl/tests: Add initial test for WSK listen socket. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 5f45c770df..4336fdb21a 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -163,6 +163,56 @@ static void test_wsk_get_address_info(void) provider_npi.Dispatch->WskFreeAddressInfo(provider_npi.Client, result); } +struct socket_context +{ +}; + +static void test_wsk_listen_socket(void) +{ + static const WSK_CLIENT_LISTEN_DISPATCH client_listen_dispatch; + const WSK_PROVIDER_LISTEN_DISPATCH *dispatch; + struct socket_context context; + NTSTATUS status; + WSK_SOCKET *s; + + status = provider_npi.Dispatch->WskSocket(NULL, AF_INET, SOCK_STREAM, IPPROTO_TCP, + WSK_FLAG_LISTEN_SOCKET, &context, &client_listen_dispatch, NULL, NULL, NULL, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + status = provider_npi.Dispatch->WskSocket(NULL, AF_INET, SOCK_STREAM, IPPROTO_TCP, + WSK_FLAG_LISTEN_SOCKET, &context, &client_listen_dispatch, NULL, NULL, NULL, wsk_irp); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = provider_npi.Dispatch->WskSocket(provider_npi.Client, AF_INET, SOCK_STREAM, IPPROTO_TCP, + WSK_FLAG_LISTEN_SOCKET, &context, &client_listen_dispatch, NULL, NULL, NULL, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information, "Got zero Information.\n"); + + s = (WSK_SOCKET *)wsk_irp->IoStatus.Information; + dispatch = s->Dispatch; + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = dispatch->Basic.WskCloseSocket(s, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -188,6 +238,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st netio_init(); test_wsk_get_address_info(); + test_wsk_listen_socket(); if (winetest_debug) {

1 0

Alistair Leslie-Hughes : uuid: Add directmanipulation.h.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 44cbf6e5c64352862d81b59fcd2e4568ee8c557f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cbf6e5c64352862d81b59f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 18 09:46:30 2019 +1000 uuid: Add directmanipulation.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uuid/uuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index aa3b30c3c7..eacb83301d 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -90,6 +90,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "netcfgx.h" #include "shimgdata.h" #include "comsvcs.h" +#include "directmanipulation.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Zebediah Figura : quartz/vmr9: Get rid of VMR9_ImagePresenter_PresentOffscreenSurface().
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 5444ce2f0db7b3f7b4e1fdf3f7bb8d18b79f315b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5444ce2f0db7b3f7b4e1fdf3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 12 16:28:28 2020 -0500 quartz/vmr9: Get rid of VMR9_ImagePresenter_PresentOffscreenSurface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 449943f2dc..6b653e5609 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2611,26 +2611,6 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if return S_OK; } -static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presenter *This, IDirect3DSurface9 *surface) -{ - HRESULT hr; - IDirect3DSurface9 *target = NULL; - - hr = IDirect3DDevice9_GetBackBuffer(This->d3d9_dev, 0, 0, D3DBACKBUFFER_TYPE_MONO, &target); - if (FAILED(hr)) - { - ERR("IDirect3DDevice9_GetBackBuffer -- %08x\n", hr); - return hr; - } - - hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, NULL, target, NULL, D3DTEXF_POINT); - if (FAILED(hr)) - ERR("IDirect3DDevice9_StretchRect -- %08x\n", hr); - IDirect3DSurface9_Release(target); - - return hr; -} - static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR cookie, VMR9PresentationInfo *info) { @@ -2638,6 +2618,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac const struct quartz_vmr *filter = presenter->pVMR9; IDirect3DDevice9 *device = presenter->d3d9_dev; const RECT src = filter->window.src; + IDirect3DSurface9 *backbuffer; RECT dst = filter->window.dst; HRESULT hr; @@ -2654,7 +2635,15 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac if (FAILED(hr = IDirect3DDevice9_BeginScene(device))) ERR("Failed to begin scene, hr %#x.\n", hr); - VMR9_ImagePresenter_PresentOffscreenSurface(presenter, info->lpSurf); + if (FAILED(hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) + { + ERR("Failed to get backbuffer, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IDirect3DDevice9_StretchRect(device, info->lpSurf, NULL, backbuffer, NULL, D3DTEXF_POINT))) + ERR("Failed to blit image, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); if (FAILED(hr = IDirect3DDevice9_EndScene(device))) ERR("Failed to end scene, hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Relax some timings.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 5161554b9d4e8d999f21a420b4c56067e209d435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5161554b9d4e8d999f21a420… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 13 13:55:38 2020 -0500 quartz/tests: Relax some timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index d603ea46ed..ab2b4f9e0d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1082,7 +1082,7 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input ok(hr == S_OK, "Got hr %#x.\n", hr); thread = send_frame_time(input, 2, 0x66); /* orange */ - ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a227a647f6..2641b7a04b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1430,7 +1430,7 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont ok(hr == S_OK, "Got hr %#x.\n", hr); thread = send_frame_time(input, 2, 0x00ff00ff); /* magenta */ - ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Paul Gofman : netio.sys: Implement wsk_free_address_info() function.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 0d1d8c1220caf7bbcdff9191560be7eb3ab9706d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1d8c1220caf7bbcdff9191… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sun Jun 14 21:58:49 2020 +0300 netio.sys: Implement wsk_free_address_info() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index cbbf8c0611..00dbec7664 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -203,7 +203,9 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) { - FIXME("client %p, addr_info %p stub.\n", client, addr_info); + TRACE("client %p, addr_info %p.\n", client, addr_info); + + FreeAddrInfoExW(addr_info); } static NTSTATUS WINAPI wsk_get_name_info(WSK_CLIENT *client, SOCKADDR *sock_addr, ULONG sock_addr_length,

1 0

Paul Gofman : netio.sys: Implement wsk_close_socket() function.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 136d4603816e98edb9d8772f26e048ad8cee7a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=136d4603816e98edb9d8772f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sun Jun 14 21:58:54 2020 +0300 netio.sys: Implement wsk_close_socket() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 3ac2008c7e..2b8848a275 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -52,6 +52,11 @@ struct wsk_socket_internal void *client_context; }; +static inline struct wsk_socket_internal *wsk_socket_internal_from_wsk_socket(WSK_SOCKET *wsk_socket) +{ + return CONTAINING_RECORD(wsk_socket, struct wsk_socket_internal, wsk_socket); +} + static NTSTATUS sock_error_to_ntstatus(DWORD err) { switch (err) @@ -114,9 +119,18 @@ static NTSTATUS WINAPI wsk_control_socket(WSK_SOCKET *socket, WSK_CONTROL_SOCKET static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) { - FIXME("socket %p, irp %p stub.\n", socket, irp); + struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); + NTSTATUS status; - return STATUS_NOT_IMPLEMENTED; + TRACE("socket %p, irp %p.\n", socket, irp); + + status = closesocket(s->s) ? sock_error_to_ntstatus(WSAGetLastError()) : STATUS_SUCCESS; + heap_free(socket); + + irp->IoStatus.Information = 0; + dispatch_irp(irp, status); + + return status ? status : STATUS_PENDING; } static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULONG flags, IRP *irp)

1 0