diff options
| author | Daniel Neus <[email protected]> | 2015-12-16 20:44:58 +0100 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2015-12-16 20:44:58 +0100 |
| commit | d94d86c5cadfbe61dcb199effc3765a42646c45f (patch) | |
| tree | 49ccff58f3342d2413bb6d3b43845811a44655b8 | |
| parent | 740591cb0adf608f9ae93d0720173d1daa7934f7 (diff) | |
Replace deprecated Win API calls in Win32_EntropySource
* GetTickCount is replaced by GetTickCount64(): see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724408(v=vs.85).aspx for details
* GlobalMemoryStatus is replaced by GlobalMemoryStatusEx: see https://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx for details
| -rw-r--r-- | src/lib/entropy/win32_stats/es_win32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/entropy/win32_stats/es_win32.cpp b/src/lib/entropy/win32_stats/es_win32.cpp index 52bb24136..c0a8acdbd 100644 --- a/src/lib/entropy/win32_stats/es_win32.cpp +++ b/src/lib/entropy/win32_stats/es_win32.cpp @@ -20,7 +20,7 @@ void Win32_EntropySource::poll(Entropy_Accumulator& accum) First query a bunch of basic statistical stuff, though don't count it for much in terms of contributed entropy. */ - accum.add(GetTickCount(), BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); + accum.add(GetTickCount64(), BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); accum.add(GetMessagePos(), BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); accum.add(GetMessageTime(), BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); accum.add(GetInputState(), BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); @@ -32,8 +32,8 @@ void Win32_EntropySource::poll(Entropy_Accumulator& accum) GetSystemInfo(&sys_info); accum.add(sys_info, BOTAN_ENTROPY_ESTIMATE_STATIC_SYSTEM_DATA); - MEMORYSTATUS mem_info; - GlobalMemoryStatus(&mem_info); + MEMORYSTATUSEX mem_info; + GlobalMemoryStatusEx(&mem_info); accum.add(mem_info, BOTAN_ENTROPY_ESTIMATE_SYSTEM_DATA); POINT point; |