Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2004-11-02 15:02:19 +0000
committerSilenio Quarti2004-11-02 15:02:19 +0000
commit608bc6caf3c82ff42d5796f0a1fa1f463ef13554 (patch)
treeacadc8b64cb9388a416a4563e38d1edb439fc135 /bundles/org.eclipse.swt.tools/JNI Generation
parent788d0431f6cb8ab3e336181188e328cdba3f23a0 (diff)
downloadeclipse.platform.swt-608bc6caf3c82ff42d5796f0a1fa1f463ef13554.tar.gz
eclipse.platform.swt-608bc6caf3c82ff42d5796f0a1fa1f463ef13554.tar.xz
eclipse.platform.swt-608bc6caf3c82ff42d5796f0a1fa1f463ef13554.zip
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.swt.tools/JNI Generation')
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java4
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java2
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties26
3 files changed, 29 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
index 7588984272..a049be2c98 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
@@ -215,7 +215,7 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
output(")");
}
}
- outputln(") == NULL) goto failTag;");
+ outputln(") == NULL) goto fail;");
return true;
}
@@ -700,7 +700,7 @@ void generateFunctionBody(Method method, MethodData methodData, String function,
} else {
generateFunctionCall(method, methodData, paramTypes, returnType, needsReturn);
}
- if (genFailTag) outputln("failTag:");
+ if (genFailTag) outputln("fail:");
generateSetters(method, paramTypes);
generateExitMacro(method, function);
generateReturn(method, returnType, needsReturn);
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
index 286c974db2..af7ad9422d 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
@@ -118,7 +118,7 @@ void generateSourceFile(Class clazz) {
if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
output("\t\"");
output(getFunctionName(method));
- outputln("\", ");
+ outputln("\",");
if (progress != null) progress.step();
}
outputln("};");
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index daf65e3b4a..2d20837162 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -164,6 +164,15 @@ DROPFILES_pt_y=accessor=pt.y
DROPFILES_fNC=
DROPFILES_fWide=
+org_eclipse_swt_internal_win32_EXTLOGPEN=
+EXTLOGPEN_elpPenStyle=
+EXTLOGPEN_elpWidth=
+EXTLOGPEN_elpBrushStyle=
+EXTLOGPEN_elpColor=
+EXTLOGPEN_elpHatch=
+EXTLOGPEN_elpNumEntries=
+EXTLOGPEN_elpStyleEntry=
+
org_eclipse_swt_internal_win32_FILETIME=
FILETIME_dwLowDateTime=
FILETIME_dwHighDateTime=
@@ -1138,6 +1147,13 @@ OS_ExpandEnvironmentStringsW_0=
OS_ExpandEnvironmentStringsW_1=
OS_ExpandEnvironmentStringsW_2=
+OS_ExtCreatePen=
+OS_ExtCreatePen_0=
+OS_ExtCreatePen_1=
+OS_ExtCreatePen_2=cast=CONST LOGBRUSH *
+OS_ExtCreatePen_3=
+OS_ExtCreatePen_4=cast=CONST DWORD *
+
OS_ExtTextOutA=
OS_ExtTextOutA_0=cast=(HDC)
OS_ExtTextOutA_1=
@@ -1491,6 +1507,11 @@ OS_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_0=cast=(HGDIOBJ)
OS_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_1=
OS_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_2=flags=no_in
+OS_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2=
+OS_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_0=cast=(HGDIOBJ)
+OS_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_1=
+OS_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_2=flags=no_in
+
OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2=
OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_0=cast=(HGDIOBJ)
OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_1=
@@ -1516,6 +1537,11 @@ OS_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_0=cast=(HGDIOBJ)
OS_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_1=
OS_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_2=flags=no_in
+OS_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2=
+OS_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_0=cast=(HGDIOBJ)
+OS_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_1=
+OS_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_2=flags=no_in
+
OS_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2=
OS_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_0=cast=(HGDIOBJ)
OS_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_1=

Back to the top