diff --git a/manifest b/manifest
index 6994d5e8ec..a8453434a2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\snew\sbalance_nonroot()\sroutine.
-D 2014-11-05T21:21:08.046
+C Fixes\sto\sthe\sWindows\sVFS\sto\sallow\smemory\smapped\sfiles\sto\swork\swithout\sWAL\ssupport.
+D 2014-11-05T21:34:56.096
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -213,7 +213,7 @@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
-F src/os_win.c a019caaae2bcbbc0cc4c39af6e7d7e43d8426053
+F src/os_win.c a9e500dd963fb1f67d7860e58b5772abe6123862
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 F src/pager.c 8d97b3633f098fef817656dcbf167ca904511d78
 F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
@@ -728,7 +728,7 @@ F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test edd0b63e2ee29a256900b0514f6fff27e19e9bb2
 F test/misuse.test 3c34719944ba045cc6c188a4852ba04680728912
-F test/mmap1.test 93d167b328255cbe6679fe1e1a23be1b1197d07b
+F test/mmap1.test 1bfd611b9841eafb44f7d83c0788e146d84a33c9
 F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
 F test/mmap3.test c92273e16eb8d23c1d55c9815b446bb72ef0512e
 F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
@@ -1211,7 +1211,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2d36be5d9a1cdd4fd2d54fc4eeece32a81cbacc1
-R e9a3ba77188e96b62213debbd39f0d21
+P 83a1e5db926b3a6d40f4a5cf9a8e6852b9bac9ac 6fc4ead26d19b9348bbda34c3053ae1e066abc32
+R 3ad47b2ac5693ba63ff5c591cf540d89
+T +closed 6fc4ead26d19b9348bbda34c3053ae1e066abc32
 U drh
-Z dda139af7d076df31a05d3458397d7d6
+Z ee3b32335a4c8630acaf81919b28b64e
diff --git a/manifest.uuid b/manifest.uuid
index 82de0553f1..b558f09274 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83a1e5db926b3a6d40f4a5cf9a8e6852b9bac9ac
\ No newline at end of file
+272fddc14cc322655eeba670bc0f9fc30e5a804c
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 8ca2107d90..2a7681c73f 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -34,6 +34,11 @@
  with SQLITE_OMIT_WAL."
 #endif
 
+#if !SQLITE_OS_WINNT && SQLITE_MAX_MMAP_SIZE>0
+#  error "Memory mapped files require support from the Windows NT kernel,\
+ compile with SQLITE_MAX_MMAP_SIZE=0."
+#endif
+
 /*
 ** Are most of the Win32 ANSI APIs available (i.e. with certain exceptions
 ** based on the sub-platform)?
@@ -163,10 +168,11 @@
 
 /*
 ** Do we need to manually define the Win32 file mapping APIs for use with WAL
-** mode (e.g. these APIs are available in the Windows CE SDK; however, they
-** are not present in the header file)?
+** mode or memory mapped files (e.g. these APIs are available in the Windows
+** CE SDK; however, they are not present in the header file)?
 */
-#if SQLITE_WIN32_FILEMAPPING_API && !defined(SQLITE_OMIT_WAL)
+#if SQLITE_WIN32_FILEMAPPING_API && \
+        (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0)
 /*
 ** Two of the file mapping APIs are different under WinRT.  Figure out which
 ** set we need.
@@ -194,7 +200,7 @@ WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 ** This file mapping API is common to both Win32 and WinRT.
 */
 WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID);
-#endif /* SQLITE_WIN32_FILEMAPPING_API && !defined(SQLITE_OMIT_WAL) */
+#endif /* SQLITE_WIN32_FILEMAPPING_API */
 
 /*
 ** Some Microsoft compilers lack this definition.
@@ -487,7 +493,7 @@ static struct win_syscall {
         LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE))aSyscall[5].pCurrent)
 
 #if (!SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_ANSI) && \
-        !defined(SQLITE_OMIT_WAL))
+        (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0))
   { "CreateFileMappingA",      (SYSCALL)CreateFileMappingA,      0 },
 #else
   { "CreateFileMappingA",      (SYSCALL)0,                       0 },
@@ -497,7 +503,7 @@ static struct win_syscall {
         DWORD,DWORD,DWORD,LPCSTR))aSyscall[6].pCurrent)
 
 #if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
-        !defined(SQLITE_OMIT_WAL))
+        (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0))
   { "CreateFileMappingW",      (SYSCALL)CreateFileMappingW,      0 },
 #else
   { "CreateFileMappingW",      (SYSCALL)0,                       0 },
@@ -837,7 +843,8 @@ static struct win_syscall {
         LPOVERLAPPED))aSyscall[48].pCurrent)
 #endif
 
-#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL))
+#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && \
+        (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0))
   { "MapViewOfFile",           (SYSCALL)MapViewOfFile,           0 },
 #else
   { "MapViewOfFile",           (SYSCALL)0,                       0 },
@@ -907,7 +914,7 @@ static struct win_syscall {
 #define osUnlockFileEx ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
         LPOVERLAPPED))aSyscall[58].pCurrent)
 
-#if SQLITE_OS_WINCE || !defined(SQLITE_OMIT_WAL)
+#if SQLITE_OS_WINCE || !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
   { "UnmapViewOfFile",         (SYSCALL)UnmapViewOfFile,         0 },
 #else
   { "UnmapViewOfFile",         (SYSCALL)0,                       0 },
@@ -970,7 +977,7 @@ static struct win_syscall {
 #define osGetFileInformationByHandleEx ((BOOL(WINAPI*)(HANDLE, \
         FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[66].pCurrent)
 
-#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
+#if SQLITE_OS_WINRT && (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0)
   { "MapViewOfFileFromApp",    (SYSCALL)MapViewOfFileFromApp,    0 },
 #else
   { "MapViewOfFileFromApp",    (SYSCALL)0,                       0 },
@@ -1034,7 +1041,7 @@ static struct win_syscall {
 
 #define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[74].pCurrent)
 
-#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
+#if SQLITE_OS_WINRT && (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0)
   { "CreateFileMappingFromApp", (SYSCALL)CreateFileMappingFromApp, 0 },
 #else
   { "CreateFileMappingFromApp", (SYSCALL)0,                      0 },
diff --git a/test/mmap1.test b/test/mmap1.test
index ece3e0201e..18aec9f8fa 100644
--- a/test/mmap1.test
+++ b/test/mmap1.test
@@ -33,7 +33,7 @@ proc register_rblob_code {dbname seed} {
     set ::rcnt $seed
     proc rblob {n} {
       set ::rcnt [expr (([set ::rcnt] << 3) + [set ::rcnt] + 456) & 0xFFFFFFFF]
-      set str [format %.8x [expr [set ::rcnt] ^ 0xbdf20da3]] 
+      set str [format %.8x [expr [set ::rcnt] ^ 0xbdf20da3]]
       string range [string repeat [set str] [expr [set n]/4]] 1 [set n]
     }
     $dbname func rblob rblob
@@ -42,7 +42,7 @@ proc register_rblob_code {dbname seed} {
 
 # For cases 1.1 and 1.4, the number of pages read using xRead() is 4 on
 # unix and 9 on windows. The difference is that windows only ever maps
-# an integer number of OS pages (i.e. creates mappings that are a multiple 
+# an integer number of OS pages (i.e. creates mappings that are a multiple
 # of 4KB in size). Whereas on unix any sized mapping may be created.
 #
 foreach {t mmap_size nRead c2init} {
@@ -106,50 +106,52 @@ foreach {t mmap_size nRead c2init} {
 set ::rcnt 0
 proc rblob {n} {
   set ::rcnt [expr (($::rcnt << 3) + $::rcnt + 456) & 0xFFFFFFFF]
-  set str [format %.8x [expr $::rcnt ^ 0xbdf20da3]] 
+  set str [format %.8x [expr $::rcnt ^ 0xbdf20da3]]
   string range [string repeat $str [expr $n/4]] 1 $n
 }
 
 reset_db
 db func rblob rblob
 
-do_execsql_test 2.1 {
-  PRAGMA auto_vacuum = 1;
-  PRAGMA mmap_size = 67108864;
-  PRAGMA journal_mode = wal;
-  CREATE TABLE t1(a, b, UNIQUE(a, b));
-  INSERT INTO t1 VALUES(rblob(500), rblob(500));
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    2
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    4
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    8
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   16
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   32
-  PRAGMA wal_checkpoint;
-} {67108864 wal 0 103 103}
-
-do_execsql_test 2.2 {
-  PRAGMA auto_vacuum;
-  SELECT count(*) FROM t1;
-} {1 32}
-
-if {[permutation] != "inmemory_journal"} {
-  do_test 2.3 {
-    sqlite3 db2 test.db
-    db2 func rblob rblob
-    db2 eval { 
-      DELETE FROM t1 WHERE (rowid%4);
-        PRAGMA wal_checkpoint;
-    }
-    db2 eval { 
-      INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    16
-      SELECT count(*) FROM t1;
-    }
-  } {16}
-
-  do_execsql_test 2.4 {
+ifcapable wal {
+  do_execsql_test 2.1 {
+    PRAGMA auto_vacuum = 1;
+    PRAGMA mmap_size = 67108864;
+    PRAGMA journal_mode = wal;
+    CREATE TABLE t1(a, b, UNIQUE(a, b));
+    INSERT INTO t1 VALUES(rblob(500), rblob(500));
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    2
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    4
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    8
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   16
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   32
     PRAGMA wal_checkpoint;
-  } {0 24 24}
-  db2 close
+  } {67108864 wal 0 103 103}
+
+  do_execsql_test 2.2 {
+    PRAGMA auto_vacuum;
+    SELECT count(*) FROM t1;
+  } {1 32}
+
+  if {[permutation] != "inmemory_journal"} {
+    do_test 2.3 {
+      sqlite3 db2 test.db
+      db2 func rblob rblob
+      db2 eval {
+        DELETE FROM t1 WHERE (rowid%4);
+          PRAGMA wal_checkpoint;
+      }
+      db2 eval {
+        INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    16
+        SELECT count(*) FROM t1;
+      }
+    } {16}
+
+    do_execsql_test 2.4 {
+      PRAGMA wal_checkpoint;
+    } {0 24 24}
+    db2 close
+  }
 }
 
 reset_db
@@ -227,7 +229,7 @@ do_test 4.4 {
 do_execsql_test 4.5 { COMMIT }
 
 #-------------------------------------------------------------------------
-# Ensure that existing cursors holding xFetch() references are not 
+# Ensure that existing cursors holding xFetch() references are not
 # confused if those pages are moved to make way for the root page of a
 # new table or index.
 #
@@ -296,7 +298,7 @@ foreach {tn1 mmap1 mmap2} {
     sql1 "PRAGMA mmap_size = $mmap1"
     sql2 "PRAGMA mmap_size = $mmap2"
 
-    do_test $tn1.$tn { 
+    do_test $tn1.$tn {
       for {set i 1} {$i <= 100} {incr i} {
         if {$i % 2} {
           set c1 sql1
@@ -311,7 +313,7 @@ foreach {tn1 mmap1 mmap2} {
           UPDATE t2 SET x = (SELECT md5sum(a) FROM t1);
         }
 
-        set res [$c2 { 
+        set res [$c2 {
             SELECT count(*) FROM t1;
             SELECT x == (SELECT md5sum(a) FROM t1) FROM t2;
             PRAGMA integrity_check;