Use GetProcAddressA() on wince. Ticket #2123 (CVS 3543)

FossilOrigin-Name: e3dddd1cef5877c009852fd7f484973843e26e00

diff --git a/manifest b/manifest
index 18d4fc897ef6ead244a180df4a198f0c4230869b..1d4fb184f792a8fc45f71d7ebe321ea48b7c8016 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reduce\sthe\snumber\sof\sutf8->unicode\sconversions\srequired\sin\swince.\s\sTicket\s#2122\s(CVS\s3542)
-D 2006-12-21T01:37:40
+C Use\sGetProcAddressA()\son\swince.\s\sTicket\s#2123\s(CVS\s3543)
+D 2006-12-21T02:21:57
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -83,7 +83,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c d4bc8cbe1c0dc330bd55bf7821db5b7dbfbf183e
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c 96c7cf8213d10760a097591ba73c75a450c6b688
+F src/os_win.c d7cf0fc2acd9d2a519a9442f78b4bdbf30e730d6
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c 814268d5bbd69f30069867142f1d460b8b7ab778
 F src/pager.h 2e6d42f4ae004ae748a037b8468112b851c447a7
@@ -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 a1bcc6de578992b28924c1cf974ea58251454e2d
-R e8fa20c887a4e40f22b76691faf8de91
+P 6d2ff0962dff0477fe2af0323032dc16337f42ab
+R 1a4c9add7b3dd8462c8e8800ce5e3721
 U drh
-Z dcb186a9f7d66fa34d31b0ea1ff9119c
+Z 485f836110e73c29878298d90fc161b1

diff --git a/manifest.uuid b/manifest.uuid
index 74d71ba6ce658d92d9e92f6f153579836137ff17..4bd3dbbd1f222206006336900b82c06bf92f3ea4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6d2ff0962dff0477fe2af0323032dc16337f42ab
\ No newline at end of file
+e3dddd1cef5877c009852fd7f484973843e26e00
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 661aa750cca2c8132bdf4d40d02033470548d1dd..0961060781a53879399ec94ada08291d5ed4b777 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1516,7 +1516,7 @@ void *sqlite3WinDlopen(const char *zFilename){
     h = LoadLibraryW(zConverted);
   }else{
 #if OS_WINCE
-    return SQLITE_NOMEM;
+    return 0;
 #else
     h = LoadLibraryA(zConverted);
 #endif
@@ -1526,7 +1526,14 @@ void *sqlite3WinDlopen(const char *zFilename){
   
 }
 void *sqlite3WinDlsym(void *pHandle, const char *zSymbol){
+#if OS_WINCE
+  /* The GetProcAddressA() routine is only available on wince. */
+  return GetProcAddressA((HANDLE)pHandle, zSymbol);
+#else
+  /* All other windows platforms expect GetProcAddress() to take
+  ** an Ansi string regardless of the _UNICODE setting */
   return GetProcAddress((HANDLE)pHandle, zSymbol);
+#endif
 }
 int sqlite3WinDlclose(void *pHandle){
   return FreeLibrary((HANDLE)pHandle);