March 2011 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9: Handle pool and device in ID3DXEffect.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: eb1faf6155eda67028637ed6b252c46d38d803fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb1faf6155eda67028637ed6b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:28 2011 +0200 d3dx9: Handle pool and device in ID3DXEffect. --- dlls/d3dx9_36/effect.c | 39 ++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 15683df..fec95be 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -32,6 +32,9 @@ typedef struct ID3DXEffectImpl { ID3DXEffect ID3DXEffect_iface; LONG ref; + LPDIRECT3DDEVICE9 device; + LPD3DXEFFECTPOOL pool; + UINT parameter_count; UINT technique_count; } ID3DXEffectImpl; @@ -55,6 +58,18 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } +static void free_effect(struct ID3DXEffectImpl *effect) +{ + TRACE("Free effect %p\n", effect); + + if (effect->pool) + { + effect->pool->lpVtbl->Release(effect->pool); + } + + IDirect3DDevice9_Release(effect->device); +} + static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) { return (0xfeff0000 | ((major) << 8) | (minor)); @@ -103,7 +118,10 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect* iface) TRACE("(%p)->(): Release from %u\n", This, ref + 1); if (!ref) + { + free_effect(This); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -899,15 +917,24 @@ static HRESULT d3dx9_parse_effect(ID3DXEffectImpl *effect, const char *data, UIN return S_OK; } -static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE_T data_size) +static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, + const char *data, SIZE_T data_size, LPD3DXEFFECTPOOL pool) { DWORD tag, offset; const char *ptr = data; HRESULT hr; + TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; + if (pool) pool->lpVtbl->AddRef(pool); + effect->pool = pool; + + IDirect3DDevice9_AddRef(device); + effect->device = device; + read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -928,11 +955,17 @@ static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE if (hr != S_OK) { FIXME("Failed to parse effect.\n"); - return hr; + goto err_out; } } return S_OK; + +err_out: + + free_effect(effect); + + return hr; } HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, @@ -969,7 +1002,7 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, return E_OUTOFMEMORY; } - hr = d3dx9_effect_init(object, srcdata, srcdatalen); + hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); if (FAILED(hr)) { WARN("Failed to initialize shader reflection\n"); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8b23536..f4e0f9a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "initguid.h" #include "wine/test.h" #include "d3dx9.h" @@ -24,10 +26,11 @@ static const char effect_desc[] = "{\n" "}\n"; -static void test_create_effect(IDirect3DDevice9* device) +static void test_create_effect(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffect* effect; + ID3DXEffect *effect; + ULONG count; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -44,13 +47,16 @@ static void test_create_effect(IDirect3DDevice9* device) hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - effect->lpVtbl->Release(effect); + count = effect->lpVtbl->Release(effect); + ok(count == 0, "Release failed %u\n", count); } -static void test_create_effect_pool(void) +static void test_create_effect_pool(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffectPool* pool; + ID3DXEffectPool *pool, *pool2; + ULONG count; + IDirect3DDevice9 *device2; hr = D3DXCreateEffectPool(NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -58,7 +64,29 @@ static void test_create_effect_pool(void) hr = D3DXCreateEffectPool(&pool); ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); - pool->lpVtbl->Release(pool); + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); + + hr = D3DXCreateEffectPool(&pool); + ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); + + hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, pool, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = pool2->lpVtbl->Release(pool2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + hr = device->lpVtbl->QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = device2->lpVtbl->Release(device2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); } START_TEST(effect) @@ -93,7 +121,7 @@ START_TEST(effect) } test_create_effect(device); - test_create_effect_pool(); + test_create_effect_pool(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Rico Schüller : d3dx9/tests: Add refcount test for the device.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 68f11dabd7740624d666bbcf4bfd4c47993c85a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f11dabd7740624d666bbcf4… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:31 2011 +0200 d3dx9/tests: Add refcount test for the device. --- dlls/d3dx9_36/tests/effect.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f4e0f9a..2c9034f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -92,10 +92,11 @@ static void test_create_effect_pool(IDirect3DDevice9 *device) START_TEST(effect) { HWND wnd; - IDirect3D9* d3d; - IDirect3DDevice9* device; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; + ULONG count; wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -123,7 +124,11 @@ START_TEST(effect) test_create_effect(device); test_create_effect_pool(device); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d); + count = IDirect3DDevice9_Release(device); + ok(count == 0, "The device was not properly freed: refcount %u\n", count); + + count = IDirect3D9_Release(d3d); + ok(count == 0, "Release failed %u\n", count); + DestroyWindow(wnd); }

1 0

Rico Schüller : include: Fix ID3DXEffectCompiler interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 2b877d758686f6e172c54e2535ecefd6c5b86e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b877d758686f6e172c54e253… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:35 2011 +0200 include: Fix ID3DXEffectCompiler interface. --- include/d3dx9effect.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 235b8e7..d014559 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -337,9 +337,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; - STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; - STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/

1 0

Rico Schüller : d3dx9: Add ID3DXBaseEffect interface.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: aaa06cfba4e357343508d2776416275e60f77acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa06cfba4e357343508d2776… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:38 2011 +0200 d3dx9: Add ID3DXBaseEffect interface. --- dlls/d3dx9_36/effect.c | 689 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 669 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa06cfba4e357343508d…

1 0

Jacek Caban : mshtml: Try loading library in IInternetProtocolInfo:: ParseUrl(PARSE_INTERNET_URL) for res protocol to work around library name difference for winelib libraries .
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 643c66ba752a6274178cd9c574896395cf063f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=643c66ba752a6274178cd9c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:50:52 2011 +0200 mshtml: Try loading library in IInternetProtocolInfo::ParseUrl(PARSE_INTERNET_URL) for res protocol to work around library name difference for winelib libraries. --- dlls/mshtml/protocol.c | 16 ++++++++++++++-- dlls/mshtml/tests/protocol.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index dad93ba..456c3fd 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -865,8 +865,20 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); if(!len) { - WARN("Could not find file %s\n", debugstr_w(file_part)); - return MK_E_SYNTAX; + HMODULE module; + + /* SearchPath does not work well with winelib files (like our test executable), + * so we also try to load the library here */ + module = LoadLibraryExW(file_part, NULL, LOAD_LIBRARY_AS_DATAFILE); + if(!module) { + WARN("Could not find file %s\n", debugstr_w(file_part)); + return MK_E_SYNTAX; + } + + len = GetModuleFileNameW(module, full_path, sizeof(full_path)/sizeof(WCHAR)); + FreeLibrary(module); + if(!len) + return E_FAIL; } size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 7504927..07f424f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -315,6 +315,8 @@ static void test_res_protocol(void) {'r','e','s',':','/','/','x','x','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR wrong_url5[] = {'r','e','s',':','/','/','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; + static const WCHAR wrong_url6[] = + {'r','e','s',':','/','/','c',':','\\','d','i','r','\\','f','i','l','e','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR mshtml_dllW[] = {'m','s','h','t','m','l','.','d','l','l',0}; hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -366,6 +368,10 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url6, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,

1 0

Jacek Caban : mshtml: Store security manager in HTMLWindow instead of HTMLDocumentNode.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 739ff1208e63ef46dcb11ec0205fc76fc80f5eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739ff1208e63ef46dcb11ec02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:51:04 2011 +0200 mshtml: Store security manager in HTMLWindow instead of HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 9 --------- dlls/mshtml/htmlwindow.c | 10 ++++++++++ dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/secmgr.c | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f9bc469..f7a70ca 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1912,8 +1912,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) release_nsevents(This); if(This->catmgr) ICatInformation_Release(This->catmgr); - if(This->secmgr) - IInternetSecurityManager_Release(This->secmgr); detach_selection(This); detach_ranges(This); @@ -2013,7 +2011,6 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *wi HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; - HRESULT hres; doc = alloc_doc_node(doc_obj, window); if(!doc) @@ -2030,12 +2027,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->node.vtbl = &HTMLDocumentNodeImplVtbl; doc->node.cp_container = &doc->basedoc.cp_container; - hres = CoInternetCreateSecurityManager(NULL, &doc->secmgr, 0); - if(FAILED(hres)) { - htmldoc_release(&doc->basedoc); - return hres; - } - *ret = doc; return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 695b829..e0d542b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -236,6 +236,9 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) window_set_docnode(This, NULL); release_children(This); + if(This->secmgr) + IInternetSecurityManager_Release(This->secmgr); + if(This->frame_element) This->frame_element->content_window = NULL; @@ -2217,6 +2220,7 @@ static dispex_static_data_t HTMLWindow_dispex = { HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTMLWindow *parent, HTMLWindow **ret) { HTMLWindow *window; + HRESULT hres; window = heap_alloc_zero(sizeof(HTMLWindow)); if(!window) @@ -2251,6 +2255,12 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->readystate = READYSTATE_UNINITIALIZED; list_init(&window->script_hosts); + hres = CoInternetCreateSecurityManager(NULL, &window->secmgr, 0); + if(FAILED(hres)) { + IHTMLWindow2_Release(&window->IHTMLWindow2_iface); + return hres; + } + window->task_magic = get_task_target_magic(); update_window_doc(window); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 83a76b9..a449b18 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -295,6 +295,8 @@ struct HTMLWindow { SCRIPTMODE scriptmode; struct list script_hosts; + IInternetSecurityManager *secmgr; + HTMLOptionElementFactory *option_factory; HTMLImageElementFactory *image_factory; HTMLLocation *location; @@ -611,7 +613,6 @@ struct HTMLDocumentNode { BOOL content_ready; event_target_t *body_event_target; - IInternetSecurityManager *secmgr; ICatInformation *catmgr; nsDocumentEventListener *nsevent_listener; BOOL *event_vector; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 8225d59..3d21475 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -83,7 +83,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - return IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, dwAction, pPolicy, cbPolicy, + return IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); } @@ -121,7 +121,7 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ - hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + hres = IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); if(FAILED(hres) || policy != URLPOLICY_ALLOW) { *ret = URLPOLICY_DISALLOW; @@ -187,7 +187,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; - hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, + hres = IInternetSecurityManager_QueryCustomPolicy(This->basedoc.window->secmgr, url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) return hres;

1 0

Jacek Caban : mshtml: Use zone mapping instead of hardcoded protocols in use_gecko_script.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 3e422b9ed828122524214b9f3ce20f35431242dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e422b9ed828122524214b9f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 12:51:21 2011 +0200 mshtml: Use zone mapping instead of hardcoded protocols in use_gecko_script. --- dlls/mshtml/persist.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 43d7e3c..6915e3d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -48,15 +48,22 @@ typedef struct { LPOLESTR url; } download_proc_task_t; -static BOOL use_gecko_script(LPCWSTR url) +static BOOL use_gecko_script(HTMLWindow *window) { - static const WCHAR fileW[] = {'f','i','l','e',':'}; + DWORD zone; + HRESULT hres; + static const WCHAR aboutW[] = {'a','b','o','u','t',':'}; - static const WCHAR resW[] = {'r','e','s',':'}; - return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)) - && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)) - && strncmpiW(resW, url, sizeof(resW)/sizeof(WCHAR)); + hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); + if(FAILED(hres)) { + WARN("Could not map %s to zone: %08x\n", debugstr_w(window->url), hres); + return TRUE; + } + + TRACE("zone %d\n", zone); + return zone != URLZONE_LOCAL_MACHINE && zone != URLZONE_TRUSTED + && strncmpiW(aboutW, window->url, sizeof(aboutW)/sizeof(WCHAR)); } void set_current_mon(HTMLWindow *This, IMoniker *mon) @@ -83,7 +90,7 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) if(FAILED(hres)) WARN("GetDisplayName failed: %08x\n", hres); - set_script_mode(This, use_gecko_script(This->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); + set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } static void set_progress_proc(task_t *_task)

1 0

Jacek Caban : mshtml: Event handler may be already free in release_event_target.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: a96606e6adcb43ce6953b7161419013f3783168a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96606e6adcb43ce6953b7161… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:36:46 2011 +0200 mshtml: Event handler may be already free in release_event_target. --- dlls/mshtml/htmlevent.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d1430cd..8dbf554 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1343,7 +1343,8 @@ void release_event_target(event_target_t *event_target) if(event_target->event_table[i]->handler_prop) IDispatch_Release(event_target->event_table[i]->handler_prop); for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + if(event_target->event_table[i]->handlers[j]) + IDispatch_Release(event_target->event_table[i]->handlers[j]); } }

1 0

Jacek Caban : mshtml: Fixed ref count handling in events.c.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1d61146cb6fc722157b9d3a20c2923fd7a04609b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61146cb6fc722157b9d3a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:37:01 2011 +0200 mshtml: Fixed ref count handling in events.c. --- dlls/mshtml/tests/events.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6ed9f97..32f943f 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1037,7 +1037,6 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L str = NULL; hres = IHTMLFrameBase2_get_readyState(iframe, &str); - IHTMLFrameBase2_Release(iframe); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(str != NULL, "readyState == NULL\n"); ok(!lstrcmpW(str, V_BSTR(&v)), "ready states differ\n");

1 0

Jacek Caban : mshtml: Fixed node leak in HTMLEventObj.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 86aecc8488e818cb09c0817cbfa9c40845938fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86aecc8488e818cb09c0817cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:37:42 2011 +0200 mshtml: Fixed node leak in HTMLEventObj. --- dlls/mshtml/htmlevent.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8dbf554..d0e8814 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -289,6 +289,8 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->target) + IHTMLDOMNode_Release(&This->target->IHTMLDOMNode_iface); if(This->nsevent) nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex);

1 0