[SERVMAN]

* Use StringCchCopy instead of {_t,w}cscpy_s as these shouldn't be exported.
CORE-8174

svn path=/trunk/; revision=63458

diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h
index 4a63984..73ec615 100644 (file)
--- a/reactos/base/applications/mscutils/servman/precomp.h
+++ b/reactos/base/applications/mscutils/servman/precomp.h
@@ -14,6 +14,7 @@
 #include <wincon.h>
 #include <tchar.h>
 #include <shlobj.h>
+#include <strsafe.h>
 
 #include "resource.h"
 

diff --git a/reactos/base/applications/mscutils/servman/propsheet_depends.c b/reactos/base/applications/mscutils/servman/propsheet_depends.c
index 01ebd0d..52afc51 100644 (file)
--- a/reactos/base/applications/mscutils/servman/propsheet_depends.c
+++ b/reactos/base/applications/mscutils/servman/propsheet_depends.c
@@ -60,7 +60,7 @@ AddItemToTreeView(HWND hTreeView,
                                    dwSize * sizeof(TCHAR));
         if (lpName)
         {
-            _tcscpy_s(lpName, dwSize, lpServiceName);
+            StringCchCopy(lpName, dwSize, lpServiceName);
             tvi.lParam = (LPARAM)lpName;
         }
     }

diff --git a/reactos/base/applications/mscutils/servman/query.c b/reactos/base/applications/mscutils/servman/query.c
index 69f0343..14a68e5 100644 (file)
--- a/reactos/base/applications/mscutils/servman/query.c
+++ b/reactos/base/applications/mscutils/servman/query.c
@@ -183,9 +183,9 @@ GetServiceDescription(LPTSTR lpServiceName)
                                                   dwSize * sizeof(TCHAR));
                         if (lpDescription)
                         {
-                            _tcscpy_s(lpDescription,
-                                      dwSize,
-                                      pServiceDescription->lpDescription);
+                            StringCchCopy(lpDescription,
+                                          dwSize,
+                                          pServiceDescription->lpDescription);
                         }
                     }
                 }

diff --git a/reactos/base/applications/mscutils/servman/stop_dependencies.c b/reactos/base/applications/mscutils/servman/stop_dependencies.c
index 5ef2276..559002c 100644 (file)
--- a/reactos/base/applications/mscutils/servman/stop_dependencies.c
+++ b/reactos/base/applications/mscutils/servman/stop_dependencies.c
@@ -32,9 +32,9 @@ AddServiceToList(LPWSTR *lpServiceList,
         if (lpNewList)
         {
             /* Copy the service name */
-            wcscpy_s(lpNewList,
-                     dwToAddSize,
-                     lpServiceToAdd);
+            StringCchCopy(lpNewList,
+                          dwToAddSize,
+                          lpServiceToAdd);
 
             /* Add the double null char */
             lpNewList[dwToAddSize - 1] = L'\0';
@@ -68,9 +68,9 @@ AddServiceToList(LPWSTR *lpServiceList,
         if (lpNewList)
         {
             /* Copy the service name */
-            wcscpy_s(&lpNewList[dwCurSize - 1],
-                     dwToAddSize,
-                     lpServiceToAdd);
+            StringCchCopy(&lpNewList[dwCurSize - 1],
+                          dwToAddSize,
+                          lpServiceToAdd);
 
             /* Add the double null char */
             lpNewList[dwCurSize + dwToAddSize - 1] = L'\0';