July 2012 - Wine-commits - list.winehq.org

Detlef Riekenberg : ntdll: Support TokenIntegrityLevel.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 5c3e919b1080ad3f988467f49b530d9331ac3890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3e919b1080ad3f988467f49… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 30 18:08:34 2012 +0200 ntdll: Support TokenIntegrityLevel. --- dlls/ntdll/nt.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index cc35815..775b6f1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -276,7 +276,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenAccessInformation */ 0, /* TokenVirtualizationAllowed */ 0, /* TokenVirtualizationEnabled */ - 0, /* TokenIntegrityLevel */ + sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ 0 /* TokenLogonSid */ @@ -507,6 +507,20 @@ NTSTATUS WINAPI NtQueryInformationToken( FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; + case TokenIntegrityLevel: + { + /* report always "S-1-16-12288" (high mandatory level) for now */ + static const SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + + TOKEN_MANDATORY_LABEL *tml = tokeninfo; + PSID psid = tml + 1; + + tml->Label.Sid = psid; + tml->Label.Attributes = SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED; + memcpy(psid, &high_level, sizeof(SID)); + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0

Hans Leidekker : wbemprox: Implement Win32_Service. AcceptPause and Win32_Service.AcceptStop.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 54d21602267f790368a02c21faf52396f6385c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d21602267f790368a02c21f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:15 2012 +0200 wbemprox: Implement Win32_Service.AcceptPause and Win32_Service.AcceptStop. --- dlls/wbemprox/builtin.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b2c657f..ce18b92 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -65,6 +65,10 @@ static const WCHAR class_stdregprovW[] = static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_acceptpauseW[] = + {'A','c','c','e','p','t','P','a','u','s','e',0}; +static const WCHAR prop_acceptstopW[] = + {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = @@ -249,6 +253,8 @@ static const struct column col_processor[] = }; static const struct column col_service[] = { + { prop_acceptpauseW, CIM_BOOLEAN }, + { prop_acceptstopW, CIM_BOOLEAN }, { prop_displaynameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_processidW, CIM_UINT32 }, @@ -383,6 +389,8 @@ struct record_processor }; struct record_service { + int accept_pause; + int accept_stop; const WCHAR *displayname; const WCHAR *name; UINT32 process_id; @@ -860,11 +868,13 @@ static void fill_service( struct table *table ) { status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); - rec->displayname = heap_strdupW( services[i].lpDisplayName ); - rec->name = heap_strdupW( services[i].lpServiceName ); - rec->process_id = status->dwProcessId; - rec->servicetype = get_service_type( status->dwServiceType ); - rec->state = get_service_state( status->dwCurrentState ); + rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; + rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->state = get_service_state( status->dwCurrentState ); offset += sizeof(*rec); num_rows++; }

1 0

Hans Leidekker : wbemprox: Store the class name in the class object.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 12caddb4be1265811ecaff928eb35d1c6368a782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caddb4be1265811ecaff928… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:30 2012 +0200 wbemprox: Store the class name in the class object. --- dlls/wbemprox/class.c | 26 ++++++++++++++++---------- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 801a553..74e1c71 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -125,7 +125,7 @@ static HRESULT WINAPI enum_class_object_Next( *puReturned = 0; if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); + hr = create_class_object( view->table->name, iface, ec->index, apObjects ); if (hr != S_OK) return hr; ec->index++; @@ -216,6 +216,7 @@ struct class_object { IWbemClassObject IWbemClassObject_iface; LONG refs; + WCHAR *name; IEnumWbemClassObject *iter; UINT index; }; @@ -242,6 +243,7 @@ static ULONG WINAPI class_object_Release( { TRACE("destroying %p\n", co); if (co->iter) IEnumWbemClassObject_Release( co->iter ); + heap_free( co->name ); heap_free( co ); } return refs; @@ -606,16 +608,14 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppOutSignature ) { struct class_object *co = impl_from_IWbemClassObject( iface ); - struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature ); + hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); if (hr != S_OK) return hr; - hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature ); + hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); return hr; } @@ -714,24 +714,30 @@ static const IWbemClassObjectVtbl class_object_vtbl = class_object_GetMethodOrigin }; -HRESULT WbemClassObject_create( - IUnknown *pUnkOuter, IEnumWbemClassObject *iter, UINT index, LPVOID *ppObj ) +HRESULT create_class_object( + const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj ) { struct class_object *co; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%s, %p\n", debugstr_w(name), obj); co = heap_alloc( sizeof(*co) ); if (!co) return E_OUTOFMEMORY; co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; + co->name = heap_strdupW( name ); + if (!co->name) + { + heap_free( co ); + return E_OUTOFMEMORY; + } co->iter = iter; co->index = index; if (iter) IEnumWbemClassObject_AddRef( iter ); - *ppObj = &co->IWbemClassObject_iface; + *obj = &co->IWbemClassObject_iface; - TRACE("returning iface %p\n", *ppObj); + TRACE("returning iface %p\n", *obj); return S_OK; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 8c9c2f4..abd31c5 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -334,7 +334,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = WbemClassObject_create( NULL, iter, 0, (void **)obj ); + hr = create_class_object( path->class, iter, 0, obj ); IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index a5f0a42..34a3384 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -154,7 +154,8 @@ HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN; +HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, + IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : wbemprox: Add support for enumerating class methods.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: a26b5dc09a9732da264728ae0e318a5d09efdd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26b5dc09a9732da264728ae0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:49 2012 +0200 wbemprox: Add support for enumerating class methods. --- dlls/wbemprox/class.c | 55 ++++++++++++++++++++++++++++++++----- dlls/wbemprox/table.c | 18 ++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 74e1c71..e9f1f13 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -219,6 +219,7 @@ struct class_object WCHAR *name; IEnumWbemClassObject *iter; UINT index; + UINT index_method; }; static inline struct class_object *impl_from_IWbemClassObject( @@ -643,8 +644,19 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration( IWbemClassObject *iface, LONG lEnumFlags) { - FIXME("%p, %08x\n", iface, lEnumFlags); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %08x\n", iface, lEnumFlags); + + if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + + if (co->iter) + { + WARN("not allowed on instance\n"); + return WBEM_E_ILLEGAL_OPERATION; + } + co->index_method = 0; + return S_OK; } static HRESULT WINAPI class_object_NextMethod( @@ -654,15 +666,41 @@ static HRESULT WINAPI class_object_NextMethod( IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature) { - FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + const WCHAR *method; + HRESULT hr; + + TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); + + if (!(method = get_method_name( co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA; + + hr = create_signature( co->name, method, PARAM_IN, ppInSignature ); + if (hr != S_OK) return hr; + + hr = create_signature( co->name, method, PARAM_OUT, ppOutSignature ); + if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + else + { + if (!(*pstrName = SysAllocString( method ))) + { + IWbemClassObject_Release( *ppInSignature ); + IWbemClassObject_Release( *ppOutSignature ); + return E_OUTOFMEMORY; + } + co->index_method++; + } + return hr; } static HRESULT WINAPI class_object_EndMethodEnumeration( IWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p\n", iface); + + co->index_method = 0; + return S_OK; } static HRESULT WINAPI class_object_GetMethodQualifierSet( @@ -732,8 +770,9 @@ HRESULT create_class_object( heap_free( co ); return E_OUTOFMEMORY; } - co->iter = iter; - co->index = index; + co->iter = iter; + co->index = index; + co->index_method = 0; if (iter) IEnumWbemClassObject_AddRef( iter ); *obj = &co->IWbemClassObject_iface; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 5b6f4b4..231c27d 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -331,3 +331,21 @@ BOOL add_table( struct table *table ) list_add_tail( table_list, &table->entry ); return TRUE; } + +const WCHAR *get_method_name( const WCHAR *class, UINT index ) +{ + struct table *table; + UINT i, count = 0; + + if (!(table = get_table( class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (table->columns[i].type & COL_FLAG_METHOD) + { + if (index == count) return table->columns[i].name; + count++; + } + } + return NULL; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 34a3384..f6aa2b8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -151,6 +151,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; +const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add support for enumerating class properties.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 348e5d85fa5fac43dcbd228ca431ad949167285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=348e5d85fa5fac43dcbd228ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:05:09 2012 +0200 wbemprox: Add support for enumerating class properties. --- dlls/wbemprox/class.c | 39 ++++++++++++++++++++++++++++++++----- dlls/wbemprox/table.c | 18 +++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e9f1f13..030aed5 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -220,6 +220,7 @@ struct class_object IEnumWbemClassObject *iter; UINT index; UINT index_method; + UINT index_property; }; static inline struct class_object *impl_from_IWbemClassObject( @@ -351,8 +352,14 @@ static HRESULT WINAPI class_object_BeginEnumeration( IWbemClassObject *iface, LONG lEnumFlags ) { - FIXME("%p, %08x\n", iface, lEnumFlags); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %08x\n", iface, lEnumFlags); + + if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + + co->index_property = 0; + return S_OK; } static HRESULT WINAPI class_object_Next( @@ -363,15 +370,34 @@ static HRESULT WINAPI class_object_Next( CIMTYPE *pType, LONG *plFlavor ) { - FIXME("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + const WCHAR *property; + HRESULT hr; + + TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); + + if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; + if (!(*strName = SysAllocString( property ))) return E_OUTOFMEMORY; + if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) + { + SysFreeString( *strName ); + return hr; + } + co->index_property++; + return S_OK; } static HRESULT WINAPI class_object_EndEnumeration( IWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p\n", iface); + + co->index_property = 0; + return S_OK; } static HRESULT WINAPI class_object_GetPropertyQualifierSet( @@ -773,6 +799,7 @@ HRESULT create_class_object( co->iter = iter; co->index = index; co->index_method = 0; + co->index_property = 0; if (iter) IEnumWbemClassObject_AddRef( iter ); *obj = &co->IWbemClassObject_iface; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 231c27d..6b584ff 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -349,3 +349,21 @@ const WCHAR *get_method_name( const WCHAR *class, UINT index ) } return NULL; } + +const WCHAR *get_property_name( const WCHAR *class, UINT index ) +{ + struct table *table; + UINT i, count = 0; + + if (!(table = get_table( class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (!(table->columns[i].type & COL_FLAG_METHOD)) + { + if (index == count) return table->columns[i].name; + count++; + } + } + return NULL; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index f6aa2b8..69b04e7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -152,6 +152,7 @@ HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYP HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Store inner window directly in HTMLDocumentNode.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 27f799d8804603b711d9e2c572fce25e231090a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f799d8804603b711d9e2c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:30 2012 +0200 mshtml: Store inner window directly in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 19 ++++++++++++++----- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a43522a..86615df 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2091,8 +2091,13 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); if(This->nsdoc) { + assert(!This->window); release_document_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); + }else if(This->window) { + /* document fragments own reference to inner window */ + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + This->window = NULL; } heap_free(This->event_vector); @@ -2124,6 +2129,7 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) release_document_mutation(This); This->nsdoc = NULL; nsIDOMHTMLDocument_Release(nsdoc); + This->window = NULL; } } @@ -2238,7 +2244,7 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HTMLDocumentNode_iface_tids }; -static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindow *window) +static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window) { HTMLDocumentNode *doc; @@ -2249,7 +2255,8 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindo doc->ref = 1; doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; - doc->basedoc.window = window; + doc->basedoc.window = window->base.outer_window; + doc->window = window; init_dispex(&doc->node.dispex, (IUnknown*)&doc->node.IHTMLDOMNode_iface, &HTMLDocumentNode_dispex); @@ -2264,7 +2271,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindo return doc; } -HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLOuterWindow *window, HTMLDocumentNode **ret) +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; @@ -2272,7 +2279,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; - if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) + if(!doc_obj->basedoc.window || window->base.outer_window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); @@ -2294,10 +2301,12 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, { HTMLDocumentNode *doc_frag; - doc_frag = alloc_doc_node(doc_node->basedoc.doc_obj, doc_node->basedoc.window); + doc_frag = alloc_doc_node(doc_node->basedoc.doc_obj, doc_node->window); if(!doc_frag) return E_OUTOFMEMORY; + IHTMLWindow2_AddRef(&doc_frag->window->base.IHTMLWindow2_iface); + HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ade07e..dd25263 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -239,8 +239,10 @@ static void release_inner_window(HTMLInnerWindow *This) abort_window_bindings(This); release_script_hosts(This); - if(This->doc) + if(This->doc) { + This->doc->window = NULL; htmldoc_release(&This->doc->basedoc); + } release_dispex(&This->dispex); @@ -2745,7 +2747,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return E_FAIL; } - hres = create_doc_from_nsdoc(nshtmldoc, outer_window->doc_obj, outer_window, &window->doc); + hres = create_doc_from_nsdoc(nshtmldoc, outer_window->doc_obj, window, &window->doc); nsIDOMHTMLDocument_Release(nshtmldoc); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b636685..0bc9d4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -679,6 +679,8 @@ struct HTMLDocumentNode { LONG ref; + HTMLInnerWindow *window; + nsIDOMHTMLDocument *nsdoc; BOOL content_ready; event_target_t *body_event_target; @@ -700,7 +702,7 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLOuterWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use inner window directly from document node in htmlevent.c.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 7ff231d7fbbb81e11259ca41049cae9f03ac2e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff231d7fbbb81e11259ca410… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:42 2012 +0200 mshtml: Use inner window directly from document node in htmlevent.c. --- dlls/mshtml/htmlevent.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ca966ba..1836664 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -997,7 +997,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - window = doc->basedoc.window->base.inner_window; + window = doc->window; prev_event = window->event; if(set_event) { hres = get_node(doc, target, TRUE, &node); @@ -1388,7 +1388,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) TRACE("%p.%s = %s\n", nselem, debugstr_w(event_info[i].attr_name), debugstr_w(attr_value)); - disp = script_parse_event(doc->basedoc.window->base.inner_window, attr_value); + disp = script_parse_event(doc->window, attr_value); if(disp) { hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLImageElementFactory implementation.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: dce83a304d98199d00afe22791242920b3e83fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce83a304d98199d00afe2279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:57 2012 +0200 mshtml: Use inner window directly in HTMLImageElementFactory implementation. --- dlls/mshtml/htmlimg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index be33a71..06c8b3d 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -809,12 +809,12 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), img_elem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } - doc = This->window->base.inner_window->doc; + doc = This->window->doc; *img_elem = NULL;

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLOptionElementFactory implementation.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: e78537ffa236a05d07b9df5580ccf65b062da3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78537ffa236a05d07b9df558… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:07 2012 +0200 mshtml: Use inner window directly in HTMLOptionElementFactory implementation. --- dlls/mshtml/htmloption.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index fac06ed..8722228 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -458,18 +458,18 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } *optelem = NULL; - hres = create_nselem(This->window->base.inner_window->doc, optionW, &nselem); + hres = create_nselem(This->window->doc, optionW, &nselem); if(FAILED(hres)) return hres; - hres = get_node(This->window->base.inner_window->doc, (nsIDOMNode*)nselem, TRUE, &node); + hres = get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE, &node); nsIDOMHTMLElement_Release(nselem); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Use inner window directly in run_insert_script.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 8b69ff6b3bedcd8fb586ea548ba001ca1aec57ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b69ff6b3bedcd8fb586ea548… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:33 2012 +0200 mshtml: Use inner window directly in run_insert_script. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 12c5c98..129094e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -316,7 +316,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->basedoc.window->base.inner_window, nsscript); + doc_insert_script(doc->window, nsscript); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser);

1 0