Additional changes for wince. (CVS 2877)

FossilOrigin-Name: b10343d9163263f97efb1bbc61af8307a2cfe8a4

diff --git a/manifest b/manifest
index da068ee0e8e0d6b3f3100875b4a13f7043845b99..7976bac0a13f8a38617aec92306a24bd74e19c80 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\schanges\sto\ssupport\swince.\s(CVS\s2876)
-D 2006-01-06T20:40:28
+C Additional\schanges\sfor\swince.\s(CVS\s2877)
+D 2006-01-06T21:09:01
 F Makefile.in c79fbdaa264c6afcd435f2fb492551de5a8cf80d
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -57,7 +57,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 1ade7cd84c6f18dd2ceb98000ea1e9bdcac256ff
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c acd7a7a61e412ac27868c4389a1296d820a56e18
+F src/os_win.c 88f372bf093b3257f54d2d7710f00cfcae86fb9d
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c f06b85eb1e43bb2e6a7a5108ac8346576b4b78fa
 F src/pager.h e0acb095b3ad0bca48f2ab00c87346665643f64f
@@ -335,7 +335,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b45c076f0d5f7c863287ccb5703c492e1010a99d
-R e375cf1ce660da1379ac01835cbe9f4e
+P f3cbd995c845dc19596678d05844e0691b63da54
+R 11838801e26c24bbbb2453268d28d5d8
 U drh
-Z bd82221e19b550d50606ba5e825dba0a
+Z 72f4dd691e533e35210623f72a478eab

diff --git a/manifest.uuid b/manifest.uuid
index 5b14ecc5842cc399aeacfb517cc4aae27b593e5c..8c93d0669b30f92c7baa3a17187b70a0a6e4372f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3cbd995c845dc19596678d05844e0691b63da54
\ No newline at end of file
+b10343d9163263f97efb1bbc61af8307a2cfe8a4
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 34c865df0ae1af8e59b076c1c08a5ad7a6d08b4b..b70c71bc96046587a8a39bbd03d21743ea291519 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -55,7 +55,7 @@ struct winFile {
   unsigned char locktype; /* Type of lock currently held on this file */
   short sharedLockByte;   /* Randomly chosen byte used as a shared lock */
 #if OS_WINCE
-  char *zDeleteOnClose;   /* Name of file to delete when closing */
+  WCHAR *zDeleteOnClose;   /* Name of file to delete when closing */
 #endif
 };
 
@@ -382,7 +382,7 @@ int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){
   f.locktype = NO_LOCK;
   f.sharedLockByte = 0;
 #if OS_WINCE
-  f.zDeleteOnClose = delFlag ? sqlite3StrDup(zFilename) : 0;
+  f.zDeleteOnClose = delFlag ? utf8ToUnicode(zFilename) : 0;
 #endif
   TRACE3("OPEN EX %d \"%s\"\n", h, zFilename);
   return allocateWinFile(&f, pId);
@@ -517,7 +517,7 @@ static int winClose(OsFile **pId){
     CloseHandle(pFile->h);
 #if OS_WINCE
     if( pFile->zDeleteOnClose ){
-      DeleteFileW((WCHAR*)pFile->zDeleteOnClose);
+      DeleteFileW(pFile->zDeleteOnClose);
       sqliteFree(pFile->zDeleteOnClose);
     }
 #endif