/ Changes On Branch winrt
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch winrt Excluding Merge-Ins

This is equivalent to a diff from 7029b3404d to 9fe0f0754c

2014-09-01
19:29
For sqlite3_win32_is_nt(), assume WinRT is NT-based and revise #ifdef ordering to prefer the ANSI version of GetVersionEx, when available. (check-in: be0a037244 user: mistachkin tags: trunk)
2014-08-22
19:12
Revise #ifdef ordering to prefer the ANSI version of GetVersionEx, when available. (Closed-Leaf check-in: 9fe0f0754c user: mistachkin tags: winrt)
2014-08-21
20:26
Simplify the interface to the symbol table, saving 600 bytes of code space. (check-in: 14b0f561fe user: drh tags: trunk)
19:11
For sqlite3_win32_is_nt(), assume WinRT is NT-based. (check-in: 2f59e71fbf user: mistachkin tags: winrt)
16:09
Merge all recent trunk changes, especially the fix for ticket [369d57fb8e5ccdff06f1], but also the skip-scan improvement and performance improvements in the b-tree code. (check-in: 0b9e2c3269 user: drh tags: sessions)
14:10
Fix a faulty assert() statement. Add comments to clarify the behavior of the sqlite3OpenTableAndIndices() routine in insert.c. Add test cases to verify that the assert() statement is not firing inappropriately. Ticket [369d57fb8e5ccdff06f1]. (check-in: 7029b3404d user: drh tags: trunk)
2014-08-20
23:42
Increase the version number to 3.8.7 (check-in: 91594aae07 user: drh tags: trunk)

Changes to src/os_win.c.

  1313   1313   #endif
  1314   1314   
  1315   1315   /*
  1316   1316   ** This function determines if the machine is running a version of Windows
  1317   1317   ** based on the NT kernel.
  1318   1318   */
  1319   1319   int sqlite3_win32_is_nt(void){
  1320         -#if defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX
         1320  +#if SQLITE_OS_WINRT
         1321  +  /*
         1322  +  ** NOTE: The WinRT sub-platform is always assumed to be based on the NT
         1323  +  **       kernel.
         1324  +  */
         1325  +  return 1;
         1326  +#elif defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX
  1321   1327     if( osInterlockedCompareExchange(&sqlite3_os_type, 0, 0)==0 ){
  1322         -#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
  1323         -        defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WIN8
  1324         -    OSVERSIONINFOW sInfo;
  1325         -    sInfo.dwOSVersionInfoSize = sizeof(sInfo);
  1326         -    osGetVersionExW(&sInfo);
  1327         -    osInterlockedCompareExchange(&sqlite3_os_type,
  1328         -        (sInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) ? 2 : 1, 0);
  1329         -#elif defined(SQLITE_WIN32_HAS_ANSI)
         1328  +#if defined(SQLITE_WIN32_HAS_ANSI)
  1330   1329       OSVERSIONINFOA sInfo;
  1331   1330       sInfo.dwOSVersionInfoSize = sizeof(sInfo);
  1332   1331       osGetVersionExA(&sInfo);
         1332  +    osInterlockedCompareExchange(&sqlite3_os_type,
         1333  +        (sInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) ? 2 : 1, 0);
         1334  +#elif defined(SQLITE_WIN32_HAS_WIDE)
         1335  +    OSVERSIONINFOW sInfo;
         1336  +    sInfo.dwOSVersionInfoSize = sizeof(sInfo);
         1337  +    osGetVersionExW(&sInfo);
  1333   1338       osInterlockedCompareExchange(&sqlite3_os_type,
  1334   1339           (sInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) ? 2 : 1, 0);
  1335   1340   #endif
  1336   1341     }
  1337   1342     return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2;
  1338   1343   #elif SQLITE_TEST
  1339   1344     return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2;
  1340   1345   #else
         1346  +  /*
         1347  +  ** NOTE: All sub-platforms where the GetVersionEx[AW] functions are
         1348  +  **       deprecated are always assumed to be based on the NT kernel.
         1349  +  */
  1341   1350     return 1;
  1342   1351   #endif
  1343   1352   }
  1344   1353   
  1345   1354   #ifdef SQLITE_WIN32_MALLOC
  1346   1355   /*
  1347   1356   ** Allocate nBytes of memory.