From: shane <shane@noemail.net>
Date: Wed, 19 Nov 2008 21:35:46 +0000 (+0000)
Subject: In os_win.c, if SQLITE_TEST defined, winRandomness() should return all zeroes like... 
X-Git-Tag: version-3.6.10~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b7f1ae1ddda6c6637c0fb1e3e680de6f9d9aac;p=thirdparty%2Fsqlite.git

In os_win.c, if SQLITE_TEST defined, winRandomness() should return all zeroes like os_unix.c. (CVS 5932)

FossilOrigin-Name: 00b68a1e3164fbf04dabb480c2037be45612b4e4
---

diff --git a/manifest b/manifest
index f2aa85ab08..9c0d7c6955 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.6.6\s(CVS\s5931)
-D 2008-11-19T21:03:38
+C In\sos_win.c,\sif\sSQLITE_TEST\sdefined,\swinRandomness()\sshould\sreturn\sall\szeroes\slike\sos_unix.c.\s(CVS\s5932)
+D 2008-11-19T21:35:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0aa7bbe3be6acc4045706e3bb3fd0b8f38f4a3b5
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -138,7 +138,7 @@ F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c d12285d66df674c42f6f544a6f7c21bf1a954ee1
 F src/os_unix.c 03c76b5269361adcd68cf9d6713181922535ac6e
-F src/os_win.c 08d0b059ac01f32e8813bb96fc573486592b83f5
+F src/os_win.c 3dff41670fb9798a869c636626bb7d6d8b6a45bb
 F src/pager.c db12a8333e54e7bbf62dc621ada5507adb3a6493
 F src/pager.h a02ef8e6cc7e78b54874166e5ce786c9d4c489bf
 F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe
@@ -659,7 +659,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P deadc2548d1e43cbbfe3af049cc5f59ee55bda46
-R c5d1d278ab22a9ce54fe52f780e58c60
-U drh
-Z 3cc08c78d320a8218f2ba2945f05b24e
+P 01a6e2820af0729f01ce90664ce9a6aa63e5b09a
+R 76c151a976f8d3a735617b3c9cd38e30
+U shane
+Z dc6f492a5f846806441eff5aaa950b52
diff --git a/manifest.uuid b/manifest.uuid
index 4ee816e0d6..5d472e3714 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01a6e2820af0729f01ce90664ce9a6aa63e5b09a
\ No newline at end of file
+00b68a1e3164fbf04dabb480c2037be45612b4e4
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 901482d94f..833c24ce78 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $Id: os_win.c,v 1.139 2008/11/18 19:18:52 drh Exp $
+** $Id: os_win.c,v 1.140 2008/11/19 21:35:47 shane Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_WIN               /* This file is used for windows only */
@@ -1553,6 +1553,11 @@ void winDlClose(sqlite3_vfs *pVfs, void *pHandle){
 */
 static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
   int n = 0;
+  UNUSED_PARAMETER(pVfs);
+#if defined(SQLITE_TEST)
+  n = nBuf;
+  memset(zBuf, 0, nBuf);
+#else
   if( sizeof(SYSTEMTIME)<=nBuf-n ){
     SYSTEMTIME x;
     GetSystemTime(&x);
@@ -1575,6 +1580,7 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
     memcpy(&zBuf[n], &i, sizeof(i));
     n += sizeof(i);
   }
+#endif
   return n;
 }