database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-30 07:05:46 +03:00
Code Activity

Blind check-in of changes to fix #2294 - I have no ability to test.

Browse Source 
Gentle wince users: please test this change and if it works leave a remark
on the #2294 ticket.  Tnx. (CVS 3836)

FossilOrigin-Name: ca56c3e2250eda0b312ab6f801b0fd95fb136bfa
This commit is contained in:
drh
2007-04-11 17:54:03 +00:00
parent f33c9fad35
commit 694b19d86e
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Preliminary\sfix\sfor\sticket\s#2291.\s\sThis\sfixes\sthe\simmediate\sproblem.\s\sBut\nwe\sreally\sneed\sto\swrite\smore\stests\sfor\sthe\sxfer\soptimization\sin\sorder\sto\nlook\sfor\sother\srelated\sproblems\sbefore\sclosing\sthis\sticket.\s(CVS\s3835) C Blind\scheck-in\sof\schanges\sto\sfix\s#2294\s-\sI\shave\sno\sability\sto\stest.\r\nGentle\swince\susers:\splease\stest\sthis\schange\sand\sif\sit\sworks\sleave\sa\sremark\r\non\sthe\s#2294\sticket.\s\sTnx.\s(CVS\s3836)
D 2007-04-10T18:17:55 D 2007-04-11T17:54:03
F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -84,7 +84,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 426b4c03c304ad78746d65d9ba101e0b72e18e23 F src/os_unix.c 426b4c03c304ad78746d65d9ba101e0b72e18e23
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c c9a99524d6b2bdec636264cad1b67553925e3309 F src/os_win.c e94903c7dc1c0599c8ddce42efa0b6928068ddc5
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c 655073dd7b32eade2f10f69e1d51fece380d45e1 F src/pager.c 655073dd7b32eade2f10f69e1d51fece380d45e1
F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42 F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42
@@ -457,7 +457,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P e14374e4e6f14a90ecb53c2e7c86908a220c6d68 P 34fec312fd1aeabb04e07d6aa061991775c7b8a1
R f289180cefc2c2db5021e660d1bbcc38 R d1534c540b5ae78307739707a6abdcd3
U drh U drh
Z 390c704b66783e56774a93432326a3cd Z 17f9de9f818eaf8a3c214b1aa054fe86

2
manifest.uuid
View File

@@ -1 +1 @@
34fec312fd1aeabb04e07d6aa061991775c7b8a1 ca56c3e2250eda0b312ab6f801b0fd95fb136bfa

10
src/os_win.c
View File

@@ -408,6 +408,12 @@ static void winceDestroyLock(winFile *pFile){
UnmapViewOfFile(pFile->shared); UnmapViewOfFile(pFile->shared);
CloseHandle(pFile->hShared); CloseHandle(pFile->hShared);
if( pFile->zDeleteOnClose ){
DeleteFileW(pFile->zDeleteOnClose);
sqliteFree(pFile->zDeleteOnClose);
pFile->zDeleteOnClose = 0;
}
/* Done with the mutex */ /* Done with the mutex */
winceMutexRelease(pFile->hMutex); winceMutexRelease(pFile->hMutex);
CloseHandle(pFile->hMutex); CloseHandle(pFile->hMutex);
@@ -975,10 +981,6 @@ static int winClose(OsFile **pId){
}while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) ); }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
#if OS_WINCE #if OS_WINCE
winceDestroyLock(pFile); winceDestroyLock(pFile);
if( pFile->zDeleteOnClose ){
DeleteFileW(pFile->zDeleteOnClose);
sqliteFree(pFile->zDeleteOnClose);
}
#endif #endif
OpenCounter(-1); OpenCounter(-1);
sqliteFree(pFile); sqliteFree(pFile);