September 2008 - Wine-Commits

Jim Cameron : ntoskrnl.exe: Add stub for IoRegisterDriverReinitialization() .
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 9a4d1d15cf76c4fd1aa861cd6868c48353e0345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4d1d15cf76c4fd1aa861cd6… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 23:31:58 2008 +0100 ntoskrnl.exe: Add stub for IoRegisterDriverReinitialization(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fca424d..beaa6ad 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -31,7 +31,7 @@ #include "windef.h" #include "winternl.h" #include "excpt.h" -#include "ddk/wdm.h" +#include "ddk/ntddk.h" #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" @@ -471,6 +471,15 @@ PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) /*********************************************************************** + * IoRegisterDriverReinitialization (NTOSKRNL.EXE.@) + */ +void WINAPI IoRegisterDriverReinitialization( PDRIVER_OBJECT obj, PDRIVER_REINITIALIZE reinit, PVOID context ) +{ + FIXME( "stub: %p %p %p\n", obj, reinit, context ); +} + + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c370004..6fa960b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -426,7 +426,7 @@ @ stub IoReadTransferCount @ stub IoRegisterBootDriverReinitialization @ stub IoRegisterDeviceInterface -@ stub IoRegisterDriverReinitialization +@ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) @ stub IoRegisterFileSystem @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 47b6b1e..b93b51e 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -46,4 +46,8 @@ typedef enum _BUS_DATA_TYPE MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; +typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); + +void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); + #endif

1 0

Jim Cameron : ntoskrnl.exe: Add stub for IoRegisterShutdownNotification().
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 4f39948f7b6270a2359975bac93444a2f091e76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f39948f7b6270a2359975bac… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 23:36:35 2008 +0100 ntoskrnl.exe: Add stub for IoRegisterShutdownNotification(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index beaa6ad..c2d5f0b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -480,6 +480,16 @@ void WINAPI IoRegisterDriverReinitialization( PDRIVER_OBJECT obj, PDRIVER_REINIT /*********************************************************************** + * IoRegisterShutdownNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterShutdownNotification( PDEVICE_OBJECT obj ) +{ + FIXME( "stub: %p\n", obj ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6fa960b..4fa636e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -431,7 +431,7 @@ @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification -@ stub IoRegisterShutdownNotification +@ stdcall IoRegisterShutdownNotification(ptr) @ stub IoReleaseCancelSpinLock @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index b93b51e..cbc9cfa 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -49,5 +49,6 @@ typedef enum _BUS_DATA_TYPE typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); +NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); #endif

1 0

Jim Cameron : ntoskrnl.exe: Add stub for ObReferenceObjectByHandle().
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 410cb3e7f8fb8291783b3e6ea9e0e01c6462c39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=410cb3e7f8fb8291783b3e6ea… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 23:45:48 2008 +0100 ntoskrnl.exe: Add stub for ObReferenceObjectByHandle(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 4 ++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c2d5f0b..556486e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -778,6 +778,20 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) TRACE("%p\n", AddrInSection); } + + /*********************************************************************** + * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE obj, ACCESS_MASK access, + POBJECT_TYPE type, + KPROCESSOR_MODE mode, PVOID* ptr, + POBJECT_HANDLE_INFORMATION info) +{ + FIXME( "stub: %p %x %p %d %p %p\n", obj, access, type, mode, ptr, info); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4fa636e..3ac035e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -809,7 +809,7 @@ @ stub ObOpenObjectByPointer @ stub ObQueryNameString @ stub ObQueryObjectAuditingByHandle -@ stub ObReferenceObjectByHandle +@ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) @ stub ObReferenceObjectByName @ stub ObReferenceObjectByPointer @ stub ObReferenceSecurityDescriptor diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3f5a6ca..19d799b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -89,6 +89,8 @@ typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _IO_WORKITEM *PIO_WORKITEM; +typedef struct _OBJECT_TYPE *POBJECT_TYPE; +typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; #define MAXIMUM_VOLUME_LABEL_LENGTH (32 * sizeof(WCHAR)) @@ -953,6 +955,8 @@ ULONG WINAPI KeQueryTimeIncrement(void); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); + NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread())

1 0

Jim Cameron : ntoskrnl.exe: Add stub for IoGetRelatedDeviceObject().
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 597150f6925275cbde2ecd0762312136266b00f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=597150f6925275cbde2ecd076… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 22:46:51 2008 +0100 ntoskrnl.exe: Add stub for IoGetRelatedDeviceObject(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9658ab7..fca424d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -459,6 +459,17 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * IoGetRelatedDeviceObject (NTOSKRNL.EXE.@) + */ +PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject( PFILE_OBJECT obj ) +{ + FIXME( "stub: %p\n", obj ); + return NULL; +} + + /*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2e4bc28..c370004 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -391,7 +391,7 @@ @ stub IoGetFileObjectGenericMapping @ stub IoGetInitialStack @ stub IoGetLowerDeviceObject -@ stub IoGetRelatedDeviceObject +@ stdcall IoGetRelatedDeviceObject(ptr) @ stub IoGetRequestorProcess @ stub IoGetRequestorProcessId @ stub IoGetRequestorSessionId diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index dc1147e..3f5a6ca 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -942,6 +942,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); +PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Jim Cameron : ntoskrnl.exe: Add stub for IoGetDeviceObjectPointer().
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: faa6ca08e9a192fa7cbd4ca6f73efca037f8bef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa6ca08e9a192fa7cbd4ca6f… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Thu Aug 28 22:22:15 2008 +0100 ntoskrnl.exe: Add stub for IoGetDeviceObjectPointer(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aff50fd..9658ab7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -451,6 +451,15 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoGetDeviceObjectPointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) +{ + FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0bfda7e..2e4bc28 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -382,7 +382,7 @@ @ stub IoGetDeviceAttachmentBaseRef @ stub IoGetDeviceInterfaceAlias @ stub IoGetDeviceInterfaces -@ stub IoGetDeviceObjectPointer +@ stdcall IoGetDeviceObjectPointer(ptr long ptr ptr) @ stub IoGetDeviceProperty @ stub IoGetDeviceToVerify @ stub IoGetDiskDeviceObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e2340dd..dc1147e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -941,6 +941,7 @@ void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); +NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Alistair Leslie-Hughes : msxml3: Add IDispatchEx support to IXMLDOMDocument2.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: 954cb31448b0e4e2b074095f47cc8e6f83ca2f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=954cb31448b0e4e2b074095f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 3 10:23:10 2008 +1000 msxml3: Add IDispatchEx support to IXMLDOMDocument2. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 438cf48..0ccda74 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -79,6 +79,7 @@ static REFIID tid_ids[] = { &IID_IXMLDOMAttribute, &IID_IXMLDOMCDATASection, &IID_IXMLDOMComment, + &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2, &IID_IXMLDOMDocumentFragment, &IID_IXMLDOMElement, diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 062ce7a..3c5aede 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -36,6 +36,7 @@ #include "shlwapi.h" #include "ocidl.h" #include "objsafe.h" +#include "dispex.h" #include "wine/debug.h" @@ -75,6 +76,9 @@ typedef struct _domdoc /* IObjectSafety */ DWORD safeopt; + + /* IDispatchEx */ + DispatchEx dispex; } domdoc; static xmlDocPtr doparse( char *ptr, int len ) @@ -290,6 +294,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IObjectWithSite*)&(This->lpvtblIObjectWithSite); } + else if(dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -1967,6 +1975,20 @@ static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { xmldoc_Safety_SetInterfaceSafetyOptions }; + +static const tid_t domdoc_iface_tids[] = { + IXMLDOMNode_tid, + IXMLDOMDocument_tid, + IXMLDOMDocument2_tid, + 0 +}; +static dispex_static_data_t domdoc_dispex = { + NULL, + IXMLDOMDocument2_tid, + NULL, + domdoc_iface_tids +}; + HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document) { domdoc *doc; @@ -2007,6 +2029,9 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu HeapFree( GetProcessHeap(), 0, doc ); return E_FAIL; } + + init_dispex(&doc->dispex, (IUnknown*)&doc->lpVtbl, &domdoc_dispex); + /* The ref on doc->node is actually looped back into this object, so release it */ IXMLDOMNode_Release(doc->node); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index ae3a4e6..55b84df 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -107,6 +107,7 @@ typedef enum tid_t { IXMLDOMAttribute_tid, IXMLDOMCDATASection_tid, IXMLDOMComment_tid, + IXMLDOMDocument_tid, IXMLDOMDocument2_tid, IXMLDOMDocumentFragment_tid, IXMLDOMElement_tid,

1 0

Alistair Leslie-Hughes : msxml3: Correct FIXME.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: c6a64414df9dc46defd5021e122687a5cada4a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a64414df9dc46defd5021e1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 3 13:04:50 2008 +1000 msxml3: Correct FIXME. --- dlls/msxml3/node.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 68bf881..ee409c4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -802,7 +802,7 @@ static HRESULT WINAPI xmlnode_get_nodeTypeString( str = (const xmlChar*) "text"; break; default: - FIXME("nodeName not mapped correctly (%d)\n", This->node->type); + FIXME("Unknown node type (%d)\n", This->node->type); str = This->node->name; break; }

1 0

James Hawkins : ole32: Fix two failing tests in win9x.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: e28098aee5b0e20ef2720f65c76848dd1908db70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28098aee5b0e20ef2720f65c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:57:54 2008 -0500 ole32: Fix two failing tests in win9x. --- dlls/ole32/tests/compobj.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b2aaa22..bdc34d9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -244,7 +244,9 @@ static void test_CoGetClassObject(void) ok(pUnk == NULL, "CoGetClassObject should have changed the passed in pointer to NULL, instead of %p\n", pUnk); hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); - ok(hr == E_INVALIDARG, "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); + ok(hr == E_INVALIDARG || + broken(hr == CO_E_NOTINITIALIZED), /* win9x */ + "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); } static ATOM register_dummy_class(void) @@ -944,7 +946,9 @@ static void test_CoFreeUnusedLibraries(void) ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); - ok(pUnk != NULL, "Expected a valid pointer\n"); + ok(pUnk != NULL || + broken(pUnk == NULL), /* win9x */ + "Expected a valid pointer\n"); if (pUnk) IUnknown_Release(pUnk);

1 0

Alistair Leslie-Hughes : mshtml: Make IHTMLBodyElement use correct IDispatchEx interface.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: aee6a2d8e1a53574918951ae4a9c6307d963d826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee6a2d8e1a53574918951ae4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 1 22:21:21 2008 +1000 mshtml: Make IHTMLBodyElement use correct IDispatchEx interface. --- dlls/mshtml/htmlbody.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 2d30895..13c802e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -591,6 +591,28 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLBodyElement_destructor }; +static const tid_t HTMLBodyElement_iface_tids[] = { + IHTMLBodyElement_tid, + IHTMLBodyElement2_tid, + IHTMLControlElement_tid, + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLElement3_tid, + IHTMLElement4_tid, + IHTMLTextContainer_tid, + IHTMLUniqueName_tid, + 0 +}; + +static dispex_static_data_t HTMLBodyElement_dispex = { + NULL, + DispHTMLBody_tid, + NULL, + HTMLBodyElement_iface_tids +}; + HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) { HTMLBodyElement *ret = heap_alloc_zero(sizeof(HTMLBodyElement)); @@ -601,6 +623,8 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) HTMLTextContainer_Init(&ret->textcont); ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; + + init_dispex(&ret->textcont.element.node.dispex, (IUnknown*)HTMLBODY(ret), &HTMLBodyElement_dispex); ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl; ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink);

1 0

Alistair Leslie-Hughes : mshtml: Add IHTMLElementBody test.
by Alexandre Julliard Sept. 3, 2008

Sept. 3, 2008

Module: wine Branch: master Commit: b5be64db6b2fda9fb2e028bf0bb4fe053b5ad923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5be64db6b2fda9fb2e028bf0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 3 13:15:18 2008 +1000 mshtml: Add IHTMLElementBody test. --- dlls/mshtml/tests/script.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 970da5d..157dbc3 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -237,6 +237,10 @@ static IHTMLDocument2 *create_and_load_doc(const char *str) ULONG ref; MSG msg; HRESULT hres; + static const WCHAR ucPtr[] = {'b','a','c','k','g','r','o','u','n','d',0}; + DISPID dispID = -1; + OLECHAR *name; + doc = create_doc_with_string(str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); @@ -256,6 +260,12 @@ static IHTMLDocument2 *create_and_load_doc(const char *str) return NULL; } + /* Check we can query for function on the IHTMLElementBody interface */ + name = (WCHAR*)ucPtr; + hres = IHTMLElement_GetIDsOfNames(body, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispID); + ok(hres == S_OK, "GetIDsOfNames(background) failed %08x\n", hres); + ok(dispID == DISPID_IHTMLBODYELEMENT_BACKGROUND, "Incorrect dispID got (%d)\n", dispID); + IHTMLElement_Release(body); return doc; }

1 0