Change from using the win32-none VFS to just a query parameter.

FossilOrigin-Name: ffceacf61905dc3553978ba5f68e133947eca2fa

diff --git a/manifest b/manifest
index cea8c644a2dd1d9bf89f464fc1ce3d8dbb4e471a..f71432393e29d9087ddf9b5104cbe66ba2a14070 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\sOSTRACE\scalls\sfor\sconsistency.
-D 2014-04-22T19:34:16.263
+C Change\sfrom\susing\sthe\swin32-none\sVFS\sto\sjust\sa\squery\sparameter.
+D 2014-04-22T19:42:22.086
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -204,7 +204,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
-F src/os_win.c 8c74fd4c2a7e2478e0b05530a51af4049acfcc43
+F src/os_win.c 1662c40d22be162698a31725e836eede09e841ed
 F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@ -1161,7 +1161,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 03e3c5a8b17a219a49bfbe79b7debd27ace8ad85
-R 173fb04236ec33d12e5d272efbb7cda6
-U mistachkin
-Z 7e8fdfc3e14c55c25e98572df7e0ac54
+P be292d559748a24ff012266a1f58ce6c027e0411
+R f3c1c9d0a2061a78351193fe4c39a447
+U drh
+Z 55529acaca6c8896715e4d74b5257ddb

diff --git a/manifest.uuid b/manifest.uuid
index 7c3c02fbb87a2d87a1bac3e9170bd5a7b5baa82a..fb9c97c16a44b81eb28957f72412135ba016451e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-be292d559748a24ff012266a1f58ce6c027e0411
\ No newline at end of file
+ffceacf61905dc3553978ba5f68e133947eca2fa
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 7d1b1af92a8e1a25fd51f6a0bc4d87f256d2a39a..bf5b9c72d1ae8f891cadcf89755c76e7418deef5 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -4704,7 +4704,7 @@ static int winOpen(
   if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){
     pFile->ctrlFlags |= WINFILE_PSOW;
   }
-  if( strcmp(pVfs->zName,"win32-none")==0 ){
+  if( sqlite3_uri_boolean(zName, "nolock", 0) ){
     pFile->ctrlFlags |= WINFILE_NOLOCK;
   }
   pFile->lastErrno = NO_ERROR;
@@ -5431,30 +5431,6 @@ int sqlite3_os_init(void){
     winNextSystemCall,   /* xNextSystemCall */
   };
 #endif
-  static sqlite3_vfs winNoneVfs = {
-    3,                   /* iVersion */
-    sizeof(winFile),     /* szOsFile */
-    SQLITE_WIN32_MAX_PATH_BYTES, /* mxPathname */
-    0,                   /* pNext */
-    "win32-none",        /* zName */
-    0,                   /* pAppData */
-    winOpen,             /* xOpen */
-    winDelete,           /* xDelete */
-    winAccess,           /* xAccess */
-    winFullPathname,     /* xFullPathname */
-    winDlOpen,           /* xDlOpen */
-    winDlError,          /* xDlError */
-    winDlSym,            /* xDlSym */
-    winDlClose,          /* xDlClose */
-    winRandomness,       /* xRandomness */
-    winSleep,            /* xSleep */
-    winCurrentTime,      /* xCurrentTime */
-    winGetLastError,     /* xGetLastError */
-    winCurrentTimeInt64, /* xCurrentTimeInt64 */
-    winSetSystemCall,    /* xSetSystemCall */
-    winGetSystemCall,    /* xGetSystemCall */
-    winNextSystemCall,   /* xNextSystemCall */
-  };
 
   /* Double-check that the aSyscall[] array has been constructed
   ** correctly.  See ticket [bb3a86e890c8e96ab] */
@@ -5471,7 +5447,6 @@ int sqlite3_os_init(void){
   assert( winSysInfo.dwPageSize>0 );
 
   sqlite3_vfs_register(&winVfs, 1);
-  sqlite3_vfs_register(&winNoneVfs, 0);
 
 #if defined(SQLITE_WIN32_HAS_WIDE)
   sqlite3_vfs_register(&winLongPathVfs, 0);