From 8128d34e351a088485f4364f2699e99fb413a196 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 29 Nov 2016 11:02:02 +0000
Subject: [PATCH] [bb] fix rand() initialization

* What do you know, srand() is thread-local...
---
 src/badblocks.c |  2 ++
 src/rufus.c     |  1 -
 src/rufus.rc    | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/badblocks.c b/src/badblocks.c
index 8b96b910..94a8d731 100644
--- a/src/badblocks.c
+++ b/src/badblocks.c
@@ -349,6 +349,7 @@ static void pattern_fill(unsigned char *buffer, unsigned int pattern,
 	unsigned char	bpattern[sizeof(pattern)], *ptr;
 
 	if (pattern == (unsigned int) ~0) {
+		srand((unsigned int)_GetTickCount64());
 		for (ptr = buffer; ptr < buffer + n; ptr++) {
 			// coverity[dont_call]
 			(*ptr) = rand() % (1 << (8 * sizeof(char)));
@@ -450,6 +451,7 @@ static unsigned int test_rw(HANDLE hDrive, blk_t last_block, size_t block_size,
 	cur_pattern = 0;
 
 	for (pat_idx = 0; pat_idx < nb_passes; pat_idx++) {
+		srand((unsigned int)_GetTickCount64());
 		if (cancel_ops) goto out;
 		// coverity[dont_call]
 		id_offset = rand() * (block_size-sizeof(blk_t)) / RAND_MAX;
diff --git a/src/rufus.c b/src/rufus.c
index 968a6289..d90f8b9a 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -3073,7 +3073,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				uprintf("Failed to enable AutoMount");
 		}
 	}
-	srand((unsigned int)_GetTickCount64());
 
 relaunch:
 	uprintf("localization: using locale '%s'\n", selected_locale->txt[0]);
diff --git a/src/rufus.rc b/src/rufus.rc
index 5e5f66c5..6e4734bd 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.11.1002"
+CAPTION "Rufus 2.11.1003"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,11,1002,0
- PRODUCTVERSION 2,11,1002,0
+ FILEVERSION 2,11,1003,0
+ PRODUCTVERSION 2,11,1003,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.11.1002"
+            VALUE "FileVersion", "2.11.1003"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.11.1002"
+            VALUE "ProductVersion", "2.11.1003"
         END
     END
     BLOCK "VarFileInfo"