*** empty log message ***

2 files changed, 28 insertions, 15 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
index 749aafc1e0..fbd98d7e5f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
@@ -1826,21 +1826,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardFormatNameW)
 }
 #endif
 
-#ifndef NO_GetComboBoxInfo
-JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	COMBOBOXINFO _arg1, *lparg1=NULL;
-	jboolean rc;
-	NATIVE_ENTER(env, that, "GetComboBoxInfo\n")
-	if (arg1) lparg1 = getCOMBOBOXINFOFields(env, arg1, &_arg1);
-	rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1);
-	if (arg1) setCOMBOBOXINFOFields(env, arg1, lparg1);
-	NATIVE_EXIT(env, that, "GetComboBoxInfo\n")
-	return rc;
-}
-#endif
-
 #ifndef NO_GetCurrentObject
 JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentObject)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
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 8e38a8e84d..306b1caf3f 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
@@ -138,6 +138,34 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
 }
 #endif
 
+
+#ifndef NO_GetComboBoxInfo
+JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	COMBOBOXINFO _arg1, *lparg1=NULL;
+	jboolean rc;
+	NATIVE_ENTER(env, that, "GetComboBoxInfo\n")
+	if (arg1) lparg1 = getCOMBOBOXINFOFields(env, arg1, &_arg1);
+	{
+		/*
+		*  GetComboBoxInfo is a Win2000 and Win98 specific call
+		*  If you link it into swt.dll a system modal entry point not found dialog will
+		*  appear as soon as swt.dll is loaded. Here we check for the entry point and
+		*  only do the call if it exists.
+		*/
+		HMODULE hm;
+		FARPROC fp;
+    	if ((hm=GetModuleHandle("user32.dll")) && (fp=GetProcAddress(hm, "GetComboBoxInfo"))) {
+			rc = (jboolean)(fp)((HWND)arg0, lparg1);
+    	}
+	}
+	if (arg1) setCOMBOBOXINFOFields(env, arg1, lparg1);
+	NATIVE_EXIT(env, that, "GetComboBoxInfo\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_GetLayout
 JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
 	(JNIEnv *env, jclass that, jint arg0)