Patch to get extension loading working on wince. Ticket #2023. (CVS 3537)

FossilOrigin-Name: a81f3ddfd0626ae642c5ffd27a23c568d06f58dc

diff --git a/manifest b/manifest
index 953aa940c7c2d9c983cc73818b58f284f2af4991..b0c51829a1c6032296bc67db4e75bbd3a8667b29 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\squery\soptimizer\sdoes\sa\sbetter\sjob\sof\soptimizing\sout\sORDER\sBY\sclauses\nthat\scontain\sthe\srowid\sor\swhich\suse\sindices\sthat\scontain\sthe\srowid.\nTicket\s#2116.\s(CVS\s3536)
-D 2006-12-20T03:24:19
+C Patch\sto\sget\sextension\sloading\sworking\son\swince.\s\sTicket\s#2023.\s(CVS\s3537)
+D 2006-12-20T03:37:35
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4
 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
-F src/loadext.c ab9b7fc502078a93f97161d28b4aac6ae2aad793
+F src/loadext.c acbbf33357d7eec1ff2aa94dc1fcd38fef76c939
 F src/main.c 33c32014da3a1471e8869d2eba32b2c4314c39ce
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
@@ -423,7 +423,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 893d58c23da2a9b900a13eaa5202d94429862136
-R b71e90ccc82c8a1640aa72f2c870612e
+P f245f5c2c2d337fe6458824beb7f9e721837765f
+R 73af098ac8d3872ee5d1cf0975d597ce
 U drh
-Z 9fec3d60f3cf9eea1be494a067e0f511
+Z 8fbc1ec3a565ddb0cd82d7fc7f801e89

diff --git a/manifest.uuid b/manifest.uuid
index 89fb96bd757d15ccc02cf317b3208146d9a1cea0..27a88f27445620e7ad04129bd7dc793f96604fb2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f245f5c2c2d337fe6458824beb7f9e721837765f
\ No newline at end of file
+a81f3ddfd0626ae642c5ffd27a23c568d06f58dc
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index dec0bb8dbf07a81593e6eaa5ffa8919958bdd898..083bd94511b39e25365d01f51562fdc81d38a48e 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -223,8 +223,18 @@ const sqlite3_api_routines sqlite3_apis = {
 #if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined(__BORLANDC__)
 # include <windows.h>
 # define SQLITE_LIBRARY_TYPE     HANDLE
-# define SQLITE_OPEN_LIBRARY(A)  LoadLibrary(A)
-# define SQLITE_FIND_SYMBOL(A,B) GetProcAddress(A,B)
+# ifdef _WIN32_WCE
+    static HANDLE loadLibraryUtf8(const char *z){
+      WCHAR zWide[MAX_PATH];
+      MultiByteToWideChar(CP_ACP,0,z,-1,zWide,MAX_PATH);
+      return LoadLibrary(zWide);
+    }
+#   define SQLITE_OPEN_LIBRARY(A)  loadLibraryUtf8(A)
+#   define SQLITE_FIND_SYMBOL(A,B) GetProcAddressA(A,B)
+# else
+#   define SQLITE_OPEN_LIBRARY(A)  LoadLibrary(A)
+#   define SQLITE_FIND_SYMBOL(A,B) GetProcAddress(A,B)
+# endif
 # define SQLITE_CLOSE_LIBRARY(A) FreeLibrary(A)
 #endif /* windows */