From: drh Date: Mon, 23 Jan 2006 22:15:07 +0000 (+0000) Subject: Bug fix in the WinCE bindings. (CVS 3015) X-Git-Tag: version-3.6.10~3152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36a5005946bb1f45b22253261b2fe251be8debf6;p=thirdparty%2Fsqlite.git Bug fix in the WinCE bindings. (CVS 3015) FossilOrigin-Name: c57922838a31b45f69ba14ae13df8a612884cb4b --- diff --git a/manifest b/manifest index 2df8343818..81e331605e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\sprogress\stoward\sgetting\sSQLITE_OMIT_FLOATING_POINT\sto\spass\stests.\nTicket\s#1621.\s(CVS\s3014) -D 2006-01-23T21:44:54 +C Bug\sfix\sin\sthe\sWinCE\sbindings.\s(CVS\s3015) +D 2006-01-23T22:15:07 F Makefile.in 53841eb72e9eeb6030a8ce28c2595a92f440fd10 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -57,7 +57,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_unix.c b25eca667f926d24b542fb20378b3665feccfe2b F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e -F src/os_win.c 2600438d6cfe1c59c2bdab37abfe83fe9f441467 +F src/os_win.c 63718af58c981734058881db307349839d3ba48a F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/pager.c b101634a093451017068c4fd80af966bd5042edc F src/pager.h e0acb095b3ad0bca48f2ab00c87346665643f64f @@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 4a1a9f3e9df6588bcd4da13456790fbbc58f66de -R 6b8fafd0b1455cf565f915edd63f61f7 +P b52674e5642a9d26b15a5d5c2a6716febaef130a +R ae011a5f82c5959bbf15fc7ed747c313 U drh -Z cd141eec2e5f17ef19649782bda7ef21 +Z d3a94aa26cf3dc149e327933132cfc1b diff --git a/manifest.uuid b/manifest.uuid index a6351c8d2e..b5d048f5a6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b52674e5642a9d26b15a5d5c2a6716febaef130a \ No newline at end of file +c57922838a31b45f69ba14ae13df8a612884cb4b \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 284433a89e..044618624e 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -667,6 +667,7 @@ int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ 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); @@ -714,6 +715,7 @@ int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ f.h = h; #if OS_WINCE f.zDeleteOnClose = 0; + f.hMutex = NULL; #endif TRACE3("OPEN RO %d \"%s\"\n", h, zFilename); return allocateWinFile(&f, pId); @@ -1302,9 +1304,6 @@ int allocateWinFile(winFile *pInit, OsFile **pId){ pNew->pMethod = &sqlite3WinIoMethod; pNew->locktype = NO_LOCK; pNew->sharedLockByte = 0; -#if OS_WINCE - pNew->hMutex = NULL; -#endif *pId = (OsFile*)pNew; OpenCounter(+1); return SQLITE_OK;