Initialization handles without creating a Cursor instance

In win32_getHandle, a new cursor instance is created to retrieve the OS
handle. With this change, we are able to safely retrieve the handle
without creating a cursor instance.

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java

@@ -74,6 +74,7 @@ public final class Cursor extends Resource {
 	private final ImageData mask;
 	private final int hotspotX;
 	private final int hotspotY;
+	private Integer style;
 /**
  * Prevents uninitialized instances from being created outside the package.
  */
@@ -135,6 +136,7 @@ public final class Cursor extends Resource {
  */
 public Cursor(Device device, int style) {
 	this(device);
+	this.style = style;
 	this.handle = setupCursorFromStyle(style);
 	init();
 }
@@ -430,10 +432,11 @@ public static Long win32_getHandle (Cursor cursor, int zoom) {
 	if (cursor.zoomLevelToHandle.get(zoom) != null) {
 		return cursor.zoomLevelToHandle.get(zoom);
 	}
-
-	if (cursor.source == null) {
-		cursor.setHandleForZoomLevel(cursor.handle, zoom);
-	} else {
+	if (cursor.style != null) {
+		// we don't need to pass zoom in this case. LoadCursor will always return scaled cursor even though handle value will be same for all zoom levels.
+		long handle = setupCursorFromStyle(cursor.style);
+		cursor.setHandleForZoomLevel(handle, zoom);
+	}  else {
 		ImageData source;
 		if (cursor.imageDataProvider != null) {
 			Image tempImage = new Image(cursor.getDevice(), cursor.imageDataProvider);
@@ -444,12 +447,12 @@ public static Long win32_getHandle (Cursor cursor, int zoom) {
 			source = DPIUtil.scaleImageData(cursor.device, cursor.source, zoom, DEFAULT_ZOOM);
 		}
 		if (cursor.isIcon) {
-			Cursor newCursor = new Cursor(cursor.device, source, Win32DPIUtils.pointToPixel(cursor.hotspotX, zoom), Win32DPIUtils.pointToPixel(cursor.hotspotY, zoom));
-			cursor.setHandleForZoomLevel(newCursor.handle, zoom);
+			long handle = setupCursorFromImageData(cursor.getDevice(), source, Win32DPIUtils.pointToPixel(cursor.hotspotX, zoom), Win32DPIUtils.pointToPixel(cursor.hotspotY, zoom));
+			cursor.setHandleForZoomLevel(handle, zoom);
 		} else {
-			ImageData mask = DPIUtil.scaleImageData(cursor.device, cursor.mask, zoom, DEFAULT_ZOOM);
-			Cursor newCursor = new Cursor(cursor.device, source, mask, Win32DPIUtils.pointToPixel(cursor.hotspotX, zoom), Win32DPIUtils.pointToPixel(cursor.hotspotY, zoom));
-			cursor.setHandleForZoomLevel(newCursor.handle, zoom);
+			ImageData mask = DPIUtil.scaleImageData(cursor.getDevice(), cursor.mask, zoom, DEFAULT_ZOOM);
+			long handle = setupCursorFromImageData(source, mask, Win32DPIUtils.pointToPixel(cursor.hotspotX, zoom), Win32DPIUtils.pointToPixel(cursor.hotspotY, zoom));
+			cursor.setHandleForZoomLevel(handle, zoom);
 		}
 	}
 	return cursor.zoomLevelToHandle.get(zoom);