October 2012 - Wine-commits

Hans Leidekker : wbemprox: The last parameter to IWbemClassObject:: GetMethod is optional.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 64a7f2ea7fddb3934e13818cc24aad650358235b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a7f2ea7fddb3934e13818cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:06:59 2012 +0200 wbemprox: The last parameter to IWbemClassObject::GetMethod is optional. --- dlls/wbemprox/class.c | 2 +- dlls/wbemprox/tests/query.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a3a06e1..75bd612 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -848,7 +848,7 @@ static HRESULT WINAPI class_object_GetMethod( TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); - if (hr != S_OK) return hr; + if (hr != S_OK || !ppOutSignature) return hr; hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 15fad8c..e531b3c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -143,7 +143,7 @@ static void test_StdRegProv( IWbemServices *services ) {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; BSTR class = SysAllocString( stdregprovW ), method; - IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; + IWbemClassObject *reg, *sig_in, *in, *out; VARIANT defkey, subkey, retval, names, types, value, valuename; CIMTYPE type; HRESULT hr; @@ -154,7 +154,7 @@ static void test_StdRegProv( IWbemServices *services ) win_skip( "StdRegProv not available\n" ); return; } - hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, enumkeyW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -196,9 +196,8 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); - hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, enumvaluesW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -248,9 +247,8 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); - hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, &sig_out ); + hr = IWbemClassObject_GetMethod( reg, getstringvalueW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); @@ -298,7 +296,6 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); IWbemClassObject_Release( sig_in ); - IWbemClassObject_Release( sig_out ); IWbemClassObject_Release( reg ); SysFreeString( class );

1 0

Hans Leidekker : wbemprox: Implement Win32_Service.PauseService.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 8fe25b2b89b4b2e2ae23b079671426ae67fd70d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe25b2b89b4b2e2ae23b0796… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:07:17 2012 +0200 wbemprox: Implement Win32_Service.PauseService. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 30 +++++----- dlls/wbemprox/service.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 5 ++ 4 files changed, 135 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index b04bb64..bd96a99 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ main.c \ query.c \ reg.c \ + service.c \ services.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9e515ef..5138fde 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -65,8 +65,6 @@ static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR class_serviceW[] = - {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = @@ -132,8 +130,6 @@ static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; -static const WCHAR prop_nameW[] = - {'N','a','m','e',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -295,7 +291,9 @@ static const struct column col_service[] = { prop_servicetypeW, CIM_STRING }, { prop_startmodeW, CIM_STRING }, { prop_stateW, CIM_STRING }, - { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + /* methods */ + { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -473,6 +471,8 @@ struct record_service const WCHAR *startmode; const WCHAR *state; const WCHAR *systemname; + /* methods */ + class_method *pause_service; }; struct record_sounddevice { @@ -514,6 +514,7 @@ static const struct record_diskdrive data_diskdrive[] = }; static const struct record_params data_params[] = { + { class_serviceW, method_pauseserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1103,15 +1104,16 @@ static void fill_service( struct table *table ) status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); - rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; - rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; - rec->displayname = heap_strdupW( services[i].lpDisplayName ); - rec->name = heap_strdupW( services[i].lpServiceName ); - rec->process_id = status->dwProcessId; - rec->servicetype = get_service_type( status->dwServiceType ); - rec->startmode = get_service_startmode( config->dwStartType ); - rec->state = get_service_state( status->dwCurrentState ); - rec->systemname = heap_strdupW( sysnameW ); + rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; + rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->startmode = get_service_startmode( config->dwStartType ); + rec->state = get_service_state( status->dwCurrentState ); + rec->systemname = heap_strdupW( sysnameW ); + rec->pause_service = service_pause_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c new file mode 100644 index 0000000..7c6aabf --- /dev/null +++ b/dlls/wbemprox/service.c @@ -0,0 +1,113 @@ +/* + * Win32_Service methods implementation + * + * Copyright 2012 Hans Leidekker 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" +#include "winsvc.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +static UINT map_error( DWORD error ) +{ + switch (error) + { + case ERROR_SUCCESS: return 0; + case ERROR_ACCESS_DENIED: return 2; + case ERROR_DEPENDENT_SERVICES_RUNNING: return 3; + case ERROR_INVALID_SERVICE_CONTROL: return 4; + case ERROR_SERVICE_CANNOT_ACCEPT_CTRL: return 5; + case ERROR_SERVICE_NOT_ACTIVE: return 6; + case ERROR_SERVICE_REQUEST_TIMEOUT: return 7; + case ERROR_SERVICE_ALREADY_RUNNING: return 10; + default: + WARN("unknown error %u\n", error); + break; + } + return 8; +} + +static HRESULT control_service( const WCHAR *name, DWORD control, VARIANT *retval ) +{ + SC_HANDLE manager, service = NULL; + SERVICE_STATUS status; + UINT error = 0; + + if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!(service = OpenServiceW( manager, name, SERVICE_STOP|SERVICE_START|SERVICE_PAUSE_CONTINUE ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!ControlService( service, control, &status )) error = map_error( GetLastError() ); + +done: + set_variant( VT_UI4, error, NULL, retval ); + CloseServiceHandle( service ); + CloseServiceHandle( manager ); + return S_OK; +} + +HRESULT service_pause_service( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT name, retval; + IWbemClassObject *sig; + HRESULT hr; + + TRACE("%p, %p, %p\n", obj, in, out); + + hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( class_serviceW, method_pauseserviceW, PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + return hr; + } + hr = IWbemClassObject_SpawnInstance( sig, 0, out ); + if (hr != S_OK) + { + VariantClear( &name ); + IWbemClassObject_Release( sig ); + return hr; + } + hr = control_service( V_BSTR(&name), SERVICE_CONTROL_PAUSE, &retval ); + if (hr != S_OK) goto done; + hr = IWbemClassObject_Put( *out, param_returnvalueW, 0, &retval, CIM_UINT32 ); + +done: + VariantClear( &name ); + IWbemClassObject_Release( sig ); + if (hr != S_OK) IWbemClassObject_Release( *out ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 05da3c6..c2181c0 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -201,6 +201,7 @@ HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPE HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -233,11 +234,15 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) return dst; } +static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; +static const WCHAR prop_nameW[] = {'N','a','m','e',0}; + static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; +static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; static const WCHAR param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};

1 0

Daniel Lehman : msvcp90: Fix num_get<>::_Getffld.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 82c1fb41aa4abb14ff6c86ff984c811f9f4bddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c1fb41aa4abb14ff6c86ff9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 2 11:30:40 2012 -0700 msvcp90: Fix num_get<>::_Getffld. --- dlls/msvcp90/locale.c | 288 ++++++++++++++++++++++----------------------- dlls/msvcp90/tests/ios.c | 160 +++++++++++++++++++++++++ 2 files changed, 301 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82c1fb41aa4abb14ff6c8…

1 0

Francois Gouget : shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 47d4041dc18aa536fbf3d0f49c159b87c4e2a2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d4041dc18aa536fbf3d0f49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 16 16:07:08 2012 +0200 shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000. --- dlls/shell32/tests/shlexec.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3d5676..3c630ef 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -704,7 +704,7 @@ static int StrCmpPath(const char* s1, const char* s2) return 0; } -static void _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; result=getChildString("Arguments", key); @@ -713,7 +713,8 @@ static void _okChildString(const char* file, int line, const char* key, const ch ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); return; } - ok_(file, line)(lstrcmpiA(result, expected) == 0, + ok_(file, line)(lstrcmpiA(result, expected) == 0 || + broken(lstrcmpiA(result, bad) == 0), "%s expected '%s', got '%s'\n", key, expected, result); } @@ -738,7 +739,8 @@ static void _okChildInt(const char* file, int line, const char* key, int expecte "%s expected %d, but got %d\n", key, expected, result); } -#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected)) +#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) +#define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) @@ -1219,6 +1221,7 @@ typedef struct const char* params; int todo; cmdline_tests_t cmd; + cmdline_tests_t broken; } argify_tests_t; static const argify_tests_t argify_tests[] = @@ -1324,7 +1327,9 @@ static const argify_tests_t argify_tests[] = /* An unclosed quoted string gets lost! */ {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3, {" \"p2\" \"p3\" \"\" \"\" \"\"", - {"", "p2", "p3", "", "", "", NULL}, 0}}, + {"", "p2", "p3", "", "", "", NULL}, 0}, + {" \"p2\" \"p3\" \"p3\" \"\" \"\"", + {"", "p2", "p3", "p3", "", "", NULL}, 0}}, /* Backslashes have no special meaning even when preceding quotes. All * they do is start an unquoted string. @@ -1376,6 +1381,7 @@ static void test_argify(void) char fileA[MAX_PATH], params[2*MAX_PATH+12]; INT_PTR rc; const argify_tests_t* test; + const cmdline_tests_t *bad; const char* cmd; unsigned i, count; @@ -1392,6 +1398,8 @@ static void test_argify(void) test = argify_tests; while (test->params) { + bad = test->broken.cmd ? &test->broken : &test->cmd; + /* trace("***** verb='%s' params='%s'\n", test->verb, test->params); */ rc = shell_execute_ex(SEE_MASK_DOENVSUBST, test->verb, fileA, test->params, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); @@ -1415,18 +1423,20 @@ static void test_argify(void) if (cmd) cmd += strlen(test->verb); if (!cmd) cmd = "(null)"; if ((test->todo & 0x2) == 0) - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); else todo_wine - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); for (i = 0; i < count - 1; i++) { char argname[18]; sprintf(argname, "argvA%d", 4 + i); if ((test->todo & (1 << (i+4))) == 0) - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); else todo_wine - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); } if (has_cl2a)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement:: onload property implementation.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: c26b63560e64d529b70396cb6eee45534cb3984a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26b63560e64d529b70396cb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:10 2012 +0200 mshtml: Added IHTMLBodyElement::onload property implementation. --- dlls/mshtml/htmlbody.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index ea0f11b..e427fc0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -573,15 +574,19 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->textcont.element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLBodyElement_get_onload(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->textcont.element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLBodyElement_put_onunload(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Moved HTMLScriptElement declaration to separated header.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 51b701c3adb19811b2d6bbe45b959f4982c29754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b701c3adb19811b2d6bbe45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:29 2012 +0200 mshtml: Moved HTMLScriptElement declaration to separated header. --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlscript.h | 38 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 20 -------------------- dlls/mshtml/mutation.c | 1 + dlls/mshtml/navigate.c | 1 + dlls/mshtml/nsevents.c | 1 + dlls/mshtml/persist.c | 1 + dlls/mshtml/script.c | 1 + 10 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 53f8cff..94a9e7e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -28,6 +28,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlscript.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d6241ae..d5ae39d 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h new file mode 100644 index 0000000..d6031bd --- /dev/null +++ b/dlls/mshtml/htmlscript.h @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Jacek Caban 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 + */ + +typedef struct { + HTMLElement element; + + IHTMLScriptElement IHTMLScriptElement_iface; + + nsIDOMHTMLScriptElement *nsscript; + BOOL parsed; +} HTMLScriptElement; + +HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; +void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; + +void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; +void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; +void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; +IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; +HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; +void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; +BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; +IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7122b4b..740ac55 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -36,6 +36,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlscript.h" #include "binding.h" #include "resource.h" diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dc51565..d78e6ab 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -743,18 +743,6 @@ void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; -typedef struct { - HTMLElement element; - - IHTMLScriptElement IHTMLScriptElement_iface; - - nsIDOMHTMLScriptElement *nsscript; - BOOL parsed; -} HTMLScriptElement; - -HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; -void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; - HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_static_data_t*) DECLSPEC_HIDDEN; @@ -918,14 +906,6 @@ HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; -void release_script_hosts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void connect_scripts(HTMLInnerWindow*) DECLSPEC_HIDDEN; -void doc_insert_script(HTMLInnerWindow*,HTMLScriptElement*) DECLSPEC_HIDDEN; -IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR) DECLSPEC_HIDDEN; -HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; -void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; -BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; -IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index d765b02..8c45621 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "wine/debug.h" diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bec5ed6..8554ddb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -40,6 +40,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4f970df..7f66f17 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "resource.h" diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 72711ca..b518b56 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -38,6 +38,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "htmlevent.h" #include "binding.h" #include "resource.h" diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index dca0b57..730881b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" #include "pluginhost.h" #include "htmlevent.h" #include "binding.h"

1 0

Jacek Caban : mshtml: Added beginning IHTMLScriptElement:: put_src implementation.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 680aca56efab0610ab5b4c698da481a82acaf5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680aca56efab0610ab5b4c698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:48 2012 +0200 mshtml: Added beginning IHTMLScriptElement::put_src implementation. --- dlls/mshtml/htmlscript.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 12 ++++++++++-- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d5ae39d..a256663 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -95,8 +95,47 @@ static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); + HTMLInnerWindow *window; + nsIDOMNode *parent; + nsAString src_str; + nsresult nsres; + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + if(!This->element.node.doc || !This->element.node.doc->window) { + WARN("no windoow\n"); + return E_UNEXPECTED; + } + + window = This->element.node.doc->window; + + nsAString_InitDepend(&src_str, v); + nsres = nsIDOMHTMLScriptElement_SetSrc(This->nsscript, &src_str); + nsAString_Finish(&src_str); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + if(This->parsed) { + WARN("already parsed\n"); + return S_OK; + } + + if(window->parser_callback_cnt) { + FIXME("execution inside parser not supported\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + if(NS_FAILED(nsres) || !parent) { + FIXME("No parent, not supported detached elements\n"); + return E_NOTIMPL; + } + + nsIDOMNode_Release(parent); + doc_insert_script(window, This); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_src(IHTMLScriptElement *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d78e6ab..d5f4ce3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,8 @@ struct HTMLInnerWindow { IOmHistory *history; IHTMLStorage *session_storage; + unsigned parser_callback_cnt; + global_prop_t *global_props; DWORD global_prop_cnt; DWORD global_prop_size; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8c45621..da691de 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,11 +298,16 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + HTMLInnerWindow *window; nsresult nsres; HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); + window = doc->window; + if(!window) + return NS_OK; + nsres = nsISupports_QueryInterface(script_iface, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); @@ -322,12 +327,15 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(FAILED(hres)) return NS_ERROR_FAILURE; - if(nsparser) + if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser); + window->parser_callback_cnt++; + } - doc_insert_script(doc->window, script_elem); + doc_insert_script(window, script_elem); if(nsparser) { + window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); }

1 0

Jacek Caban : mshtml: Return early from BindToDocument if possible.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: fdbbaa1ff565ac0cff22b1ae4abe5bfd1e8bbab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbbaa1ff565ac0cff22b1ae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:08:05 2012 +0200 mshtml: Return early from BindToDocument if possible. --- dlls/mshtml/mutation.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index da691de..3ab7a07 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -633,6 +633,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); nsIDOMComment_Release(nscomment); + return; } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); @@ -641,6 +642,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_bind_to_tree, (nsISupports*)nsiframe, NULL); nsIDOMHTMLIFrameElement_Release(nsiframe); + return; } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLFrameElement, (void**)&nsframe); @@ -649,6 +651,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_bind_to_tree, (nsISupports*)nsframe, NULL); nsIDOMHTMLFrameElement_Release(nsframe); + return; } }

1 0

Jacek Caban : mshtml: Added support for IHTMLScriptElement:: put_src on detached elements.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b882b18402aeafd22501602969bc096145517b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b882b18402aeafd2250160296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:09:52 2012 +0200 mshtml: Added support for IHTMLScriptElement::put_src on detached elements. --- dlls/mshtml/htmlscript.c | 5 +++-- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/mutation.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 75e65f1..befc577 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -138,8 +138,9 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); if(NS_FAILED(nsres) || !parent) { - FIXME("No parent, not supported detached elements\n"); - return E_NOTIMPL; + TRACE("No parent, not executing\n"); + This->parse_on_bind = TRUE; + return S_OK; } nsIDOMNode_Release(parent); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 4540d4c..8a0c1e5 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -23,6 +23,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; + BOOL parse_on_bind; } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 5e54158..fcae9ff 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -629,6 +629,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, HTMLDocumentNode *This = impl_from_nsIDocumentObserver(iface); nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; + nsIDOMHTMLScriptElement *nsscript; nsIDOMComment *nscomment; nsIDOMElement *nselem; nsresult nsres; @@ -667,6 +668,24 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLFrameElement_Release(nsframe); return; } + + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); + if(NS_SUCCEEDED(nsres)) { + HTMLScriptElement *script_elem; + HRESULT hres; + + TRACE("script element\n"); + + hres = script_elem_from_nsscript(This, nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); + if(FAILED(hres)) + return; + + if(script_elem->parse_on_bind) + add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); + + IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + } } static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver *iface, nsIContent *aContent,

1 0

Jacek Caban : mshtml: Added support for IHTMLScriptElement:: put_src calls during parser callback.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: ccbee09f7ea340d3b2185cd2c4e6a470f8dab656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbee09f7ea340d3b2185cd2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:08:25 2012 +0200 mshtml: Added support for IHTMLScriptElement::put_src calls during parser callback. --- dlls/mshtml/htmlscript.c | 13 +++++++++++-- dlls/mshtml/htmlscript.h | 5 +++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 14 ++++++++++++++ dlls/mshtml/script.c | 12 ++++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index a256663..75e65f1 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -123,8 +123,17 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR } if(window->parser_callback_cnt) { - FIXME("execution inside parser not supported\n"); - return E_NOTIMPL; + script_queue_entry_t *queue; + + queue = heap_alloc(sizeof(*queue)); + if(!queue) + return E_OUTOFMEMORY; + + IHTMLScriptElement_AddRef(&This->IHTMLScriptElement_iface); + queue->script = This; + + list_add_tail(&window->script_queue, &queue->entry); + return S_OK; } nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index d6031bd..4540d4c 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -25,6 +25,11 @@ typedef struct { BOOL parsed; } HTMLScriptElement; +typedef struct { + struct list entry; + HTMLScriptElement *script; +} script_queue_entry_t; + HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 740ac55..92659cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2720,6 +2720,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, list_init(&window->script_hosts); list_init(&window->bindings); + list_init(&window->script_queue); window->base.outer_window = outer_window; window->base.inner_window = window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5f4ce3..737731f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -400,6 +400,7 @@ struct HTMLInnerWindow { IHTMLStorage *session_storage; unsigned parser_callback_cnt; + struct list script_queue; global_prop_t *global_props; DWORD global_prop_cnt; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3ab7a07..5e54158 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,6 +298,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + script_queue_entry_t *iter; HTMLInnerWindow *window; nsresult nsres; HRESULT hres; @@ -332,8 +333,20 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa window->parser_callback_cnt++; } + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + doc_insert_script(window, script_elem); + while(!list_empty(&window->script_queue)) { + iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + list_remove(&iter->entry); + doc_insert_script(window, iter->script); + IHTMLScriptElement_Release(&iter->script->IHTMLScriptElement_iface); + heap_free(iter); + } + + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + if(nsparser) { window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); @@ -341,6 +354,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 730881b..d99269a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -915,6 +915,9 @@ void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; + if(script_elem->parsed) + return; + script_host = get_elem_script_host(window, script_elem); if(!script_host) return; @@ -1309,8 +1312,17 @@ void set_script_mode(HTMLOuterWindow *window, SCRIPTMODE mode) void release_script_hosts(HTMLInnerWindow *window) { + script_queue_entry_t *queue_iter; ScriptHost *iter; + while(!list_empty(&window->script_queue)) { + queue_iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + + list_remove(&queue_iter->entry); + IHTMLScriptElement_Release(&queue_iter->script->IHTMLScriptElement_iface); + heap_free(queue_iter); + } + while(!list_empty(&window->script_hosts)) { iter = LIST_ENTRY(list_head(&window->script_hosts), ScriptHost, entry);

1 0