win32: code shrink

Save a few bytes:

- When collecting entropy prefer functions we call elsewhere.

- In uname(2) set 32-bit processor type to i686 and tweak it for
  i386.

1 files changed, 3 insertions, 3 deletions

diff --git a/win32/isaac.c b/win32/isaac.c
index 2b02eaff2..f419a3f2e 100644
--- a/win32/isaac.c
+++ b/win32/isaac.c
@@ -129,7 +129,7 @@ static void randinit(isaac_t *t, int flag)
 static void get_entropy(isaac_t *t)
 {
         int i, j, len;
-        SYSTEMTIME tm;
+        FILETIME tm;
         MEMORYSTATUS ms;
         SYSTEM_INFO si;
         LARGE_INTEGER pc;
@@ -139,11 +139,11 @@ static void get_entropy(isaac_t *t)
         unsigned char buf[16];
 
         i = 0;
-        t->randrsl[i++] = (uint32_t)GetCurrentProcessId();
+        t->randrsl[i++] = (uint32_t)GetProcessId(GetCurrentProcess());
         t->randrsl[i++] = (uint32_t)GetCurrentThreadId();
         t->randrsl[i++] = (uint32_t)GetTickCount();
 
-        GET_DATA(GetLocalTime, tm)
+        GET_DATA(GetSystemTimeAsFileTime, tm)
         GET_DATA(GlobalMemoryStatus, ms)
         GET_DATA(GetSystemInfo, si)
         GET_DATA(QueryPerformanceCounter, pc)