diff --git a/bindgen/bindings_linux.rs b/bindgen/bindings_linux.rs index a491855..4cba995 100644 --- a/bindgen/bindings_linux.rs +++ b/bindgen/bindings_linux.rs @@ -14794,6 +14794,7 @@ pub const fmx_Locale_Type_kType_CES: fmx_Locale_Type = 18; pub const fmx_Locale_Type_kType_DAN: fmx_Locale_Type = 19; pub const fmx_Locale_Type_kType_NLD: fmx_Locale_Type = 20; pub const fmx_Locale_Type_kType_ENG: fmx_Locale_Type = 21; +pub const fmx_Locale_Type_kType_ENG_INTL: fmx_Locale_Type = 77; pub const fmx_Locale_Type_kType_FIN: fmx_Locale_Type = 22; pub const fmx_Locale_Type_kType_FIN_fmi: fmx_Locale_Type = 23; pub const fmx_Locale_Type_kType_FRA: fmx_Locale_Type = 24; @@ -14866,44 +14867,6 @@ fn bindgen_test_layout_fmx_Locale() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_QuadCharAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_QuadCharAutoPtr_UpCaster = fmx_QuadCharAutoPtr; -#[test] -fn bindgen_test_layout_fmx_QuadCharAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_QuadCharAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_QuadCharAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_LocaleAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_LocaleAutoPtr_UpCaster = fmx_LocaleAutoPtr; -#[test] -fn bindgen_test_layout_fmx_LocaleAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_LocaleAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_LocaleAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_QuadCharUniquePtr { pub _base: std_unique_ptr, } @@ -14960,25 +14923,6 @@ fn bindgen_test_layout_fmx_BinaryData() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_BinaryDataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_BinaryDataAutoPtr_UpCaster = fmx_BinaryDataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_BinaryDataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_BinaryDataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_BinaryDataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_BinaryDataUniquePtr { pub _base: std_unique_ptr, } @@ -15045,15 +14989,6 @@ pub type fmx_ExtPluginType = ::std::option::Option< pub struct fmx_ExprEnv { pub _address: u8, } -pub const fmx_ExprEnv_kMayEvaluateOnServer: fmx_ExprEnv__bindgen_ty_1 = 1; -pub const fmx_ExprEnv_kDisplayCalcFields: fmx_ExprEnv__bindgen_ty_1 = 256; -pub const fmx_ExprEnv_kDisplayAutoEnter: fmx_ExprEnv__bindgen_ty_1 = 512; -pub const fmx_ExprEnv_kDisplayValidation: fmx_ExprEnv__bindgen_ty_1 = 1024; -pub const fmx_ExprEnv_kDisplayCustomFunctions: fmx_ExprEnv__bindgen_ty_1 = 2048; -pub const fmx_ExprEnv_kDisplayPrivileges: fmx_ExprEnv__bindgen_ty_1 = 4096; -pub const fmx_ExprEnv_kDisplayInFuture1: fmx_ExprEnv__bindgen_ty_1 = 8192; -pub const fmx_ExprEnv_kDisplayInFuture2: fmx_ExprEnv__bindgen_ty_1 = 16384; -pub const fmx_ExprEnv_kDisplayGeneric: fmx_ExprEnv__bindgen_ty_1 = 32768; pub const fmx_ExprEnv_kDisplayInAllDialogs: fmx_ExprEnv__bindgen_ty_1 = 65280; pub const fmx_ExprEnv_kMacCompatible: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kWinCompatible: fmx_ExprEnv__bindgen_ty_1 = 4; @@ -15194,6 +15129,25 @@ pub const fmx_ExprEnv_kGet_UUIDNumber: fmx_ExprEnv__bindgen_ty_1 = 1122; pub const fmx_ExprEnv_kGet_OpenDataFileInfo: fmx_ExprEnv__bindgen_ty_1 = 1123; pub const fmx_ExprEnv_kGet_AccountType: fmx_ExprEnv__bindgen_ty_1 = 1124; pub const fmx_ExprEnv_kGet_PageCount: fmx_ExprEnv__bindgen_ty_1 = 1125; + +pub const fmx_ExprEnv_kGet_SystemLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1126; +pub const fmx_ExprEnv_kGet_FileLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1127; +pub const fmx_ExprEnv_kGet_InstalledFMPluginsAsJSON: fmx_ExprEnv__bindgen_ty_1 = 1128; +// New to FileMaker Pro 19.4.1 +pub const fmx_ExprEnv_kGet_kGet_SessionIdentifier: fmx_ExprEnv__bindgen_ty_1 = 1129; +// New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release +pub const fmx_ExprEnv_kGet_CacheFileName: fmx_ExprEnv__bindgen_ty_1 = 1130; +pub const fmx_ExprEnv_kGet_CacheFilePath: fmx_ExprEnv__bindgen_ty_1 = 1131; +// New to FileMaker Pro 19.6 +pub const fmx_ExprEnv_kGet_TransactionState: fmx_ExprEnv__bindgen_ty_1 = 1132; +pub const fmx_ExprEnv_kGet_CurrentTimeUTCMicroseconds: fmx_ExprEnv__bindgen_ty_1 = 1133; +pub const fmx_ExprEnv_kGet_LastErrorLocation: fmx_ExprEnv__bindgen_ty_1 = 1134; +// New to FileMaker Pro 21.0 +pub const fmx_ExprEnv_kGet_LLMLastStepTokensUsed: fmx_ExprEnv__bindgen_ty_1 = 1135; +// New to FileMaker Pro 21.1 +pub const fmx_ExprEnv_kGet_RevertTransactionOnErrorState: fmx_ExprEnv__bindgen_ty_1 = 1136; +pub const fmx_ExprEnv_kGet_SystemStorageAvailable: fmx_ExprEnv__bindgen_ty_1 = 1137; + pub const fmx_ExprEnv_kConvert_PosixPath: fmx_ExprEnv__bindgen_ty_1 = 1; pub const fmx_ExprEnv_kConvert_WinPath: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kConvert_URLPath: fmx_ExprEnv__bindgen_ty_1 = 3; @@ -15213,63 +15167,6 @@ fn bindgen_test_layout_fmx_ExprEnv() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataVectAutoPtr_UpCaster = fmx_DataVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_RowVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_RowVectAutoPtr_UpCaster = fmx_RowVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_RowVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_RowVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_RowVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_ExprEnvAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_ExprEnvAutoPtr_UpCaster = fmx_ExprEnvAutoPtr; -#[test] -fn bindgen_test_layout_fmx_ExprEnvAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_ExprEnvAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_ExprEnvAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataVectUniquePtr { pub _base: std_unique_ptr, } @@ -15510,25 +15407,6 @@ fn bindgen_test_layout_fmx_Data() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataAutoPtr_UpCaster = fmx_DataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataUniquePtr { pub _base: std_unique_ptr, } @@ -15566,25 +15444,6 @@ fn bindgen_test_layout_fmx_DateTime() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DateTimeAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DateTimeAutoPtr_UpCaster = fmx_DateTimeAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DateTimeAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DateTimeAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DateTimeAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DateTimeUniquePtr { pub _base: std_unique_ptr, } @@ -15624,25 +15483,6 @@ fn bindgen_test_layout_fmx_FixPt() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_FixPtAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_FixPtAutoPtr_UpCaster = fmx_FixPtAutoPtr; -#[test] -fn bindgen_test_layout_fmx_FixPtAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_FixPtAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_FixPtAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_FixPtUniquePtr { pub _base: std_unique_ptr, } @@ -15721,25 +15561,6 @@ fn bindgen_test_layout_fmx_Text() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_TextAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_TextAutoPtr_UpCaster = fmx_TextAutoPtr; -#[test] -fn bindgen_test_layout_fmx_TextAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_TextAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_TextAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_TextUniquePtr { pub _base: std_unique_ptr, } @@ -17000,15 +16821,6 @@ extern "C" { extern "C" { pub fn FM_Data_Delete(_self: *mut ::std::os::raw::c_void, _x: *mut fmx__fmxcpt); } -extern "C" { - pub fn FM_Data_GetFontID( - _self: *const ::std::os::raw::c_void, - fontDisplayName: *const fmx_Text, - fontScript: fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> fmx_CharacterStyle_FontID; -} extern "C" { pub fn FM_Data_GetPostscriptFontID( _self: *const ::std::os::raw::c_void, @@ -17017,16 +16829,6 @@ extern "C" { _x: *mut fmx__fmxcpt, ) -> fmx_CharacterStyle_FontID; } -extern "C" { - pub fn FM_Data_GetFontInfo( - _self: *const ::std::os::raw::c_void, - font: fmx_CharacterStyle_FontID, - fontDisplayName: *mut fmx_Text, - fontScript: *mut fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> bool; -} extern "C" { pub fn FM_Data_GetPostscriptFontInfo( _self: *const ::std::os::raw::c_void, diff --git a/bindgen/bindings_mac.rs b/bindgen/bindings_mac.rs index 87dc391..6156a72 100644 --- a/bindgen/bindings_mac.rs +++ b/bindgen/bindings_mac.rs @@ -18693,6 +18693,7 @@ pub const fmx_Locale_Type_kType_CES: fmx_Locale_Type = 18; pub const fmx_Locale_Type_kType_DAN: fmx_Locale_Type = 19; pub const fmx_Locale_Type_kType_NLD: fmx_Locale_Type = 20; pub const fmx_Locale_Type_kType_ENG: fmx_Locale_Type = 21; +pub const fmx_Locale_Type_kType_ENG_INTL: fmx_Locale_Type = 77; pub const fmx_Locale_Type_kType_FIN: fmx_Locale_Type = 22; pub const fmx_Locale_Type_kType_FIN_fmi: fmx_Locale_Type = 23; pub const fmx_Locale_Type_kType_FRA: fmx_Locale_Type = 24; @@ -18765,44 +18766,6 @@ fn bindgen_test_layout_fmx_Locale() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_QuadCharAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_QuadCharAutoPtr_UpCaster = fmx_QuadCharAutoPtr; -#[test] -fn bindgen_test_layout_fmx_QuadCharAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_QuadCharAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_QuadCharAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_LocaleAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_LocaleAutoPtr_UpCaster = fmx_LocaleAutoPtr; -#[test] -fn bindgen_test_layout_fmx_LocaleAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_LocaleAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_LocaleAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_QuadCharUniquePtr { pub _base: std_unique_ptr, } @@ -18859,25 +18822,6 @@ fn bindgen_test_layout_fmx_BinaryData() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_BinaryDataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_BinaryDataAutoPtr_UpCaster = fmx_BinaryDataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_BinaryDataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_BinaryDataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_BinaryDataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_BinaryDataUniquePtr { pub _base: std_unique_ptr, } @@ -18944,15 +18888,6 @@ pub type fmx_ExtPluginType = ::std::option::Option< pub struct fmx_ExprEnv { pub _address: u8, } -pub const fmx_ExprEnv_kMayEvaluateOnServer: fmx_ExprEnv__bindgen_ty_1 = 1; -pub const fmx_ExprEnv_kDisplayCalcFields: fmx_ExprEnv__bindgen_ty_1 = 256; -pub const fmx_ExprEnv_kDisplayAutoEnter: fmx_ExprEnv__bindgen_ty_1 = 512; -pub const fmx_ExprEnv_kDisplayValidation: fmx_ExprEnv__bindgen_ty_1 = 1024; -pub const fmx_ExprEnv_kDisplayCustomFunctions: fmx_ExprEnv__bindgen_ty_1 = 2048; -pub const fmx_ExprEnv_kDisplayPrivileges: fmx_ExprEnv__bindgen_ty_1 = 4096; -pub const fmx_ExprEnv_kDisplayInFuture1: fmx_ExprEnv__bindgen_ty_1 = 8192; -pub const fmx_ExprEnv_kDisplayInFuture2: fmx_ExprEnv__bindgen_ty_1 = 16384; -pub const fmx_ExprEnv_kDisplayGeneric: fmx_ExprEnv__bindgen_ty_1 = 32768; pub const fmx_ExprEnv_kDisplayInAllDialogs: fmx_ExprEnv__bindgen_ty_1 = 65280; pub const fmx_ExprEnv_kMacCompatible: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kWinCompatible: fmx_ExprEnv__bindgen_ty_1 = 4; @@ -19093,6 +19028,25 @@ pub const fmx_ExprEnv_kGet_UUIDNumber: fmx_ExprEnv__bindgen_ty_1 = 1122; pub const fmx_ExprEnv_kGet_OpenDataFileInfo: fmx_ExprEnv__bindgen_ty_1 = 1123; pub const fmx_ExprEnv_kGet_AccountType: fmx_ExprEnv__bindgen_ty_1 = 1124; pub const fmx_ExprEnv_kGet_PageCount: fmx_ExprEnv__bindgen_ty_1 = 1125; + +pub const fmx_ExprEnv_kGet_SystemLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1126; +pub const fmx_ExprEnv_kGet_FileLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1127; +pub const fmx_ExprEnv_kGet_InstalledFMPluginsAsJSON: fmx_ExprEnv__bindgen_ty_1 = 1128; +// New to FileMaker Pro 19.4.1 +pub const fmx_ExprEnv_kGet_kGet_SessionIdentifier: fmx_ExprEnv__bindgen_ty_1 = 1129; +// New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release +pub const fmx_ExprEnv_kGet_CacheFileName: fmx_ExprEnv__bindgen_ty_1 = 1130; +pub const fmx_ExprEnv_kGet_CacheFilePath: fmx_ExprEnv__bindgen_ty_1 = 1131; +// New to FileMaker Pro 19.6 +pub const fmx_ExprEnv_kGet_TransactionState: fmx_ExprEnv__bindgen_ty_1 = 1132; +pub const fmx_ExprEnv_kGet_CurrentTimeUTCMicroseconds: fmx_ExprEnv__bindgen_ty_1 = 1133; +pub const fmx_ExprEnv_kGet_LastErrorLocation: fmx_ExprEnv__bindgen_ty_1 = 1134; +// New to FileMaker Pro 21.0 +pub const fmx_ExprEnv_kGet_LLMLastStepTokensUsed: fmx_ExprEnv__bindgen_ty_1 = 1135; +// New to FileMaker Pro 21.1 +pub const fmx_ExprEnv_kGet_RevertTransactionOnErrorState: fmx_ExprEnv__bindgen_ty_1 = 1136; +pub const fmx_ExprEnv_kGet_SystemStorageAvailable: fmx_ExprEnv__bindgen_ty_1 = 1137; + pub const fmx_ExprEnv_kConvert_PosixPath: fmx_ExprEnv__bindgen_ty_1 = 1; pub const fmx_ExprEnv_kConvert_WinPath: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kConvert_URLPath: fmx_ExprEnv__bindgen_ty_1 = 3; @@ -19112,63 +19066,6 @@ fn bindgen_test_layout_fmx_ExprEnv() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataVectAutoPtr_UpCaster = fmx_DataVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_RowVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_RowVectAutoPtr_UpCaster = fmx_RowVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_RowVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_RowVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_RowVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_ExprEnvAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_ExprEnvAutoPtr_UpCaster = fmx_ExprEnvAutoPtr; -#[test] -fn bindgen_test_layout_fmx_ExprEnvAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_ExprEnvAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_ExprEnvAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataVectUniquePtr { pub _base: std_unique_ptr, } @@ -19409,25 +19306,6 @@ fn bindgen_test_layout_fmx_Data() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataAutoPtr_UpCaster = fmx_DataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataUniquePtr { pub _base: std_unique_ptr, } @@ -19465,25 +19343,6 @@ fn bindgen_test_layout_fmx_DateTime() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DateTimeAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DateTimeAutoPtr_UpCaster = fmx_DateTimeAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DateTimeAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DateTimeAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DateTimeAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DateTimeUniquePtr { pub _base: std_unique_ptr, } @@ -19523,25 +19382,6 @@ fn bindgen_test_layout_fmx_FixPt() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_FixPtAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_FixPtAutoPtr_UpCaster = fmx_FixPtAutoPtr; -#[test] -fn bindgen_test_layout_fmx_FixPtAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_FixPtAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_FixPtAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_FixPtUniquePtr { pub _base: std_unique_ptr, } @@ -19620,25 +19460,6 @@ fn bindgen_test_layout_fmx_Text() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_TextAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_TextAutoPtr_UpCaster = fmx_TextAutoPtr; -#[test] -fn bindgen_test_layout_fmx_TextAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_TextAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_TextAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_TextUniquePtr { pub _base: std_unique_ptr, } @@ -20899,15 +20720,6 @@ extern "C" { extern "C" { pub fn FM_Data_Delete(_self: *mut ::std::os::raw::c_void, _x: *mut fmx__fmxcpt); } -extern "C" { - pub fn FM_Data_GetFontID( - _self: *const ::std::os::raw::c_void, - fontDisplayName: *const fmx_Text, - fontScript: fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> fmx_CharacterStyle_FontID; -} extern "C" { pub fn FM_Data_GetPostscriptFontID( _self: *const ::std::os::raw::c_void, @@ -20916,16 +20728,6 @@ extern "C" { _x: *mut fmx__fmxcpt, ) -> fmx_CharacterStyle_FontID; } -extern "C" { - pub fn FM_Data_GetFontInfo( - _self: *const ::std::os::raw::c_void, - font: fmx_CharacterStyle_FontID, - fontDisplayName: *mut fmx_Text, - fontScript: *mut fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> bool; -} extern "C" { pub fn FM_Data_GetPostscriptFontInfo( _self: *const ::std::os::raw::c_void, diff --git a/bindgen/bindings_win.rs b/bindgen/bindings_win.rs index f9626f9..bf5d5ee 100644 --- a/bindgen/bindings_win.rs +++ b/bindgen/bindings_win.rs @@ -11381,44 +11381,6 @@ fn bindgen_test_layout_fmx_Locale() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_QuadCharAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_QuadCharAutoPtr_UpCaster = fmx_QuadCharAutoPtr; -#[test] -fn bindgen_test_layout_fmx_QuadCharAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_QuadCharAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_QuadCharAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_LocaleAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_LocaleAutoPtr_UpCaster = fmx_LocaleAutoPtr; -#[test] -fn bindgen_test_layout_fmx_LocaleAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_LocaleAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_LocaleAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_QuadCharUniquePtr { pub _base: std_unique_ptr, } @@ -11475,25 +11437,6 @@ fn bindgen_test_layout_fmx_BinaryData() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_BinaryDataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_BinaryDataAutoPtr_UpCaster = fmx_BinaryDataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_BinaryDataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_BinaryDataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_BinaryDataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_BinaryDataUniquePtr { pub _base: std_unique_ptr, } @@ -11560,15 +11503,8 @@ pub type fmx_ExtPluginType = ::std::option::Option< pub struct fmx_ExprEnv { pub _address: u8, } -pub const fmx_ExprEnv_kMayEvaluateOnServer: fmx_ExprEnv__bindgen_ty_1 = 1; -pub const fmx_ExprEnv_kDisplayCalcFields: fmx_ExprEnv__bindgen_ty_1 = 256; -pub const fmx_ExprEnv_kDisplayAutoEnter: fmx_ExprEnv__bindgen_ty_1 = 512; -pub const fmx_ExprEnv_kDisplayValidation: fmx_ExprEnv__bindgen_ty_1 = 1024; -pub const fmx_ExprEnv_kDisplayCustomFunctions: fmx_ExprEnv__bindgen_ty_1 = 2048; -pub const fmx_ExprEnv_kDisplayPrivileges: fmx_ExprEnv__bindgen_ty_1 = 4096; -pub const fmx_ExprEnv_kDisplayInFuture1: fmx_ExprEnv__bindgen_ty_1 = 8192; -pub const fmx_ExprEnv_kDisplayInFuture2: fmx_ExprEnv__bindgen_ty_1 = 16384; -pub const fmx_ExprEnv_kDisplayGeneric: fmx_ExprEnv__bindgen_ty_1 = 32768; + + pub const fmx_ExprEnv_kDisplayInAllDialogs: fmx_ExprEnv__bindgen_ty_1 = 65280; pub const fmx_ExprEnv_kMacCompatible: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kWinCompatible: fmx_ExprEnv__bindgen_ty_1 = 4; @@ -11709,6 +11645,25 @@ pub const fmx_ExprEnv_kGet_UUIDNumber: fmx_ExprEnv__bindgen_ty_1 = 1122; pub const fmx_ExprEnv_kGet_OpenDataFileInfo: fmx_ExprEnv__bindgen_ty_1 = 1123; pub const fmx_ExprEnv_kGet_AccountType: fmx_ExprEnv__bindgen_ty_1 = 1124; pub const fmx_ExprEnv_kGet_PageCount: fmx_ExprEnv__bindgen_ty_1 = 1125; + +pub const fmx_ExprEnv_kGet_SystemLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1126; +pub const fmx_ExprEnv_kGet_FileLocaleElements: fmx_ExprEnv__bindgen_ty_1 = 1127; +pub const fmx_ExprEnv_kGet_InstalledFMPluginsAsJSON: fmx_ExprEnv__bindgen_ty_1 = 1128; +// New to FileMaker Pro 19.4.1 +pub const fmx_ExprEnv_kGet_kGet_SessionIdentifier: fmx_ExprEnv__bindgen_ty_1 = 1129; +// New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release +pub const fmx_ExprEnv_kGet_CacheFileName: fmx_ExprEnv__bindgen_ty_1 = 1130; +pub const fmx_ExprEnv_kGet_CacheFilePath: fmx_ExprEnv__bindgen_ty_1 = 1131; +// New to FileMaker Pro 19.6 +pub const fmx_ExprEnv_kGet_TransactionState: fmx_ExprEnv__bindgen_ty_1 = 1132; +pub const fmx_ExprEnv_kGet_CurrentTimeUTCMicroseconds: fmx_ExprEnv__bindgen_ty_1 = 1133; +pub const fmx_ExprEnv_kGet_LastErrorLocation: fmx_ExprEnv__bindgen_ty_1 = 1134; +// New to FileMaker Pro 21.0 +pub const fmx_ExprEnv_kGet_LLMLastStepTokensUsed: fmx_ExprEnv__bindgen_ty_1 = 1135; +// New to FileMaker Pro 21.1 +pub const fmx_ExprEnv_kGet_RevertTransactionOnErrorState: fmx_ExprEnv__bindgen_ty_1 = 1136; +pub const fmx_ExprEnv_kGet_SystemStorageAvailable: fmx_ExprEnv__bindgen_ty_1 = 1137; + pub const fmx_ExprEnv_kConvert_PosixPath: fmx_ExprEnv__bindgen_ty_1 = 1; pub const fmx_ExprEnv_kConvert_WinPath: fmx_ExprEnv__bindgen_ty_1 = 2; pub const fmx_ExprEnv_kConvert_URLPath: fmx_ExprEnv__bindgen_ty_1 = 3; @@ -11728,63 +11683,6 @@ fn bindgen_test_layout_fmx_ExprEnv() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataVectAutoPtr_UpCaster = fmx_DataVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_RowVectAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_RowVectAutoPtr_UpCaster = fmx_RowVectAutoPtr; -#[test] -fn bindgen_test_layout_fmx_RowVectAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_RowVectAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_RowVectAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] -pub struct fmx_ExprEnvAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_ExprEnvAutoPtr_UpCaster = fmx_ExprEnvAutoPtr; -#[test] -fn bindgen_test_layout_fmx_ExprEnvAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_ExprEnvAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_ExprEnvAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataVectUniquePtr { pub _base: std_unique_ptr, } @@ -12025,25 +11923,6 @@ fn bindgen_test_layout_fmx_Data() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DataAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DataAutoPtr_UpCaster = fmx_DataAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DataAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DataAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DataAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DataUniquePtr { pub _base: std_unique_ptr, } @@ -12081,25 +11960,6 @@ fn bindgen_test_layout_fmx_DateTime() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_DateTimeAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_DateTimeAutoPtr_UpCaster = fmx_DateTimeAutoPtr; -#[test] -fn bindgen_test_layout_fmx_DateTimeAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_DateTimeAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_DateTimeAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_DateTimeUniquePtr { pub _base: std_unique_ptr, } @@ -12139,25 +11999,6 @@ fn bindgen_test_layout_fmx_FixPt() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_FixPtAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_FixPtAutoPtr_UpCaster = fmx_FixPtAutoPtr; -#[test] -fn bindgen_test_layout_fmx_FixPtAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_FixPtAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_FixPtAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_FixPtUniquePtr { pub _base: std_unique_ptr, } @@ -12236,25 +12077,6 @@ fn bindgen_test_layout_fmx_Text() { } #[repr(C)] #[derive(Debug)] -pub struct fmx_TextAutoPtr { - pub _base: std_auto_ptr, -} -pub type fmx_TextAutoPtr_UpCaster = fmx_TextAutoPtr; -#[test] -fn bindgen_test_layout_fmx_TextAutoPtr() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(fmx_TextAutoPtr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(fmx_TextAutoPtr)) - ); -} -#[repr(C)] -#[derive(Debug)] pub struct fmx_TextUniquePtr { pub _base: std_unique_ptr, } @@ -13359,15 +13181,6 @@ extern "C" { extern "C" { pub fn FM_Data_Delete(_self: *mut ::std::os::raw::c_void, _x: *mut fmx__fmxcpt); } -extern "C" { - pub fn FM_Data_GetFontID( - _self: *const ::std::os::raw::c_void, - fontDisplayName: *const fmx_Text, - fontScript: fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> fmx_CharacterStyle_FontID; -} extern "C" { pub fn FM_Data_GetPostscriptFontID( _self: *const ::std::os::raw::c_void, @@ -13376,16 +13189,6 @@ extern "C" { _x: *mut fmx__fmxcpt, ) -> fmx_CharacterStyle_FontID; } -extern "C" { - pub fn FM_Data_GetFontInfo( - _self: *const ::std::os::raw::c_void, - font: fmx_CharacterStyle_FontID, - fontDisplayName: *mut fmx_Text, - fontScript: *mut fmx_CharacterStyle_FontScript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> bool; -} extern "C" { pub fn FM_Data_GetPostscriptFontInfo( _self: *const ::std::os::raw::c_void, diff --git a/headers/FMXBinaryData.h b/headers/FMXBinaryData.h index fea1b50..711f41d 100644 --- a/headers/FMXBinaryData.h +++ b/headers/FMXBinaryData.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -130,29 +130,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED BinaryDataAutoPtr : public std::auto_ptr - { - typedef BinaryDataAutoPtr UpCaster; - public: - inline BinaryDataAutoPtr (); - inline BinaryDataAutoPtr ( const BinaryData &sourceData ); - - // New to FileMaker Pro 13 (API VERSION 54) and later - // This method sets the FNAM, SIZE, main stream, and all other information streams - // for the given data. The extension of the file name passed in is used to determine - // the type of data passed in the buffer. This routine does not read data from the - // disk itself. Please use this to do "Insert from..." type operations. - inline BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ); - - // New to FileMaker Pro 14 (API VERSION 55) and later - // Same as the above constructor except use AddAppend/AddFinish for the data - inline BinaryDataAutoPtr ( const Text &name, uint32* context ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class BinaryDataUniquePtr : public std::unique_ptr { typedef BinaryDataUniquePtr UpCaster; @@ -163,7 +140,6 @@ extern "C++" inline BinaryDataUniquePtr ( const Text &name, uint32 amount, void *buffer ); inline BinaryDataUniquePtr ( const Text &name, uint32* context ); }; -#endif } } @@ -293,34 +269,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline BinaryDataAutoPtr::BinaryDataAutoPtr () - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor1 ( _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const BinaryData &sourceData ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor2 ( sourceData, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor3 ( name, amount, buffer, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, fmx::uint32* context ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline BinaryDataUniquePtr::BinaryDataUniquePtr () { _fmxcpt _x; @@ -345,7 +293,6 @@ extern "C++" reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); _x.Check (); } -#endif inline errcode BinaryData::GetFNAMData ( Text &filepathlist ) const { diff --git a/headers/FMXCalcEngine.h b/headers/FMXCalcEngine.h index 35a85eb..0e78378 100644 --- a/headers/FMXCalcEngine.h +++ b/headers/FMXCalcEngine.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2020 Claris International Inc. + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -90,22 +90,6 @@ extern "C++" public: enum { - // DEPRECATED in FileMaker Pro 12. The server database process no longer loads plug-ins. Stored calculations - // containing plug-in functions will not evaluate the same way they do on a client with the plug-in if a - // schema change forces the server to recalculate the stored calculation's value. - kMayEvaluateOnServer = 0x00000001, - - // DEPRECATED in FileMaker Pro 16. All the following flags will be ignored for the commented purpose in version - // 16 and later. Note the change of kDisplayInAllDialogs further below. - kDisplayCalcFields = 0x00000100, // Calculated fields - kDisplayAutoEnter = 0x00000200, // Auto enter calculation - kDisplayValidation = 0x00000400, // Validation by calculation - kDisplayCustomFunctions = 0x00000800, // Custom function definition - kDisplayPrivileges = 0x00001000, // Row level access calculations - kDisplayInFuture1 = 0x00002000, // As yet undefined calculation dialog - kDisplayInFuture2 = 0x00004000, // As yet undefined calculation dialog - kDisplayGeneric = 0x00008000, // Dialog used by scripting and replace - // Changed in FileMaker Pro 16v2. If any of these bits are set, the function will be displayed in any picking // UI control. Future functions should use this constant if they want to be displayed. The function can always // be typed in manually. @@ -257,11 +241,33 @@ extern "C++" kGet_OpenDataFileInfo = 1123, kGet_AccountType = 1124, kGet_PageCount = 1125, - + kGet_SystemLocaleElements = 1126, + kGet_FileLocaleElements = 1127, + kGet_InstalledFMPluginsAsJSON = 1128, + + // New to FileMaker Pro 19.4.1 + kGet_SessionIdentifier = 1129, + + // New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release + kGet_CacheFileName = 1130, + kGet_CacheFilePath = 1131, + // New to FileMaker Pro 19 (API VERSION 62) and later. For new EvaluateConvert... entry points kConvert_PosixPath = 1, kConvert_WinPath = 2, - kConvert_URLPath = 3 + kConvert_URLPath = 3, + + // New to FileMaker Pro 19.6 + kGet_TransactionState = 1132, + kGet_CurrentTimeUTCMicroseconds = 1133, + kGet_LastErrorLocation = 1134, + + // New to FileMaker Pro 21.0 + kGet_LLMLastStepTokensUsed = 1135, + + // New to FileMaker Pro 21.1 + kGet_RevertTransactionOnErrorState = 1136, + kGet_SystemStorageAvailable = 1137, }; inline errcode Evaluate ( const Text &expression, Data &result ) const; @@ -354,33 +360,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataVectAutoPtr : public std::auto_ptr - { - typedef DataVectAutoPtr UpCaster; - public: - inline DataVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED RowVectAutoPtr : public std::auto_ptr - { - typedef RowVectAutoPtr UpCaster; - public: - inline RowVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ExprEnvAutoPtr : public std::auto_ptr - { - typedef ExprEnvAutoPtr UpCaster; - public: - inline ExprEnvAutoPtr (); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataVectUniquePtr : public std::unique_ptr { typedef DataVectUniquePtr UpCaster; @@ -401,7 +380,6 @@ extern "C++" public: inline ExprEnvUniquePtr (); }; -#endif } } @@ -437,9 +415,6 @@ extern "C" fmx::errcode FMX_API FM_ExprEnv_EvaluateGetFunction ( const void *_self, short functionValue, fmx::Data &result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertToFileMakerPath ( const void *_self, const fmx::Text &inPath, fmx::int32 inFormat, fmx::Text &outFMPath, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertFromFileMakerPath ( const void *_self, const fmx::Text &inFMPath, fmx::int32 inFormat, fmx::Text &outPath, fmx::_fmxcpt &_x ) throw (); -#if FMX_OBSOLETE_API - DEPRECATED fmx::errcode FMX_API FM_ExprEnv_ExecuteSQL ( const void *_self, const fmx::Text &expression, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); -#endif fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQL ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::RowVect& result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQLTextResult ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_RegisterExternalFunction ( const fmx::QuadChar &pluginId, short functionId, const fmx::Text &functionName, const fmx::Text &functionPrototype, short minArgs, short maxArgs, fmx::uint32 compatibleOnFlags, fmx::ExtPluginType funcPtr, fmx::_fmxcpt &_x ) throw (); @@ -553,23 +528,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataVectAutoPtr::DataVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_DataVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataVectUniquePtr::DataVectUniquePtr () { _fmxcpt _x; reset ( FM_DataVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline uint32 RowVect::Size () const { @@ -599,23 +563,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline RowVectAutoPtr::RowVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_RowVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline RowVectUniquePtr::RowVectUniquePtr () { _fmxcpt _x; reset ( FM_RowVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline errcode ExprEnv::Evaluate ( const Text &expression, Data &result ) const { @@ -715,23 +668,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ExprEnvAutoPtr::ExprEnvAutoPtr () - { - _fmxcpt _x; - reset ( FM_ExprEnv_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ExprEnvUniquePtr::ExprEnvUniquePtr () { _fmxcpt _x; reset ( FM_ExprEnv_Constructor1 ( _x ) ); _x.Check (); } -#endif } } diff --git a/headers/FMXClient.h b/headers/FMXClient.h index d0edfd3..ffa35f0 100644 --- a/headers/FMXClient.h +++ b/headers/FMXClient.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely diff --git a/headers/FMXData.h b/headers/FMXData.h index 9876d25..e27428e 100644 --- a/headers/FMXData.h +++ b/headers/FMXData.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -94,10 +94,6 @@ extern "C++" // GetFontInfo will return false if the given font id is not found in the database - // New to FileMaker Pro 8 (API VERSION 51) and later - DEPRECATED inline CharacterStyle::FontID GetFontID ( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const; - DEPRECATED inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const; - // New to FileMaker Pro 14 (API VERSION 55) and later inline CharacterStyle::FontID GetFontID ( const Text &fontPostscriptName, const ExprEnv &env ) const; inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const; @@ -108,18 +104,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataAutoPtr : public std::auto_ptr - { - typedef DataAutoPtr UpCaster; - public: - inline DataAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataUniquePtr : public std::unique_ptr { typedef DataUniquePtr UpCaster; @@ -127,7 +111,6 @@ extern "C++" inline DataUniquePtr (); }; -#endif } } @@ -160,9 +143,7 @@ extern "C" void FMX_API FM_Data_SetBinaryData ( void *_self, const fmx::BinaryData &binaryData, bool forceBinaryNativeType, fmx::_fmxcpt &_x ) throw (); void FMX_API FM_Data_Delete ( void *_self, fmx::_fmxcpt &_x ) throw (); - fmx::CharacterStyle::FontID FMX_API FM_Data_GetFontID ( const void *_self, const fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); fmx::CharacterStyle::FontID FMX_API FM_Data_GetPostscriptFontID ( const void *_self, const fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); - bool FMX_API FM_Data_GetFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript &fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); bool FMX_API FM_Data_GetPostscriptFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); } @@ -318,31 +299,13 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataAutoPtr::DataAutoPtr () - { - _fmxcpt _x; - reset ( FM_Data_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataUniquePtr::DataUniquePtr () { _fmxcpt _x; reset ( FM_Data_Constructor1 ( _x ) ); _x.Check (); } -#endif - inline CharacterStyle::FontID Data::GetFontID( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - CharacterStyle::FontID _rtn = FM_Data_GetFontID ( this, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } inline CharacterStyle::FontID Data::GetFontID( const Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; @@ -350,13 +313,6 @@ extern "C++" _x.Check (); return _rtn; } - inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - bool _rtn = FM_Data_GetFontInfo ( this, font, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; diff --git a/headers/FMXDateTime.h b/headers/FMXDateTime.h index bb38183..f2f18c0 100644 --- a/headers/FMXDateTime.h +++ b/headers/FMXDateTime.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -80,19 +80,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DateTimeAutoPtr : public std::auto_ptr - { - typedef DateTimeAutoPtr UpCaster; - public: - inline DateTimeAutoPtr (); - inline DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); - inline DateTimeAutoPtr ( const Text &dateText, const Locale &intl ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DateTimeUniquePtr : public std::unique_ptr { typedef DateTimeUniquePtr UpCaster; @@ -101,7 +88,6 @@ extern "C++" inline DateTimeUniquePtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); inline DateTimeUniquePtr ( const Text &dateText, const Locale &intl ); }; -#endif } } @@ -336,28 +322,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DateTimeAutoPtr::DateTimeAutoPtr () - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor1 ( _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor2 ( dateString, dateLength, intl, _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const Text &dateText, const Locale &intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DateTimeUniquePtr::DateTimeUniquePtr () { _fmxcpt _x; @@ -376,7 +340,6 @@ extern "C++" reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); _x.Check (); } -#endif } } diff --git a/headers/FMXExtern.h b/headers/FMXExtern.h index 81b51ee..31122b5 100644 --- a/headers/FMXExtern.h +++ b/headers/FMXExtern.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2020 Claris International Inc. + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -36,7 +36,7 @@ // Platform specific macros -#if defined(__GNUC__) +#if defined(__GNUC__) && (defined (__cplusplus) && __cplusplus >= 201103L) #define FMX_PACK __attribute__ ((packed)) #define FMX_PACK_ON @@ -50,21 +50,7 @@ #define DEPRECATED __attribute__((deprecated)) #endif - #if defined (_LIBCPP_STD_VER) && _LIBCPP_STD_VER > 14 - #define FMX_USE_AUTO_PTR 0 - #else - #define FMX_USE_AUTO_PTR 1 - #endif - - #if defined(_UNIQUE_PTR_H) || defined(_LIBCPP_VERSION) - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_LP64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && _MSC_VER >= 1800 #define FMX_PACK #define FMX_PACK_ON pack (push, 1) @@ -78,30 +64,10 @@ #define DEPRECATED __declspec(deprecated) #endif - #if defined(_MSVC_LANG) && _MSVC_LANG <= 201402 - #define FMX_USE_AUTO_PTR 1 - #endif - - #if _MSC_VER >= 1800 - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_M_X64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - #else - #error "Unsupported compiler" - -#endif - -// Original memorary manager callbacks and External() call exists only on Mac and Win 32 bit targets + #error "Unsupported compiler version" -#if defined(FMX_64BIT_PLUGIN_API) || defined(__linux__) || TARGET_OS_IPHONE - #define FMX_OBSOLETE_API 0 -#else - #define FMX_OBSOLETE_API 1 #endif // Forward definitions @@ -123,41 +89,17 @@ extern "C++" #if defined( _MSC_VER ) typedef __int64 int64; typedef unsigned __int64 uint64; - - #if defined( _M_X64) typedef uint64 ptrtype; - #else - typedef uint32 ptrtype; - #endif typedef int16 unusedid; #else - #if defined( _LP64 ) typedef long int64; typedef unsigned long uint64; typedef uint64 ptrtype; typedef int32 unusedid; - #else - typedef long long int64; - typedef unsigned long long uint64; - typedef uint32 ptrtype; - typedef int16 unusedid; - #endif #endif typedef short errcode; typedef unsigned short unichar16; - typedef DEPRECATED unichar16 unichar; // DEPRECATED in version 15. unichar conflicts often with Cocoa's definition of it - -#if FMX_OBSOLETE_API - - // DEPRECATED in version 15. These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) - // should be specific about the sizes of integers and not rely on ambiguous "long" data types. - typedef DEPRECATED fmx::uint32 ulong; - typedef DEPRECATED fmx::uint16 ushort; - typedef DEPRECATED fmx::int64 longlong; - -#endif // FMX_OBSOLETE_API - } } extern "C" @@ -176,46 +118,6 @@ extern "C" typedef char FMX_Char; typedef char FMX_Boolean; -#if FMX_OBSOLETE_API - -// DEPRECATED in version 15. Old style definitions; never were supported in 64-bit plugins; - -// These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) should be specific about the sizes of -// integers and not rely on ambiguous "long" data types. -typedef DEPRECATED FMX_UInt32 FMX_ULong; -typedef DEPRECATED FMX_UInt16 FMX_UShort; -typedef DEPRECATED FMX_Int32 FMX_Long; -typedef DEPRECATED FMX_Int16 FMX_Short; -typedef DEPRECATED FMX_Char* FMX_Ptr; -typedef DEPRECATED FMX_Char** FMX_Hdl; - -// Memory accessors for old style plug-ins -// New style plugins should not use these. When creating new objects (BinaryData, Text, etc), use the autoptr classes provided in the SDK. - -FMX_PROCPTR(char**, FMX_NewHandleCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_SetHandleSizeCall)(char** h, FMX_Int32 size); -FMX_PROCPTR(FMX_Int32, FMX_GetHandleSizeCall)(char** h); -FMX_PROCPTR(void, FMX_DisposeHandleCall)(char** h); -FMX_PROCPTR(void, FMX_MoveHHiCall)(char** h); -FMX_PROCPTR(void, FMX_LockHandleCall)(char** h); -FMX_PROCPTR(void, FMX_UnlockHandleCall)(char** h); -FMX_PROCPTR(char*, FMX_NewPointerCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_DisposePointerCall)(char* p); -FMX_PROCPTR(FMX_Int16, FMX_MemoryErrorCall)(void); - -#define FMX_NewHandle(size) (gFMX_ExternCallPtr->cNewHandle)(size) -#define FMX_SetHandleSize(h, size) (gFMX_ExternCallPtr->cSetHandleSize)(h, size) -#define FMX_GetHandleSize(h) (gFMX_ExternCallPtr->cGetHandleSize)(h) -#define FMX_DisposeHandle(h) (gFMX_ExternCallPtr->cDisposeHandle)(h) -#define FMX_MoveHHi(h) (gFMX_ExternCallPtr->cMoveHHi)(h) -#define FMX_LockHandle(h) (gFMX_ExternCallPtr->cLockHandle)(h) -#define FMX_UnlockHandle(h) (gFMX_ExternCallPtr->cUnlockHandle)(h) -#define FMX_NewPointer(size) (gFMX_ExternCallPtr->cNewPointer)(size) -#define FMX_DisposePointer(p) (gFMX_ExternCallPtr->cDisposePointer)(p) -#define FMX_MemoryError() (gFMX_ExternCallPtr->cMemoryError)() - -#endif // FMX_OBSOLETE_API - // New public callbacks typedef FMX_UChar FMX_ScriptControl; @@ -254,7 +156,18 @@ enum k170ExtnVersion = 59, k180ExtnVersion = 60, k190ExtnVersion = 62, - kCurrentExtnVersion = 62, + k191ExtnVersion = 63, + k192ExtnVersion = 64, + k193ExtnVersion = 65, + k194ExtnVersion = 66, + k195ExtnVersion = 67, + k196ExtnVersion = 68, + k201ExtnVersion = 71, + k202ExtnVersion = 72, + k203ExtnVersion = 73, + k210ExtnVersion = 74, + k211ExtnVersion = 75, + kCurrentExtnVersion = 75, kMinExtnVersion = 4, kMaxExtnVersion = 255 }; @@ -264,16 +177,17 @@ enum { kFMXT_Init = 0, // Enabled by kFMXT_OptionsStr character 8 kFMXT_Idle = 1, // Enabled by kFMXT_OptionsStr character 9 -#if FMX_OBSOLETE_API - kFMXT_External = 3, // DEPRECATED External function callback -#endif + // kFMXT_External = 3, // DEPRECATED External function callback kFMXT_Shutdown = 4, // Enabled by kFMXT_OptionsStr character 8 kFMXT_DoAppPreferences = 5, // Enabled by kFMXT_OptionsStr character 6 kFMXT_GetString = 7, // REQUIRED to be handled // New to FileMaker Pro 15 (API VERSION 56) and later kFMXT_SessionShutdown = 8, // Enabled by kFMXT_OptionsStr character 10 - kFMXT_FileShutdown = 9 // Enabled by kFMXT_OptionsStr character 10 + kFMXT_FileShutdown = 9, // Enabled by kFMXT_OptionsStr character 10 + + // New to FileMaker Pro 21.1 (API VERSION 75) and later + kFMXT_SchemaChange = 10 // Enabled by kFMXT_OptionsStr character 10 }; typedef FMX_UChar FMX_Strings; // Different strings that may be asked for by kFMXT_GetString @@ -300,15 +214,16 @@ enum typedef FMX_UChar FMX_Application; enum { - kFMXT_Developer = 0, // FileMaker Pro Advanced + kFMXT_Developer = 0, // FileMaker Pro Advanced (no longer shipping) kFMXT_Pro = 1, // FileMaker Pro - kFMXT_Runtime = 2, // FileMaker Runtime + kFMXT_Runtime = 2, // FileMaker Runtime (no longer shipping) kFMXT_Server = 3, // This process no longer loads plug-ins kFMXT_Web = 4, // Web Publishing process kFMXT_Mobile = 5, // This iOS process is not allowed to load plug-ins kFMXT_XDBC = 6, // This process does not currently load plug-ins kFMXT_SASE = 7, // Server scripting process - kFMXT_IWP = 8 // This process no longer exists + kFMXT_IWP = 8, // This process no longer exists + kFMXT_FMDAPI = 9 // FileMaker Data API process }; struct FMX_ExternCallStruct; @@ -323,9 +238,9 @@ struct FMX_ExternCallStruct FMX_Int16 extnVersion; // Version of this structure, set to the value of kCurrentExtnVersion fmx::unusedid unusedID; // Always -1 as of FileMaker Pro version 19 (API VERSION 61) FMX_ExternCallProc entryPoint; // The pointer the plug-ins entry point, FMExternCallProc - FMX_Boolean cfmCalls; // Always false (i.e. 0) + FMX_Boolean unusedFlag; // Always false (i.e. 0) FMX_ExternCallSwitch whichCall; // Which call FileMaker is making into the plug-in (i.e. kFMXT_Init and others) - FMX_Boolean unsafeCalls; // True if unsafe for non-memory calls + FMX_Boolean unsafeCalls; // True if not on the main thread // Parameters for the calls; any parameter not used by a call is set to zero. FMX_UChar parm1; @@ -336,15 +251,15 @@ struct FMX_ExternCallStruct // Msg = Parm1 Parm2 Parm3 // kFMXT_Init FMX_Application value App vers unicode c str* [unused] // kFMXT_Idle FMX_IdleLevel value Session ID [unused] - // kFMXT_External [unused] Funct str index Parameter text** // kFMXT_Shutdown [unused] [unused] [unused] // kFMXT_DoAppPreferences [unused] [unused] [unused] // kFMXT_GetString FMX_Strings value Windows lang ID Maximum size of string to return // kFMXT_SessionShutdown [unused] Session ID [unused] // kFMXT_FileShutdown [unused] Session ID File ID + // kFMXT_SchemaChange [unused] char* to utf8 JSON text** Length of utf8 JSON text // //(* same as GetAppVersion, e.g. "Pro 13.0v2" ) - //(** Parameter from calculation as text, in kEncoding_ASCII_Mac or kEncoding_ShiftJIS_Mac; Result passed back to FileMaker must match encoding.) + //(** This message only sent to plug-ins loaded in the server side scripting process) // Passed in every call FMX_PtrType instanceID; // ID of the plug-in @@ -357,20 +272,6 @@ struct FMX_ExternCallStruct // Unused FMX_PtrType unused; -#if FMX_OBSOLETE_API - // DEPRECATED in version 15. Call backs for old plug-ins - DEPRECATED FMX_NewHandleCall cNewHandle; - DEPRECATED FMX_SetHandleSizeCall cSetHandleSize; - DEPRECATED FMX_GetHandleSizeCall cGetHandleSize; - DEPRECATED FMX_DisposeHandleCall cDisposeHandle; - DEPRECATED FMX_MoveHHiCall cMoveHHi; - DEPRECATED FMX_LockHandleCall cLockHandle; - DEPRECATED FMX_UnlockHandleCall cUnlockHandle; - DEPRECATED FMX_NewPointerCall cNewPointer; - DEPRECATED FMX_DisposePointerCall cDisposePointer; - DEPRECATED FMX_MemoryErrorCall cMemoryError; -#endif - // New public callbacks FMX_StartScriptCall cStartScript; FMX_CurrentEnvCall cCurrentEnv; diff --git a/headers/FMXFixPt.h b/headers/FMXFixPt.h index 68d21f2..f420837 100644 --- a/headers/FMXFixPt.h +++ b/headers/FMXFixPt.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -84,19 +84,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED FixPtAutoPtr : public std::auto_ptr - { - typedef FixPtAutoPtr UpCaster; - public: - inline FixPtAutoPtr ( fmx::int32 val = 0, int precision = FixPt::kDefltFixedPrecision ); - inline FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class FixPtUniquePtr : public std::unique_ptr { typedef FixPtUniquePtr UpCaster; @@ -105,7 +92,6 @@ extern "C++" inline FixPtUniquePtr ( fmx::int32 val, const FixPt &precisionExample ); }; -#endif } } @@ -318,22 +304,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, int precision ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor1 ( val, precision, _x ) ); - _x.Check (); - } - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline FixPtUniquePtr::FixPtUniquePtr ( fmx::int32 val, int precision ) { _fmxcpt _x; @@ -346,7 +316,6 @@ extern "C++" reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); _x.Check (); } -#endif } } diff --git a/headers/FMXText.h b/headers/FMXText.h index 29175a5..5cc1b60 100644 --- a/headers/FMXText.h +++ b/headers/FMXText.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -155,18 +155,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED TextAutoPtr : public std::auto_ptr - { - typedef TextAutoPtr UpCaster; - public: - inline TextAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class TextUniquePtr : public std::unique_ptr { typedef TextUniquePtr UpCaster; @@ -174,7 +162,6 @@ extern "C++" inline TextUniquePtr (); }; -#endif } } @@ -428,23 +415,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline TextAutoPtr::TextAutoPtr () - { - _fmxcpt _x; - reset ( FM_Text_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline TextUniquePtr::TextUniquePtr () { _fmxcpt _x; reset ( FM_Text_Constructor1 ( _x ) ); _x.Check (); } -#endif } } diff --git a/headers/FMXTextStyle.h b/headers/FMXTextStyle.h index a6e5ad8..981579f 100644 --- a/headers/FMXTextStyle.h +++ b/headers/FMXTextStyle.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -47,28 +47,6 @@ extern "C++" typedef unsigned char ColorChannel; typedef unsigned short ColorChannel16; - // DEPRECATED in FileMaker Pro 14. Fonts no longer belong to "scripts" - typedef unsigned short FontScript; - enum - { - kRoman = 0, - kGreek = 1, - kCyrillic = 2, - kCentralEurope = 3, - kShiftJIS = 4, - kTraditionalChinese = 5, - kSimplifiedChinese = 6, - kOEM = 7, - kSymbol = 8, - kNative = 9, - kOther = 10, - kKorean = 11, - kDingbats = 12, - kTurkish = 13, - - kInvalidFont = 0xFFFF - }; - class Color { public: @@ -171,33 +149,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ColorAutoPtr : public std::auto_ptr - { - typedef ColorAutoPtr UpCaster; - public: - inline ColorAutoPtr (); - inline ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, - CharacterStyle::ColorChannel alpha = CharacterStyle::Color::kColorChannel_ON ); - inline ColorAutoPtr ( const CharacterStyle::Color &mask ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED CharacterStyleAutoPtr : public std::auto_ptr - { - typedef CharacterStyleAutoPtr UpCaster; - public: - inline CharacterStyleAutoPtr (); - inline CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, - const CharacterStyle::Color &color = CharacterStyle::Color::Black() ); - inline CharacterStyleAutoPtr ( const CharacterStyle &style ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class ColorUniquePtr : public std::unique_ptr { typedef ColorUniquePtr UpCaster; @@ -219,7 +170,6 @@ extern "C++" inline CharacterStyleUniquePtr ( const CharacterStyle &style ); }; -#endif } } @@ -408,28 +358,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ColorAutoPtr::ColorAutoPtr () - { - _fmxcpt _x; - reset ( FM_Color_Constructor1 ( _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, CharacterStyle::ColorChannel alpha ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor2 ( red, green, blue, alpha, _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor3 ( color, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ColorUniquePtr::ColorUniquePtr () { _fmxcpt _x; @@ -448,7 +376,6 @@ extern "C++" reset ( FM_Color_Constructor3 ( color, _x ) ); _x.Check (); } -#endif inline void CharacterStyle::EnableFont () { @@ -645,28 +572,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr () - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor1 ( _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor2 ( font, face, size, color, _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( const CharacterStyle &style ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline CharacterStyleUniquePtr::CharacterStyleUniquePtr () { _fmxcpt _x; @@ -685,7 +590,6 @@ extern "C++" reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); _x.Check (); } -#endif } } diff --git a/headers/FMXTypes.h b/headers/FMXTypes.h index 7bcb70d..534b617 100644 --- a/headers/FMXTypes.h +++ b/headers/FMXTypes.h @@ -1,6 +1,6 @@ /* - Copyright © 1998 - 2019 Claris International Inc. + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. Claris International Inc. grants you a non-exclusive limited license to use this file solely @@ -83,6 +83,9 @@ extern "C++" kType_DAN = 19, // Danish kType_NLD = 20, // Dutch kType_ENG = 21, // English +#ifdef XUNIX + kType_ENG_INTL = 77, // English Intl +#endif kType_FIN = 22, // Finnish kType_FIN_fmi = 23, // Finnish (FileMaker custom) kType_FRA = 24, // French @@ -159,30 +162,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED QuadCharAutoPtr : public std::auto_ptr - { - typedef QuadCharAutoPtr UpCaster; - public: - inline QuadCharAutoPtr (); - inline QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ); - inline QuadCharAutoPtr ( const QuadChar &value ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED LocaleAutoPtr : public std::auto_ptr - { - typedef LocaleAutoPtr UpCaster; - public: - inline LocaleAutoPtr ( Locale::Type inputType = Locale::kType_System ); - inline LocaleAutoPtr ( const Locale ©Construct ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class QuadCharUniquePtr : public std::unique_ptr { typedef QuadCharUniquePtr UpCaster; @@ -201,7 +180,6 @@ extern "C++" inline LocaleUniquePtr ( const Locale ©Construct ); }; -#endif } } @@ -320,28 +298,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline QuadCharAutoPtr::QuadCharAutoPtr () - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor1 ( _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor2 ( c0, c1, c2, c3, _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( const QuadChar &value ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor3 ( value, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline QuadCharUniquePtr::QuadCharUniquePtr () { _fmxcpt _x; @@ -360,7 +316,6 @@ extern "C++" reset ( FM_QuadChar_Constructor3 ( value, _x ) ); _x.Check (); } -#endif inline Locale &Locale::operator = ( const Locale &rhs ) { _fmxcpt _x; @@ -375,22 +330,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline LocaleAutoPtr::LocaleAutoPtr ( Locale::Type inputType ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor1 ( inputType, _x ) ); - _x.Check (); - } - inline LocaleAutoPtr::LocaleAutoPtr ( const Locale ©Construct ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline LocaleUniquePtr::LocaleUniquePtr ( Locale::Type inputType ) { _fmxcpt _x; @@ -403,7 +342,6 @@ extern "C++" reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/Linux/libFMWrapper.so b/libraries/Linux/libFMWrapper.so index cc406a4..ef153a0 100644 Binary files a/libraries/Linux/libFMWrapper.so and b/libraries/Linux/libFMWrapper.so differ diff --git a/libraries/Mac/FMWrapper.framework/FMWrapper b/libraries/Mac/FMWrapper.framework/FMWrapper index ae53e8f..baad052 100644 Binary files a/libraries/Mac/FMWrapper.framework/FMWrapper and b/libraries/Mac/FMWrapper.framework/FMWrapper differ diff --git a/libraries/Win/x64/FMWrapper.lib b/libraries/Win/x64/FMWrapper.lib index 187de45..5cbb827 100644 Binary files a/libraries/Win/x64/FMWrapper.lib and b/libraries/Win/x64/FMWrapper.lib differ diff --git a/libraries/iphoneos/FMWrapper.framework b/libraries/iphoneos/FMWrapper.framework index a7a927c..5a83a04 100644 --- a/libraries/iphoneos/FMWrapper.framework +++ b/libraries/iphoneos/FMWrapper.framework @@ -1 +1 @@ -/Users/builder/Jenkins-Production/workspace/FMP_19.1_Plugin_SDK_iOS/Source/Draco/FMWrapper/FMPluginExample/PlugInSDK/Libraries/iphoneos/iOSAppSDK.framework \ No newline at end of file +/Users/builder/Jenkins-Production/workspace/FMP_21.1_Plugin_SDK_iOS/Source/Draco/FMWrapper/PlugInSDK/Libraries/iphoneos/iOSAppSDK.framework \ No newline at end of file diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXBinaryData.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXBinaryData.h index 7c91f31..ab9b2a3 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXBinaryData.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXBinaryData.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_BinaryData_ @@ -42,7 +42,7 @@ extern "C++" // stream of the same type. Streams should not be empty. // Container fields can be considered to be of type BinaryData when data is stored in the database // as opposed to objects inserted by reference (path of file as text). - // + // // To iterate through the streams of a BinaryData, use GetCount and then call GetIndex to // get the TypeID for each stream. // @@ -67,9 +67,9 @@ extern "C++" // the image. Please use the special accessors below (GetSIZEData and AddSIZEData) // to get the height and width values for the image. // - // When generating other kinds of graphical data, use JPEG or PNGf for a preview, - // and the other format will be preferred if possible. For example, to generate - // a TIFF picture, you have to add "TIFF" and "JPEG" streams. + // When generating other kinds of graphical data, use JPEG or PNGf for a preview, + // and the other format will be preferred if possible. For example, to generate + // a TIFF picture, you have to add "TIFF" and "JPEG" streams. // // Files: // { "FILE" (binary file data), "ZLIB" (compressed file data), "FORK" (Mac only resource fork) } @@ -77,8 +77,8 @@ extern "C++" // deflateInit2( ctx, Z_BEST_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY ); // Decompression also uses zlib set to detect zlib or gzip headers. Parameters used are: // inflateInit2( ctx, 15 + 32 ) - // - // Sound: + // + // Sound: // { "snd " } // Always Mac raw format. // @@ -101,7 +101,7 @@ extern "C++" inline void GetType ( int32 index, QuadChar& dataType ) const; inline uint32 GetSize ( int32 index ) const; inline errcode GetData ( int32 index, uint32 offset, uint32 amount, void *buffer ) const; - + // You should exercise great care in using the following functions. Removing or modifying a required stream // could have undesirable and undefined results. inline errcode Add ( const QuadChar& dataType, uint32 amount, void *buffer ); @@ -130,40 +130,16 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED BinaryDataAutoPtr : public std::auto_ptr - { - typedef BinaryDataAutoPtr UpCaster; - public: - inline BinaryDataAutoPtr (); - inline BinaryDataAutoPtr ( const BinaryData &sourceData ); - - // New to FileMaker Pro 13 (API VERSION 54) and later - // This method sets the FNAM, SIZE, main stream, and all other information streams - // for the given data. The extension of the file name passed in is used to determine - // the type of data passed in the buffer. This routine does not read data from the - // disk itself. Please use this to do "Insert from..." type operations. - inline BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ); - - // New to FileMaker Pro 14 (API VERSION 55) and later - // Same as the above constructor except use AddAppend/AddFinish for the data - inline BinaryDataAutoPtr ( const Text &name, uint32* context ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class BinaryDataUniquePtr : public std::unique_ptr { typedef BinaryDataUniquePtr UpCaster; public: inline BinaryDataUniquePtr (); inline BinaryDataUniquePtr ( const BinaryData &sourceData ); - + inline BinaryDataUniquePtr ( const Text &name, uint32 amount, void *buffer ); inline BinaryDataUniquePtr ( const Text &name, uint32* context ); }; -#endif } } @@ -293,34 +269,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline BinaryDataAutoPtr::BinaryDataAutoPtr () - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor1 ( _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const BinaryData &sourceData ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor2 ( sourceData, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor3 ( name, amount, buffer, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, fmx::uint32* context ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline BinaryDataUniquePtr::BinaryDataUniquePtr () { _fmxcpt _x; @@ -345,7 +293,6 @@ extern "C++" reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); _x.Check (); } -#endif inline errcode BinaryData::GetFNAMData ( Text &filepathlist ) const { diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXCalcEngine.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXCalcEngine.h index 3178844..98886cc 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXCalcEngine.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXCalcEngine.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2020 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_DBCalcEngine_ @@ -32,7 +32,7 @@ #include "FMWrapper/FMXClient.h" -extern "C++" +extern "C++" { namespace fmx { @@ -84,28 +84,12 @@ extern "C++" // Calculation and script step function definition FMX_PROCPTR( errcode, ExtPluginType ) ( short functionId, const ExprEnv& env, const DataVect& parms, Data& result ); - + class ExprEnv { public: enum { - // DEPRECATED in FileMaker Pro 12. The server database process no longer loads plug-ins. Stored calculations - // containing plug-in functions will not evaluate the same way they do on a client with the plug-in if a - // schema change forces the server to recalculate the stored calculation's value. - kMayEvaluateOnServer = 0x00000001, - - // DEPRECATED in FileMaker Pro 16. All the following flags will be ignored for the commented purpose in version - // 16 and later. Note the change of kDisplayInAllDialogs further below. - kDisplayCalcFields = 0x00000100, // Calculated fields - kDisplayAutoEnter = 0x00000200, // Auto enter calculation - kDisplayValidation = 0x00000400, // Validation by calculation - kDisplayCustomFunctions = 0x00000800, // Custom function definition - kDisplayPrivileges = 0x00001000, // Row level access calculations - kDisplayInFuture1 = 0x00002000, // As yet undefined calculation dialog - kDisplayInFuture2 = 0x00004000, // As yet undefined calculation dialog - kDisplayGeneric = 0x00008000, // Dialog used by scripting and replace - // Changed in FileMaker Pro 16v2. If any of these bits are set, the function will be displayed in any picking // UI control. Future functions should use this constant if they want to be displayed. The function can always // be typed in manually. @@ -257,11 +241,33 @@ extern "C++" kGet_OpenDataFileInfo = 1123, kGet_AccountType = 1124, kGet_PageCount = 1125, - + kGet_SystemLocaleElements = 1126, + kGet_FileLocaleElements = 1127, + kGet_InstalledFMPluginsAsJSON = 1128, + + // New to FileMaker Pro 19.4.1 + kGet_SessionIdentifier = 1129, + + // New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release + kGet_CacheFileName = 1130, + kGet_CacheFilePath = 1131, + // New to FileMaker Pro 19 (API VERSION 62) and later. For new EvaluateConvert... entry points kConvert_PosixPath = 1, kConvert_WinPath = 2, - kConvert_URLPath = 3 + kConvert_URLPath = 3, + + // New to FileMaker Pro 19.6 + kGet_TransactionState = 1132, + kGet_CurrentTimeUTCMicroseconds = 1133, + kGet_LastErrorLocation = 1134, + + // New to FileMaker Pro 21.0 + kGet_LLMLastStepTokensUsed = 1135, + + // New to FileMaker Pro 21.1 + kGet_RevertTransactionOnErrorState = 1136, + kGet_SystemStorageAvailable = 1137, }; inline errcode Evaluate ( const Text &expression, Data &result ) const; @@ -354,54 +360,26 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataVectAutoPtr : public std::auto_ptr - { - typedef DataVectAutoPtr UpCaster; - public: - inline DataVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED RowVectAutoPtr : public std::auto_ptr - { - typedef RowVectAutoPtr UpCaster; - public: - inline RowVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ExprEnvAutoPtr : public std::auto_ptr - { - typedef ExprEnvAutoPtr UpCaster; - public: - inline ExprEnvAutoPtr (); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataVectUniquePtr : public std::unique_ptr { typedef DataVectUniquePtr UpCaster; public: inline DataVectUniquePtr (); }; - + class RowVectUniquePtr : public std::unique_ptr { typedef RowVectUniquePtr UpCaster; public: inline RowVectUniquePtr (); }; - + class ExprEnvUniquePtr : public std::unique_ptr { typedef ExprEnvUniquePtr UpCaster; public: inline ExprEnvUniquePtr (); }; -#endif } } @@ -437,9 +415,6 @@ extern "C" fmx::errcode FMX_API FM_ExprEnv_EvaluateGetFunction ( const void *_self, short functionValue, fmx::Data &result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertToFileMakerPath ( const void *_self, const fmx::Text &inPath, fmx::int32 inFormat, fmx::Text &outFMPath, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertFromFileMakerPath ( const void *_self, const fmx::Text &inFMPath, fmx::int32 inFormat, fmx::Text &outPath, fmx::_fmxcpt &_x ) throw (); -#if FMX_OBSOLETE_API - DEPRECATED fmx::errcode FMX_API FM_ExprEnv_ExecuteSQL ( const void *_self, const fmx::Text &expression, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); -#endif fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQL ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::RowVect& result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQLTextResult ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_RegisterExternalFunction ( const fmx::QuadChar &pluginId, short functionId, const fmx::Text &functionName, const fmx::Text &functionPrototype, short minArgs, short maxArgs, fmx::uint32 compatibleOnFlags, fmx::ExtPluginType funcPtr, fmx::_fmxcpt &_x ) throw (); @@ -553,23 +528,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataVectAutoPtr::DataVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_DataVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataVectUniquePtr::DataVectUniquePtr () { _fmxcpt _x; reset ( FM_DataVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline uint32 RowVect::Size () const { @@ -599,23 +563,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline RowVectAutoPtr::RowVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_RowVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline RowVectUniquePtr::RowVectUniquePtr () { _fmxcpt _x; reset ( FM_RowVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline errcode ExprEnv::Evaluate ( const Text &expression, Data &result ) const { @@ -715,23 +668,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ExprEnvAutoPtr::ExprEnvAutoPtr () - { - _fmxcpt _x; - reset ( FM_ExprEnv_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ExprEnvUniquePtr::ExprEnvUniquePtr () { _fmxcpt _x; reset ( FM_ExprEnv_Constructor1 ( _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXClient.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXClient.h index 04d2925..f4da8bd 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXClient.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXClient.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef FMXCLIENT_H_INCLUDED @@ -49,13 +49,13 @@ extern "C++" kBadAlloc, kUnknown }; - + inline _fmxcpt () : m_vers ( 1 ) , m_code ( kNoErr ) { } - + inline void Check () { switch ( m_code ) @@ -68,7 +68,7 @@ extern "C++" throw std::exception (); } } - + int32 m_vers; int32 m_code; }; diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXData.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXData.h index c6b8197..97f4da8 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXData.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXData.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Data_ @@ -81,7 +81,7 @@ extern "C++" inline void SetAsTimeStamp ( const DateTime &timeStampData, const DataType nativeType = kDTTimeStamp ); inline void SetDateTime ( const DateTime &dateTimeData, const DataType dateTimeType, const DataType nativeType ); inline void SetBinaryData ( const BinaryData &binaryData, bool forceBinaryNativeType = true ); - + inline void operator delete ( void *obj ); // Prior to version 14 the display name tended to be the name of the font that was returned. In version 14 and later @@ -94,10 +94,6 @@ extern "C++" // GetFontInfo will return false if the given font id is not found in the database - // New to FileMaker Pro 8 (API VERSION 51) and later - DEPRECATED inline CharacterStyle::FontID GetFontID ( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const; - DEPRECATED inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const; - // New to FileMaker Pro 14 (API VERSION 55) and later inline CharacterStyle::FontID GetFontID ( const Text &fontPostscriptName, const ExprEnv &env ) const; inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const; @@ -108,26 +104,13 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataAutoPtr : public std::auto_ptr - { - typedef DataAutoPtr UpCaster; - public: - inline DataAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataUniquePtr : public std::unique_ptr { typedef DataUniquePtr UpCaster; public: inline DataUniquePtr (); - + }; -#endif } } @@ -160,9 +143,7 @@ extern "C" void FMX_API FM_Data_SetBinaryData ( void *_self, const fmx::BinaryData &binaryData, bool forceBinaryNativeType, fmx::_fmxcpt &_x ) throw (); void FMX_API FM_Data_Delete ( void *_self, fmx::_fmxcpt &_x ) throw (); - fmx::CharacterStyle::FontID FMX_API FM_Data_GetFontID ( const void *_self, const fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); fmx::CharacterStyle::FontID FMX_API FM_Data_GetPostscriptFontID ( const void *_self, const fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); - bool FMX_API FM_Data_GetFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript &fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); bool FMX_API FM_Data_GetPostscriptFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); } @@ -318,31 +299,13 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataAutoPtr::DataAutoPtr () - { - _fmxcpt _x; - reset ( FM_Data_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataUniquePtr::DataUniquePtr () { _fmxcpt _x; reset ( FM_Data_Constructor1 ( _x ) ); _x.Check (); } -#endif - - inline CharacterStyle::FontID Data::GetFontID( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - CharacterStyle::FontID _rtn = FM_Data_GetFontID ( this, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } + inline CharacterStyle::FontID Data::GetFontID( const Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; @@ -350,13 +313,6 @@ extern "C++" _x.Check (); return _rtn; } - inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - bool _rtn = FM_Data_GetFontInfo ( this, font, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXDateTime.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXDateTime.h index 0bfaf66..4192039 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXDateTime.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXDateTime.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_DateTime_ @@ -80,19 +80,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DateTimeAutoPtr : public std::auto_ptr - { - typedef DateTimeAutoPtr UpCaster; - public: - inline DateTimeAutoPtr (); - inline DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); - inline DateTimeAutoPtr ( const Text &dateText, const Locale &intl ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DateTimeUniquePtr : public std::unique_ptr { typedef DateTimeUniquePtr UpCaster; @@ -101,7 +88,6 @@ extern "C++" inline DateTimeUniquePtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); inline DateTimeUniquePtr ( const Text &dateText, const Locale &intl ); }; -#endif } } @@ -336,28 +322,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DateTimeAutoPtr::DateTimeAutoPtr () - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor1 ( _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor2 ( dateString, dateLength, intl, _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const Text &dateText, const Locale &intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DateTimeUniquePtr::DateTimeUniquePtr () { _fmxcpt _x; @@ -376,8 +340,7 @@ extern "C++" reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); _x.Check (); } -#endif - + } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXExtern.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXExtern.h index bc988ba..31122b5 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXExtern.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXExtern.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2020 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Extern_ @@ -36,7 +36,7 @@ // Platform specific macros -#if defined(__GNUC__) +#if defined(__GNUC__) && (defined (__cplusplus) && __cplusplus >= 201103L) #define FMX_PACK __attribute__ ((packed)) #define FMX_PACK_ON @@ -50,21 +50,7 @@ #define DEPRECATED __attribute__((deprecated)) #endif - #if defined (_LIBCPP_STD_VER) && _LIBCPP_STD_VER > 14 - #define FMX_USE_AUTO_PTR 0 - #else - #define FMX_USE_AUTO_PTR 1 - #endif - - #if defined(_UNIQUE_PTR_H) || defined(_LIBCPP_VERSION) - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_LP64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && _MSC_VER >= 1800 #define FMX_PACK #define FMX_PACK_ON pack (push, 1) @@ -78,30 +64,10 @@ #define DEPRECATED __declspec(deprecated) #endif - #if defined(_MSVC_LANG) && _MSVC_LANG <= 201402 - #define FMX_USE_AUTO_PTR 1 - #endif - - #if _MSC_VER >= 1800 - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_M_X64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - #else - #error "Unsupported compiler" - -#endif + #error "Unsupported compiler version" -// Original memorary manager callbacks and External() call exists only on Mac and Win 32 bit targets - -#if defined(FMX_64BIT_PLUGIN_API) || defined(__linux__) || TARGET_OS_IPHONE - #define FMX_OBSOLETE_API 0 -#else - #define FMX_OBSOLETE_API 1 #endif // Forward definitions @@ -123,41 +89,17 @@ extern "C++" #if defined( _MSC_VER ) typedef __int64 int64; typedef unsigned __int64 uint64; - - #if defined( _M_X64) typedef uint64 ptrtype; - #else - typedef uint32 ptrtype; - #endif typedef int16 unusedid; #else - #if defined( _LP64 ) typedef long int64; typedef unsigned long uint64; typedef uint64 ptrtype; typedef int32 unusedid; - #else - typedef long long int64; - typedef unsigned long long uint64; - typedef uint32 ptrtype; - typedef int16 unusedid; - #endif #endif typedef short errcode; typedef unsigned short unichar16; - typedef DEPRECATED unichar16 unichar; // DEPRECATED in version 15. unichar conflicts often with Cocoa's definition of it - -#if FMX_OBSOLETE_API - - // DEPRECATED in version 15. These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) - // should be specific about the sizes of integers and not rely on ambiguous "long" data types. - typedef DEPRECATED fmx::uint32 ulong; - typedef DEPRECATED fmx::uint16 ushort; - typedef DEPRECATED fmx::int64 longlong; - -#endif // FMX_OBSOLETE_API - } } extern "C" @@ -176,50 +118,10 @@ extern "C" typedef char FMX_Char; typedef char FMX_Boolean; -#if FMX_OBSOLETE_API - -// DEPRECATED in version 15. Old style definitions; never were supported in 64-bit plugins; - -// These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) should be specific about the sizes of -// integers and not rely on ambiguous "long" data types. -typedef DEPRECATED FMX_UInt32 FMX_ULong; -typedef DEPRECATED FMX_UInt16 FMX_UShort; -typedef DEPRECATED FMX_Int32 FMX_Long; -typedef DEPRECATED FMX_Int16 FMX_Short; -typedef DEPRECATED FMX_Char* FMX_Ptr; -typedef DEPRECATED FMX_Char** FMX_Hdl; - -// Memory accessors for old style plug-ins -// New style plugins should not use these. When creating new objects (BinaryData, Text, etc), use the autoptr classes provided in the SDK. - -FMX_PROCPTR(char**, FMX_NewHandleCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_SetHandleSizeCall)(char** h, FMX_Int32 size); -FMX_PROCPTR(FMX_Int32, FMX_GetHandleSizeCall)(char** h); -FMX_PROCPTR(void, FMX_DisposeHandleCall)(char** h); -FMX_PROCPTR(void, FMX_MoveHHiCall)(char** h); -FMX_PROCPTR(void, FMX_LockHandleCall)(char** h); -FMX_PROCPTR(void, FMX_UnlockHandleCall)(char** h); -FMX_PROCPTR(char*, FMX_NewPointerCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_DisposePointerCall)(char* p); -FMX_PROCPTR(FMX_Int16, FMX_MemoryErrorCall)(void); - -#define FMX_NewHandle(size) (gFMX_ExternCallPtr->cNewHandle)(size) -#define FMX_SetHandleSize(h, size) (gFMX_ExternCallPtr->cSetHandleSize)(h, size) -#define FMX_GetHandleSize(h) (gFMX_ExternCallPtr->cGetHandleSize)(h) -#define FMX_DisposeHandle(h) (gFMX_ExternCallPtr->cDisposeHandle)(h) -#define FMX_MoveHHi(h) (gFMX_ExternCallPtr->cMoveHHi)(h) -#define FMX_LockHandle(h) (gFMX_ExternCallPtr->cLockHandle)(h) -#define FMX_UnlockHandle(h) (gFMX_ExternCallPtr->cUnlockHandle)(h) -#define FMX_NewPointer(size) (gFMX_ExternCallPtr->cNewPointer)(size) -#define FMX_DisposePointer(p) (gFMX_ExternCallPtr->cDisposePointer)(p) -#define FMX_MemoryError() (gFMX_ExternCallPtr->cMemoryError)() - -#endif // FMX_OBSOLETE_API - // New public callbacks typedef FMX_UChar FMX_ScriptControl; -enum +enum { kFMXT_Halt, kFMXT_Exit, @@ -254,7 +156,18 @@ enum k170ExtnVersion = 59, k180ExtnVersion = 60, k190ExtnVersion = 62, - kCurrentExtnVersion = 62, + k191ExtnVersion = 63, + k192ExtnVersion = 64, + k193ExtnVersion = 65, + k194ExtnVersion = 66, + k195ExtnVersion = 67, + k196ExtnVersion = 68, + k201ExtnVersion = 71, + k202ExtnVersion = 72, + k203ExtnVersion = 73, + k210ExtnVersion = 74, + k211ExtnVersion = 75, + kCurrentExtnVersion = 75, kMinExtnVersion = 4, kMaxExtnVersion = 255 }; @@ -264,20 +177,21 @@ enum { kFMXT_Init = 0, // Enabled by kFMXT_OptionsStr character 8 kFMXT_Idle = 1, // Enabled by kFMXT_OptionsStr character 9 -#if FMX_OBSOLETE_API - kFMXT_External = 3, // DEPRECATED External function callback -#endif + // kFMXT_External = 3, // DEPRECATED External function callback kFMXT_Shutdown = 4, // Enabled by kFMXT_OptionsStr character 8 kFMXT_DoAppPreferences = 5, // Enabled by kFMXT_OptionsStr character 6 kFMXT_GetString = 7, // REQUIRED to be handled // New to FileMaker Pro 15 (API VERSION 56) and later kFMXT_SessionShutdown = 8, // Enabled by kFMXT_OptionsStr character 10 - kFMXT_FileShutdown = 9 // Enabled by kFMXT_OptionsStr character 10 + kFMXT_FileShutdown = 9, // Enabled by kFMXT_OptionsStr character 10 + + // New to FileMaker Pro 21.1 (API VERSION 75) and later + kFMXT_SchemaChange = 10 // Enabled by kFMXT_OptionsStr character 10 }; typedef FMX_UChar FMX_Strings; // Different strings that may be asked for by kFMXT_GetString -enum +enum { kFMXT_NameStr = 128, // Name of the plug-in kFMXT_AppConfigStr = 129, // Help text to display in FileMaker application preferences @@ -300,15 +214,16 @@ enum typedef FMX_UChar FMX_Application; enum { - kFMXT_Developer = 0, // FileMaker Pro Advanced + kFMXT_Developer = 0, // FileMaker Pro Advanced (no longer shipping) kFMXT_Pro = 1, // FileMaker Pro - kFMXT_Runtime = 2, // FileMaker Runtime + kFMXT_Runtime = 2, // FileMaker Runtime (no longer shipping) kFMXT_Server = 3, // This process no longer loads plug-ins kFMXT_Web = 4, // Web Publishing process kFMXT_Mobile = 5, // This iOS process is not allowed to load plug-ins kFMXT_XDBC = 6, // This process does not currently load plug-ins kFMXT_SASE = 7, // Server scripting process - kFMXT_IWP = 8 // This process no longer exists + kFMXT_IWP = 8, // This process no longer exists + kFMXT_FMDAPI = 9 // FileMaker Data API process }; struct FMX_ExternCallStruct; @@ -323,29 +238,29 @@ struct FMX_ExternCallStruct FMX_Int16 extnVersion; // Version of this structure, set to the value of kCurrentExtnVersion fmx::unusedid unusedID; // Always -1 as of FileMaker Pro version 19 (API VERSION 61) FMX_ExternCallProc entryPoint; // The pointer the plug-ins entry point, FMExternCallProc - FMX_Boolean cfmCalls; // Always false (i.e. 0) + FMX_Boolean unusedFlag; // Always false (i.e. 0) FMX_ExternCallSwitch whichCall; // Which call FileMaker is making into the plug-in (i.e. kFMXT_Init and others) - FMX_Boolean unsafeCalls; // True if unsafe for non-memory calls + FMX_Boolean unsafeCalls; // True if not on the main thread // Parameters for the calls; any parameter not used by a call is set to zero. FMX_UChar parm1; - FMX_PtrType parm2; + FMX_PtrType parm2; FMX_PtrType parm3; - + // The meanings of parm1..parm3 in terms of the various messages: // Msg = Parm1 Parm2 Parm3 // kFMXT_Init FMX_Application value App vers unicode c str* [unused] // kFMXT_Idle FMX_IdleLevel value Session ID [unused] - // kFMXT_External [unused] Funct str index Parameter text** // kFMXT_Shutdown [unused] [unused] [unused] // kFMXT_DoAppPreferences [unused] [unused] [unused] // kFMXT_GetString FMX_Strings value Windows lang ID Maximum size of string to return // kFMXT_SessionShutdown [unused] Session ID [unused] // kFMXT_FileShutdown [unused] Session ID File ID + // kFMXT_SchemaChange [unused] char* to utf8 JSON text** Length of utf8 JSON text // //(* same as GetAppVersion, e.g. "Pro 13.0v2" ) - //(** Parameter from calculation as text, in kEncoding_ASCII_Mac or kEncoding_ShiftJIS_Mac; Result passed back to FileMaker must match encoding.) - + //(** This message only sent to plug-ins loaded in the server side scripting process) + // Passed in every call FMX_PtrType instanceID; // ID of the plug-in // On Windows, it is the Instance ID of the plug-in. @@ -354,23 +269,9 @@ struct FMX_ExternCallStruct // Result from a call FMX_PtrType result; // kFMXT_Init returns it's kCurrentExtnVersion - // Unused - FMX_PtrType unused; - -#if FMX_OBSOLETE_API - // DEPRECATED in version 15. Call backs for old plug-ins - DEPRECATED FMX_NewHandleCall cNewHandle; - DEPRECATED FMX_SetHandleSizeCall cSetHandleSize; - DEPRECATED FMX_GetHandleSizeCall cGetHandleSize; - DEPRECATED FMX_DisposeHandleCall cDisposeHandle; - DEPRECATED FMX_MoveHHiCall cMoveHHi; - DEPRECATED FMX_LockHandleCall cLockHandle; - DEPRECATED FMX_UnlockHandleCall cUnlockHandle; - DEPRECATED FMX_NewPointerCall cNewPointer; - DEPRECATED FMX_DisposePointerCall cDisposePointer; - DEPRECATED FMX_MemoryErrorCall cMemoryError; -#endif - + // Unused + FMX_PtrType unused; + // New public callbacks FMX_StartScriptCall cStartScript; FMX_CurrentEnvCall cCurrentEnv; diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXFixPt.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXFixPt.h index ba927a7..75f15e0 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXFixPt.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXFixPt.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_FixPt_ @@ -44,7 +44,7 @@ extern "C++" { kDefltFixedPrecision = 16 }; - + inline void AssignInt ( fmx::int32 that ); inline void AssignDouble ( double that ); inline void AssignFixPt ( const FixPt &that ); @@ -57,11 +57,11 @@ extern "C++" inline void Increment ( fmx::int32 n ); inline void Decrement ( fmx::int32 n ); inline void Negate (); - + // Obtain and modify the decimal precision from the standard 16 digits. For more information, see SetPrecision calculation function in FileMaker Pro Help. inline int GetPrecision () const; inline void SetPrecision ( int precision ); - + inline void Add ( const FixPt &arg, FixPt &result ) const; inline void Subtract ( const FixPt &arg, FixPt &result ) const; inline void Multiply ( const FixPt &arg, FixPt &result ) const; @@ -84,28 +84,14 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED FixPtAutoPtr : public std::auto_ptr - { - typedef FixPtAutoPtr UpCaster; - public: - inline FixPtAutoPtr ( fmx::int32 val = 0, int precision = FixPt::kDefltFixedPrecision ); - inline FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class FixPtUniquePtr : public std::unique_ptr { typedef FixPtUniquePtr UpCaster; public: inline FixPtUniquePtr ( fmx::int32 val = 0, int precision = FixPt::kDefltFixedPrecision ); inline FixPtUniquePtr ( fmx::int32 val, const FixPt &precisionExample ); - + }; -#endif } } @@ -318,22 +304,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, int precision ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor1 ( val, precision, _x ) ); - _x.Check (); - } - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline FixPtUniquePtr::FixPtUniquePtr ( fmx::int32 val, int precision ) { _fmxcpt _x; @@ -346,7 +316,6 @@ extern "C++" reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXText.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXText.h index 87b8d6a..3e4b47e 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXText.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXText.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Text_ @@ -155,26 +155,13 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED TextAutoPtr : public std::auto_ptr - { - typedef TextAutoPtr UpCaster; - public: - inline TextAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class TextUniquePtr : public std::unique_ptr { typedef TextUniquePtr UpCaster; public: inline TextUniquePtr (); - + }; -#endif } } @@ -428,24 +415,13 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline TextAutoPtr::TextAutoPtr () - { - _fmxcpt _x; - reset ( FM_Text_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline TextUniquePtr::TextUniquePtr () { _fmxcpt _x; reset ( FM_Text_Constructor1 ( _x ) ); _x.Check (); } -#endif - + } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTextStyle.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTextStyle.h index 87eb00a..f7108a9 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTextStyle.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTextStyle.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_TextStyle_ @@ -47,28 +47,6 @@ extern "C++" typedef unsigned char ColorChannel; typedef unsigned short ColorChannel16; - // DEPRECATED in FileMaker Pro 14. Fonts no longer belong to "scripts" - typedef unsigned short FontScript; - enum - { - kRoman = 0, - kGreek = 1, - kCyrillic = 2, - kCentralEurope = 3, - kShiftJIS = 4, - kTraditionalChinese = 5, - kSimplifiedChinese = 6, - kOEM = 7, - kSymbol = 8, - kNative = 9, - kOther = 10, - kKorean = 11, - kDingbats = 12, - kTurkish = 13, - - kInvalidFont = 0xFFFF - }; - class Color { public: @@ -171,33 +149,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ColorAutoPtr : public std::auto_ptr - { - typedef ColorAutoPtr UpCaster; - public: - inline ColorAutoPtr (); - inline ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, - CharacterStyle::ColorChannel alpha = CharacterStyle::Color::kColorChannel_ON ); - inline ColorAutoPtr ( const CharacterStyle::Color &mask ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED CharacterStyleAutoPtr : public std::auto_ptr - { - typedef CharacterStyleAutoPtr UpCaster; - public: - inline CharacterStyleAutoPtr (); - inline CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, - const CharacterStyle::Color &color = CharacterStyle::Color::Black() ); - inline CharacterStyleAutoPtr ( const CharacterStyle &style ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class ColorUniquePtr : public std::unique_ptr { typedef ColorUniquePtr UpCaster; @@ -206,9 +157,9 @@ extern "C++" inline ColorUniquePtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, CharacterStyle::ColorChannel alpha = CharacterStyle::Color::kColorChannel_ON ); inline ColorUniquePtr ( const CharacterStyle::Color &mask ); - + }; - + class CharacterStyleUniquePtr : public std::unique_ptr { typedef CharacterStyleUniquePtr UpCaster; @@ -217,9 +168,8 @@ extern "C++" inline CharacterStyleUniquePtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, const CharacterStyle::Color &color = CharacterStyle::Color::Black() ); inline CharacterStyleUniquePtr ( const CharacterStyle &style ); - + }; -#endif } } @@ -408,28 +358,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ColorAutoPtr::ColorAutoPtr () - { - _fmxcpt _x; - reset ( FM_Color_Constructor1 ( _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, CharacterStyle::ColorChannel alpha ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor2 ( red, green, blue, alpha, _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor3 ( color, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ColorUniquePtr::ColorUniquePtr () { _fmxcpt _x; @@ -448,8 +376,7 @@ extern "C++" reset ( FM_Color_Constructor3 ( color, _x ) ); _x.Check (); } -#endif - + inline void CharacterStyle::EnableFont () { _fmxcpt _x; @@ -645,28 +572,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr () - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor1 ( _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor2 ( font, face, size, color, _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( const CharacterStyle &style ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline CharacterStyleUniquePtr::CharacterStyleUniquePtr () { _fmxcpt _x; @@ -685,7 +590,6 @@ extern "C++" reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTypes.h b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTypes.h index a499dd3..038b3b6 100644 --- a/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTypes.h +++ b/libraries/iphoneos/iOSAppSDK.framework/Headers/FMXTypes.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Types_ @@ -83,6 +83,9 @@ extern "C++" kType_DAN = 19, // Danish kType_NLD = 20, // Dutch kType_ENG = 21, // English +#ifdef XUNIX + kType_ENG_INTL = 77, // English Intl +#endif kType_FIN = 22, // Finnish kType_FIN_fmi = 23, // Finnish (FileMaker custom) kType_FRA = 24, // French @@ -113,7 +116,7 @@ extern "C++" // New to FileMaker Pro 13 kType_KOR = 76, // Korean - + // For compatibility with WinSoft versions (supported in FMI versions >= 12) kType_HE = 47, // Hebrew kType_HI = 48, // Hindi @@ -159,30 +162,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED QuadCharAutoPtr : public std::auto_ptr - { - typedef QuadCharAutoPtr UpCaster; - public: - inline QuadCharAutoPtr (); - inline QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ); - inline QuadCharAutoPtr ( const QuadChar &value ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED LocaleAutoPtr : public std::auto_ptr - { - typedef LocaleAutoPtr UpCaster; - public: - inline LocaleAutoPtr ( Locale::Type inputType = Locale::kType_System ); - inline LocaleAutoPtr ( const Locale ©Construct ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class QuadCharUniquePtr : public std::unique_ptr { typedef QuadCharUniquePtr UpCaster; @@ -190,18 +169,17 @@ extern "C++" inline QuadCharUniquePtr (); inline QuadCharUniquePtr ( char c0, char c1, char c2, char c3 ); inline QuadCharUniquePtr ( const QuadChar &value ); - + }; - + class LocaleUniquePtr : public std::unique_ptr { typedef LocaleUniquePtr UpCaster; public: inline LocaleUniquePtr ( Locale::Type inputType = Locale::kType_System ); inline LocaleUniquePtr ( const Locale ©Construct ); - + }; -#endif } } @@ -236,7 +214,7 @@ extern "C" extern "C++" { namespace fmx - { + { inline const QuadChar &QuadChar::operator = ( const QuadChar &value ) { _fmxcpt _x; @@ -320,28 +298,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline QuadCharAutoPtr::QuadCharAutoPtr () - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor1 ( _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor2 ( c0, c1, c2, c3, _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( const QuadChar &value ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor3 ( value, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline QuadCharUniquePtr::QuadCharUniquePtr () { _fmxcpt _x; @@ -360,7 +316,6 @@ extern "C++" reset ( FM_QuadChar_Constructor3 ( value, _x ) ); _x.Check (); } -#endif inline Locale &Locale::operator = ( const Locale &rhs ) { _fmxcpt _x; @@ -375,22 +330,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline LocaleAutoPtr::LocaleAutoPtr ( Locale::Type inputType ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor1 ( inputType, _x ) ); - _x.Check (); - } - inline LocaleAutoPtr::LocaleAutoPtr ( const Locale ©Construct ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline LocaleUniquePtr::LocaleUniquePtr ( Locale::Type inputType ) { _fmxcpt _x; @@ -403,7 +342,6 @@ extern "C++" reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphoneos/iOSAppSDK.framework/Info.plist b/libraries/iphoneos/iOSAppSDK.framework/Info.plist index 7a6e038..cfcd45b 100644 Binary files a/libraries/iphoneos/iOSAppSDK.framework/Info.plist and b/libraries/iphoneos/iOSAppSDK.framework/Info.plist differ diff --git a/libraries/iphoneos/iOSAppSDK.framework/iOSAppSDK b/libraries/iphoneos/iOSAppSDK.framework/iOSAppSDK index 2018cb3..c1a1a9d 100644 Binary files a/libraries/iphoneos/iOSAppSDK.framework/iOSAppSDK and b/libraries/iphoneos/iOSAppSDK.framework/iOSAppSDK differ diff --git a/libraries/iphonesimulator/FMWrapper.framework b/libraries/iphonesimulator/FMWrapper.framework index f6a9d1e..d64f146 100644 --- a/libraries/iphonesimulator/FMWrapper.framework +++ b/libraries/iphonesimulator/FMWrapper.framework @@ -1 +1 @@ -/Users/builder/Jenkins-Production/workspace/FMP_19.1_Plugin_SDK_iOS/Source/Draco/FMWrapper/FMPluginExample/PlugInSDK/Libraries/iphonesimulator/iOSAppSDK.framework \ No newline at end of file +/Users/builder/Jenkins-Production/workspace/FMP_21.1_Plugin_SDK_iOS/Source/Draco/FMWrapper/PlugInSDK/Libraries/iphonesimulator/iOSAppSDK.framework \ No newline at end of file diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXBinaryData.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXBinaryData.h index 7c91f31..ab9b2a3 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXBinaryData.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXBinaryData.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_BinaryData_ @@ -42,7 +42,7 @@ extern "C++" // stream of the same type. Streams should not be empty. // Container fields can be considered to be of type BinaryData when data is stored in the database // as opposed to objects inserted by reference (path of file as text). - // + // // To iterate through the streams of a BinaryData, use GetCount and then call GetIndex to // get the TypeID for each stream. // @@ -67,9 +67,9 @@ extern "C++" // the image. Please use the special accessors below (GetSIZEData and AddSIZEData) // to get the height and width values for the image. // - // When generating other kinds of graphical data, use JPEG or PNGf for a preview, - // and the other format will be preferred if possible. For example, to generate - // a TIFF picture, you have to add "TIFF" and "JPEG" streams. + // When generating other kinds of graphical data, use JPEG or PNGf for a preview, + // and the other format will be preferred if possible. For example, to generate + // a TIFF picture, you have to add "TIFF" and "JPEG" streams. // // Files: // { "FILE" (binary file data), "ZLIB" (compressed file data), "FORK" (Mac only resource fork) } @@ -77,8 +77,8 @@ extern "C++" // deflateInit2( ctx, Z_BEST_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY ); // Decompression also uses zlib set to detect zlib or gzip headers. Parameters used are: // inflateInit2( ctx, 15 + 32 ) - // - // Sound: + // + // Sound: // { "snd " } // Always Mac raw format. // @@ -101,7 +101,7 @@ extern "C++" inline void GetType ( int32 index, QuadChar& dataType ) const; inline uint32 GetSize ( int32 index ) const; inline errcode GetData ( int32 index, uint32 offset, uint32 amount, void *buffer ) const; - + // You should exercise great care in using the following functions. Removing or modifying a required stream // could have undesirable and undefined results. inline errcode Add ( const QuadChar& dataType, uint32 amount, void *buffer ); @@ -130,40 +130,16 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED BinaryDataAutoPtr : public std::auto_ptr - { - typedef BinaryDataAutoPtr UpCaster; - public: - inline BinaryDataAutoPtr (); - inline BinaryDataAutoPtr ( const BinaryData &sourceData ); - - // New to FileMaker Pro 13 (API VERSION 54) and later - // This method sets the FNAM, SIZE, main stream, and all other information streams - // for the given data. The extension of the file name passed in is used to determine - // the type of data passed in the buffer. This routine does not read data from the - // disk itself. Please use this to do "Insert from..." type operations. - inline BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ); - - // New to FileMaker Pro 14 (API VERSION 55) and later - // Same as the above constructor except use AddAppend/AddFinish for the data - inline BinaryDataAutoPtr ( const Text &name, uint32* context ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class BinaryDataUniquePtr : public std::unique_ptr { typedef BinaryDataUniquePtr UpCaster; public: inline BinaryDataUniquePtr (); inline BinaryDataUniquePtr ( const BinaryData &sourceData ); - + inline BinaryDataUniquePtr ( const Text &name, uint32 amount, void *buffer ); inline BinaryDataUniquePtr ( const Text &name, uint32* context ); }; -#endif } } @@ -293,34 +269,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline BinaryDataAutoPtr::BinaryDataAutoPtr () - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor1 ( _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const BinaryData &sourceData ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor2 ( sourceData, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, uint32 amount, void *buffer ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor3 ( name, amount, buffer, _x ) ); - _x.Check (); - } - inline BinaryDataAutoPtr::BinaryDataAutoPtr ( const Text &name, fmx::uint32* context ) - { - _fmxcpt _x; - reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline BinaryDataUniquePtr::BinaryDataUniquePtr () { _fmxcpt _x; @@ -345,7 +293,6 @@ extern "C++" reset ( FM_BinaryData_Constructor4 ( name, context, _x ) ); _x.Check (); } -#endif inline errcode BinaryData::GetFNAMData ( Text &filepathlist ) const { diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXCalcEngine.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXCalcEngine.h index 3178844..98886cc 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXCalcEngine.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXCalcEngine.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2020 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_DBCalcEngine_ @@ -32,7 +32,7 @@ #include "FMWrapper/FMXClient.h" -extern "C++" +extern "C++" { namespace fmx { @@ -84,28 +84,12 @@ extern "C++" // Calculation and script step function definition FMX_PROCPTR( errcode, ExtPluginType ) ( short functionId, const ExprEnv& env, const DataVect& parms, Data& result ); - + class ExprEnv { public: enum { - // DEPRECATED in FileMaker Pro 12. The server database process no longer loads plug-ins. Stored calculations - // containing plug-in functions will not evaluate the same way they do on a client with the plug-in if a - // schema change forces the server to recalculate the stored calculation's value. - kMayEvaluateOnServer = 0x00000001, - - // DEPRECATED in FileMaker Pro 16. All the following flags will be ignored for the commented purpose in version - // 16 and later. Note the change of kDisplayInAllDialogs further below. - kDisplayCalcFields = 0x00000100, // Calculated fields - kDisplayAutoEnter = 0x00000200, // Auto enter calculation - kDisplayValidation = 0x00000400, // Validation by calculation - kDisplayCustomFunctions = 0x00000800, // Custom function definition - kDisplayPrivileges = 0x00001000, // Row level access calculations - kDisplayInFuture1 = 0x00002000, // As yet undefined calculation dialog - kDisplayInFuture2 = 0x00004000, // As yet undefined calculation dialog - kDisplayGeneric = 0x00008000, // Dialog used by scripting and replace - // Changed in FileMaker Pro 16v2. If any of these bits are set, the function will be displayed in any picking // UI control. Future functions should use this constant if they want to be displayed. The function can always // be typed in manually. @@ -257,11 +241,33 @@ extern "C++" kGet_OpenDataFileInfo = 1123, kGet_AccountType = 1124, kGet_PageCount = 1125, - + kGet_SystemLocaleElements = 1126, + kGet_FileLocaleElements = 1127, + kGet_InstalledFMPluginsAsJSON = 1128, + + // New to FileMaker Pro 19.4.1 + kGet_SessionIdentifier = 1129, + + // New to FileMaker Pro 19.5.1 internal use, new to 20.1.1 Release + kGet_CacheFileName = 1130, + kGet_CacheFilePath = 1131, + // New to FileMaker Pro 19 (API VERSION 62) and later. For new EvaluateConvert... entry points kConvert_PosixPath = 1, kConvert_WinPath = 2, - kConvert_URLPath = 3 + kConvert_URLPath = 3, + + // New to FileMaker Pro 19.6 + kGet_TransactionState = 1132, + kGet_CurrentTimeUTCMicroseconds = 1133, + kGet_LastErrorLocation = 1134, + + // New to FileMaker Pro 21.0 + kGet_LLMLastStepTokensUsed = 1135, + + // New to FileMaker Pro 21.1 + kGet_RevertTransactionOnErrorState = 1136, + kGet_SystemStorageAvailable = 1137, }; inline errcode Evaluate ( const Text &expression, Data &result ) const; @@ -354,54 +360,26 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataVectAutoPtr : public std::auto_ptr - { - typedef DataVectAutoPtr UpCaster; - public: - inline DataVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED RowVectAutoPtr : public std::auto_ptr - { - typedef RowVectAutoPtr UpCaster; - public: - inline RowVectAutoPtr (); - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ExprEnvAutoPtr : public std::auto_ptr - { - typedef ExprEnvAutoPtr UpCaster; - public: - inline ExprEnvAutoPtr (); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataVectUniquePtr : public std::unique_ptr { typedef DataVectUniquePtr UpCaster; public: inline DataVectUniquePtr (); }; - + class RowVectUniquePtr : public std::unique_ptr { typedef RowVectUniquePtr UpCaster; public: inline RowVectUniquePtr (); }; - + class ExprEnvUniquePtr : public std::unique_ptr { typedef ExprEnvUniquePtr UpCaster; public: inline ExprEnvUniquePtr (); }; -#endif } } @@ -437,9 +415,6 @@ extern "C" fmx::errcode FMX_API FM_ExprEnv_EvaluateGetFunction ( const void *_self, short functionValue, fmx::Data &result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertToFileMakerPath ( const void *_self, const fmx::Text &inPath, fmx::int32 inFormat, fmx::Text &outFMPath, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_EvaluateConvertFromFileMakerPath ( const void *_self, const fmx::Text &inFMPath, fmx::int32 inFormat, fmx::Text &outPath, fmx::_fmxcpt &_x ) throw (); -#if FMX_OBSOLETE_API - DEPRECATED fmx::errcode FMX_API FM_ExprEnv_ExecuteSQL ( const void *_self, const fmx::Text &expression, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); -#endif fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQL ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::RowVect& result, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_ExecuteFileSQLTextResult ( const void *_self, const fmx::Text &expression, const fmx::Text &filename, const fmx::DataVect ¶meters, fmx::Data &result, fmx::uint16 colSep, fmx::uint16 rowSep, fmx::_fmxcpt &_x ) throw (); fmx::errcode FMX_API FM_ExprEnv_RegisterExternalFunction ( const fmx::QuadChar &pluginId, short functionId, const fmx::Text &functionName, const fmx::Text &functionPrototype, short minArgs, short maxArgs, fmx::uint32 compatibleOnFlags, fmx::ExtPluginType funcPtr, fmx::_fmxcpt &_x ) throw (); @@ -553,23 +528,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataVectAutoPtr::DataVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_DataVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataVectUniquePtr::DataVectUniquePtr () { _fmxcpt _x; reset ( FM_DataVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline uint32 RowVect::Size () const { @@ -599,23 +563,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline RowVectAutoPtr::RowVectAutoPtr () - { - _fmxcpt _x; - reset ( FM_RowVect_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline RowVectUniquePtr::RowVectUniquePtr () { _fmxcpt _x; reset ( FM_RowVect_Constructor1 ( _x ) ); _x.Check (); } -#endif inline errcode ExprEnv::Evaluate ( const Text &expression, Data &result ) const { @@ -715,23 +668,12 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ExprEnvAutoPtr::ExprEnvAutoPtr () - { - _fmxcpt _x; - reset ( FM_ExprEnv_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ExprEnvUniquePtr::ExprEnvUniquePtr () { _fmxcpt _x; reset ( FM_ExprEnv_Constructor1 ( _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXClient.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXClient.h index 04d2925..f4da8bd 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXClient.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXClient.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef FMXCLIENT_H_INCLUDED @@ -49,13 +49,13 @@ extern "C++" kBadAlloc, kUnknown }; - + inline _fmxcpt () : m_vers ( 1 ) , m_code ( kNoErr ) { } - + inline void Check () { switch ( m_code ) @@ -68,7 +68,7 @@ extern "C++" throw std::exception (); } } - + int32 m_vers; int32 m_code; }; diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXData.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXData.h index c6b8197..97f4da8 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXData.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXData.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Data_ @@ -81,7 +81,7 @@ extern "C++" inline void SetAsTimeStamp ( const DateTime &timeStampData, const DataType nativeType = kDTTimeStamp ); inline void SetDateTime ( const DateTime &dateTimeData, const DataType dateTimeType, const DataType nativeType ); inline void SetBinaryData ( const BinaryData &binaryData, bool forceBinaryNativeType = true ); - + inline void operator delete ( void *obj ); // Prior to version 14 the display name tended to be the name of the font that was returned. In version 14 and later @@ -94,10 +94,6 @@ extern "C++" // GetFontInfo will return false if the given font id is not found in the database - // New to FileMaker Pro 8 (API VERSION 51) and later - DEPRECATED inline CharacterStyle::FontID GetFontID ( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const; - DEPRECATED inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const; - // New to FileMaker Pro 14 (API VERSION 55) and later inline CharacterStyle::FontID GetFontID ( const Text &fontPostscriptName, const ExprEnv &env ) const; inline bool GetFontInfo ( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const; @@ -108,26 +104,13 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DataAutoPtr : public std::auto_ptr - { - typedef DataAutoPtr UpCaster; - public: - inline DataAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DataUniquePtr : public std::unique_ptr { typedef DataUniquePtr UpCaster; public: inline DataUniquePtr (); - + }; -#endif } } @@ -160,9 +143,7 @@ extern "C" void FMX_API FM_Data_SetBinaryData ( void *_self, const fmx::BinaryData &binaryData, bool forceBinaryNativeType, fmx::_fmxcpt &_x ) throw (); void FMX_API FM_Data_Delete ( void *_self, fmx::_fmxcpt &_x ) throw (); - fmx::CharacterStyle::FontID FMX_API FM_Data_GetFontID ( const void *_self, const fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); fmx::CharacterStyle::FontID FMX_API FM_Data_GetPostscriptFontID ( const void *_self, const fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); - bool FMX_API FM_Data_GetFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontDisplayName, fmx::CharacterStyle::FontScript &fontScript, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); bool FMX_API FM_Data_GetPostscriptFontInfo ( const void *_self, fmx::CharacterStyle::FontID font, fmx::Text &fontPostscriptName, const fmx::ExprEnv &env, fmx::_fmxcpt &_x ) throw (); } @@ -318,31 +299,13 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DataAutoPtr::DataAutoPtr () - { - _fmxcpt _x; - reset ( FM_Data_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DataUniquePtr::DataUniquePtr () { _fmxcpt _x; reset ( FM_Data_Constructor1 ( _x ) ); _x.Check (); } -#endif - - inline CharacterStyle::FontID Data::GetFontID( const Text &fontDisplayName, CharacterStyle::FontScript fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - CharacterStyle::FontID _rtn = FM_Data_GetFontID ( this, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } + inline CharacterStyle::FontID Data::GetFontID( const Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; @@ -350,13 +313,6 @@ extern "C++" _x.Check (); return _rtn; } - inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontDisplayName, CharacterStyle::FontScript &fontScript, const ExprEnv &env ) const - { - _fmxcpt _x; - bool _rtn = FM_Data_GetFontInfo ( this, font, fontDisplayName, fontScript, env, _x ); - _x.Check (); - return _rtn; - } inline bool Data::GetFontInfo( CharacterStyle::FontID font, Text &fontPostscriptName, const ExprEnv &env ) const { _fmxcpt _x; diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXDateTime.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXDateTime.h index 0bfaf66..4192039 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXDateTime.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXDateTime.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_DateTime_ @@ -80,19 +80,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED DateTimeAutoPtr : public std::auto_ptr - { - typedef DateTimeAutoPtr UpCaster; - public: - inline DateTimeAutoPtr (); - inline DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); - inline DateTimeAutoPtr ( const Text &dateText, const Locale &intl ); - }; -#endif - -#if FMX_USE_UNIQUE_PTR class DateTimeUniquePtr : public std::unique_ptr { typedef DateTimeUniquePtr UpCaster; @@ -101,7 +88,6 @@ extern "C++" inline DateTimeUniquePtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ); inline DateTimeUniquePtr ( const Text &dateText, const Locale &intl ); }; -#endif } } @@ -336,28 +322,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline DateTimeAutoPtr::DateTimeAutoPtr () - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor1 ( _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const unichar16* dateString, uint32 dateLength, const Locale& intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor2 ( dateString, dateLength, intl, _x ) ); - _x.Check (); - } - inline DateTimeAutoPtr::DateTimeAutoPtr ( const Text &dateText, const Locale &intl ) - { - _fmxcpt _x; - reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline DateTimeUniquePtr::DateTimeUniquePtr () { _fmxcpt _x; @@ -376,8 +340,7 @@ extern "C++" reset ( FM_DateTime_Constructor3 ( dateText, intl, _x ) ); _x.Check (); } -#endif - + } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXExtern.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXExtern.h index bc988ba..31122b5 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXExtern.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXExtern.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2020 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Extern_ @@ -36,7 +36,7 @@ // Platform specific macros -#if defined(__GNUC__) +#if defined(__GNUC__) && (defined (__cplusplus) && __cplusplus >= 201103L) #define FMX_PACK __attribute__ ((packed)) #define FMX_PACK_ON @@ -50,21 +50,7 @@ #define DEPRECATED __attribute__((deprecated)) #endif - #if defined (_LIBCPP_STD_VER) && _LIBCPP_STD_VER > 14 - #define FMX_USE_AUTO_PTR 0 - #else - #define FMX_USE_AUTO_PTR 1 - #endif - - #if defined(_UNIQUE_PTR_H) || defined(_LIBCPP_VERSION) - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_LP64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && _MSC_VER >= 1800 #define FMX_PACK #define FMX_PACK_ON pack (push, 1) @@ -78,30 +64,10 @@ #define DEPRECATED __declspec(deprecated) #endif - #if defined(_MSVC_LANG) && _MSVC_LANG <= 201402 - #define FMX_USE_AUTO_PTR 1 - #endif - - #if _MSC_VER >= 1800 - #define FMX_USE_UNIQUE_PTR 1 - #endif - - #if defined(_M_X64) - #define FMX_64BIT_PLUGIN_API 1 - #endif - #else - #error "Unsupported compiler" - -#endif + #error "Unsupported compiler version" -// Original memorary manager callbacks and External() call exists only on Mac and Win 32 bit targets - -#if defined(FMX_64BIT_PLUGIN_API) || defined(__linux__) || TARGET_OS_IPHONE - #define FMX_OBSOLETE_API 0 -#else - #define FMX_OBSOLETE_API 1 #endif // Forward definitions @@ -123,41 +89,17 @@ extern "C++" #if defined( _MSC_VER ) typedef __int64 int64; typedef unsigned __int64 uint64; - - #if defined( _M_X64) typedef uint64 ptrtype; - #else - typedef uint32 ptrtype; - #endif typedef int16 unusedid; #else - #if defined( _LP64 ) typedef long int64; typedef unsigned long uint64; typedef uint64 ptrtype; typedef int32 unusedid; - #else - typedef long long int64; - typedef unsigned long long uint64; - typedef uint32 ptrtype; - typedef int16 unusedid; - #endif #endif typedef short errcode; typedef unsigned short unichar16; - typedef DEPRECATED unichar16 unichar; // DEPRECATED in version 15. unichar conflicts often with Cocoa's definition of it - -#if FMX_OBSOLETE_API - - // DEPRECATED in version 15. These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) - // should be specific about the sizes of integers and not rely on ambiguous "long" data types. - typedef DEPRECATED fmx::uint32 ulong; - typedef DEPRECATED fmx::uint16 ushort; - typedef DEPRECATED fmx::int64 longlong; - -#endif // FMX_OBSOLETE_API - } } extern "C" @@ -176,50 +118,10 @@ extern "C" typedef char FMX_Char; typedef char FMX_Boolean; -#if FMX_OBSOLETE_API - -// DEPRECATED in version 15. Old style definitions; never were supported in 64-bit plugins; - -// These are provided for backwards compatibility. Newly developed plugins(both 32-bit and 64-bit) should be specific about the sizes of -// integers and not rely on ambiguous "long" data types. -typedef DEPRECATED FMX_UInt32 FMX_ULong; -typedef DEPRECATED FMX_UInt16 FMX_UShort; -typedef DEPRECATED FMX_Int32 FMX_Long; -typedef DEPRECATED FMX_Int16 FMX_Short; -typedef DEPRECATED FMX_Char* FMX_Ptr; -typedef DEPRECATED FMX_Char** FMX_Hdl; - -// Memory accessors for old style plug-ins -// New style plugins should not use these. When creating new objects (BinaryData, Text, etc), use the autoptr classes provided in the SDK. - -FMX_PROCPTR(char**, FMX_NewHandleCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_SetHandleSizeCall)(char** h, FMX_Int32 size); -FMX_PROCPTR(FMX_Int32, FMX_GetHandleSizeCall)(char** h); -FMX_PROCPTR(void, FMX_DisposeHandleCall)(char** h); -FMX_PROCPTR(void, FMX_MoveHHiCall)(char** h); -FMX_PROCPTR(void, FMX_LockHandleCall)(char** h); -FMX_PROCPTR(void, FMX_UnlockHandleCall)(char** h); -FMX_PROCPTR(char*, FMX_NewPointerCall)(FMX_Int32 size); -FMX_PROCPTR(void, FMX_DisposePointerCall)(char* p); -FMX_PROCPTR(FMX_Int16, FMX_MemoryErrorCall)(void); - -#define FMX_NewHandle(size) (gFMX_ExternCallPtr->cNewHandle)(size) -#define FMX_SetHandleSize(h, size) (gFMX_ExternCallPtr->cSetHandleSize)(h, size) -#define FMX_GetHandleSize(h) (gFMX_ExternCallPtr->cGetHandleSize)(h) -#define FMX_DisposeHandle(h) (gFMX_ExternCallPtr->cDisposeHandle)(h) -#define FMX_MoveHHi(h) (gFMX_ExternCallPtr->cMoveHHi)(h) -#define FMX_LockHandle(h) (gFMX_ExternCallPtr->cLockHandle)(h) -#define FMX_UnlockHandle(h) (gFMX_ExternCallPtr->cUnlockHandle)(h) -#define FMX_NewPointer(size) (gFMX_ExternCallPtr->cNewPointer)(size) -#define FMX_DisposePointer(p) (gFMX_ExternCallPtr->cDisposePointer)(p) -#define FMX_MemoryError() (gFMX_ExternCallPtr->cMemoryError)() - -#endif // FMX_OBSOLETE_API - // New public callbacks typedef FMX_UChar FMX_ScriptControl; -enum +enum { kFMXT_Halt, kFMXT_Exit, @@ -254,7 +156,18 @@ enum k170ExtnVersion = 59, k180ExtnVersion = 60, k190ExtnVersion = 62, - kCurrentExtnVersion = 62, + k191ExtnVersion = 63, + k192ExtnVersion = 64, + k193ExtnVersion = 65, + k194ExtnVersion = 66, + k195ExtnVersion = 67, + k196ExtnVersion = 68, + k201ExtnVersion = 71, + k202ExtnVersion = 72, + k203ExtnVersion = 73, + k210ExtnVersion = 74, + k211ExtnVersion = 75, + kCurrentExtnVersion = 75, kMinExtnVersion = 4, kMaxExtnVersion = 255 }; @@ -264,20 +177,21 @@ enum { kFMXT_Init = 0, // Enabled by kFMXT_OptionsStr character 8 kFMXT_Idle = 1, // Enabled by kFMXT_OptionsStr character 9 -#if FMX_OBSOLETE_API - kFMXT_External = 3, // DEPRECATED External function callback -#endif + // kFMXT_External = 3, // DEPRECATED External function callback kFMXT_Shutdown = 4, // Enabled by kFMXT_OptionsStr character 8 kFMXT_DoAppPreferences = 5, // Enabled by kFMXT_OptionsStr character 6 kFMXT_GetString = 7, // REQUIRED to be handled // New to FileMaker Pro 15 (API VERSION 56) and later kFMXT_SessionShutdown = 8, // Enabled by kFMXT_OptionsStr character 10 - kFMXT_FileShutdown = 9 // Enabled by kFMXT_OptionsStr character 10 + kFMXT_FileShutdown = 9, // Enabled by kFMXT_OptionsStr character 10 + + // New to FileMaker Pro 21.1 (API VERSION 75) and later + kFMXT_SchemaChange = 10 // Enabled by kFMXT_OptionsStr character 10 }; typedef FMX_UChar FMX_Strings; // Different strings that may be asked for by kFMXT_GetString -enum +enum { kFMXT_NameStr = 128, // Name of the plug-in kFMXT_AppConfigStr = 129, // Help text to display in FileMaker application preferences @@ -300,15 +214,16 @@ enum typedef FMX_UChar FMX_Application; enum { - kFMXT_Developer = 0, // FileMaker Pro Advanced + kFMXT_Developer = 0, // FileMaker Pro Advanced (no longer shipping) kFMXT_Pro = 1, // FileMaker Pro - kFMXT_Runtime = 2, // FileMaker Runtime + kFMXT_Runtime = 2, // FileMaker Runtime (no longer shipping) kFMXT_Server = 3, // This process no longer loads plug-ins kFMXT_Web = 4, // Web Publishing process kFMXT_Mobile = 5, // This iOS process is not allowed to load plug-ins kFMXT_XDBC = 6, // This process does not currently load plug-ins kFMXT_SASE = 7, // Server scripting process - kFMXT_IWP = 8 // This process no longer exists + kFMXT_IWP = 8, // This process no longer exists + kFMXT_FMDAPI = 9 // FileMaker Data API process }; struct FMX_ExternCallStruct; @@ -323,29 +238,29 @@ struct FMX_ExternCallStruct FMX_Int16 extnVersion; // Version of this structure, set to the value of kCurrentExtnVersion fmx::unusedid unusedID; // Always -1 as of FileMaker Pro version 19 (API VERSION 61) FMX_ExternCallProc entryPoint; // The pointer the plug-ins entry point, FMExternCallProc - FMX_Boolean cfmCalls; // Always false (i.e. 0) + FMX_Boolean unusedFlag; // Always false (i.e. 0) FMX_ExternCallSwitch whichCall; // Which call FileMaker is making into the plug-in (i.e. kFMXT_Init and others) - FMX_Boolean unsafeCalls; // True if unsafe for non-memory calls + FMX_Boolean unsafeCalls; // True if not on the main thread // Parameters for the calls; any parameter not used by a call is set to zero. FMX_UChar parm1; - FMX_PtrType parm2; + FMX_PtrType parm2; FMX_PtrType parm3; - + // The meanings of parm1..parm3 in terms of the various messages: // Msg = Parm1 Parm2 Parm3 // kFMXT_Init FMX_Application value App vers unicode c str* [unused] // kFMXT_Idle FMX_IdleLevel value Session ID [unused] - // kFMXT_External [unused] Funct str index Parameter text** // kFMXT_Shutdown [unused] [unused] [unused] // kFMXT_DoAppPreferences [unused] [unused] [unused] // kFMXT_GetString FMX_Strings value Windows lang ID Maximum size of string to return // kFMXT_SessionShutdown [unused] Session ID [unused] // kFMXT_FileShutdown [unused] Session ID File ID + // kFMXT_SchemaChange [unused] char* to utf8 JSON text** Length of utf8 JSON text // //(* same as GetAppVersion, e.g. "Pro 13.0v2" ) - //(** Parameter from calculation as text, in kEncoding_ASCII_Mac or kEncoding_ShiftJIS_Mac; Result passed back to FileMaker must match encoding.) - + //(** This message only sent to plug-ins loaded in the server side scripting process) + // Passed in every call FMX_PtrType instanceID; // ID of the plug-in // On Windows, it is the Instance ID of the plug-in. @@ -354,23 +269,9 @@ struct FMX_ExternCallStruct // Result from a call FMX_PtrType result; // kFMXT_Init returns it's kCurrentExtnVersion - // Unused - FMX_PtrType unused; - -#if FMX_OBSOLETE_API - // DEPRECATED in version 15. Call backs for old plug-ins - DEPRECATED FMX_NewHandleCall cNewHandle; - DEPRECATED FMX_SetHandleSizeCall cSetHandleSize; - DEPRECATED FMX_GetHandleSizeCall cGetHandleSize; - DEPRECATED FMX_DisposeHandleCall cDisposeHandle; - DEPRECATED FMX_MoveHHiCall cMoveHHi; - DEPRECATED FMX_LockHandleCall cLockHandle; - DEPRECATED FMX_UnlockHandleCall cUnlockHandle; - DEPRECATED FMX_NewPointerCall cNewPointer; - DEPRECATED FMX_DisposePointerCall cDisposePointer; - DEPRECATED FMX_MemoryErrorCall cMemoryError; -#endif - + // Unused + FMX_PtrType unused; + // New public callbacks FMX_StartScriptCall cStartScript; FMX_CurrentEnvCall cCurrentEnv; diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXFixPt.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXFixPt.h index ba927a7..75f15e0 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXFixPt.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXFixPt.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_FixPt_ @@ -44,7 +44,7 @@ extern "C++" { kDefltFixedPrecision = 16 }; - + inline void AssignInt ( fmx::int32 that ); inline void AssignDouble ( double that ); inline void AssignFixPt ( const FixPt &that ); @@ -57,11 +57,11 @@ extern "C++" inline void Increment ( fmx::int32 n ); inline void Decrement ( fmx::int32 n ); inline void Negate (); - + // Obtain and modify the decimal precision from the standard 16 digits. For more information, see SetPrecision calculation function in FileMaker Pro Help. inline int GetPrecision () const; inline void SetPrecision ( int precision ); - + inline void Add ( const FixPt &arg, FixPt &result ) const; inline void Subtract ( const FixPt &arg, FixPt &result ) const; inline void Multiply ( const FixPt &arg, FixPt &result ) const; @@ -84,28 +84,14 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED FixPtAutoPtr : public std::auto_ptr - { - typedef FixPtAutoPtr UpCaster; - public: - inline FixPtAutoPtr ( fmx::int32 val = 0, int precision = FixPt::kDefltFixedPrecision ); - inline FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class FixPtUniquePtr : public std::unique_ptr { typedef FixPtUniquePtr UpCaster; public: inline FixPtUniquePtr ( fmx::int32 val = 0, int precision = FixPt::kDefltFixedPrecision ); inline FixPtUniquePtr ( fmx::int32 val, const FixPt &precisionExample ); - + }; -#endif } } @@ -318,22 +304,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, int precision ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor1 ( val, precision, _x ) ); - _x.Check (); - } - inline FixPtAutoPtr::FixPtAutoPtr ( fmx::int32 val, const FixPt &precisionExample ) - { - _fmxcpt _x; - reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline FixPtUniquePtr::FixPtUniquePtr ( fmx::int32 val, int precision ) { _fmxcpt _x; @@ -346,7 +316,6 @@ extern "C++" reset ( FM_FixPt_Constructor2 ( val, precisionExample, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXText.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXText.h index 87b8d6a..3e4b47e 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXText.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXText.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Text_ @@ -155,26 +155,13 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED TextAutoPtr : public std::auto_ptr - { - typedef TextAutoPtr UpCaster; - public: - inline TextAutoPtr (); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class TextUniquePtr : public std::unique_ptr { typedef TextUniquePtr UpCaster; public: inline TextUniquePtr (); - + }; -#endif } } @@ -428,24 +415,13 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline TextAutoPtr::TextAutoPtr () - { - _fmxcpt _x; - reset ( FM_Text_Constructor1 ( _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline TextUniquePtr::TextUniquePtr () { _fmxcpt _x; reset ( FM_Text_Constructor1 ( _x ) ); _x.Check (); } -#endif - + } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTextStyle.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTextStyle.h index 87eb00a..f7108a9 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTextStyle.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTextStyle.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2024 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_TextStyle_ @@ -47,28 +47,6 @@ extern "C++" typedef unsigned char ColorChannel; typedef unsigned short ColorChannel16; - // DEPRECATED in FileMaker Pro 14. Fonts no longer belong to "scripts" - typedef unsigned short FontScript; - enum - { - kRoman = 0, - kGreek = 1, - kCyrillic = 2, - kCentralEurope = 3, - kShiftJIS = 4, - kTraditionalChinese = 5, - kSimplifiedChinese = 6, - kOEM = 7, - kSymbol = 8, - kNative = 9, - kOther = 10, - kKorean = 11, - kDingbats = 12, - kTurkish = 13, - - kInvalidFont = 0xFFFF - }; - class Color { public: @@ -171,33 +149,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED ColorAutoPtr : public std::auto_ptr - { - typedef ColorAutoPtr UpCaster; - public: - inline ColorAutoPtr (); - inline ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, - CharacterStyle::ColorChannel alpha = CharacterStyle::Color::kColorChannel_ON ); - inline ColorAutoPtr ( const CharacterStyle::Color &mask ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED CharacterStyleAutoPtr : public std::auto_ptr - { - typedef CharacterStyleAutoPtr UpCaster; - public: - inline CharacterStyleAutoPtr (); - inline CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, - const CharacterStyle::Color &color = CharacterStyle::Color::Black() ); - inline CharacterStyleAutoPtr ( const CharacterStyle &style ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class ColorUniquePtr : public std::unique_ptr { typedef ColorUniquePtr UpCaster; @@ -206,9 +157,9 @@ extern "C++" inline ColorUniquePtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, CharacterStyle::ColorChannel alpha = CharacterStyle::Color::kColorChannel_ON ); inline ColorUniquePtr ( const CharacterStyle::Color &mask ); - + }; - + class CharacterStyleUniquePtr : public std::unique_ptr { typedef CharacterStyleUniquePtr UpCaster; @@ -217,9 +168,8 @@ extern "C++" inline CharacterStyleUniquePtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, const CharacterStyle::Color &color = CharacterStyle::Color::Black() ); inline CharacterStyleUniquePtr ( const CharacterStyle &style ); - + }; -#endif } } @@ -408,28 +358,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline ColorAutoPtr::ColorAutoPtr () - { - _fmxcpt _x; - reset ( FM_Color_Constructor1 ( _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( CharacterStyle::ColorChannel red, CharacterStyle::ColorChannel green, CharacterStyle::ColorChannel blue, CharacterStyle::ColorChannel alpha ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor2 ( red, green, blue, alpha, _x ) ); - _x.Check (); - } - inline ColorAutoPtr::ColorAutoPtr ( const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_Color_Constructor3 ( color, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline ColorUniquePtr::ColorUniquePtr () { _fmxcpt _x; @@ -448,8 +376,7 @@ extern "C++" reset ( FM_Color_Constructor3 ( color, _x ) ); _x.Check (); } -#endif - + inline void CharacterStyle::EnableFont () { _fmxcpt _x; @@ -645,28 +572,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr () - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor1 ( _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( CharacterStyle::FontID font, CharacterStyle::Face face, CharacterStyle::FontSize size, const CharacterStyle::Color &color ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor2 ( font, face, size, color, _x ) ); - _x.Check (); - } - inline CharacterStyleAutoPtr::CharacterStyleAutoPtr ( const CharacterStyle &style ) - { - _fmxcpt _x; - reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline CharacterStyleUniquePtr::CharacterStyleUniquePtr () { _fmxcpt _x; @@ -685,7 +590,6 @@ extern "C++" reset ( FM_CharacterStyle_Constructor3 ( style, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTypes.h b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTypes.h index a499dd3..038b3b6 100644 --- a/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTypes.h +++ b/libraries/iphonesimulator/iOSAppSDK.framework/Headers/FMXTypes.h @@ -1,19 +1,19 @@ /* - - Copyright © 1998 - 2019 Claris International Inc. + + Copyright © 1998 - 2021 Claris International Inc. All rights reserved. - + Claris International Inc. grants you a non-exclusive limited license to use this file solely to enable licensees of Claris FileMaker Pro to compile plug-ins for use with Claris products. Redistribution and use in source and binary forms, without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * The name Claris International Inc. may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY CLARIS INTERNATIONAL INC. ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ #ifndef _h_Types_ @@ -83,6 +83,9 @@ extern "C++" kType_DAN = 19, // Danish kType_NLD = 20, // Dutch kType_ENG = 21, // English +#ifdef XUNIX + kType_ENG_INTL = 77, // English Intl +#endif kType_FIN = 22, // Finnish kType_FIN_fmi = 23, // Finnish (FileMaker custom) kType_FRA = 24, // French @@ -113,7 +116,7 @@ extern "C++" // New to FileMaker Pro 13 kType_KOR = 76, // Korean - + // For compatibility with WinSoft versions (supported in FMI versions >= 12) kType_HE = 47, // Hebrew kType_HI = 48, // Hindi @@ -159,30 +162,6 @@ extern "C++" }; -#if FMX_USE_AUTO_PTR - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED QuadCharAutoPtr : public std::auto_ptr - { - typedef QuadCharAutoPtr UpCaster; - public: - inline QuadCharAutoPtr (); - inline QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ); - inline QuadCharAutoPtr ( const QuadChar &value ); - - }; - - // DEPRECATED in FileMaker Pro 15. C++11 deprecated std::auto_ptr and replaced with std::unique_ptr. - class DEPRECATED LocaleAutoPtr : public std::auto_ptr - { - typedef LocaleAutoPtr UpCaster; - public: - inline LocaleAutoPtr ( Locale::Type inputType = Locale::kType_System ); - inline LocaleAutoPtr ( const Locale ©Construct ); - - }; -#endif - -#if FMX_USE_UNIQUE_PTR class QuadCharUniquePtr : public std::unique_ptr { typedef QuadCharUniquePtr UpCaster; @@ -190,18 +169,17 @@ extern "C++" inline QuadCharUniquePtr (); inline QuadCharUniquePtr ( char c0, char c1, char c2, char c3 ); inline QuadCharUniquePtr ( const QuadChar &value ); - + }; - + class LocaleUniquePtr : public std::unique_ptr { typedef LocaleUniquePtr UpCaster; public: inline LocaleUniquePtr ( Locale::Type inputType = Locale::kType_System ); inline LocaleUniquePtr ( const Locale ©Construct ); - + }; -#endif } } @@ -236,7 +214,7 @@ extern "C" extern "C++" { namespace fmx - { + { inline const QuadChar &QuadChar::operator = ( const QuadChar &value ) { _fmxcpt _x; @@ -320,28 +298,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline QuadCharAutoPtr::QuadCharAutoPtr () - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor1 ( _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( char c0, char c1, char c2, char c3 ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor2 ( c0, c1, c2, c3, _x ) ); - _x.Check (); - } - inline QuadCharAutoPtr::QuadCharAutoPtr ( const QuadChar &value ) - { - _fmxcpt _x; - reset ( FM_QuadChar_Constructor3 ( value, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline QuadCharUniquePtr::QuadCharUniquePtr () { _fmxcpt _x; @@ -360,7 +316,6 @@ extern "C++" reset ( FM_QuadChar_Constructor3 ( value, _x ) ); _x.Check (); } -#endif inline Locale &Locale::operator = ( const Locale &rhs ) { _fmxcpt _x; @@ -375,22 +330,6 @@ extern "C++" _x.Check (); } -#if FMX_USE_AUTO_PTR - inline LocaleAutoPtr::LocaleAutoPtr ( Locale::Type inputType ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor1 ( inputType, _x ) ); - _x.Check (); - } - inline LocaleAutoPtr::LocaleAutoPtr ( const Locale ©Construct ) - { - _fmxcpt _x; - reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); - _x.Check (); - } -#endif - -#if FMX_USE_UNIQUE_PTR inline LocaleUniquePtr::LocaleUniquePtr ( Locale::Type inputType ) { _fmxcpt _x; @@ -403,7 +342,6 @@ extern "C++" reset ( FM_Locale_Constructor2 ( copyConstruct, _x ) ); _x.Check (); } -#endif } } diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/Info.plist b/libraries/iphonesimulator/iOSAppSDK.framework/Info.plist index 207ae98..41caab9 100644 Binary files a/libraries/iphonesimulator/iOSAppSDK.framework/Info.plist and b/libraries/iphonesimulator/iOSAppSDK.framework/Info.plist differ diff --git a/libraries/iphonesimulator/iOSAppSDK.framework/iOSAppSDK b/libraries/iphonesimulator/iOSAppSDK.framework/iOSAppSDK index 4a511a7..d13b62b 100644 Binary files a/libraries/iphonesimulator/iOSAppSDK.framework/iOSAppSDK and b/libraries/iphonesimulator/iOSAppSDK.framework/iOSAppSDK differ diff --git a/src/ffi/data.rs b/src/ffi/data.rs index 5436f64..8465881 100644 --- a/src/ffi/data.rs +++ b/src/ffi/data.rs @@ -48,16 +48,6 @@ extern "C" { _x: *mut fmx__fmxcpt, ) -> FMError; - #[deprecated] - #[allow(dead_code)] - fn FM_Data_GetFontID( - _self: *const fmx_Data, - fontDisplayName: *const fmx_Text, - fontScript: fmx_fontscript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> fmx_fontid; - fn FM_Data_GetPostscriptFontID( _self: *const fmx_Data, fontPostscriptName: *const fmx_Text, @@ -65,17 +55,6 @@ extern "C" { _x: *mut fmx__fmxcpt, ) -> fmx_fontid; - #[deprecated] - #[allow(dead_code)] - fn FM_Data_GetFontInfo( - _self: *const fmx_Data, - font: fmx_fontid, - fontDisplayName: *mut fmx_Text, - fontScript: *mut fmx_fontscript, - env: *const fmx_ExprEnv, - _x: *mut fmx__fmxcpt, - ) -> bool; - fn FM_Data_GetPostscriptFontInfo( _self: *const fmx_Data, font: fmx_fontid,