diff options
author | Nikita Nemkin | 2019-04-24 13:02:14 +0000 |
---|---|---|
committer | Nikita Nemkin | 2019-05-10 09:24:58 +0000 |
commit | e8c4408aea4cb0b4a0aa7991da4e0ec65c6780d3 (patch) | |
tree | 9e2c1d49ab9883ec88417e6de1a7ec2480d355d8 /bundles/org.eclipse.swt/Eclipse SWT PI/cocoa | |
parent | 5300e5640ac4555bfc26fea780ae2c5189f3e6ef (diff) | |
download | eclipse.platform.swt-e8c4408aea4cb0b4a0aa7991da4e0ec65c6780d3.tar.gz eclipse.platform.swt-e8c4408aea4cb0b4a0aa7991da4e0ec65c6780d3.tar.xz eclipse.platform.swt-e8c4408aea4cb0b4a0aa7991da4e0ec65c6780d3.zip |
Bug 546694 - [Cocoa] Re-enable struct generation in MacGenerator
Struct generation was disabled in 6ddf285abe, likely to allow for
customization (for example, flattening of NSRect).
Partially re-enable struct generation with the help of two new
bridgesupport tags (on <struct>):
swt_gen_memmove - generate OS.memmove and OS.***_sizeof for the struct.
This is independent from swt_gen and allows custom struct definition
without losing automatically generated helper functions.
swt_gen_tostring - generate simple toString() implementation.
This matches previously handwritten toString() code.
With this patch, all Cocoa structures except NSRect become
auto-genrated.
Since memmove generation is now configurable, I've removed unused
memmoves.
Change-Id: Ia2cd3fcb3bc7cece5668d6c7c32ca1f6d22128ef
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa')
18 files changed, 95 insertions, 633 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c index 75c8da39ac..c4e0c60bd6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -6347,56 +6347,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(kUTTypeURL) } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CFRange _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCFRangeFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCFRangeFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CGAffineTransform _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCGAffineTransformFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCGAffineTransformFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) @@ -6422,131 +6372,6 @@ fail: } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CGPoint _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCGPointFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCGPointFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CGRect _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCGRectFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCGRectFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CGSize _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCGSizeFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCGSizeFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - CTParagraphStyleSetting _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getCTParagraphStyleSettingFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setCTParagraphStyleSettingFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - NSAffineTransformStruct _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getNSAffineTransformStructFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (void *)lparg1, arg2); -fail: - if (arg1 && lparg1) setNSAffineTransformStructFields(env, arg1, lparg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) @@ -6647,56 +6472,6 @@ fail: } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CFRange _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCFRangeFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CGAffineTransform _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCGAffineTransformFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) @@ -6722,131 +6497,6 @@ fail: } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CGPoint _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCGPointFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CGRect _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CGSize _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCGSizeFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - CTParagraphStyleSetting _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setCTParagraphStyleSettingFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ_FUNC); -#endif -} -#endif - -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - NSAffineTransformStruct _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (void *)arg1, arg2); -fail: - if (arg0 && lparg0) setNSAffineTransformStructFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c index 116e9b4641..1707f2764a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -477,46 +477,11 @@ char * OS_nativeFunctionNames[] = { "kUTTypeFileURL", "kUTTypeURL", #ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J", -#endif -#ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I", #else "memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J", #endif #ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J", -#endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I", -#else - "memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J", -#endif -#ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I", #else "memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J", @@ -537,46 +502,11 @@ char * OS_nativeFunctionNames[] = { "memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J", #endif #ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ", -#endif -#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II", #else "memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ", #endif #ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ", -#endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II", -#else - "memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ", -#endif -#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II", #else "memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h index 374c17e420..1803b9d115 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -487,46 +487,11 @@ typedef enum { kUTTypeFileURL_FUNC, kUTTypeURL_FUNC, #ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CFRange_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CFRange_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CGAffineTransform_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CGAffineTransform_2J_FUNC, -#endif -#ifndef JNI64 memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I_FUNC, #else memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J_FUNC, #endif #ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2J_FUNC, -#endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC, -#endif -#ifndef JNI64 memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC, #else memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC, @@ -547,46 +512,11 @@ typedef enum { memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC, #endif #ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CFRange_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CGAffineTransform_2JJ_FUNC, -#endif -#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II_FUNC, #else memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ_FUNC, #endif #ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_CTParagraphStyleSetting_2JJ_FUNC, -#endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC, -#endif -#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC, #else memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c index 6db699c975..67347b101d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -39,8 +39,8 @@ void cacheCFRangeFields(JNIEnv *env, jobject lpObject) CFRange *getCFRangeFields(JNIEnv *env, jobject lpObject, CFRange *lpStruct) { if (!CFRangeFc.cached) cacheCFRangeFields(env, lpObject); - lpStruct->location = (*env)->GetIntLongField(env, lpObject, CFRangeFc.location); - lpStruct->length = (*env)->GetIntLongField(env, lpObject, CFRangeFc.length); + lpStruct->location = (CFIndex)(*env)->GetIntLongField(env, lpObject, CFRangeFc.location); + lpStruct->length = (CFIndex)(*env)->GetIntLongField(env, lpObject, CFRangeFc.length); return lpStruct; } @@ -77,12 +77,12 @@ void cacheCGAffineTransformFields(JNIEnv *env, jobject lpObject) CGAffineTransform *getCGAffineTransformFields(JNIEnv *env, jobject lpObject, CGAffineTransform *lpStruct) { if (!CGAffineTransformFc.cached) cacheCGAffineTransformFields(env, lpObject); - lpStruct->a = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.a); - lpStruct->b = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.b); - lpStruct->c = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.c); - lpStruct->d = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.d); - lpStruct->tx = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.tx); - lpStruct->ty = (*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.ty); + lpStruct->a = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.a); + lpStruct->b = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.b); + lpStruct->c = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.c); + lpStruct->d = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.d); + lpStruct->tx = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.tx); + lpStruct->ty = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.ty); return lpStruct; } @@ -120,7 +120,7 @@ CGPathElement *getCGPathElementFields(JNIEnv *env, jobject lpObject, CGPathEleme { if (!CGPathElementFc.cached) cacheCGPathElementFields(env, lpObject); lpStruct->type = (CGPathElementType)(*env)->GetIntField(env, lpObject, CGPathElementFc.type); - lpStruct->points = (CGPoint *)(*env)->GetIntLongField(env, lpObject, CGPathElementFc.points); + lpStruct->points = (CGPoint*)(*env)->GetIntLongField(env, lpObject, CGPathElementFc.points); return lpStruct; } @@ -153,8 +153,8 @@ void cacheCGPointFields(JNIEnv *env, jobject lpObject) CGPoint *getCGPointFields(JNIEnv *env, jobject lpObject, CGPoint *lpStruct) { if (!CGPointFc.cached) cacheCGPointFields(env, lpObject); - lpStruct->x = (*env)->GetFloatDoubleField(env, lpObject, CGPointFc.x); - lpStruct->y = (*env)->GetFloatDoubleField(env, lpObject, CGPointFc.y); + lpStruct->x = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGPointFc.x); + lpStruct->y = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGPointFc.y); return lpStruct; } @@ -233,8 +233,8 @@ void cacheCGSizeFields(JNIEnv *env, jobject lpObject) CGSize *getCGSizeFields(JNIEnv *env, jobject lpObject, CGSize *lpStruct) { if (!CGSizeFc.cached) cacheCGSizeFields(env, lpObject); - lpStruct->width = (*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.width); - lpStruct->height = (*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.height); + lpStruct->width = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.width); + lpStruct->height = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.height); return lpStruct; } @@ -269,8 +269,8 @@ CTParagraphStyleSetting *getCTParagraphStyleSettingFields(JNIEnv *env, jobject l { if (!CTParagraphStyleSettingFc.cached) cacheCTParagraphStyleSettingFields(env, lpObject); lpStruct->spec = (CTParagraphStyleSpecifier)(*env)->GetIntField(env, lpObject, CTParagraphStyleSettingFc.spec); - lpStruct->valueSize = (*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize); - lpStruct->value = (void *)(*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.value); + lpStruct->valueSize = (size_t)(*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize); + lpStruct->value = (void*)(*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.value); return lpStruct; } @@ -308,12 +308,12 @@ void cacheNSAffineTransformStructFields(JNIEnv *env, jobject lpObject) NSAffineTransformStruct *getNSAffineTransformStructFields(JNIEnv *env, jobject lpObject, NSAffineTransformStruct *lpStruct) { if (!NSAffineTransformStructFc.cached) cacheNSAffineTransformStructFields(env, lpObject); - lpStruct->m11 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11); - lpStruct->m12 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12); - lpStruct->m21 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21); - lpStruct->m22 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22); - lpStruct->tX = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX); - lpStruct->tY = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY); + lpStruct->m11 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11); + lpStruct->m12 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12); + lpStruct->m21 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21); + lpStruct->m22 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22); + lpStruct->tX = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX); + lpStruct->tY = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY); return lpStruct; } @@ -350,8 +350,8 @@ void cacheNSPointFields(JNIEnv *env, jobject lpObject) NSPoint *getNSPointFields(JNIEnv *env, jobject lpObject, NSPoint *lpStruct) { if (!NSPointFc.cached) cacheNSPointFields(env, lpObject); - lpStruct->x = (*env)->GetFloatDoubleField(env, lpObject, NSPointFc.x); - lpStruct->y = (*env)->GetFloatDoubleField(env, lpObject, NSPointFc.y); + lpStruct->x = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSPointFc.x); + lpStruct->y = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSPointFc.y); return lpStruct; } @@ -384,8 +384,8 @@ void cacheNSRangeFields(JNIEnv *env, jobject lpObject) NSRange *getNSRangeFields(JNIEnv *env, jobject lpObject, NSRange *lpStruct) { if (!NSRangeFc.cached) cacheNSRangeFields(env, lpObject); - lpStruct->location = (*env)->GetIntLongField(env, lpObject, NSRangeFc.location); - lpStruct->length = (*env)->GetIntLongField(env, lpObject, NSRangeFc.length); + lpStruct->location = (NSUInteger)(*env)->GetIntLongField(env, lpObject, NSRangeFc.location); + lpStruct->length = (NSUInteger)(*env)->GetIntLongField(env, lpObject, NSRangeFc.length); return lpStruct; } @@ -458,8 +458,8 @@ void cacheNSSizeFields(JNIEnv *env, jobject lpObject) NSSize *getNSSizeFields(JNIEnv *env, jobject lpObject, NSSize *lpStruct) { if (!NSSizeFc.cached) cacheNSSizeFields(env, lpObject); - lpStruct->width = (*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.width); - lpStruct->height = (*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.height); + lpStruct->width = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.width); + lpStruct->height = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.height); return lpStruct; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.h index 480111fe21..67fb462ef9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java index 3aa6f2fedf..e0f0559b89 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CFRange { + /** @field cast=(CFIndex) */ public long /*int*/ location; + /** @field cast=(CFIndex) */ public long /*int*/ length; - public static int sizeof = OS.CFRange_sizeof(); + public static final int sizeof = OS.CFRange_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java index 4edd7aab50..5b18762594 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,16 +9,22 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGAffineTransform { + /** @field cast=(CGFloat) */ public double /*float*/ a; + /** @field cast=(CGFloat) */ public double /*float*/ b; + /** @field cast=(CGFloat) */ public double /*float*/ c; + /** @field cast=(CGFloat) */ public double /*float*/ d; + /** @field cast=(CGFloat) */ public double /*float*/ tx; + /** @field cast=(CGFloat) */ public double /*float*/ ty; - public static int sizeof = OS.CGAffineTransform_sizeof(); + public static final int sizeof = OS.CGAffineTransform_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java index 60cdf1d044..381738c3c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,15 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; public class CGPathElement { /** @field cast=(CGPathElementType) */ public int type; - /** @field cast=(CGPoint *) */ + /** @field cast=(CGPoint*) */ public long /*int*/ points; public static final int sizeof = OS.CGPathElement_sizeof(); -}
\ No newline at end of file +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java index 3a082ac0e9..1364ba524b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGPoint { + /** @field cast=(CGFloat) */ public double /*float*/ x; + /** @field cast=(CGFloat) */ public double /*float*/ y; public static final int sizeof = OS.CGPoint_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java index e7e50a8d43..09edc415d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class CGSize { + /** @field cast=(CGFloat) */ public double /*float*/ width; + /** @field cast=(CGFloat) */ public double /*float*/ height; public static final int sizeof = OS.CGSize_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java index 0aa9941ca3..0163c64bd3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,16 +9,16 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; public class CTParagraphStyleSetting { /** @field cast=(CTParagraphStyleSpecifier) */ public int spec; + /** @field cast=(size_t) */ public long /*int*/ valueSize; - /** @field cast=(void *) */ + /** @field cast=(void*) */ public long /*int*/ value; public static final int sizeof = OS.CTParagraphStyleSetting_sizeof(); -}
\ No newline at end of file +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras index a4f0c02ccb..c565af1c30 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras @@ -376,7 +376,7 @@ <field name="tx" swt_gen="true"></field> <field name="ty" swt_gen="true"></field> </struct> - <struct name="CGPathElement" swt_gen="true"> + <struct name="CGPathElement" swt_gen="true" swt_gen_memmove="true"> <field name="points" swt_gen="true"></field> <field name="type" swt_gen="true"></field> </struct> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras index 3a0d229a6b..8617aa1c03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras @@ -1227,19 +1227,17 @@ <field name="tX" swt_gen="true"></field> <field name="tY" swt_gen="true"></field> </struct> - <struct name="NSPoint" swt_gen="true"> + <struct name="NSPoint" swt_gen="true" swt_gen_memmove="true" swt_gen_tostring="true"> <field name="x" swt_gen="true"></field> <field name="y" swt_gen="true"></field> </struct> - <struct name="NSRange" swt_gen="true"> + <struct name="NSRange" swt_gen="true" swt_gen_memmove="true"> <field name="length" swt_gen="true"></field> <field name="location" swt_gen="true"></field> </struct> - <struct name="NSRect" swt_gen="true"> - <field name="origin" swt_gen="true"></field> - <field name="size" swt_gen="true"></field> + <struct name="NSRect" swt_gen_memmove="true"> </struct> - <struct name="NSSize" swt_gen="true"> + <struct name="NSSize" swt_gen="true" swt_gen_memmove="true" swt_gen_tostring="true"> <field name="height" swt_gen="true"></field> <field name="width" swt_gen="true"></field> </struct> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java index 0624e16c83..a31170102e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,22 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class NSAffineTransformStruct { - public double /*float*/ m11, m12, m21, m22; - public double /*float*/ tX, tY; + /** @field cast=(CGFloat) */ + public double /*float*/ m11; + /** @field cast=(CGFloat) */ + public double /*float*/ m12; + /** @field cast=(CGFloat) */ + public double /*float*/ m21; + /** @field cast=(CGFloat) */ + public double /*float*/ m22; + /** @field cast=(CGFloat) */ + public double /*float*/ tX; + /** @field cast=(CGFloat) */ + public double /*float*/ tY; public static final int sizeof = OS.NSAffineTransformStruct_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java index def75627e6..8b4c02e918 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,13 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; - public class NSPoint { + /** @field cast=(CGFloat) */ public double /*float*/ x; + /** @field cast=(CGFloat) */ public double /*float*/ y; public static final int sizeof = OS.NSPoint_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java index 84f8f1ac1a..f6acd7013e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.swt.internal.cocoa; public class NSRange { + /** @field cast=(NSUInteger) */ public long /*int*/ location; + /** @field cast=(NSUInteger) */ public long /*int*/ length; - public static int sizeof = OS.NSRange_sizeof(); + public static final int sizeof = OS.NSRange_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java index 4befead30f..044949eadd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,14 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.swt.internal.cocoa; - public class NSSize { + /** @field cast=(CGFloat) */ public double /*float*/ width; + /** @field cast=(CGFloat) */ public double /*float*/ height; public static final int sizeof = OS.NSSize_sizeof(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index 06e7414bf2..839feea199 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java @@ -4351,26 +4351,6 @@ public static final native int NSSize_sizeof(); * @param dest cast=(void *),flags=no_in critical * @param src cast=(void *),flags=critical */ -public static final native void memmove(long /*int*/ dest, CFRange src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CFRange dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGAffineTransform src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGAffineTransform dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ public static final native void memmove(long /*int*/ dest, CGPathElement src, long /*int*/ size); /** * @param dest cast=(void *),flags=no_in critical @@ -4381,56 +4361,6 @@ public static final native void memmove(CGPathElement dest, long /*int*/ src, lo * @param dest cast=(void *),flags=no_in critical * @param src cast=(void *),flags=critical */ -public static final native void memmove(long /*int*/ dest, CGPoint src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGPoint dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGRect src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGRect dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CGSize src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CGSize dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, CTParagraphStyleSetting src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(CTParagraphStyleSetting dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(long /*int*/ dest, NSAffineTransformStruct src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ -public static final native void memmove(NSAffineTransformStruct dest, long /*int*/ src, long /*int*/ size); -/** - * @param dest cast=(void *),flags=no_in critical - * @param src cast=(void *),flags=critical - */ public static final native void memmove(long /*int*/ dest, NSPoint src, long /*int*/ size); /** * @param dest cast=(void *),flags=no_in critical |