December 2008 - Wine-Commits

Andrew Riedi : itircl: Fix documentation typo.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 56d41bbd10baa7ec9c0c060a939930b8062d318f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d41bbd10baa7ec9c0c060a9… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Dec 24 12:02:56 2008 -0800 itircl: Fix documentation typo. --- dlls/itircl/itircl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index 8cd4fa0..b8d5751 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -58,7 +58,7 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllRegisterServer (ITIRCL.@) + * DllUnregisterServer (ITIRCL.@) */ HRESULT WINAPI DllUnregisterServer(void) {

1 0

Francois Gouget : winemine: Reorder some functions to avoid forward declarations.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: eec04aeb624c19762b4a97bcaeae44c6238388aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec04aeb624c19762b4a97bca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 31 00:59:51 2008 +0100 winemine: Reorder some functions to avoid forward declarations. --- programs/winemine/main.c | 808 +++++++++++++++++++++++----------------------- programs/winemine/main.h | 50 --- 2 files changed, 405 insertions(+), 453 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eec04aeb624c19762b4a9…

1 0

Francois Gouget : winemine: Remove AboutDlgProc() as it is unused.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 165650d89bee6b0af52066ae149eb173133c95d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165650d89bee6b0af52066ae1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 31 00:59:05 2008 +0100 winemine: Remove AboutDlgProc() as it is unused. --- programs/winemine/dialog.c | 18 ------------------ programs/winemine/main.h | 1 - 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index fb7efb2..dc4ab34 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -114,21 +114,3 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara } return FALSE; } - -INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - switch( uMsg ) { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - switch( LOWORD( wParam ) ) { - case IDOK: - case IDCANCEL: - EndDialog( hDlg, 0 ); - return TRUE; - } - break; - } - return FALSE; -} diff --git a/programs/winemine/main.h b/programs/winemine/main.h index a813c95..e9febfc 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -178,6 +178,5 @@ INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); /* end of header */

1 0

Francois Gouget : cmd: Reorder some functions to avoid forward declarations .
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 3d070ff8a6fa4c771192d1794c9fb8c6f6eb076d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d070ff8a6fa4c771192d1794… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 31 00:56:53 2008 +0100 cmd: Reorder some functions to avoid forward declarations. --- programs/cmd/wcmdmain.c | 2676 +++++++++++++++++++++++------------------------ 1 files changed, 1334 insertions(+), 1342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d070ff8a6fa4c771192d…

1 0

Francois Gouget : cmd: Reorder some functions to avoid forward declarations .
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: f5f54fb411b1cdb124618c88a635c5fb8a20c5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f54fb411b1cdb124618c88a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 31 00:56:21 2008 +0100 cmd: Reorder some functions to avoid forward declarations. --- programs/cmd/directory.c | 1009 +++++++++++++++++++++++----------------------- 1 files changed, 500 insertions(+), 509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f54fb411b1cdb124618…

1 0

Jacek Caban : mshtml.idl: Added HTMLStyle coclass declaration.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 2b3c8ad501dc86928789984780e2f0251b0cab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c8ad501dc8692878998478… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:23:56 2008 +0100 mshtml.idl: Added HTMLStyle coclass declaration. --- dlls/mshtml/htmlstyle.h | 4 ++-- include/mshtml.idl | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5fe1f24..2dedb03 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct { +struct HTMLStyle { DispatchEx dispex; const IHTMLStyleVtbl *lpHTMLStyleVtbl; const IHTMLStyle2Vtbl *lpHTMLStyle2Vtbl; @@ -24,7 +24,7 @@ typedef struct { LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; -} HTMLStyle; +}; #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl) #define HTMLSTYLE2(x) ((IHTMLStyle2*) &(x)->lpHTMLStyle2Vtbl) diff --git a/include/mshtml.idl b/include/mshtml.idl index eabf867..be99f3c 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2245,6 +2245,20 @@ methods: VARIANT minHeight(); } +[ + noncreatable, + uuid(3050f285-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyle +{ + [default] dispinterface DispHTMLStyle; + interface IHTMLStyle; + interface IHTMLStyle2; + /* interface IHTMLStyle3; */ + /* interface IHTMLStyle4; */ + /* interface IHTMLStyle5; */ +} + /***************************************************************************** * IHTMLRenderStyle interface */

1 0

Jacek Caban : mshtml: Added gecko debug channel to control Gecko logging.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: f9cbbab53b27ab5b9801d56359e660be671626c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cbbab53b27ab5b9801d5635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:21:33 2008 +0100 mshtml: Added gecko debug channel to control Gecko logging. --- dlls/mshtml/nsembed.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 648f8ba..ee386ac 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -34,6 +34,7 @@ #include "mshtml_private.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" @@ -144,13 +145,16 @@ static void register_nscontainer_class(void) static void set_environment(LPCWSTR gre_path) { - WCHAR path_env[MAX_PATH]; - int len; + WCHAR path_env[MAX_PATH], buf[20]; + int len, debug_level = 0; static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR warnW[] = {'w','a','r','n',0}; static const WCHAR xpcom_debug_breakW[] = {'X','P','C','O','M','_','D','E','B','U','G','_','B','R','E','A','K',0}; + static const WCHAR nspr_log_modulesW[] = + {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; + static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); @@ -160,6 +164,16 @@ static void set_environment(LPCWSTR gre_path) SetEnvironmentVariableW(pathW, path_env); SetEnvironmentVariableW(xpcom_debug_breakW, warnW); + + if(TRACE_ON(gecko)) + debug_level = 5; + else if(WARN_ON(gecko)) + debug_level = 3; + else if(ERR_ON(gecko)) + debug_level = 2; + + sprintfW(buf, debug_formatW, debug_level); + SetEnvironmentVariableW(nspr_log_modulesW, buf); } static BOOL load_xpcom(const PRUnichar *gre_path)

1 0

Jacek Caban : mshtml: Set XPCOM_DEBUG_BREAK to 'warn' before loading Gecko.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: fd4832ea2eb0a28d291f3f81b49f763c4f158a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4832ea2eb0a28d291f3f81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:21:18 2008 +0100 mshtml: Set XPCOM_DEBUG_BREAK to 'warn' before loading Gecko. --- dlls/mshtml/nsembed.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1a09587..648f8ba 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -142,22 +142,33 @@ static void register_nscontainer_class(void) nscontainer_class = RegisterClassExW(&wndclass); } -static BOOL load_xpcom(const PRUnichar *gre_path) +static void set_environment(LPCWSTR gre_path) { WCHAR path_env[MAX_PATH]; int len; - static const WCHAR wszPATH[] = {'P','A','T','H',0}; - static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; - - TRACE("(%s)\n", debugstr_w(gre_path)); + static const WCHAR pathW[] = {'P','A','T','H',0}; + static const WCHAR warnW[] = {'w','a','r','n',0}; + static const WCHAR xpcom_debug_breakW[] = + {'X','P','C','O','M','_','D','E','B','U','G','_','B','R','E','A','K',0}; /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ - GetEnvironmentVariableW(wszPATH, path_env, sizeof(path_env)/sizeof(WCHAR)); + GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); len = strlenW(path_env); path_env[len++] = ';'; strcpyW(path_env+len, gre_path); - SetEnvironmentVariableW(wszPATH, path_env); + SetEnvironmentVariableW(pathW, path_env); + + SetEnvironmentVariableW(xpcom_debug_breakW, warnW); +} + +static BOOL load_xpcom(const PRUnichar *gre_path) +{ + static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; + + TRACE("(%s)\n", debugstr_w(gre_path)); + + set_environment(gre_path); hXPCOM = LoadLibraryW(strXPCOM); if(!hXPCOM) {

1 0

Jacek Caban : mshtml: Move handle_insert_comment to mutation.c.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 91af3c56caeac3aa5aed4c42711c83a52f900606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91af3c56caeac3aa5aed4c427… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:20:57 2008 +0100 mshtml: Move handle_insert_comment to mutation.c. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/mutation.c | 138 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsevents.c | 138 ------------------------------------------ 3 files changed, 138 insertions(+), 139 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8b40fea..58f662a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -506,7 +506,6 @@ void NSContainer_Release(NSContainer*); void init_mutation(NSContainer*); void set_mutation_observer(NSContainer*,nsIDOMHTMLDocument*); -BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 1711908..edd3dca 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -55,6 +55,144 @@ void set_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmld nsIDOMNSDocument_Release(nsdoc); } +#define IE_MAJOR_VERSION 7 +#define IE_MINOR_VERSION 0 + +static BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment) +{ + DWORD len; + int majorv = 0, minorv = 0; + const PRUnichar *ptr, *end; + nsAString nsstr; + PRUnichar *buf; + nsresult nsres; + + enum { + CMP_EQ, + CMP_LT, + CMP_LTE, + CMP_GT, + CMP_GTE + } cmpt = CMP_EQ; + + static const PRUnichar endifW[] = {'<','!','[','e','n','d','i','f',']'}; + + if(comment[0] != '[' || comment[1] != 'i' || comment[2] != 'f') + return FALSE; + + ptr = comment+3; + while(isspaceW(*ptr)) + ptr++; + + if(ptr[0] == 'l' && ptr[1] == 't') { + ptr += 2; + if(*ptr == 'e') { + cmpt = CMP_LTE; + ptr++; + }else { + cmpt = CMP_LT; + } + }else if(ptr[0] == 'g' && ptr[1] == 't') { + ptr += 2; + if(*ptr == 'e') { + cmpt = CMP_GTE; + ptr++; + }else { + cmpt = CMP_GT; + } + } + + if(!isspaceW(*ptr++)) + return FALSE; + while(isspaceW(*ptr)) + ptr++; + + if(ptr[0] != 'I' || ptr[1] != 'E') + return FALSE; + + ptr +=2; + if(!isspaceW(*ptr++)) + return FALSE; + while(isspaceW(*ptr)) + ptr++; + + if(!isdigitW(*ptr)) + return FALSE; + while(isdigitW(*ptr)) + majorv = majorv*10 + (*ptr++ - '0'); + + if(*ptr == '.') { + if(!isdigitW(*ptr)) + return FALSE; + while(isdigitW(*ptr)) + minorv = minorv*10 + (*ptr++ - '0'); + } + + while(isspaceW(*ptr)) + ptr++; + if(ptr[0] != ']' || ptr[1] != '>') + return FALSE; + ptr += 2; + + len = strlenW(ptr); + if(len < sizeof(endifW)/sizeof(WCHAR)) + return FALSE; + + end = ptr + len-sizeof(endifW)/sizeof(WCHAR); + if(memcmp(end, endifW, sizeof(endifW))) + return FALSE; + + switch(cmpt) { + case CMP_EQ: + if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) + break; + return FALSE; + case CMP_LT: + if(majorv > IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) + break; + return FALSE; + case CMP_LTE: + if(majorv > IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) + break; + return FALSE; + case CMP_GT: + if(majorv < IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) + break; + return FALSE; + case CMP_GTE: + if(majorv < IE_MAJOR_VERSION) + break; + if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) + break; + return FALSE; + } + + buf = heap_alloc((end-ptr+1)*sizeof(WCHAR)); + if(!buf) + return FALSE; + + memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); + buf[end-ptr] = 0; + nsAString_Init(&nsstr, buf); + heap_free(buf); + + /* FIXME: Find better way to insert HTML to document. */ + nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("Write failed: %08x\n", nsres); + return FALSE; + } + + return TRUE; +} + static void add_script_runner(NSContainer *This) { nsIDOMNSDocument *nsdoc; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index ac4572c..1933c57 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -175,144 +175,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_OK; } -#define IE_MAJOR_VERSION 7 -#define IE_MINOR_VERSION 0 - -BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment) -{ - DWORD len; - int majorv = 0, minorv = 0; - const PRUnichar *ptr, *end; - nsAString nsstr; - PRUnichar *buf; - nsresult nsres; - - enum { - CMP_EQ, - CMP_LT, - CMP_LTE, - CMP_GT, - CMP_GTE - } cmpt = CMP_EQ; - - static const PRUnichar endifW[] = {'<','!','[','e','n','d','i','f',']'}; - - if(comment[0] != '[' || comment[1] != 'i' || comment[2] != 'f') - return FALSE; - - ptr = comment+3; - while(isspaceW(*ptr)) - ptr++; - - if(ptr[0] == 'l' && ptr[1] == 't') { - ptr += 2; - if(*ptr == 'e') { - cmpt = CMP_LTE; - ptr++; - }else { - cmpt = CMP_LT; - } - }else if(ptr[0] == 'g' && ptr[1] == 't') { - ptr += 2; - if(*ptr == 'e') { - cmpt = CMP_GTE; - ptr++; - }else { - cmpt = CMP_GT; - } - } - - if(!isspaceW(*ptr++)) - return FALSE; - while(isspaceW(*ptr)) - ptr++; - - if(ptr[0] != 'I' || ptr[1] != 'E') - return FALSE; - - ptr +=2; - if(!isspaceW(*ptr++)) - return FALSE; - while(isspaceW(*ptr)) - ptr++; - - if(!isdigitW(*ptr)) - return FALSE; - while(isdigitW(*ptr)) - majorv = majorv*10 + (*ptr++ - '0'); - - if(*ptr == '.') { - if(!isdigitW(*ptr)) - return FALSE; - while(isdigitW(*ptr)) - minorv = minorv*10 + (*ptr++ - '0'); - } - - while(isspaceW(*ptr)) - ptr++; - if(ptr[0] != ']' || ptr[1] != '>') - return FALSE; - ptr += 2; - - len = strlenW(ptr); - if(len < sizeof(endifW)/sizeof(WCHAR)) - return FALSE; - - end = ptr + len-sizeof(endifW)/sizeof(WCHAR); - if(memcmp(end, endifW, sizeof(endifW))) - return FALSE; - - switch(cmpt) { - case CMP_EQ: - if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) - break; - return FALSE; - case CMP_LT: - if(majorv > IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) - break; - return FALSE; - case CMP_LTE: - if(majorv > IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) - break; - return FALSE; - case CMP_GT: - if(majorv < IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) - break; - return FALSE; - case CMP_GTE: - if(majorv < IE_MAJOR_VERSION) - break; - if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) - break; - return FALSE; - } - - buf = heap_alloc((end-ptr+1)*sizeof(WCHAR)); - if(!buf) - return FALSE; - - memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); - buf[end-ptr] = 0; - nsAString_Init(&nsstr, buf); - heap_free(buf); - - /* FIXME: Find better way to insert HTML to document. */ - nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); - nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("Write failed: %08x\n", nsres); - return FALSE; - } - - return TRUE; -} - static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface)->This;

1 0

Jacek Caban : mshtml: Remove no longer used node_insert_listener.
by Alexandre Julliard Dec. 31, 2008

Dec. 31, 2008

Module: wine Branch: master Commit: 327dc2c40995b34d0ca0a82794a7232671d19309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327dc2c40995b34d0ca0a8279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:20:37 2008 +0100 mshtml: Remove no longer used node_insert_listener. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 66 ------------------------------------------ 2 files changed, 0 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9ebaaaa..8b40fea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -321,7 +321,6 @@ struct NSContainer { nsEventListener focus_listener; nsEventListener keypress_listener; nsEventListener load_listener; - nsEventListener node_insert_listener; nsEventListener htmlevent_listener; nsIWebBrowser *webbrowser; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 20227f7..ac4572c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -313,70 +313,6 @@ BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment) return TRUE; } -static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent *event) -{ - NSContainer *This = NSEVENTLIST_THIS(iface)->This; - nsIDOMEventTarget *target; - nsIDOMComment *nscomment; - nsIDOMElement *elem; - nsresult nsres; - - TRACE("(%p %p)\n", This, event); - - nsres = nsIDOMEvent_GetTarget(event, &target); - if(NS_FAILED(nsres)) { - ERR("GetTarget failed: %08x\n", nsres); - return NS_OK; - } - - nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMElement, (void**)&elem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMHTMLScriptElement *script; - - nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLScriptElement, (void**)&script); - if(NS_SUCCEEDED(nsres)) { - doc_insert_script(This->doc, script); - nsIDOMHTMLScriptElement_Release(script); - } - - check_event_attr(This->doc, elem); - - nsIDOMEventTarget_Release(target); - nsIDOMNode_Release(elem); - return NS_OK; - } - - nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMComment, (void**)&nscomment); - if(NS_SUCCEEDED(nsres)) { - nsAString comment_str; - BOOL remove_comment = FALSE; - - nsAString_Init(&comment_str, NULL); - nsres = nsIDOMComment_GetData(nscomment, &comment_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *comment; - - nsAString_GetData(&comment_str, &comment); - remove_comment = handle_insert_comment(This->doc, comment); - } - - nsAString_Finish(&comment_str); - - if(remove_comment) { - nsIDOMNode *nsparent, *tmp; - - nsIDOMComment_GetParentNode(nscomment, &nsparent); - nsIDOMNode_RemoveChild(nsparent, (nsIDOMNode*)nscomment, &tmp); - nsIDOMNode_Release(nsparent); - nsIDOMNode_Release(tmp); - } - - nsIDOMComment_Release(nscomment); - } - - return NS_OK; -} - static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface)->This; @@ -427,7 +363,6 @@ static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_ static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus); static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); -static const nsIDOMEventListenerVtbl node_insert_vtbl = EVENTLISTENER_VTBL(handle_node_insert); static const nsIDOMEventListenerVtbl htmlevent_vtbl = EVENTLISTENER_VTBL(handle_htmlevent); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, @@ -489,7 +424,6 @@ void init_nsevents(NSContainer *This) init_listener(&This->focus_listener, This, &focus_vtbl); init_listener(&This->keypress_listener, This, &keypress_vtbl); init_listener(&This->load_listener, This, &load_vtbl); - init_listener(&This->node_insert_listener, This, &node_insert_vtbl); init_listener(&This->htmlevent_listener, This, &htmlevent_vtbl); nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window);

1 0