November 2009 - Wine-commits

Stefan Dösinger : wined3d: Add a usage flag for static buffer declarations.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: d4275e87f14188e0c5929d2602b77e50cdf0366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4275e87f14188e0c5929d260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 20 14:14:45 2009 +0200 wined3d: Add a usage flag for static buffer declarations. --- dlls/ddraw/direct3d.c | 6 +++++- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/device.c | 4 ++-- include/wine/wined3d.idl | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 798518a..a89d998 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -970,6 +970,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, IDirectDrawImpl *This = ddraw_from_d3d7(iface); IDirect3DVertexBufferImpl *object; HRESULT hr; + DWORD usage; TRACE("(%p)->(%p,%p,%08x)\n", This, Desc, VertexBuffer, Flags); TRACE("(%p) Vertex buffer description:\n", This); @@ -1009,10 +1010,13 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, object->ddraw = This; object->fvf = Desc->dwFVF; + usage = Desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0; + usage |= WINED3DUSAGE_STATICDECL; + EnterCriticalSection(&ddraw_cs); hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice, get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices, - Desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0, Desc->dwFVF, + usage, Desc->dwFVF, Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, &object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops); if(hr != D3D_OK) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 30ae816..24b58a5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -325,8 +325,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ if (This->flags & WINED3D_BUFFER_HASDESC) { - if(((IWineD3DImpl *)device->wineD3D)->dxVersion == 7 || - This->resource.format_desc->format != WINED3DFMT_VERTEXDATA) return FALSE; + if(This->resource.usage & WINED3DUSAGE_STATICDECL) return FALSE; } TRACE("Finding vertex buffer conversion information\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59c18e9..e6931ea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -569,8 +569,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface return WINED3DERR_OUTOFVIDEOMEMORY; } - hr = buffer_init(object, This, Length, Usage, WINED3DFMT_UNKNOWN, - Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); + hr = buffer_init(object, This, Length, Usage | WINED3DUSAGE_STATICDECL, + WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x\n", hr); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 65306a3..2534fbb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -901,6 +901,7 @@ const UINT WINED3DUSAGE_DYNAMIC = 0x00000200; const UINT WINED3DUSAGE_AUTOGENMIPMAP = 0x00000400; const UINT WINED3DUSAGE_DMAP = 0x00004000; const UINT WINED3DUSAGE_MASK = 0x00004fff; +const UINT WINED3DUSAGE_STATICDECL = 0x20000000; const UINT WINED3DUSAGE_OPTIMIZE = 0x40000000; const UINT WINED3DUSAGE_OVERLAY = 0x80000000;

1 0

Stefan Dösinger : d3d8: Fix device creation error handling.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 83bca757070f6fb7d9045bddac2dd7d1cde1251e URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bca757070f6fb7d9045bdda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 20 10:20:18 2009 +0200 d3d8: Fix device creation error handling. --- dlls/d3d8/directx.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index aedfdc8..57ddf56 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -413,6 +413,10 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters); wined3d_mutex_unlock(); + if (hr != D3D_OK) { + FIXME("(%p) D3D Initialization failed for WineD3DDevice %p\n", This, object->WineD3DDevice); + goto err; + } pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; @@ -428,25 +432,28 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz; pPresentationParameters->FullScreen_PresentationInterval = localParameters.PresentationInterval; - if (hr != D3D_OK) { - FIXME("(%p) D3D Initialization failed for WineD3DDevice %p\n", This, object->WineD3DDevice); - HeapFree(GetProcessHeap(), 0, object); - *ppReturnedDeviceInterface = NULL; - } - object->declArraySize = 16; object->decls = HeapAlloc(GetProcessHeap(), 0, object->declArraySize * sizeof(*object->decls)); if(!object->decls) { ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err; + } + return D3D_OK; +err: + *ppReturnedDeviceInterface = NULL; + + if(!object) return hr; + HeapFree(GetProcessHeap(), 0, object->decls); + if(object->WineD3DDevice) { wined3d_mutex_lock(); + IWineD3DDevice_Uninit3D(object->WineD3DDevice, D3D8CB_DestroySwapChain); IWineD3DDevice_Release(object->WineD3DDevice); wined3d_mutex_unlock(); - - HeapFree(GetProcessHeap(), 0, object); - *ppReturnedDeviceInterface = NULL; - hr = E_OUTOFMEMORY; } + HeapFree(GetProcessHeap(), 0, object); + return hr; }

1 0

Stefan Dösinger : d3d: Handle the pointsize_min default difference in d3d8.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 8eef221d20174bded6c3e5954f64d801ef45cc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef221d20174bded6c3e5954… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 20 10:26:06 2009 +0200 d3d: Handle the pointsize_min default difference in d3d8. --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/directx.c | 8 +++++++- dlls/wined3d/stateblock.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e6c1f5b..50a257d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -587,6 +587,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE wined3d_mutex_lock(); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); + if(SUCCEEDED(hr)) { + hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, WINED3DRS_POINTSIZE_MIN, 0); + } wined3d_mutex_unlock(); pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 57ddf56..efcdbd6 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -412,11 +412,17 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte } hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters); - wined3d_mutex_unlock(); if (hr != D3D_OK) { + wined3d_mutex_unlock(); FIXME("(%p) D3D Initialization failed for WineD3DDevice %p\n", This, object->WineD3DDevice); goto err; } + hr = IWineD3DDevice_SetRenderState(object->WineD3DDevice, WINED3DRS_POINTSIZE_MIN, 0); + wined3d_mutex_unlock(); + if(FAILED(hr)) { + FIXME("(%p) SetRenderState failed\n", This); + goto err; + } pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5c33609..9082c3d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1161,7 +1161,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat IWineD3DDevice_SetRenderState(device, WINED3DRS_SOFTWAREVERTEXPROCESSING, FALSE); tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE, tmpfloat.d); - tmpfloat.f = ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion < 9 ? 0.0f : 1.0f; + tmpfloat.f = 1.0f; IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSIZE_MIN, tmpfloat.d); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSPRITEENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_POINTSCALEENABLE, FALSE);

1 0

Marcus Meissner : mapi32: Check folder for NULL (Coverity).
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 3ea9ccca85af6a9340ed56e26c82ec670cc11a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea9ccca85af6a9340ed56e26… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 1 14:05:41 2009 +0100 mapi32: Check folder for NULL (Coverity). --- dlls/mapi32/sendmail.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 08aceb0..cbbff98 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -355,7 +355,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Free up the resources we've used */ IMAPIFolder_Release(draft_folder); - IMAPIFolder_Release(folder); + if (folder) IMAPIFolder_Release(folder); IMsgStore_Release(msg_store); logoff: ;

1 0

Marcus Meissner : wined3d: Check for NULL before context_release (Coverity) .
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 9f8a73ab960335a4d2c4e0d29a379ebbff6e5053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8a73ab960335a4d2c4e0d29… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 1 16:05:19 2009 +0100 wined3d: Check for NULL before context_release (Coverity). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c143ec..221f16e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4983,7 +4983,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D mem = HeapAlloc(GetProcessHeap(), 0, outpitch * height); if(!mem) { ERR("Out of memory %d, %d!\n", outpitch, height); - context_release(context); + if (context) context_release(context); return WINED3DERR_OUTOFVIDEOMEMORY; } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This);

1 0

Michael Stefaniuc : mshtml: Free the right variable (Smatch).
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: cc94a1db0186e83ea9f3327c6aa41472332ba60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc94a1db0186e83ea9f3327c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 1 18:04:58 2009 +0100 mshtml: Free the right variable (Smatch). --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5b07b0f..b278a5c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1562,7 +1562,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->window_ref = heap_alloc(sizeof(windowref_t)); if(!window->window_ref) { - heap_free(window->window_ref); + heap_free(window); return E_OUTOFMEMORY; }

1 0

Jacek Caban : mshtml: Moved whole element initialization to HTMLElement_Init.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: d3a9f162e8c4741e02bcb19fc41158da58dba562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a9f162e8c4741e02bcb19fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:16:48 2009 +0100 mshtml: Moved whole element initialization to HTMLElement_Init. --- dlls/mshtml/htmlanchor.c | 4 ++-- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmlcomment.c | 6 ++++-- dlls/mshtml/htmlelem.c | 42 +++++++++++++++++++++++------------------- dlls/mshtml/htmlgeneric.c | 4 ++-- dlls/mshtml/htmliframe.c | 4 ++-- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 3 ++- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 4 ++-- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmltable.c | 4 ++-- dlls/mshtml/htmltablerow.c | 4 ++-- dlls/mshtml/htmltextarea.c | 4 ++-- dlls/mshtml/htmltextcont.c | 5 +++-- dlls/mshtml/mshtml_private.h | 28 ++++++++++++++-------------- 17 files changed, 70 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3a9f162e8c4741e02bcb…

1 0

Jacek Caban : mshtml: Moved IHTMLFrameBase to separated object to allow sharing implementation with HTMLFrame .
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 4ffd64ddeb1f2cc3377c0b3d63d20fc2c42b5686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffd64ddeb1f2cc3377c0b3d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:17:17 2009 +0100 mshtml: Moved IHTMLFrameBase to separated object to allow sharing implementation with HTMLFrame. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlframebase.c | 269 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmliframe.c | 239 ++----------------------------------- dlls/mshtml/mshtml_private.h | 11 ++ 4 files changed, 292 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ffd64ddeb1f2cc3377c0…

1 0

Jacek Caban : mshtml: Store content window on HTMLIFrameElement creation.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 20ed399b2865845bb3c539a720032a817a796e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ed399b2865845bb3c539a72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:17:58 2009 +0100 mshtml: Store content window on HTMLIFrameElement creation. --- dlls/mshtml/htmliframe.c | 76 ++++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 92f6e40..35aff3d 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -104,39 +104,13 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, TRACE("(%p)->(%p)\n", This, p); - if(!This->content_window) { - nsIDOMWindow *nswindow; - nsIDOMDocument *nsdoc; - nsresult nsres; - - nsres = nsIDOMHTMLIFrameElement_GetContentDocument(This->nsiframe, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetContentDocument failed: %08x\n", nsres); - return E_FAIL; - } - - if(!nsdoc) { - FIXME("NULL contentDocument\n"); - return E_FAIL; - } - - nswindow = get_nsdoc_window(nsdoc); - nsIDOMDocument_Release(nsdoc); - if(!nswindow) - return E_FAIL; - - This->content_window = nswindow_to_window(nswindow); - nsIDOMWindow_Release(nswindow); - if(!This->content_window) { - ERR("Could not get window object\n"); - return E_FAIL; - } - + if(This->content_window) { IHTMLWindow2_AddRef(HTMLWINDOW2(This->content_window)); + *p = HTMLWINDOW2(This->content_window); + }else { + WARN("NULL content window\n"); + *p = NULL; } - - IHTMLWindow2_AddRef(HTMLWINDOW2(This->content_window)); - *p = HTMLWINDOW2(This->content_window); return S_OK; } @@ -265,7 +239,38 @@ static dispex_static_data_t HTMLIFrame_dispex = { HTMLIFrame_iface_tids }; -HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) +static HTMLWindow *get_content_window(nsIDOMHTMLIFrameElement *nsiframe) +{ + HTMLWindow *ret; + nsIDOMWindow *nswindow; + nsIDOMDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMHTMLIFrameElement_GetContentDocument(nsiframe, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetContentDocument failed: %08x\n", nsres); + return NULL; + } + + if(!nsdoc) { + FIXME("NULL contentDocument\n"); + return NULL; + } + + nswindow = get_nsdoc_window(nsdoc); + nsIDOMDocument_Release(nsdoc); + if(!nswindow) + return NULL; + + ret = nswindow_to_window(nswindow); + nsIDOMWindow_Release(nswindow); + if(!ret) + ERR("Could not get window object\n"); + + return ret; +} + +HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLWindow *content_window) { HTMLIFrame *ret; nsresult nsres; @@ -281,5 +286,12 @@ HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) if(NS_FAILED(nsres)) ERR("Could not get nsIDOMHTMLIFrameElement iface: %08x\n", nsres); + if(!content_window) + content_window = get_content_window(ret->nsiframe); + + if(content_window) + IHTMLWindow2_AddRef(HTMLWINDOW2(content_window)); + ret->content_window = content_window; + return &ret->framebase.element; }

1 0

Jacek Caban : mshtml: Moved content_window to HTMLFrameBase.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: bdb92707055984025fdcc9998d93b1a436d2c73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb92707055984025fdcc9998… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 1 19:18:38 2009 +0100 mshtml: Moved content_window to HTMLFrameBase. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlframebase.c | 9 ++++++++- dlls/mshtml/htmliframe.c | 15 ++++----------- dlls/mshtml/mshtml_private.h | 6 ++++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ba02d5c..b794b73 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1541,7 +1541,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL else if(!strcmpW(class_name, wszBODY)) ret = HTMLBodyElement_Create(doc, nselem); else if(!strcmpW(class_name, wszIFRAME)) - ret = HTMLIFrame_Create(doc, nselem); + ret = HTMLIFrame_Create(doc, nselem, NULL); else if(!strcmpW(class_name, wszIMG)) ret = HTMLImgElement_Create(doc, nselem); else if(!strcmpW(class_name, wszINPUT)) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index d00f685..83817be 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -257,13 +257,20 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase *This, REFIID riid, void **ppv) void HTMLFrameBase_destructor(HTMLFrameBase *This) { + if(This->content_window) + IHTMLWindow2_Release(HTMLWINDOW2(This->content_window)); + HTMLElement_destructor(&This->element.node); } void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, - dispex_static_data_t *dispex_data) + HTMLWindow *content_window, dispex_static_data_t *dispex_data) { This->lpIHTMLFrameBaseVtbl = &HTMLFrameBaseVtbl; HTMLElement_Init(&This->element, doc, nselem, dispex_data); + + if(content_window) + IHTMLWindow2_AddRef(HTMLWINDOW2(content_window)); + This->content_window = content_window; } diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 35aff3d..daef946 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -38,7 +38,6 @@ typedef struct { LONG ref; nsIDOMHTMLIFrameElement *nsiframe; - HTMLWindow *content_window; } HTMLIFrame; #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) @@ -104,9 +103,9 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, TRACE("(%p)->(%p)\n", This, p); - if(This->content_window) { - IHTMLWindow2_AddRef(HTMLWINDOW2(This->content_window)); - *p = HTMLWINDOW2(This->content_window); + if(This->framebase.content_window) { + IHTMLWindow2_AddRef(HTMLWINDOW2(This->framebase.content_window)); + *p = HTMLWINDOW2(This->framebase.content_window); }else { WARN("NULL content window\n"); *p = NULL; @@ -206,8 +205,6 @@ static void HTMLIFrame_destructor(HTMLDOMNode *iface) { HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); - if(This->content_window) - IHTMLWindow2_Release(HTMLWINDOW2(This->content_window)); if(This->nsiframe) nsIDOMHTMLIFrameElement_Release(This->nsiframe); @@ -280,8 +277,6 @@ HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->lpIHTMLFrameBase2Vtbl = &HTMLIFrameBase2Vtbl; ret->framebase.element.node.vtbl = &HTMLIFrameImplVtbl; - HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLIFrame_dispex); - nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&ret->nsiframe); if(NS_FAILED(nsres)) ERR("Could not get nsIDOMHTMLIFrameElement iface: %08x\n", nsres); @@ -289,9 +284,7 @@ HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, if(!content_window) content_window = get_content_window(ret->nsiframe); - if(content_window) - IHTMLWindow2_AddRef(HTMLWINDOW2(content_window)); - ret->content_window = content_window; + HTMLFrameBase_Init(&ret->framebase, doc, nselem, content_window, &HTMLIFrame_dispex); return &ret->framebase.element; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f03cb3..340fefe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -464,6 +464,8 @@ typedef struct { HTMLElement element; const IHTMLFrameBaseVtbl *lpIHTMLFrameBaseVtbl; + + HTMLWindow *content_window; } HTMLFrameBase; typedef struct _mutation_queue_t { @@ -693,7 +695,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL); HTMLElement *HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); -HTMLElement *HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); +HTMLElement *HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLWindow*); HTMLElement *HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLInputElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLOptionElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); @@ -709,7 +711,7 @@ void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_s void HTMLElement2_Init(HTMLElement*); void HTMLElement3_Init(HTMLElement*); void HTMLTextContainer_Init(HTMLTextContainer*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*); -void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*); +void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLWindow*,dispex_static_data_t*); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); void HTMLDOMNode_destructor(HTMLDOMNode*);

1 0