From 45cc2a67ae27b97fac56def87dac1e5265de8132 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Mon, 15 Aug 2022 16:37:40 +0800
Subject: [PATCH] os: fix win lack dll error

---
 cmake/cmake.define     | 8 +++++++-
 contrib/CMakeLists.txt | 2 +-
 source/os/src/osRand.c | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 5639d212d7..989b69a89b 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -81,7 +81,7 @@ ENDIF ()
 
 IF (TD_WINDOWS)
     MESSAGE("${Yellow} set compiler flag for Windows! ${ColourReset}")
-    SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi")
+    SET(COMMON_FLAGS "/w /D_WIN32 /DWIN32 /Zi /MTd")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
     # IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
     #  SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
@@ -92,6 +92,12 @@ IF (TD_WINDOWS)
     IF (CMAKE_DEPFILE_FLAGS_CXX)
         SET(CMAKE_DEPFILE_FLAGS_CXX "")
     ENDIF ()
+    IF (CMAKE_C_FLAGS_DEBUG)
+        SET(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)
+    ENDIF ()
+    IF (CMAKE_CXX_FLAGS_DEBUG)
+        SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
+    ENDIF ()
 
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index b4e8825431..294b59fe95 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -273,7 +273,7 @@ endif(${BUILD_WITH_NURAFT})
 
 # pthread
 if(${BUILD_PTHREAD})
-    set(CMAKE_BUILD_TYPE release)
+    set(CMAKE_BUILD_TYPE debug)
     add_definitions(-DPTW32_STATIC_LIB)
     add_subdirectory(pthread EXCLUDE_FROM_ALL)
     set_target_properties(libpthreadVC3 PROPERTIES OUTPUT_NAME pthread)
diff --git a/source/os/src/osRand.c b/source/os/src/osRand.c
index 461a72e962..bd2bfa486e 100644
--- a/source/os/src/osRand.c
+++ b/source/os/src/osRand.c
@@ -37,9 +37,13 @@ uint32_t taosRandR(uint32_t *pSeed) {
 
 uint32_t taosSafeRand(void) {
 #ifdef WINDOWS
-  uint32_t seed;
+  uint32_t seed = taosRand();
   HCRYPTPROV hCryptProv;
-  if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) return seed;
+  if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
+    if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
+      return seed;
+    }
+  }
   if (hCryptProv != NULL) {
     if (!CryptGenRandom(hCryptProv, 4, &seed)) return seed;
   }