From 745cf0f6e1f549e021f752e1438ae8bd0d63a605 Mon Sep 17 00:00:00 2001
From: Chenxi Han <chehan@qti.qualcomm.com>
Date: Mon, 15 Jun 2026 15:38:26 -0700
Subject: [PATCH] qdinstall: replace deprecated win32 API

Signed-off-by: Chenxi Han <chehan@qti.qualcomm.com>
---
 src/windows/tools/qdinstall/main.cpp          |  2 +-
 src/windows/tools/qdinstall/main.h            |  2 +-
 src/windows/tools/qdinstall/qdinstall.vcxproj | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/windows/tools/qdinstall/main.cpp b/src/windows/tools/qdinstall/main.cpp
index a2bb70e..58ee23d 100644
--- a/src/windows/tools/qdinstall/main.cpp
+++ b/src/windows/tools/qdinstall/main.cpp
@@ -143,7 +143,7 @@ static std::wstring get_exe_directory()
 {
     WCHAR path[MAX_PATH];
     GetModuleFileNameW(NULL, path, MAX_PATH);
-    PathRemoveFileSpecW(path);
+    PathCchRemoveFileSpec(path, MAX_PATH);
     return path[0] ? std::wstring(path) : std::wstring(L".");
 }
 
diff --git a/src/windows/tools/qdinstall/main.h b/src/windows/tools/qdinstall/main.h
index 6636022..56a362a 100644
--- a/src/windows/tools/qdinstall/main.h
+++ b/src/windows/tools/qdinstall/main.h
@@ -5,8 +5,8 @@
 
 #include <windows.h>
 #include <cfgmgr32.h>
+#include <pathcch.h>
 #include <string>
-#include <shlwapi.h>
 
 struct Options
 {
diff --git a/src/windows/tools/qdinstall/qdinstall.vcxproj b/src/windows/tools/qdinstall/qdinstall.vcxproj
index df00f64..747ecc7 100644
--- a/src/windows/tools/qdinstall/qdinstall.vcxproj
+++ b/src/windows/tools/qdinstall/qdinstall.vcxproj
@@ -125,7 +125,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -142,7 +142,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -155,7 +155,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -168,7 +168,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -185,7 +185,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -202,7 +202,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cfgmgr32.lib;advapi32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>