wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

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

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

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

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

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

Jacek Caban : ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 86b5ec3fd1fb8c42f7e79b29647c59cd698aa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b5ec3fd1fb8c42f7e79b296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:13:52 2016 +0200 ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 90ba950..dffd3f3 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -75,6 +75,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); +static NTSTATUS (WINAPI *pNtCancelIoFileEx) (HANDLE hFile, IO_STATUS_BLOCK *iosb, IO_STATUS_BLOCK *io_status); static void (WINAPI *pRtlInitUnicodeString) (PUNICODE_STRING target, PCWSTR source); static HANDLE (WINAPI *pOpenThread)(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwThreadId); @@ -95,6 +96,7 @@ static BOOL init_func_ptrs(void) loadfunc(NtQueryInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) + loadfunc(NtCancelIoFileEx) loadfunc(RtlInitUnicodeString) /* not fatal */ @@ -498,6 +500,21 @@ static void test_cancelio(void) ok(ioapc_called, "IOAPC didn't run\n"); + CloseHandle(hPipe); + + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, FALSE); + ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + + res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); + ok(!res, "NtCancelIoFileEx returned %x\n", res); + + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + CloseHandle(hEvent); CloseHandle(hPipe); }

1 0

Sebastian Lackner : ntoskrnl.exe: Don' t transfer back input buffer for IRP_MJ_WRITE requests.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 8d799ea57bf607dc5e44089efdfd61f9511c657b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d799ea57bf607dc5e44089ef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 12 18:53:55 2016 +0200 ntoskrnl.exe: Don't transfer back input buffer for IRP_MJ_WRITE requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ++++++++++--- include/ddk/wdm.h | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 909bf6f..5d423e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -176,12 +176,15 @@ static HANDLE get_device_manager(void) static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; + HANDLE irp_handle = context; void *out_buff = irp->UserBuffer; - HANDLE handle = context; + + if (irp->Flags & IRP_WRITE_OPERATION) + out_buff = NULL; /* do not transfer back input buffer */ SERVER_START_REQ( set_irp_result ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->file_ptr = wine_server_client_ptr( file ); if (irp->IoStatus.u.Status >= 0) @@ -193,7 +196,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - HeapFree( GetProcessHeap(), 0, out_buff ); + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); return STATUS_SUCCESS; } @@ -248,6 +251,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -285,6 +289,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ @@ -325,6 +330,7 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Read.Key = params->read.key; + irp->Flags |= IRP_READ_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -358,6 +364,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Write.Key = params->write.key; + irp->Flags |= IRP_WRITE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5602f7d..d6ee235 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -457,6 +457,23 @@ typedef struct _IRP { } IRP; typedef struct _IRP *PIRP; +#define IRP_NOCACHE 0x0001 +#define IRP_PAGING_IO 0x0002 +#define IRP_MOUNT_COMPLETION 0x0002 +#define IRP_SYNCHRONOUS_API 0x0004 +#define IRP_ASSOCIATED_IRP 0x0008 +#define IRP_BUFFERED_IO 0x0010 +#define IRP_DEALLOCATE_BUFFER 0x0020 +#define IRP_INPUT_OPERATION 0x0040 +#define IRP_SYNCHRONOUS_PAGING_IO 0x0040 +#define IRP_CREATE_OPERATION 0x0080 +#define IRP_READ_OPERATION 0x0100 +#define IRP_WRITE_OPERATION 0x0200 +#define IRP_CLOSE_OPERATION 0x0400 +#define IRP_DEFER_IO_COMPLETION 0x0800 +#define IRP_OB_QUERY_NAME 0x1000 +#define IRP_HOLD_DEVICE_QUEUE 0x2000 + typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context);

1 0

Nikolay Sivov : d2d1: Implement GetDesktopDpi().
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 4121b223c85a5d0d491a3d9b5674ea854ba84716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121b223c85a5d0d491a3d9b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 11 23:40:52 2016 +0300 d2d1: Implement GetDesktopDpi(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 36 +++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 17 +++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 86c1690..b83d221 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,9 @@ struct d2d_factory LONG refcount; ID3D10Device1 *device; + + float dpi_x; + float dpi_y; }; static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) @@ -37,6 +40,24 @@ static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory_iface); } +static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) +{ + HDC hdc; + + if (!(hdc = GetDC(NULL))) + { + factory->dpi_x = factory->dpi_y = 96.0f; + return E_FAIL; + } + + factory->dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + factory->dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + + ReleaseDC(NULL, hdc); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -84,17 +105,21 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + return d2d_factory_reload_sysmetrics(factory); } static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = factory->dpi_x; + *dpi_y = factory->dpi_y; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory *iface, @@ -381,6 +406,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; + d2d_factory_reload_sysmetrics(factory); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 38012ca..433b1a5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3099,6 +3099,22 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_desktop_dpi(void) +{ + ID2D1Factory *factory; + float dpi_x, dpi_y; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + dpi_x = dpi_y = 0.0f; + ID2D1Factory_GetDesktopDpi(factory, &dpi_x, &dpi_y); + ok(dpi_x > 0.0f && dpi_y > 0.0f, "Got wrong dpi %f x %f.\n", dpi_x, dpi_y); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -3116,4 +3132,5 @@ START_TEST(d2d1) test_dc_target(); test_hwnd_target(); test_bitmap_target(); + test_desktop_dpi(); }

1 0

Hans Leidekker : webservices: Implement WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 459b7caeb2a58895bf5d8173dd847edfec3815df URL: http://source.winehq.org/git/wine.git/?a=commit;h=459b7caeb2a58895bf5d8173d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:25 2016 +0200 webservices: Implement WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 109 +++++++++++++++++++++++---------- dlls/webservices/tests/reader.c | 42 ++++++++++++- dlls/webservices/webservices_private.h | 6 ++ 3 files changed, 124 insertions(+), 33 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9a82bcd..9ba4dfc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4000,7 +4000,11 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, char *buf; if (!desc) return E_INVALIDARG; - if (desc->structOptions) FIXME( "struct options %08x not supported\n", desc->structOptions ); + if (desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) + { + FIXME( "struct options %08x not supported\n", + desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT ); + } switch (option) { @@ -4037,7 +4041,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, return hr; } *(char **)ret = buf; - return S_OK; + break; case WS_READ_OPTIONAL_POINTER: case WS_READ_NILLABLE_POINTER: @@ -4047,16 +4051,77 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, buf = NULL; } *(char **)ret = buf; - return S_OK; + break; case WS_READ_REQUIRED_VALUE: case WS_READ_NILLABLE_VALUE: - return hr; + if (hr != S_OK) return hr; + break; default: ERR( "unhandled read option %u\n", option ); return E_NOTIMPL; } + + if (desc->structOptions & WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) + { + struct node *parent = find_parent( reader ); + parent->flags |= NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT; + } + return S_OK; +} + +static HRESULT start_mapping( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + case WS_ELEMENT_CONTENT_TYPE_MAPPING: + return read_type_next_element_node( reader, localname, ns ); + + case WS_ANY_ELEMENT_TYPE_MAPPING: + case WS_ATTRIBUTE_TYPE_MAPPING: + return S_OK; + + default: + FIXME( "unhandled mapping %u\n", mapping ); + return E_NOTIMPL; + } +} + +static HRESULT read_type_endelement_node( struct reader *reader ) +{ + const struct node *parent = find_parent( reader ); + HRESULT hr; + + for (;;) + { + if ((hr = read_type_next_node( reader )) != S_OK) return hr; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT && reader->current->parent == parent) + { + return S_OK; + } + if (read_end_of_data( reader ) || !(parent->flags & NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT)) break; + } + + return WS_E_INVALID_FORMAT; +} + +static HRESULT end_mapping( struct reader *reader, WS_TYPE_MAPPING mapping ) +{ + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + return read_type_endelement_node( reader ); + + case WS_ELEMENT_CONTENT_TYPE_MAPPING: + return read_type_next_node( reader ); + + case WS_ATTRIBUTE_TYPE_MAPPING: + default: + return S_OK; + } } static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) @@ -4078,28 +4143,17 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) } static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, - const WS_XML_STRING *localname, const WS_XML_STRING *ns, - const void *desc, WS_READ_OPTION option, WS_HEAP *heap, - void *value, ULONG size ) + const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) { HRESULT hr; - switch (mapping) - { - case WS_ELEMENT_TYPE_MAPPING: - case WS_ELEMENT_CONTENT_TYPE_MAPPING: - if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; - if ((option == WS_READ_NILLABLE_POINTER || option == WS_READ_NILLABLE_VALUE) && - is_nil_element( &reader->current->hdr )) return read_type_next_node( reader ); - break; - - case WS_ANY_ELEMENT_TYPE_MAPPING: - case WS_ATTRIBUTE_TYPE_MAPPING: - break; + if ((hr = start_mapping( reader, mapping, localname, ns )) != S_OK) return hr; - default: - FIXME( "unhandled mapping %u\n", mapping ); - return E_NOTIMPL; + if (mapping == WS_ELEMENT_TYPE_MAPPING && is_nil_element( &reader->current->hdr )) + { + if (option != WS_READ_NILLABLE_POINTER && option != WS_READ_NILLABLE_VALUE) return WS_E_INVALID_FORMAT; + return end_mapping( reader, mapping ); } switch (type) @@ -4189,16 +4243,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return E_NOTIMPL; } - switch (mapping) - { - case WS_ELEMENT_TYPE_MAPPING: - case WS_ELEMENT_CONTENT_TYPE_MAPPING: - return read_type_next_node( reader ); - - case WS_ATTRIBUTE_TYPE_MAPPING: - default: - return S_OK; - } + return end_mapping( reader, mapping ); } /************************************************************************** diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index a020c01..62ed499 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -71,6 +71,12 @@ static const char data11[] = "</o:services>" "</o:OfficeConfig>"; +static const char data11b[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" + "<trailing>content</trailing>" + "</o:OfficeConfig>"; + static const char data12[] = "<services>" "<service><id>1</id></service>" @@ -2069,12 +2075,23 @@ static void test_simple_struct_type(void) s.typeLocalName = &localname2; s.typeNs = &ns; - test = NULL; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; + prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + s.structOptions = 0; + test = NULL; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, @@ -2815,6 +2832,29 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + /* trailing content */ + prepare_struct_type_test( reader, data11b ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + prepare_struct_type_test( reader, data11b ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + s.structOptions = 0; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeHeap( heap ); WsFreeError( error ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 12b7984..424f3fe 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -41,12 +41,18 @@ HRESULT set_output( WS_XML_WRITER * ) DECLSPEC_HIDDEN; HRESULT set_input( WS_XML_READER *, char *, ULONG ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const WS_STRUCT_DESCRIPTION * ) DECLSPEC_HIDDEN; +enum node_flag +{ + NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT = 0x1, +}; + struct node { WS_XML_ELEMENT_NODE hdr; struct list entry; struct node *parent; struct list children; + ULONG flags; }; struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Fix node insertion in the reader when the current node is an end element.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 829b2255461bbaa79afd120fce02c86fc7c607b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829b2255461bbaa79afd120fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:24 2016 +0200 webservices: Fix node insertion in the reader when the current node is an end element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 25 ++++++++++++------------- dlls/webservices/webservices_private.h | 7 ++++++- dlls/webservices/writer.c | 15 +++++++++++---- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c364cff..9a82bcd 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1400,16 +1400,15 @@ error: return hr; } -static inline BOOL is_valid_parent( const struct node *node ) +static struct node *find_parent( struct reader *reader ) { - if (!node) return FALSE; - return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; -} - -struct node *find_parent( struct node *node ) -{ - if (is_valid_parent( node )) return node; - if (is_valid_parent( node->parent )) return node->parent; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT) + { + if (is_valid_parent( reader->current->parent->parent )) return reader->current->parent->parent; + return NULL; + } + else if (is_valid_parent( reader->current )) return reader->current; + else if (is_valid_parent( reader->current->parent )) return reader->current->parent; return NULL; } @@ -1468,7 +1467,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = find_parent( reader->current ))) goto error; + if (!(parent = find_parent( reader ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1522,7 +1521,7 @@ static HRESULT read_text( struct reader *reader ) len += skip; } - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; @@ -1693,7 +1692,7 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -1717,7 +1716,7 @@ static HRESULT read_startcdata( struct reader *reader ) if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; if (!(endnode = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cdaa4b5..12b7984 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -52,7 +52,6 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; -struct node *find_parent( struct node * ) DECLSPEC_HIDDEN; HRESULT copy_node( WS_XML_READER *, struct node ** ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) @@ -125,6 +124,12 @@ static inline BOOL is_nil_value( const char *value, ULONG size ) return TRUE; } +static inline BOOL is_valid_parent( const struct node *node ) +{ + if (!node) return FALSE; + return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); +} + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 26ab726..4622277 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -130,6 +130,13 @@ static void write_insert_node( struct writer *writer, struct node *parent, struc writer->current = node; } +static struct node *find_parent( struct writer *writer ) +{ + if (is_valid_parent( writer->current )) return writer->current; + if (is_valid_parent( writer->current->parent )) return writer->current->parent; + return NULL; +} + static HRESULT write_init_state( struct writer *writer ) { struct node *node; @@ -890,7 +897,7 @@ static HRESULT write_flush( struct writer *writer ) static HRESULT write_add_cdata_node( struct writer *writer ) { struct node *node, *parent; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; write_insert_node( writer, parent, node ); return S_OK; @@ -977,7 +984,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN struct node *node, *parent; WS_XML_ELEMENT_NODE *elem; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { @@ -2563,7 +2570,7 @@ static HRESULT write_add_comment_node( struct writer *writer, const WS_XML_STRIN struct node *node, *parent; WS_XML_COMMENT_NODE *comment; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -2774,7 +2781,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if ((hr = copy_node( reader, &node )) != S_OK) return hr; write_insert_node( writer, parent, node );

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016