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

Vincent Povirk : windowscodecs: Add stub IWICBitmapScaler implementation.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: efab393295e3c9fe49891c778cd05b49f7426f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efab393295e3c9fe49891c778… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 13:45:32 2012 -0600 windowscodecs: Add stub IWICBitmapScaler implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 5 +- dlls/windowscodecs/scaler.c | 169 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 174 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 28b5852..da851d5 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ propertybag.c \ proxy.c \ regsvr.c \ + scaler.c \ stream.c \ tgaformat.c \ tiffformat.c \ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 9ef8bbb..fa28c9a 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -356,8 +356,9 @@ static HRESULT WINAPI ComponentFactory_CreateFormatConverter(IWICComponentFactor static HRESULT WINAPI ComponentFactory_CreateBitmapScaler(IWICComponentFactory *iface, IWICBitmapScaler **ppIBitmapScaler) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapScaler); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapScaler); + + return BitmapScaler_Create(ppIBitmapScaler); } static HRESULT WINAPI ComponentFactory_CreateBitmapClipper(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c new file mode 100644 index 0000000..d3bd1b7 --- /dev/null +++ b/dlls/windowscodecs/scaler.c @@ -0,0 +1,169 @@ +/* + * Copyright 2010 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapScaler { + IWICBitmapScaler IWICBitmapScaler_iface; + LONG ref; +} BitmapScaler; + +static inline BitmapScaler *impl_from_IWICBitmapScaler(IWICBitmapScaler *iface) +{ + return CONTAINING_RECORD(iface, BitmapScaler, IWICBitmapScaler_iface); +} + +static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFIID iid, + void **ppv) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapScaler, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, + IWICBitmapSource *pISource, UINT uiWidth, UINT uiHeight, + WICBitmapInterpolationMode mode) +{ + FIXME("(%p,%p,%u,%u,%u): stub\n", iface, pISource, uiWidth, uiHeight, mode); + + return E_NOTIMPL; +} + +static const IWICBitmapScalerVtbl BitmapScaler_Vtbl = { + BitmapScaler_QueryInterface, + BitmapScaler_AddRef, + BitmapScaler_Release, + BitmapScaler_GetSize, + BitmapScaler_GetPixelFormat, + BitmapScaler_GetResolution, + BitmapScaler_CopyPalette, + BitmapScaler_CopyPixels, + BitmapScaler_Initialize +}; + +HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) +{ + BitmapScaler *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapScaler)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapScaler_iface.lpVtbl = &BitmapScaler_Vtbl; + This->ref = 1; + + *scaler = &This->IWICBitmapScaler_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 92fa7ef..815ee3d 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -44,6 +44,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory::CreateEncoder .
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 02aa7ec403e5faf3d89126e39481a4c7209d5540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02aa7ec403e5faf3d89126e39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:10:08 2012 -0600 windowscodecs: Implement IWICImagingFactory::CreateEncoder. --- dlls/windowscodecs/imgfactory.c | 60 +++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index fa28c9a..d70c223 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -335,9 +335,65 @@ static HRESULT WINAPI ComponentFactory_CreateEncoder(IWICComponentFactory *iface REFGUID guidContainerFormat, const GUID *pguidVendor, IWICBitmapEncoder **ppIEncoder) { - FIXME("(%p,%s,%s,%p): stub\n", iface, debugstr_guid(guidContainerFormat), + static int fixme=0; + IEnumUnknown *enumencoders; + IUnknown *unkencoderinfo; + IWICBitmapEncoderInfo *encoderinfo; + IWICBitmapEncoder *encoder=NULL; + HRESULT res=S_OK; + ULONG num_fetched; + GUID actual_containerformat; + + TRACE("(%p,%s,%s,%p)\n", iface, debugstr_guid(guidContainerFormat), debugstr_guid(pguidVendor), ppIEncoder); - return E_NOTIMPL; + + if (pguidVendor && !fixme++) + FIXME("ignoring vendor GUID\n"); + + res = CreateComponentEnumerator(WICEncoder, WICComponentEnumerateDefault, &enumencoders); + if (FAILED(res)) return res; + + while (!encoder) + { + res = IEnumUnknown_Next(enumencoders, 1, &unkencoderinfo, &num_fetched); + + if (res == S_OK) + { + res = IUnknown_QueryInterface(unkencoderinfo, &IID_IWICBitmapEncoderInfo, (void**)&encoderinfo); + + if (SUCCEEDED(res)) + { + res = IWICBitmapEncoderInfo_GetContainerFormat(encoderinfo, &actual_containerformat); + + if (SUCCEEDED(res) && IsEqualGUID(guidContainerFormat, &actual_containerformat)) + { + res = IWICBitmapEncoderInfo_CreateInstance(encoderinfo, &encoder); + if (FAILED(res)) + encoder = NULL; + } + + IWICBitmapEncoderInfo_Release(encoderinfo); + } + + IUnknown_Release(unkencoderinfo); + } + else + break; + } + + IEnumUnknown_Release(enumencoders); + + if (encoder) + { + *ppIEncoder = encoder; + return S_OK; + } + else + { + WARN("failed to create encoder\n"); + *ppIEncoder = NULL; + return WINCODEC_ERR_COMPONENTNOTFOUND; + } } static HRESULT WINAPI ComponentFactory_CreatePalette(IWICComponentFactory *iface,

1 0

Francois Gouget : msvcp90: Make numpunct_char_use_facet() static.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 98748efbf5cf57272dc469ad678fc46625392747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98748efbf5cf57272dc469ad6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:32:56 2012 +0200 msvcp90: Make numpunct_char_use_facet() static. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 01fb1a6..2c16147 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3445,7 +3445,7 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc return LC_NUMERIC; } -numpunct_char* numpunct_char_use_facet(const locale *loc) +static numpunct_char* numpunct_char_use_facet(const locale *loc) { static numpunct_char *obj = NULL;

1 0

Francois Gouget : jscript: Make int_to_bstr() static.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b7f74922a48b285358301da7477cca73a33042d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f74922a48b285358301da74… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:33:28 2012 +0200 jscript: Make int_to_bstr() static. --- dlls/jscript/jscript.h | 1 - dlls/jscript/jsutils.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4662afa..11b6ec9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -266,7 +266,6 @@ HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HI HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; -BSTR int_to_bstr(int) DECLSPEC_HIDDEN; HRESULT double_to_bstr(double,BSTR*) DECLSPEC_HIDDEN; typedef struct named_item_t { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 0e8e304..9f5eb58 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -517,7 +517,7 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) return S_OK; } -BSTR int_to_bstr(int i) +static BSTR int_to_bstr(int i) { WCHAR buf[12], *p; BOOL neg = FALSE;

1 0

Jacek Caban : mshtml: Moved image_factory to HTMLInnerWindow.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b85631bab675b867a1d3f7c2f0bca6e0a0b8a417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85631bab675b867a1d3f7c2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:27 2012 +0200 mshtml: Moved image_factory to HTMLInnerWindow. --- dlls/mshtml/htmlimg.c | 7 +++++-- dlls/mshtml/htmlwindow.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 6 +++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 300218b..adb40d5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -920,11 +920,13 @@ static dispex_static_data_t HTMLImageElementFactory_dispex = { HTMLImageElementFactory_iface_tids }; -HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow *window) +HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElementFactory **ret_val) { HTMLImageElementFactory *ret; ret = heap_alloc(sizeof(HTMLImageElementFactory)); + if(!ret) + return E_OUTOFMEMORY; ret->IHTMLImageElementFactory_iface.lpVtbl = &HTMLImageElementFactoryVtbl; ret->ref = 1; @@ -933,5 +935,6 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow *window) init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, &HTMLImageElementFactory_dispex); - return ret; + *ret_val = ret; + return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc6d9af..5852a26 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -192,11 +192,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->frame_element) This->frame_element->content_window = NULL; - if(This->image_factory) { - This->image_factory->window = NULL; - IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); - } - if(This->location) { This->location->window = NULL; IHTMLLocation_Release(&This->location->IHTMLLocation_iface); @@ -228,6 +223,11 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); + if(This->image_factory) { + This->image_factory->window = NULL; + IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); + } + if(This->option_factory) { This->option_factory->window = NULL; IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); @@ -647,12 +647,17 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageElementFactory **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); - if(!window->image_factory) - window->image_factory = HTMLImageElementFactory_Create(window); + if(!window->image_factory) { + HRESULT hres; + + hres = HTMLImageElementFactory_Create(window, &window->image_factory); + if(FAILED(hres)) + return hres; + } *p = &window->image_factory->IHTMLImageElementFactory_iface; IHTMLImageElementFactory_AddRef(*p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 31532cd..d9f0639 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -278,7 +278,7 @@ typedef struct { LONG ref; - HTMLOuterWindow *window; + HTMLInnerWindow *window; } HTMLImageElementFactory; struct HTMLLocation { @@ -335,7 +335,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - HTMLImageElementFactory *image_factory; HTMLLocation *location; IHTMLScreen *screen; IOmHistory *history; @@ -355,6 +354,7 @@ struct HTMLInnerWindow { IHTMLEventObj *event; + HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; global_prop_t *global_props; @@ -663,7 +663,7 @@ HRESULT update_window_doc(HTMLOuterWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; -HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow*) DECLSPEC_HIDDEN; +HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Moved screen property to HTMLInnerWindow.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 4647fe0f231d57cc056b3dc61c2bf21c314059f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4647fe0f231d57cc056b3dc61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:40 2012 +0200 mshtml: Moved screen property to HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5852a26..2c355a9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -197,9 +197,6 @@ static void release_outer_window(HTMLOuterWindow *This) IHTMLLocation_Release(&This->location->IHTMLLocation_iface); } - if(This->screen) - IHTMLScreen_Release(This->screen); - This->window_ref->window = NULL; windowref_release(This->window_ref); @@ -233,6 +230,9 @@ static void release_inner_window(HTMLInnerWindow *This) IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); } + if(This->screen) + IHTMLScreen_Release(This->screen); + heap_free(This); } @@ -1068,7 +1068,7 @@ static HRESULT WINAPI HTMLWindow2_showHelp(IHTMLWindow2 *iface, BSTR helpURL, VA static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d9f0639..401e5cb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,7 +336,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; HTMLLocation *location; - IHTMLScreen *screen; IOmHistory *history; struct list children; @@ -356,6 +355,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; + IHTMLScreen *screen; global_prop_t *global_props; DWORD global_prop_cnt;

1 0

Jacek Caban : mshtml: Moved history property to HTMLInnerWindow.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: d31176ec03684970feb6d24945f0a028fee41ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31176ec03684970feb6d2494… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:53 2012 +0200 mshtml: Moved history property to HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2c355a9..651aa75 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -232,6 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->screen) IHTMLScreen_Release(This->screen); + if(This->history) + IOmHistory_Release(This->history); heap_free(This); } @@ -684,7 +686,7 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 401e5cb..d8d67f7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,7 +336,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; HTMLLocation *location; - IOmHistory *history; struct list children; struct list sibling_entry; @@ -356,6 +355,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; + IOmHistory *history; global_prop_t *global_props; DWORD global_prop_cnt;

1 0

Jacek Caban : mshtml: Return referenced instances from node constructors.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: a8d0efc7d6ff001b671e379c6c312257261a4b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d0efc7d6ff001b671e379c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:33:35 2012 +0200 mshtml: Return referenced instances from node constructors. --- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmldoc3.c | 1 - dlls/mshtml/htmldoc5.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlnode.c | 20 ++++++-------------- dlls/mshtml/htmltextnode.c | 8 +------- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ede856b..19b73e5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1037,7 +1037,6 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa return hres; *newElem = &elem->IHTMLElement_iface; - IHTMLElement_AddRef(&elem->IHTMLElement_iface); return S_OK; } @@ -2262,7 +2261,6 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; - htmldoc_addref(&doc_frag->basedoc); *ret = doc_frag; return S_OK; } diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 3e7c7b7..eb19f8c 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -135,7 +135,6 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t return hres; *newTextNode = &node->IHTMLDOMNode_iface; - IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 587d75b..2377b7a 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -155,7 +155,6 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs return hres; *ppRetNode = &elem->node.IHTMLDOMNode_iface; - IHTMLDOMNode_AddRef(&elem->node.IHTMLDOMNode_iface); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b0e589e..10d5108 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1618,7 +1618,6 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** } } - IHTMLElement_AddRef(&new_elem->IHTMLElement_iface); *ret = &new_elem->node; return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index adb40d5..5d1c665 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -841,6 +841,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i hres = IHTMLElement_QueryInterface(&elem->IHTMLElement_iface, &IID_IHTMLImgElement, (void**)&img); + IHTMLElement_Release(&elem->IHTMLElement_iface); if(FAILED(hres)) { ERR("IHTMLElement_QueryInterface failed: 0x%08x\n", hres); return hres; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9574fcb..5124c1c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1007,14 +1007,7 @@ void HTMLDOMNode_destructor(HTMLDOMNode *This) static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - HRESULT hres; - - hres = create_node(This->doc, nsnode, ret); - if(FAILED(hres)) - return hres; - - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return S_OK; + return create_node(This->doc, nsnode, ret); } static const NodeImplVtbl HTMLDOMNodeImplVtbl = { @@ -1027,9 +1020,12 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno { node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; - node->ref = 1; + node->ref = 2; node->doc = doc; + if(&doc->node != node) + node->ref++; /* one extra for list entry reference */ + if(nsnode) nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; @@ -1096,7 +1092,6 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { HTMLDOMNode *iter = This->nodes; - HRESULT hres; while(iter) { if(iter->nsnode == nsnode) @@ -1111,10 +1106,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - hres = create_node(This, nsnode, ret); - if(SUCCEEDED(hres)) - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return hres; + return create_node(This, nsnode, ret); } /* diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 58422de..7663810 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -191,14 +191,8 @@ static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - HRESULT hres; - hres = HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); - if(FAILED(hres)) - return hres; - - IHTMLDOMNode_AddRef(&(*ret)->IHTMLDOMNode_iface); - return S_OK; + return HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); } static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = {

1 0

Jacek Caban : mshtml: Use inner window as script global object.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: d9efd6a44d709884d5666eca18539cde84893921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9efd6a44d709884d5666eca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:33:48 2012 +0200 mshtml: Use inner window as script global object. --- dlls/mshtml/script.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 099266e..458499e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -316,11 +316,11 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC if(strcmpW(pstrName, windowW)) return DISP_E_MEMBERNOTFOUND; - if(!This->window || !This->window->base.outer_window) + if(!This->window) return E_FAIL; /* FIXME: Return proxy object */ - *ppiunkItem = (IUnknown*)&This->window->base.outer_window->base.IHTMLWindow2_iface; + *ppiunkItem = (IUnknown*)&This->window->base.IHTMLWindow2_iface; IUnknown_AddRef(*ppiunkItem); return S_OK;

1 0

Jacek Caban : mshtml: Share nsIDOMText reference with nsIDOMNode.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: cf35bbd2618d8e664d1e16dcf2e8825be060c514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf35bbd2618d8e664d1e16dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:06 2012 +0200 mshtml: Share nsIDOMText reference with nsIDOMNode. --- dlls/mshtml/htmltextnode.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 7663810..1be260f 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -18,6 +18,7 @@ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -178,16 +179,6 @@ static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) -{ - HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - - if(This->nstext) - IHTMLDOMTextNode_Release(This->nstext); - - HTMLDOMNode_destructor(&This->node); -} - static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); @@ -197,7 +188,7 @@ static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTM static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { HTMLDOMTextNode_QI, - HTMLDOMTextNode_destructor, + HTMLDOMNode_destructor, HTMLDOMTextNode_clone }; @@ -226,17 +217,17 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMText iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - init_dispex(&ret->node.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, &HTMLDOMTextNode_dispex); + HTMLDOMNode_Init(doc, &ret->node, nsnode); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstext == ret->node.nsnode); + + /* Share reference with nsnode */ + nsIDOMNode_Release(ret->node.nsnode); + *node = &ret->node; return S_OK; }

1 0