diff options
38 files changed, 1445 insertions, 539 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 127718c611..7791aa4a1c 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 @@ -572,7 +572,9 @@ void generateDynamicFunctionCall(JNIMethod method, JNIParameter[] params, JNITyp String name = method.getName(); if (name.startsWith("_")) name = name.substring(1); - output("\t\tLOAD_FUNCTION(fp, "); + output("\t\t"); + output(method.getDeclaringClass().getSimpleName()); + output("_LOAD_FUNCTION(fp, "); output(name); outputln(")"); outputln("\t\tif (fp) {"); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h index 5e7e33d8e5..5b0554c676 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h @@ -28,6 +28,8 @@ #include "nsIScriptGlobalObject.h" #endif /* nsIScriptContext_h__ */ +#define XPCOM_LOAD_FUNCTION LOAD_FUNCTION + #ifdef _WIN32 #define STDMETHODCALLTYPE __stdcall #define NO__1NS_1InitXPCOM2 diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp index 78e2a00dc1..f61d97b078 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp @@ -55,7 +55,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals) { #ifdef _WIN32 - LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals) + XPCOM_LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals) if (fp) { rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7); } @@ -99,7 +99,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1Free) { #ifdef _WIN32 - LOAD_FUNCTION(fp, NS_Free) + XPCOM_LOAD_FUNCTION(fp, NS_Free) if (fp) { ((jint (*)(void *))fp)((void *)arg0); rc = 1; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index e9ed5add0b..a7e45becc8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2009 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2011 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -1012,7 +1012,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size) cairo_pdf_surface_set_size((cairo_surface_t *)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_pdf_surface_set_size) + Cairo_LOAD_FUNCTION(fp, cairo_pdf_surface_set_size) if (fp) { ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2); } @@ -1030,7 +1030,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size) cairo_ps_surface_set_size((cairo_surface_t *)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_ps_surface_set_size) + Cairo_LOAD_FUNCTION(fp, cairo_ps_surface_set_size) if (fp) { ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2); } @@ -1490,7 +1490,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type) rc = (jint)cairo_surface_get_type((cairo_surface_t *)arg0); */ { - LOAD_FUNCTION(fp, cairo_surface_get_type) + Cairo_LOAD_FUNCTION(fp, cairo_surface_get_type) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(cairo_surface_t *))fp)((cairo_surface_t *)arg0); } @@ -1541,7 +1541,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution) cairo_surface_set_fallback_resolution(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution) + Cairo_LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h index 0500b3bca1..9b3cf2fc19 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.h @@ -29,4 +29,6 @@ #include "cairo_custom.h" +#define Cairo_LOAD_FUNCTION LOAD_FUNCTION + #endif /* INC_cairo_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c index b79006f6a8..0672bb797a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL Cocoa_NATIVE(HICocoaViewCreate) rc = (jint)HICocoaViewCreate(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, HICocoaViewCreate) + Cocoa_LOAD_FUNCTION(fp, HICocoaViewCreate) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h index a57d4b0a06..8811735312 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h @@ -20,6 +20,8 @@ #include "cocoa_custom.h" +#define Cocoa_LOAD_FUNCTION LOAD_FUNCTION + #ifndef __i386__ #define objc_msgSend_fpret objc_msgSend #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c index 0e88a7fd1e..c824f03483 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c @@ -993,7 +993,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementCreateWithDataBrowserAndItemInfo) rc = (jint)AXUIElementCreateWithDataBrowserAndItemInfo(arg0, lparg1); */ { - LOAD_FUNCTION(fp, AXUIElementCreateWithDataBrowserAndItemInfo) + OS_LOAD_FUNCTION(fp, AXUIElementCreateWithDataBrowserAndItemInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, lparg1); } @@ -1029,7 +1029,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementGetDataBrowserItemInfo) rc = (jint)AXUIElementGetDataBrowserItemInfo(arg0, arg1, arg2, lparg3); */ { - LOAD_FUNCTION(fp, AXUIElementGetDataBrowserItemInfo) + OS_LOAD_FUNCTION(fp, AXUIElementGetDataBrowserItemInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, arg1, arg2, lparg3); } @@ -1950,7 +1950,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGBitmapContextCreateImage) rc = (jint)CGBitmapContextCreateImage(arg0); */ { - LOAD_FUNCTION(fp, CGBitmapContextCreateImage) + OS_LOAD_FUNCTION(fp, CGBitmapContextCreateImage) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -2329,7 +2329,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode) CGContextSetBlendMode((CGContextRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, CGContextSetBlendMode) + OS_LOAD_FUNCTION(fp, CGContextSetBlendMode) if (fp) { ((void (CALLING_CONVENTION*)(CGContextRef, jint))fp)((CGContextRef)arg0, arg1); } @@ -2758,7 +2758,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage) rc = (jintLong)CGDisplayCreateImage((CGDirectDisplayID)arg0); */ { - LOAD_FUNCTION(fp, CGDisplayCreateImage) + OS_LOAD_FUNCTION(fp, CGDisplayCreateImage) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); } @@ -2922,7 +2922,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGImageCreateCopy) rc = (jint)CGImageCreateCopy(arg0); */ { - LOAD_FUNCTION(fp, CGImageCreateCopy) + OS_LOAD_FUNCTION(fp, CGImageCreateCopy) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -2944,7 +2944,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGImageCreateWithImageInRect) rc = (jint)CGImageCreateWithImageInRect(arg0, *lparg1); */ { - LOAD_FUNCTION(fp, CGImageCreateWithImageInRect) + OS_LOAD_FUNCTION(fp, CGImageCreateWithImageInRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, CGRect))fp)(arg0, *lparg1); } @@ -4384,7 +4384,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserChangeAttributes) rc = (jint)DataBrowserChangeAttributes(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, DataBrowserChangeAttributes) + OS_LOAD_FUNCTION(fp, DataBrowserChangeAttributes) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint))fp)(arg0, arg1, arg2); } @@ -4406,7 +4406,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetAttributes) rc = (jint)DataBrowserGetAttributes(arg0, lparg1); */ { - LOAD_FUNCTION(fp, DataBrowserGetAttributes) + OS_LOAD_FUNCTION(fp, DataBrowserGetAttributes) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint *))fp)(arg0, lparg1); } @@ -4432,7 +4432,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetMetric) rc = (jint)DataBrowserGetMetric(arg0, arg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, DataBrowserGetMetric) + OS_LOAD_FUNCTION(fp, DataBrowserGetMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean *, jfloat *))fp)(arg0, arg1, lparg2, lparg3); } @@ -4455,7 +4455,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserSetMetric) rc = (jint)DataBrowserSetMetric(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, DataBrowserSetMetric) + OS_LOAD_FUNCTION(fp, DataBrowserSetMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean, jfloat))fp)(arg0, arg1, arg2, arg3); } @@ -6594,7 +6594,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromIconFamilyPtr) rc = (jint)GetIconRefFromIconFamilyPtr(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, GetIconRefFromIconFamilyPtr) + OS_LOAD_FUNCTION(fp, GetIconRefFromIconFamilyPtr) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2); } @@ -7639,7 +7639,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HIComboBoxIsListVisible) rc = (jboolean)HIComboBoxIsListVisible((HIViewRef)arg0); */ { - LOAD_FUNCTION(fp, HIComboBoxIsListVisible) + OS_LOAD_FUNCTION(fp, HIComboBoxIsListVisible) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HIViewRef))fp)((HIViewRef)arg0); } @@ -7671,7 +7671,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIComboBoxSetListVisible) rc = (jint)HIComboBoxSetListVisible((HIViewRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, HIComboBoxSetListVisible) + OS_LOAD_FUNCTION(fp, HIComboBoxSetListVisible) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HIViewRef, jboolean))fp)((HIViewRef)arg0, arg1); } @@ -7705,7 +7705,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HICreateTransformedCGImage) rc = (jint)HICreateTransformedCGImage((CGImageRef)arg0, arg1, (CGImageRef *)lparg2); */ { - LOAD_FUNCTION(fp, HICreateTransformedCGImage) + OS_LOAD_FUNCTION(fp, HICreateTransformedCGImage) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CGImageRef, jint, CGImageRef *))fp)((CGImageRef)arg0, arg1, (CGImageRef *)lparg2); } @@ -7913,7 +7913,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeCreateWithQDRgn) rc = (jint)HIShapeCreateWithQDRgn(arg0); */ { - LOAD_FUNCTION(fp, HIShapeCreateWithQDRgn) + OS_LOAD_FUNCTION(fp, HIShapeCreateWithQDRgn) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -7933,7 +7933,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeReplacePathInCGContext) rc = (jint)HIShapeReplacePathInCGContext(arg0, arg1); */ { - LOAD_FUNCTION(fp, HIShapeReplacePathInCGContext) + OS_LOAD_FUNCTION(fp, HIShapeReplacePathInCGContext) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -8486,7 +8486,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetFill) rc = (jint)HIThemeSetFill((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3); */ { - LOAD_FUNCTION(fp, HIThemeSetFill) + OS_LOAD_FUNCTION(fp, HIThemeSetFill) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(ThemeBrush, void *, CGContextRef, HIThemeOrientation))fp)((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3); } @@ -8506,7 +8506,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetTextFill) rc = (jint)HIThemeSetTextFill(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, HIThemeSetTextFill) + OS_LOAD_FUNCTION(fp, HIThemeSetTextFill) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -9746,7 +9746,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LSCopyAllRoleHandlersForContentType) rc = (jint)LSCopyAllRoleHandlersForContentType((CFStringRef)arg0, arg1); */ { - LOAD_FUNCTION(fp, LSCopyAllRoleHandlersForContentType) + OS_LOAD_FUNCTION(fp, LSCopyAllRoleHandlersForContentType) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CFStringRef, jint))fp)((CFStringRef)arg0, arg1); } @@ -10139,7 +10139,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(NavDialogSetFilterTypeIdentifiers) rc = (jint)NavDialogSetFilterTypeIdentifiers(arg0, arg1); */ { - LOAD_FUNCTION(fp, NavDialogSetFilterTypeIdentifiers) + OS_LOAD_FUNCTION(fp, NavDialogSetFilterTypeIdentifiers) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -10643,7 +10643,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMPrinterGetOutputResolution) rc = (jint)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); } @@ -11059,7 +11059,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMShowPrintDialogWithOptions) rc = (jint)PMShowPrintDialogWithOptions(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, PMShowPrintDialogWithOptions) + OS_LOAD_FUNCTION(fp, PMShowPrintDialogWithOptions) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint, jboolean *))fp)(arg0, arg1, arg2, arg3, lparg4); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h index f7c7b1ce28..1704ce45b1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h @@ -22,6 +22,8 @@ #include "os_custom.h" +#define OS_LOAD_FUNCTION LOAD_FUNCTION + extern jint CPSEnableForegroundOperation(jint *, jint, jint, jint, jint); extern jint CPSSetProcessName(jint *, jbyte *); 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 7b91d4e421..f3fc72488d 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 @@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileReference) rc = (jint)ATSFontActivateFromFileReference((const FSRef *)lparg0, (ATSFontContext)arg1, (ATSFontFormat)arg2, (void *)arg3, (ATSOptionFlags)arg4, (ATSFontContainerRef *)lparg5); */ { - LOAD_FUNCTION(fp, ATSFontActivateFromFileReference) + OS_LOAD_FUNCTION(fp, ATSFontActivateFromFileReference) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const FSRef *, ATSFontContext, ATSFontFormat, void *, ATSOptionFlags, ATSFontContainerRef *))fp)((const FSRef *)lparg0, (ATSFontContext)arg1, (ATSFontFormat)arg2, (void *)arg3, (ATSOptionFlags)arg4, (ATSFontContainerRef *)lparg5); } @@ -52,7 +52,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(AcquireRootMenu) rc = (jintLong)AcquireRootMenu(); */ { - LOAD_FUNCTION(fp, AcquireRootMenu) + OS_LOAD_FUNCTION(fp, AcquireRootMenu) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -1314,7 +1314,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGContextCopyPath) rc = (jintLong)CGContextCopyPath(arg0); */ { - LOAD_FUNCTION(fp, CGContextCopyPath) + OS_LOAD_FUNCTION(fp, CGContextCopyPath) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -1337,7 +1337,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextCopyWindowContentsToRect) CGContextCopyWindowContentsToRect(arg0, *lparg1, arg2, arg3, *lparg4); */ { - LOAD_FUNCTION(fp, CGContextCopyWindowContentsToRect) + OS_LOAD_FUNCTION(fp, CGContextCopyWindowContentsToRect) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, CGRect, jintLong, jintLong, CGRect))fp)(arg0, *lparg1, arg2, arg3, *lparg4); } @@ -1669,7 +1669,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage) rc = (jintLong)CGDisplayCreateImage((CGDirectDisplayID)arg0); */ { - LOAD_FUNCTION(fp, CGDisplayCreateImage) + OS_LOAD_FUNCTION(fp, CGDisplayCreateImage) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0); } @@ -2207,7 +2207,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CancelMenuTracking) rc = (jint)CancelMenuTracking(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, CancelMenuTracking) + OS_LOAD_FUNCTION(fp, CancelMenuTracking) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jboolean, jint))fp)(arg0, arg1, arg2); } @@ -2226,7 +2226,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CloseRgn) CloseRgn(arg0); */ { - LOAD_FUNCTION(fp, CloseRgn) + OS_LOAD_FUNCTION(fp, CloseRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2244,7 +2244,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CopyRgn) CopyRgn(arg0, arg1); */ { - LOAD_FUNCTION(fp, CopyRgn) + OS_LOAD_FUNCTION(fp, CopyRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2272,7 +2272,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DeleteMenuItem) DeleteMenuItem((MenuRef)arg0, (short)arg1); */ { - LOAD_FUNCTION(fp, DeleteMenuItem) + OS_LOAD_FUNCTION(fp, DeleteMenuItem) if (fp) { ((void (CALLING_CONVENTION*)(MenuRef, short))fp)((MenuRef)arg0, (short)arg1); } @@ -2290,7 +2290,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DiffRgn) DiffRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, DiffRgn) + OS_LOAD_FUNCTION(fp, DiffRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -2308,7 +2308,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn) DisposeRgn(arg0); */ { - LOAD_FUNCTION(fp, DisposeRgn) + OS_LOAD_FUNCTION(fp, DisposeRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2327,7 +2327,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn) rc = (jboolean)EmptyRgn(arg0); */ { - LOAD_FUNCTION(fp, EmptyRgn) + OS_LOAD_FUNCTION(fp, EmptyRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2351,7 +2351,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(FSPathMakeRef) rc = (jint)FSPathMakeRef((const UInt8 *)arg0, (FSRef *)lparg1, (Boolean *)lparg2); */ { - LOAD_FUNCTION(fp, FSPathMakeRef) + OS_LOAD_FUNCTION(fp, FSPathMakeRef) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const UInt8 *, FSRef *, Boolean *))fp)((const UInt8 *)arg0, (FSRef *)lparg1, (Boolean *)lparg2); } @@ -2390,7 +2390,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentEventButtonState) rc = (jint)GetCurrentEventButtonState(); */ { - LOAD_FUNCTION(fp, GetCurrentEventButtonState) + OS_LOAD_FUNCTION(fp, GetCurrentEventButtonState) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -2426,7 +2426,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDblTime) rc = (jint)GetDblTime(); */ { - LOAD_FUNCTION(fp, GetDblTime) + OS_LOAD_FUNCTION(fp, GetDblTime) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -2448,7 +2448,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromTypeInfo) rc = (jint)GetIconRefFromTypeInfo((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (IconServicesUsageFlags)arg4, (IconRef *)lparg5); */ { - LOAD_FUNCTION(fp, GetIconRefFromTypeInfo) + OS_LOAD_FUNCTION(fp, GetIconRefFromTypeInfo) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(OSType, OSType, CFStringRef, CFStringRef, IconServicesUsageFlags, IconRef *))fp)((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (IconServicesUsageFlags)arg4, (IconRef *)lparg5); } @@ -2474,7 +2474,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIndMenuItemWithCommandID) rc = (jint)GetIndMenuItemWithCommandID((MenuRef)arg0, (MenuCommand)arg1, (UInt32)arg2, (MenuRef *)lparg3, (MenuItemIndex *)lparg4); */ { - LOAD_FUNCTION(fp, GetIndMenuItemWithCommandID) + OS_LOAD_FUNCTION(fp, GetIndMenuItemWithCommandID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(MenuRef, MenuCommand, UInt32, MenuRef *, MenuItemIndex *))fp)((MenuRef)arg0, (MenuCommand)arg1, (UInt32)arg2, (MenuRef *)lparg3, (MenuItemIndex *)lparg4); } @@ -2498,7 +2498,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds) GetRegionBounds(arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetRegionBounds) + OS_LOAD_FUNCTION(fp, GetRegionBounds) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1); } @@ -2523,7 +2523,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemUIMode) rc = (jint)GetSystemUIMode((UInt32*)lparg0, (UInt32*)lparg1); */ { - LOAD_FUNCTION(fp, GetSystemUIMode) + OS_LOAD_FUNCTION(fp, GetSystemUIMode) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(UInt32*, UInt32*))fp)((UInt32*)lparg0, (UInt32*)lparg1); } @@ -2547,7 +2547,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GetThemeMetric) GetThemeMetric(arg0, (SInt32 *)lparg1); */ { - LOAD_FUNCTION(fp, GetThemeMetric) + OS_LOAD_FUNCTION(fp, GetThemeMetric) if (fp) { ((void (CALLING_CONVENTION*)(jint, SInt32 *))fp)(arg0, (SInt32 *)lparg1); } @@ -2570,7 +2570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeDrawFocusRect) rc = (jint)HIThemeDrawFocusRect(lparg0, arg1, (CGContextRef)arg2, arg3); */ { - LOAD_FUNCTION(fp, HIThemeDrawFocusRect) + OS_LOAD_FUNCTION(fp, HIThemeDrawFocusRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(CGRect *, jboolean, CGContextRef, jint))fp)(lparg0, arg1, (CGContextRef)arg2, arg3); } @@ -2592,7 +2592,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWindowGetCGWindowID) rc = (jint)HIWindowGetCGWindowID((WindowRef)arg0); */ { - LOAD_FUNCTION(fp, HIWindowGetCGWindowID) + OS_LOAD_FUNCTION(fp, HIWindowGetCGWindowID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(WindowRef))fp)((WindowRef)arg0); } @@ -2654,7 +2654,7 @@ JNIEXPORT jbyte JNICALL OS_NATIVE(LMGetKbdType) rc = (jbyte)LMGetKbdType(); */ { - LOAD_FUNCTION(fp, LMGetKbdType) + OS_LOAD_FUNCTION(fp, LMGetKbdType) if (fp) { rc = (jbyte)((jbyte (CALLING_CONVENTION*)())fp)(); } @@ -2692,7 +2692,7 @@ JNIEXPORT void JNICALL OS_NATIVE(LineTo) LineTo(arg0, arg1); */ { - LOAD_FUNCTION(fp, LineTo) + OS_LOAD_FUNCTION(fp, LineTo) if (fp) { ((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1); } @@ -2710,7 +2710,7 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveTo) MoveTo(arg0, arg1); */ { - LOAD_FUNCTION(fp, MoveTo) + OS_LOAD_FUNCTION(fp, MoveTo) if (fp) { ((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1); } @@ -5419,7 +5419,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NewRgn) rc = (jintLong)NewRgn(); */ { - LOAD_FUNCTION(fp, NewRgn) + OS_LOAD_FUNCTION(fp, NewRgn) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5438,7 +5438,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OffsetRgn) OffsetRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, OffsetRgn) + OS_LOAD_FUNCTION(fp, OffsetRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -5456,7 +5456,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OpenRgn) OpenRgn(); */ { - LOAD_FUNCTION(fp, OpenRgn) + OS_LOAD_FUNCTION(fp, OpenRgn) if (fp) { ((void (CALLING_CONVENTION*)())fp)(); } @@ -5477,7 +5477,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMGetDuplex) rc = (jintLong)PMGetDuplex((PMPrintSettings)arg0, (PMDuplexMode *)lparg1); */ { - LOAD_FUNCTION(fp, PMGetDuplex) + OS_LOAD_FUNCTION(fp, PMGetDuplex) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode *))fp)((PMPrintSettings)arg0, (PMDuplexMode *)lparg1); } @@ -5501,7 +5501,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetIndexedPrinterResolution) rc = (jintLong)PMPrinterGetIndexedPrinterResolution((PMPrinter)arg0, arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetIndexedPrinterResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetIndexedPrinterResolution) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint, PMResolution *))fp)((PMPrinter)arg0, arg1, (PMResolution *)lparg2); } @@ -5525,7 +5525,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetOutputResolution) rc = (jintLong)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); */ { - LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) + OS_LOAD_FUNCTION(fp, PMPrinterGetOutputResolution) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2); } @@ -5549,7 +5549,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetPrinterResolutionCount) rc = (jintLong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, lparg1); */ { - LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount) + OS_LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint *))fp)((PMPrinter)arg0, lparg1); } @@ -5573,7 +5573,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetCurrentPrinter) rc = (jintLong)PMSessionGetCurrentPrinter((PMPrintSession)arg0, (PMPrinter *)lparg1); */ { - LOAD_FUNCTION(fp, PMSessionGetCurrentPrinter) + OS_LOAD_FUNCTION(fp, PMSessionGetCurrentPrinter) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrinter *))fp)((PMPrintSession)arg0, (PMPrinter *)lparg1); } @@ -5597,7 +5597,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetDestinationType) rc = (jintLong)PMSessionGetDestinationType((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2); */ { - LOAD_FUNCTION(fp, PMSessionGetDestinationType) + OS_LOAD_FUNCTION(fp, PMSessionGetDestinationType) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrintSettings, jshort *))fp)((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2); } @@ -5619,7 +5619,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSetDuplex) rc = (jintLong)PMSetDuplex((PMPrintSettings)arg0, (PMDuplexMode)arg1); */ { - LOAD_FUNCTION(fp, PMSetDuplex) + OS_LOAD_FUNCTION(fp, PMSetDuplex) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode))fp)((PMPrintSettings)arg0, (PMDuplexMode)arg1); } @@ -5641,7 +5641,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn) rc = (jboolean)PtInRgn(*(Point *)lparg0, arg1); */ { - LOAD_FUNCTION(fp, PtInRgn) + OS_LOAD_FUNCTION(fp, PtInRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(Point, jintLong))fp)(*(Point *)lparg0, arg1); } @@ -5663,7 +5663,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects) rc = (jint)QDRegionToRects(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, QDRegionToRects) + OS_LOAD_FUNCTION(fp, QDRegionToRects) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); } @@ -5685,7 +5685,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn) rc = (jboolean)RectInRgn(lparg0, arg1); */ { - LOAD_FUNCTION(fp, RectInRgn) + OS_LOAD_FUNCTION(fp, RectInRgn) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jintLong))fp)(lparg0, arg1); } @@ -5708,7 +5708,7 @@ JNIEXPORT void JNICALL OS_NATIVE(RectRgn) RectRgn(arg0, lparg1); */ { - LOAD_FUNCTION(fp, RectRgn) + OS_LOAD_FUNCTION(fp, RectRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1); } @@ -5776,7 +5776,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SectRgn) SectRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, SectRgn) + OS_LOAD_FUNCTION(fp, SectRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -5812,7 +5812,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SetRect) SetRect(lparg0, arg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, SetRect) + OS_LOAD_FUNCTION(fp, SetRect) if (fp) { ((void (CALLING_CONVENTION*)(jshort *, jshort, jshort, jshort, jshort))fp)(lparg0, arg1, arg2, arg3, arg4); } @@ -5833,7 +5833,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetSystemUIMode) rc = (jint)SetSystemUIMode((UInt32)arg0, (UInt32)arg1); */ { - LOAD_FUNCTION(fp, SetSystemUIMode) + OS_LOAD_FUNCTION(fp, SetSystemUIMode) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(UInt32, UInt32))fp)((UInt32)arg0, (UInt32)arg1); } @@ -5853,7 +5853,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetThemeCursor) rc = (jint)SetThemeCursor(arg0); */ { - LOAD_FUNCTION(fp, SetThemeCursor) + OS_LOAD_FUNCTION(fp, SetThemeCursor) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -5873,7 +5873,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISCopyCurrentKeyboardInputSource) rc = (jintLong)TISCopyCurrentKeyboardInputSource(); */ { - LOAD_FUNCTION(fp, TISCopyCurrentKeyboardInputSource) + OS_LOAD_FUNCTION(fp, TISCopyCurrentKeyboardInputSource) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5893,7 +5893,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISGetInputSourceProperty) rc = (jintLong)TISGetInputSourceProperty(arg0, arg1); */ { - LOAD_FUNCTION(fp, TISGetInputSourceProperty) + OS_LOAD_FUNCTION(fp, TISGetInputSourceProperty) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -5935,7 +5935,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UCKeyTranslate) rc = (jint)UCKeyTranslate((const UCKeyboardLayout *)arg0, (UInt16)arg1, (UInt16)arg2, (UInt32)arg3, (UInt32)arg4, (OptionBits)arg5, (UInt32 *)lparg6, (UniCharCount)arg7, (UniCharCount *)lparg8, (UniChar *)lparg9); */ { - LOAD_FUNCTION(fp, UCKeyTranslate) + OS_LOAD_FUNCTION(fp, UCKeyTranslate) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const UCKeyboardLayout *, UInt16, UInt16, UInt32, UInt32, OptionBits, UInt32 *, UniCharCount, UniCharCount *, UniChar *))fp)((const UCKeyboardLayout *)arg0, (UInt16)arg1, (UInt16)arg2, (UInt32)arg3, (UInt32)arg4, (OptionBits)arg5, (UInt32 *)lparg6, (UniCharCount)arg7, (UniCharCount *)lparg8, (UniChar *)lparg9); } @@ -5970,7 +5970,7 @@ JNIEXPORT void JNICALL OS_NATIVE(UnionRgn) UnionRgn(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, UnionRgn) + OS_LOAD_FUNCTION(fp, UnionRgn) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -6133,7 +6133,7 @@ JNIEXPORT void JNICALL OS_NATIVE(instrumentObjcMessageSends) instrumentObjcMessageSends(arg0); */ { - LOAD_FUNCTION(fp, instrumentObjcMessageSends) + OS_LOAD_FUNCTION(fp, instrumentObjcMessageSends) if (fp) { ((void (CALLING_CONVENTION*)(jboolean))fp)(arg0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h index eab0260318..78f7a93d9e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h @@ -25,6 +25,8 @@ extern jint CPSSetProcessName(void *, jintLong); +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #define objc_msgSend_bool objc_msgSend #define objc_msgSendSuper_bool objc_msgSendSuper diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c index c43c4c1e68..08fac00104 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c @@ -51,7 +51,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindow) rc = (jintLong)FindWindow(arg0, arg1, (WindowRef *)lparg2); */ { - LOAD_FUNCTION(fp, FindWindow) + OS_LOAD_FUNCTION(fp, FindWindow) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh index c19f52efcc..5d69ef1c4e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh @@ -131,6 +131,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${XULRUNNER_LIBS}" = "" ]; then export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "linux.x86_64") if [ "${CC}" = "" ]; then @@ -160,6 +163,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${XULRUNNER_LIBS}" = "" ]; then export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "linux.ppc") if [ "${CC}" = "" ]; then @@ -189,6 +195,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "linux.ppc64") if [ "${CC}" = "" ]; then @@ -218,6 +227,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "solaris.x86") if [ "${CC}" = "" ]; then @@ -331,6 +343,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "linux.s390x") if [ "${CC}" = "" ]; then @@ -360,6 +375,9 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/local/cairo64/lib/pkgconfig" fi + if [ "${WEBKIT_INCLUDES}" = "" ]; then + export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" + fi ;; "aix.ppc") if [ "${CC}" = "" ]; then diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak index 8c27bffab0..9715d39c8b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -91,8 +91,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -DNO_nsDynamicFunctionLoad XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 -WEBKITCFLAGS = `pkg-config --cflags webkit-1.0` -WEBKITLIBS = `pkg-config --libs webkit-1.0` +WEBKITCFLAGS = ${WEBKIT_INCLUDES} SWT_OBJECTS = swt.o c.o c_stats.o callback.o CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o @@ -279,7 +278,7 @@ xpcominit_stats.o: xpcominit_stats.cpp make_webkit: $(WEBKIT_LIB) $(WEBKIT_LIB): $(WEBKIT_OBJECTS) - $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) + $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) webkit.o: webkitgtk.c $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 445c429c0e..be5ce3da15 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -1299,7 +1299,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile) rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1); */ { - LOAD_FUNCTION(fp, FcConfigAppFontAddFile) + OS_LOAD_FUNCTION(fp, FcConfigAppFontAddFile) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -1811,6 +1811,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME) } #endif +#ifndef NO__1G_1TYPE_1CHECK_1INSTANCE_1TYPE +JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE) + (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +{ + jboolean rc = 0; + OS_NATIVE_ENTER(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC); + rc = (jboolean)G_TYPE_CHECK_INSTANCE_TYPE(arg0, arg1); + OS_NATIVE_EXIT(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC); + return rc; +} +#endif + #ifndef NO__1G_1TYPE_1STRING JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING) (JNIEnv *env, jclass that) @@ -2106,7 +2118,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite) XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); */ { - LOAD_FUNCTION(fp, XRenderComposite) + OS_LOAD_FUNCTION(fp, XRenderComposite) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); } @@ -2127,7 +2139,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture) rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, XRenderCreatePicture) + OS_LOAD_FUNCTION(fp, XRenderCreatePicture) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -2148,7 +2160,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat) rc = (jintLong)XRenderFindStandardFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindStandardFormat) + OS_LOAD_FUNCTION(fp, XRenderFindStandardFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -2168,7 +2180,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat) rc = (jintLong)XRenderFindVisualFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindVisualFormat) + OS_LOAD_FUNCTION(fp, XRenderFindVisualFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2187,7 +2199,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture) XRenderFreePicture(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFreePicture) + OS_LOAD_FUNCTION(fp, XRenderFreePicture) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -2210,7 +2222,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension) rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryExtension) + OS_LOAD_FUNCTION(fp, XRenderQueryExtension) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -2237,7 +2249,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion) rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryVersion) + OS_LOAD_FUNCTION(fp, XRenderQueryVersion) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -2261,7 +2273,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles) XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5); } @@ -2283,7 +2295,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform) XRenderSetPictureTransform(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureTransform) + OS_LOAD_FUNCTION(fp, XRenderSetPictureTransform) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2); } @@ -2446,7 +2458,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship) rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); */ { - LOAD_FUNCTION(fp, atk_object_add_relationship) + OS_LOAD_FUNCTION(fp, atk_object_add_relationship) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); } @@ -2466,7 +2478,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1remove_1relationship) rc = (jboolean)atk_object_remove_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); */ { - LOAD_FUNCTION(fp, atk_object_remove_relationship) + OS_LOAD_FUNCTION(fp, atk_object_remove_relationship) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2); } @@ -2546,7 +2558,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline) rc = (jintLong)g_app_info_create_from_commandline(lparg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_app_info_create_from_commandline) + OS_LOAD_FUNCTION(fp, g_app_info_create_from_commandline) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jintLong, jintLong))fp)(lparg0, lparg1, arg2, arg3); } @@ -2569,7 +2581,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all) rc = (jintLong)g_app_info_get_all(); */ { - LOAD_FUNCTION(fp, g_app_info_get_all) + OS_LOAD_FUNCTION(fp, g_app_info_get_all) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -2591,7 +2603,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type) rc = (jintLong)g_app_info_get_default_for_type(lparg0, arg1); */ { - LOAD_FUNCTION(fp, g_app_info_get_default_for_type) + OS_LOAD_FUNCTION(fp, g_app_info_get_default_for_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jboolean))fp)(lparg0, arg1); } @@ -2613,7 +2625,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable) rc = (jintLong)g_app_info_get_executable(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_executable) + OS_LOAD_FUNCTION(fp, g_app_info_get_executable) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2633,7 +2645,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon) rc = (jintLong)g_app_info_get_icon(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_icon) + OS_LOAD_FUNCTION(fp, g_app_info_get_icon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2653,7 +2665,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1id) rc = (jintLong)g_app_info_get_id(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_id) + OS_LOAD_FUNCTION(fp, g_app_info_get_id) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2673,7 +2685,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) rc = (jintLong)g_app_info_get_name(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_get_name) + OS_LOAD_FUNCTION(fp, g_app_info_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2693,7 +2705,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch) rc = (jboolean)g_app_info_launch(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_app_info_launch) + OS_LOAD_FUNCTION(fp, g_app_info_launch) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); } @@ -2713,7 +2725,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri) rc = (jboolean)g_app_info_launch_default_for_uri(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, g_app_info_launch_default_for_uri) + OS_LOAD_FUNCTION(fp, g_app_info_launch_default_for_uri) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -2733,7 +2745,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show) rc = (jboolean)g_app_info_should_show(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_should_show) + OS_LOAD_FUNCTION(fp, g_app_info_should_show) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2753,7 +2765,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris) rc = (jboolean)g_app_info_supports_uris(arg0); */ { - LOAD_FUNCTION(fp, g_app_info_supports_uris) + OS_LOAD_FUNCTION(fp, g_app_info_supports_uris) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2809,7 +2821,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals) rc = (jboolean)g_content_type_equals(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_content_type_equals) + OS_LOAD_FUNCTION(fp, g_content_type_equals) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -2833,7 +2845,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1type_1get_1mime_1type) rc = (jintLong)g_content_type_get_mime_type(lparg0); */ { - LOAD_FUNCTION(fp, g_content_type_get_mime_type) + OS_LOAD_FUNCTION(fp, g_content_type_get_mime_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -2857,7 +2869,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a) rc = (jboolean)g_content_type_is_a(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_content_type_is_a) + OS_LOAD_FUNCTION(fp, g_content_type_is_a) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -2879,7 +2891,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1types_1get_1registered) rc = (jintLong)g_content_types_get_registered(); */ { - LOAD_FUNCTION(fp, g_content_types_get_registered) + OS_LOAD_FUNCTION(fp, g_content_types_get_registered) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -2899,7 +2911,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1data_1input_1stream_1new) rc = (jintLong)g_data_input_stream_new(arg0); */ { - LOAD_FUNCTION(fp, g_data_input_stream_new) + OS_LOAD_FUNCTION(fp, g_data_input_stream_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2921,7 +2933,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1data_1input_1stream_1read_1line) rc = (jintLong)g_data_input_stream_read_line(arg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, g_data_input_stream_read_line) + OS_LOAD_FUNCTION(fp, g_data_input_stream_read_line) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint *, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3); } @@ -2945,7 +2957,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1desktop_1app_1info_1new_1from_1filenam rc = (jintLong)g_desktop_app_info_new_from_filename(lparg0); */ { - LOAD_FUNCTION(fp, g_desktop_app_info_new_from_filename) + OS_LOAD_FUNCTION(fp, g_desktop_app_info_new_from_filename) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -2967,7 +2979,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1path) rc = (jintLong)g_file_get_path(arg0); */ { - LOAD_FUNCTION(fp, g_file_get_path) + OS_LOAD_FUNCTION(fp, g_file_get_path) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -2987,7 +2999,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri) rc = (jintLong)g_file_get_uri(arg0); */ { - LOAD_FUNCTION(fp, g_file_get_uri) + OS_LOAD_FUNCTION(fp, g_file_get_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3007,7 +3019,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1icon_1get_1file) rc = (jintLong)g_file_icon_get_file(arg0); */ { - LOAD_FUNCTION(fp, g_file_icon_get_file) + OS_LOAD_FUNCTION(fp, g_file_icon_get_file) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3027,7 +3039,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type) rc = (jintLong)g_file_info_get_content_type(arg0); */ { - LOAD_FUNCTION(fp, g_file_info_get_content_type) + OS_LOAD_FUNCTION(fp, g_file_info_get_content_type) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -3048,7 +3060,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1file_1info_1get_1modification_1time) g_file_info_get_modification_time(arg0, lparg1); */ { - LOAD_FUNCTION(fp, g_file_info_get_modification_time) + OS_LOAD_FUNCTION(fp, g_file_info_get_modification_time) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong *))fp)(arg0, lparg1); } @@ -3071,7 +3083,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) rc = (jintLong)g_file_new_for_path(lparg0); */ { - LOAD_FUNCTION(fp, g_file_new_for_path) + OS_LOAD_FUNCTION(fp, g_file_new_for_path) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -3095,7 +3107,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri) rc = (jintLong)g_file_new_for_uri(lparg0); */ { - LOAD_FUNCTION(fp, g_file_new_for_uri) + OS_LOAD_FUNCTION(fp, g_file_new_for_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -3119,7 +3131,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info) rc = (jintLong)g_file_query_info(arg0, lparg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, g_file_query_info) + OS_LOAD_FUNCTION(fp, g_file_query_info) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); } @@ -3141,7 +3153,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1read) rc = (jintLong)g_file_read(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, g_file_read) + OS_LOAD_FUNCTION(fp, g_file_read) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -3163,7 +3175,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1file_1test) rc = (jboolean)g_file_test(lparg0, arg1); */ { - LOAD_FUNCTION(fp, g_file_test) + OS_LOAD_FUNCTION(fp, g_file_test) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jbyte *, jint))fp)(lparg0, arg1); } @@ -3278,7 +3290,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string) rc = (jintLong)g_icon_new_for_string(lparg0, lparg1); */ { - LOAD_FUNCTION(fp, g_icon_new_for_string) + OS_LOAD_FUNCTION(fp, g_icon_new_for_string) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong *))fp)(lparg0, lparg1); } @@ -3301,7 +3313,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string) rc = (jintLong)g_icon_to_string(arg0); */ { - LOAD_FUNCTION(fp, g_icon_to_string) + OS_LOAD_FUNCTION(fp, g_icon_to_string) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -4934,7 +4946,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1create) rc = (jintLong)gdk_cairo_create(arg0); */ { - LOAD_FUNCTION(fp, gdk_cairo_create) + OS_LOAD_FUNCTION(fp, gdk_cairo_create) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -4953,7 +4965,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region) gdk_cairo_region(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_region) + OS_LOAD_FUNCTION(fp, gdk_cairo_region) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -4971,7 +4983,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1reset_1clip) gdk_cairo_reset_clip(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_reset_clip) + OS_LOAD_FUNCTION(fp, gdk_cairo_reset_clip) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -4991,7 +5003,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color) gdk_cairo_set_source_color(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gdk_cairo_set_source_color) + OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_color) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1); } @@ -5105,7 +5117,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf) rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf) + OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -5142,7 +5154,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default) rc = (jintLong)gdk_display_get_default(); */ { - LOAD_FUNCTION(fp, gdk_display_get_default) + OS_LOAD_FUNCTION(fp, gdk_display_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -5162,7 +5174,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color) rc = (jboolean)gdk_display_supports_cursor_color(arg0); */ { - LOAD_FUNCTION(fp, gdk_display_supports_cursor_color) + OS_LOAD_FUNCTION(fp, gdk_display_supports_cursor_color) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -5284,7 +5296,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf) gdk_draw_pixbuf((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11); */ { - LOAD_FUNCTION(fp, gdk_draw_pixbuf) + OS_LOAD_FUNCTION(fp, gdk_draw_pixbuf) if (fp) { ((void (CALLING_CONVENTION*)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint))fp)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11); } @@ -6173,7 +6185,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv) rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6); */ { - LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv) + OS_LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, jintLong *, jintLong *, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6); } @@ -6491,7 +6503,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default) rc = (jintLong)gdk_screen_get_default(); */ { - LOAD_FUNCTION(fp, gdk_screen_get_default) + OS_LOAD_FUNCTION(fp, gdk_screen_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -6511,7 +6523,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point) rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2); } @@ -6531,7 +6543,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window) rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1); } @@ -6552,7 +6564,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry) gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry) + OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry) if (fp) { ((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2); } @@ -6573,7 +6585,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors) rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_screen_get_n_monitors) + OS_LOAD_FUNCTION(fp, gdk_screen_get_n_monitors) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -6593,7 +6605,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number) rc = (jint)gdk_screen_get_number((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_screen_get_number) + OS_LOAD_FUNCTION(fp, gdk_screen_get_number) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -7144,7 +7156,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack) gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2); */ { - LOAD_FUNCTION(fp, gdk_window_restack) + OS_LOAD_FUNCTION(fp, gdk_window_restack) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2); } @@ -7172,7 +7184,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus) gdk_window_set_accept_focus((GdkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gdk_window_set_accept_focus) + OS_LOAD_FUNCTION(fp, gdk_window_set_accept_focus) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1); } @@ -7260,7 +7272,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above) gdk_window_set_keep_above((GdkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gdk_window_set_keep_above) + OS_LOAD_FUNCTION(fp, gdk_window_set_keep_above) if (fp) { ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1); } @@ -7387,7 +7399,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1n rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0); */ { - LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name) + OS_LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); } @@ -7407,7 +7419,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual) rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1); */ { - LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual) + OS_LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1); } @@ -7651,7 +7663,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1clear_1marks) gtk_calendar_clear_marks((GtkCalendar *)arg0); */ { - LOAD_FUNCTION(fp, gtk_calendar_clear_marks) + OS_LOAD_FUNCTION(fp, gtk_calendar_clear_marks) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *))fp)((GtkCalendar *)arg0); } @@ -7669,7 +7681,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options) gtk_calendar_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_display_options) + OS_LOAD_FUNCTION(fp, gtk_calendar_display_options) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); } @@ -7693,7 +7705,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date) gtk_calendar_get_date((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3); */ { - LOAD_FUNCTION(fp, gtk_calendar_get_date) + OS_LOAD_FUNCTION(fp, gtk_calendar_get_date) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint *, guint *, guint *))fp)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3); } @@ -7715,7 +7727,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1mark_1day) gtk_calendar_mark_day((GtkCalendar *)arg0, (guint)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_mark_day) + OS_LOAD_FUNCTION(fp, gtk_calendar_mark_day) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1); } @@ -7734,7 +7746,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1calendar_1new) rc = (jintLong)gtk_calendar_new(); */ { - LOAD_FUNCTION(fp, gtk_calendar_new) + OS_LOAD_FUNCTION(fp, gtk_calendar_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -7753,7 +7765,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day) gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_select_day) + OS_LOAD_FUNCTION(fp, gtk_calendar_select_day) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1); } @@ -7772,7 +7784,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month) rc = (jboolean)gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2); */ { - LOAD_FUNCTION(fp, gtk_calendar_select_month) + OS_LOAD_FUNCTION(fp, gtk_calendar_select_month) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkCalendar *, guint, guint))fp)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2); } @@ -7791,7 +7803,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options) gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); */ { - LOAD_FUNCTION(fp, gtk_calendar_set_display_options) + OS_LOAD_FUNCTION(fp, gtk_calendar_set_display_options) if (fp) { ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1); } @@ -7809,7 +7821,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear) gtk_cell_layout_clear(arg0); */ { - LOAD_FUNCTION(fp, gtk_cell_layout_clear) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_clear) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -7827,7 +7839,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start) gtk_cell_layout_pack_start(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_cell_layout_pack_start) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_pack_start) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jboolean))fp)(arg0, arg1, arg2); } @@ -7991,7 +8003,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1can_1store) gtk_clipboard_set_can_store((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gtk_clipboard_set_can_store) + OS_LOAD_FUNCTION(fp, gtk_clipboard_set_can_store) if (fp) { ((void (CALLING_CONVENTION*)(GtkClipboard *, const GtkTargetEntry *, gint))fp)((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2); } @@ -8033,7 +8045,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1store) gtk_clipboard_store((GtkClipboard *)arg0); */ { - LOAD_FUNCTION(fp, gtk_clipboard_store) + OS_LOAD_FUNCTION(fp, gtk_clipboard_store) if (fp) { ((void (CALLING_CONVENTION*)(GtkClipboard *))fp)((GtkClipboard *)arg0); } @@ -8117,7 +8129,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text) rc = (jintLong)gtk_combo_box_entry_new_text(); */ { - LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -8137,7 +8149,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active) rc = (jint)gtk_combo_box_get_active(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_get_active) + OS_LOAD_FUNCTION(fp, gtk_combo_box_get_active) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8157,7 +8169,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model) rc = (jintLong)gtk_combo_box_get_model(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_get_model) + OS_LOAD_FUNCTION(fp, gtk_combo_box_get_model) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8178,7 +8190,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text) gtk_combo_box_insert_text(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gtk_combo_box_insert_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_insert_text) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2); } @@ -8199,7 +8211,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text) rc = (jintLong)gtk_combo_box_new_text(); */ { - LOAD_FUNCTION(fp, gtk_combo_box_new_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_new_text) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -8218,7 +8230,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown) gtk_combo_box_popdown(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_popdown) + OS_LOAD_FUNCTION(fp, gtk_combo_box_popdown) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8236,7 +8248,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup) gtk_combo_box_popup(arg0); */ { - LOAD_FUNCTION(fp, gtk_combo_box_popup) + OS_LOAD_FUNCTION(fp, gtk_combo_box_popup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8254,7 +8266,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text) gtk_combo_box_remove_text(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_remove_text) + OS_LOAD_FUNCTION(fp, gtk_combo_box_remove_text) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8272,7 +8284,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active) gtk_combo_box_set_active(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_set_active) + OS_LOAD_FUNCTION(fp, gtk_combo_box_set_active) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8290,7 +8302,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click) gtk_combo_box_set_focus_on_click(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click) + OS_LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -8703,7 +8715,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1inner_1border) rc = (jintLong)gtk_entry_get_inner_border(arg0); */ { - LOAD_FUNCTION(fp, gtk_entry_get_inner_border) + OS_LOAD_FUNCTION(fp, gtk_entry_get_inner_border) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -8821,7 +8833,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment) gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1); */ { - LOAD_FUNCTION(fp, gtk_entry_set_alignment) + OS_LOAD_FUNCTION(fp, gtk_entry_set_alignment) if (fp) { ((void (CALLING_CONVENTION*)(GtkEntry *, gfloat))fp)((GtkEntry *)arg0, (gfloat)arg1); } @@ -8851,7 +8863,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1from_1stock) gtk_entry_set_icon_from_stock(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, gtk_entry_set_icon_from_stock) + OS_LOAD_FUNCTION(fp, gtk_entry_set_icon_from_stock) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2); } @@ -8871,7 +8883,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1sensitive) gtk_entry_set_icon_sensitive(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_entry_set_icon_sensitive) + OS_LOAD_FUNCTION(fp, gtk_entry_set_icon_sensitive) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jboolean))fp)(arg0, arg1, arg2); } @@ -8934,7 +8946,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index) rc = (jint)gtk_entry_text_index_to_layout_index(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index) + OS_LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -8953,7 +8965,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers) gtk_enumerate_printers(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3); */ { - LOAD_FUNCTION(fp, gtk_enumerate_printers) + OS_LOAD_FUNCTION(fp, gtk_enumerate_printers) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gpointer, GDestroyNotify, gboolean))fp)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3); } @@ -8984,7 +8996,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded) rc = (jboolean)gtk_expander_get_expanded(arg0); */ { - LOAD_FUNCTION(fp, gtk_expander_get_expanded) + OS_LOAD_FUNCTION(fp, gtk_expander_get_expanded) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9004,7 +9016,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget) rc = (jintLong)gtk_expander_get_label_widget(arg0); */ { - LOAD_FUNCTION(fp, gtk_expander_get_label_widget) + OS_LOAD_FUNCTION(fp, gtk_expander_get_label_widget) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9026,7 +9038,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new) rc = (jintLong)gtk_expander_new((const gchar *)lparg0); */ { - LOAD_FUNCTION(fp, gtk_expander_new) + OS_LOAD_FUNCTION(fp, gtk_expander_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); } @@ -9047,7 +9059,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded) gtk_expander_set_expanded(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_expanded) + OS_LOAD_FUNCTION(fp, gtk_expander_set_expanded) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9067,7 +9079,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label) gtk_expander_set_label(arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_label) + OS_LOAD_FUNCTION(fp, gtk_expander_set_label) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1); } @@ -9087,7 +9099,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget) gtk_expander_set_label_widget(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_expander_set_label_widget) + OS_LOAD_FUNCTION(fp, gtk_expander_set_label_widget) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9105,7 +9117,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter) gtk_file_chooser_add_filter(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_add_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_add_filter) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9124,7 +9136,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder) rc = (jintLong)gtk_file_chooser_get_current_folder(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9144,7 +9156,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename) rc = (jintLong)gtk_file_chooser_get_filename(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filename) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filename) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9164,7 +9176,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames) rc = (jintLong)gtk_file_chooser_get_filenames(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9184,7 +9196,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter) rc = (jintLong)gtk_file_chooser_get_filter(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_filter) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9204,7 +9216,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uri) rc = (jintLong)gtk_file_chooser_get_uri(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_uri) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9224,7 +9236,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uris) rc = (jintLong)gtk_file_chooser_get_uris(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_get_uris) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_get_uris) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9243,7 +9255,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder) gtk_file_chooser_set_current_folder(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9263,7 +9275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri gtk_file_chooser_set_current_folder_uri(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder_uri) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9285,7 +9297,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name) gtk_file_chooser_set_current_name(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9305,7 +9317,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confi gtk_file_chooser_set_do_overwrite_confirmation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9323,7 +9335,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget) gtk_file_chooser_set_extra_widget(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9341,7 +9353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename) gtk_file_chooser_set_filename(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_filename) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_filename) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9359,7 +9371,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter) gtk_file_chooser_set_filter(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_filter) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_filter) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -9377,7 +9389,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1local_1only) gtk_file_chooser_set_local_only(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_local_only) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_local_only) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9395,7 +9407,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple) gtk_file_chooser_set_select_multiple(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -9415,7 +9427,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1uri) gtk_file_chooser_set_uri(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_chooser_set_uri) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_set_uri) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9437,7 +9449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern) gtk_file_filter_add_pattern(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_filter_add_pattern) + OS_LOAD_FUNCTION(fp, gtk_file_filter_add_pattern) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9458,7 +9470,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name) rc = (jintLong)gtk_file_filter_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_file_filter_get_name) + OS_LOAD_FUNCTION(fp, gtk_file_filter_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9478,7 +9490,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new) rc = (jintLong)gtk_file_filter_new(); */ { - LOAD_FUNCTION(fp, gtk_file_filter_new) + OS_LOAD_FUNCTION(fp, gtk_file_filter_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -9499,7 +9511,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name) gtk_file_filter_set_name(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_file_filter_set_name) + OS_LOAD_FUNCTION(fp, gtk_file_filter_set_name) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -9887,7 +9899,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1info_1free) gtk_icon_info_free(arg0); */ { - LOAD_FUNCTION(fp, gtk_icon_info_free) + OS_LOAD_FUNCTION(fp, gtk_icon_info_free) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -9908,7 +9920,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1info_1load_1icon) rc = (jintLong)gtk_icon_info_load_icon(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_icon_info_load_icon) + OS_LOAD_FUNCTION(fp, gtk_icon_info_load_icon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong *))fp)(arg0, lparg1); } @@ -9974,7 +9986,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1get_1default) rc = (jintLong)gtk_icon_theme_get_default(); */ { - LOAD_FUNCTION(fp, gtk_icon_theme_get_default) + OS_LOAD_FUNCTION(fp, gtk_icon_theme_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -9994,7 +10006,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon) rc = (jintLong)gtk_icon_theme_lookup_by_gicon(arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_icon_theme_lookup_by_gicon) + OS_LOAD_FUNCTION(fp, gtk_icon_theme_lookup_by_gicon) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3); } @@ -10319,7 +10331,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode) gtk_label_set_line_wrap_mode(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode) + OS_LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -10813,7 +10825,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus) gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus) + OS_LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus) if (fp) { ((void (CALLING_CONVENTION*)(GtkMenuShell *, gboolean))fp)((GtkMenuShell *)arg0, (gboolean)arg1); } @@ -11008,7 +11020,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin) rc = (jdouble)gtk_page_setup_get_bottom_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11028,7 +11040,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin) rc = (jdouble)gtk_page_setup_get_left_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11048,7 +11060,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation) rc = (jint)gtk_page_setup_get_orientation(arg0); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_orientation) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_orientation) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11068,7 +11080,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height) rc = (jdouble)gtk_page_setup_get_page_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_page_height) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11088,7 +11100,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width) rc = (jdouble)gtk_page_setup_get_page_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_page_width) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11108,7 +11120,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height) rc = (jdouble)gtk_page_setup_get_paper_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11128,7 +11140,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size) rc = (jintLong)gtk_page_setup_get_paper_size(arg0); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11148,7 +11160,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width) rc = (jdouble)gtk_page_setup_get_paper_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11168,7 +11180,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin) rc = (jdouble)gtk_page_setup_get_right_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11188,7 +11200,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin) rc = (jdouble)gtk_page_setup_get_top_margin(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11208,7 +11220,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new) rc = (jintLong)gtk_page_setup_new(); */ { - LOAD_FUNCTION(fp, gtk_page_setup_new) + OS_LOAD_FUNCTION(fp, gtk_page_setup_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -11227,7 +11239,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin) gtk_page_setup_set_bottom_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11245,7 +11257,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin) gtk_page_setup_set_left_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11263,7 +11275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation) gtk_page_setup_set_orientation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_orientation) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_orientation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11281,7 +11293,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size) gtk_page_setup_set_paper_size(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -11299,7 +11311,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin) gtk_page_setup_set_right_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11317,7 +11329,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin) gtk_page_setup_set_top_margin(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin) + OS_LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2); } @@ -11622,7 +11634,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free) gtk_paper_size_free(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_free) + OS_LOAD_FUNCTION(fp, gtk_paper_size_free) if (fp) { ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11641,7 +11653,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name) rc = (jintLong)gtk_paper_size_get_display_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_display_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_display_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11661,7 +11673,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height) rc = (jdouble)gtk_paper_size_get_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_height) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11681,7 +11693,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name) rc = (jintLong)gtk_paper_size_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11701,7 +11713,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name) rc = (jintLong)gtk_paper_size_get_ppd_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11721,7 +11733,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width) rc = (jdouble)gtk_paper_size_get_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_paper_size_get_width) + OS_LOAD_FUNCTION(fp, gtk_paper_size_get_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11741,7 +11753,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom) rc = (jboolean)gtk_paper_size_is_custom(arg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_is_custom) + OS_LOAD_FUNCTION(fp, gtk_paper_size_is_custom) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11763,7 +11775,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new) rc = (jintLong)gtk_paper_size_new(lparg0); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } @@ -11789,7 +11801,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom) rc = (jintLong)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new_custom) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new_custom) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble, jint))fp)(lparg0, lparg1, arg2, arg3, arg4); } @@ -11816,7 +11828,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd) rc = (jintLong)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd) + OS_LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble))fp)(lparg0, lparg1, arg2, arg3); } @@ -11863,7 +11875,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer) rc = (jintLong)gtk_print_job_get_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_printer) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11883,7 +11895,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings) rc = (jintLong)gtk_print_job_get_settings(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_settings) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_settings) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11903,7 +11915,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status) rc = (jint)gtk_print_job_get_status(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_status) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_status) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11925,7 +11937,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface) rc = (jintLong)gtk_print_job_get_surface(arg0, (GError **)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_surface) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_surface) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, GError **))fp)(arg0, (GError **)lparg1); } @@ -11947,7 +11959,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title) rc = (jintLong)gtk_print_job_get_title(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_job_get_title) + OS_LOAD_FUNCTION(fp, gtk_print_job_get_title) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -11969,7 +11981,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1new) rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_print_job_new) + OS_LOAD_FUNCTION(fp, gtk_print_job_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jintLong, jintLong, jintLong))fp)((const gchar *)lparg0, arg1, arg2, arg3); } @@ -11990,7 +12002,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send) gtk_print_job_send(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3); */ { - LOAD_FUNCTION(fp, gtk_print_job_send) + OS_LOAD_FUNCTION(fp, gtk_print_job_send) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer, GDestroyNotify))fp)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3); } @@ -12013,7 +12025,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1job_1set_1source_1file) rc = (jboolean)gtk_print_job_set_source_file(arg0, (const gchar *)lparg1, (GError **)lparg2); */ { - LOAD_FUNCTION(fp, gtk_print_job_set_source_file) + OS_LOAD_FUNCTION(fp, gtk_print_job_set_source_file) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *, GError **))fp)(arg0, (const gchar *)lparg1, (GError **)lparg2); } @@ -12035,7 +12047,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach) gtk_print_settings_foreach(arg0, arg1, (gpointer)arg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_foreach) + OS_LOAD_FUNCTION(fp, gtk_print_settings_foreach) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer))fp)(arg0, arg1, (gpointer)arg2); } @@ -12056,7 +12068,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get) rc = (jintLong)gtk_print_settings_get(arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1); } @@ -12078,7 +12090,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate) rc = (jboolean)gtk_print_settings_get_collate(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_collate) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_collate) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12098,7 +12110,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1duplex) rc = (jint)gtk_print_settings_get_duplex(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_duplex) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_duplex) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12118,7 +12130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies) rc = (jint)gtk_print_settings_get_n_copies(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12138,7 +12150,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation) rc = (jint)gtk_print_settings_get_orientation(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_orientation) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_orientation) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12160,7 +12172,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges) rc = (jintLong)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *))fp)(arg0, (gint *)lparg1); } @@ -12182,7 +12194,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height) rc = (jdouble)gtk_print_settings_get_paper_height(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12202,7 +12214,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width) rc = (jdouble)gtk_print_settings_get_paper_width(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12222,7 +12234,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages) rc = (jint)gtk_print_settings_get_print_pages(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12242,7 +12254,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer) rc = (jintLong)gtk_print_settings_get_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_printer) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12262,7 +12274,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution) rc = (jint)gtk_print_settings_get_resolution(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_settings_get_resolution) + OS_LOAD_FUNCTION(fp, gtk_print_settings_get_resolution) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12282,7 +12294,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new) rc = (jintLong)gtk_print_settings_new(); */ { - LOAD_FUNCTION(fp, gtk_print_settings_new) + OS_LOAD_FUNCTION(fp, gtk_print_settings_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -12305,7 +12317,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set) gtk_print_settings_set(arg0, (const gchar *)lparg1, (const gchar *)lparg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, const gchar *, const gchar *))fp)(arg0, (const gchar *)lparg1, (const gchar *)lparg2); } @@ -12326,7 +12338,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate) gtk_print_settings_set_collate(arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_collate) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_collate) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gboolean))fp)(arg0, (gboolean)arg1); } @@ -12344,7 +12356,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1duplex) gtk_print_settings_set_duplex(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_duplex) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_duplex) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12362,7 +12374,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies) gtk_print_settings_set_n_copies(arg0, (gint)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1); } @@ -12380,7 +12392,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation) gtk_print_settings_set_orientation(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_orientation) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_orientation) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12400,7 +12412,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges) gtk_print_settings_set_page_ranges(arg0, lparg1, (gint)arg2); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint *, gint))fp)(arg0, lparg1, (gint)arg2); } @@ -12420,7 +12432,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages) gtk_print_settings_set_print_pages(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -12440,7 +12452,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer) gtk_print_settings_set_printer(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_print_settings_set_printer) + OS_LOAD_FUNCTION(fp, gtk_print_settings_set_printer) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -12461,7 +12473,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page) rc = (jint)gtk_print_unix_dialog_get_current_page(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12481,7 +12493,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setu rc = (jintLong)gtk_print_unix_dialog_get_page_setup(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12501,7 +12513,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1 rc = (jintLong)gtk_print_unix_dialog_get_selected_printer(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12521,7 +12533,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings) rc = (jintLong)gtk_print_unix_dialog_get_settings(arg0); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12543,7 +12555,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new) rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_new) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1); } @@ -12564,7 +12576,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page) gtk_print_unix_dialog_set_current_page(arg0, (gint)arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1); } @@ -12582,7 +12594,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1s gtk_print_unix_dialog_set_embed_page_setup(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_embed_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_embed_page_setup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -12600,7 +12612,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabi gtk_print_unix_dialog_set_manual_capabilities(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12618,7 +12630,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup) gtk_print_unix_dialog_set_page_setup(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12636,7 +12648,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings) gtk_print_unix_dialog_set_settings(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings) + OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -12655,7 +12667,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend) rc = (jintLong)gtk_printer_get_backend(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_get_backend) + OS_LOAD_FUNCTION(fp, gtk_printer_get_backend) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12675,7 +12687,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name) rc = (jintLong)gtk_printer_get_name(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_get_name) + OS_LOAD_FUNCTION(fp, gtk_printer_get_name) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -12695,7 +12707,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default) rc = (jboolean)gtk_printer_is_default(arg0); */ { - LOAD_FUNCTION(fp, gtk_printer_is_default) + OS_LOAD_FUNCTION(fp, gtk_printer_is_default) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -13283,7 +13295,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1geometry) rc = (jboolean)gtk_status_icon_get_geometry(arg0, arg1, lparg2, arg3); */ { - LOAD_FUNCTION(fp, gtk_status_icon_get_geometry) + OS_LOAD_FUNCTION(fp, gtk_status_icon_get_geometry) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, GdkRectangle *, jintLong))fp)(arg0, arg1, lparg2, arg3); } @@ -13305,7 +13317,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1visible) rc = (jboolean)gtk_status_icon_get_visible(arg0); */ { - LOAD_FUNCTION(fp, gtk_status_icon_get_visible) + OS_LOAD_FUNCTION(fp, gtk_status_icon_get_visible) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -13325,7 +13337,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1status_1icon_1new) rc = (jintLong)gtk_status_icon_new(); */ { - LOAD_FUNCTION(fp, gtk_status_icon_new) + OS_LOAD_FUNCTION(fp, gtk_status_icon_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -13356,7 +13368,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf) gtk_status_icon_set_from_pixbuf(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_from_pixbuf) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_from_pixbuf) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -13376,7 +13388,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1tooltip) gtk_status_icon_set_tooltip(arg0, lparg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_tooltip) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_tooltip) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); } @@ -13396,7 +13408,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1visible) gtk_status_icon_set_visible(arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_status_icon_set_visible) + OS_LOAD_FUNCTION(fp, gtk_status_icon_set_visible) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -14386,7 +14398,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query) gtk_tooltip_trigger_tooltip_query((GdkDisplay*)arg0); */ { - LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query) + OS_LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query) if (fp) { ((void (CALLING_CONVENTION*)(GdkDisplay*))fp)((GdkDisplay*)arg0); } @@ -14797,7 +14809,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows) rc = (jint)gtk_tree_selection_count_selected_rows((GtkTreeSelection *)arg0); */ { - LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows) + OS_LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GtkTreeSelection *))fp)((GtkTreeSelection *)arg0); } @@ -14835,7 +14847,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); */ { - LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows) + OS_LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeSelection *, GtkTreeModel **))fp)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1); } @@ -15127,7 +15139,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1posit rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3); */ { - LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position) + OS_LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *))fp)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3); } @@ -15779,7 +15791,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines) gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines) + OS_LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines) if (fp) { ((void (CALLING_CONVENTION*)(GtkTreeView*, jint))fp)((GtkTreeView*)arg0, arg1); } @@ -16241,7 +16253,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited) rc = (jboolean)gtk_widget_is_composited((GtkWidget *)arg0); */ { - LOAD_FUNCTION(fp, gtk_widget_is_composited) + OS_LOAD_FUNCTION(fp, gtk_widget_is_composited) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0); } @@ -16534,7 +16546,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text) gtk_widget_set_tooltip_text((GtkWidget *)arg0, (const gchar *)lparg1); */ { - LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text) + OS_LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text) if (fp) { ((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1); } @@ -16751,7 +16763,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1group) rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0); */ { - LOAD_FUNCTION(fp, gtk_window_get_group) + OS_LOAD_FUNCTION(fp, gtk_window_get_group) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0); } @@ -16807,7 +16819,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity) rc = (jdouble)gtk_window_get_opacity((GtkWindow *)arg0); */ { - LOAD_FUNCTION(fp, gtk_window_get_opacity) + OS_LOAD_FUNCTION(fp, gtk_window_get_opacity) if (fp) { rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0); } @@ -17031,7 +17043,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below) gtk_window_set_keep_below((GtkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_keep_below) + OS_LOAD_FUNCTION(fp, gtk_window_set_keep_below) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1); } @@ -17059,7 +17071,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity) gtk_window_set_opacity((GtkWindow *)arg0, arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_opacity) + OS_LOAD_FUNCTION(fp, gtk_window_set_opacity) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, jdouble))fp)((GtkWindow *)arg0, arg1); } @@ -17087,7 +17099,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint) gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1); */ { - LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint) + OS_LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint) if (fp) { ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1); } @@ -17342,7 +17354,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new) rc = (jintLong)pango_attr_strikethrough_color_new(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new) + OS_LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -17374,7 +17386,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new) rc = (jintLong)pango_attr_underline_color_new(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, pango_attr_underline_color_new) + OS_LOAD_FUNCTION(fp, pango_attr_underline_color_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2); } @@ -17418,7 +17430,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options rc = (jintLong)pango_cairo_context_get_font_options((PangoContext *)arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_context_get_font_options) + OS_LOAD_FUNCTION(fp, pango_cairo_context_get_font_options) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PangoContext *))fp)((PangoContext *)arg0); } @@ -17437,7 +17449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options) pango_cairo_context_set_font_options((PangoContext *)arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_context_set_font_options) + OS_LOAD_FUNCTION(fp, pango_cairo_context_set_font_options) if (fp) { ((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1); } @@ -17456,7 +17468,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout) rc = (jintLong)pango_cairo_create_layout(arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_create_layout) + OS_LOAD_FUNCTION(fp, pango_cairo_create_layout) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17476,7 +17488,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context) rc = (jintLong)pango_cairo_font_map_create_context(arg0); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_create_context) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_create_context) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17496,7 +17508,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default) rc = (jintLong)pango_cairo_font_map_get_default(); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_get_default) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_get_default) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -17516,7 +17528,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new) rc = (jintLong)pango_cairo_font_map_new(); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_new) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_new) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); } @@ -17535,7 +17547,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution) pango_cairo_font_map_set_resolution(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution) + OS_LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1); } @@ -17553,7 +17565,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path) pango_cairo_layout_path(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_layout_path) + OS_LOAD_FUNCTION(fp, pango_cairo_layout_path) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -17571,7 +17583,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout) pango_cairo_show_layout(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_cairo_show_layout) + OS_LOAD_FUNCTION(fp, pango_cairo_show_layout) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -17978,7 +17990,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos rc = (jint)pango_font_metrics_get_strikethrough_position(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17998,7 +18010,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi rc = (jint)pango_font_metrics_get_strikethrough_thickness(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18018,7 +18030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio rc = (jint)pango_font_metrics_get_underline_position(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18038,7 +18050,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne rc = (jint)pango_font_metrics_get_underline_thickness(arg0); */ { - LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness) + OS_LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -18428,7 +18440,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir) pango_layout_set_auto_dir(arg0, arg1); */ { - LOAD_FUNCTION(fp, pango_layout_set_auto_dir) + OS_LOAD_FUNCTION(fp, pango_layout_set_auto_dir) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); } @@ -18784,7 +18796,7 @@ JNIEXPORT void JNICALL OS_NATIVE(gdk_1threads_1set_1lock_1functions) gdk_threads_set_lock_functions(arg0, arg1); */ { - LOAD_FUNCTION(fp, gdk_threads_set_lock_functions) + OS_LOAD_FUNCTION(fp, gdk_threads_set_lock_functions) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h index 69485058ef..b3711bb0d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h @@ -33,6 +33,8 @@ #include <locale.h> #include <unistd.h> +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #ifndef GDK_WINDOWING_X11 /* X Structures */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c index c964103bae..efdb5a24a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c @@ -75,7 +75,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new) * are passing in, otherwise it crashes. */ typedef jintLong (CALLING_CONVENTION* FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...); - LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new) + OS_LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new) if (fp) { rc = (jintLong)((FPTR) fp)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } @@ -107,7 +107,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes) * are passing in, otherwise it crashes. */ typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...); - LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes) + OS_LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes) if (fp) { ((FPTR)fp)(arg0, arg1, lparg2, arg3, arg4); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 68ba6cb3f4..daaf74c241 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -354,7 +354,7 @@ #define localeconv_decimal_point() localeconv()->decimal_point #define gtk_status_icon_position_menu_func() 0; \ -LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \ +OS_LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \ rc = (jintLong)fp; glong g_utf16_pointer_to_offset(const gchar*, const gchar*); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 2fc886a3a3..2c78396ae2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1396; -int OS_nativeFunctionCallCount[1396]; +int OS_nativeFunctionCount = 1397; +int OS_nativeFunctionCallCount[1397]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -178,6 +178,7 @@ char * OS_nativeFunctionNames[] = { "_1G_1OBJECT_1GET_1CLASS", "_1G_1OBJECT_1TYPE", "_1G_1OBJECT_1TYPE_1NAME", + "_1G_1TYPE_1CHECK_1INSTANCE_1TYPE", "_1G_1TYPE_1STRING", "_1PANGO_1PIXELS", "_1PANGO_1TYPE_1FONT_1DESCRIPTION", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 420c64d982..67de14abc2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -186,6 +186,7 @@ typedef enum { _1G_1OBJECT_1GET_1CLASS_FUNC, _1G_1OBJECT_1TYPE_FUNC, _1G_1OBJECT_1TYPE_1NAME_FUNC, + _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC, _1G_1TYPE_1STRING_FUNC, _1PANGO_1PIXELS_FUNC, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 6d631ef093..308e9fd3da 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -1780,6 +1780,15 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) { lock.unlock(); } } +public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int type); +public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int type) { + lock.lock(); + try { + return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type); + } finally { + lock.unlock(); + } +} /** @method flags=const */ public static final native int /*long*/ G_TYPE_BOOLEAN(); /** @method flags=const */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c index 9a68414652..2dfdb94f2a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -1462,7 +1462,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite) XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); */ { - LOAD_FUNCTION(fp, XRenderComposite) + OS_LOAD_FUNCTION(fp, XRenderComposite) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12); } @@ -1483,7 +1483,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture) rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, XRenderCreatePicture) + OS_LOAD_FUNCTION(fp, XRenderCreatePicture) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -1505,7 +1505,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat) rc = (jintLong)XRenderFindStandardFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindStandardFormat) + OS_LOAD_FUNCTION(fp, XRenderFindStandardFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -1525,7 +1525,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat) rc = (jintLong)XRenderFindVisualFormat(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFindVisualFormat) + OS_LOAD_FUNCTION(fp, XRenderFindVisualFormat) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -1544,7 +1544,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture) XRenderFreePicture(arg0, arg1); */ { - LOAD_FUNCTION(fp, XRenderFreePicture) + OS_LOAD_FUNCTION(fp, XRenderFreePicture) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); } @@ -1567,7 +1567,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension) rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryExtension) + OS_LOAD_FUNCTION(fp, XRenderQueryExtension) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -1594,7 +1594,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion) rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderQueryVersion) + OS_LOAD_FUNCTION(fp, XRenderQueryVersion) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2); } @@ -1618,7 +1618,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles) XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5); } @@ -1638,7 +1638,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRegion) XRenderSetPictureClipRegion(arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureClipRegion) + OS_LOAD_FUNCTION(fp, XRenderSetPictureClipRegion) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); } @@ -1658,7 +1658,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform) XRenderSetPictureTransform(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, XRenderSetPictureTransform) + OS_LOAD_FUNCTION(fp, XRenderSetPictureTransform) if (fp) { ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h index 0f8a897f15..26b53f1baf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.h @@ -66,6 +66,8 @@ XtAppContext _XtDefaultAppContext(); #include <sys/select.h> #endif +#define OS_LOAD_FUNCTION LOAD_FUNCTION + #ifdef NO_XPRINTING_EXTENSIONS #define NO__1XpCancelJob #define NO__1XpCreateContext diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c index 6fbda3b2cd..39de3e9706 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c @@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(AccessibleChildren) rc = (jint)AccessibleChildren((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4); */ { - LOAD_FUNCTION(fp, AccessibleChildren) + COM_LOAD_FUNCTION(fp, AccessibleChildren) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(IAccessible *, LONG, LONG, VARIANT *, LONG *))fp)((IAccessible *)arg0, (LONG)arg1, (LONG)arg2, (VARIANT *)arg3, (LONG *)lparg4); } @@ -53,7 +53,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow) rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3); */ { - LOAD_FUNCTION(fp, AccessibleObjectFromWindow) + COM_LOAD_FUNCTION(fp, AccessibleObjectFromWindow) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWORD, GUID *, LPVOID *))fp)((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3); } @@ -220,7 +220,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject) rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3); */ { - LOAD_FUNCTION(fp, CreateStdAccessibleObject) + COM_LOAD_FUNCTION(fp, CreateStdAccessibleObject) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, jint, GUID *, LPVOID *))fp)((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3); } @@ -414,7 +414,7 @@ JNIEXPORT jintLong JNICALL COM_NATIVE(LresultFromObject) rc = (jintLong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2); */ { - LOAD_FUNCTION(fp, LresultFromObject) + COM_LOAD_FUNCTION(fp, LresultFromObject) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GUID *, jintLong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h index 5e98453bd5..e2c5f176ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.h @@ -15,6 +15,8 @@ #include "os_structs.h" #include "com_custom.h" +#define COM_LOAD_FUNCTION LOAD_FUNCTION + #define COM_NATIVE_ENTER_TRY(env, that, func) \ COM_NATIVE_ENTER(env, that, func); \ NATIVE_TRY(env, that, func); 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 997d92013a..c31a1c7739 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 @@ -63,7 +63,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx) rc = (jboolean)ActivateActCtx(arg0, (ULONG_PTR*)lparg1); */ { - LOAD_FUNCTION(fp, ActivateActCtx) + OS_LOAD_FUNCTION(fp, ActivateActCtx) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, ULONG_PTR*))fp)(arg0, (ULONG_PTR*)lparg1); } @@ -99,7 +99,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA) rc = (jint)AddFontResourceExA(lparg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AddFontResourceExA) + OS_LOAD_FUNCTION(fp, AddFontResourceExA) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jintLong))fp)(lparg0, arg1, arg2); } @@ -123,7 +123,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW) rc = (jint)AddFontResourceExW(lparg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AddFontResourceExW) + OS_LOAD_FUNCTION(fp, AddFontResourceExW) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jint, jintLong))fp)(lparg0, arg1, arg2); } @@ -161,7 +161,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow) rc = (jboolean)AllowSetForegroundWindow(arg0); */ { - LOAD_FUNCTION(fp, AllowSetForegroundWindow) + OS_LOAD_FUNCTION(fp, AllowSetForegroundWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -183,7 +183,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend) rc = (jboolean)AlphaBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10); */ { - LOAD_FUNCTION(fp, AlphaBlend) + OS_LOAD_FUNCTION(fp, AlphaBlend) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, BLENDFUNCTION))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10); } @@ -205,7 +205,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow) rc = (jboolean)AnimateWindow((HWND)arg0, arg1, arg2); */ { - LOAD_FUNCTION(fp, AnimateWindow) + OS_LOAD_FUNCTION(fp, AnimateWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint))fp)((HWND)arg0, arg1, arg2); } @@ -245,7 +245,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringA) rc = (jint)AssocQueryStringA(arg0, arg1, lparg2, lparg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, AssocQueryStringA) + OS_LOAD_FUNCTION(fp, AssocQueryStringA) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5); } @@ -278,7 +278,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW) rc = (jint)AssocQueryStringW(arg0, arg1, lparg2, lparg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, AssocQueryStringW) + OS_LOAD_FUNCTION(fp, AssocQueryStringW) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jchar *, jchar *, jchar *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5); } @@ -393,7 +393,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint) rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); */ { - LOAD_FUNCTION(fp, BeginBufferedPaint) + OS_LOAD_FUNCTION(fp, BeginBufferedPaint) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HDC, RECT *, jint, BP_PAINTPARAMS *, HDC*))fp)((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4); } @@ -481,7 +481,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit) rc = (jint)BufferedPaintInit(); */ { - LOAD_FUNCTION(fp, BufferedPaintInit) + OS_LOAD_FUNCTION(fp, BufferedPaintInit) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -503,7 +503,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha) rc = (jint)BufferedPaintSetAlpha((HPAINTBUFFER)arg0, lparg1, arg2); */ { - LOAD_FUNCTION(fp, BufferedPaintSetAlpha) + OS_LOAD_FUNCTION(fp, BufferedPaintSetAlpha) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, RECT *, jbyte))fp)((HPAINTBUFFER)arg0, lparg1, arg2); } @@ -525,7 +525,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintUnInit) rc = (jint)BufferedPaintUnInit(); */ { - LOAD_FUNCTION(fp, BufferedPaintUnInit) + OS_LOAD_FUNCTION(fp, BufferedPaintUnInit) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); } @@ -1001,7 +1001,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CloseGestureInfoHandle) rc = (jintLong)CloseGestureInfoHandle((HGESTUREINFO)arg0); */ { - LOAD_FUNCTION(fp, CloseGestureInfoHandle) + OS_LOAD_FUNCTION(fp, CloseGestureInfoHandle) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HGESTUREINFO))fp)((HGESTUREINFO)arg0); } @@ -1045,7 +1045,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData) rc = (jint)CloseThemeData((HTHEME)arg0); */ { - LOAD_FUNCTION(fp, CloseThemeData) + OS_LOAD_FUNCTION(fp, CloseThemeData) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME))fp)((HTHEME)arg0); } @@ -1065,7 +1065,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseTouchInputHandle) rc = (jboolean)CloseTouchInputHandle((HTOUCHINPUT)arg0); */ { - LOAD_FUNCTION(fp, CloseTouchInputHandle) + OS_LOAD_FUNCTION(fp, CloseTouchInputHandle) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HTOUCHINPUT))fp)((HTOUCHINPUT)arg0); } @@ -1107,7 +1107,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled) rc = (jint)CoInternetIsFeatureEnabled(arg0, arg1); */ { - LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled) + OS_LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1); } @@ -1127,7 +1127,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled) rc = (jint)CoInternetSetFeatureEnabled(arg0, arg1, (BOOL)arg2); */ { - LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled) + OS_LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, BOOL))fp)(arg0, arg1, (BOOL)arg2); } @@ -1321,7 +1321,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxA) rc = (jintLong)CreateActCtxA(lparg0); */ { - LOAD_FUNCTION(fp, CreateActCtxA) + OS_LOAD_FUNCTION(fp, CreateActCtxA) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0); } @@ -1344,7 +1344,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxW) rc = (jintLong)CreateActCtxW(lparg0); */ { - LOAD_FUNCTION(fp, CreateActCtxW) + OS_LOAD_FUNCTION(fp, CreateActCtxW) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0); } @@ -2577,7 +2577,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground) rc = (jint)DrawThemeBackground((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5); */ { - LOAD_FUNCTION(fp, DrawThemeBackground) + OS_LOAD_FUNCTION(fp, DrawThemeBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME, HDC, jint, jint, const RECT *, const RECT *))fp)((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5); } @@ -2604,7 +2604,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge) rc = (jint)DrawThemeEdge(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7); */ { - LOAD_FUNCTION(fp, DrawThemeEdge) + OS_LOAD_FUNCTION(fp, DrawThemeEdge) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7); } @@ -2629,7 +2629,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon) rc = (jint)DrawThemeIcon(arg0, arg1, arg2, arg3, lparg4, arg5, arg6); */ { - LOAD_FUNCTION(fp, DrawThemeIcon) + OS_LOAD_FUNCTION(fp, DrawThemeIcon) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jintLong, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6); } @@ -2653,7 +2653,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground) rc = (jint)DrawThemeParentBackground(arg0, arg1, lparg2); */ { - LOAD_FUNCTION(fp, DrawThemeParentBackground) + OS_LOAD_FUNCTION(fp, DrawThemeParentBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, RECT *))fp)(arg0, arg1, lparg2); } @@ -2679,7 +2679,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText) rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8); */ { - LOAD_FUNCTION(fp, DrawThemeText) + OS_LOAD_FUNCTION(fp, DrawThemeText) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8); } @@ -2720,7 +2720,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow) rc = (jint)DwmEnableBlurBehindWindow((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow) + OS_LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWM_BLURBEHIND *))fp)((HWND)arg0, lparg1); } @@ -2744,7 +2744,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea) rc = (jint)DwmExtendFrameIntoClientArea((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea) + OS_LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, MARGINS *))fp)((HWND)arg0, lparg1); } @@ -2862,7 +2862,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint) rc = (jint)EndBufferedPaint((HPAINTBUFFER)arg0, arg1); */ { - LOAD_FUNCTION(fp, EndBufferedPaint) + OS_LOAD_FUNCTION(fp, EndBufferedPaint) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, jboolean))fp)((HPAINTBUFFER)arg0, arg1); } @@ -2948,7 +2948,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors) rc = (jboolean)EnumDisplayMonitors((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3); */ { - LOAD_FUNCTION(fp, EnumDisplayMonitors) + OS_LOAD_FUNCTION(fp, EnumDisplayMonitors) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, LPCRECT, MONITORENUMPROC, LPARAM))fp)((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3); } @@ -3050,7 +3050,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA) rc = (jboolean)EnumSystemLanguageGroupsA((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2); */ { - LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA) + OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCA, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2); } @@ -3070,7 +3070,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW) rc = (jboolean)EnumSystemLanguageGroupsW((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2); */ { - LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW) + OS_LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCW, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2); } @@ -4055,7 +4055,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo) rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetComboBoxInfo) + OS_LOAD_FUNCTION(fp, GetComboBoxInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, COMBOBOXINFO *))fp)((HWND)arg0, lparg1); } @@ -4395,7 +4395,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetGestureInfo) rc = (jboolean)GetGestureInfo((HGESTUREINFO)arg0, (PGESTUREINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetGestureInfo) + OS_LOAD_FUNCTION(fp, GetGestureInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HGESTUREINFO, PGESTUREINFO))fp)((HGESTUREINFO)arg0, (PGESTUREINFO)lparg1); } @@ -4582,7 +4582,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes) rc = (jboolean)GetLayeredWindowAttributes((HWND)arg0, lparg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, GetLayeredWindowAttributes) + OS_LOAD_FUNCTION(fp, GetLayeredWindowAttributes) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint *, jbyte *, jint *))fp)((HWND)arg0, lparg1, lparg2, lparg3); } @@ -4606,7 +4606,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLayout) rc = (jint)GetLayout((HDC)arg0); */ { - LOAD_FUNCTION(fp, GetLayout) + OS_LOAD_FUNCTION(fp, GetLayout) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HDC))fp)((HDC)arg0); } @@ -4684,7 +4684,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo) rc = (jboolean)GetMenuBarInfo(arg0, arg1, arg2, lparg3); */ { - LOAD_FUNCTION(fp, GetMenuBarInfo) + OS_LOAD_FUNCTION(fp, GetMenuBarInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, MENUBARINFO *))fp)(arg0, arg1, arg2, lparg3); } @@ -4720,7 +4720,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo) rc = (jboolean)GetMenuInfo((HMENU)arg0, lparg1); */ { - LOAD_FUNCTION(fp, GetMenuInfo) + OS_LOAD_FUNCTION(fp, GetMenuInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1); } @@ -4936,7 +4936,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA) rc = (jboolean)GetMonitorInfoA((HMONITOR)arg0, (LPMONITORINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetMonitorInfoA) + OS_LOAD_FUNCTION(fp, GetMonitorInfoA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1); } @@ -4960,7 +4960,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW) rc = (jboolean)GetMonitorInfoW((HMONITOR)arg0, (LPMONITORINFO)lparg1); */ { - LOAD_FUNCTION(fp, GetMonitorInfoW) + OS_LOAD_FUNCTION(fp, GetMonitorInfoW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1); } @@ -5829,7 +5829,7 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage) rc = (jshort)GetSystemDefaultUILanguage(); */ { - LOAD_FUNCTION(fp, GetSystemDefaultUILanguage) + OS_LOAD_FUNCTION(fp, GetSystemDefaultUILanguage) if (fp) { rc = (jshort)((jshort (CALLING_CONVENTION*)())fp)(); } @@ -6029,7 +6029,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect) rc = (jint)GetThemeBackgroundContentRect(arg0, arg1, arg2, arg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeBackgroundContentRect) + OS_LOAD_FUNCTION(fp, GetThemeBackgroundContentRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5); } @@ -6056,7 +6056,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent) rc = (jint)GetThemeBackgroundExtent(arg0, arg1, arg2, arg3, lparg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeBackgroundExtent) + OS_LOAD_FUNCTION(fp, GetThemeBackgroundExtent) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5); } @@ -6080,7 +6080,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor) rc = (jint)GetThemeColor(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeColor) + OS_LOAD_FUNCTION(fp, GetThemeColor) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6104,7 +6104,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt) rc = (jint)GetThemeInt(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeInt) + OS_LOAD_FUNCTION(fp, GetThemeInt) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6130,7 +6130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins) rc = (jint)GetThemeMargins(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6); */ { - LOAD_FUNCTION(fp, GetThemeMargins) + OS_LOAD_FUNCTION(fp, GetThemeMargins) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, MARGINS *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6); } @@ -6155,7 +6155,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric) rc = (jint)GetThemeMetric(arg0, arg1, arg2, arg3, arg4, lparg5); */ { - LOAD_FUNCTION(fp, GetThemeMetric) + OS_LOAD_FUNCTION(fp, GetThemeMetric) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } @@ -6181,7 +6181,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize) rc = (jint)GetThemePartSize(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6); */ { - LOAD_FUNCTION(fp, GetThemePartSize) + OS_LOAD_FUNCTION(fp, GetThemePartSize) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, SIZE *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6); } @@ -6206,7 +6206,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect) rc = (jint)GetThemeRect(arg0, arg1, arg2, arg3, lparg4); */ { - LOAD_FUNCTION(fp, GetThemeRect) + OS_LOAD_FUNCTION(fp, GetThemeRect) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4); } @@ -6228,7 +6228,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize) rc = (jint)GetThemeSysSize(arg0, arg1); */ { - LOAD_FUNCTION(fp, GetThemeSysSize) + OS_LOAD_FUNCTION(fp, GetThemeSysSize) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -6254,7 +6254,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent) rc = (jint)GetThemeTextExtent(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); */ { - LOAD_FUNCTION(fp, GetThemeTextExtent) + OS_LOAD_FUNCTION(fp, GetThemeTextExtent) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8); } @@ -6334,7 +6334,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetTouchInputInfo) rc = (jboolean)GetTouchInputInfo((HTOUCHINPUT)arg0, (UINT)arg1, (PTOUCHINPUT)arg2, arg3); */ { - LOAD_FUNCTION(fp, GetTouchInputInfo) + OS_LOAD_FUNCTION(fp, GetTouchInputInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HTOUCHINPUT, UINT, PTOUCHINPUT, jint))fp)((HTOUCHINPUT)arg0, (UINT)arg1, (PTOUCHINPUT)arg2, arg3); } @@ -6634,7 +6634,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowTheme) rc = (jintLong)GetWindowTheme((HWND)arg0); */ { - LOAD_FUNCTION(fp, GetWindowTheme) + OS_LOAD_FUNCTION(fp, GetWindowTheme) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0); } @@ -6778,7 +6778,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill) rc = (jboolean)GradientFill((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5); */ { - LOAD_FUNCTION(fp, GradientFill) + OS_LOAD_FUNCTION(fp, GradientFill) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG))fp)((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5); } @@ -6924,7 +6924,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground) rc = (jint)HitTestThemeBackground(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8); */ { - LOAD_FUNCTION(fp, HitTestThemeBackground) + OS_LOAD_FUNCTION(fp, HitTestThemeBackground) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, jintLong, POINT, jshort *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8); } @@ -7279,7 +7279,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService) rc = (jboolean)ImmDisableTextFrameService(arg0); */ { - LOAD_FUNCTION(fp, ImmDisableTextFrameService) + OS_LOAD_FUNCTION(fp, ImmDisableTextFrameService) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0); } @@ -7901,7 +7901,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed) rc = (jboolean)IsAppThemed(); */ { - LOAD_FUNCTION(fp, IsAppThemed) + OS_LOAD_FUNCTION(fp, IsAppThemed) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -7957,7 +7957,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow) rc = (jboolean)IsHungAppWindow((HWND)arg0); */ { - LOAD_FUNCTION(fp, IsHungAppWindow) + OS_LOAD_FUNCTION(fp, IsHungAppWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0); } @@ -7991,7 +7991,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsTouchWindow) rc = (jboolean)IsTouchWindow((HWND)arg0, (PULONG)lparg1); */ { - LOAD_FUNCTION(fp, IsTouchWindow) + OS_LOAD_FUNCTION(fp, IsTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, PULONG))fp)((HWND)arg0, (PULONG)lparg1); } @@ -8565,7 +8565,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass) rc = (jboolean)MCIWndRegisterClass(); */ { - LOAD_FUNCTION(fp, MCIWndRegisterClass) + OS_LOAD_FUNCTION(fp, MCIWndRegisterClass) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -8837,7 +8837,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow) rc = (jintLong)MonitorFromWindow(arg0, arg1); */ { - LOAD_FUNCTION(fp, MonitorFromWindow) + OS_LOAD_FUNCTION(fp, MonitorFromWindow) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); } @@ -11990,7 +11990,7 @@ JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent) NotifyWinEvent((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3); */ { - LOAD_FUNCTION(fp, NotifyWinEvent) + OS_LOAD_FUNCTION(fp, NotifyWinEvent) if (fp) { ((void (CALLING_CONVENTION*)(DWORD, HWND, LONG, LONG))fp)((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3); } @@ -12219,7 +12219,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData) rc = (jintLong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1); */ { - LOAD_FUNCTION(fp, OpenThemeData) + OS_LOAD_FUNCTION(fp, OpenThemeData) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1); } @@ -12355,7 +12355,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PSPropertyKeyFromString) rc = (jint)PSPropertyKeyFromString(lparg0, lparg1); */ { - LOAD_FUNCTION(fp, PSPropertyKeyFromString) + OS_LOAD_FUNCTION(fp, PSPropertyKeyFromString) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, PROPERTYKEY *))fp)(lparg0, lparg1); } @@ -12586,7 +12586,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow) rc = (jboolean)PrintWindow((HWND)arg0, (HDC)arg1, arg2); */ { - LOAD_FUNCTION(fp, PrintWindow) + OS_LOAD_FUNCTION(fp, PrintWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, jint))fp)((HWND)arg0, (HDC)arg1, arg2); } @@ -13228,7 +13228,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RegisterTouchWindow) rc = (jboolean)RegisterTouchWindow((HWND)arg0, (ULONG)arg1); */ { - LOAD_FUNCTION(fp, RegisterTouchWindow) + OS_LOAD_FUNCTION(fp, RegisterTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, ULONG))fp)((HWND)arg0, (ULONG)arg1); } @@ -13582,7 +13582,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemFromRelativeName) rc = (jint)SHCreateItemFromRelativeName(arg0, lparg1, arg2, lparg3, lparg4); */ { - LOAD_FUNCTION(fp, SHCreateItemFromRelativeName) + OS_LOAD_FUNCTION(fp, SHCreateItemFromRelativeName) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jchar *, jintLong, jbyte *, jintLong *))fp)(arg0, lparg1, arg2, lparg3, lparg4); } @@ -13614,7 +13614,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHCreateItemInKnownFolder) rc = (jint)SHCreateItemInKnownFolder(lparg0, arg1, lparg2, lparg3, lparg4); */ { - LOAD_FUNCTION(fp, SHCreateItemInKnownFolder) + OS_LOAD_FUNCTION(fp, SHCreateItemInKnownFolder) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jchar *, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3, lparg4); } @@ -16292,7 +16292,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetCurrentProcessExplicitAppUserModelID) rc = (jint)SetCurrentProcessExplicitAppUserModelID(lparg0); */ { - LOAD_FUNCTION(fp, SetCurrentProcessExplicitAppUserModelID) + OS_LOAD_FUNCTION(fp, SetCurrentProcessExplicitAppUserModelID) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(jchar *))fp)(lparg0); } @@ -16370,7 +16370,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryA) rc = (jboolean)SetDllDirectoryA((LPSTR)lparg0); */ { - LOAD_FUNCTION(fp, SetDllDirectoryA) + OS_LOAD_FUNCTION(fp, SetDllDirectoryA) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPSTR))fp)((LPSTR)lparg0); } @@ -16394,7 +16394,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetDllDirectoryW) rc = (jboolean)SetDllDirectoryW((LPWSTR)lparg0); */ { - LOAD_FUNCTION(fp, SetDllDirectoryW) + OS_LOAD_FUNCTION(fp, SetDllDirectoryW) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LPWSTR))fp)((LPWSTR)lparg0); } @@ -16452,7 +16452,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetGestureConfig) rc = (jboolean)SetGestureConfig((HWND)arg0, arg1, arg2, (PGESTURECONFIG)arg3, arg4); */ { - LOAD_FUNCTION(fp, SetGestureConfig) + OS_LOAD_FUNCTION(fp, SetGestureConfig) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint, PGESTURECONFIG, jint))fp)((HWND)arg0, arg1, arg2, (PGESTURECONFIG)arg3, arg4); } @@ -16484,7 +16484,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes) rc = (jboolean)SetLayeredWindowAttributes((HWND)arg0, arg1, arg2, arg3); */ { - LOAD_FUNCTION(fp, SetLayeredWindowAttributes) + OS_LOAD_FUNCTION(fp, SetLayeredWindowAttributes) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jbyte, jint))fp)((HWND)arg0, arg1, arg2, arg3); } @@ -16504,7 +16504,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout) rc = (jint)SetLayout((HDC)arg0, (DWORD)arg1); */ { - LOAD_FUNCTION(fp, SetLayout) + OS_LOAD_FUNCTION(fp, SetLayout) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HDC, DWORD))fp)((HDC)arg0, (DWORD)arg1); } @@ -16574,7 +16574,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo) rc = (jboolean)SetMenuInfo((HMENU)arg0, lparg1); */ { - LOAD_FUNCTION(fp, SetMenuInfo) + OS_LOAD_FUNCTION(fp, SetMenuInfo) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1); } @@ -16706,7 +16706,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware) rc = (jboolean)SetProcessDPIAware(); */ { - LOAD_FUNCTION(fp, SetProcessDPIAware) + OS_LOAD_FUNCTION(fp, SetProcessDPIAware) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)(); } @@ -17042,7 +17042,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme) rc = (jint)SetWindowTheme((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2); */ { - LOAD_FUNCTION(fp, SetWindowTheme) + OS_LOAD_FUNCTION(fp, SetWindowTheme) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(HWND, LPCWSTR, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2); } @@ -17807,7 +17807,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt) rc = (jboolean)TransparentBlt(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); */ { - LOAD_FUNCTION(fp, TransparentBlt) + OS_LOAD_FUNCTION(fp, TransparentBlt) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); } @@ -17923,7 +17923,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterTouchWindow) rc = (jboolean)UnregisterTouchWindow(arg0); */ { - LOAD_FUNCTION(fp, UnregisterTouchWindow) + OS_LOAD_FUNCTION(fp, UnregisterTouchWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); } @@ -17951,7 +17951,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateLayeredWindow) rc = (jboolean)UpdateLayeredWindow((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8); */ { - LOAD_FUNCTION(fp, UpdateLayeredWindow) + OS_LOAD_FUNCTION(fp, UpdateLayeredWindow) if (fp) { rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, jint))fp)((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8); } 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 49d530b235..0f44973263 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 @@ -50,6 +50,8 @@ /* Optional custom definitions to exclude some types */ #include "defines.h" +#define OS_LOAD_FUNCTION LOAD_FUNCTION + /* Structs excludes */ #ifdef _WIN32_WCE #define NO_ACTCTX diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c index 4160de1b98..276ffef2b6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -221,7 +221,7 @@ JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1wi rc = (jintLong)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1); */ { - LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs) if (fp) { rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, jint))fp)((const char *)lparg0, arg1); } @@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch) rc = (jint)gnome_vfs_mime_application_launch((GnomeVFSMimeApplication *)arg0, (GList *)arg1); */ { - LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(GnomeVFSMimeApplication *, GList *))fp)((GnomeVFSMimeApplication *)arg0, (GList *)arg1); } @@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show) rc = (jint)gnome_vfs_url_show((const char *)arg0); */ { - LOAD_FUNCTION(fp, gnome_vfs_url_show) + GNOME_LOAD_FUNCTION(fp, gnome_vfs_url_show) if (fp) { rc = (jint)((jint (CALLING_CONVENTION*)(const char *))fp)((const char *)arg0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h index 07f1b5a057..9937221066 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h @@ -28,6 +28,8 @@ #include <libgnomevfs/gnome-vfs-mime-handlers.h> #include <libgnomevfs/gnome-vfs-mime-info.h> +#define GNOME_LOAD_FUNCTION LOAD_FUNCTION + #ifdef AIX #define LIB_VFS "libgnomevfs-2.a(libgnomevfs-2.so.0)" #elif HPUX diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c index 3ce68d9355..ccee8100b4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -37,7 +37,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC); +/* rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const JSClassDefinition*))fp)((const JSClassDefinition*)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC); return rc; } @@ -49,7 +57,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC); +/* rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC); return rc; } @@ -63,7 +79,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectRef, JSStringRef, jint, JSValueRef *))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSEvaluateScript_FUNC); @@ -77,7 +101,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC); +/* rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSObjectRef))fp)((JSObjectRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC); return rc; } @@ -91,7 +123,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetProperty_FUNC); @@ -107,7 +147,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, unsigned, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPropertyAtIndex_FUNC); @@ -121,7 +169,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC); +/* rc = (jintLong)JSObjectMake((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSClassRef, void *))fp)((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC); return rc; } @@ -137,7 +193,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeArray_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, size_t, const struct OpaqueJSValue * const*, JSValueRef*))fp)((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); @@ -152,7 +216,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); +/* rc = (jintLong)JSObjectMakeFunctionWithCallback((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectCallAsFunctionCallback))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); return rc; } @@ -165,7 +237,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) jintLong *lparg5=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; +/* JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty) + if (fp) { + ((void (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef, JSPropertyAttributes, JSValueRef *))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectSetProperty_FUNC); @@ -180,7 +260,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSStringCreateWithUTF8CString((const char *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringCreateWithUTF8CString_FUNC); @@ -194,7 +282,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC); +/* rc = (jintLong)JSStringGetLength((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC); return rc; } @@ -206,7 +302,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); +/* rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); return rc; } @@ -220,7 +324,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSStringGetUTF8CString((JSStringRef)arg0, (char *)lparg1, (size_t)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef, char *, size_t))fp)((JSStringRef)arg0, (char *)lparg1, (size_t)arg2); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetUTF8CString_FUNC); @@ -236,7 +348,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringIsEqualToUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* rc = (jint)JSStringIsEqualToUTF8CString((JSStringRef)arg0, (const char *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSStringRef, const char *))fp)((JSStringRef)arg0, (const char *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringIsEqualToUTF8CString_FUNC); @@ -249,7 +369,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC); +/* JSStringRelease((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease) + if (fp) { + ((void (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC); } #endif @@ -260,7 +388,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC); +/* rc = (jint)JSValueGetType((JSContextRef)arg0, (JSValueRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC); return rc; } @@ -272,7 +408,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC); +/* rc = (jint)JSValueIsObjectOfClass((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSClassRef))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC); return rc; } @@ -284,7 +428,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC); +/* rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, bool))fp)((JSContextRef)arg0, (bool)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC); return rc; } @@ -296,7 +448,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC); +/* rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, double))fp)((JSContextRef)arg0, (double)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC); return rc; } @@ -308,7 +468,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC); +/* rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef))fp)((JSContextRef)arg0, (JSStringRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC); return rc; } @@ -320,7 +488,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC); +/* rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC); return rc; } @@ -332,7 +508,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueToBoolean) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToBoolean_FUNC); +/* rc = (jint)JSValueToBoolean((JSContextRef)arg0, (JSValueRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToBoolean) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToBoolean_FUNC); return rc; } @@ -346,7 +530,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToNumber_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToNumber_FUNC); @@ -362,7 +554,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToStringCopy_FUNC); @@ -370,18 +570,6 @@ fail: } #endif -#ifndef NO__1SOUP_1IS_1SESSION -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1SOUP_1IS_1SESSION) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1SOUP_1IS_1SESSION_FUNC); - rc = (jboolean)SOUP_IS_SESSION(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1SOUP_1IS_1SESSION_FUNC); - return rc; -} -#endif - #ifndef NO__1SoupCookie_1expires JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) (JNIEnv *env, jclass that, jintLong arg0) @@ -428,18 +616,6 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) } #endif -#ifndef NO__1WEBKIT_1IS_1WEB_1FRAME -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1WEBKIT_1IS_1WEB_1FRAME) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - rc = (jboolean)WEBKIT_IS_WEB_FRAME(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - return rc; -} -#endif - #ifndef NO__1soup_1auth_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) @@ -449,7 +625,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1authenticate_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* soup_auth_authenticate((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupAuth *, const char *, const char *))fp)((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -463,7 +647,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC); +/* rc = (jintLong)soup_auth_get_host((SoupAuth *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC); return rc; } @@ -475,7 +667,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); +/* rc = (jintLong)soup_auth_get_scheme_name((SoupAuth *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); return rc; } @@ -486,7 +686,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); +/* soup_cookie_jar_add_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); } #endif @@ -497,7 +705,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); +/* rc = (jintLong)soup_cookie_jar_all_cookies((SoupCookieJar *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *))fp)((SoupCookieJar *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); return rc; } @@ -508,7 +724,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); +/* soup_cookie_jar_delete_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); } #endif @@ -519,7 +743,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); +/* rc = (jintLong)soup_cookie_jar_get_cookies((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *, SoupURI *, jint))fp)((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); return rc; } @@ -531,7 +763,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); +/* rc = (jintLong)soup_cookie_jar_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); return rc; } @@ -545,7 +785,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1parse_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* rc = (jintLong)soup_cookie_parse((const char *)lparg0, (SoupURI *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, SoupURI *))fp)((const char *)lparg0, (SoupURI *)arg1); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1parse_FUNC); @@ -558,7 +806,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC); +/* soup_message_body_append((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageBody *, SoupMemoryUse, gconstpointer, gsize))fp)((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC); } #endif @@ -568,7 +824,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC); +/* soup_message_body_flatten((SoupMessageBody *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageBody *))fp)((SoupMessageBody *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC); } #endif @@ -579,7 +843,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC); +/* rc = (jintLong)soup_message_get_uri((SoupMessage *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupMessage *))fp)((SoupMessage *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC); return rc; } @@ -594,7 +866,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1headers_1append_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* soup_message_headers_append((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageHeaders *, const char *, const char *))fp)((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -607,7 +887,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); +/* soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); } #endif @@ -617,7 +905,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC); +/* soup_session_feature_attach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC); } #endif @@ -627,7 +923,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC); +/* soup_session_feature_detach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC); } #endif @@ -638,18 +942,54 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC); +/* rc = (jintLong)soup_session_get_feature((SoupSession *)arg0, (GType)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC); return rc; } #endif +#ifndef NO__1soup_1session_1get_1type +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1type_FUNC); +/* + rc = (jint)soup_session_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1soup_1uri_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC); +/* soup_uri_free((SoupURI *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupURI *))fp)((SoupURI *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC); } #endif @@ -662,7 +1002,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* rc = (jintLong)soup_uri_new((const char *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1new_FUNC); @@ -676,7 +1024,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC); +/* rc = (jintLong)soup_uri_to_string((SoupURI *)arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupURI *, jint))fp)((SoupURI *)arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC); return rc; } @@ -687,7 +1043,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC); +/* webkit_download_cancel((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC); } #endif @@ -698,7 +1062,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC); +/* rc = (jlong)webkit_download_get_current_size((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC); return rc; } @@ -710,7 +1082,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC); +/* rc = (jint)webkit_download_get_status((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC); return rc; } @@ -722,7 +1102,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1 { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); +/* rc = (jintLong)webkit_download_get_suggested_filename((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); return rc; } @@ -734,7 +1122,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC); +/* rc = (jlong)webkit_download_get_total_size((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC); return rc; } @@ -746,7 +1142,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC); +/* rc = (jintLong)webkit_download_get_uri((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC); return rc; } @@ -759,7 +1163,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_download_set_destination_uri((WebKitDownload *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitDownload *, const gchar *))fp)((WebKitDownload *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); @@ -772,7 +1184,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1default_1session_FUNC); +/* rc = (jintLong)webkit_get_default_session(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_get_default_session) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1default_1session_FUNC); return rc; } @@ -784,7 +1204,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1major_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1major_1version_FUNC); +/* rc = (jint)webkit_major_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_major_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1major_1version_FUNC); return rc; } @@ -796,7 +1224,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1micro_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1micro_1version_FUNC); +/* rc = (jint)webkit_micro_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_micro_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1micro_1version_FUNC); return rc; } @@ -808,7 +1244,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1minor_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1minor_1version_FUNC); +/* rc = (jint)webkit_minor_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_minor_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1minor_1version_FUNC); return rc; } @@ -820,7 +1264,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC); +/* rc = (jintLong)webkit_network_request_get_message((WebKitNetworkRequest *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC); return rc; } @@ -832,7 +1284,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC); +/* rc = (jintLong)webkit_network_request_get_uri((WebKitNetworkRequest *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC); return rc; } @@ -846,7 +1306,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* rc = (jintLong)webkit_network_request_new((const gchar *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1new_FUNC); @@ -860,7 +1328,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1t { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); +/* rc = (jintLong)webkit_soup_auth_dialog_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_soup_auth_dialog_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); return rc; } @@ -872,7 +1348,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); +/* rc = (jintLong)webkit_web_data_source_get_data((WebKitWebDataSource *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); return rc; } @@ -884,7 +1368,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); +/* rc = (jintLong)webkit_web_data_source_get_encoding((WebKitWebDataSource *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); return rc; } @@ -896,7 +1388,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); +/* rc = (jintLong)webkit_web_frame_get_data_source((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); return rc; } @@ -908,7 +1408,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); +/* rc = (jintLong)webkit_web_frame_get_global_context((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); return rc; } @@ -920,7 +1428,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); +/* rc = (jint)webkit_web_frame_get_load_status((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); return rc; } @@ -932,7 +1448,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); +/* rc = (jintLong)webkit_web_frame_get_parent((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); return rc; } @@ -944,19 +1468,55 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC); +/* rc = (jintLong)webkit_web_frame_get_title((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC); return rc; } #endif +#ifndef NO__1webkit_1web_1frame_1get_1type +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1type_FUNC); +/* + rc = (jint)webkit_web_frame_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1webkit_1web_1frame_1get_1uri JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) (JNIEnv *env, jclass that, jintLong arg0) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); +/* rc = (jintLong)webkit_web_frame_get_uri((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); return rc; } @@ -968,7 +1528,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); +/* rc = (jintLong)webkit_web_frame_get_web_view((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); return rc; } @@ -979,7 +1547,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); +/* webkit_web_policy_decision_download((WebKitWebPolicyDecision *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); } #endif @@ -989,7 +1565,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); +/* webkit_web_policy_decision_ignore((WebKitWebPolicyDecision *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); } #endif @@ -1000,7 +1584,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); +/* rc = (jint)webkit_web_view_can_go_back((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); return rc; } @@ -1012,7 +1604,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); +/* rc = (jint)webkit_web_view_can_go_forward((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); return rc; } @@ -1024,7 +1624,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); +/* rc = (jint)webkit_web_view_can_show_mime_type((WebKitWebView *)arg0, (const gchar *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); return rc; } @@ -1037,7 +1645,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_web_view_execute_script((WebKitWebView *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1execute_1script_FUNC); @@ -1050,7 +1666,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); +/* rc = (jint)webkit_web_view_get_load_status((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); return rc; } @@ -1062,7 +1686,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); +/* rc = (jintLong)webkit_web_view_get_main_frame((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); return rc; } @@ -1074,7 +1706,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC); +/* rc = (jdouble)webkit_web_view_get_progress((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC); return rc; } @@ -1086,7 +1726,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC); +/* rc = (jintLong)webkit_web_view_get_settings((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC); return rc; } @@ -1098,7 +1746,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC); +/* rc = (jintLong)webkit_web_view_get_title((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC); return rc; } @@ -1110,7 +1766,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC); +/* rc = (jintLong)webkit_web_view_get_uri((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC); return rc; } @@ -1122,7 +1786,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); +/* rc = (jintLong)webkit_web_view_get_window_features((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); return rc; } @@ -1133,7 +1805,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC); +/* webkit_web_view_go_back((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC); } #endif @@ -1143,7 +1823,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC); +/* webkit_web_view_go_forward((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC); } #endif @@ -1161,7 +1849,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; +/* webkit_web_view_load_string((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *, const gchar *, const gchar *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4); + } + } fail: if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); @@ -1178,7 +1874,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_web_view_load_uri((WebKitWebView *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1load_1uri_FUNC); @@ -1191,7 +1895,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1new_FUNC); +/* rc = (jintLong)webkit_web_view_new(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1new_FUNC); return rc; } @@ -1202,7 +1914,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC); +/* webkit_web_view_reload((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC); } #endif @@ -1212,7 +1932,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); +/* webkit_web_view_stop_loading((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h index 90685cf9f9..c0b22e9b8e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h @@ -16,6 +16,7 @@ #ifndef INC_webkitgtk_H #define INC_webkitgtk_H +#include <dlfcn.h> #include <string.h> #include <JavaScriptCore/JSContextRef.h> #include <JavaScriptCore/JSObjectRef.h> @@ -36,4 +37,18 @@ #include <webkit/webkitglobals.h> #endif +#define WebKitGTK_LOAD_FUNCTION(var, name) \ + static int initialized = 0; \ + static void *var = NULL; \ + if (!initialized) { \ + void* handle = dlopen("libwebkit-1.0.so.2", LOAD_FLAGS); /* webkitgtk 1.2.x lib */ \ + if (!handle) { \ + handle = dlopen("libwebkitgtk-1.0.so.0", LOAD_FLAGS); /* webkitgtk 1.4.x lib */ \ + } \ + if (handle) { \ + var = dlsym(handle, #name); \ + } \ + initialized = 1; \ + } + #endif /* INC_webkitgtk_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c index 31b101d3e1..fc12f79ed4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -47,12 +47,10 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1JSValueToBoolean", "_1JSValueToNumber", "_1JSValueToStringCopy", - "_1SOUP_1IS_1SESSION", "_1SoupCookie_1expires", "_1SoupMessage_1method", "_1SoupMessage_1request_1body", "_1SoupMessage_1request_1headers", - "_1WEBKIT_1IS_1WEB_1FRAME", "_1soup_1auth_1authenticate", "_1soup_1auth_1get_1host", "_1soup_1auth_1get_1scheme_1name", @@ -70,6 +68,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1soup_1session_1feature_1attach", "_1soup_1session_1feature_1detach", "_1soup_1session_1get_1feature", + "_1soup_1session_1get_1type", "_1soup_1uri_1free", "_1soup_1uri_1new", "_1soup_1uri_1to_1string", @@ -95,6 +94,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1webkit_1web_1frame_1get_1load_1status", "_1webkit_1web_1frame_1get_1parent", "_1webkit_1web_1frame_1get_1title", + "_1webkit_1web_1frame_1get_1type", "_1webkit_1web_1frame_1get_1uri", "_1webkit_1web_1frame_1get_1web_1view", "_1webkit_1web_1policy_1decision_1download", diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h index 69398a9b36..26aeec72b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -55,12 +55,10 @@ typedef enum { _1JSValueToBoolean_FUNC, _1JSValueToNumber_FUNC, _1JSValueToStringCopy_FUNC, - _1SOUP_1IS_1SESSION_FUNC, _1SoupCookie_1expires_FUNC, _1SoupMessage_1method_FUNC, _1SoupMessage_1request_1body_FUNC, _1SoupMessage_1request_1headers_FUNC, - _1WEBKIT_1IS_1WEB_1FRAME_FUNC, _1soup_1auth_1authenticate_FUNC, _1soup_1auth_1get_1host_FUNC, _1soup_1auth_1get_1scheme_1name_FUNC, @@ -78,6 +76,7 @@ typedef enum { _1soup_1session_1feature_1attach_FUNC, _1soup_1session_1feature_1detach_FUNC, _1soup_1session_1get_1feature_FUNC, + _1soup_1session_1get_1type_FUNC, _1soup_1uri_1free_FUNC, _1soup_1uri_1new_FUNC, _1soup_1uri_1to_1string_FUNC, @@ -103,6 +102,7 @@ typedef enum { _1webkit_1web_1frame_1get_1load_1status_FUNC, _1webkit_1web_1frame_1get_1parent_FUNC, _1webkit_1web_1frame_1get_1title_FUNC, + _1webkit_1web_1frame_1get_1type_FUNC, _1webkit_1web_1frame_1get_1uri_FUNC, _1webkit_1web_1frame_1get_1web_1view_FUNC, _1webkit_1web_1policy_1decision_1download_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 087bd2247f..9bd57205c3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -89,20 +89,10 @@ class WebKit extends WebBrowser { static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc; static { - - /* - * WebKitGTK is binary-incompatible between its 1.2 and 1.4 releases, - * so swt has separate libraries compiled against each. - */ try { - Library.loadLibrary ("swt-webkit12"); // $NON-NLS-1$ + Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ LibraryLoaded = true; } catch (Throwable e) { - try { - Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ - LibraryLoaded = true; - } catch (Throwable e2) { - } } if (LibraryLoaded) { @@ -286,7 +276,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } int /*long*/ webView; - if (WebKitGTK.WEBKIT_IS_WEB_FRAME (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { webView = WebKitGTK.webkit_web_frame_get_web_view (handle); } else { webView = handle; @@ -310,7 +300,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { int /*long*/ webView; - if (WebKitGTK.SOUP_IS_SESSION (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) { webView = user_data; } else { webView = handle; diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java index 01bbe98be5..5540f843f7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java @@ -80,6 +80,7 @@ protected static byte [] ascii (String name) { /** + * @method flags=dynamic * @param definition cast=(const JSClassDefinition*) */ public static final native int /*long*/ _JSClassCreate (int /*long*/ definition); @@ -93,6 +94,7 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) */ public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx); @@ -106,6 +108,7 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param script cast=(JSStringRef) * @param thisObject cast=(JSObjectRef) @@ -123,6 +126,7 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long* } /** + * @method flags=dynamic * @param object cast=(JSObjectRef) */ public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object); @@ -136,6 +140,7 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) @@ -152,6 +157,7 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyIndex cast=(unsigned) @@ -168,6 +174,7 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param jsClass cast=(JSClassRef) * @param data cast=(void *) @@ -183,6 +190,7 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param argumentCount cast=(size_t) * @param arguments cast=(const struct OpaqueJSValue * const*) @@ -199,6 +207,7 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param name cast=(JSStringRef) * @param callAsFunction cast=(JSObjectCallAsFunctionCallback) @@ -214,6 +223,7 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) @@ -232,6 +242,7 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj } /** + * @method flags=dynamic * @param string cast=(const char *) */ public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string); @@ -245,6 +256,7 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native int /*long*/ _JSStringGetLength (int /*long*/ string); @@ -258,6 +270,7 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) { } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string); @@ -271,6 +284,7 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ } /** + * @method flags=dynamic * @param string cast=(JSStringRef) * @param buffer cast=(char *) * @param bufferSize cast=(size_t) @@ -286,6 +300,7 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by } /** + * @method flags=dynamic * @param a cast=(JSStringRef) * @param b cast=(const char *) */ @@ -300,6 +315,7 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native void _JSStringRelease (int /*long*/ string); @@ -313,6 +329,7 @@ public static final void JSStringRelease (int /*long*/ string) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ @@ -327,6 +344,7 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param jsClass cast=(JSClassRef) @@ -342,6 +360,7 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param bool cast=(bool) */ @@ -356,6 +375,7 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param number cast=(double) */ @@ -370,6 +390,7 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param string cast=(JSStringRef) */ @@ -384,6 +405,7 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) */ public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx); @@ -397,6 +419,7 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ @@ -411,6 +434,7 @@ public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value) } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) @@ -426,6 +450,7 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) @@ -443,6 +468,7 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo /* --------------------- start libsoup natives --------------------- */ /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) * @param username cast=(const char *) * @param password cast=(const char *) @@ -458,6 +484,7 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern } /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) */ public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth); @@ -471,6 +498,7 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { } /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) */ public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth); @@ -484,6 +512,7 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param cookie cast=(SoupCookie *) */ @@ -498,6 +527,7 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) */ public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar); @@ -511,6 +541,7 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param cookie cast=(SoupCookie *) */ @@ -525,6 +556,7 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /* } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param uri cast=(SoupURI *) */ @@ -538,6 +570,9 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _soup_cookie_jar_get_type (); public static final int /*long*/ soup_cookie_jar_get_type () { lock.lock(); @@ -549,6 +584,7 @@ public static final int /*long*/ soup_cookie_jar_get_type () { } /** + * @method flags=dynamic * @param header cast=(const char *) * @param origin cast=(SoupURI *) */ @@ -563,73 +599,7 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ } /** - * @method flags=getter - * @param cookie cast=(SoupCookie *) - */ -public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); -public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { - lock.lock(); - try { - return _SoupCookie_expires (cookie); - } finally { - lock.unlock(); - } -} - -public static final native boolean _SOUP_IS_SESSION (int /*long*/ object); -public static final boolean SOUP_IS_SESSION (int /*long*/ object) { - lock.lock(); - try { - return _SOUP_IS_SESSION (object); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=setter - * @param message cast=(SoupMessage *) - * @param method cast=(const char *) - */ -public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); -public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { - lock.lock(); - try { - _SoupMessage_method (message, method); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { - lock.lock(); - try { - return _SoupMessage_request_body (message); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { - lock.lock(); - try { - return _SoupMessage_request_headers (message); - } finally { - lock.unlock(); - } -} - -/** + * @method flags=dynamic * @param body cast=(SoupMessageBody *) * @param use cast=(SoupMemoryUse) * @param data cast=(gconstpointer) @@ -646,6 +616,7 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i } /** + * @method flags=dynamic * @param body cast=(SoupMessageBody *) */ public static final native void _soup_message_body_flatten (int /*long*/ body); @@ -659,6 +630,7 @@ public static final void soup_message_body_flatten (int /*long*/ body) { } /** + * @method flags=dynamic * @param msg cast=(SoupMessage *) */ public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg); @@ -672,6 +644,7 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { } /** + * @method flags=dynamic * @param headers cast=(SoupMessageHeaders *) * @param name cast=(const char *) * @param value cast=(const char *) @@ -687,6 +660,7 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte } /** + * @method flags=dynamic * @param session cast=(SoupSession *) * @param type cast=(GType) */ @@ -701,6 +675,7 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session, } /** + * @method flags=dynamic * @param session cast=(SoupSession *) * @param feature_type cast=(GType) */ @@ -715,6 +690,7 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session, } /** + * @method flags=dynamic * @param feature cast=(SoupSessionFeature *) * @param session cast=(SoupSession *) */ @@ -729,6 +705,20 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int } /** + * @method flags=dynamic + */ +public static final native int _soup_session_get_type (); +public static final int soup_session_get_type () { + lock.lock(); + try { + return _soup_session_get_type (); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=dynamic * @param feature cast=(SoupSessionFeature *) * @param session cast=(SoupSession *) */ @@ -743,6 +733,7 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int } /** + * @method flags=dynamic * @param uri cast=(SoupURI *) */ public static final native void _soup_uri_free (int /*long*/ uri); @@ -756,6 +747,7 @@ public static final void soup_uri_free (int /*long*/ uri) { } /** + * @method flags=dynamic * @param uri_string cast=(const char *) */ public static final native int /*long*/ _soup_uri_new (byte[] uri_string); @@ -769,6 +761,7 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) { } /** + * @method flags=dynamic * @param uri cast=(SoupURI *) */ public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query); @@ -784,6 +777,7 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_ /* --------------------- start WebKitGTK natives --------------------- */ /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native void _webkit_download_cancel (int /*long*/ download); @@ -797,6 +791,7 @@ public static final void webkit_download_cancel (int /*long*/ download) { } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native long _webkit_download_get_current_size (int /*long*/ download); @@ -810,6 +805,7 @@ public static final long webkit_download_get_current_size (int /*long*/ download } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int _webkit_download_get_status (int /*long*/ download); @@ -823,6 +819,7 @@ public static final int webkit_download_get_status (int /*long*/ download) { } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download); @@ -836,6 +833,7 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native long _webkit_download_get_total_size (int /*long*/ download); @@ -849,6 +847,7 @@ public static final long webkit_download_get_total_size (int /*long*/ download) } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download); @@ -862,6 +861,7 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) * @param destination_uri cast=(const gchar *) */ @@ -875,6 +875,9 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_get_default_session (); public static final int /*long*/ webkit_get_default_session () { lock.lock(); @@ -885,16 +888,9 @@ public static final int /*long*/ webkit_get_default_session () { } } -public static final native boolean _WEBKIT_IS_WEB_FRAME (int /*long*/ object); -public static final boolean WEBKIT_IS_WEB_FRAME (int /*long*/ object) { - lock.lock(); - try { - return _WEBKIT_IS_WEB_FRAME (object); - } finally { - lock.unlock(); - } -} - +/** + * @method flags=dynamic + */ public static final native int _webkit_major_version (); public static final int webkit_major_version () { lock.lock(); @@ -905,6 +901,9 @@ public static final int webkit_major_version () { } } +/** + * @method flags=dynamic + */ public static final native int _webkit_micro_version (); public static final int webkit_micro_version () { lock.lock(); @@ -915,6 +914,9 @@ public static final int webkit_micro_version () { } } +/** + * @method flags=dynamic + */ public static final native int _webkit_minor_version (); public static final int webkit_minor_version () { lock.lock(); @@ -926,6 +928,7 @@ public static final int webkit_minor_version () { } /** + * @method flags=dynamic * @param request cast=(WebKitNetworkRequest *) */ public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request); @@ -939,6 +942,7 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long* } /** + * @method flags=dynamic * @param request cast=(WebKitNetworkRequest *) */ public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request); @@ -952,6 +956,7 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re } /** + * @method flags=dynamic * @param uri cast=(const gchar *) */ public static final native int /*long*/ _webkit_network_request_new (byte[] uri); @@ -964,6 +969,9 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) { } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_soup_auth_dialog_get_type (); public static final int /*long*/ webkit_soup_auth_dialog_get_type () { lock.lock(); @@ -975,6 +983,7 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () { } /** + * @method flags=dynamic * @param data_source cast=(WebKitWebDataSource *) */ public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source); @@ -988,6 +997,7 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d } /** + * @method flags=dynamic * @param data_source cast=(WebKitWebDataSource *) */ public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source); @@ -1001,6 +1011,7 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame); @@ -1014,6 +1025,7 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame); @@ -1027,6 +1039,7 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame); @@ -1040,6 +1053,7 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame); @@ -1053,6 +1067,7 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame); @@ -1066,6 +1081,20 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) } /** + * @method flags=dynamic + */ +public static final native int _webkit_web_frame_get_type (); +public static final int webkit_web_frame_get_type () { + lock.lock(); + try { + return _webkit_web_frame_get_type (); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame); @@ -1079,6 +1108,7 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame); @@ -1092,6 +1122,7 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra } /** + * @method flags=dynamic * @param decision cast=(WebKitWebPolicyDecision *) */ public static final native void _webkit_web_policy_decision_download (int /*long*/ decision); @@ -1105,6 +1136,7 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis } /** + * @method flags=dynamic * @param decision cast=(WebKitWebPolicyDecision *) */ public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision); @@ -1118,6 +1150,7 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view); @@ -1131,6 +1164,7 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view); @@ -1144,6 +1178,7 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param mime_type cast=(const gchar *) */ @@ -1158,6 +1193,7 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param script cast=(const gchar *) */ @@ -1172,6 +1208,7 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view, } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view); @@ -1185,6 +1222,7 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view); @@ -1198,6 +1236,7 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native double _webkit_web_view_get_progress (int /*long*/ web_view); @@ -1211,6 +1250,7 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view); @@ -1224,6 +1264,7 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_ } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view); @@ -1237,6 +1278,7 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view); @@ -1250,6 +1292,7 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view); @@ -1263,6 +1306,7 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_go_back (int /*long*/ web_view); @@ -1276,6 +1320,7 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_go_forward (int /*long*/ web_view); @@ -1289,6 +1334,7 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param content cast=(const gchar *) * @param mime_type cast=(const gchar *) @@ -1306,6 +1352,7 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param uri cast=(const gchar *) */ @@ -1319,6 +1366,9 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_web_view_new (); public static final int /*long*/ webkit_web_view_new () { lock.lock(); @@ -1330,6 +1380,7 @@ public static final int /*long*/ webkit_web_view_new () { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_reload (int /*long*/ web_view); @@ -1343,6 +1394,7 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view); @@ -1366,4 +1418,61 @@ public static final native int JSClassDefinition_sizeof (); */ public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size); +/** + * @method flags=getter + * @param cookie cast=(SoupCookie *) + */ +public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); +public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { + lock.lock(); + try { + return _SoupCookie_expires (cookie); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=setter + * @param message cast=(SoupMessage *) + * @param method cast=(const char *) + */ +public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); +public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { + lock.lock(); + try { + _SoupMessage_method (message, method); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_body (message); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_headers (message); + } finally { + lock.unlock(); + } +} + } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h index 583f87673c..f25a2d2c36 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h @@ -22,5 +22,7 @@ #include <WebKitCOMAPI.h> #include "webkit_win32_custom.h" +#define WebKit_LOAD_FUNCTION LOAD_FUNCTION + #endif /* INC_webkit_win32_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp index 5193f7666b..a1860586a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp @@ -88,7 +88,7 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance) rc = (jint)WebKitCreateInstance(lparg0, arg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, WebKitCreateInstance) + WebKit_LOAD_FUNCTION(fp, WebKitCreateInstance) if (fp) { rc = (jint)((jint (*)(jbyte *, jintLong, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3); } diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 412a86bf86..471d758c54 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -93,11 +93,11 @@ <param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="12"/> + <param name="library_count" value="11"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="12"/> + <param name="library_count" value="11"/> <param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/> </antcall> <antcall target="check_fragment_libraries"> @@ -158,7 +158,7 @@ <target name="check_fragment_libraries" depends="get_version"> <echo>Checking ${fragment}</echo> <property name="checkdir" value="~/build/check_libraries"/> - <property name="library_count" value="124"/> + <property name="library_count" value="122"/> <property name="fragment" value=""/> <fileset id="match" dir="${repo.bin}/bundles/${fragment}"> <filename regex="[0-9][0-9][0-9][0-9]."/> |