For sqlite3_win32_is_nt(), assume WinRT is NT-based.

FossilOrigin-Name: 2f59e71fbf31d2bd788d11197943b2ff3f4046e1

diff --git a/manifest b/manifest
index 1e5132fbcf26f4d07d5873c77e1a590a4070f4c4..8ca8db3ef3fca219cf8fc0cb90fcd8219ff5d76f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfaulty\sassert()\sstatement.\s\sAdd\scomments\sto\sclarify\sthe\sbehavior\sof\nthe\ssqlite3OpenTableAndIndices()\sroutine\sin\sinsert.c.\s\sAdd\stest\scases\sto\nverify\sthat\sthe\sassert()\sstatement\sis\snot\sfiring\sinappropriately.\nTicket\s[369d57fb8e5ccdff06f1].
-D 2014-08-21T14:10:23.770
+C For\ssqlite3_win32_is_nt(),\sassume\sWinRT\sis\sNT-based.
+D 2014-08-21T19:11:17.859
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -209,7 +209,7 @@ F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
-F src/os_win.c d067fce558a5032e6e6afe62899e5397bf63cf3e
+F src/os_win.c 817005660016dcaee908b44e4437c000f3666b4c
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -1188,7 +1188,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 91594aae0725388765070c80039dfe1bf126392d
-R 25e887863ed8cfd2c8a241fac46385f1
-U drh
-Z ed55b6e966354470a11e6c95fe10b90c
+P 7029b3404d3f5f698a496934f3a3f2972051b257
+R 2bf9f3345de9d3c6f464f51024249e55
+T *branch * winrt
+T *sym-winrt *
+T -sym-trunk *
+U mistachkin
+Z 677c2dec084bbb63edeb1740996a4b29

diff --git a/manifest.uuid b/manifest.uuid
index 944f894bbc10eab54f5f585e50020ece8985b477..a2db9504d91deeb96fb7755e35ccf21508bb510c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7029b3404d3f5f698a496934f3a3f2972051b257
\ No newline at end of file
+2f59e71fbf31d2bd788d11197943b2ff3f4046e1
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index b9f13becd6f8447f85bdf2941bb525cb4d7040d2..17613d253f8e991c79afe51befe6211faced9715 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1317,10 +1317,15 @@ void sqlite3_win32_sleep(DWORD milliseconds){
 ** based on the NT kernel.
 */
 int sqlite3_win32_is_nt(void){
-#if defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX
+#if SQLITE_OS_WINRT
+  /*
+  ** NOTE: The WinRT sub-platform is always assumed to be based on the NT
+  **       kernel.
+  */
+  return 1;
+#elif defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX
   if( osInterlockedCompareExchange(&sqlite3_os_type, 0, 0)==0 ){
-#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
-        defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WIN8
+#if defined(SQLITE_WIN32_HAS_WIDE)
     OSVERSIONINFOW sInfo;
     sInfo.dwOSVersionInfoSize = sizeof(sInfo);
     osGetVersionExW(&sInfo);
@@ -1338,6 +1343,10 @@ int sqlite3_win32_is_nt(void){
 #elif SQLITE_TEST
   return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2;
 #else
+  /*
+  ** NOTE: All sub-platforms where the GetVersionEx[AW] functions are
+  **       deprecated are always assumed to be based on the NT kernel.
+  */
   return 1;
 #endif
 }