Index: ext/lsm1/lsm-test/lsmtest6.c
==================================================================
--- ext/lsm1/lsm-test/lsmtest6.c
+++ ext/lsm1/lsm-test/lsmtest6.c
@@ -255,11 +255,11 @@
   unlink(zShm);
   testFree(zLog);
   testFree(zShm);
 }
 
-static void copy_file(const char *zFrom, const char *zTo){
+static void copy_file(const char *zFrom, const char *zTo, int isDatabase){
 
   if( access(zFrom, F_OK) ){
     unlink(zTo);
   }else{
     int fd1;
@@ -276,13 +276,19 @@
     sz = buf.st_size;
     ftruncate(fd2, sz);
 
     aBuf = testMalloc(4096);
     for(i=0; i<sz; i+=4096){
-      int nByte = MIN(4096, sz - i);
+      int bLockPage = isDatabase && i == 0;
+      int nByte = MIN((bLockPage ? 4066 : 4096), sz - i);
+      memset(aBuf, 0, 4096);
       read(fd1, aBuf, nByte);
       write(fd2, aBuf, nByte);
+      if( bLockPage ){
+        lseek(fd1, 4096, SEEK_SET);
+        lseek(fd2, 4096, SEEK_SET);
+      }
     }
     testFree(aBuf);
 
     close(fd1);
     close(fd2);
@@ -296,13 +302,13 @@
   char *zShm2 = testMallocPrintf("%s-shm", zTo);
 
   unlink(zShm2);
   unlink(zLog2);
   unlink(zTo);
-  copy_file(zFrom, zTo);
-  copy_file(zLog1, zLog2);
-  copy_file(zShm1, zShm2);
+  copy_file(zFrom, zTo, 1);
+  copy_file(zLog1, zLog2, 0);
+  copy_file(zShm1, zShm2, 0);
 
   testFree(zLog1); testFree(zLog2); testFree(zShm1); testFree(zShm2);
 }
 
 /*
@@ -320,12 +326,12 @@
   char *zFileSave = testMallocPrintf("%s-save", zFile);
   char *zLogSave = testMallocPrintf("%s-%s-save", zFile, zAux);
 
   unlink(zFileSave);
   unlink(zLogSave);
-  copy_file(zFile, zFileSave);
-  copy_file(zLog, zLogSave);
+  copy_file(zFile, zFileSave, 1);
+  copy_file(zLog, zLogSave, 0);
 
   testFree(zLog); testFree(zFileSave); testFree(zLogSave);
 }
 
 /*
@@ -339,12 +345,12 @@
 void testRestoreDb(const char *zFile, const char *zAux){
   char *zLog = testMallocPrintf("%s-%s", zFile, zAux);
   char *zFileSave = testMallocPrintf("%s-save", zFile);
   char *zLogSave = testMallocPrintf("%s-%s-save", zFile, zAux);
 
-  copy_file(zFileSave, zFile);
-  copy_file(zLogSave, zLog);
+  copy_file(zFileSave, zFile, 1);
+  copy_file(zLogSave, zLog, 0);
 
   testFree(zLog); testFree(zFileSave); testFree(zLogSave);
 }
 
 

Index: ext/lsm1/lsm-test/lsmtest_main.c
==================================================================
--- ext/lsm1/lsm-test/lsmtest_main.c
+++ ext/lsm1/lsm-test/lsmtest_main.c
@@ -9,10 +9,11 @@
 #include <sqlite3.h>
 
 #ifndef _WIN32
 # include <unistd.h>
 #endif
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 
@@ -1519,10 +1520,14 @@
   FILE *pReport = 0;              /* lsm malloc() report file */
   const char *zReport = "malloc.txt generated";
 #else
   const char *zReport = "malloc.txt NOT generated";
 #endif
+
+#if defined(_MSC_VER) || defined(__MSVCRT__)
+  _set_fmode(_O_BINARY);
+#endif
 
   testMallocInstall(tdb_lsm_env());
 
   if( argc<2 ){
     testPrintError("Usage: %s sub-command ?args...?\n", argv[0]);