Reduce the number of utf8->unicode conversions required in wince. Ticket #2122 ...

FossilOrigin-Name: 6d2ff0962dff0477fe2af0323032dc16337f42ab

diff --git a/manifest b/manifest
index 6ed2dda9f6c937eacc1bc331e4698f71ff568a51..18d4fc897ef6ead244a180df4a198f0c4230869b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\sshared-library\sloading\sroutines\sinto\sthe\sOS\sportability\slayer,\nthus\senabling\sthe\sos_win.c\scode\sto\shandle\sthe\scharacter\sencoding\nconfusion\sof\swin95/nt/ce.\s\sTicket\s#2023.\s(CVS\s3541)
-D 2006-12-21T01:29:23
+C Reduce\sthe\snumber\sof\sutf8->unicode\sconversions\srequired\sin\swince.\s\sTicket\s#2122\s(CVS\s3542)
+D 2006-12-21T01:37:40
 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 359dd74a2bb58a5eef052da2c0c9e15f72aaf7c5
+F src/os_win.c 96c7cf8213d10760a097591ba73c75a450c6b688
 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 cca1eb3dfaa67d64ced3e49e7ddbd8db27a5526a
-R 2fa316d910e96d33fb975864696b955f
+P a1bcc6de578992b28924c1cf974ea58251454e2d
+R e8fa20c887a4e40f22b76691faf8de91
 U drh
-Z a6682a31d2f426580df4abfdbb85f6ad
+Z dcb186a9f7d66fa34d31b0ea1ff9119c

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

diff --git a/src/os_win.c b/src/os_win.c
index c191f96ace070bca47b5fc55a5432c7408045f25..661aa750cca2c8132bdf4d40d02033470548d1dd 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -799,15 +799,18 @@ int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){
     }while( h==INVALID_HANDLE_VALUE && cnt++ < 2 && (Sleep(100), 1) );
 #endif /* OS_WINCE */
   }
+#if OS_WINCE
+  if( delFlag && h!=INVALID_HANDLE_VALUE ){
+    f.zDeleteOnClose = zConverted;
+    zConverted = 0;
+  }
+  f.hMutex = NULL;
+#endif
   sqliteFree(zConverted);
   if( h==INVALID_HANDLE_VALUE ){
     return SQLITE_CANTOPEN;
   }
   f.h = h;
-#if OS_WINCE
-  f.zDeleteOnClose = delFlag ? utf8ToUnicode(zFilename) : 0;
-  f.hMutex = NULL;
-#endif
   TRACE3("OPEN EX %d \"%s\"\n", h, zFilename);
   return allocateWinFile(&f, pId);
 }