Attachment #168169 for bug #307991

View | Details | Raw Unified | Return to bug 307991
Collapse All | Expand All

Lines 78-83 Link Here

(-)Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java (+1 lines)
78	static final int URLACTION_ACTIVEX_MIN = 0x00001200;	78	static final int URLACTION_ACTIVEX_MIN = 0x00001200;
79	static final int URLACTION_ACTIVEX_MAX = 0x000013ff;	79	static final int URLACTION_ACTIVEX_MAX = 0x000013ff;
80	static final int URLACTION_ACTIVEX_RUN = 0x00001200;	80	static final int URLACTION_ACTIVEX_RUN = 0x00001200;
		81	static final int URLACTION_FEATURE_ZONE_ELEVATION = 0x00002101;
81	static final int URLACTION_JAVA_MIN = 0x00001C00;	82	static final int URLACTION_JAVA_MIN = 0x00001C00;
82	static final int URLACTION_JAVA_MAX = 0x00001Cff;	83	static final int URLACTION_JAVA_MAX = 0x00001Cff;
83	static final int URLACTION_SCRIPT_RUN = 0x00001400;	84	static final int URLACTION_SCRIPT_RUN = 0x00001400;




int ProcessUrlAction(int /*long*/ pwszUrl, int dwAction, int /*long*/ pPolicy, int cbPolicy, int /*long*/ pContext, int cbContext, int dwFlags, int dwReserved) {
	ignoreNextMessage = false;

	/*
	* If the current page is about:blank and is trusted then
	* override default zone elevation settings to allow the action.  
	*/
	if (dwAction == IE.URLACTION_FEATURE_ZONE_ELEVATION) {
	    IE ie = (IE)((Browser)getParent().getParent()).webBrowser;
	    if (ie._getUrl().startsWith(IE.ABOUT_BLANK) && !ie.untrustedText) {
			if (cbPolicy >= 4) COM.MoveMemory(pPolicy, new int[] {IE.URLPOLICY_ALLOW}, 4);
			return COM.S_OK;
	    }
	}

	int policy = IE.INET_E_DEFAULT_ACTION;

	if (dwAction >= IE.URLACTION_JAVA_MIN && dwAction <= IE.URLACTION_JAVA_MAX) {

Return to bug 307991

Lines 510-515 Link Here

(-)Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java (+12 lines)
510	int ProcessUrlAction(int /long/ pwszUrl, int dwAction, int /long/ pPolicy, int cbPolicy, int /long/ pContext, int cbContext, int dwFlags, int dwReserved) {	510	int ProcessUrlAction(int /long/ pwszUrl, int dwAction, int /long/ pPolicy, int cbPolicy, int /long/ pContext, int cbContext, int dwFlags, int dwReserved) {
511	ignoreNextMessage = false;	511	ignoreNextMessage = false;
512		512
		513	/*
		514	* If the current page is about:blank and is trusted then
		515	* override default zone elevation settings to allow the action.
		516	*/
		517	if (dwAction == IE.URLACTION_FEATURE_ZONE_ELEVATION) {
		518	IE ie = (IE)((Browser)getParent().getParent()).webBrowser;
		519	if (ie._getUrl().startsWith(IE.ABOUT_BLANK) && !ie.untrustedText) {
		520	if (cbPolicy >= 4) COM.MoveMemory(pPolicy, new int[] {IE.URLPOLICY_ALLOW}, 4);
		521	return COM.S_OK;
		522	}
		523	}
		524
513	int policy = IE.INET_E_DEFAULT_ACTION;	525	int policy = IE.INET_E_DEFAULT_ACTION;
514		526
515	if (dwAction >= IE.URLACTION_JAVA_MIN && dwAction <= IE.URLACTION_JAVA_MAX) {	527	if (dwAction >= IE.URLACTION_JAVA_MIN && dwAction <= IE.URLACTION_JAVA_MAX) {