Use OS.CreateIconIndirect for colored cursors with source and mask

Previously, the Cursor constructor that accepted both source and mask used
OS.CreateCursor, which only supports monochrome cursors. As a result,
any color information in the source was ignored and the cursor always
appeared black.

This change updates the constructor to use OS.CreateIconIndirect, allowing
full-color cursors while still respecting the mask for transparency.
DPI scaling of the source and mask now works correctly with colored cursors.

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

Author: ShahzaibIbrahim

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

@@ -154,25 +154,6 @@ public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int
 	this.device.registerResourceWithZoomSupport(this);
 }
 
-private static CursorHandle setupCursorFromImageData(ImageData source, ImageData mask, int hotspotX, int hotspotY) {
-	if (mask == null) {
-		mask = source.getTransparencyMask();
-	}
-	/* Convert depth to 1 */
-	mask = ImageData.convertMask(mask);
-	source = ImageData.convertMask(source);
-
-	/* Make sure source and mask scanline pad is 2 */
-	byte[] sourceData = ImageData.convertPad(source.data, source.width, source.height, source.depth, source.scanlinePad, 2);
-	byte[] maskData = ImageData.convertPad(mask.data, mask.width, mask.height, mask.depth, mask.scanlinePad, 2);
-
-	/* Create the cursor */
-	long hInst = OS.GetModuleHandle(null);
-	long handle = OS.CreateCursor(hInst, hotspotX, hotspotY, source.width, source.height, sourceData, maskData);
-	if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-	return new CustomCursorHandle(handle);
-}
-
 /**
  * Constructs a new cursor given a device, image data describing
  * the desired cursor appearance, and the x and y coordinates of
@@ -209,7 +190,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
 	this.device.registerResourceWithZoomSupport(this);
 }
 
-private static CursorHandle setupCursorFromImageData(Device device, ImageData source, int hotspotX, int hotspotY) {
+private static CursorHandle setupCursorFromImageData(Device device, ImageData source, ImageData maskData, int hotspotX, int hotspotY) {
 	if (source == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	long hBitmap = 0;
 	long hMask = 0;
@@ -255,10 +236,21 @@ private static CursorHandle setupCursorFromImageData(Device device, ImageData so
 			}
 		}
 		OS.MoveMemory(dibBM.bmBits, srcData, srcData.length);
-		hMask = OS.CreateBitmap(source.width, source.height, 1, 1, new byte[(((source.width + 7) / 8) + 3) / 4 * 4 * source.height]);
+		if (maskData != null) {
+			long[] maskResult = Image.initIcon(device, maskData, maskData);
+			hMask = maskResult[1];
+		} else {
+			hMask = OS.CreateBitmap(source.width, source.height, 1, 1,
+					new byte[(((source.width + 7) / 8) + 3) / 4 * 4 * source.height]);
+		}
 		if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	} else {
-		ImageData mask = source.getTransparencyMask();
+		ImageData mask;
+		if(maskData != null) {
+			mask = maskData;
+		} else {
+			mask = source.getTransparencyMask();
+		}
 		long [] result = Image.initIcon(device, source, mask);
 		hBitmap = result[0];
 		hMask = result[1];
@@ -368,8 +360,7 @@ private void setHandleForZoomLevel(CursorHandle handle, Integer zoom) {
  * @return the cursor scaling factor (e.g., 1 for default size, 2 for double
  *         size, etc.)
  */
-
-private static int getPointerSizeScaleFactor() {
+private static float getPointerSizeScaleFactor() {
 	if (OsVersion.IS_WIN10_1809) {
 		int[] cursorBaseSize = OS.readRegistryDwords(OS.HKEY_CURRENT_USER, "Control Panel\\Cursors", "CursorBaseSize");
 		if (cursorBaseSize != null && cursorBaseSize.length > 0 && cursorBaseSize[0] > 0) {
@@ -649,7 +640,7 @@ public CursorHandle createHandle(Device device, int zoom) {
 			source = tempImage.getImageData(zoom);
 			tempImage.dispose();
 		}
-		return setupCursorFromImageData(device, source, getHotpotXInPixels(zoom), getHotpotYInPixels(zoom));
+		return setupCursorFromImageData(device, source, null, getHotpotXInPixels(zoom), getHotpotYInPixels(zoom));
 	}
 }
 
@@ -665,9 +656,9 @@ public ImageDataCursorHandleProvider(ImageData source, int hotspotX, int hotspot
 
 	@Override
 	public CursorHandle createHandle(Device device, int zoom) {
-		int accessibilityFactor = getPointerSizeScaleFactor();
-		ImageData scaledSource = DPIUtil.scaleImageData(device, this.source, zoom * accessibilityFactor, DEFAULT_ZOOM);
-		return setupCursorFromImageData(device, scaledSource, getHotpotXInPixels(zoom),
+		float accessibilityFactor = getPointerSizeScaleFactor();
+		ImageData scaledSource = DPIUtil.scaleImageData(device, this.source, (int)(zoom * accessibilityFactor), DEFAULT_ZOOM);
+		return setupCursorFromImageData(device, scaledSource, null, getHotpotXInPixels(zoom),
 				getHotpotYInPixels(zoom));
 	}
 }
@@ -697,10 +688,10 @@ private void validateMask(ImageData source, ImageData mask) {
 
 	@Override
 	public CursorHandle createHandle(Device device, int zoom) {
-		ImageData scaledSource = DPIUtil.scaleImageData(device, this.source, zoom, DEFAULT_ZOOM);
-		ImageData scaledMask = this.mask != null ? DPIUtil.scaleImageData(device, mask, zoom, DEFAULT_ZOOM)
-				: null;
-		return setupCursorFromImageData(scaledSource, scaledMask, getHotpotXInPixels(zoom), getHotpotYInPixels(zoom));
+		float zoomFactor = getPointerSizeScaleFactor() * ((float) zoom) / 100f;
+		ImageData scaledSource =  this.source.scaledTo((int) (this.source.width * zoomFactor), (int) (this.source.height * zoomFactor));
+		ImageData scaledMask = this.mask!= null? this.mask.scaledTo((int) (this.mask.width * zoomFactor), (int) (this.mask.height * zoomFactor)) : null;
+		return setupCursorFromImageData(device, scaledSource, scaledMask, getHotpotXInPixels(zoom), getHotpotYInPixels(zoom));
 	}
 }