From 96eb96dfb613e4c745db6bd1f53a92fe7e2290fc Mon Sep 17 00:00:00 2001
From: karlf <karlf@microsoft.com>
Date: Thu, 11 Aug 2016 13:28:13 -0700
Subject: Updated for "Windows 10 Anniversary Update" (Version 1607)

---
 setup/devcon/cmds.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'setup/devcon/cmds.cpp')

diff --git a/setup/devcon/cmds.cpp b/setup/devcon/cmds.cpp
index 590decdd..3d845589 100644
--- a/setup/devcon/cmds.cpp
+++ b/setup/devcon/cmds.cpp
@@ -1327,7 +1327,7 @@ Return Value:
         &DeviceInfoData,
         SPDRP_HARDWAREID,
         (LPBYTE)hwIdList,
-        (lstrlen(hwIdList)+1+1)*sizeof(TCHAR)))
+        ((DWORD)_tcslen(hwIdList)+1+1)*sizeof(TCHAR)))
     {
         goto final;
     }
@@ -1863,7 +1863,7 @@ Return Value:
             LPTSTR multiSz = multiVal[-1];
             LPTSTR p = multiSz;
             while(*p) {
-                p+=lstrlen(p)+1;
+                p+=_tcslen(p)+1;
             }
             p++; // skip past null
             len = (p-multiSz)*sizeof(TCHAR);
@@ -2054,7 +2054,7 @@ Return Value:
             LPTSTR multiSz = hwlist[-1];
             LPTSTR p = multiSz;
             while(*p) {
-                p+=lstrlen(p)+1;
+                p+=_tcslen(p)+1;
             }
             p++; // skip past final null
             len = (p-multiSz)*sizeof(TCHAR);
-- 
cgit v1.3.1