Author: akhaldi
Date: Mon May 26 09:53:49 2014
New Revision: 63458
URL:
http://svn.reactos.org/svn/reactos?rev=63458&view=rev
Log:
[SERVMAN]
* Use StringCchCopy instead of {_t,w}cscpy_s as these shouldn't be exported.
CORE-8174
Modified:
trunk/reactos/base/applications/mscutils/servman/precomp.h
trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
trunk/reactos/base/applications/mscutils/servman/query.c
trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c
Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Mon May 26
09:53:49 2014
@@ -14,6 +14,7 @@
#include <wincon.h>
#include <tchar.h>
#include <shlobj.h>
+#include <strsafe.h>
#include "resource.h"
Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Mon
May 26 09:53:49 2014
@@ -60,7 +60,7 @@
dwSize * sizeof(TCHAR));
if (lpName)
{
- _tcscpy_s(lpName, dwSize, lpServiceName);
+ StringCchCopy(lpName, dwSize, lpServiceName);
tvi.lParam = (LPARAM)lpName;
}
}
Modified: trunk/reactos/base/applications/mscutils/servman/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Mon May 26
09:53:49 2014
@@ -183,9 +183,9 @@
dwSize * sizeof(TCHAR));
if (lpDescription)
{
- _tcscpy_s(lpDescription,
- dwSize,
- pServiceDescription->lpDescription);
+ StringCchCopy(lpDescription,
+ dwSize,
+ pServiceDescription->lpDescription);
}
}
}
Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Mon
May 26 09:53:49 2014
@@ -32,9 +32,9 @@
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 @@
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';