October 2008 - Wine-commits

Michael Karcher : msxml3: Handle all variant types in IXMLDOMDocument:: createNode.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 91513caa16f5c5c523a312e05920e4ea943cf4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91513caa16f5c5c523a312e05… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 7 11:55:57 2008 +0200 msxml3: Handle all variant types in IXMLDOMDocument::createNode. --- dlls/msxml3/domdoc.c | 22 ++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3c5aede..41cd856 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1110,13 +1110,19 @@ static HRESULT WINAPI domdoc_getElementsByTagName( return hr; } -static DOMNodeType get_node_type(VARIANT Type) +static HRESULT get_node_type(VARIANT Type, DOMNodeType * type) { - if(V_VT(&Type) == VT_I4) - return V_I4(&Type); + VARIANT tmp; + HRESULT hr; + + VariantInit(&tmp); + hr = VariantChangeType(&tmp, &Type, 0, VT_I4); + if(FAILED(hr)) + return E_INVALIDARG; + + *type = V_I4(&tmp); - FIXME("Unsupported variant type %x\n", V_VT(&Type)); - return 0; + return S_OK; } static HRESULT WINAPI domdoc_createNode( @@ -1130,10 +1136,14 @@ static HRESULT WINAPI domdoc_createNode( DOMNodeType node_type; xmlNodePtr xmlnode = NULL; xmlChar *xml_name; + HRESULT hr; TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); - node_type = get_node_type(Type); + hr = get_node_type(Type, &node_type); + if(FAILED(hr)) + return hr; + TRACE("node_type %d\n", node_type); xml_name = xmlChar_from_wchar((WCHAR*)name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 056c91b..1645e2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1353,6 +1353,8 @@ static void test_refs(void) static void test_create(void) { + static const WCHAR szOne[] = {'1',0}; + static const WCHAR szOneGarbage[] = {'1','G','a','r','b','a','g','e',0}; HRESULT r; VARIANT var; BSTR str, name; @@ -1369,6 +1371,36 @@ static void test_create(void) if( r != S_OK ) return; + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + + V_VT(&var) = VT_R4; + V_R4(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szOne ); + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szOneGarbage ); + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + VariantClear(&var); + V_VT(&var) = VT_I4; V_I4(&var) = NODE_ELEMENT; str = SysAllocString( szlc );

1 0

Alexander Morozov : include: Add some definitions.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 332105331ae15b3fbb949df75851bda3106ee356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332105331ae15b3fbb949df75… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Oct 3 17:46:51 2008 +0400 include: Add some definitions. --- include/ddk/wdm.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 19d799b..3e4528b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -28,6 +28,8 @@ #define POINTER_ALIGNMENT #endif +typedef LONG KPRIORITY; + typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; struct _KDPC; @@ -84,6 +86,44 @@ typedef struct _KDEVICE_QUEUE { BOOLEAN Busy; } KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; +typedef struct _KMUTANT { + DISPATCHER_HEADER Header; + LIST_ENTRY MutantListEntry; + struct _KTHREAD *RESTRICTED_POINTER OwnerThread; + BOOLEAN Abandoned; + UCHAR ApcDisable; +} KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT, KMUTEX, *PKMUTEX, *RESTRICTED_POINTER PRKMUTEX; + +typedef enum _KWAIT_REASON +{ + Executive, + FreePage, + PageIn, + PoolAllocation, + DelayExecution, + Suspended, + UserRequest, + WrExecutive, + WrFreePage, + WrPageIn, + WrDelayExecution, + WrSuspended, + WrUserRequest, + WrQueue, + WrLpcReceive, + WrLpcReply, + WrVirtualMemory, + WrPageOut, + WrRendezvous, + Spare2, + Spare3, + Spare4, + Spare5, + Spare6, + WrKernel, + MaximumWaitReason, +} KWAIT_REASON; + typedef struct _IO_TIMER *PIO_TIMER; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD; @@ -183,11 +223,49 @@ typedef struct _WAIT_CONTEXT_BLOCK { #define IRP_MJ_SET_QUOTA 0x1a #define IRP_MJ_PNP 0x1b +#define IRP_MN_START_DEVICE 0x00 +#define IRP_MN_QUERY_REMOVE_DEVICE 0x01 +#define IRP_MN_REMOVE_DEVICE 0x02 +#define IRP_MN_CANCEL_REMOVE_DEVICE 0x03 +#define IRP_MN_STOP_DEVICE 0x04 +#define IRP_MN_QUERY_STOP_DEVICE 0x05 +#define IRP_MN_CANCEL_STOP_DEVICE 0x06 +#define IRP_MN_QUERY_DEVICE_RELATIONS 0x07 +#define IRP_MN_QUERY_INTERFACE 0x08 +#define IRP_MN_QUERY_CAPABILITIES 0x09 +#define IRP_MN_QUERY_RESOURCES 0x0A +#define IRP_MN_QUERY_RESOURCE_REQUIREMENTS 0x0B +#define IRP_MN_QUERY_DEVICE_TEXT 0x0C +#define IRP_MN_FILTER_RESOURCE_REQUIREMENTS 0x0D +#define IRP_MN_READ_CONFIG 0x0F +#define IRP_MN_WRITE_CONFIG 0x10 +#define IRP_MN_EJECT 0x11 +#define IRP_MN_SET_LOCK 0x12 +#define IRP_MN_QUERY_ID 0x13 +#define IRP_MN_QUERY_PNP_DEVICE_STATE 0x14 +#define IRP_MN_QUERY_BUS_INFORMATION 0x15 +#define IRP_MN_DEVICE_USAGE_NOTIFICATION 0x16 +#define IRP_MN_SURPRISE_REMOVAL 0x17 + #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 #define IRP_ALLOCATED_FIXED_SIZE 0x04 #define IRP_LOOKASIDE_ALLOCATION 0x08 +#define IO_TYPE_ADAPTER 0x01 +#define IO_TYPE_CONTROLLER 0x02 +#define IO_TYPE_DEVICE 0x03 +#define IO_TYPE_DRIVER 0x04 +#define IO_TYPE_FILE 0x05 +#define IO_TYPE_IRP 0x06 +#define IO_TYPE_MASTER_ADAPTER 0x07 +#define IO_TYPE_OPEN_PACKET 0x08 +#define IO_TYPE_TIMER 0x09 +#define IO_TYPE_VPB 0x0a +#define IO_TYPE_ERROR_LOG 0x0b +#define IO_TYPE_ERROR_MESSAGE 0x0c +#define IO_TYPE_DEVICE_OBJECT_EXTENSION 0x0d + typedef struct _DEVICE_OBJECT { CSHORT Type; USHORT Size; @@ -685,6 +763,11 @@ typedef NTSTATUS (WINAPI *PIO_COMPLETION_ROUTINE)( IN struct _IRP *Irp, IN PVOID Context); +#define SL_PENDING_RETURNED 0x01 +#define SL_INVOKE_ON_CANCEL 0x20 +#define SL_INVOKE_ON_SUCCESS 0x40 +#define SL_INVOKE_ON_ERROR 0x80 + #include <pshpack1.h> typedef struct _IO_STACK_LOCATION { UCHAR MajorFunction;

1 0

Alexander Morozov : include: Add usb.h, usb100.h, usb200.h and usbdlib.h.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 626de2b35a0a4ab36aaf01767bc5b279a6c390bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=626de2b35a0a4ab36aaf01767… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Oct 3 17:48:42 2008 +0400 include: Add usb.h, usb100.h, usb200.h and usbdlib.h. --- include/Makefile.in | 4 + include/ddk/usb.h | 342 +++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/usb100.h | 101 +++++++++++++++ include/ddk/usb200.h | 24 ++++ include/ddk/usbdlib.h | 28 ++++ 5 files changed, 499 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=626de2b35a0a4ab36aaf0…

1 0

Alexander Morozov : ntoskrnl.exe: Implement some functions.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 2e917e3a3c82e3f3cb7d9a5980c523418de12908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e917e3a3c82e3f3cb7d9a598… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Oct 3 17:51:26 2008 +0400 ntoskrnl.exe: Implement some functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 179 ++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- 2 files changed, 177 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1751233..9af2f16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -34,6 +34,7 @@ #include "ddk/ntddk.h" #include "wine/unicode.h" #include "wine/server.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -54,6 +55,14 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +static struct list Irps = LIST_INIT(Irps); + +struct IrpInstance +{ + struct list entry; + IRP *irp; +}; + #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ __ASM_GLOBAL_FUNC( name, \ @@ -253,7 +262,17 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) */ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) { - FIXME( "%p, %u, %d\n", irp, size, stack_size ); + TRACE( "%p, %u, %d\n", irp, size, stack_size ); + + RtlZeroMemory( irp, size ); + + irp->Type = IO_TYPE_IRP; + irp->Size = size; + InitializeListHead( &irp->ThreadListEntry ); + irp->StackCount = stack_size; + irp->CurrentLocation = stack_size + 1; + irp->Tail.Overlay.s.u.CurrentStackLocation = + (PIO_STACK_LOCATION)(irp + 1) + stack_size; } @@ -262,8 +281,20 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { - FIXME( "%d, %d\n", stack_size, charge_quota ); - return NULL; + SIZE_T size; + PIRP irp; + + TRACE( "%d, %d\n", stack_size, charge_quota ); + + size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + irp = ExAllocatePool( NonPagedPool, size ); + if (irp != NULL) + IoInitializeIrp( irp, size, stack_size ); + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (charge_quota) + irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; + + return irp; } @@ -272,7 +303,9 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) */ void WINAPI IoFreeIrp( IRP *irp ) { - FIXME( "%p\n", irp ); + TRACE( "%p\n", irp ); + + ExFreePool( irp ); } @@ -297,6 +330,68 @@ PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) /*********************************************************************** + * IoAttachDeviceToDeviceStack (NTOSKRNL.EXE.@) + */ +PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack( DEVICE_OBJECT *source, + DEVICE_OBJECT *target ) +{ + TRACE( "%p, %p\n", source, target ); + target->AttachedDevice = source; + source->StackSize = target->StackSize + 1; + return target; +} + + +/*********************************************************************** + * 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 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 ); + + if (DeviceObject == NULL) + return NULL; + + irp = IoAllocateIrp( DeviceObject->StackSize, FALSE ); + 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 = irp->Tail.Overlay.s.u.CurrentStackLocation - 1; + irpsp->MajorFunction = InternalDeviceIoControl ? + IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; + irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode; + irp->UserIosb = IoStatusBlock; + irp->UserEvent = Event; + + return irp; +} + + +/*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) @@ -462,6 +557,31 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc /*********************************************************************** + * IofCallDriver (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCallDriver ) +NTSTATUS WINAPI __regs_IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#else +NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) +#endif +{ + PDRIVER_DISPATCH dispatch; + IO_STACK_LOCATION *irpsp; + NTSTATUS status; + + TRACE( "%p %p\n", device, irp ); + + --irp->CurrentLocation; + irpsp = --irp->Tail.Overlay.s.u.CurrentStackLocation; + dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; + status = dispatch( device, irp ); + + return status; +} + + +/*********************************************************************** * IoGetRelatedDeviceObject (NTOSKRNL.EXE.@) */ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) @@ -512,8 +632,57 @@ void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) #endif { + IO_STACK_LOCATION *irpsp; + PIO_COMPLETION_ROUTINE routine; + IO_STATUS_BLOCK *iosb; + struct IrpInstance *instance; + NTSTATUS status, stat; + int call_flag = 0; + TRACE( "%p %u\n", irp, priority_boost ); - /* nothing to do for now */ + + iosb = irp->UserIosb; + status = irp->IoStatus.u.Status; + while (irp->CurrentLocation <= irp->StackCount) + { + irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + routine = irpsp->CompletionRoutine; + call_flag = 0; + /* FIXME: add SL_INVOKE_ON_CANCEL support */ + if (routine) + { + if ((irpsp->Control & SL_INVOKE_ON_SUCCESS) && STATUS_SUCCESS == status) + call_flag = 1; + if ((irpsp->Control & SL_INVOKE_ON_ERROR) && STATUS_SUCCESS != status) + call_flag = 1; + } + ++irp->CurrentLocation; + ++irp->Tail.Overlay.s.u.CurrentStackLocation; + if (call_flag) + { + TRACE( "calling %p( %p, %p, %p )\n", routine, + irpsp->DeviceObject, irp, irpsp->Context ); + stat = routine( irpsp->DeviceObject, irp, irpsp->Context ); + TRACE( "CompletionRoutine returned %x\n", status ); + if (STATUS_MORE_PROCESSING_REQUIRED == stat) + return; + } + } + if (iosb && STATUS_SUCCESS == status) + { + iosb->u.Status = irp->IoStatus.u.Status; + 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; + } + } } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bdd1537..7d543d4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -39,7 +39,7 @@ @ stub IoReadPartitionTable @ stub IoSetPartitionInformation @ stub IoWritePartitionTable -@ stub IofCallDriver +@ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @@ -317,10 +317,10 @@ @ stub IoAssignResources @ stub IoAttachDevice @ stub IoAttachDeviceByPointer -@ stub IoAttachDeviceToDeviceStack +@ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe @ stub IoBuildAsynchronousFsdRequest -@ stub IoBuildDeviceIoControlRequest +@ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl @ stub IoBuildSynchronousFsdRequest @ stub IoCallDriver

1 0

Michael Karcher : msxml3/tests: Valgrind fix.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 2a21579b081400aa9cd198152e8c868c539d7f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a21579b081400aa9cd198152… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 7 11:54:45 2008 +0200 msxml3/tests: Valgrind fix. --- dlls/msxml3/tests/domdoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1ad168b..57d8689 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1565,7 +1565,8 @@ static void test_getElementsByTagName(void) r = IDispatchEx_GetMemberName(dispex, dispid, &sName); ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - SysFreeString(sName); + if( SUCCEEDED(r) ) + SysFreeString(sName); r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r);

1 0

Michael Karcher : msxml3: Basic implementation of IXMLDOMNode::replaceChild .
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 6fe686f599a013026cf2a5cff50690f11ae88ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe686f599a013026cf2a5cff… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 7 11:55:01 2008 +0200 msxml3: Basic implementation of IXMLDOMNode::replaceChild. --- dlls/msxml3/node.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++--------- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b82ef55..27c8e53 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -610,6 +610,9 @@ static HRESULT WINAPI xmlnode_replaceChild( IXMLDOMNode** outOldChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlNode *old_child_ptr, *new_child_ptr; + xmlDocPtr leaving_doc; + xmlNode *my_ancestor; TRACE("%p->(%p,%p,%p)\n",This,newChild,oldChild,outOldChild); @@ -618,8 +621,40 @@ static HRESULT WINAPI xmlnode_replaceChild( if(!newChild || !oldChild) return E_INVALIDARG; - FIXME("not implemented\n"); - return E_NOTIMPL; + if(outOldChild) + *outOldChild = NULL; + + old_child_ptr = impl_from_IXMLDOMNode(oldChild)->node; + if(old_child_ptr->parent != This->node) + { + WARN("childNode %p is not a child of %p\n", oldChild, iface); + return E_INVALIDARG; + } + + new_child_ptr = impl_from_IXMLDOMNode(newChild)->node; + my_ancestor = This->node; + while(my_ancestor) + { + if(my_ancestor == new_child_ptr) + { + WARN("tried to create loop\n"); + return E_FAIL; + } + my_ancestor = my_ancestor->parent; + } + + leaving_doc = new_child_ptr->doc; + xmldoc_add_ref(old_child_ptr->doc); + xmlReplaceNode(old_child_ptr, new_child_ptr); + xmldoc_release(leaving_doc); + + if(outOldChild) + { + IXMLDOMNode_AddRef(oldChild); + *outOldChild = oldChild; + } + + return S_OK; } static HRESULT WINAPI xmlnode_removeChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 57d8689..85c19cc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1843,7 +1843,7 @@ static void test_replaceChild(void) VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMElement *element; - IXMLDOMNode *fo_node, *ba_node, *removed_node, *temp_node; + IXMLDOMNode *fo_node, *ba_node, *lc_node, *removed_node, *temp_node; IXMLDOMNodeList *root_list, *fo_list; IUnknown * unk1, *unk2; long len; @@ -1865,6 +1865,9 @@ static void test_replaceChild(void) r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); + r = IXMLDOMNodeList_get_item( root_list, 0, &lc_node ); + ok( r == S_OK, "ret %08x\n", r); + r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node ); ok( r == S_OK, "ret %08x\n", r); @@ -1890,13 +1893,14 @@ static void test_replaceChild(void) /* invalid parameter: OldNode is not a child */ removed_node = (void*)0xdeadbeef; - r = IXMLDOMElement_replaceChild( element, ba_node, ba_node, &removed_node ); - todo_wine ok( r == E_INVALIDARG, "ret %08x\n", r ); - if( r == E_NOTIMPL) - { - skip("replaceChild not implemented\n"); - return; - } + r = IXMLDOMElement_replaceChild( element, lc_node, ba_node, &removed_node ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + ok( removed_node == NULL, "%p\n", removed_node ); + + /* invalid parameter: would create loop */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMNode_replaceChild( fo_node, fo_node, ba_node, &removed_node ); + ok( r == E_FAIL, "ret %08x\n", r ); ok( removed_node == NULL, "%p\n", removed_node ); r = IXMLDOMElement_replaceChild( element, ba_node, fo_node, NULL ); @@ -1912,7 +1916,7 @@ static void test_replaceChild(void) ok( r == S_OK, "ret %08x\n", r ); r = IXMLDOMNode_QueryInterface( ba_node, &IID_IUnknown, (void**)&unk2); ok( r == S_OK, "ret %08x\n", r ); - ok( unk1 == unk2, "unk1 %p unk2 %p\n", unk1, unk2); + todo_wine ok( unk1 == unk2, "unk1 %p unk2 %p\n", unk1, unk2); IUnknown_Release( unk1 ); IUnknown_Release( unk2 );

1 0

Jacek Caban : jscript: Added a few missing allocation checks (Coverity).
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: ec35d3ab38c5746b233057bf849021b043f48dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec35d3ab38c5746b233057bf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 09:57:20 2008 -0500 jscript: Added a few missing allocation checks (Coverity). --- dlls/jscript/array.c | 6 +++++- dlls/jscript/jscript.c | 2 ++ dlls/jscript/number.c | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 11c8b95..43cc61f 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -744,9 +744,13 @@ static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISP static HRESULT alloc_array(script_ctx_t *ctx, BOOL use_constr, ArrayInstance **ret) { - ArrayInstance *array = heap_alloc_zero(sizeof(ArrayInstance)); + ArrayInstance *array; HRESULT hres; + array = heap_alloc_zero(sizeof(ArrayInstance)); + if(!array) + return E_OUTOFMEMORY; + if(use_constr) hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); else diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 3730661..41fb40f 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -758,6 +758,8 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn lock_module(); ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; ret->lpIActiveScriptVtbl = &JScriptVtbl; ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 974d309..598de42 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -231,9 +231,13 @@ static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT alloc_number(script_ctx_t *ctx, BOOL use_constr, NumberInstance **ret) { - NumberInstance *number = heap_alloc_zero(sizeof(NumberInstance)); + NumberInstance *number; HRESULT hres; + number = heap_alloc_zero(sizeof(NumberInstance)); + if(!number) + return E_OUTOFMEMORY; + if(use_constr) hres = init_dispex_from_constr(&number->dispex, ctx, &Number_info, ctx->number_constr); else

1 0

Jacek Caban : jscript: Fixed compare function check in Array.sort (Coverity ).
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 0c20b1d0a11161027983d3af9e14181b846d0cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c20b1d0a11161027983d3af9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 09:57:39 2008 -0500 jscript: Fixed compare function check in Array.sort (Coverity). --- dlls/jscript/array.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 43cc61f..c4d7399 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -433,9 +433,10 @@ static HRESULT Array_sort(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS cmp_func = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); - if(!is_class(cmp_func, JSCLASS_FUNCTION)) { + if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { WARN("cmp_func is not a function\n"); - jsdisp_release(cmp_func); + if(cmp_func) + jsdisp_release(cmp_func); return E_FAIL; } }

1 0

Alexander Morozov : ntoskrnl.exe: Initialize StackSize field of DEVICE_OBJECT structure.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: 1be805bee58b2c2c57c2a9b4f99583d4249c266c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be805bee58b2c2c57c2a9b4f… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Oct 3 16:26:25 2008 +0400 ntoskrnl.exe: Initialize StackSize field of DEVICE_OBJECT structure. --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 123a558..1751233 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -379,6 +379,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, device->DriverObject = driver; device->DeviceExtension = device + 1; device->DeviceType = type; + device->StackSize = 1; device->Reserved = handle; device->NextDevice = driver->DeviceObject;

1 0

James Hawkins : msi: Don' t update the table columns if there are no more columns.
by Alexandre Julliard 07 Oct '08

07 Oct '08

Module: wine Branch: master Commit: e88b09a3421a2cb72d03f8a591c38e8deced5796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88b09a3421a2cb72d03f8a59… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Oct 7 01:52:00 2008 -0500 msi: Don't update the table columns if there are no more columns. This should fix the heap corruption that caused intermittent crashes for patchwatcher. --- dlls/msi/table.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index edd0519..0309165 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -585,6 +585,8 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO if( r != ERROR_SUCCESS ) return r; + *pcount = column_count; + /* if there's no columns, there's no table */ if( column_count == 0 ) return ERROR_INVALID_PARAMETER; @@ -603,7 +605,6 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO } *pcols = columns; - *pcount = column_count; return r; } @@ -1034,6 +1035,9 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) msi_free( table->colinfo ); table_get_column_info( db, name, &table->colinfo, &table->col_count ); + if (!table->col_count) + return; + size = msi_table_get_row_size( db, table->colinfo, table->col_count ); offset = table->colinfo[table->col_count - 1].offset;

1 0