From: drh Date: Mon, 8 Oct 2007 15:06:03 +0000 (+0000) Subject: More untested changes for wince contributed by users. Ticket #2702. (CVS 4479) X-Git-Tag: version-3.6.10~1698 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cd1ea5e44f9d3274bae4cc6622dc08a81a75910;p=thirdparty%2Fsqlite.git More untested changes for wince contributed by users. Ticket #2702. (CVS 4479) FossilOrigin-Name: ccd709e1791b1c1091a61139633b972b378c1816 --- diff --git a/manifest b/manifest index efad3119bb..43d28496ce 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reverting\scheck-in\s(3836)\sat\sthe\srequest\sof\swinCE\susers.\s\sWe\sno\sability\nto\stest\sthis\schange.\s\sPresumably\sthis\sis\sa\sfix\sfor\stickets\s#2698,\s#2533,\nand\s#2598.\s\sIt\sis\sunclear\sif\sthis\scauses\s#2294\sto\sbe\sreopened\sor\snot.\s(CVS\s4478) -D 2007-10-08T12:29:17 +C More\suntested\schanges\sfor\swince\scontributed\sby\susers.\s\sTicket\s#2702.\s(CVS\s4479) +D 2007-10-08T15:06:04 F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -118,7 +118,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_unix.c 308bd8ad6977f66f608228cccaecc4cbc1a24693 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e -F src/os_win.c 3bc308a90f7012698b95cabe0ca58b078b45c06a +F src/os_win.c 3ea65d671b2bf1c6e29bab9cc5b4525e12391b3a F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/pager.c 0a92a08192785af79547b017cda45eb683b22552 F src/pager.h d783e7f184afdc33adff37ba58d4e029bd8793b3 @@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P a36fca4cdef162c87ce47a50ededdea19a8865f9 -R 6ed221af82d379a0128b8802c79c45dd +P 27346fa55ed9b5c20016d07a37268fbd42dc097f +R 2ac64ff791413acc80640b875cdb23e3 U drh -Z d9f526598bb6c123baa0e086a7f1575e +Z 64719b764c78c200eccd02a7c4303411 diff --git a/manifest.uuid b/manifest.uuid index ccdf829695..4f0a11adc6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -27346fa55ed9b5c20016d07a37268fbd42dc097f \ No newline at end of file +ccd709e1791b1c1091a61139633b972b378c1816 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 2524552473..55a3c1980d 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1104,9 +1104,13 @@ static int winOpen( } if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL | SQLITE_OPEN_SUBJOURNAL) ){ +#if OS_WINCE + dwFlagsAndAttributes = FILE_ATTRIBUTE_HIDDEN; +#else dwFlagsAndAttributes = FILE_ATTRIBUTE_TEMPORARY | FILE_ATTRIBUTE_HIDDEN | FILE_FLAG_DELETE_ON_CLOSE; +#endif }else{ dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL; } @@ -1337,6 +1341,7 @@ static int winFullPathname( #if OS_WINCE /* WinCE has no concept of a relative pathname, or so I am told. */ sqlite3_snprintf(pVfs->mxPathname, zFull, "%s", zRelative); + return SQLTIE_OK; #endif #if !OS_WINCE && !defined(__CYGWIN__)