diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-09-25 12:12:52 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-09-25 12:12:52 -0400 |
| commit | a01ce1fdb6ad3a12ed23e5bb7226b96dbb6c86c5 (patch) | |
| tree | f8184ff2b6c133ae1520fd0308098f7123072730 /bundles/org.eclipse.swt/Eclipse SWT PI/win32 | |
| parent | 99aa8aa5b88fb4867827824844707e74aecc24e1 (diff) | |
| download | eclipse.platform.swt-a01ce1fdb6ad3a12ed23e5bb7226b96dbb6c86c5.tar.gz eclipse.platform.swt-a01ce1fdb6ad3a12ed23e5bb7226b96dbb6c86c5.tar.xz eclipse.platform.swt-a01ce1fdb6ad3a12ed23e5bb7226b96dbb6c86c5.zip | |
Bug 377107 - no 32bits vm for JDK7 - comment#2
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/win32')
4 files changed, 40 insertions, 0 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 39272ca3a4..c6837207e8 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 @@ -11107,6 +11107,31 @@ fail: } #endif +#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI) && defined(JNI64)) +#ifndef JNI64 +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#else +JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) +#endif +{ + SAFEARRAY _arg0, *lparg0=NULL; +#ifndef JNI64 + OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC); +#else + OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC); +#endif + if (arg0) if ((lparg0 = getSAFEARRAYFields(env, arg0, &_arg0)) == NULL) goto fail; + MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2); +fail: + if (arg0 && lparg0) setSAFEARRAYFields(env, arg0, lparg0); +#ifndef JNI64 + OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC); +#else + OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC); +#endif +} +#endif + #if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2) 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 724a3c517d..122bfc6fff 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 @@ -1093,6 +1093,11 @@ char * OS_nativeFunctionNames[] = { "MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI", #endif #ifndef JNI64 + "MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II", +#else + "MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI", +#endif +#ifndef JNI64 "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II", #else "MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI", 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 47434909fb..5f47247125 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 @@ -1103,6 +1103,11 @@ typedef enum { MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI_FUNC, #endif #ifndef JNI64 + MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2II_FUNC, +#else + MoveMemory__Lorg_eclipse_swt_internal_win32_SAFEARRAY_2JI_FUNC, +#endif +#ifndef JNI64 MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC, #else MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_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 b9512389ae..ea9bc64063 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 @@ -5338,6 +5338,11 @@ public static final native void MoveMemory (long /*int*/ Destination, SAFEARRAY * @param Destination cast=(PVOID) * @param Source cast=(CONST VOID *),flags=no_out */ +public static final native void MoveMemory (SAFEARRAY Destination, long /*int*/ Source, int Length); +/** + * @param Destination cast=(PVOID) + * @param Source cast=(CONST VOID *),flags=no_out + */ public static final native void MoveMemory (long /*int*/ Destination, TRIVERTEX Source, int Length); /** * @param Destination cast=(PVOID) |