Fix a problem in winOpen(). Merge the makefile enhancements from trunk.

FossilOrigin-Name: bd247ae7f95d2e50436961e9aee60578e98ceccc0df9f71c201dd4b1884f2085

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc autoconf/Makefile.msc
index a4270fb2ae71fb15eb84c66ecdd3fb943fa1e5d5,a4270fb2ae71fb15eb84c66ecdd3fb943fa1e5d5..f8a65e90cc537467f281d4738016cb28d869e984
--- 1/autoconf/Makefile.msc
--- 2/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@@ -301,6 -301,6 +301,7 @@@ SQLITE3EXEPDB = /pdb:sqlite3sh.pd
  # the Windows platform.
  #
  !IFNDEF OPT_FEATURE_FLAGS
++OPT_FEATURE_FLAGS = $(OPT_XTRA)
  !IF $(MINIMAL_AMALGAMATION)==0
  OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
  OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1
@@@ -314,6 -314,6 +315,14 @@@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS
  OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
  !ENDIF
  
++# Additional feature-options above and beyond what are normally used can be
++# be added using OPTIONS=.... on the command-line.  These values are
++# appended to the OPT_FEATURE_FLAGS variable.
++#
++!IFDEF OPTIONS
++OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) $(OPTIONS)
++!ENDIF
++
  # Should the session extension be enabled?  If so, add compilation options
  # to enable it.
  #

diff --cc main.mk
Simple merge

diff --cc manifest
index 8c86ddc03ef2ba4e8d71201b9d07097af829e47e,1a8810cd58e17ce36765510ac7eaf065ad0f0e04..6a90d353c526b0ffc7160764764d51e187d17c2f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\stests\scases\sfor\sSQLITE_ENABLE_SHARED_CACHE\sso\sthat\sthey\swork\son\sWindows.
- D 2024-08-29T19:37:21.055
 -C All\smakefiles\sare\sresponsive\sto\sOPTIONS=...\scommand-line\sarguments,\sand\sadd\nthe\sRHS\svalue\sof\sOPTIONS=\sto\sbuilds\sand\sto\slemon\sand\sother\sbuild\ssteps\sthat\nmight\srespond\sto\s-D\sor\s-U\soptions.
 -D 2024-08-29T18:32:56.249
++C Fix\sa\sproblem\sin\swinOpen().\s\sMerge\sthe\smakefile\senhancements\sfrom\strunk.
++D 2024-08-29T22:05:38.293
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 04a865aed7c79f6c91036acfeb344f44c27e6082c596afd657ed733c5fe7eabd
 -F Makefile.in f246a6d8a8a77c35d50d5494ee9bcd8fb6f90118eff46169427f9f404057b56e
++F Makefile.in c322adca45438743dd48882921f73c75f37f0fd4ab67446928b98e3fe928f65f
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc edd0c5eee0584f8d712650173da05cf5c64efb512d525008e82532ad24bb154c
- F README.md 83335813752d41cd445c727b0918597d99e18e7de0e05024536f555a5f34cc56
 -F Makefile.msc 47dfd26a401c5a33e237ecfe126c996977f34ac44e44a1a1ebf2204abb89d483
++F Makefile.msc 0ed3a1a328c744dc9fbecb848997105ea5ebd9635dbf6481ca179383a216d88f
+ F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
  F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -17,7 -17,7 +17,7 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
  F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
  F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
--F autoconf/Makefile.msc 7ac6c331fc3b8aa57b6782db995b8c0e49230352decd4e2662fd07c06a9ed623
++F autoconf/Makefile.msc 2aced6442addab13ed115696eba28d9ed29caa3dd604a31392c2c7a5da301492
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
  F autoconf/README.txt 42cfd21d0b19dc7d5d85fb5c405c5f3c6a4c923021c39128f6ba685355d8fd56
  F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277
@@@ -686,7 -685,7 +686,7 @@@ F ext/wasm/wasmfs.make 8a4955882aaa0783
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk ec134b350a0560b8fd73b96652467d6d80ad34fd27a7ee1a27139b27dc4baa3c
 -F main.mk 715c833f9733fd10b15d8773c59dd7535067d9d0f1a20073182069538f523bc7
++F main.mk 6b4e3eb9f0e885f9f4b103c11862e3045018f089c335389b8301660f734b92a6
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -751,7 -750,7 +751,7 @@@ F src/os_common.h 6c0eb8dd40ef3e12fe585
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
  F src/os_unix.c 6e3e4fc75904ff85184091dbab996e6e35c1799e771788961cc3b4fcbe8f852c
--F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
++F src/os_win.c 3c5614e5ea39e2ea33659d2d652fabd82ec3b5a39e342ca587eb6e5806e6d047
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
  F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
@@@ -1722,9 -1713,9 +1722,9 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
 -F test/testrunner.tcl ff5f42f683a9c868fe01a855d81b9f08e1afb031edc5c340e5cf0fe5deaa0041
 -F test/testrunner_data.tcl f1cbff53fe42087cac3d43ca02f9574bd212c842307442e2b6fff2183f5ccbfe
 +F test/tester.tcl 5fffa7c6d9e293fa109a3ccb925a92dba91c9ea1b824a2d64a0ae60b571231da
 +F test/testrunner.tcl 2c28979f936bc07cfc769080f4268fb7e95b64d0e16a4eca7f9cc6b7eefcde7d
- F test/testrunner_data.tcl 1943583c7d4d9be89519ba078ca9ab9b96d5e41f2a8fc97a67cd14cb6c048b48
++F test/testrunner_data.tcl 787af292f8c9e51ad2bb62dd8488ababd9e1bc303f920e4cbbe43a7650f3540e
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2221,8 -2211,8 +2221,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 87aa6fc2121951cebf4e31b204c9e152359c274a9467cb8f76becbc601cf173e
- R d469253a658afd77b0fd377d603fbf26
 -P e042eb024738a83eed92cd2dfac3d2a50d2589715a3d81b1a494564dd7d8e7fa
 -R f410afede94c7e996193f1f14e81b108
++P 60795a30c64dbaa3be16dc35a39262b5487a5d4abcff20ae8973e12b73af5af2 854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
++R 25b272be2c06f88ae1e734e918af2e85
  U drh
- Z 525dbfc62ae8437d80889e7e15a1cc65
 -Z d182fc30f4d0c921d3b91364d1eaed1e
++Z 3d8456fdef56a3a1151e6f41c182190c
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 325cfc58081ae0808e79fd8112a862f218d51c9a,21e3bcb9c3f7dbb8d17dbb5c635deff3ced01fe5..6a60af7ac783fdd67181d8ab065ba46676e8d716
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 60795a30c64dbaa3be16dc35a39262b5487a5d4abcff20ae8973e12b73af5af2
 -854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
++bd247ae7f95d2e50436961e9aee60578e98ceccc0df9f71c201dd4b1884f2085

diff --cc src/os_win.c
index 442c108e9df373ad5340cb9158463ea0acfb21ff,442c108e9df373ad5340cb9158463ea0acfb21ff..4e4056625e632e36b8c56bfd95545522bb96f3fb
--- 1/src/os_win.c
--- 2/src/os_win.c
+++ b/src/os_win.c
@@@ -5048,7 -5048,7 +5048,7 @@@ static int winOpen
  
    int rc = SQLITE_OK;            /* Function Return Code */
  #if !defined(NDEBUG) || SQLITE_OS_WINCE
--  int eType = flags&0xFFFFFF00;  /* Type of file to open */
++  int eType = flags&0x0FFF00;    /* Type of file to open */
  #endif
  
    int isExclusive  = (flags & SQLITE_OPEN_EXCLUSIVE);

diff --cc test/testrunner_data.tcl
index 67907d9902e4d909cac9ca6fe28013d2d97607af,71a42ab404eb0ef0635403fd05252112124b7864..732e1b02de181a8f6ea8607e85d6f4ff455c749b
--- 1/test/testrunner_data.tcl
--- 2/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@@ -477,10 -465,10 +477,10 @@@ proc make_sh_script {srcdir opts cflag
    set myopts ""
    if {[info exists ::env(OPTS)]} {
      append myopts "# From environment variable:\n"
--    append myopts "OPTS=$::env(OPTS)\n\n"
++    append myopts "OPTIONS=$::env(OPTS)\n\n"
    }
    foreach o [lsort $opts] { 
--    append myopts "OPTS=\"\$OPTS $o\"\n"
++    append myopts "OPTIONS=\"\$OPTS $o\"\n"
    }
  
    return [trimscript [subst -nocommands {