From 9c38e704d9f6550d0cc9e8b39e03604bb4336bbb Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Mon, 8 Aug 2022 09:34:12 +0800
Subject: [PATCH] build: add win package

---
 cmake/cmake.install                        |   4 +-
 contrib/CMakeLists.txt                     |  17 ++++
 include/os/osDef.h                         |   4 +-
 packaging/release.bat                      | 109 ++++++++++++---------
 packaging/release.sh                       |   2 +-
 packaging/tools/favicon.ico                | Bin 0 -> 4286 bytes
 packaging/tools/install.sh                 |   1 -
 packaging/tools/makepkg.sh                 |   3 +-
 packaging/tools/taos.bat                   |   6 ++
 packaging/tools/tdengine.iss               |  81 +++++++++++++++
 packaging/tools/windows_before_install.txt |   3 +
 source/os/src/osAtomic.c                   |  22 ++++-
 source/os/src/osString.c                   |   4 +-
 13 files changed, 198 insertions(+), 58 deletions(-)
 create mode 100644 packaging/tools/favicon.ico
 create mode 100644 packaging/tools/taos.bat
 create mode 100644 packaging/tools/tdengine.iss
 create mode 100644 packaging/tools/windows_before_install.txt

diff --git a/cmake/cmake.install b/cmake/cmake.install
index 27edd8e27a..d9f759217a 100644
--- a/cmake/cmake.install
+++ b/cmake/cmake.install
@@ -10,7 +10,9 @@ ELSEIF (TD_WINDOWS)
   # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/python DESTINATION connector)
   # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/src/connector/C\# DESTINATION connector)
   # INSTALL(DIRECTORY ${TD_SOURCE_DIR}/examples DESTINATION .)
-  INSTALL(FILES ${TD_SOURCE_DIR}/packaging/cfg/taos.cfg DESTINATION cfg)
+  INSTALL(CODE "IF (NOT EXISTS ${CMAKE_INSTALL_PREFIX}/cfg/taos.cfg)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${TD_SOURCE_DIR}/packaging/cfg/taos.cfg ${CMAKE_INSTALL_PREFIX}/cfg/taos.cfg)
+  ENDIF ()")
   INSTALL(FILES ${TD_SOURCE_DIR}/include/client/taos.h DESTINATION include)
   INSTALL(FILES ${TD_SOURCE_DIR}/include/util/taoserror.h DESTINATION include)
   INSTALL(FILES ${TD_SOURCE_DIR}/include/libs/function/taosudf.h DESTINATION include)
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index b4e8825431..de7b75a245 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -27,6 +27,10 @@ else ()
     cat("${TD_SUPPORT_DIR}/taosadapter_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
+if(TD_LINUX_64 AND JEMALLOC_ENABLED)
+    cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+endif()
+
 # pthread
 if(${BUILD_PTHREAD})
     cat("${TD_SUPPORT_DIR}/pthread_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
@@ -392,6 +396,19 @@ if(${BUILD_WITH_SQLITE})
     endif(NOT TD_WINDOWS)
 endif(${BUILD_WITH_SQLITE})
 
+# jemalloc
+IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
+    include(ExternalProject)
+    ExternalProject_Add(jemalloc
+        PREFIX        "jemalloc"
+        SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
+        BUILD_IN_SOURCE     1
+        CONFIGURE_COMMAND   ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+        BUILD_COMMAND       ${MAKE}
+        )
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
+ENDIF ()
+
 # addr2line
 if(${BUILD_ADDR2LINE})
     if(NOT ${TD_WINDOWS})    
diff --git a/include/os/osDef.h b/include/os/osDef.h
index 14f38eb7ff..be8689398d 100644
--- a/include/os/osDef.h
+++ b/include/os/osDef.h
@@ -57,7 +57,7 @@ extern "C" {
 
 #if defined(WINDOWS)
   char *stpcpy (char *dest, const char *src);
-  char *stpncpy (char *dest, const char *src, size_t n);
+  char *stpncpy (char *dest, const char *src, int n);
 
   // specific
 #ifndef __COMPAR_FN_T
@@ -77,7 +77,7 @@ extern "C" {
 
   char *     strsep(char **stringp, const char *delim);
   char *     getpass(const char *prefix);
-  char *     strndup(const char *s, size_t n);
+  char *     strndup(const char *s, int n);
 
   // for send function in tsocket.c
   #define MSG_NOSIGNAL             0
diff --git a/packaging/release.bat b/packaging/release.bat
index c1cf7875a5..d58e19cece 100644
--- a/packaging/release.bat
+++ b/packaging/release.bat
@@ -2,61 +2,78 @@
 
 set internal_dir=%~dp0\..\..\
 set community_dir=%~dp0\..
-cd %community_dir%
-git checkout -- .
-cd %community_dir%\packaging
+set package_dir=%cd%
 
 :: %1 name %2 version
 if !%1==! GOTO USAGE
 if !%2==! GOTO USAGE
-if %1 == taos GOTO TAOS
-if %1 == power GOTO POWER
-if %1 == tq GOTO TQ
-if %1 == pro GOTO PRO
-if %1 == kh GOTO KH
-if %1 == jh GOTO JH
-GOTO USAGE
 
-:TAOS
-goto RELEASE
-
-:POWER
-call sed_power.bat %community_dir%
-goto RELEASE
-
-:TQ
-call sed_tq.bat %community_dir%
-goto RELEASE
-
-:PRO
-call sed_pro.bat %community_dir%
-goto RELEASE
-
-:KH
-call sed_kh.bat %community_dir%
-goto RELEASE
-
-:JH
-call sed_jh.bat %community_dir%
-goto RELEASE
-
-:RELEASE
-echo release windows-client-64 for %1, version: %2
-if not exist %internal_dir%\debug\ver-%2-64bit-%1 (
-	md %internal_dir%\debug\ver-%2-64bit-%1
+if "%1" == "cluster" (
+	set work_dir=%internal_dir%
+	set packagServerName_x64=TDengine-enterprise-server-%2-beta-Windows-x64
+	set packagServerName_x86=TDengine-enterprise-server-%2-beta-Windows-x86
+	set packagClientName_x64=TDengine-enterprise-client-%2-beta-Windows-x64
+	set packagClientName_x86=TDengine-enterprise-client-%2-beta-Windows-x86
 ) else (
-	rd /S /Q %internal_dir%\debug\ver-%2-64bit-%1
-	md %internal_dir%\debug\ver-%2-64bit-%1
+	set work_dir=%community_dir%
+	set packagServerName_x64=TDengine-server-%2-Windows-x64
+	set packagServerName_x86=TDengine-server-%2-Windows-x86
+	set packagClientName_x64=TDengine-client-%2-Windows-x64
+	set packagClientName_x86=TDengine-client-%2-Windows-x86
 )
-cd %internal_dir%\debug\ver-%2-64bit-%1
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-cmake ../../ -G "NMake Makefiles" -DVERNUMBER=%2 -DCPUTYPE=x64
-set CL=/MP4
-nmake install
+
+echo release windows-client for %1, version: %2
+if not exist %work_dir%\debug (
+	md %work_dir%\debug
+)
+if not exist %work_dir%\debug\ver-%2-x64 (
+	md %work_dir%\debug\ver-%2-x64
+) else (
+	rd /S /Q %work_dir%\debug\ver-%2-x64
+	md %work_dir%\debug\ver-%2-x64
+)
+if not exist %work_dir%\debug\ver-%2-x86 (
+	md %work_dir%\debug\ver-%2-x86
+) else (
+	rd /S /Q %work_dir%\debug\ver-%2-x86
+	md %work_dir%\debug\ver-%2-x86
+)
+cd %work_dir%\debug\ver-%2-x64
+call vcvarsall.bat x64
+cmake ../../ -G "NMake Makefiles JOM" -DCMAKE_MAKE_PROGRAM=jom -DBUILD_TOOLS=true -DBUILD_HTTP=false -DVERNUMBER=%2 -DCPUTYPE=x64
+cmake --build .
+rd /s /Q C:\TDengine
+cmake --install .
+if not %errorlevel% == 0  ( call :RUNFAILED build x64 failed & exit /b 1)
+cd %package_dir%
+iscc /DMyAppInstallName="%packagServerName_x64%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
+if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x64% failed & exit /b 1)
+iscc /DMyAppInstallName="%packagClientName_x64%" /DMyAppVersion="%2" /DMyAppExcludeSource="taosd.exe" tools\tdengine.iss /O..\release
+if not %errorlevel% == 0  ( call :RUNFAILED package %packagClientName_x64% failed & exit /b 1)
+
+cd %work_dir%\debug\ver-%2-x86
+call vcvarsall.bat x86
+cmake ../../ -G "NMake Makefiles JOM" -DCMAKE_MAKE_PROGRAM=jom -DBUILD_TOOLS=true -DBUILD_HTTP=false -DVERNUMBER=%2 -DCPUTYPE=x86
+cmake --build .
+rd /s /Q C:\TDengine
+cmake --install .
+if not %errorlevel% == 0  ( call :RUNFAILED build x86 failed & exit /b 1)
+cd %package_dir%
+iscc /DMyAppInstallName="%packagServerName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="" tools\tdengine.iss /O..\release
+if not %errorlevel% == 0  ( call :RUNFAILED package %packagServerName_x86% failed & exit /b 1)
+iscc /DMyAppInstallName="%packagClientName_x86%" /DMyAppVersion="%2" /DMyAppExcludeSource="taosd.exe" tools\tdengine.iss /O..\release
+if not %errorlevel% == 0  ( call :RUNFAILED package %packagClientName_x86% failed & exit /b 1)
+
 goto EXIT0
 
 :USAGE
-echo Usage: release.bat $productName $version
+echo Usage: release.bat $verMode $version
 goto EXIT0
 
-:EXIT0
\ No newline at end of file
+:EXIT0
+exit /b
+
+:RUNFAILED
+echo %*
+cd %package_dir%
+goto :eof
\ No newline at end of file
diff --git a/packaging/release.sh b/packaging/release.sh
index 3426c2856d..09781dbe8e 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -26,7 +26,7 @@ soMode=dynamic  # [static | dynamic]
 dbName=taos     # [taos | ...]
 allocator=glibc # [glibc | jemalloc]
 verNumber=""
-verNumberComp="2.0.0.0"
+verNumberComp="3.0.0.0"
 httpdBuild=false
 
 while getopts "hv:V:c:o:l:s:d:a:n:m:H:" arg; do
diff --git a/packaging/tools/favicon.ico b/packaging/tools/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..20b8026d1d2efd6d77b013a1b94cee7aaed11772
GIT binary patch
literal 4286
zcmd6qPiPfa6vn3^1PLL8AR&}HB}fP&5~N5e5;TM$B0+qiiy{(Sgdh@ZDWR31h9VM*
zNRS{wL?j6kL8Q1ST?8w|m2}~%i!RDTq?97|8M1iD^S#^OH<>%mjFZe*vT(xZx%d3J
z_uO;NJ@@H(AMw}I<LO`TZinY}d7if$!14xx_`!$leZJ*UzXj|7?_(C}V%H2>K~uym
zIKbvh@b_}byns#=G>g=*`4~K2F8QyaKZ5p1m@`0EXZ{OVVQJK_KzD*}@JRs>H}eB}
zfqh6%=WH8^(QjqXe`5A)tk=c-1o*lDboMzA-+waNpuk|MWG1m^Uw<8(2OZ?1xqzvM
zZ72TsVe>nv<NIT%%Chi>zG_GD7Mj3e_P++*x!EG2-Y8UOSM5@JM)_*n%w{t_Hsjdt
zf$jw-fd_VjTVNn<2d`~OIWPGWjODv<87Lm&7mA%*7rO<ZGYAWB`9}BYd+;p?)`ZH(
zJK$3gsN(wo<1tO3@@c<YBadR+P5v%9J$zR!C*schFnWv7vrxsm)#-~e$HoLUjFp3n
zarstbbWdR$#hCdJKAec#z|(zP1`mk)2>MZvfv4DCcRW$-ndj#KUHLvwtwrZyuKRdR
z`-k#D<f?;StqBwZ<s|4a(9gkm%HK(B_QiQwW9+DRb2%-8uN)Xa-px4>_fI}+&zqnh
z$QKh|1AX~=F3!suqoW=(l$OEc4wzNWFw8hD4(9MXkzWBnGj541VXHVP2MK;$M`Pr=
z<I#O(EZ!H`>umFB{q!82&!~qLFwZz$v+A9D(l&06tcyCCjm_KOUFH7j{>c9;__5_H
ziq16W--TWu<He<te;~FV{lt9Z=4pyPcgjB^K2&#l1t_0^Dz?WNkEHF~99aucjDx!n
z&Zz~}OW?oGpgM}~ifoaKuQ#IuXzwxNa1|QWSg6+tj~Hy0e<NSdIDbURgVq~{>b~gC
zYA@As`-aTO=lei!mEPH-K=Oo-ZcS|DSLRy|e~Q@ar_VbdGWo9kRh!!DB{&EM!nu1Z
z^;W6Jj)T(~SPA-hw(M8*Co^ocj(RhFD)A=&6!Li^Bfk98d)Et8Luu@Xr&y->irb|O
zzSGnBm52CV_u$bRjozte;5TYvA9N6Oz7xcdflPNaQ5&pF5A^%9Y~brWL+I!?jPmy!
zJfX&dTrpOSw6k~68yKthZ!^z)vyhE}gKjUz&EzDrzavvF)eq$#wP&cww|luY(iGh`
zFbkB=L@hGcIieoTxCcz9*WkSRy|74p)tl4e+&MPH%^ZWO_a%Nm!C&AU8}TYpr={fk
zPCOJN^}sFrRjv~#u!im<`S6E9V8Z^oADoM~b=1EBT+dORY2TBazsT~1bXbqv`BSWU
z9;%#ngCn2?@MZ;l<^XY!pP4<N&_+2*tgW6g4dl-dI0bk&jA~YOmbe!=%l$7gdo+>z
zDd@&sF8P0Oe&W7;@y>IMJUnH8*E69ec(?NGwoA_5`t9fT*Z)!awrlMo>u`R(CF(g3
zfO>Bcvky+k@-=1}hu(yL8rw?E+UmcL>Z@g2|K%YH7s|Ci%eGd2VQpo-QhoZ`R=;Z4
zhOK^AuiEll)vnF1S6<E5DzD~hcCBv9j~aD5V;?rGEw8de6;xQ~khO0@G-lvg`yX`t
B?)(4%

literal 0
HcmV?d00001

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 2c3b70f5ed..beb0718987 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -30,7 +30,6 @@ configDir="/etc/taos"
 installDir="/usr/local/taos"
 adapterName="taosadapter"
 benchmarkName="taosBenchmark"
-tmqName="tmq_sim"
 dumpName="taosdump"
 demoName="taosdemo"
 
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index a3f4c35842..6103ce170c 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -60,7 +60,7 @@ if [ "$pagMode" == "lite" ]; then
   strip ${build_dir}/bin/${serverName}
   strip ${build_dir}/bin/${clientName}
   # lite version doesn't include taosadapter,  which will lead to no restful interface
-  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/taosBenchmark  ${build_dir}/bin/tmq_sim"
+  bin_files="${build_dir}/bin/${serverName} ${build_dir}/bin/${clientName} ${script_dir}/remove.sh ${script_dir}/startPre.sh ${build_dir}/bin/taosBenchmark "
   taostools_bin_files=""
 else
 
@@ -78,7 +78,6 @@ else
 
   taostools_bin_files=" ${build_dir}/bin/taosdump \
       ${build_dir}/bin/taosBenchmark \
-      ${build_dir}/bin/tmq_sim \
       ${build_dir}/bin/TDinsight.sh \
       $tdinsight_caches"
 
diff --git a/packaging/tools/taos.bat b/packaging/tools/taos.bat
new file mode 100644
index 0000000000..c3fe625e16
--- /dev/null
+++ b/packaging/tools/taos.bat
@@ -0,0 +1,6 @@
+@echo off
+cd C:\TDengine
+if not "%1" == "" (
+    %1 --help 
+    @cmd /k
+)
\ No newline at end of file
diff --git a/packaging/tools/tdengine.iss b/packaging/tools/tdengine.iss
new file mode 100644
index 0000000000..7310201815
--- /dev/null
+++ b/packaging/tools/tdengine.iss
@@ -0,0 +1,81 @@
+#define MyAppName "TDengine"
+#define MyAppPublisher "taosdata"
+#define MyAppURL "http://www.taosdata.com/"
+#define MyAppBeforeInstallTxt "windows_before_install.txt"
+#define MyAppIco "favicon.ico"
+#define MyAppInstallDir "C:\TDengine"
+#define MyAppOutputDir "./"
+#define MyAppSourceDir "C:\TDengine"
+;#define MyAppAllFile "\*"
+#define MyAppCfgName "\cfg\*"
+#define MyAppDriverName "\driver\*"
+#define MyAppConnectorName "\connector\*"
+#define MyAppExamplesName "\examples\*"
+#define MyAppIncludeName "\include\*"
+#define MyAppExeName "\*.exe"
+#define MyAppTaosExeName "\taos.bat"
+#define MyAppTaosdemoExeName "\taosBenchmark.exe"
+#define MyAppDLLName "\driver\taos.dll"
+;#define MyAppVersion "3.0"
+;#define MyAppInstallName "TDengine"
+
+[Setup]
+VersionInfoVersion={#MyAppVersion}
+AppId={{A0F7A93C-79C4-485D-B2B8-F0D03DF42FAB}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={#MyAppInstallDir}
+DefaultGroupName={#MyAppName}
+DisableProgramGroupPage=yes
+InfoBeforeFile={#MyAppBeforeInstallTxt}
+OutputDir={#MyAppOutputDir}
+OutputBaseFilename={#MyAppInstallName}
+SetupIconFile={#MyAppIco}
+Compression=lzma
+SolidCompression=yes
+DisableDirPage=yes
+Uninstallable=yes
+
+[Languages]
+Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
+;Name: "english"; MessagesFile: "compiler:Languages\English.isl"
+
+[Files]
+;Source: {#MyAppSourceDir}{#MyAppAllFile}; DestDir: "{app}"; Flags: igNoreversion recursesubdirs createallsubdirs 
+Source: taos.bat; DestDir: "{app}\include"; Flags: igNoreversion;
+;Source: taosdemo.png; DestDir: "{app}\include"; Flags: igNoreversion;
+;Source: taosShell.png; DestDir: "{app}\include"; Flags: igNoreversion;
+Source: favicon.ico; DestDir: "{app}\include"; Flags: igNoreversion;
+Source: {#MyAppSourceDir}{#MyAppDLLName}; DestDir: "{win}\System32"; Flags: igNoreversion;
+Source: {#MyAppSourceDir}{#MyAppCfgName}; DestDir: "{app}\cfg"; Flags: igNoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall
+Source: {#MyAppSourceDir}{#MyAppDriverName}; DestDir: "{app}\driver"; Flags: igNoreversion recursesubdirs createallsubdirs
+;Source: {#MyAppSourceDir}{#MyAppConnectorName}; DestDir: "{app}\connector"; Flags: igNoreversion recursesubdirs createallsubdirs
+;Source: {#MyAppSourceDir}{#MyAppExamplesName}; DestDir: "{app}\examples"; Flags: igNoreversion recursesubdirs createallsubdirs
+Source: {#MyAppSourceDir}{#MyAppIncludeName}; DestDir: "{app}\include"; Flags: igNoreversion recursesubdirs createallsubdirs
+Source: {#MyAppSourceDir}{#MyAppExeName}; DestDir: "{app}"; Excludes: {#MyAppExcludeSource} ; Flags: igNoreversion recursesubdirs createallsubdirs
+Source: {#MyAppSourceDir}{#MyAppTaosdemoExeName}; DestDir: "{app}"; Flags: igNoreversion recursesubdirs createallsubdirs
+
+[UninstallDelete]
+Name: {app}\driver; Type: filesandordirs 
+Name: {app}\connector; Type: filesandordirs
+Name: {app}\examples; Type: filesandordirs
+Name: {app}\include; Type: filesandordirs
+
+[Tasks]
+Name: "desktopicon";Description: "{cm:CreateDesktopIcon}"; GroupDescription:"{cm:AdditionalIcons}"; Flags: checkablealone
+
+[Icons]
+Name:"{group}\Taos Shell"; Filename: "{app}\include\{#MyAppTaosExeName}" ; Parameters: "taos.exe" ; IconFilename: "{app}\include\{#MyAppIco}" 
+Name:"{group}\Open TDengine Directory"; Filename: "{app}\" 
+Name:"{group}\Taosdemo"; Filename: "{app}\include\{#MyAppTaosExeName}" ; Parameters: "taosdemo.exe" ; IconFilename: "{app}\include\{#MyAppIco}" 
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" ; IconFilename: "{app}\include\{#MyAppIco}" 
+Name:"{commondesktop}\Taos Shell"; Filename: "{app}\include\{#MyAppTaosExeName}" ; Parameters: "taos.exe" ; Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\include\{#MyAppIco}" 
+
+
+[Messages]
+ConfirmUninstall=Do you really want to uninstall TDengine from your computer?%n%nPress [Y] to completely delete %1 and all its components;%nPress [N] to keep the software on your computer.
diff --git a/packaging/tools/windows_before_install.txt b/packaging/tools/windows_before_install.txt
new file mode 100644
index 0000000000..b793a3e801
--- /dev/null
+++ b/packaging/tools/windows_before_install.txt
@@ -0,0 +1,3 @@
+TDengine is a high-efficient, scalable, high-available distributed time-series database, which makes a lot of optimizations on inserting and querying data, which is far more efficient than normal regular databases. So TDengine can meet the high requirements of IOT and other areas on storing and querying a large amount of data. 
+
+TDengine will be installed under C:\TDengine, users can modify configuration file C:\TDengine\cfg\taos.cfg, set the log file path or other parameters.
\ No newline at end of file
diff --git a/source/os/src/osAtomic.c b/source/os/src/osAtomic.c
index d1d768fbcc..a65801df49 100644
--- a/source/os/src/osAtomic.c
+++ b/source/os/src/osAtomic.c
@@ -193,7 +193,13 @@ void* interlocked_sub_fetch_ptr(void* volatile* ptr, void* val) {
 }
 int32_t interlocked_fetch_sub_32(int32_t volatile* ptr, int32_t val) { return _InterlockedExchangeAdd(ptr, -val); }
 
-int64_t interlocked_fetch_sub_64(int64_t volatile* ptr, int64_t val) { return _InterlockedExchangeAdd64(ptr, -val); }
+int64_t interlocked_fetch_sub_64(int64_t volatile* ptr, int64_t val) { 
+#ifdef _TD_WINDOWS_32
+  return _InterlockedExchangeAdd((int32_t volatile*)ptr, -(int32_t)val); 
+#else
+  return _InterlockedExchangeAdd64(ptr, -val); 
+#endif
+}
 
 void* interlocked_fetch_sub_ptr(void* volatile* ptr, void* val) {
 #ifdef WINDOWS
@@ -375,8 +381,11 @@ int32_t atomic_exchange_32(int32_t volatile* ptr, int32_t val) {
 
 int64_t atomic_exchange_64(int64_t volatile* ptr, int64_t val) {
 #ifdef WINDOWS
+#ifdef _TD_WINDOWS_32
+  return _InterlockedExchange((int32_t volatile*)(ptr), (int32_t)(val));
+#else
   return _InterlockedExchange64((int64_t volatile*)(ptr), (int64_t)(val));
-#elif defined(_TD_NINGSI_60)
+#endif#elif defined(_TD_NINGSI_60)
   return atomic_exchange_64_impl((int64_t*)ptr, (int64_t)val);
 #else
   return __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST);
@@ -529,8 +538,11 @@ int32_t atomic_fetch_add_32(int32_t volatile* ptr, int32_t val) {
 
 int64_t atomic_fetch_add_64(int64_t volatile* ptr, int64_t val) {
 #ifdef WINDOWS
+#ifdef _TD_WINDOWS_32
+  return _InterlockedExchangeAdd((int32_t volatile*)(ptr), (int32_t)(val));
+#else
   return _InterlockedExchangeAdd64((int64_t volatile*)(ptr), (int64_t)(val));
-#elif defined(_TD_NINGSI_60)
+#endif#elif defined(_TD_NINGSI_60)
   return __sync_fetch_and_add((ptr), (val));
 #else
   return __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST);
@@ -631,7 +643,11 @@ int32_t atomic_fetch_sub_32(int32_t volatile* ptr, int32_t val) {
 
 int64_t atomic_fetch_sub_64(int64_t volatile* ptr, int64_t val) {
 #ifdef WINDOWS
+#ifdef _TD_WINDOWS_32
+  return _InterlockedExchangeAdd((int32_t volatile*)(ptr), -(int32_t)(val));
+#else
   return _InterlockedExchangeAdd64((int64_t volatile*)(ptr), -(int64_t)(val));
+#endif
 #elif defined(_TD_NINGSI_60)
   return __sync_fetch_and_sub((ptr), (val));
 #else
diff --git a/source/os/src/osString.c b/source/os/src/osString.c
index 26aafd743f..db3aaa49a6 100644
--- a/source/os/src/osString.c
+++ b/source/os/src/osString.c
@@ -48,7 +48,7 @@ char *strsep(char **stringp, const char *delim) {
   /* NOTREACHED */
 }
 /* Duplicate a string, up to at most size characters */
-char *strndup(const char *s, size_t size) {
+char *strndup(const char *s, int size) {
   size_t l;
   char * s2;
   l = strlen(s);
@@ -62,7 +62,7 @@ char *strndup(const char *s, size_t size) {
 }
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the terminating '\0' in DEST, if any, or else DEST + N.  */
-char *stpncpy(char *dest, const char *src, size_t n) {
+char *stpncpy(char *dest, const char *src, int n) {
   size_t size = strnlen(src, n);
   memcpy(dest, src, size);
   dest += size;