From: mistachkin <mistachkin@noemail.net>
Date: Tue, 14 Aug 2012 01:45:12 +0000 (+0000)
Subject: Refer to the file mapping Win32 API functions only when absolutely necessary.
X-Git-Tag: version-3.7.14~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1700b1c65cc286ab292c3c44158da902eb273742;p=thirdparty%2Fsqlite.git

Refer to the file mapping Win32 API functions only when absolutely necessary.

FossilOrigin-Name: 1de2237d005fa1a1e1d034820d17daf64a860f81
---

diff --git a/manifest b/manifest
index 029a64c6c1..6206e360d2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refer\sto\sthe\sWaitForSingleObjectEx\sand\sSetFilePointerEx\sWin32\sfunctions\sonly\sfor\splatforms\swhere\sthey\sare\sgoing\sto\sbe\sused.
-D 2012-08-13T22:05:22.296
+C Refer\sto\sthe\sfile\smapping\sWin32\sAPI\sfunctions\sonly\swhen\sabsolutely\snecessary.
+D 2012-08-14T01:45:12.276
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
-F src/os_win.c 5de2e293ce912be89edcd8b1f97d25a05201d705
+F src/os_win.c 370c6f3399e3cd9f14343fb7dc4b2bbe8619d3bf
 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P b0d31e779ecf01c5a235443c05f488b177ac3045
-R e108fe40c60912ec60f26ef742628f98
+P 9888ce9294c09749f5c958f965f949561867fea0
+R a98aa246c40b02fe38a0fee800dd8927
 U mistachkin
-Z a85518ddd930e1856fb03005c1a29498
+Z 9b5874d2d03bd5e6df37f953a18d9b36
diff --git a/manifest.uuid b/manifest.uuid
index daa011d39a..0feb2de849 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9888ce9294c09749f5c958f965f949561867fea0
\ No newline at end of file
+1de2237d005fa1a1e1d034820d17daf64a860f81
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index a533453197..2cbd2cee54 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -288,7 +288,8 @@ static struct win_syscall {
 #define osCreateFileW ((HANDLE(WINAPI*)(LPCWSTR,DWORD,DWORD, \
         LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE))aSyscall[5].pCurrent)
 
-#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE)
+#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
+        !defined(SQLITE_OMIT_WAL))
   { "CreateFileMappingW",      (SYSCALL)CreateFileMappingW,      0 },
 #else
   { "CreateFileMappingW",      (SYSCALL)0,                       0 },
@@ -600,7 +601,7 @@ static struct win_syscall {
         LPOVERLAPPED))aSyscall[45].pCurrent)
 #endif
 
-#if !SQLITE_OS_WINRT
+#if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL))
   { "MapViewOfFile",           (SYSCALL)MapViewOfFile,           0 },
 #else
   { "MapViewOfFile",           (SYSCALL)0,                       0 },
@@ -670,7 +671,11 @@ static struct win_syscall {
 #define osUnlockFileEx ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
         LPOVERLAPPED))aSyscall[55].pCurrent)
 
+#if SQLITE_OS_WINCE || !defined(SQLITE_OMIT_WAL)
   { "UnmapViewOfFile",         (SYSCALL)UnmapViewOfFile,         0 },
+#else
+  { "UnmapViewOfFile",         (SYSCALL)0,                       0 },
+#endif
 
 #define osUnmapViewOfFile ((BOOL(WINAPI*)(LPCVOID))aSyscall[56].pCurrent)
 
@@ -729,7 +734,7 @@ static struct win_syscall {
 #define osGetFileInformationByHandleEx ((BOOL(WINAPI*)(HANDLE, \
         FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[63].pCurrent)
 
-#if SQLITE_OS_WINRT
+#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "MapViewOfFileFromApp",    (SYSCALL)MapViewOfFileFromApp,    0 },
 #else
   { "MapViewOfFileFromApp",    (SYSCALL)0,                       0 },
@@ -793,7 +798,7 @@ static struct win_syscall {
 
 #define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[71].pCurrent)
 
-#if SQLITE_OS_WINRT
+#if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "CreateFileMappingFromApp", (SYSCALL)CreateFileMappingFromApp, 0 },
 #else
   { "CreateFileMappingFromApp", (SYSCALL)0,                      0 },