Attachment 22280 Details for Bug 77611 – Patch File

[patch] Patch File

jobi_jserror_patch.txt (text/plain), 2.46 KB, created by Jobi George

on 2005-06-02 17:39:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jobi George

Created: 2005-06-02 17:39:10 EDT

Size: 2.46 KB

patch

obsolete

>
>Index: Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java,v
>retrieving revision 1.23
>diff -u -r1.23 WebSite.java
>--- Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java	12 Apr 2005 20:41:21 -0000	1.23
>+++ Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java	2 Jun 2005 21:24:15 -0000
>@@ -22,6 +22,10 @@
> 	COMObject iServiceProvider;
> 	COMObject iInternetSecurityManager;
> 	COMObject iOleCommandTarget;
>+	
>+	public static final int OLECMDID_SHOWSCRIPTERROR = 40;
>+	public static final int OLE_E_LAST = 0x800400FF;
>+	public static final int OLECMDERR_E_UNKNOWNGROUP = OLE_E_LAST+3;
> 
> public WebSite(Composite parent, int style, String progId) {
> 	super(parent, style, progId);		
>@@ -439,6 +443,20 @@
> }
> 
> int Exec(int pguidCmdGroup, int nCmdID, int nCmdExecOpt, int pvaIn, int pvaOut) {
>+	
>+	if (pguidCmdGroup != 0)
>+	{	
>+		GUID guid = new GUID();
>+		COM.MoveMemory(guid, pguidCmdGroup, GUID.sizeof);
>+		if (COM.IsEqualGUID(guid, COM.CGID_DocHostCommandHandler))
>+		{
>+			if (nCmdID == OLECMDID_SHOWSCRIPTERROR) 
>+				return COM.S_OK;
>+			else
>+				return OLECMDERR_E_UNKNOWNGROUP;
>+		}
>+	}
>+	
> 	/*
> 	* Bug in Internet Explorer.  OnToolBar TRUE is also fired when any of the 
> 	* address bar or menu bar are requested but not the tool bar.  A workaround
>
>
>Index: Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java,v
>retrieving revision 1.33
>diff -u -r1.33 COM.java
>--- Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java	12 Apr 2005 20:41:21 -0000	1.33
>+++ Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java	2 Jun 2005 21:24:15 -0000
>@@ -123,6 +123,9 @@
> 	//public static final GUID IIDIViewObject = IIDFromString("{0000010D-0000-0000-C000-000000000046}"); //$NON-NLS-1$
> 	public static final GUID IIDIViewObject2 = IIDFromString("{00000127-0000-0000-C000-000000000046}"); //$NON-NLS-1$
> 	public static final GUID CGID_Explorer = IIDFromString("{000214D0-0000-0000-C000-000000000046}"); //$NON-NLS-1$
>+	
>+	public static final GUID CGID_DocHostCommandHandler = COM.IIDFromString("{f38bc242-b950-11d1-8918-00c04fc2c836}");
>+
> 
> 
> 	/** Constants */

Actions: View | Diff

Attachments on bug 77611: 22280