Reverting check-in (3836) at the request of winCE users. We no ability

to test this change.  Presumably this is a fix for tickets #2698, #2533,
and #2598.  It is unclear if this causes #2294 to be reopened or not. (CVS 4478)

FossilOrigin-Name: 27346fa55ed9b5c20016d07a37268fbd42dc097f

diff --git a/manifest b/manifest
index 423a0dfead1a92f43ede221d2cdb0ed58001ecb7..efad3119bbaa83aa48c0ea2bbdb77045062e3beb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\scode\sfor\swinCE.\s\sTicket\s#2700.\s(CVS\s4477)
-D 2007-10-08T12:22:57
+C Reverting\scheck-in\s(3836)\sat\sthe\srequest\sof\swinCE\susers.\s\sWe\sno\sability\nto\stest\sthis\schange.\s\sPresumably\sthis\sis\sa\sfix\sfor\stickets\s#2698,\s#2533,\nand\s#2598.\s\sIt\sis\sunclear\sif\sthis\scauses\s#2294\sto\sbe\sreopened\sor\snot.\s(CVS\s4478)
+D 2007-10-08T12:29:17
 F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -118,7 +118,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 308bd8ad6977f66f608228cccaecc4cbc1a24693
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c 0fd00bbfc4f5acf6806e32c91ea3b1d3f5c3812f
+F src/os_win.c 3bc308a90f7012698b95cabe0ca58b078b45c06a
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c 0a92a08192785af79547b017cda45eb683b22552
 F src/pager.h d783e7f184afdc33adff37ba58d4e029bd8793b3
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 5cdbc0972fe94c13dffee1f908a77f903e580449
-R af77ac636bb4d1974889859078354299
+P a36fca4cdef162c87ce47a50ededdea19a8865f9
+R 6ed221af82d379a0128b8802c79c45dd
 U drh
-Z c974d43bcac97fe376c543595cc5fc35
+Z d9f526598bb6c123baa0e086a7f1575e

diff --git a/manifest.uuid b/manifest.uuid
index 916ea51dff5d016b61cea75b3d293319d43d1c20..ccdf829695c193f5b1e497dd43ecd378f38f9fb8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a36fca4cdef162c87ce47a50ededdea19a8865f9
\ No newline at end of file
+27346fa55ed9b5c20016d07a37268fbd42dc097f
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 51050421941fcd93d30d6a9a06b6b86955188f61..25245524737dbf179a1fc40c42f2af98adb61fa3 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -431,12 +431,6 @@ static void winceDestroyLock(winFile *pFile){
     UnmapViewOfFile(pFile->shared);
     CloseHandle(pFile->hShared);
 
-    if( pFile->zDeleteOnClose ){
-      DeleteFileW(pFile->zDeleteOnClose);
-      free(pFile->zDeleteOnClose);
-      pFile->zDeleteOnClose = 0;
-    }
-
     /* Done with the mutex */
     winceMutexRelease(pFile->hMutex);    
     CloseHandle(pFile->hMutex);
@@ -613,6 +607,10 @@ static int winClose(sqlite3_file *id){
   }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
 #if OS_WINCE
   winceDestroyLock(pFile);
+  if( pFile->zDeleteOnClose ){
+    DeleteFileW(pFile->zDeleteOnClose);
+    free(pFile->zDeleteOnClose);
+  }
 #endif
   OpenCounter(-1);
   return rc ? SQLITE_OK : SQLITE_IOERR;