March 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ws2_32/tests: Actually test a return value (PVS-Studio ).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: bbe2c58261a1dd9b4a4fd0c6c353355742f59ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe2c58261a1dd9b4a4fd0c6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 10:14:40 2015 +0100 ws2_32/tests: Actually test a return value (PVS-Studio). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6569515..7155a09 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4374,6 +4374,7 @@ static void test_ioctlsocket(void) ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); arg = 0; ret = ioctlsocket(sock, SIOCATMARK, &arg); + ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n"); ok(arg, "SIOCATMARK expected a non-zero value\n"); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL);

1 0

Alexandre Julliard : ntoskrnl: Use the IRP allocation routines for standard ioctl processing.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 5fc369ff21ba4c66242ed7c26cf888bfc159fe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc369ff21ba4c66242ed7c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 22:21:45 2015 +0900 ntoskrnl: Use the IRP allocation routines for standard ioctl processing. --- dlls/ntoskrnl.exe/ntoskrnl.c | 116 +++++++++++++++++++------------------------ include/ddk/wdm.h | 1 + 2 files changed, 53 insertions(+), 64 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cdc5305..9734296 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -140,45 +140,38 @@ static HANDLE get_device_manager(void) static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, void *out_buff, ULONG *out_size ) { - IRP irp; MDL mdl; - IO_STACK_LOCATION irpsp; + IRP *irp; + void *sys_buff = NULL; FILE_OBJECT file; - PDRIVER_DISPATCH dispatch = device->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL]; - NTSTATUS status; + IO_STATUS_BLOCK iosb; LARGE_INTEGER count; TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, *out_size ); /* so we can spot things that we should initialize */ - memset( &irp, 0x55, sizeof(irp) ); - memset( &irpsp, 0x66, sizeof(irpsp) ); memset( &mdl, 0x77, sizeof(mdl) ); memset( &file, 0x88, sizeof(file) ); - irp.RequestorMode = UserMode; if ((code & 3) == METHOD_BUFFERED) { - irp.AssociatedIrp.SystemBuffer = HeapAlloc( GetProcessHeap(), 0, max( in_size, *out_size ) ); - if (!irp.AssociatedIrp.SystemBuffer) + if (!(sys_buff = HeapAlloc( GetProcessHeap(), 0, max( in_size, *out_size ) ))) return STATUS_NO_MEMORY; - memcpy( irp.AssociatedIrp.SystemBuffer, in_buff, in_size ); + memcpy( sys_buff, in_buff, in_size ); } - else - irp.AssociatedIrp.SystemBuffer = in_buff; - irp.UserBuffer = out_buff; - irp.MdlAddress = &mdl; - irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp; - irp.Tail.Overlay.OriginalFileObject = &file; - irp.UserIosb = NULL; - - irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; - irpsp.Parameters.DeviceIoControl.OutputBufferLength = *out_size; - irpsp.Parameters.DeviceIoControl.InputBufferLength = in_size; - irpsp.Parameters.DeviceIoControl.IoControlCode = code; - irpsp.Parameters.DeviceIoControl.Type3InputBuffer = in_buff; - irpsp.DeviceObject = device; - irpsp.CompletionRoutine = NULL; + + irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, *out_size, + FALSE, NULL, &iosb ); + if (!irp) + { + HeapFree( GetProcessHeap(), 0, sys_buff ); + return STATUS_NO_MEMORY; + } + irp->RequestorMode = UserMode; + irp->AssociatedIrp.SystemBuffer = ((code & 3) == METHOD_BUFFERED) ? sys_buff : in_buff; + irp->UserBuffer = out_buff; + irp->MdlAddress = &mdl; + irp->Tail.Overlay.OriginalFileObject = &file; mdl.Next = NULL; mdl.Size = 0; @@ -189,27 +182,17 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, file.FsContext = NULL; file.FsContext2 = NULL; - device->CurrentIrp = &irp; + device->CurrentIrp = irp; KeQueryTickCount( &count ); /* update the global KeTickCount */ - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", - GetCurrentThreadId(), dispatch, device, &irp ); + IoCallDriver( device, irp ); - status = dispatch( device, &irp ); + *out_size = (iosb.u.Status >= 0) ? iosb.Information : 0; + if (out_buff && (code & 3) == METHOD_BUFFERED) memcpy( out_buff, sys_buff, *out_size ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", - GetCurrentThreadId(), dispatch, device, &irp, status ); - - *out_size = (irp.IoStatus.u.Status >= 0) ? irp.IoStatus.Information : 0; - if ((code & 3) == METHOD_BUFFERED) - { - if (out_buff) memcpy( out_buff, irp.AssociatedIrp.SystemBuffer, *out_size ); - HeapFree( GetProcessHeap(), 0, irp.AssociatedIrp.SystemBuffer ); - } - return irp.IoStatus.u.Status; + HeapFree( GetProcessHeap(), 0, sys_buff ); + return iosb.u.Status; } @@ -493,29 +476,23 @@ PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack( DEVICE_OBJECT *source, /*********************************************************************** * IoBuildDeviceIoControlRequest (NTOSKRNL.EXE.@) */ -PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode, - PDEVICE_OBJECT DeviceObject, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - BOOLEAN InternalDeviceIoControl, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock ) +PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, + PVOID in_buff, ULONG in_len, + PVOID out_buff, ULONG out_len, + BOOLEAN internal, PKEVENT event, + PIO_STATUS_BLOCK iosb ) { PIRP irp; PIO_STACK_LOCATION irpsp; struct IrpInstance *instance; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", - IoControlCode, DeviceObject, InputBuffer, InputBufferLength, - OutputBuffer, OutputBufferLength, InternalDeviceIoControl, - Event, IoStatusBlock ); + code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); - if (DeviceObject == NULL) + if (device == NULL) return NULL; - irp = IoAllocateIrp( DeviceObject->StackSize, FALSE ); + irp = IoAllocateIrp( device->StackSize, FALSE ); if (irp == NULL) return NULL; @@ -529,12 +506,16 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode, list_add_tail( &Irps, &instance->entry ); irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MajorFunction = InternalDeviceIoControl ? - IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; - irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode; - irp->UserIosb = IoStatusBlock; - irp->UserEvent = Event; + irpsp->MajorFunction = internal ? IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; + irpsp->Parameters.DeviceIoControl.IoControlCode = code; + irpsp->Parameters.DeviceIoControl.InputBufferLength = in_len; + irpsp->Parameters.DeviceIoControl.OutputBufferLength = out_len; + irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; + irpsp->DeviceObject = device; + irpsp->CompletionRoutine = NULL; + irp->UserIosb = iosb; + irp->UserEvent = event; return irp; } @@ -812,13 +793,20 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *irpsp; NTSTATUS status; - TRACE( "%p %p\n", device, irp ); - --irp->CurrentLocation; irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation; dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", + GetCurrentThreadId(), dispatch, device, irp ); + status = dispatch( device, irp ); + if (TRACE_ON(relay)) + DPRINTF( "%04x:Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", + GetCurrentThreadId(), dispatch, device, irp, status ); + return status; } @@ -1020,10 +1008,10 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) return; } } - if (iosb && STATUS_SUCCESS == status) + if (iosb) { iosb->u.Status = irp->IoStatus.u.Status; - iosb->Information = irp->IoStatus.Information; + if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; } LIST_FOR_EACH_ENTRY( instance, &Irps, struct IrpInstance, entry ) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e4f693a..661b75e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1199,6 +1199,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**);

1 0

Alexandre Julliard : ntoskrnl: Use the MDL allocation routines for standard ioctl processing.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 1895a42509e8ea96946c10bbe4fc0d03ca8a044d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1895a42509e8ea96946c10bbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 22:45:06 2015 +0900 ntoskrnl: Use the MDL allocation routines for standard ioctl processing. --- dlls/ntoskrnl.exe/ntoskrnl.c | 56 +++++++++++++++++++++++++++----------------- include/ddk/wdm.h | 2 ++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9734296..a282b37 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -140,7 +140,6 @@ static HANDLE get_device_manager(void) static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, void *out_buff, ULONG *out_size ) { - MDL mdl; IRP *irp; void *sys_buff = NULL; FILE_OBJECT file; @@ -150,7 +149,6 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, *out_size ); /* so we can spot things that we should initialize */ - memset( &mdl, 0x77, sizeof(mdl) ); memset( &file, 0x88, sizeof(file) ); if ((code & 3) == METHOD_BUFFERED) @@ -170,18 +168,13 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = ((code & 3) == METHOD_BUFFERED) ? sys_buff : in_buff; irp->UserBuffer = out_buff; - irp->MdlAddress = &mdl; irp->Tail.Overlay.OriginalFileObject = &file; - mdl.Next = NULL; - mdl.Size = 0; - mdl.StartVa = out_buff; - mdl.ByteCount = *out_size; - mdl.ByteOffset = 0; - file.FsContext = NULL; file.FsContext2 = NULL; + IoAllocateMdl( out_buff, *out_size, FALSE, FALSE, irp ); + device->CurrentIrp = irp; KeQueryTickCount( &count ); /* update the global KeTickCount */ @@ -385,8 +378,18 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) */ void WINAPI IoFreeIrp( IRP *irp ) { + MDL *mdl; + TRACE( "%p\n", irp ); + mdl = irp->MdlAddress; + while (mdl) + { + MDL *next = mdl->Next; + IoFreeMdl( mdl ); + mdl = next; + } + ExFreePool( irp ); } @@ -404,24 +407,21 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) /*********************************************************************** * IoAllocateMdl (NTOSKRNL.EXE.@) */ -PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) +PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN charge_quota, IRP *irp ) { PMDL mdl; - ULONG_PTR address = (ULONG_PTR)VirtualAddress; + ULONG_PTR address = (ULONG_PTR)va; ULONG_PTR page_address; SIZE_T nb_pages, mdl_size; - TRACE("(%p, %u, %i, %i, %p)\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp); - if (Irp) - FIXME("Attaching the MDL to an IRP is not yet supported\n"); - - if (ChargeQuota) + if (charge_quota) FIXME("Charge quota is not yet supported\n"); /* FIXME: We suppose that page size is 4096 */ page_address = address & ~(4096 - 1); - nb_pages = (((address + Length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; + nb_pages = (((address + length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); @@ -430,11 +430,24 @@ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN Secondary return NULL; mdl->Size = mdl_size; - mdl->Process = IoGetCurrentProcess(); + mdl->Process = NULL; /* FIXME: IoGetCurrentProcess */ mdl->StartVa = (PVOID)page_address; - mdl->ByteCount = Length; + mdl->ByteCount = length; mdl->ByteOffset = address - page_address; + if (!irp) return mdl; + + if (secondary) /* add it at the end */ + { + MDL **pmdl = &irp->MdlAddress; + while (*pmdl) pmdl = &(*pmdl)->Next; + *pmdl = mdl; + } + else + { + mdl->Next = irp->MdlAddress; + irp->MdlAddress = mdl; + } return mdl; } @@ -442,10 +455,9 @@ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN Secondary /*********************************************************************** * IoFreeMdl (NTOSKRNL.EXE.@) */ -VOID WINAPI IoFreeMdl(PMDL mdl) +void WINAPI IoFreeMdl(PMDL mdl) { - FIXME("partial stub: %p\n", mdl); - + TRACE("%p\n", mdl); HeapFree(GetProcessHeap(), 0, mdl); } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 661b75e..c234375 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1199,6 +1199,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); @@ -1209,6 +1210,7 @@ void WINAPI IoDeleteDevice(DEVICE_OBJECT*); void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); +void WINAPI IoFreeMdl(MDL*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*);

1 0

Alexandre Julliard : ntoskrnl: Get rid of the IRP instance list.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: a85d23bfc345dfa25f615a172740581515dab504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85d23bfc345dfa25f615a172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 22:22:14 2015 +0900 ntoskrnl: Get rid of the IRP instance list. --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a282b37..65702aa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -64,14 +64,6 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); -static struct list Irps = LIST_INIT(Irps); - -struct IrpInstance -{ - struct list entry; - IRP *irp; -}; - /* tid of the thread running client request */ static DWORD request_thread; @@ -496,7 +488,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, { PIRP irp; PIO_STACK_LOCATION irpsp; - struct IrpInstance *instance; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); @@ -508,15 +499,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = internal ? IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; irpsp->Parameters.DeviceIoControl.IoControlCode = code; @@ -540,7 +522,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, PKEVENT event, PIO_STATUS_BLOCK iosb) { PIRP irp; - struct IrpInstance *instance; PIO_STACK_LOCATION irpsp; FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); @@ -549,15 +530,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ @@ -987,7 +959,6 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; IO_STATUS_BLOCK *iosb; - struct IrpInstance *instance; NTSTATUS status, stat; int call_flag = 0; @@ -1025,16 +996,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) iosb->u.Status = irp->IoStatus.u.Status; if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; } - LIST_FOR_EACH_ENTRY( instance, &Irps, struct IrpInstance, entry ) - { - if (instance->irp == irp) - { - list_remove( &instance->entry ); - HeapFree( GetProcessHeap(), 0, instance ); - IoFreeIrp( irp ); - break; - } - } + IoFreeIrp( irp ); }

1 0

Michael Stefaniuc : ieframe: Remove unused assignments (PVS-Studio).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 51e3750feae9af56526d20ce854362bf0012d379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3750feae9af56526d20ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:38:43 2015 +0100 ieframe: Remove unused assignments (PVS-Studio). --- dlls/ieframe/intshcut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index d4b71a7..a780fea 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -504,7 +504,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - r = get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); + get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); if (iconfile != NULL) { PROPSPEC ps; @@ -522,7 +522,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam CoTaskMemFree(iconfile); } - r = get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); + get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); if (iconindexstring != NULL) {

1 0

Michael Stefaniuc : crypt32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 89569b4b340af2c94e1d1fad36c9d335f94284ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=89569b4b340af2c94e1d1fad3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:05:54 2015 +0100 crypt32/tests: Remove an unused assignment (PVS-Studio). --- dlls/crypt32/tests/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 259361c..da32a74 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2874,7 +2874,7 @@ static void testGetValidUsages(void) oids[i]); HeapFree(GetProcessHeap(), 0, oids); } - numOIDs = size = 0xdeadbeef; + numOIDs = 0xdeadbeef; /* Oddly enough, this crashes when the number of contexts is not 1: ret = pCertGetValidUsages(2, contexts, &numOIDs, NULL, &size); * but setting size to 0 allows it to succeed:

1 0

Sebastian Lackner : ntdll: Assert when trying to replace an exiting file descriptor in fd_cache.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: bf65fef8bcd51459090724f65148571fa1da09c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf65fef8bcd51459090724f65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 02:36:45 2015 +0100 ntdll: Assert when trying to replace an exiting file descriptor in fd_cache. --- dlls/ntdll/server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2c99cbe..69d01be 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -821,7 +821,6 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); - int prev_fd; if (entry >= FD_CACHE_ENTRIES) { @@ -841,11 +840,11 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, } } /* store fd+1 so that 0 can be used as the unset value */ - prev_fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ) - 1; + fd = interlocked_xchg( &fd_cache[entry][idx].fd, fd + 1 ); fd_cache[entry][idx].type = type; fd_cache[entry][idx].access = access; fd_cache[entry][idx].options = options; - if (prev_fd != -1) close( prev_fd ); + assert( !fd ); return TRUE; }

1 0

Nikolay Sivov : rpcrt4: Implement MesBufferHandleReset().
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: d240fdff18704298fd76f37d09a2ec704ab0addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d240fdff18704298fd76f37d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 22:49:07 2015 +0300 rpcrt4: Implement MesBufferHandleReset(). --- dlls/rpcrt4/ndr_es.c | 34 ++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 22 ++++++++++++++++++++++ include/midles.h | 3 ++- 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 73bd867..e3cd48a 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -124,6 +124,40 @@ RPC_STATUS WINAPI MesIncrementalHandleReset( } /*********************************************************************** + * MesBufferHandleReset [RPCRT4.@] + */ +RPC_STATUS WINAPI MesBufferHandleReset(handle_t Handle, ULONG HandleStyle, + MIDL_ES_CODE Operation, char **Buffer, ULONG BufferSize, ULONG *EncodedSize) +{ + MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; + + TRACE("(%p, %u, %d, %p, %u, %p)\n", Handle, HandleStyle, Operation, Buffer, + BufferSize, EncodedSize); + + if (!Handle || !Buffer || !EncodedSize) + return RPC_S_INVALID_ARG; + + if (Operation != MES_ENCODE && Operation != MES_DECODE && Operation != MES_ENCODE_NDR64) + return RPC_S_INVALID_ARG; + + if (HandleStyle != MES_FIXED_BUFFER_HANDLE && HandleStyle != MES_DYNAMIC_BUFFER_HANDLE) + return RPC_S_INVALID_ARG; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = Operation; + pEsMsg->HandleStyle = HandleStyle; + if (HandleStyle == MES_FIXED_BUFFER_HANDLE) + pEsMsg->Buffer = (unsigned char*)*Buffer; + else + pEsMsg->pDynBuffer = (unsigned char**)Buffer; + pEsMsg->BufferSize = BufferSize; + pEsMsg->pEncodedSize = EncodedSize; + + return RPC_S_OK; +} + +/*********************************************************************** * MesHandleFree [RPCRT4.@] */ RPC_STATUS WINAPI MesHandleFree(handle_t Handle) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 378b277..c42fd8b 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -96,7 +96,7 @@ @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen -@ stub MesBufferHandleReset +@ stdcall MesBufferHandleReset(ptr long long ptr long ptr) @ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) @ stdcall MesEncodeDynBufferHandleCreate(ptr ptr ptr) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index fd1cbbb..315a452 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2437,6 +2437,28 @@ if (status == RPC_S_OK) status = MesEncodeFixedBufferHandleCreate(buffer, 32, &encoded_size, &handle); ok(status == RPC_S_OK, "got %d\n", status); + status = MesBufferHandleReset(NULL, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + /* convert to dynamic buffer handle */ + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_OK, "got %d\n", status); + + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + NULL, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE, MES_ENCODE, + &buffer, 32, NULL); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + + /* invalid handle type */ + status = MesBufferHandleReset(handle, MES_DYNAMIC_BUFFER_HANDLE+1, MES_ENCODE, + &buffer, 32, &encoded_size); + ok(status == RPC_S_INVALID_ARG, "got %d\n", status); + status = MesHandleFree(handle); ok(status == RPC_S_OK, "got %d\n", status); } diff --git a/include/midles.h b/include/midles.h index 99b2eff..4cf3ddc 100644 --- a/include/midles.h +++ b/include/midles.h @@ -30,7 +30,8 @@ extern "C" { typedef enum { MES_ENCODE, - MES_DECODE + MES_DECODE, + MES_ENCODE_NDR64 } MIDL_ES_CODE; typedef enum

1 0

Christian Costa : windowscodecs: Fix init of LONGLONG variable with a negative value in TGA decoder.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: cc95915a3c2a09fa44b7a9bc5424ecb60b060a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc95915a3c2a09fa44b7a9bc5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jan 15 09:57:18 2015 +0100 windowscodecs: Fix init of LONGLONG variable with a negative value in TGA decoder. --- dlls/windowscodecs/tgaformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index f2a867a..2b8cb1a 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -292,7 +292,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p This->image_offset = This->colormap_offset + This->colormap_length; /* Read footer if there is one */ - seek.QuadPart = -sizeof(tga_footer); + seek.QuadPart = -(LONGLONG)sizeof(tga_footer); hr = IStream_Seek(pIStream, seek, STREAM_SEEK_END, NULL); if (SUCCEEDED(hr)) {

1 0

Alexandre Julliard : wininet: Hardcode the base64 table to avoid ugly macros.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 5bf29fb897339a4927cbeac8b5a53d8048e7ceb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf29fb897339a4927cbeac8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 17:07:24 2015 +0900 wininet: Hardcode the base64 table to avoid ugly macros. --- dlls/wininet/http.c | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c0785b9..328882e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1555,40 +1555,17 @@ static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 ) return n; } -#define CH(x) (((x) >= 'A' && (x) <= 'Z') ? (x) - 'A' : \ - ((x) >= 'a' && (x) <= 'z') ? (x) - 'a' + 26 : \ - ((x) >= '0' && (x) <= '9') ? (x) - '0' + 52 : \ - ((x) == '+') ? 62 : ((x) == '/') ? 63 : -1) -static const signed char HTTP_Base64Dec[256] = -{ - CH( 0),CH( 1),CH( 2),CH( 3),CH( 4),CH( 5),CH( 6),CH( 7),CH( 8),CH( 9), - CH(10),CH(11),CH(12),CH(13),CH(14),CH(15),CH(16),CH(17),CH(18),CH(19), - CH(20),CH(21),CH(22),CH(23),CH(24),CH(25),CH(26),CH(27),CH(28),CH(29), - CH(30),CH(31),CH(32),CH(33),CH(34),CH(35),CH(36),CH(37),CH(38),CH(39), - CH(40),CH(41),CH(42),CH(43),CH(44),CH(45),CH(46),CH(47),CH(48),CH(49), - CH(50),CH(51),CH(52),CH(53),CH(54),CH(55),CH(56),CH(57),CH(58),CH(59), - CH(60),CH(61),CH(62),CH(63),CH(64),CH(65),CH(66),CH(67),CH(68),CH(69), - CH(70),CH(71),CH(72),CH(73),CH(74),CH(75),CH(76),CH(77),CH(78),CH(79), - CH(80),CH(81),CH(82),CH(83),CH(84),CH(85),CH(86),CH(87),CH(88),CH(89), - CH(90),CH(91),CH(92),CH(93),CH(94),CH(95),CH(96),CH(97),CH(98),CH(99), - CH(100),CH(101),CH(102),CH(103),CH(104),CH(105),CH(106),CH(107),CH(108),CH(109), - CH(110),CH(111),CH(112),CH(113),CH(114),CH(115),CH(116),CH(117),CH(118),CH(119), - CH(120),CH(121),CH(122),CH(123),CH(124),CH(125),CH(126),CH(127),CH(128),CH(129), - CH(130),CH(131),CH(132),CH(133),CH(134),CH(135),CH(136),CH(137),CH(138),CH(139), - CH(140),CH(141),CH(142),CH(143),CH(144),CH(145),CH(146),CH(147),CH(148),CH(149), - CH(150),CH(151),CH(152),CH(153),CH(154),CH(155),CH(156),CH(157),CH(158),CH(159), - CH(160),CH(161),CH(162),CH(163),CH(164),CH(165),CH(166),CH(167),CH(168),CH(169), - CH(170),CH(171),CH(172),CH(173),CH(174),CH(175),CH(176),CH(177),CH(178),CH(179), - CH(180),CH(181),CH(182),CH(183),CH(184),CH(185),CH(186),CH(187),CH(188),CH(189), - CH(190),CH(191),CH(192),CH(193),CH(194),CH(195),CH(196),CH(197),CH(198),CH(199), - CH(200),CH(201),CH(202),CH(203),CH(204),CH(205),CH(206),CH(207),CH(208),CH(209), - CH(210),CH(211),CH(212),CH(213),CH(214),CH(215),CH(216),CH(217),CH(218),CH(219), - CH(220),CH(221),CH(222),CH(223),CH(224),CH(225),CH(226),CH(227),CH(228),CH(229), - CH(230),CH(231),CH(232),CH(233),CH(234),CH(235),CH(236),CH(237),CH(238),CH(239), - CH(240),CH(241),CH(242),CH(243),CH(244),CH(245),CH(246),CH(247),CH(248), CH(249), - CH(250),CH(251),CH(252),CH(253),CH(254),CH(255), +static const signed char HTTP_Base64Dec[] = +{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70 */ }; -#undef CH /*********************************************************************** * HTTP_DecodeBase64

1 0