October 2016 - Wine-commits

Jacek Caban : ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 93863d25fc32a6229590e3b97a9d12e1a94676d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93863d25fc32a6229590e3b97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:34 2016 +0200 ws2_32: Pass completion routing to NtDeviceIoControlFile in server_ioctl_sock only if caller provided completion routine. Otherwise we're always doing non-blocking calls, preventing server from doing the right thing (and in actually doing the opposite in WS_SIO_ADDRESS_LIST_CHANGE case). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 2 -- server/sock.c | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e3c7507..e8c5130 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4520,18 +4520,27 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s { HANDLE event = overlapped ? overlapped->hEvent : 0; HANDLE handle = SOCKET2HANDLE( s ); - struct ws2_async *wsa; + struct ws2_async *wsa = NULL; + IO_STATUS_BLOCK *io = (PIO_STATUS_BLOCK)overlapped, iosb; + void *cvalue = NULL; NTSTATUS status; - PIO_STATUS_BLOCK io; - if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) - return WSA_NOT_ENOUGH_MEMORY; - wsa->hSocket = handle; - wsa->user_overlapped = overlapped; - wsa->completion_func = completion; - io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); + if (completion) + { + if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) + return WSA_NOT_ENOUGH_MEMORY; + wsa->hSocket = handle; + wsa->user_overlapped = overlapped; + wsa->completion_func = completion; + if (!io) io = &wsa->local_iosb; + cvalue = wsa; + } + else if (!io) + io = &iosb; + else if (!((ULONG_PTR)overlapped->hEvent & 1)) + cvalue = overlapped; - status = NtDeviceIoControlFile( handle, event, ws2_async_apc, wsa, io, code, + status = NtDeviceIoControlFile( handle, event, wsa ? ws2_async_apc : NULL, cvalue, io, code, in_buff, in_size, out_buff, out_size ); if (status == STATUS_NOT_SUPPORTED) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 320f820..b7aaea3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8387,7 +8387,6 @@ static void test_sioAddressListChange(void) ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); @@ -8426,7 +8425,6 @@ todo_wine ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); error = GetLastError(); ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); -todo_wine ok (error == ERROR_IO_PENDING, "expected 0x3e5, got 0x%x\n", error); CloseHandle(overlapped.hEvent); diff --git a/server/sock.c b/server/sock.c index 89049e0..d7349fc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -548,7 +548,7 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && !blocking) + if ((sock->state & FD_WINE_NONBLOCKING) && blocking) { set_error( STATUS_CANT_WAIT ); return 0;

1 0

Jacek Caban : server: Create ifchange async queue on socket fd.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 60f8ddbf9d372948674733169fcafc04c3d4827d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f8ddbf9d372948674733169… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:11:50 2016 +0200 server: Create ifchange async queue on socket fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 30 +++++++++++++++++++++++++++++- server/sock.c | 18 ++++++------------ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7aaea3..a144bd3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8345,12 +8345,15 @@ static void test_sioAddressListChange(void) { struct sockaddr_in bindAddress; struct in_addr net_address; - WSAOVERLAPPED overlapped; + WSAOVERLAPPED overlapped, *olp; struct hostent *h; DWORD num_bytes, error, tick; SOCKET sock, sock2, sock3; WSAEVENT event2, event3; + HANDLE io_port; + ULONG_PTR key; int acount; + BOOL bret; int ret; /* Use gethostbyname to find the list of local network interfaces */ @@ -8465,8 +8468,33 @@ static void test_sioAddressListChange(void) ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %d\n", error); ok (error == WSAEWOULDBLOCK, "expected 10035, got %d\n", error); + io_port = CreateIoCompletionPort( (HANDLE)sock, NULL, 0, 0 ); + ok (io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + set_blocking(sock, FALSE); + memset(&overlapped, 0, sizeof(overlapped)); + SetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + error = GetLastError(); + ok (ret == SOCKET_ERROR, "WSAIoctl(SIO_ADDRESS_LIST_CHANGE) failed with error %u\n", error); + ok (error == ERROR_IO_PENDING, "expected ERROR_IO_PENDING got %u\n", error); + + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(!olp, "Overlapped structure is at %p\n", olp); + closesocket(sock); + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 0 ); + ok(!bret, "failed to get completion status %u\n", bret); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %u\n", GetLastError()); + ok(olp == &overlapped, "Overlapped structure is at %p\n", olp); + + CloseHandle(io_port); + /* Misuse of the API by using a blocking socket and not using an overlapped structure, * this leads to a hang forever. */ if (0) diff --git a/server/sock.c b/server/sock.c index d7349fc..0de6f68 100644 --- a/server/sock.c +++ b/server/sock.c @@ -606,7 +606,9 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - sock_reselect( sock ); + /* ignore reselect on ifchange queue */ + if (sock->ifchange_q != queue) + sock_reselect( sock ); } static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) @@ -640,6 +642,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( sock->read_q ); free_async_queue( sock->write_q ); + async_wake_up( sock->ifchange_q, STATUS_CANCELLED ); sock_destroy_ifchange_q( sock ); if (sock->event) release_object( sock->event ); if (sock->fd) @@ -973,7 +976,6 @@ static void ifchange_destroy( struct object *obj ); static int ifchange_get_poll_events( struct fd *fd ); static void ifchange_poll_event( struct fd *fd, int event ); -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ); struct ifchange { @@ -1014,7 +1016,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_flush, /* flush */ no_fd_ioctl, /* ioctl */ NULL, /* queue_async */ - ifchange_reselect_async, /* reselect_async */ + NULL, /* reselect_async */ NULL /* cancel_async */ }; @@ -1096,11 +1098,6 @@ static void ifchange_poll_event( struct fd *fd, int event ) if (status != STATUS_PENDING) ifchange_wake_up( ifchange, status ); } -static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ) -{ - /* do nothing, this object is about to disappear */ -} - #endif /* we only need one of these interface notification objects, all of the sockets dependent upon @@ -1174,7 +1171,6 @@ static void ifchange_add_sock( struct object *obj, struct sock *sock ) static struct async_queue *sock_get_ifchange_q( struct sock *sock ) { struct object *ifchange; - struct fd *fd; if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */ return sock->ifchange_q; @@ -1183,9 +1179,7 @@ static struct async_queue *sock_get_ifchange_q( struct sock *sock ) return NULL; /* create the ifchange notification queue */ - fd = get_obj_fd( ifchange ); - sock->ifchange_q = create_async_queue( fd ); - release_object( fd ); + sock->ifchange_q = create_async_queue( sock->fd ); if (!sock->ifchange_q) { release_object( ifchange );

1 0

Alex Henrie : msinfo32: Display an About dialog when the program is run.
by Alexandre Julliard 13 Oct '16

13 Oct '16

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: d42332c1d39da1066aaf519bac656eeada40fcb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42332c1d39da1066aaf519ba… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Oct 13 08:23:18 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/po/lt.po b/po/lt.po index 816f0b2..3b6f02b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-07-16 12:20+0300\n" +"PO-Revision-Date: 2016-10-13 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14581,36 +14581,32 @@ msgid "F&ormat" msgstr "F&ormatas" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Sąrašas" +msgstr "&Sąrašai" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "&Ženkleliai" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "ALS numeris" +msgstr "Skaičiai" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Raidės – mažosios" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Raidės – didžiosios" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Lotyniški skaitmenys – mažosios raidės" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Lotyniški skaitmenys – didžiosios raidės" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Aric Stewart : winehid.sys: Add HID minidriver.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 769cc264e02ea58a8cb35b88632ba204df118dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=769cc264e02ea58a8cb35b886… Author: Aric Stewart <aricstewart(a)gmail.com> Date: Wed Oct 12 17:46:13 2016 +0200 winehid.sys: Add HID minidriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/winehid.sys/Makefile.in | 5 +++++ dlls/winehid.sys/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winehid.sys/winehid.sys.spec | 1 + loader/wine.inf.in | 14 ++++++++++++++ 7 files changed, 62 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4a7191c..55a7834 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -122,6 +122,7 @@ HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/winehid.sys/ HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> diff --git a/configure b/configure index bd0a1b9..99793b0 100755 --- a/configure +++ b/configure @@ -1424,6 +1424,7 @@ enable_winebus_sys enable_winecoreaudio_drv enable_wined3d enable_winegstreamer +enable_winehid_sys enable_winejoystick_drv enable_winemac_drv enable_winemapi @@ -18333,6 +18334,7 @@ wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer +wine_fn_config_dll winehid.sys enable_winehid_sys wine_fn_config_dll winejoystick.drv enable_winejoystick_drv wine_fn_config_dll winemac.drv enable_winemac_drv clean wine_fn_config_dll winemapi enable_winemapi diff --git a/configure.ac b/configure.ac index eb328a0..ba8fd0f 100644 --- a/configure.ac +++ b/configure.ac @@ -3423,6 +3423,7 @@ WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) +WINE_CONFIG_DLL(winehid.sys) WINE_CONFIG_DLL(winejoystick.drv) WINE_CONFIG_DLL(winemac.drv,,[clean]) WINE_CONFIG_DLL(winemapi) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in new file mode 100644 index 0000000..d4ca3dd --- /dev/null +++ b/dlls/winehid.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = winehid.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c new file mode 100644 index 0000000..7ab9267 --- /dev/null +++ b/dlls/winehid.sys/main.c @@ -0,0 +1,38 @@ +/* + * WINE Hid minidriver + * + * Copyright 2016 Aric Stewart + * + * 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 + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/winehid.sys/winehid.sys.spec b/dlls/winehid.sys/winehid.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/winehid.sys/winehid.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a92a9fe..fcf9c4a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -131,6 +131,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -146,6 +147,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -161,6 +163,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineHID,0,WineHIDService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2530,6 +2533,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ndis.sys,- 12,,tdi.sys,- 12,,winebus.sys,- +12,,winehid.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2573,6 +2577,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ndis.sys 12,,tdi.sys 12,,winebus.sys +12,,winehid.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -3198,6 +3203,15 @@ ServiceType=1 StartType=3 ErrorControl=1 +[WineHIDService] +Description="Wine HID Minidriver" +DisplayName="Wine HID" +ServiceBinary="%12%\winehid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 + [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler"

1 0

Aric Stewart : winehid.sys: Register as a HID minidriver.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 45b651e2137a559c1ba26836f1780183529b265d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b651e2137a559c1ba26836f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 12 17:46:17 2016 +0200 winehid.sys: Register as a HID minidriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 1 + dlls/winehid.sys/main.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index d4ca3dd..ad7881e 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,4 +1,5 @@ MODULE = winehid.sys +IMPORTS = hidclass EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c index 7ab9267..cdef3c5 100644 --- a/dlls/winehid.sys/main.c +++ b/dlls/winehid.sys/main.c @@ -26,13 +26,30 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/hidport.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *device) +{ + TRACE("(%p, %p)\n", driver, device); + return STATUS_SUCCESS; +} + NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { + HID_MINIDRIVER_REGISTRATION registration; + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); - return STATUS_SUCCESS; + driver->DriverExtension->AddDevice = add_device; + + memset(&registration, 0, sizeof(registration)); + registration.DriverObject = driver; + registration.RegistryPath = path; + registration.DeviceExtensionSize = sizeof(HID_DEVICE_EXTENSION); + registration.DevicesArePolled = FALSE; + + return HidRegisterMinidriver(&registration); }

1 0

Sebastian Lackner : ntoskrnl.exe: Add support for async close processing.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: e20259bb6e5c7b5f6800e308b9d1eaf7294d7937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20259bb6e5c7b5f6800e308b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 13 00:46:34 2016 +0200 ntoskrnl.exe: Add support for async close processing. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5d423e0..f3b6913 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -196,6 +196,12 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; + if (irp->Flags & IRP_CLOSE_OPERATION) + { + HeapFree( GetProcessHeap(), 0, file ); + irp->Tail.Overlay.OriginalFileObject = NULL; + } + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); return STATUS_SUCCESS; } @@ -292,7 +298,6 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); - HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ return STATUS_SUCCESS; }

1 0

Sebastian Lackner : ntoskrnl.exe: Fix management of input/ output buffers in dispatch handlers.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: a0d04a641ddfcd33d156471cdd3b87f3a5454aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d04a641ddfcd33d156471cd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 13 00:51:48 2016 +0200 ntoskrnl.exe: Fix management of input/output buffers in dispatch handlers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 47 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f3b6913..974f946 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -202,7 +202,11 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, irp->Tail.Overlay.OriginalFileObject = NULL; } - HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); + if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) + { + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); + irp->UserBuffer = NULL; + } return STATUS_SUCCESS; } @@ -260,6 +264,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -298,6 +303,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -336,8 +342,10 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp->Parameters.Read.Key = params->read.key; irp->Flags |= IRP_READ_OPERATION; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -370,6 +378,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp->Parameters.Write.Key = params->write.key; irp->Flags |= IRP_WRITE_OPERATION; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -398,6 +407,7 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, in_buff ); return STATUS_SUCCESS; } @@ -425,6 +435,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if ((params->ioctl.code & 3) == METHOD_BUFFERED) { memcpy( out_buff, in_buff, in_size ); + HeapFree( GetProcessHeap(), 0, in_buff ); in_buff = out_buff; } } @@ -439,7 +450,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; + irp->AssociatedIrp.SystemBuffer = in_buff; + irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -490,23 +503,23 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) HANDLE irp = 0; NTSTATUS status = STATUS_SUCCESS; irp_params_t irp_params; - void *in_buff; ULONG in_size = 4096, out_size = 0; + void *in_buff = NULL; HANDLE handles[2]; request_thread = GetCurrentThreadId(); - if (!(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) - { - ERR( "failed to allocate buffer\n" ); - return STATUS_NO_MEMORY; - } - handles[0] = stop_event; handles[1] = manager; for (;;) { + if (!in_buff && !(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) + { + ERR( "failed to allocate buffer\n" ); + return STATUS_NO_MEMORY; + } + SERVER_START_REQ( get_next_device_request ) { req->manager = wine_server_obj_handle( manager ); @@ -525,13 +538,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) else { irp = 0; /* no previous irp */ - out_size = 0; - in_size = reply->in_size; + if (status == STATUS_BUFFER_OVERFLOW) + in_size = reply->in_size; } } SERVER_END_REQ; - switch(status) + switch (status) { case STATUS_SUCCESS: if (irp_params.major > IRP_MJ_MAXIMUM_FUNCTION || !dispatch_funcs[irp_params.major]) @@ -541,11 +554,16 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) break; } status = dispatch_funcs[irp_params.major]( &irp_params, in_buff, in_size, out_size, irp ); - if (status == STATUS_SUCCESS) irp = 0; /* status reported by IoCompleteRequest */ + if (status == STATUS_SUCCESS) + { + irp = 0; /* status reported by IoCompleteRequest */ + in_size = 4096; + in_buff = NULL; + } break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, in_buff ); - in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ); + in_buff = NULL; /* restart with larger buffer */ break; case STATUS_PENDING: @@ -1451,6 +1469,9 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) } } + if (irp->Flags & IRP_DEALLOCATE_BUFFER) + HeapFree( GetProcessHeap(), 0, irp->AssociatedIrp.SystemBuffer ); + IoFreeIrp( irp ); }

1 0

Matteo Bruni : d3d11/tests: Make the window client rect match the d3d swapchain size.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: 9d89fd032bd45b5c933bbf4b5e9355c917ccf18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d89fd032bd45b5c933bbf4b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:06 2016 +0200 d3d11/tests: Make the window client rect match the d3d swapchain size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ed4987e..4ff7d45 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1056,6 +1056,7 @@ static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *con struct device_desc device_desc; D3D11_VIEWPORT vp; HRESULT hr; + RECT rect; memset(context, 0, sizeof(*context)); @@ -1066,8 +1067,10 @@ static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *con skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); context->window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); context->swapchain = create_swapchain(context->device, context->window, NULL); hr = IDXGISwapChain_GetBuffer(context->swapchain, 0, &IID_ID3D11Texture2D, (void **)&context->backbuffer); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); @@ -7695,6 +7698,7 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; + RECT rect; static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = { @@ -7774,8 +7778,10 @@ static void test_swapchain_flip(void) skip("Failed to create device, skipping tests.\n"); return; } + SetRect(&rect, 0, 0, 640, 480); + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); desc.buffer_count = 3; desc.swap_effect = DXGI_SWAP_EFFECT_SEQUENTIAL; desc.windowed = TRUE;

1 0

Matteo Bruni : d3d11/tests: Add a test for derivative shader instructions.
by Alexandre Julliard 13 Oct '16

13 Oct '16

Module: wine Branch: master Commit: c061b3e2ece1c8c1df1a5006cc105acc4d6e0a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c061b3e2ece1c8c1df1a5006c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 13 01:04:07 2016 +0200 d3d11/tests: Add a test for derivative shader instructions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c061b3e2ece1c8c1df1a5…

1 0