database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Make names of private functions in the Win32 VFS consistent. Fix comment typo in Win32 mutex implementation.

Browse Source 
FossilOrigin-Name: c3b82c5bf97cfb35544c5b1fbcdf7b9c4827d1cf
This commit is contained in:
mistachkin
2013-08-28 02:37:29 +00:00
parent 533fb6de5b
commit b324bc79e9
4 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Remove\shard-coding\sof\sthe\sdirectory\sseparator\sin\sthe\sWin32\sVFS.\s\sFixes\sto\sOSTRACE\smacros. C Make\snames\sof\sprivate\sfunctions\sin\sthe\sWin32\sVFS\sconsistent.\s\sFix\scomment\stypo\sin\sWin32\smutex\simplementation.
D 2013-08-28T02:26:48.559 D 2013-08-28T02:37:29.527
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -197,13 +197,13 @@ F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553 F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
F src/mutex_w32.c db4e14c30da72ffc8ead548469bc786c7a13145a F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97
F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c c27a14a05061e4e690bd3949dc0246bda35e399d F src/os_unix.c c27a14a05061e4e690bd3949dc0246bda35e399d
F src/os_win.c 7f8cabe0ae13bf6303543197c349bd13a1aaaa0f F src/os_win.c 0b9ab09dd3ccf8933f888c542a9b11b0bfa62659
F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
F src/parse.y 27c6b4138497d6f8360ba7847da6ed48033f957f F src/parse.y 27c6b4138497d6f8360ba7847da6ed48033f957f
@@ -1105,7 +1105,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 8917e9f9a0802cbfb6f33e2ab1c2f98e4df5babd P fc98092f4bd42d64059024f09547904c1d70a517
R 596c11dfb76cd23db3586c983e12df43 R 1438e04cfc27e16b0dae733cf906e3e9
U mistachkin U mistachkin
Z 1567302589a948f8e7270192d6781870 Z 1716564dd5627ab9e624a1f87aa67863

2
manifest.uuid
View File

@@ -1 +1 @@
fc98092f4bd42d64059024f09547904c1d70a517 c3b82c5bf97cfb35544c5b1fbcdf7b9c4827d1cf

2
src/mutex_w32.c
View File

@@ -69,7 +69,7 @@ struct sqlite3_mutex {
} }
return osType==2; return osType==2;
} }
#endif /* SQLITE_OS_WINCE */ #endif /* SQLITE_OS_WINCE || SQLITE_OS_WINRT */
#endif #endif
#ifdef SQLITE_DEBUG #ifdef SQLITE_DEBUG

168
src/os_win.c
View File

@@ -1117,11 +1117,11 @@ void sqlite3_win32_sleep(DWORD milliseconds){
** the LockFileEx() API. ** the LockFileEx() API.
*/ */
#if SQLITE_OS_WINCE || SQLITE_OS_WINRT #if SQLITE_OS_WINCE || SQLITE_OS_WINRT
# define isNT() (1) # define osIsNT() (1)
#elif !defined(SQLITE_WIN32_HAS_WIDE) #elif !defined(SQLITE_WIN32_HAS_WIDE)
# define isNT() (0) # define osIsNT() (0)
#else #else
static int isNT(void){ static int osIsNT(void){
if( sqlite3_os_type==0 ){ if( sqlite3_os_type==0 ){
OSVERSIONINFOA sInfo; OSVERSIONINFOA sInfo;
sInfo.dwOSVersionInfoSize = sizeof(sInfo); sInfo.dwOSVersionInfoSize = sizeof(sInfo);
@@ -1332,7 +1332,7 @@ void sqlite3MemSetDefault(void){
** **
** Space to hold the returned string is obtained from malloc. ** Space to hold the returned string is obtained from malloc.
*/ */
static LPWSTR utf8ToUnicode(const char *zFilename){ static LPWSTR winUtf8ToUnicode(const char *zFilename){
int nChar; int nChar;
LPWSTR zWideFilename; LPWSTR zWideFilename;
@@ -1357,7 +1357,7 @@ static LPWSTR utf8ToUnicode(const char *zFilename){
** Convert Microsoft Unicode to UTF-8. Space to hold the returned string is ** Convert Microsoft Unicode to UTF-8. Space to hold the returned string is
** obtained from sqlite3_malloc(). ** obtained from sqlite3_malloc().
*/ */
static char *unicodeToUtf8(LPCWSTR zWideFilename){ static char *winUnicodeToUtf8(LPCWSTR zWideFilename){
int nByte; int nByte;
char *zFilename; char *zFilename;
@@ -1385,7 +1385,7 @@ static char *unicodeToUtf8(LPCWSTR zWideFilename){
** Space to hold the returned string is obtained ** Space to hold the returned string is obtained
** from sqlite3_malloc. ** from sqlite3_malloc.
*/ */
static LPWSTR mbcsToUnicode(const char *zFilename){ static LPWSTR winMbcsToUnicode(const char *zFilename){
int nByte; int nByte;
LPWSTR zMbcsFilename; LPWSTR zMbcsFilename;
int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP; int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP;
@@ -1415,7 +1415,7 @@ static LPWSTR mbcsToUnicode(const char *zFilename){
** Space to hold the returned string is obtained from ** Space to hold the returned string is obtained from
** sqlite3_malloc(). ** sqlite3_malloc().
*/ */
static char *unicodeToMbcs(LPCWSTR zWideFilename){ static char *winUnicodeToMbcs(LPCWSTR zWideFilename){
int nByte; int nByte;
char *zFilename; char *zFilename;
int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP; int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP;
@@ -1445,11 +1445,11 @@ char *sqlite3_win32_mbcs_to_utf8(const char *zFilename){
char *zFilenameUtf8; char *zFilenameUtf8;
LPWSTR zTmpWide; LPWSTR zTmpWide;
zTmpWide = mbcsToUnicode(zFilename); zTmpWide = winMbcsToUnicode(zFilename);
if( zTmpWide==0 ){ if( zTmpWide==0 ){
return 0; return 0;
} }
zFilenameUtf8 = unicodeToUtf8(zTmpWide); zFilenameUtf8 = winUnicodeToUtf8(zTmpWide);
sqlite3_free(zTmpWide); sqlite3_free(zTmpWide);
return zFilenameUtf8; return zFilenameUtf8;
} }
@@ -1462,11 +1462,11 @@ char *sqlite3_win32_utf8_to_mbcs(const char *zFilename){
char *zFilenameMbcs; char *zFilenameMbcs;
LPWSTR zTmpWide; LPWSTR zTmpWide;
zTmpWide = utf8ToUnicode(zFilename); zTmpWide = winUtf8ToUnicode(zFilename);
if( zTmpWide==0 ){ if( zTmpWide==0 ){
return 0; return 0;
} }
zFilenameMbcs = unicodeToMbcs(zTmpWide); zFilenameMbcs = winUnicodeToMbcs(zTmpWide);
sqlite3_free(zTmpWide); sqlite3_free(zTmpWide);
return zFilenameMbcs; return zFilenameMbcs;
} }
@@ -1496,7 +1496,7 @@ int sqlite3_win32_set_directory(DWORD type, LPCWSTR zValue){
if( ppDirectory ){ if( ppDirectory ){
char *zValueUtf8 = 0; char *zValueUtf8 = 0;
if( zValue && zValue[0] ){ if( zValue && zValue[0] ){
zValueUtf8 = unicodeToUtf8(zValue); zValueUtf8 = winUnicodeToUtf8(zValue);
if ( zValueUtf8==0 ){ if ( zValueUtf8==0 ){
return SQLITE_NOMEM; return SQLITE_NOMEM;
} }
@@ -1509,11 +1509,11 @@ int sqlite3_win32_set_directory(DWORD type, LPCWSTR zValue){
} }
/* /*
** The return value of getLastErrorMsg ** The return value of winGetLastErrorMsg
** is zero if the error message fits in the buffer, or non-zero ** is zero if the error message fits in the buffer, or non-zero
** otherwise (if the message was truncated). ** otherwise (if the message was truncated).
*/ */
static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){ static int winGetLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
/* FormatMessage returns 0 on failure. Otherwise it /* FormatMessage returns 0 on failure. Otherwise it
** returns the number of TCHARs written to the output ** returns the number of TCHARs written to the output
** buffer, excluding the terminating null char. ** buffer, excluding the terminating null char.
@@ -1521,7 +1521,7 @@ static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
DWORD dwLen = 0; DWORD dwLen = 0;
char *zOut = 0; char *zOut = 0;
if( isNT() ){ if( osIsNT() ){
#if SQLITE_OS_WINRT #if SQLITE_OS_WINRT
WCHAR zTempWide[SQLITE_WIN32_MAX_ERRMSG_CHARS+1]; WCHAR zTempWide[SQLITE_WIN32_MAX_ERRMSG_CHARS+1];
dwLen = osFormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | dwLen = osFormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
@@ -1547,7 +1547,7 @@ static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
if( dwLen > 0 ){ if( dwLen > 0 ){
/* allocate a buffer and convert to UTF8 */ /* allocate a buffer and convert to UTF8 */
sqlite3BeginBenignMalloc(); sqlite3BeginBenignMalloc();
zOut = unicodeToUtf8(zTempWide); zOut = winUnicodeToUtf8(zTempWide);
sqlite3EndBenignMalloc(); sqlite3EndBenignMalloc();
#if !SQLITE_OS_WINRT #if !SQLITE_OS_WINRT
/* free the system buffer allocated by FormatMessage */ /* free the system buffer allocated by FormatMessage */
@@ -1615,7 +1615,7 @@ static int winLogErrorAtLine(
int i; /* Loop counter */ int i; /* Loop counter */
zMsg[0] = 0; zMsg[0] = 0;
getLastErrorMsg(lastErrno, sizeof(zMsg), zMsg); winGetLastErrorMsg(lastErrno, sizeof(zMsg), zMsg);
assert( errcode!=SQLITE_OK ); assert( errcode!=SQLITE_OK );
if( zPath==0 ) zPath = ""; if( zPath==0 ) zPath = "";
for(i=0; zMsg[i] && zMsg[i]!='\r' && zMsg[i]!='\n'; i++){} for(i=0; zMsg[i] && zMsg[i]!='\r' && zMsg[i]!='\n'; i++){}
@@ -1640,17 +1640,17 @@ static int winLogErrorAtLine(
#ifndef SQLITE_WIN32_IOERR_RETRY_DELAY #ifndef SQLITE_WIN32_IOERR_RETRY_DELAY
# define SQLITE_WIN32_IOERR_RETRY_DELAY 25 # define SQLITE_WIN32_IOERR_RETRY_DELAY 25
#endif #endif
static int win32IoerrRetry = SQLITE_WIN32_IOERR_RETRY; static int winIoerrRetry = SQLITE_WIN32_IOERR_RETRY;
static int win32IoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY; static int winIoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY;
/* /*
** If a ReadFile() or WriteFile() error occurs, invoke this routine ** If a ReadFile() or WriteFile() error occurs, invoke this routine
** to see if it should be retried. Return TRUE to retry. Return FALSE ** to see if it should be retried. Return TRUE to retry. Return FALSE
** to give up with an error. ** to give up with an error.
*/ */
static int retryIoerr(int *pnRetry, DWORD *pError){ static int winRetryIoerr(int *pnRetry, DWORD *pError){
DWORD e = osGetLastError(); DWORD e = osGetLastError();
if( *pnRetry>=win32IoerrRetry ){ if( *pnRetry>=winIoerrRetry ){
if( pError ){ if( pError ){
*pError = e; *pError = e;
} }
@@ -1659,7 +1659,7 @@ static int retryIoerr(int *pnRetry, DWORD *pError){
if( e==ERROR_ACCESS_DENIED || if( e==ERROR_ACCESS_DENIED ||
e==ERROR_LOCK_VIOLATION || e==ERROR_LOCK_VIOLATION ||
e==ERROR_SHARING_VIOLATION ){ e==ERROR_SHARING_VIOLATION ){
sqlite3_win32_sleep(win32IoerrRetryDelay*(1+*pnRetry)); sqlite3_win32_sleep(winIoerrRetryDelay*(1+*pnRetry));
++*pnRetry; ++*pnRetry;
return 1; return 1;
} }
@@ -1672,11 +1672,11 @@ static int retryIoerr(int *pnRetry, DWORD *pError){
/* /*
** Log a I/O error retry episode. ** Log a I/O error retry episode.
*/ */
static void logIoerr(int nRetry){ static void winLogIoerr(int nRetry){
if( nRetry ){ if( nRetry ){
sqlite3_log(SQLITE_IOERR, sqlite3_log(SQLITE_IOERR,
"delayed %dms for lock/sharing conflict", "delayed %dms for lock/sharing conflict",
win32IoerrRetryDelay*nRetry*(nRetry+1)/2 winIoerrRetryDelay*nRetry*(nRetry+1)/2
); );
} }
} }
@@ -1741,7 +1741,7 @@ static int winceCreateLock(const char *zFilename, winFile *pFile){
BOOL bLogged = FALSE; BOOL bLogged = FALSE;
BOOL bInit = TRUE; BOOL bInit = TRUE;
zName = utf8ToUnicode(zFilename); zName = winUtf8ToUnicode(zFilename);
if( zName==0 ){ if( zName==0 ){
/* out of memory */ /* out of memory */
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
@@ -2014,7 +2014,7 @@ static BOOL winLockFile(
return winceLockFile(phFile, offsetLow, offsetHigh, return winceLockFile(phFile, offsetLow, offsetHigh,
numBytesLow, numBytesHigh); numBytesLow, numBytesHigh);
#else #else
if( isNT() ){ if( osIsNT() ){
OVERLAPPED ovlp; OVERLAPPED ovlp;
memset(&ovlp, 0, sizeof(OVERLAPPED)); memset(&ovlp, 0, sizeof(OVERLAPPED));
ovlp.Offset = offsetLow; ovlp.Offset = offsetLow;
@@ -2045,7 +2045,7 @@ static BOOL winUnlockFile(
return winceUnlockFile(phFile, offsetLow, offsetHigh, return winceUnlockFile(phFile, offsetLow, offsetHigh,
numBytesLow, numBytesHigh); numBytesLow, numBytesHigh);
#else #else
if( isNT() ){ if( osIsNT() ){
OVERLAPPED ovlp; OVERLAPPED ovlp;
memset(&ovlp, 0, sizeof(OVERLAPPED)); memset(&ovlp, 0, sizeof(OVERLAPPED));
ovlp.Offset = offsetLow; ovlp.Offset = offsetLow;
@@ -2075,7 +2075,7 @@ static BOOL winUnlockFile(
** argument to offset iOffset within the file. If successful, return 0. ** argument to offset iOffset within the file. If successful, return 0.
** Otherwise, set pFile->lastErrno and return non-zero. ** Otherwise, set pFile->lastErrno and return non-zero.
*/ */
static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){ static int winSeekFile(winFile *pFile, sqlite3_int64 iOffset){
#if !SQLITE_OS_WINRT #if !SQLITE_OS_WINRT
LONG upperBits; /* Most sig. 32 bits of new offset */ LONG upperBits; /* Most sig. 32 bits of new offset */
LONG lowerBits; /* Least sig. 32 bits of new offset */ LONG lowerBits; /* Least sig. 32 bits of new offset */
@@ -2100,7 +2100,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
&& ((lastErrno = osGetLastError())!=NO_ERROR)) ){ && ((lastErrno = osGetLastError())!=NO_ERROR)) ){
pFile->lastErrno = lastErrno; pFile->lastErrno = lastErrno;
winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno, winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
"seekWinFile", pFile->zPath); "winSeekFile", pFile->zPath);
OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h)); OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h));
return 1; return 1;
} }
@@ -2121,7 +2121,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
if(!bRet){ if(!bRet){
pFile->lastErrno = osGetLastError(); pFile->lastErrno = osGetLastError();
winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno, winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
"seekWinFile", pFile->zPath); "winSeekFile", pFile->zPath);
OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h)); OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h));
return 1; return 1;
} }
@@ -2236,7 +2236,7 @@ static int winRead(
#endif #endif
#if SQLITE_OS_WINCE #if SQLITE_OS_WINCE
if( seekWinFile(pFile, offset) ){ if( winSeekFile(pFile, offset) ){
OSTRACE(("READ file=%p, rc=SQLITE_FULL\n", pFile->h)); OSTRACE(("READ file=%p, rc=SQLITE_FULL\n", pFile->h));
return SQLITE_FULL; return SQLITE_FULL;
} }
@@ -2249,13 +2249,13 @@ static int winRead(
osGetLastError()!=ERROR_HANDLE_EOF ){ osGetLastError()!=ERROR_HANDLE_EOF ){
#endif #endif
DWORD lastErrno; DWORD lastErrno;
if( retryIoerr(&nRetry, &lastErrno) ) continue; if( winRetryIoerr(&nRetry, &lastErrno) ) continue;
pFile->lastErrno = lastErrno; pFile->lastErrno = lastErrno;
OSTRACE(("READ file=%p, rc=SQLITE_IOERR_READ\n", pFile->h)); OSTRACE(("READ file=%p, rc=SQLITE_IOERR_READ\n", pFile->h));
return winLogError(SQLITE_IOERR_READ, pFile->lastErrno, return winLogError(SQLITE_IOERR_READ, pFile->lastErrno,
"winRead", pFile->zPath); "winRead", pFile->zPath);
} }
logIoerr(nRetry); winLogIoerr(nRetry);
if( nRead<(DWORD)amt ){ if( nRead<(DWORD)amt ){
/* Unread parts of the buffer must be zero-filled */ /* Unread parts of the buffer must be zero-filled */
memset(&((char*)pBuf)[nRead], 0, amt-nRead); memset(&((char*)pBuf)[nRead], 0, amt-nRead);
@@ -2308,7 +2308,7 @@ static int winWrite(
#endif #endif
#if SQLITE_OS_WINCE #if SQLITE_OS_WINCE
rc = seekWinFile(pFile, offset); rc = winSeekFile(pFile, offset);
if( rc==0 ){ if( rc==0 ){
#else #else
{ {
@@ -2333,7 +2333,7 @@ static int winWrite(
#else #else
if( !osWriteFile(pFile->h, aRem, nRem, &nWrite, &overlapped) ){ if( !osWriteFile(pFile->h, aRem, nRem, &nWrite, &overlapped) ){
#endif #endif
if( retryIoerr(&nRetry, &lastErrno) ) continue; if( winRetryIoerr(&nRetry, &lastErrno) ) continue;
break; break;
} }
assert( nWrite==0 || nWrite<=(DWORD)nRem ); assert( nWrite==0 || nWrite<=(DWORD)nRem );
@@ -2365,7 +2365,7 @@ static int winWrite(
return winLogError(SQLITE_IOERR_WRITE, pFile->lastErrno, return winLogError(SQLITE_IOERR_WRITE, pFile->lastErrno,
"winWrite", pFile->zPath); "winWrite", pFile->zPath);
}else{ }else{
logIoerr(nRetry); winLogIoerr(nRetry);
} }
OSTRACE(("WRITE file=%p, rc=SQLITE_OK\n", pFile->h)); OSTRACE(("WRITE file=%p, rc=SQLITE_OK\n", pFile->h));
return SQLITE_OK; return SQLITE_OK;
@@ -2394,7 +2394,7 @@ static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
} }
/* SetEndOfFile() returns non-zero when successful, or zero when it fails. */ /* SetEndOfFile() returns non-zero when successful, or zero when it fails. */
if( seekWinFile(pFile, nByte) ){ if( winSeekFile(pFile, nByte) ){
rc = winLogError(SQLITE_IOERR_TRUNCATE, pFile->lastErrno, rc = winLogError(SQLITE_IOERR_TRUNCATE, pFile->lastErrno,
"winTruncate1", pFile->zPath); "winTruncate1", pFile->zPath);
}else if( 0==osSetEndOfFile(pFile->h) && }else if( 0==osSetEndOfFile(pFile->h) &&
@@ -2573,10 +2573,10 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){
** Different API routines are called depending on whether or not this ** Different API routines are called depending on whether or not this
** is Win9x or WinNT. ** is Win9x or WinNT.
*/ */
static int getReadLock(winFile *pFile){ static int winGetReadLock(winFile *pFile){
int res; int res;
OSTRACE(("READ-LOCK file=%p, lock=%d\n", pFile->h, pFile->locktype)); OSTRACE(("READ-LOCK file=%p, lock=%d\n", pFile->h, pFile->locktype));
if( isNT() ){ if( osIsNT() ){
#if SQLITE_OS_WINCE #if SQLITE_OS_WINCE
/* /*
** NOTE: Windows CE is handled differently here due its lack of the Win32 ** NOTE: Windows CE is handled differently here due its lack of the Win32
@@ -2608,11 +2608,11 @@ static int getReadLock(winFile *pFile){
/* /*
** Undo a readlock ** Undo a readlock
*/ */
static int unlockReadLock(winFile *pFile){ static int winUnlockReadLock(winFile *pFile){
int res; int res;
DWORD lastErrno; DWORD lastErrno;
OSTRACE(("READ-UNLOCK file=%p, lock=%d\n", pFile->h, pFile->locktype)); OSTRACE(("READ-UNLOCK file=%p, lock=%d\n", pFile->h, pFile->locktype));
if( isNT() ){ if( osIsNT() ){
res = winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0); res = winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
} }
#ifdef SQLITE_WIN32_HAS_ANSI #ifdef SQLITE_WIN32_HAS_ANSI
@@ -2623,7 +2623,7 @@ static int unlockReadLock(winFile *pFile){
if( res==0 && ((lastErrno = osGetLastError())!=ERROR_NOT_LOCKED) ){ if( res==0 && ((lastErrno = osGetLastError())!=ERROR_NOT_LOCKED) ){
pFile->lastErrno = lastErrno; pFile->lastErrno = lastErrno;
winLogError(SQLITE_IOERR_UNLOCK, pFile->lastErrno, winLogError(SQLITE_IOERR_UNLOCK, pFile->lastErrno,
"unlockReadLock", pFile->zPath); "winUnlockReadLock", pFile->zPath);
} }
OSTRACE(("READ-UNLOCK file=%p, rc=%s\n", pFile->h, sqlite3ErrName(res))); OSTRACE(("READ-UNLOCK file=%p, rc=%s\n", pFile->h, sqlite3ErrName(res)));
return res; return res;
@@ -2714,7 +2714,7 @@ static int winLock(sqlite3_file *id, int locktype){
*/ */
if( locktype==SHARED_LOCK && res ){ if( locktype==SHARED_LOCK && res ){
assert( pFile->locktype==NO_LOCK ); assert( pFile->locktype==NO_LOCK );
res = getReadLock(pFile); res = winGetReadLock(pFile);
if( res ){ if( res ){
newLocktype = SHARED_LOCK; newLocktype = SHARED_LOCK;
}else{ }else{
@@ -2745,14 +2745,14 @@ static int winLock(sqlite3_file *id, int locktype){
*/ */
if( locktype==EXCLUSIVE_LOCK && res ){ if( locktype==EXCLUSIVE_LOCK && res ){
assert( pFile->locktype>=SHARED_LOCK ); assert( pFile->locktype>=SHARED_LOCK );
res = unlockReadLock(pFile); res = winUnlockReadLock(pFile);
res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, SHARED_FIRST, 0, res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, SHARED_FIRST, 0,
SHARED_SIZE, 0); SHARED_SIZE, 0);
if( res ){ if( res ){
newLocktype = EXCLUSIVE_LOCK; newLocktype = EXCLUSIVE_LOCK;
}else{ }else{
lastErrno = osGetLastError(); lastErrno = osGetLastError();
getReadLock(pFile); winGetReadLock(pFile);
} }
} }
@@ -2832,7 +2832,7 @@ static int winUnlock(sqlite3_file *id, int locktype){
type = pFile->locktype; type = pFile->locktype;
if( type>=EXCLUSIVE_LOCK ){ if( type>=EXCLUSIVE_LOCK ){
winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0); winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
if( locktype==SHARED_LOCK && !getReadLock(pFile) ){ if( locktype==SHARED_LOCK && !winGetReadLock(pFile) ){
/* This should never happen. We should always be able to /* This should never happen. We should always be able to
** reacquire the read lock */ ** reacquire the read lock */
rc = winLogError(SQLITE_IOERR_UNLOCK, osGetLastError(), rc = winLogError(SQLITE_IOERR_UNLOCK, osGetLastError(),
@@ -2843,7 +2843,7 @@ static int winUnlock(sqlite3_file *id, int locktype){
winUnlockFile(&pFile->h, RESERVED_BYTE, 0, 1, 0); winUnlockFile(&pFile->h, RESERVED_BYTE, 0, 1, 0);
} }
if( locktype==NO_LOCK && type>=SHARED_LOCK ){ if( locktype==NO_LOCK && type>=SHARED_LOCK ){
unlockReadLock(pFile); winUnlockReadLock(pFile);
} }
if( type>=PENDING_LOCK ){ if( type>=PENDING_LOCK ){
winUnlockFile(&pFile->h, PENDING_BYTE, 0, 1, 0); winUnlockFile(&pFile->h, PENDING_BYTE, 0, 1, 0);
@@ -2871,7 +2871,7 @@ static void winModeBit(winFile *pFile, unsigned char mask, int *pArg){
} }
/* Forward declaration */ /* Forward declaration */
static int getTempname(int nBuf, char *zBuf); static int winGetTempname(int nBuf, char *zBuf);
#if SQLITE_MAX_MMAP_SIZE>0 #if SQLITE_MAX_MMAP_SIZE>0
static int winMapfile(winFile*, sqlite3_int64); static int winMapfile(winFile*, sqlite3_int64);
#endif #endif
@@ -2934,14 +2934,14 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
case SQLITE_FCNTL_WIN32_AV_RETRY: { case SQLITE_FCNTL_WIN32_AV_RETRY: {
int *a = (int*)pArg; int *a = (int*)pArg;
if( a[0]>0 ){ if( a[0]>0 ){
win32IoerrRetry = a[0]; winIoerrRetry = a[0];
}else{ }else{
a[0] = win32IoerrRetry; a[0] = winIoerrRetry;
} }
if( a[1]>0 ){ if( a[1]>0 ){
win32IoerrRetryDelay = a[1]; winIoerrRetryDelay = a[1];
}else{ }else{
a[1] = win32IoerrRetryDelay; a[1] = winIoerrRetryDelay;
} }
OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
return SQLITE_OK; return SQLITE_OK;
@@ -2949,7 +2949,7 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
case SQLITE_FCNTL_TEMPFILENAME: { case SQLITE_FCNTL_TEMPFILENAME: {
char *zTFile = sqlite3MallocZero( pFile->pVfs->mxPathname ); char *zTFile = sqlite3MallocZero( pFile->pVfs->mxPathname );
if( zTFile ){ if( zTFile ){
getTempname(pFile->pVfs->mxPathname, zTFile); winGetTempname(pFile->pVfs->mxPathname, zTFile);
*(char**)pArg = zTFile; *(char**)pArg = zTFile;
} }
OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
@@ -3915,10 +3915,10 @@ static const sqlite3_io_methods winIoMethod = {
** is obtained from malloc and must be freed by the calling ** is obtained from malloc and must be freed by the calling
** function. ** function.
*/ */
static void *convertUtf8Filename(const char *zFilename){ static void *winConvertUtf8Filename(const char *zFilename){
void *zConverted = 0; void *zConverted = 0;
if( isNT() ){ if( osIsNT() ){
zConverted = utf8ToUnicode(zFilename); zConverted = winUtf8ToUnicode(zFilename);
} }
#ifdef SQLITE_WIN32_HAS_ANSI #ifdef SQLITE_WIN32_HAS_ANSI
else{ else{
@@ -3933,7 +3933,7 @@ static void *convertUtf8Filename(const char *zFilename){
** Create a temporary file name in zBuf. zBuf must be big enough to ** Create a temporary file name in zBuf. zBuf must be big enough to
** hold at pVfs->mxPathname characters. ** hold at pVfs->mxPathname characters.
*/ */
static int getTempname(int nBuf, char *zBuf){ static int winGetTempname(int nBuf, char *zBuf){
static char zChars[] = static char zChars[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -3953,14 +3953,14 @@ static int getTempname(int nBuf, char *zBuf){
sqlite3_temp_directory); sqlite3_temp_directory);
} }
#if !SQLITE_OS_WINRT #if !SQLITE_OS_WINRT
else if( isNT() ){ else if( osIsNT() ){
char *zMulti; char *zMulti;
WCHAR zWidePath[SQLITE_WIN32_MAX_PATH_CHARS]; WCHAR zWidePath[SQLITE_WIN32_MAX_PATH_CHARS];
if( osGetTempPathW(SQLITE_WIN32_MAX_PATH_CHARS-30, zWidePath)==0 ){ if( osGetTempPathW(SQLITE_WIN32_MAX_PATH_CHARS-30, zWidePath)==0 ){
OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_GETTEMPPATH\n")); OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_GETTEMPPATH\n"));
return SQLITE_IOERR_GETTEMPPATH; return SQLITE_IOERR_GETTEMPPATH;
} }
zMulti = unicodeToUtf8(zWidePath); zMulti = winUnicodeToUtf8(zWidePath);
if( zMulti ){ if( zMulti ){
sqlite3_snprintf(SQLITE_WIN32_MAX_PATH_BYTES-30, zTempPath, "%s", zMulti); sqlite3_snprintf(SQLITE_WIN32_MAX_PATH_BYTES-30, zTempPath, "%s", zMulti);
sqlite3_free(zMulti); sqlite3_free(zMulti);
@@ -4043,13 +4043,13 @@ static int winIsDir(const void *zConverted){
int rc = 0; int rc = 0;
DWORD lastErrno; DWORD lastErrno;
if( isNT() ){ if( osIsNT() ){
int cnt = 0; int cnt = 0;
WIN32_FILE_ATTRIBUTE_DATA sAttrData; WIN32_FILE_ATTRIBUTE_DATA sAttrData;
memset(&sAttrData, 0, sizeof(sAttrData)); memset(&sAttrData, 0, sizeof(sAttrData));
while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted, while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted,
GetFileExInfoStandard, GetFileExInfoStandard,
&sAttrData)) && retryIoerr(&cnt, &lastErrno) ){} &sAttrData)) && winRetryIoerr(&cnt, &lastErrno) ){}
if( !rc ){ if( !rc ){
return 0; /* Invalid name? */ return 0; /* Invalid name? */
} }
@@ -4155,7 +4155,7 @@ static int winOpen(
*/ */
if( !zUtf8Name ){ if( !zUtf8Name ){
assert( isDelete && !isOpenJournal ); assert( isDelete && !isOpenJournal );
rc = getTempname(SQLITE_WIN32_MAX_PATH_BYTES+2, zTmpname); rc = winGetTempname(SQLITE_WIN32_MAX_PATH_BYTES+2, zTmpname);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
OSTRACE(("OPEN name=%s, rc=%s", zUtf8Name, sqlite3ErrName(rc))); OSTRACE(("OPEN name=%s, rc=%s", zUtf8Name, sqlite3ErrName(rc)));
return rc; return rc;
@@ -4171,7 +4171,7 @@ static int winOpen(
zUtf8Name[sqlite3Strlen30(zUtf8Name)+1]==0 ); zUtf8Name[sqlite3Strlen30(zUtf8Name)+1]==0 );
/* Convert the filename to the system encoding. */ /* Convert the filename to the system encoding. */
zConverted = convertUtf8Filename(zUtf8Name); zConverted = winConvertUtf8Filename(zUtf8Name);
if( zConverted==0 ){ if( zConverted==0 ){
OSTRACE(("OPEN name=%s, rc=SQLITE_IOERR_NOMEM", zUtf8Name)); OSTRACE(("OPEN name=%s, rc=SQLITE_IOERR_NOMEM", zUtf8Name));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
@@ -4225,7 +4225,7 @@ static int winOpen(
dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS; dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS;
#endif #endif
if( isNT() ){ if( osIsNT() ){
#if SQLITE_OS_WINRT #if SQLITE_OS_WINRT
CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; CREATEFILE2_EXTENDED_PARAMETERS extendedParameters;
extendedParameters.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); extendedParameters.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
@@ -4240,7 +4240,7 @@ static int winOpen(
dwShareMode, dwShareMode,
dwCreationDisposition, dwCreationDisposition,
&extendedParameters))==INVALID_HANDLE_VALUE && &extendedParameters))==INVALID_HANDLE_VALUE &&
retryIoerr(&cnt, &lastErrno) ){ winRetryIoerr(&cnt, &lastErrno) ){
/* Noop */ /* Noop */
} }
#else #else
@@ -4250,7 +4250,7 @@ static int winOpen(
dwCreationDisposition, dwCreationDisposition,
dwFlagsAndAttributes, dwFlagsAndAttributes,
NULL))==INVALID_HANDLE_VALUE && NULL))==INVALID_HANDLE_VALUE &&
retryIoerr(&cnt, &lastErrno) ){ winRetryIoerr(&cnt, &lastErrno) ){
/* Noop */ /* Noop */
} }
#endif #endif
@@ -4263,12 +4263,12 @@ static int winOpen(
dwCreationDisposition, dwCreationDisposition,
dwFlagsAndAttributes, dwFlagsAndAttributes,
NULL))==INVALID_HANDLE_VALUE && NULL))==INVALID_HANDLE_VALUE &&
retryIoerr(&cnt, &lastErrno) ){ winRetryIoerr(&cnt, &lastErrno) ){
/* Noop */ /* Noop */
} }
} }
#endif #endif
logIoerr(cnt); winLogIoerr(cnt);
OSTRACE(("OPEN file=%p, name=%s, access=%lx, rc=%s\n", h, zUtf8Name, OSTRACE(("OPEN file=%p, name=%s, access=%lx, rc=%s\n", h, zUtf8Name,
dwDesiredAccess, (h==INVALID_HANDLE_VALUE) ? "failed" : "ok")); dwDesiredAccess, (h==INVALID_HANDLE_VALUE) ? "failed" : "ok"));
@@ -4367,12 +4367,12 @@ static int winDelete(
SimulateIOError(return SQLITE_IOERR_DELETE); SimulateIOError(return SQLITE_IOERR_DELETE);
OSTRACE(("DELETE name=%s, syncDir=%d\n", zFilename, syncDir)); OSTRACE(("DELETE name=%s, syncDir=%d\n", zFilename, syncDir));
zConverted = convertUtf8Filename(zFilename); zConverted = winConvertUtf8Filename(zFilename);
if( zConverted==0 ){ if( zConverted==0 ){
OSTRACE(("DELETE name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename)); OSTRACE(("DELETE name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
if( isNT() ){ if( osIsNT() ){
do { do {
#if SQLITE_OS_WINRT #if SQLITE_OS_WINRT
WIN32_FILE_ATTRIBUTE_DATA sAttrData; WIN32_FILE_ATTRIBUTE_DATA sAttrData;
@@ -4411,7 +4411,7 @@ static int winDelete(
rc = SQLITE_OK; /* Deleted OK. */ rc = SQLITE_OK; /* Deleted OK. */
break; break;
} }
if ( !retryIoerr(&cnt, &lastErrno) ){ if ( !winRetryIoerr(&cnt, &lastErrno) ){
rc = SQLITE_ERROR; /* No more retries. */ rc = SQLITE_ERROR; /* No more retries. */
break; break;
} }
@@ -4439,7 +4439,7 @@ static int winDelete(
rc = SQLITE_OK; /* Deleted OK. */ rc = SQLITE_OK; /* Deleted OK. */
break; break;
} }
if ( !retryIoerr(&cnt, &lastErrno) ){ if ( !winRetryIoerr(&cnt, &lastErrno) ){
rc = SQLITE_ERROR; /* No more retries. */ rc = SQLITE_ERROR; /* No more retries. */
break; break;
} }
@@ -4450,7 +4450,7 @@ static int winDelete(
rc = winLogError(SQLITE_IOERR_DELETE, lastErrno, rc = winLogError(SQLITE_IOERR_DELETE, lastErrno,
"winDelete", zFilename); "winDelete", zFilename);
}else{ }else{
logIoerr(cnt); winLogIoerr(cnt);
} }
sqlite3_free(zConverted); sqlite3_free(zConverted);
OSTRACE(("DELETE name=%s, rc=%s\n", zFilename, sqlite3ErrName(rc))); OSTRACE(("DELETE name=%s, rc=%s\n", zFilename, sqlite3ErrName(rc)));
@@ -4476,18 +4476,18 @@ static int winAccess(
OSTRACE(("ACCESS name=%s, flags=%x, pResOut=%p\n", OSTRACE(("ACCESS name=%s, flags=%x, pResOut=%p\n",
zFilename, flags, pResOut)); zFilename, flags, pResOut));
zConverted = convertUtf8Filename(zFilename); zConverted = winConvertUtf8Filename(zFilename);
if( zConverted==0 ){ if( zConverted==0 ){
OSTRACE(("ACCESS name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename)); OSTRACE(("ACCESS name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename));
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
if( isNT() ){ if( osIsNT() ){
int cnt = 0; int cnt = 0;
WIN32_FILE_ATTRIBUTE_DATA sAttrData; WIN32_FILE_ATTRIBUTE_DATA sAttrData;
memset(&sAttrData, 0, sizeof(sAttrData)); memset(&sAttrData, 0, sizeof(sAttrData));
while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted, while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted,
GetFileExInfoStandard, GetFileExInfoStandard,
&sAttrData)) && retryIoerr(&cnt, &lastErrno) ){} &sAttrData)) && winRetryIoerr(&cnt, &lastErrno) ){}
if( rc ){ if( rc ){
/* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file
** as if it does not exist. ** as if it does not exist.
@@ -4500,7 +4500,7 @@ static int winAccess(
attr = sAttrData.dwFileAttributes; attr = sAttrData.dwFileAttributes;
} }
}else{ }else{
logIoerr(cnt); winLogIoerr(cnt);
if( lastErrno!=ERROR_FILE_NOT_FOUND && lastErrno!=ERROR_PATH_NOT_FOUND ){ if( lastErrno!=ERROR_FILE_NOT_FOUND && lastErrno!=ERROR_PATH_NOT_FOUND ){
winLogError(SQLITE_IOERR_ACCESS, lastErrno, "winAccess", zFilename); winLogError(SQLITE_IOERR_ACCESS, lastErrno, "winAccess", zFilename);
sqlite3_free(zConverted); sqlite3_free(zConverted);
@@ -4663,11 +4663,11 @@ static int winFullPathname(
sqlite3_data_directory, winGetDirDep(), zRelative); sqlite3_data_directory, winGetDirDep(), zRelative);
return SQLITE_OK; return SQLITE_OK;
} }
zConverted = convertUtf8Filename(zRelative); zConverted = winConvertUtf8Filename(zRelative);
if( zConverted==0 ){ if( zConverted==0 ){
return SQLITE_IOERR_NOMEM; return SQLITE_IOERR_NOMEM;
} }
if( isNT() ){ if( osIsNT() ){
LPWSTR zTemp; LPWSTR zTemp;
nByte = osGetFullPathNameW((LPCWSTR)zConverted, 0, 0, 0); nByte = osGetFullPathNameW((LPCWSTR)zConverted, 0, 0, 0);
if( nByte==0 ){ if( nByte==0 ){
@@ -4691,7 +4691,7 @@ static int winFullPathname(
return SQLITE_CANTOPEN_FULLPATH; return SQLITE_CANTOPEN_FULLPATH;
} }
sqlite3_free(zConverted); sqlite3_free(zConverted);
zOut = unicodeToUtf8(zTemp); zOut = winUnicodeToUtf8(zTemp);
sqlite3_free(zTemp); sqlite3_free(zTemp);
} }
#ifdef SQLITE_WIN32_HAS_ANSI #ifdef SQLITE_WIN32_HAS_ANSI
@@ -4744,12 +4744,12 @@ static int winFullPathname(
*/ */
static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
HANDLE h; HANDLE h;
void *zConverted = convertUtf8Filename(zFilename); void *zConverted = winConvertUtf8Filename(zFilename);
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
if( zConverted==0 ){ if( zConverted==0 ){
return 0; return 0;
} }
if( isNT() ){ if( osIsNT() ){
#if SQLITE_OS_WINRT #if SQLITE_OS_WINRT
h = osLoadPackagedLibrary((LPCWSTR)zConverted, 0); h = osLoadPackagedLibrary((LPCWSTR)zConverted, 0);
#else #else
@@ -4766,7 +4766,7 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
} }
static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){ static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
getLastErrorMsg(osGetLastError(), nBuf, zBufOut); winGetLastErrorMsg(osGetLastError(), nBuf, zBufOut);
} }
static void (*winDlSym(sqlite3_vfs *pVfs,void *pH,const char *zSym))(void){ static void (*winDlSym(sqlite3_vfs *pVfs,void *pH,const char *zSym))(void){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
@@ -4942,7 +4942,7 @@ static int winCurrentTime(sqlite3_vfs *pVfs, double *prNow){
*/ */
static int winGetLastError(sqlite3_vfs *pVfs, int nBuf, char *zBuf){ static int winGetLastError(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
return getLastErrorMsg(osGetLastError(), nBuf, zBuf); return winGetLastErrorMsg(osGetLastError(), nBuf, zBuf);
} }
/* /*