Add new assert() statements designed to detect and prevent the kind

of system interface numbering errors that happened in [108691a3cb2f296f]
and that were not fixed until [fe49703034bd23fa].

FossilOrigin-Name: 4e6e551c89c4f18299b3d60369f439e80f2fe2b0e70199f649821b1dbf20c668

diff --git a/manifest b/manifest
index f286dae84551c82f01d9c828d334aab396102a1c..b9cd93095473918cdaf3b8833abe4a43ab729c6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sunused\sentries\sin\sthe\saSysCall\sarray\sfor\sthe\sWindows\sdriver.\s\sFix\nincorrect\snumbering\sin\salter\sentries\sof\sthat\sarray.
-D 2025-12-12T11:50:37.088
+C Add\snew\sassert()\sstatements\sdesigned\sto\sdetect\sand\sprevent\sthe\skind\nof\ssystem\sinterface\snumbering\serrors\sthat\shappened\sin\s[108691a3cb2f296f]\nand\sthat\swere\snot\sfixed\suntil\s[fe49703034bd23fa].
+D 2025-12-12T12:06:43.000
 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 dcf7988ddbdd68619b821c9a722f9377abb46f1d26c9279eb5a50402fd43d749
-F src/os_win.c b915f7d3ba6725dd1a826a594da5e63940907b61b33d6a857838dbf0d224fc6b
+F src/os_win.c a58768884669ea574d3d4169bed596c559f07e384bd5a657fadafe77c296391e
 F src/os_win.h 5e168adf482484327195d10f9c3bce3520f598e04e07ffe62c9c5a8067c1037b
 F src/pager.c a81461de271ac4886ad75b7ca2cca8157a48635820c4646cd2714acdc2c17e5f
 F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
@@ -2184,8 +2184,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c68ef69ec97da0312b95375b3af159f8a06ce1a69376d042c557dcca18d3f77e
-R 021af3d3b587e1f5bd5ad3b9d3c9969f
+P fe49703034bd23fa8f43ffdf0e23ec9613688d957adf96b3f1ea86fb02a8d86b
+R f52f4a9c387457edc2e18d724aa80ebc
 U drh
-Z 3b2ff21063fd5b8784977a80d3a436c0
+Z 9d4c0719badab3584588a1f120e6b6db
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 09e0a046f6ce393616301b8947982c4179f21af0..d3ff44e01bd6dc1f535ea010f7d00bb0d92f1f14 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe49703034bd23fa8f43ffdf0e23ec9613688d957adf96b3f1ea86fb02a8d86b
+4e6e551c89c4f18299b3d60369f439e80f2fe2b0e70199f649821b1dbf20c668

diff --git a/src/os_win.c b/src/os_win.c
index 2800186a0982a5155aaac67bb5041829a0371792..0a326c894ac91db8293816e55c108ff1d69244eb 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -6476,6 +6476,11 @@ int sqlite3_os_init(void){
   /* Double-check that the aSyscall[] array has been constructed
   ** correctly.  See ticket [bb3a86e890c8e96ab] */
   assert( ArraySize(aSyscall)==85 );
+  assert( strcmp(aSyscall[0].zName,"AreFileApisANSI")==0 );
+  assert( strcmp(aSyscall[21].zName,"GetFileAttributesW")==0 );
+  assert( strcmp(aSyscall[42].zName,"HeapValidate")==0 );
+  assert( strcmp(aSyscall[63].zName,"WaitForSingleObjectEx")==0 );
+  assert( strcmp(aSyscall[84].zName,"cygwin_conv_path")==0 );
 
   /* get memory map allocation granularity */
   memset(&winSysInfo, 0, sizeof(SYSTEM_INFO));