*** empty log message ***

6 files changed, 72 insertions, 2 deletions

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 5bee350ca0..0459f09aca 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
@@ -1506,6 +1506,11 @@ OS_GetNearestPaletteIndex=
 OS_GetNearestPaletteIndex_0=cast=(HPALETTE)
 OS_GetNearestPaletteIndex_1=cast=(COLORREF)
 
+OS_GetObjectA__III=
+OS_GetObjectA__III_0=cast=(HGDIOBJ)
+OS_GetObjectA__III_1=
+OS_GetObjectA__III_2=cast=LPVOID,flags=no_in
+
 OS_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2=
 OS_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_0=cast=(HGDIOBJ)
 OS_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_1=
@@ -1536,6 +1541,11 @@ OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_0=cast=(HGDIOBJ)
 OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_1=
 OS_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_2=flags=no_in
 
+OS_GetObjectW__III=
+OS_GetObjectW__III_0=cast=(HGDIOBJ)
+OS_GetObjectW__III_1=
+OS_GetObjectW__III_2=cast=LPVOID,flags=no_in
+
 OS_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2=
 OS_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_0=cast=(HGDIOBJ)
 OS_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_1=
@@ -2221,6 +2231,11 @@ OS_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_0=cast=(PVOID)
 OS_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_1=cast=(CONST VOID *)
 OS_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_2=
 
+OS_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II=
+OS_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_0=cast=(PVOID),flags=no_in
+OS_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_1=cast=(CONST VOID *)
+OS_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_2=
+
 OS_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II=
 OS_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_0=cast=(PVOID),flags=no_in
 OS_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_1=cast=(CONST VOID *)
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 c718121769..b4d8549229 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
@@ -3141,6 +3141,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
 }
 #endif
 
+#ifndef NO_GetObjectA__III
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GetObjectA__III_FUNC);
+	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+	OS_NATIVE_EXIT(env, that, GetObjectA__III_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2
 JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
@@ -3237,6 +3249,18 @@ fail:
 }
 #endif
 
+#ifndef NO_GetObjectW__III
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GetObjectW__III_FUNC);
+	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+	OS_NATIVE_EXIT(env, that, GetObjectW__III_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2
 JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
@@ -5566,6 +5590,20 @@ fail:
 }
 #endif
 
+#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+{
+	EXTLOGPEN _arg0, *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
+	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
+fail:
+	if (arg0 && lparg0) setEXTLOGPENFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+}
+#endif
+
 #ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II
 JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
index 8140ee8f92..a2d90e67bc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
@@ -215,6 +215,7 @@
 #define NO_GetMonitorInfoA
 #define NO_GetMonitorInfoW
 #define NO_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
+#define NO_GetObjectA__III
 #define NO_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
 #define NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2
 #define NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2
@@ -258,6 +259,7 @@
 #define NO_MessageBoxA
 #define NO_MonitorFromWindow
 #define NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I
+#define NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II
 #define NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II
 #define NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II
 #define NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
index 7d12bdf452..a2f4c1e610 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 593;
-int OS_nativeFunctionCallCount[593];
+int OS_nativeFunctionCount = 596;
+int OS_nativeFunctionCallCount[596];
 char * OS_nativeFunctionNames[] = {
 	"AbortDoc",
 	"ActivateKeyboardLayout",
@@ -211,12 +211,14 @@ char * OS_nativeFunctionNames[] = {
 	"GetMonitorInfoA",
 	"GetMonitorInfoW",
 	"GetNearestPaletteIndex",
+	"GetObjectA__III",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2",
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2",
+	"GetObjectW__III",
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2",
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
@@ -371,6 +373,7 @@ char * OS_nativeFunctionNames[] = {
 	"MoveMemory__I_3SI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II",
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II",
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
index 67e7176fc2..3332669e33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
@@ -215,12 +215,14 @@ typedef enum {
 	GetMonitorInfoA_FUNC,
 	GetMonitorInfoW_FUNC,
 	GetNearestPaletteIndex_FUNC,
+	GetObjectA__III_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC,
+	GetObjectW__III_FUNC,
 	GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
 	GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
 	GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
@@ -375,6 +377,7 @@ typedef enum {
 	MoveMemory__I_3SI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC,
+	MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC,
 	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC,
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 08b7373f8d..01ed33e949 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
@@ -841,6 +841,7 @@ public class OS extends Platform {
 	public static final int PS_JOIN_ROUND = 0x0000;
 	public static final int PS_SOLID = 0x0;
 	public static final int PS_STYLE_MASK = 0xf;
+	public static final int PS_USERSTYLE = 0x7;
 	public static final int R2_COPYPEN = 0xd;
 	public static final int R2_XORPEN = 0x7;
 	public static final int RASTERCAPS = 0x26;
@@ -1721,6 +1722,11 @@ public static final int GetObject (int hgdiobj, int cbBuffer, LOGPEN lpvObject)
 	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
 }
 
+public static final int GetObject (int hgdiobj, int cbBuffer, int lpvObject) {
+	if (IsUnicode) return GetObjectW (hgdiobj, cbBuffer, lpvObject);
+	return GetObjectA (hgdiobj, cbBuffer, lpvObject);
+}
+
 public static final boolean GetOpenFileName (OPENFILENAME lpofn) {
 	if (IsUnicode) return GetOpenFileNameW (lpofn);
 	return GetOpenFileNameA (lpofn);
@@ -2411,6 +2417,8 @@ public static final native int GetObjectA (int hgdiobj, int cbBuffer, LOGFONTA l
 public static final native int GetObjectW (int hgdiobj, int cbBuffer, LOGFONTW lpvObject);
 public static final native int GetObjectA (int hgdiobj, int cbBuffer, LOGPEN lpvObject);
 public static final native int GetObjectW (int hgdiobj, int cbBuffer, LOGPEN lpvObject);
+public static final native int GetObjectA (int hgdiobj, int cbBuffer, int lpvObject);
+public static final native int GetObjectW (int hgdiobj, int cbBuffer, int lpvObject);
 public static final native boolean GetOpenFileNameW (OPENFILENAME lpofn);
 public static final native boolean GetOpenFileNameA (OPENFILENAME lpofn);
 public static final native int GetPaletteEntries (int hPalette, int iStartIndex, int nEntries, byte[] logPalette);
@@ -2553,6 +2561,7 @@ public static final native void MoveMemory (int Destination, TRIVERTEX Source, i
 public static final native void MoveMemory (int Destination, WINDOWPOS Source, int Length);
 public static final native void MoveMemory (BITMAPINFOHEADER Destination, byte [] Source, int Length);
 public static final native void MoveMemory (DRAWITEMSTRUCT Destination, int Source, int Length);
+public static final native void MoveMemory (EXTLOGPEN Destination, int Source, int Length);
 public static final native void MoveMemory (HDITEM Destination, int Source, int Length);
 public static final native void MoveMemory (HELPINFO Destination, int Source, int Length);
 public static final native void MoveMemory (LOGFONTW Destination, int Source, int Length);