dll,launcher: invariant string comparisons

This commit is contained in:
Bill Zissimopoulos
2016-12-09 14:23:53 -08:00
parent 228f9e2708
commit 3a65ce332b
5 changed files with 49 additions and 18 deletions

View File

@@ -227,7 +227,7 @@ int wmain(int argc, wchar_t **argv)
if (0 == argc)
usage();
if (0 == lstrcmpW(L"start", argv[0]))
if (0 == invariant_wcscmp(L"start", argv[0]))
{
if (3 > argc || argc > 12)
usage();
@@ -236,7 +236,7 @@ int wmain(int argc, wchar_t **argv)
FALSE);
}
else
if (0 == lstrcmpW(L"startWithSecret", argv[0]))
if (0 == invariant_wcscmp(L"startWithSecret", argv[0]))
{
if (4 > argc || argc > 13)
usage();
@@ -245,7 +245,7 @@ int wmain(int argc, wchar_t **argv)
TRUE);
}
else
if (0 == lstrcmpW(L"stop", argv[0]))
if (0 == invariant_wcscmp(L"stop", argv[0]))
{
if (3 != argc)
usage();
@@ -253,7 +253,7 @@ int wmain(int argc, wchar_t **argv)
return stop(PipeBuf, LAUNCHER_PIPE_BUFFER_SIZE, argv[1], argv[2]);
}
else
if (0 == lstrcmpW(L"info", argv[0]))
if (0 == invariant_wcscmp(L"info", argv[0]))
{
if (3 != argc)
usage();
@@ -261,7 +261,7 @@ int wmain(int argc, wchar_t **argv)
return getinfo(PipeBuf, LAUNCHER_PIPE_BUFFER_SIZE, argv[1], argv[2]);
}
else
if (0 == lstrcmpW(L"list", argv[0]))
if (0 == invariant_wcscmp(L"list", argv[0]))
{
if (1 != argc)
usage();
@@ -269,7 +269,7 @@ int wmain(int argc, wchar_t **argv)
return list(PipeBuf, LAUNCHER_PIPE_BUFFER_SIZE);
}
else
if (0 == lstrcmpW(L"quit", argv[0]))
if (0 == invariant_wcscmp(L"quit", argv[0]))
{
if (1 != argc)
usage();

View File

@@ -157,8 +157,8 @@ static SVC_INSTANCE *SvcInstanceLookup(PWSTR ClassName, PWSTR InstanceName)
{
SvcInstance = CONTAINING_RECORD(ListEntry, SVC_INSTANCE, ListEntry);
if (0 == lstrcmpiW(ClassName, SvcInstance->ClassName) &&
0 == lstrcmpiW(InstanceName, SvcInstance->InstanceName))
if (0 == invariant_wcsicmp(ClassName, SvcInstance->ClassName) &&
0 == invariant_wcsicmp(InstanceName, SvcInstance->InstanceName))
return SvcInstance;
}