From 50b66eff74f15c8f6a978688cf78039a43e677d8 Mon Sep 17 00:00:00 2001
From: Minh141120 <minh.itptit@gmail.com>
Date: Tue, 23 Sep 2025 13:01:09 +0700
Subject: [PATCH] chore: update hooks to install vcredist.exe and update path
 for dll and license file

---
 src-tauri/tauri.windows.conf.json |  4 +-
 src-tauri/windows/hooks.nsh       | 79 ++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
index 12945ffed..664053705 100644
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@@ -1,8 +1,8 @@
 {
   "bundle": {
     "targets": ["nsis"],
-    "resources": ["resources/pre-install/**/*"],
-    "externalBin": ["resources/bin/bun", "resources/bin/uv", "resources/lib/vulkan-1.dll", "resources/LICENSE"],
+    "resources": ["resources/pre-install/**/*", "resources/lib/vulkan-1.dll", "resources/LICENSE"],
+    "externalBin": ["resources/bin/bun", "resources/bin/uv"],
     "windows": {
       "nsis": {
         "installerHooks": "./windows/hooks.nsh",
diff --git a/src-tauri/windows/hooks.nsh b/src-tauri/windows/hooks.nsh
index a4801f040..60aec1c80 100644
--- a/src-tauri/windows/hooks.nsh
+++ b/src-tauri/windows/hooks.nsh
@@ -1,30 +1,65 @@
 !macro NSIS_HOOK_POSTINSTALL
-  ; Check if Visual C++ 2019 Redistributable is installed (via Windows Registry)
-  ReadRegDWord $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
-
-  ${If} $0 == 1
-    DetailPrint "Visual C++ Redistributable already installed"
-    Goto vcredist_done
+  ; Check if Visual C++ Redistributable is already installed
+  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version"
+  ${If} $0 == ""
+    ; Try alternative registry location
+    ReadRegStr $0 HKLM "SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version"
   ${EndIf}
 
-  ; Install from bundled MSI if not installed
-  ${If} ${FileExists} "$INSTDIR\resources\vc_redist.x64.msi"
-    DetailPrint "Installing Visual C++ Redistributable..."
-    ; Copy to TEMP folder and then execute installer
-    CopyFiles "$INSTDIR\resources\vc_redist.x64.msi" "$TEMP\vc_redist.x64.msi"
-    ExecWait 'msiexec /i "$TEMP\vc_redist.x64.msi" /passive /norestart' $0
-
-    ; Check wether installation process exited successfully (code 0) or not
-    ${If} $0 == 0
-      DetailPrint "Visual C++ Redistributable installed successfully"
+  ${If} $0 == ""
+    ; VC++ Redistributable not found, need to install
+    DetailPrint "Visual C++ Redistributable not found, downloading and installing..."
+    
+    ; Download VC++ Redistributable
+    Delete "$TEMP\vc_redist.x64.exe"
+    DetailPrint "Downloading Visual C++ Redistributable..."
+    NSISdl::download "https://aka.ms/vs/17/release/vc_redist.x64.exe" "$TEMP\vc_redist.x64.exe"
+    Pop $1
+    
+    ${If} $1 == "success"
+      DetailPrint "Visual C++ Redistributable download successful"
+      
+      ; Install VC++ Redistributable silently
+      DetailPrint "Installing Visual C++ Redistributable..."
+      ExecWait '"$TEMP\vc_redist.x64.exe" /quiet /norestart' $2
+      
+      ${If} $2 == 0
+        DetailPrint "Visual C++ Redistributable installed successfully"
+      ${ElseIf} $2 == 1638
+        DetailPrint "Visual C++ Redistributable already installed (newer version)"
+      ${ElseIf} $2 == 3010
+        DetailPrint "Visual C++ Redistributable installed successfully (restart required)"
+      ${Else}
+        DetailPrint "Visual C++ installation failed with exit code: $2"
+        MessageBox MB_ICONEXCLAMATION "Visual C++ installation failed. Some features may not work."
+      ${EndIf}
+      
+      ; Clean up downloaded file
+      Delete "$TEMP\vc_redist.x64.exe"
     ${Else}
-      MessageBox MB_ICONEXCLAMATION "Visual C++ installation failed. Some features may not work."
+      DetailPrint "Failed to download Visual C++ Redistributable: $1"
+      MessageBox MB_ICONEXCLAMATION "Failed to download Visual C++ Redistributable. Some features may not work."
     ${EndIf}
-
-    ; Clean up setup files from TEMP and your installed app
-    Delete "$TEMP\vc_redist.x64.msi"
-    Delete "$INSTDIR\resources\vc_redist.x64.msi"
+  ${Else}
+    DetailPrint "Visual C++ Redistributable already installed (version: $0)"
   ${EndIf}
 
-  vcredist_done:
+  ; ---- Copy LICENSE to install root ----
+  ${If} ${FileExists} "$INSTDIR\resources\LICENSE"
+    CopyFiles /SILENT "$INSTDIR\resources\LICENSE" "$INSTDIR\LICENSE"
+    DetailPrint "Copied LICENSE to install root"
+  ${EndIf}
+
+  ; ---- Copy vulkan-1.dll to install root ----
+  ${If} ${FileExists} "$INSTDIR\resources\lib\vulkan-1.dll"
+    CopyFiles /SILENT "$INSTDIR\resources\lib\vulkan-1.dll" "$INSTDIR\vulkan-1.dll"
+    DetailPrint "Copied vulkan-1.dll to install root"
+    
+    ; Optional cleanup - remove from resources folder
+    Delete "$INSTDIR\resources\lib\vulkan-1.dll"
+    ; Only remove the lib directory if it's empty
+    RMDir "$INSTDIR\resources\lib"
+  ${Else}
+    DetailPrint "vulkan-1.dll not found at expected location: $INSTDIR\resources\lib\vulkan-1.dll"
+  ${EndIf}
 !macroend
\ No newline at end of file