Use GetTickCount64() instead of GetTickCount() in Windows, for portability

to UWP.

FossilOrigin-Name: ea65ae964e21541d8f7c00ec679a608d34bc94408d9cc479b2d7fb08bf0e3cdf

diff --git a/manifest b/manifest
index c31fab1bfc6e469d4fc8eaa61ade5f717e2e3972..62b875d703fcae60f16705cdeb4bda684c725800 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sHaiku\sOS\sbuilds,\sfix\sthe\s--editline\sconfigure\sflag\sto\sactually\slink\sagainst\slibedit\srather\sthan\slibreadline.
-D 2026-05-13T07:33:31.519
+C Use\sGetTickCount64()\sinstead\sof\sGetTickCount()\sin\sWindows,\sfor\sportability\nto\sUWP.
+D 2026-05-13T10:47:40.516
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -722,7 +722,7 @@ F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e
 F src/os_kv.c e7d96727db5b67e39d590a68cc61c86daf4c093c36c011a09ebfb521182ec28d
 F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
 F src/os_unix.c a07dce662f6c4e18098f6faa9f7ec7cf311f56ee9151bed2aad4dcd55852c9e2
-F src/os_win.c 4786b1123beea22a9cd8f8e9d781cc1b4bf4679c56103edbf60a519ce23a2781
+F src/os_win.c 61393d1aa4f0c18103c6adb80d344d89996ee17b9ad73f9619fce40de50546de
 F src/os_win.h c06ccc3a090cf54202ea58981c298817f3309d4c9e4d52ad0a02927346493721
 F src/pager.c fbec9063ea139dfa5d94ce540671752b89f8e8dc38f8a1f614bab1aa04a2dd40
 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
@@ -2204,8 +2204,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 2741193e81750512cae8bb14ebc03fa11dde100da144488b4da1c81a351e4ff6
-R d5dd941ae29f91aac57119137237a7bd
-U stephan
-Z a9a308f5f006f1f56f22f1fa90b2cbfd
+P 642168d386074d1398b52c2d952e4cb153617f7bed82fb99d76b6d28dc8242bc
+R 687c24ced8b199134f3377cc1f9dfa5b
+U drh
+Z e9b0ac1110be2ac1d47ed3e85181d92f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f0f3ccd7bb36e5d797ac50984a22db9e8f45678f..98dd690c227d08dbdb117f09a9f53a955c068887 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-642168d386074d1398b52c2d952e4cb153617f7bed82fb99d76b6d28dc8242bc
+ea65ae964e21541d8f7c00ec679a608d34bc94408d9cc479b2d7fb08bf0e3cdf

diff --git a/src/os_win.c b/src/os_win.c
index c230c6cb23887dc4f5626e8d8c948407435d3b7f..6ba34990e5f4317e10bae6e12a3e3c3c97f08642 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -446,8 +446,8 @@ static struct win_syscall {
   { "GetTempPathW",            (SYSCALL)GetTempPathW,            0 },
 #define osGetTempPathW ((DWORD(WINAPI*)(DWORD,LPWSTR))aSyscall[18].pCurrent)
 
-  { "GetTickCount",            (SYSCALL)GetTickCount,            0 },
-#define osGetTickCount ((DWORD(WINAPI*)(VOID))aSyscall[19].pCurrent)
+  { "GetTickCount64",          (SYSCALL)GetTickCount64,          0 },
+#define osGetTickCount64 ((ULONGLONG(WINAPI*)(VOID))aSyscall[19].pCurrent)
 
   { "HeapAlloc",               (SYSCALL)HeapAlloc,               0 },
 #define osHeapAlloc ((LPVOID(WINAPI*)(HANDLE,DWORD, \
@@ -4995,7 +4995,7 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
     xorMemory(&e, (unsigned char*)&pid, sizeof(DWORD));
   }
   {
-    DWORD cnt = osGetTickCount();
+    ULONGLONG cnt = osGetTickCount64();
     xorMemory(&e, (unsigned char*)&cnt, sizeof(DWORD));
   }
   {