Merge pull request tursodatabase#1640 from tursodatabase/disable-seh

Explicitly disable SEH on Windows

Author: haaawk

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -14548,15 +14548,17 @@ SQLITE_API void libsql_wasm_engine_free(libsql_wasm_engine_t *);
 #  endif
 #endif
 
-/*
-** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
-** SEH support if the -DSQLITE_OMIT_SEH option is given.
-*/
-#if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
-# define SQLITE_USE_SEH 1
-#else
-# undef SQLITE_USE_SEH
-#endif
+
+// SEH is not supported in libSQL.
+// /*
+// ** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
+// ** SEH support if the -DSQLITE_OMIT_SEH option is given.
+// */
+// #if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
+// # define SQLITE_USE_SEH 1
+// #else
+// # undef SQLITE_USE_SEH
+// #endif
 
 /*
 ** Enable SQLITE_DIRECT_OVERFLOW_READ, unless the build explicitly

libsql-ffi/bundled/bindings/bindgen.rs

@@ -24,10 +24,10 @@ extern "C" {
 }
 
 pub const __GNUC_VA_LIST: i32 = 1;
-pub const SQLITE_VERSION: &[u8; 7] = b"3.44.0\0";
-pub const SQLITE_VERSION_NUMBER: i32 = 3044000;
+pub const SQLITE_VERSION: &[u8; 7] = b"3.45.1\0";
+pub const SQLITE_VERSION_NUMBER: i32 = 3045001;
 pub const SQLITE_SOURCE_ID: &[u8; 85] =
-    b"2023-11-01 11:23:50 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad8alt1\0";
+    b"2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257ccalt1\0";
 pub const LIBSQL_VERSION: &[u8; 6] = b"0.2.3\0";
 pub const SQLITE_OK: i32 = 0;
 pub const SQLITE_ERROR: i32 = 1;
@@ -356,6 +356,7 @@ pub const SQLITE_DETERMINISTIC: i32 = 2048;
 pub const SQLITE_DIRECTONLY: i32 = 524288;
 pub const SQLITE_SUBTYPE: i32 = 1048576;
 pub const SQLITE_INNOCUOUS: i32 = 2097152;
+pub const SQLITE_RESULT_SUBTYPE: i32 = 16777216;
 pub const SQLITE_WIN32_DATA_DIRECTORY_TYPE: i32 = 1;
 pub const SQLITE_WIN32_TEMP_DIRECTORY_TYPE: i32 = 2;
 pub const SQLITE_TXN_NONE: i32 = 0;
@@ -408,6 +409,7 @@ pub const SQLITE_TESTCTRL_PENDING_BYTE: i32 = 11;
 pub const SQLITE_TESTCTRL_ASSERT: i32 = 12;
 pub const SQLITE_TESTCTRL_ALWAYS: i32 = 13;
 pub const SQLITE_TESTCTRL_RESERVE: i32 = 14;
+pub const SQLITE_TESTCTRL_JSON_SELFCHECK: i32 = 14;
 pub const SQLITE_TESTCTRL_OPTIMIZATIONS: i32 = 15;
 pub const SQLITE_TESTCTRL_ISKEYWORD: i32 = 16;
 pub const SQLITE_TESTCTRL_SCRATCHMALLOC: i32 = 17;
@@ -938,7 +940,7 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_vmprintf(
         arg1: *const ::std::os::raw::c_char,
-        arg2: *mut __va_list_tag,
+        arg2: va_list,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -954,7 +956,7 @@ extern "C" {
         arg1: ::std::os::raw::c_int,
         arg2: *mut ::std::os::raw::c_char,
         arg3: *const ::std::os::raw::c_char,
-        arg4: *mut __va_list_tag,
+        arg4: va_list,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -2501,7 +2503,7 @@ extern "C" {
     pub fn sqlite3_str_vappendf(
         arg1: *mut sqlite3_str,
         zFormat: *const ::std::os::raw::c_char,
-        arg2: *mut __va_list_tag,
+        arg2: va_list,
     );
 }
 extern "C" {
@@ -3133,6 +3135,24 @@ pub struct Fts5ExtensionApi {
             piCol: *mut ::std::os::raw::c_int,
         ),
     >,
+    pub xQueryToken: ::std::option::Option<
+        unsafe extern "C" fn(
+            arg1: *mut Fts5Context,
+            iPhrase: ::std::os::raw::c_int,
+            iToken: ::std::os::raw::c_int,
+            ppToken: *mut *const ::std::os::raw::c_char,
+            pnToken: *mut ::std::os::raw::c_int,
+        ) -> ::std::os::raw::c_int,
+    >,
+    pub xInstToken: ::std::option::Option<
+        unsafe extern "C" fn(
+            arg1: *mut Fts5Context,
+            iIdx: ::std::os::raw::c_int,
+            iToken: ::std::os::raw::c_int,
+            arg2: *mut *const ::std::os::raw::c_char,
+            arg3: *mut ::std::os::raw::c_int,
+        ) -> ::std::os::raw::c_int,
+    >,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -3504,12 +3524,4 @@ extern "C" {
 extern "C" {
     pub static sqlite3_wal_manager: libsql_wal_manager;
 }
-pub type __builtin_va_list = [__va_list_tag; 1usize];
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct __va_list_tag {
-    pub gp_offset: ::std::os::raw::c_uint,
-    pub fp_offset: ::std::os::raw::c_uint,
-    pub overflow_arg_area: *mut ::std::os::raw::c_void,
-    pub reg_save_area: *mut ::std::os::raw::c_void,
-}
+pub type __builtin_va_list = *mut ::std::os::raw::c_char;

libsql-ffi/bundled/src/sqlite3.c

@@ -14548,15 +14548,17 @@ SQLITE_API void libsql_wasm_engine_free(libsql_wasm_engine_t *);
 #  endif
 #endif
 
-/*
-** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
-** SEH support if the -DSQLITE_OMIT_SEH option is given.
-*/
-#if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
-# define SQLITE_USE_SEH 1
-#else
-# undef SQLITE_USE_SEH
-#endif
+
+// SEH is not supported in libSQL.
+// /*
+// ** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
+// ** SEH support if the -DSQLITE_OMIT_SEH option is given.
+// */
+// #if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
+// # define SQLITE_USE_SEH 1
+// #else
+// # undef SQLITE_USE_SEH
+// #endif
 
 /*
 ** Enable SQLITE_DIRECT_OVERFLOW_READ, unless the build explicitly

libsql-sqlite3/src/sqliteInt.h

@@ -324,15 +324,17 @@
 #  endif
 #endif
 
-/*
-** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
-** SEH support if the -DSQLITE_OMIT_SEH option is given.
-*/
-#if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
-# define SQLITE_USE_SEH 1
-#else
-# undef SQLITE_USE_SEH
-#endif
+
+// SEH is not supported in libSQL.
+// /*
+// ** Enable SQLITE_USE_SEH by default on MSVC builds.  Only omit
+// ** SEH support if the -DSQLITE_OMIT_SEH option is given.
+// */
+// #if defined(_MSC_VER) && !defined(SQLITE_OMIT_SEH)
+// # define SQLITE_USE_SEH 1
+// #else
+// # undef SQLITE_USE_SEH
+// #endif
 
 /*
 ** Enable SQLITE_DIRECT_OVERFLOW_READ, unless the build explicitly