30834

5 files changed, 12 insertions, 49 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
index 3fae7e1824..0e23284ea2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
@@ -77,18 +77,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsSP)
 }
 #endif
 
-#ifndef NO_NOTIFYICONDATA_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATA_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "NOTIFYICONDATA_1sizeof\n")
-	rc = (jint)sizeof(NOTIFYICONDATA);
-	NATIVE_EXIT(env, that, "NOTIFYICONDATA_1sizeof\n")
-	return rc;
-}
-#endif
-
 #ifndef NO_SendMessageW__II_3I_3I
 JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
index 552da775b1..c706243588 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
@@ -11,32 +11,6 @@
 package org.eclipse.swt.internal.win32;
 
 public abstract class NOTIFYICONDATA {
-	static {
-		/* Get the Shell32.DLL version */
-		DLLVERSIONINFO dvi = new DLLVERSIONINFO ();
-		dvi.cbSize = DLLVERSIONINFO.sizeof;
-		dvi.dwMajorVersion = 4;
-		TCHAR lpLibFileName = new TCHAR (0, "Shell32.dll", true); //$NON-NLS-1$
-		int hModule = OS.LoadLibrary (lpLibFileName);
-		if (hModule != 0) {
-			String name = "DllGetVersion\0"; //$NON-NLS-1$
-			byte [] lpProcName = new byte [name.length ()];
-			for (int i=0; i<lpProcName.length; i++) {
-				lpProcName [i] = (byte) name.charAt (i);
-			}
-			int DllGetVersion = OS.GetProcAddress (hModule, lpProcName);
-			if (DllGetVersion != 0) OS.Call (DllGetVersion, dvi);
-			OS.FreeLibrary (hModule);
-		}
-		if (dvi.dwMajorVersion < 5) {
-			sizeof = OS.NOTIFYICONDATA_V1_SIZE;
-		} else if (dvi.dwMajorVersion == 5) {
-			sizeof = OS.NOTIFYICONDATA_V2_SIZE;
-		} else {
-			sizeof = OS.NOTIFYICONDATA_sizeof ();
-		}
-	}
-	
 	public int cbSize;
 	public int hWnd;
 	public int uID;
@@ -47,5 +21,5 @@ public abstract class NOTIFYICONDATA {
 	public int dwStateMask;
 	public int uVersion;
 	public int dwInfoFlags;
-	public static final int sizeof;
+	public static final int sizeof = OS.NOTIFYICONDATA_V2_SIZE;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java
index 863b85b6d5..7596019ac8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAA.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class NOTIFYICONDATAA extends NOTIFYICONDATA {
-	public byte szTip[] = new byte [128];		// TCHAR szTip
-	public byte szInfo[] = new byte [512];		// TCHAR szInfo
-	public byte szInfoTitle[] = new byte [128];	// TCHAR szInfoTitle
-//	public static final int sizeof = 504;
+	public byte szTip[] = new byte [128];
+	public byte szInfo[] = new byte [256];
+	public byte szInfoTitle[] = new byte [64];
+	public static final int sizeof = OS.NOTIFYICONDATAA_V2_SIZE;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java
index 20ef3f4917..89d4b5eca1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATAW.java
@@ -11,8 +11,8 @@
 package org.eclipse.swt.internal.win32;
 
 public class NOTIFYICONDATAW extends NOTIFYICONDATA {
-	public char szTip[] = new char [128];		// TCHAR szTip
-	public char szInfo[] = new char [512];		// TCHAR szInfo
-	public char szInfoTitle[] = new char [128];	// TCHAR szInfoTitle
-//	public static final int sizeof = 952; 	
+	public char szTip[] = new char [128];
+	public char szInfo[] = new char [256];
+	public char szInfoTitle[] = new char [64];
+	public static final int sizeof = OS.NOTIFYICONDATAW_V2_SIZE;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 906dd81783..79f0a8394e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -690,8 +690,9 @@ public class OS {
 	public static final int NM_DBLCLK = 0xfffffffd;
 	public static final int NM_RECOGNIZEGESTURE = NM_FIRST - 16;
 	public static final int NM_RETURN = 0xfffffffc;
-	public static final int NOTIFYICONDATA_V1_SIZE = 88;
-	public static final int NOTIFYICONDATA_V2_SIZE = 488;
+	public static final int NOTIFYICONDATAA_V2_SIZE = 488;
+	public static final int NOTIFYICONDATAW_V2_SIZE = 936;
+	public static final int NOTIFYICONDATA_V2_SIZE = IsUnicode ? NOTIFYICONDATAW_V2_SIZE : NOTIFYICONDATAA_V2_SIZE;
 	public static final int NOTSRCCOPY = 0x330008;
 	public static final int NULLREGION = 0x1;
 	public static final int NULL_BRUSH = 0x5;