From e740242978b9f74a090570738035ea4d5a45602c Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Sun, 6 Sep 2020 08:29:08 -0700
Subject: [PATCH] link with advapi32 on windows

---
 CMakeLists.txt      | 2 +-
 azure-pipelines.yml | 8 ++++----
 src/random.c        | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b55ae0..81362175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,7 +191,7 @@ endif()
 
 # extra needed libraries
 if(WIN32)
-  list(APPEND mi_libraries psapi shell32 user32 bcrypt)
+  list(APPEND mi_libraries psapi shell32 user32 advapi32)
 else()
   if(NOT ${CMAKE_C_COMPILER} MATCHES "android")
     list(APPEND mi_libraries pthread)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5ffb1ef3..43f128f0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,10 +36,10 @@ jobs:
     inputs:
       solution: $(BuildType)/libmimalloc.sln
       configuration: '$(MSBuildConfiguration)'
-  #- script: |
-  #    cd $(BuildType)
-  #    ctest --verbose --timeout 120
-  #  displayName: CTest
+  - script: |
+      cd $(BuildType)
+      ctest --verbose --timeout 120
+    displayName: CTest
   #- script: $(BuildType)\$(BuildType)\mimalloc-test-stress
   #  displayName: TestStress
   #- upload: $(Build.SourcesDirectory)/$(BuildType)
diff --git a/src/random.c b/src/random.c
index a604b49b..2d15c187 100644
--- a/src/random.c
+++ b/src/random.c
@@ -170,6 +170,7 @@ static bool os_random_buf(void* buf, size_t buf_len) {
   return (BCryptGenRandom(NULL, (PUCHAR)buf, (ULONG)buf_len, BCRYPT_USE_SYSTEM_PREFERRED_RNG) >= 0);
 }
 */
+#pragma comment (lib,"advapi32.lib")
 #define RtlGenRandom  SystemFunction036
 #ifdef __cplusplus
 extern "C" {
@@ -181,8 +182,8 @@ BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
 static bool os_random_buf(void* buf, size_t buf_len) {
   mi_assert_internal(buf_len >= sizeof(uintptr_t));
   memset(buf, 0, buf_len);
-  RtlGenRandom(buf, (ULONG)buf_len);
-  return (((uintptr_t*)buf)[0] != 0);  // sanity check (but RtlGenRandom should never fail)
+  bool ok = (RtlGenRandom(buf, (ULONG)buf_len) != 0);
+  return ok;
 }
 
 #elif defined(ANDROID) || defined(XP_DARWIN) || defined(__APPLE__) || defined(__DragonFly__) || \