June 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.CSDVersion.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: ca471b8779d38e0ec78901c084bb411a3314f546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca471b8779d38e0ec78901c08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:34:57 2012 +0200 wbemprox: Implement Win32_OperatingSystem.CSDVersion. --- dlls/wbemprox/builtin.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 849c017..a41679a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -57,6 +57,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; +static const WCHAR prop_csdversionW[] = + {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_cpustatusW[] = @@ -123,6 +125,7 @@ static const struct column col_networkadapter[] = static const struct column col_os[] = { { prop_captionW, CIM_STRING }, + { prop_csdversionW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32 }, { prop_systemdirectoryW, CIM_STRING } @@ -164,7 +167,10 @@ static const WCHAR compsys_manufacturerW[] = static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR os_captionW[] = - {'W','i','n','e',0}; + {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', + 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; +static const WCHAR os_csdversionW[] = + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}; static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = @@ -200,6 +206,7 @@ struct record_networkadapter struct record_operatingsystem { const WCHAR *caption; + const WCHAR *csdversion; const WCHAR *osarchitecture; UINT32 oslanguage; const WCHAR *systemdirectory; @@ -396,7 +403,8 @@ static void fill_os( struct table *table ) if (!(table->data = heap_alloc( sizeof(*rec) ))) return; rec = (struct record_operatingsystem *)table->data; - rec->caption = os_captionW; + rec->caption = os_captionW; + rec->csdversion = os_csdversionW; GetNativeSystemInfo( &info ); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)

1 0

Piotr Caban : msvcp90: Sync spec files.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: d1f0fe954f37bcdf529a9f51a8ff165277b21098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f0fe954f37bcdf529a9f51a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:42 2012 +0200 msvcp90: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 430 +++++++++++++++++++------------------- dlls/msvcp70/msvcp70.spec | 394 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 460 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 484 +++++++++++++++++++++--------------------- 4 files changed, 884 insertions(+), 884 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f0fe954f37bcdf529a9…

1 0

Piotr Caban : msvcp90: Added partial implementation of locale_ctor_cstr function.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 1f8fcf30f3ef343d557e0e7d8fb6005f7be3f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8fcf30f3ef343d557e0e7d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:16 2012 +0200 msvcp90: Added partial implementation of locale_ctor_cstr function. --- dlls/msvcp90/locale.c | 417 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 391 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8fcf30f3ef343d557e0…

1 0

Hans Leidekker : wbemprox: Set the row count in fill_processor.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 211469dd06c4354790506ad41e0fd8c00cedc0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211469dd06c4354790506ad41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:31 2012 +0200 wbemprox: Set the row count in fill_processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index eaffc80..7a4ee56 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,6 +376,9 @@ static void fill_processor( struct table *table ) rec->device_id = heap_strdupW( device_id ); offset += sizeof(*rec); } + + TRACE("created %u rows\n", count); + table->num_rows = count; } static void fill_os( struct table *table )

1 0

Henri Verbeet : include: Add the DEVMODE dmDisplayFlags constants.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 4cb8d1ea1e8916d8bb844a22f0ee5b0c0f52f8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb8d1ea1e8916d8bb844a22f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 27 19:02:26 2012 +0200 include: Add the DEVMODE dmDisplayFlags constants. --- include/wingdi.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 858d3c1..bff96f4 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3033,6 +3033,10 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DM_PANNINGWIDTH __MSABI_LONG(0x08000000) #define DM_PANNINGHEIGHT __MSABI_LONG(0x10000000) +#define DM_GRAYSCALE 1 +#define DM_INTERLACED 2 +#define DMDISPLAYFLAGS_TEXTMODE 4 + #define DMORIENT_PORTRAIT 1 #define DMORIENT_LANDSCAPE 2

1 0

Jacek Caban : mshtml: Share nsframe and nsiframe references with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 39005645b89ca7357c969abc270f8ecf34bbd0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39005645b89ca7357c969abc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:14 2012 +0200 mshtml: Share nsframe and nsiframe references with nsnode. --- dlls/mshtml/htmlframebase.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index b06534e..a5344ec 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -522,11 +523,6 @@ void HTMLFrameBase_destructor(HTMLFrameBase *This) if(This->content_window) This->content_window->frame_element = NULL; - if(This->nsframe) - nsIDOMHTMLFrameElement_Release(This->nsframe); - if(This->nsiframe) - nsIDOMHTMLIFrameElement_Release(This->nsiframe); - HTMLElement_destructor(&This->element.node); } @@ -542,9 +538,14 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFrameElement, (void**)&This->nsframe); if(NS_FAILED(nsres)) { + This->nsframe = NULL; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); - if(NS_FAILED(nsres)) - ERR("Could not get nsIDOMHTML[I]Frame interface\n"); - }else + assert(nsres == NS_OK && (nsIDOMNode*)This->nsiframe == This->element.node.nsnode); + }else { + assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; + } + + /* Share the reference with nsnode */ + nsIDOMNode_Release(This->element.node.nsnode); }

1 0

Jacek Caban : mshtml: Share nstable reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: db244a8051419857e9ae9f4e29cfe3e4e23c532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db244a8051419857e9ae9f4e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:30 2012 +0200 mshtml: Share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 79223be..c174634 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -741,19 +742,9 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTable_destructor(HTMLDOMNode *iface) -{ - HTMLTable *This = impl_from_HTMLDOMNode(iface); - - if(This->nstable) - nsIDOMHTMLTableElement_Release(This->nstable); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_QI, - HTMLTable_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -783,14 +774,14 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLTableElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + /* Share the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents, NULL); *elem = &ret->element;

1 0

Piotr Caban : msvcp90: Added _Fiopen functions implementation.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: ccb4c4846641b81baddfd854c63b78f9092bf5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb4c4846641b81baddfd854c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:44 2012 +0200 msvcp90: Added _Fiopen functions implementation. --- dlls/msvcp90/ios.c | 47 +++++++++++++++++++++++++++++++++++--------- dlls/msvcp90/msvcp90.spec | 12 +++++----- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 0950077..ae9e519 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2036,12 +2036,9 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) return this->file != NULL; } -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PB_WHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBGHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ -DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) -basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ +FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { static const wchar_t rW[] = {'r',0}; static const struct { @@ -2064,10 +2061,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char int mode_idx; FILE *f = NULL; - TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - - if(basic_filebuf_char_is_open(this)) - return NULL; + TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) if(str_mode[mode_idx].mode == real_mode) @@ -2096,6 +2090,39 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char return NULL; } + return f; +} + +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z */ +FILE* __cdecl _Fiopen(const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%s %d %d)\n", name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return _Fiopen_wchar(nameW, mode, prot); +} + +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBGHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) +basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +{ + FILE *f = NULL; + + TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); + + if(basic_filebuf_char_is_open(this)) + return NULL; + + if(!(f = _Fiopen_wchar(name, mode, prot))) + return NULL; + basic_filebuf_char__Init(this, f, INITFL_open); basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(this->base.loc)); return this; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 7126603..ff042d9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2206,12 +2206,12 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ thiscall -arch=win32 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBGHH(a)Z -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z(str long long) _Fiopen +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z(str long long) _Fiopen +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBGHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z(wstr long long) _Fiopen_wchar @ cdecl -arch=win32 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBDIIII(a)Z(ptr ptr long ptr ptr long str long long long long) num_put_char__Fput @ cdecl -arch=win64 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBD_K333(a)Z(ptr ptr ptr ptr long str long long long long) num_put_char__Fput @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDIIII(a)Z

1 0

Jacek Caban : mshtml: Share nsobject reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 7a8f0994dfc4ac05272965fa51e5dec2b159c955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f0994dfc4ac05272965fa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:58:23 2012 +0200 mshtml: Share nsobject reference with nsnode. --- dlls/mshtml/htmlobject.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6f171c6..fdd6614 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -571,8 +572,6 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) if(This->plugin_container.plugin_host) detach_plugin_host(This->plugin_container.plugin_host); - if(This->nsobject) - nsIDOMHTMLObjectElement_Release(This->nsobject); HTMLElement_destructor(&This->plugin_container.element.node); } @@ -646,14 +645,13 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLObjectElement2_iface.lpVtbl = &HTMLObjectElement2Vtbl; ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl; + HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLObjectElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); + /* Share nsobject reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsobject == ret->plugin_container.element.node.nsnode); + nsIDOMNode_Release(ret->plugin_container.element.node.nsnode); *elem = &ret->plugin_container.element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsimg reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 8a9d3c845b76348e8c2fc038e48a22e7aa5c5271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d3c845b76348e8c2fc038e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:54 2012 +0200 mshtml: Share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 5d1c665..be33a71 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,16 +622,6 @@ static HRESULT HTMLImgElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLImgElement_destructor(HTMLDOMNode *iface) -{ - HTMLImgElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsimg) - nsIDOMHTMLImageElement_Release(This->nsimg); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLImgElement *This = impl_from_HTMLDOMNode(iface); @@ -640,7 +631,7 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, - HTMLImgElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -676,14 +667,13 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLImageElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + /* Share nsimg reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0