Corrections to the Win32 porting changes on this branch.

FossilOrigin-Name: 0b26a5a26d700e20eea5ebbd620af0af6f2d61c652cfca5b8563267588cb2be6

diff --git a/manifest b/manifest
index d11e831d0ce62e19778e8d7113c805c83794dfc2..021c050212ee45ddf9c58b8ba062cd6340ddd17e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sit\spossible\sto\suse\sOSTRACE\sfor\smulti-process\stesting.
-D 2017-11-09T17:29:04.731
+C Corrections\sto\sthe\sWin32\sporting\schanges\son\sthis\sbranch.
+D 2017-11-09T17:29:18.701
 F Makefile.in 5bae3f2f3d42f2ad52b141562d74872c97ac0fca6c54953c91bb150a0e6427a8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3a5cb477ec3ce5274663b693164e349db63348667cd45bad78cc13d580b691e2
@@ -448,7 +448,7 @@ F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c e87cef0bb894b94d96ee3af210be669549d111c580817d14818101b992640767
-F src/os_win.c 47687775641c97743c228f99813fbcffe7d53602da5cdcf0fe52f6810341a46c
+F src/os_win.c ce0b1da0d41a1cc78e33431c72fb4b53f3247b3884841ca0a988761565488824
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 07cf850241667874fcce9d7d924c814305e499b26c804322e2261247b5921903
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
@@ -1669,7 +1669,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3738bfd0c0eadb10eea58954af5052cb6ce164059f3aacfe65d7da6a400c63c7
-R b588bb75e731a71d38f9b889268c4e35
+P 0a7d416c4c43632725dc89cda8667cd9726b5152ee4692e4d0c9e2031e60cfb4
+R 83920a29a292bf4d0aadf8e0cc58f982
 U mistachkin
-Z 3f860c7c58efb09a7e9d6ae32c9bc1c6
+Z f20b1547624a9a7c878450951251f899

diff --git a/manifest.uuid b/manifest.uuid
index 866cdfe91f8c1293a59c53db02be153174d0a5d3..f22324c47b5bf513b523431d17621918b750846f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a7d416c4c43632725dc89cda8667cd9726b5152ee4692e4d0c9e2031e60cfb4
\ No newline at end of file
+0b26a5a26d700e20eea5ebbd620af0af6f2d61c652cfca5b8563267588cb2be6
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 9bfcfe1c814366822cbc292703ac7f5d8b06cc35..d434cfe927209dd5582be4f7495598dcc94a3842 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3895,7 +3895,7 @@ static int winGetShmDmsLockType(
 ** connection and no other process already holds a lock, return
 ** SQLITE_READONLY_CANTINIT and set pShmNode->isUnlocked=1.
 */
-static int winLockSharedMemory(winFile *pDbFd, winShmNode *pShmNode){
+static int winLockSharedMemory(winShmNode *pShmNode){
   int lockType;
   int rc = SQLITE_OK;
 
@@ -4014,7 +4014,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
       rc2 = winOpen(pDbFd->pVfs,
                     pShmNode->zFilename,
                     (sqlite3_file*)&pShmNode->hFile,
-                    SQLITE_OPEN_WAL|SQLITE_OPEN_READONLY|SQLITE_OPEN_CREATE,
+                    SQLITE_OPEN_WAL|SQLITE_OPEN_READONLY,
                     0);
       if( rc2!=SQLITE_OK ){
         rc = winLogError(SQLITE_CANTOPEN_BKPT, osGetLastError(),
@@ -4024,7 +4024,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
       pShmNode->isReadonly = 1;
     }
 
-    rc = winLockSharedMemory(pDbFd, pShmNode);
+    rc = winLockSharedMemory(pShmNode);
     if( rc!=SQLITE_OK && rc!=SQLITE_READONLY_CANTINIT ) goto shm_open_err;
   }
 
@@ -4048,7 +4048,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
   p->pNext = pShmNode->pFirst;
   pShmNode->pFirst = p;
   sqlite3_mutex_leave(pShmNode->mutex);
-  return SQLITE_OK;
+  return rc;
 
   /* Jump here on any error */
 shm_open_err:
@@ -4265,7 +4265,7 @@ static int winShmMap(
 
   sqlite3_mutex_enter(pShmNode->mutex);
   if( pShmNode->isUnlocked ){
-    rc = winLockSharedMemory(pDbFd, pShmNode);
+    rc = winLockSharedMemory(pShmNode);
     if( rc!=SQLITE_OK ) goto shmpage_out;
     pShmNode->isUnlocked = 0;
   }