View | Details | Raw Unified | Return to bug 298822 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java (-2 / +19 lines)
Lines 41-46 Link Here
41
	static int IEVersion, PDFCount;
41
	static int IEVersion, PDFCount;
42
	static String ProgId = "Shell.Explorer";	//$NON-NLS-1$
42
	static String ProgId = "Shell.Explorer";	//$NON-NLS-1$
43
43
44
	static final int navNoReadFromCache = 0x4;
44
	static final int BeforeNavigate2 = 0xfa;
45
	static final int BeforeNavigate2 = 0xfa;
45
	static final int CommandStateChange = 0x69;
46
	static final int CommandStateChange = 0x69;
46
	static final int DocumentComplete = 0x103;
47
	static final int DocumentComplete = 0x103;
Lines 1088-1099 Link Here
1088
1089
1089
boolean navigate(String url, String postData, String headers[], boolean silent) {
1090
boolean navigate(String url, String postData, String headers[], boolean silent) {
1090
	navigate = true;
1091
	navigate = true;
1091
	int count = 1;
1092
	int count;
1093
1094
	//In IE8 we must add flags to list of parameters of Navigate method.
1095
	if (IEVersion >= 8) {
1096
		count = 2;
1097
	} else {
1098
		count = 1;
1099
	}
1092
	if (postData != null) count++;
1100
	if (postData != null) count++;
1093
	if (headers != null) count++;
1101
	if (headers != null) count++;
1094
	Variant[] rgvarg = new Variant[count];
1102
	Variant[] rgvarg = new Variant[count];
1095
	int[] rgdispidNamedArgs = new int[count];
1103
	int[] rgdispidNamedArgs = new int[count];
1096
	int[] rgdispid = auto.getIDsOfNames(new String[] { "Navigate", "URL", "PostData", "Headers" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
1104
	int[] rgdispid = auto.getIDsOfNames(new String[] { "Navigate", "URL", "PostData", "Headers", "Flags" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
1097
	int index = 0;
1105
	int index = 0;
1098
	rgvarg[index] = new Variant(url);
1106
	rgvarg[index] = new Variant(url);
1099
	rgdispidNamedArgs[index++] = rgdispid[1];
1107
	rgdispidNamedArgs[index++] = rgdispid[1];
Lines 1122-1127 Link Here
1122
		rgvarg[index] = new Variant(buffer.toString());
1130
		rgvarg[index] = new Variant(buffer.toString());
1123
		rgdispidNamedArgs[index++] = rgdispid[3];
1131
		rgdispidNamedArgs[index++] = rgdispid[3];
1124
	}
1132
	}
1133
	/*
1134
	 * Feature in Internet Explorer 8. Browser caches web pages and for the
1135
	 * same address display always the same page until not refreshed. Setting
1136
	 * flag navNoReadFromCache solves this problem. See bug #298822
1137
	 */
1138
	if (IEVersion >= 8) {
1139
		rgvarg[index] = new Variant(navNoReadFromCache);
1140
		rgdispidNamedArgs[index++] = rgdispid[4];	
1141
	}
1125
	boolean oldValue = false;
1142
	boolean oldValue = false;
1126
	if (silent && !OS.IsWinCE && IEVersion >= 7) {
1143
	if (silent && !OS.IsWinCE && IEVersion >= 7) {
1127
		int hResult = OS.CoInternetIsFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.GET_FEATURE_FROM_PROCESS);
1144
		int hResult = OS.CoInternetIsFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.GET_FEATURE_FROM_PROCESS);

Return to bug 298822