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

Jacek Caban : mshtml: Return referenced object in get_node_obj.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 4e10fcc953c6866a9a88ecde065fb70c6497147d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e10fcc953c6866a9a88ecde0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:21:10 2012 +0200 mshtml: Return referenced object in get_node_obj. --- dlls/mshtml/htmlnode.c | 57 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 5e1b8b3..46061a6 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -495,11 +495,10 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode VARIANT refChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - nsIDOMNode *nsnode, *nsref = NULL; - HTMLDOMNode *new_child; - HTMLDOMNode *node_obj; + HTMLDOMNode *new_child, *node_obj, *ref_node = NULL; + nsIDOMNode *nsnode; nsresult nsres; - HRESULT hres; + HRESULT hres = S_OK; TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); @@ -513,27 +512,31 @@ static HRESULT WINAPI HTMLDOMNode_insertBefore(IHTMLDOMNode *iface, IHTMLDOMNode case VT_NULL: break; case VT_DISPATCH: { - HTMLDOMNode *ref_node; - ref_node = get_node_obj(This->doc, (IUnknown*)V_DISPATCH(&refChild)); if(!ref_node) { ERR("unvalid node\n"); - return E_FAIL; + hres = E_FAIL; + break; } - - nsref = ref_node->nsnode; break; } default: FIXME("unimplemented refChild %s\n", debugstr_variant(&refChild)); - return E_NOTIMPL; + hres = E_NOTIMPL; } - nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, nsref, &nsnode); - if(NS_FAILED(nsres)) { - ERR("InsertBefore failed: %08x\n", nsres); - return E_FAIL; + if(SUCCEEDED(hres)) { + nsres = nsIDOMNode_InsertBefore(This->nsnode, new_child->nsnode, ref_node ? ref_node->nsnode : NULL, &nsnode); + if(NS_FAILED(nsres)) { + ERR("InsertBefore failed: %08x\n", nsres); + hres = E_FAIL; + } } + node_release(new_child); + if(ref_node) + node_release(ref_node); + if(FAILED(hres)) + return hres; hres = get_node(This->doc, nsnode, TRUE, &node_obj); nsIDOMNode_Release(nsnode); @@ -560,6 +563,7 @@ static HRESULT WINAPI HTMLDOMNode_removeChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; nsres = nsIDOMNode_RemoveChild(This->nsnode, node_obj->nsnode, &nsnode); + node_release(node_obj); if(NS_FAILED(nsres)) { ERR("RemoveChild failed: %08x\n", nsres); return E_FAIL; @@ -579,8 +583,7 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - HTMLDOMNode *node_new; - HTMLDOMNode *node_old; + HTMLDOMNode *node_new, *node_old, *ret_node; nsIDOMNode *nsnode; nsresult nsres; HRESULT hres; @@ -592,22 +595,23 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; node_old = get_node_obj(This->doc, (IUnknown*)oldChild); - if(!node_old) + if(!node_old) { + node_release(node_new); return E_FAIL; + } nsres = nsIDOMNode_ReplaceChild(This->nsnode, node_new->nsnode, node_old->nsnode, &nsnode); - if(NS_FAILED(nsres)) { + node_release(node_new); + node_release(node_old); + if(NS_FAILED(nsres)) return E_FAIL; - } - - nsnode = node_new->nsnode; - hres = get_node(This->doc, nsnode, TRUE, &node_new); + hres = get_node(This->doc, nsnode, TRUE, &ret_node); nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres; - *node = &node_new->IHTMLDOMNode_iface; + *node = &ret_node->IHTMLDOMNode_iface; return S_OK; } @@ -676,9 +680,10 @@ static HRESULT WINAPI HTMLDOMNode_appendChild(IHTMLDOMNode *iface, IHTMLDOMNode return E_FAIL; nsres = nsIDOMNode_AppendChild(This->nsnode, node_obj->nsnode, &nsnode); + node_release(node_obj); if(NS_FAILED(nsres)) { - WARN("AppendChild failed: %08x\n", nsres); - nsnode = node_obj->nsnode; + ERR("AppendChild failed: %08x\n", nsres); + return E_FAIL; } hres = get_node(This->doc, nsnode, TRUE, &node_obj); @@ -1123,7 +1128,6 @@ static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) IHTMLDOMNode *node; IUnknown_QueryInterface(iface, &IID_IHTMLDOMNode, (void**)&node); - IHTMLDOMNode_Release(node); while(iter) { if(&iter->IHTMLDOMNode_iface == node) @@ -1132,6 +1136,7 @@ static HTMLDOMNode *get_node_obj(HTMLDocumentNode *This, IUnknown *iface) } FIXME("Not found %p\n", iface); + IHTMLDOMNode_Release(node); return NULL; }

1 0

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

June 28, 2012

Module: wine Branch: master Commit: 54fd0845c2e0661fd4d6104019e9c4e74e9f718b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fd0845c2e0661fd4d610401… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:40 2012 +0200 mshtml: Share nsselect reference with nsnode. --- dlls/mshtml/htmlselect.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index d062c7e..587378b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -529,15 +530,6 @@ static HRESULT HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLSelectElement_destructor(HTMLDOMNode *iface) -{ - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLSelectElement_Release(This->nsselect); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); @@ -606,7 +598,7 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, - HTMLSelectElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -645,15 +637,14 @@ HRESULT HTMLSelectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLSelectElement_iface.lpVtbl = &HTMLSelectElementVtbl; ret->element.node.vtbl = &HTMLSelectElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLSelectElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLSelectElement, (void**)&ret->nsselect); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLSelectElement interfce: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLSelectElement_dispex); + /* Share nsselect reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsselect == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Henri Verbeet : wined3d: Avoid a useless call to wined3d_get_adapter_mode_count() in wined3d_enum_adapter_modes().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 91f02018c59cb0254556d513f4881dd2354b3ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f02018c59cb0254556d513f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:10 2012 +0200 wined3d: Avoid a useless call to wined3d_get_adapter_mode_count() in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1cce96b..88e6a91 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2945,12 +2945,8 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada TRACE("wined3d %p, adapter_idx %u, format %s, mode_idx %u, mode %p.\n", wined3d, adapter_idx, debug_d3dformat(format_id), mode_idx, mode); - /* Validate the parameters as much as possible */ - if (!mode || adapter_idx >= wined3d->adapter_count - || mode_idx >= wined3d_get_adapter_mode_count(wined3d, adapter_idx, format_id)) - { + if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - } /* TODO: Store modes per adapter and read it from the adapter structure */ if (!adapter_idx) @@ -2968,8 +2964,14 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada /* If we are filtering to a specific format (D3D9), then need to skip all unrelated modes, but if mode is irrelevant (D3D8), then we can just count through the ones with valid bit depths */ - while (i <= mode_idx && EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + while (i <= mode_idx) { + if (!EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) + { + WARN("Invalid mode_idx %u.\n", mode_idx); + return WINED3DERR_INVALIDCALL; + } + if (format_id == WINED3DFMT_UNKNOWN) { /* This is for D3D8, do not enumerate P8 here */ @@ -2981,11 +2983,6 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada } } - if (!i) - { - TRACE("No modes found for format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return WINED3DERR_INVALIDCALL; - } ModeIdx = j - 1; /* Now get the display mode via the calculated index */

1 0

Henri Verbeet : wined3d: Avoid a redundant call to EnumDisplaySettingsExW() in wined3d_enum_adapter_modes().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: b6bdb4286d629cfef58cb14db4e4dbe7ec44b0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bdb4286d629cfef58cb14db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:11 2012 +0200 wined3d: Avoid a redundant call to EnumDisplaySettingsExW() in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 88e6a91..b02f01e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2954,7 +2954,6 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); UINT format_bits = format->byte_count * CHAR_BIT; DEVMODEW DevModeW; - int ModeIdx = 0; UINT i = 0; int j = 0; @@ -2983,34 +2982,23 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada } } - ModeIdx = j - 1; + mode->width = DevModeW.dmPelsWidth; + mode->height = DevModeW.dmPelsHeight; + mode->refresh_rate = DEFAULT_REFRESH_RATE; + if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) + mode->refresh_rate = DevModeW.dmDisplayFrequency; - /* Now get the display mode via the calculated index */ - if (EnumDisplaySettingsExW(NULL, ModeIdx, &DevModeW, 0)) - { - mode->width = DevModeW.dmPelsWidth; - mode->height = DevModeW.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = DevModeW.dmDisplayFrequency; + if (format_id == WINED3DFMT_UNKNOWN) + mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); + else + mode->format_id = format_id; - if (format_id == WINED3DFMT_UNKNOWN) - mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); - else - mode->format_id = format_id; - - if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; - } + if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; else - { - TRACE("Requested mode %u out of range.\n", mode_idx); - return WINED3DERR_INVALIDCALL; - } + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, DevModeW.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering);

1 0

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_get_adapter_mode_count ().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 194ee40e076e7e79caf1e2149356f09f8d59ed9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=194ee40e076e7e79caf1e2149… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:13 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_get_adapter_mode_count(). --- dlls/wined3d/directx.c | 55 +++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 875c333..0cff039 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2894,48 +2894,41 @@ HMONITOR CDECL wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT a UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id) { + const struct wined3d_adapter *adapter; + const struct wined3d_format *format; + unsigned int i = 0; + unsigned int j = 0; + UINT format_bits; + DEVMODEW mode; + TRACE("wined3d %p, adapter_idx %u, format %s.\n", wined3d, adapter_idx, debug_d3dformat(format_id)); if (adapter_idx >= wined3d->adapter_count) return 0; - /* TODO: Store modes per adapter and read it from the adapter structure */ - if (!adapter_idx) - { - const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); - UINT format_bits = format->byte_count * CHAR_BIT; - unsigned int i = 0; - unsigned int j = 0; - DEVMODEW mode; + adapter = &wined3d->adapters[adapter_idx]; + format = wined3d_get_format(&adapter->gl_info, format_id); + format_bits = format->byte_count * CHAR_BIT; - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) + while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) + { + if (format_id == WINED3DFMT_UNKNOWN) { - ++j; - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for D3D8, do not enumerate P8 here */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - } - else if (mode.dmBitsPerPel == format_bits) - { - ++i; - } + /* This is for d3d8, do not enumerate P8 here. */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + } + else if (mode.dmBitsPerPel == format_bits) + { + ++i; } - - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); - - return i; - } - else - { - FIXME("Adapter not primary display.\n"); } - return 0; + TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + + return i; } /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */

1 0

Henri Verbeet : ddraw: Prevent ddraw from being unloaded.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: f95f4660602aad2e6564af3e3a933a68a36b4e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95f4660602aad2e6564af3e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:14 2012 +0200 ddraw: Prevent ddraw from being unloaded. --- dlls/ddraw/main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index db79184..61e8ec9 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -812,6 +812,7 @@ DllMain(HINSTANCE hInstDLL, TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); if (Reason == DLL_PROCESS_ATTACH) { + static HMODULE ddraw_self; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); HKEY hkey = 0; @@ -911,6 +912,16 @@ DllMain(HINSTANCE hInstDLL, RegCloseKey( hkey ); } + /* Prevent the ddraw module from being unloaded. When switching to + * exclusive mode, we replace the window proc of the ddraw window. If + * an application would unload ddraw from the WM_DESTROY handler for + * that window, it would return to unmapped memory and die. Apparently + * this is supposed to work on Windows. We should probably use + * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently + * implemented. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + ERR("Failed to get own module handle.\n"); + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); }

1 0

Francois Gouget : opencl: We still use the deprecated OpenCL 1.1 APIs.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 1c640fd80b49d704559781065387eb9fc70d744c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c640fd80b49d704559781065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 28 16:22:38 2012 +0200 opencl: We still use the deprecated OpenCL 1.1 APIs. --- dlls/opencl/opencl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 9b466ec..f3e6e79 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #if defined(HAVE_CL_CL_H) +#define CL_USE_DEPRECATED_OPENCL_1_1_APIS #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Piotr Caban : msvcp90: Always destroy _Lockit object in use_facet function.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: c679569f27fae1665ef0a0279b78dced97b4e1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c679569f27fae1665ef0a0279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 28 10:51:53 2012 +0200 msvcp90: Always destroy _Lockit object in use_facet function. --- dlls/msvcp90/locale.c | 56 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 480861f..6fbe349 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1537,8 +1537,10 @@ ctype_char* ctype_char_use_facet(const locale *loc) return (ctype_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_char__Getcat(&fac, loc); obj = (ctype_char*)fac; @@ -2292,8 +2294,10 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) return (ctype_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_wchar__Getcat(&fac, loc); obj = (ctype_wchar*)fac; @@ -2318,8 +2322,10 @@ static ctype_wchar* ctype_short_use_facet(const locale *loc) return (ctype_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_short__Getcat(&fac, loc); obj = (ctype_wchar*)fac; @@ -2783,8 +2789,10 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) return (codecvt_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_char__Getcat(&fac, loc); obj = (codecvt_char*)fac; @@ -3086,8 +3094,10 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) return (codecvt_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_wchar__Getcat(&fac, loc); obj = (codecvt_wchar*)fac; @@ -3136,8 +3146,10 @@ static codecvt_wchar* codecvt_short_use_facet(const locale *loc) return (codecvt_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_short__Getcat(&fac, loc); obj = (codecvt_wchar*)fac; @@ -3547,8 +3559,10 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) return (numpunct_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_char__Getcat(&fac, loc); obj = (numpunct_char*)fac; @@ -3904,8 +3918,10 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) return (numpunct_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_wchar__Getcat(&fac, loc); obj = (numpunct_wchar*)fac; @@ -3950,8 +3966,10 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) return (numpunct_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_short__Getcat(&fac, loc); obj = (numpunct_wchar*)fac; @@ -4347,8 +4365,10 @@ num_get* num_get_wchar_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_wchar__Getcat(&fac, loc); obj = (num_get*)fac; @@ -4385,8 +4405,10 @@ static num_get* num_get_short_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_short__Getcat(&fac, loc); obj = (num_get*)fac; @@ -5483,8 +5505,10 @@ num_get* num_get_char_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_char__Getcat(&fac, loc); obj = (num_get*)fac; @@ -6333,8 +6357,10 @@ num_put* num_put_char_use_facet(const locale *loc) return (num_put*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_put_char__Getcat(&fac, loc); obj = (num_put*)fac; @@ -6944,8 +6970,10 @@ num_put* num_put_wchar_use_facet(const locale *loc) return (num_put*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_put_wchar__Getcat(&fac, loc); obj = (num_put*)fac;

1 0

Jacek Caban : mshtml: Use proper macro to release nstext.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 66ee1fc98db102bf353e7dcbc5b47ff81f171c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ee1fc98db102bf353e7dcbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:14 2012 +0200 mshtml: Use proper macro to release nstext. --- dlls/mshtml/htmldoc3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f930bcd..5241325 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t } hres = HTMLDOMTextNode_Create(This->doc_node, (nsIDOMNode*)nstext, &node); - nsIDOMElement_Release(nstext); + nsIDOMText_Release(nstext); if(FAILED(hres)) return hres;

1 0

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

June 28, 2012

Module: wine Branch: master Commit: d37f7a91400bad741f47323c6fb15b86dbcb534f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f7a91400bad741f47323c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:28 2012 +0200 mshtml: Share nsinput reference with nsnode. --- dlls/mshtml/htmlinput.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index a174634..27b1b47 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1117,15 +1118,6 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLInputElement_destructor(HTMLDOMNode *iface) -{ - HTMLInputElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLInputElement_Release(This->nsinput); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1159,7 +1151,7 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, - HTMLInputElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -1194,14 +1186,13 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLInputTextElement_iface.lpVtbl = &HTMLInputTextElementVtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement, (void**)&ret->nsinput); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLInputElement interface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex); + /* Share nsinput reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsinput == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0