Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/refresh/win32/Win32Monitor.java

@@ -221,7 +221,7 @@ private void openHandleOn(String path, boolean subtree) {
 			setHandleValue(createHandleValue(path, subtree, Win32Natives.FILE_NOTIFY_CHANGE_FILE_NAME | Win32Natives.FILE_NOTIFY_CHANGE_DIR_NAME | Win32Natives.FILE_NOTIFY_CHANGE_LAST_WRITE | Win32Natives.FILE_NOTIFY_CHANGE_SIZE));
 			if (isOpen()) {
 				fHandleValueToHandle.put(getHandleValue(), this);
-				setHandleValueArrays(createHandleArrays());
+				setHandleValueArrays();
 			} else {
 				close();
 			}
@@ -369,7 +369,7 @@ public Win32Monitor(IRefreshResult result) {
 		setPriority(Job.DECORATE);
 		setSystem(true);
 		fHandleValueToHandle = new HashMap<>(1);
-		setHandleValueArrays(createHandleArrays());
+		setHandleValueArrays();
 	}
 
 	/**
@@ -424,13 +424,18 @@ private Handle createHandle(IResource resource) {
 	 * Win32Natives.MAXIMUM_WAIT_OBJECTS. The arrays are balanced so that they
 	 * differ in size by no more than one element.
 	 */
-	protected long[][] createHandleArrays() {
+	private long[][] createHandleArrays() {
 		long[] handles;
 		// synchronized: in order to protect the map during iteration
 		synchronized (fHandleValueToHandle) {
 			Set<Long> keys = fHandleValueToHandle.keySet();
 			int size = keys.size();
 			if (size == 0) {
+				// This is dangerous: the documentation of WaitForMultipleObjects says that the
+				// number of object handles cannot be zero and returning empty arrays will end
+				// up passing zero as the 1st parameter to WaitForMultipleObjects. Therefore one
+				// needs to make sure to check for this case when calling
+				// Win32Natives.WaitForMultipleObjects(int, ...)
 				return new long[0][0];
 			}
 			handles = new long[size];
@@ -524,7 +529,7 @@ private void removeHandles(Collection<Handle> handles) {
 				fHandleValueToHandle.remove(handle.getHandleValue());
 				handle.destroy();
 			}
-			setHandleValueArrays(createHandleArrays());
+			setHandleValueArrays();
 		}
 	}
 
@@ -572,8 +577,8 @@ protected IStatus run(IProgressMonitor monitor) {
 		return Status.OK_STATUS;
 	}
 
-	protected void setHandleValueArrays(long[][] arrays) {
-		fHandleValueArrays = arrays;
+	private void setHandleValueArrays() {
+		fHandleValueArrays = createHandleArrays();
 	}
 
 	@Override
@@ -607,6 +612,11 @@ public void unmonitor(IResource resource) {
 	 */
 	private void waitForNotification(long[] handleValues) {
 		int handleCount = handleValues.length;
+		if (handleCount == 0) {
+			// According to the documentation of WaitForMultipleObjects,
+			// nCount (the 1st parameter) cannot be zero
+			return;
+		}
 		int index = Win32Natives.WaitForMultipleObjects(handleCount, handleValues, false, WAIT_FOR_MULTIPLE_OBJECTS_TIMEOUT);
 		if (index == Win32Natives.WAIT_TIMEOUT) {
 			// nothing happened.

resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/refresh/win32/Win32Natives.java

@@ -193,7 +193,7 @@ public static boolean FindNextChangeNotification(long hChangeHandle) {
 	 *   <li>All of the objects are signaled, when bWaitAll is <code>true</code></li>
 	 *   <li>The timeout interval of dwMilliseconds elapses.</li>
 	 * </ul>
-	 * @param nCount The number of handles, cannot be greater than MAXIMUM_WAIT_OBJECTS.
+	 * @param nCount The number of handles, cannot be zero and cannot be greater than MAXIMUM_WAIT_OBJECTS.
 	 * @param lpHandles The array of handles to objects to be waited upon cannot contain
 	 * duplicate handles.
 	 * @param bWaitAll If <code>true</code> requires all objects to be signaled before this

ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java

@@ -121,7 +121,7 @@ public void controlResized(ControlEvent e) {
 			}
 		});
 
-		browser = new Browser(shell, SWT.NONE);
+		browser = new Browser(shell, SWT.SEARCH);
 		browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		initialize(browser);
 

ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java

@@ -97,7 +97,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 
 	public BrowserPart(final Composite parent, FormToolkit toolkit,
 			final IToolBarManager tbm, IMenuManager menuManager) {
-		browser = new Browser(parent, SWT.NULL);
+		browser = new Browser(parent, SWT.SEARCH);
 		browser.addLocationListener(new LocationListener() {
 
 			@Override