[Win32] Remove buggy icon retrieval from file extensions #715

Under certain conditions, program icons loaded on Windows via GDI+ have
empty mask data, even though the original icon has proper mask data. As
a result, these icons are printed with a black instead of a transparent
background. This only happens when retrieving icons via the program's
file extension but works properly when using the (also available) full
icon path.

With this change, the shortcut functionality retrieving an icon from a
program's file extension is removed, so that the icon is always
retrieved from its full path. This fixes the issue with missing mask
data and reduces code.

Fixes #715

Author: HeikoKlare

bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java

@@ -33,7 +33,6 @@ public final class Program {
 	String name;
 	String command;
 	String iconName;
-	String extension;
 	static final String [] ARGUMENTS = new String [] {"%1", "%l", "%L"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
 /**
@@ -100,7 +99,6 @@ public static Program findProgram (String extension) {
 		program.name = name;
 		program.command = command;
 		program.iconName = iconName;
-		program.extension = extension;
 	}
 	return program;
 }
@@ -182,7 +180,7 @@ static String getKeyValue (String string, boolean expand) {
 	return result;
 }
 
-static Program getProgram (String key, String extension) {
+static Program getProgram (String key) {
 
 	/* Name */
 	String name = getKeyValue (key, false);
@@ -208,7 +206,6 @@ static Program getProgram (String key, String extension) {
 	program.name = name;
 	program.command = command;
 	program.iconName = iconName;
-	program.extension = extension;
 	return program;
 }
 
@@ -234,7 +231,7 @@ static Program getProgram (String key, String extension) {
 	//map paths to programs in parallel which takes now ~ 4/5 of time:
 	ConcurrentHashMap<String, Program> programs = new ConcurrentHashMap<>(paths.size());
 	paths.stream().parallel().forEach(path -> {
-		Program program = getProgram(path, null); // getProgram takes most time
+		Program program = getProgram(path); // getProgram takes most time
 		if (program != null) {
 			programs.put(path, program);
 		}
@@ -361,19 +358,6 @@ public boolean execute (String fileName) {
  * @return the image data for the program, may be null
  */
 public ImageData getImageData () {
-	if (extension != null) {
-		SHFILEINFO shfi = new SHFILEINFO ();
-		int flags = OS.SHGFI_ICON | OS.SHGFI_SMALLICON | OS.SHGFI_USEFILEATTRIBUTES;
-		TCHAR pszPath = new TCHAR (0, extension, true);
-		OS.SHGetFileInfo (pszPath.chars, OS.FILE_ATTRIBUTE_NORMAL, shfi, SHFILEINFO.sizeof, flags);
-		if (shfi.hIcon != 0) {
-			Image image = Image.win32_new (null, SWT.ICON, shfi.hIcon);
-			/* Fetch the ImageData at 100% zoom and return */
-			ImageData imageData = image.getImageData ();
-			image.dispose ();
-			return imageData;
-		}
-	}
 	int nIconIndex = 0;
 	String fileName = iconName;
 	int index = iconName.indexOf (',');