temp = *nameend;
*nameend = L'\0';
/* Don't allow spaces in the name, since such a macro would be unusable */
- if (!wcschr(name, L' ') && AddConsoleAlias(name, text, pszExeName))
+ if (!wcschr(name, L' ') && AddConsoleAliasW(name, text, pszExeName))
return 0;
*nameend = temp;
}
- LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
+ LoadStringW(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
wprintf(szStringBuf, definition);
return 1;
}
static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent)
{
- DWORD Length = GetConsoleAliasesLength(pszExeName);
+ DWORD Length = GetConsoleAliasesLengthW(pszExeName);
PBYTE AliasBuf;
WCHAR *Alias;
WCHAR *AliasEnd;
Alias = (WCHAR *)AliasBuf;
AliasEnd = (WCHAR *)&AliasBuf[Length];
- if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName))
+ if (GetConsoleAliasesW(Alias, Length * sizeof(BYTE), pszExeName))
for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1)
wprintf(L"%s%s\n", Indent, Alias);
ExeName = (WCHAR *)ExeNameBuf;
ExeNameEnd = (WCHAR *)&ExeNameBuf[Length];
- if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE)))
+ if (GetConsoleAliasExesW(ExeName, Length * sizeof(BYTE)))
{
for (; ExeName < ExeNameEnd; ExeName += wcslen(ExeName) + 1)
{
/* Get the full command line using GetCommandLine(). We can't just use argv,
* because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */
- pArgEnd = GetCommandLine();
+ pArgEnd = GetCommandLineW();
hKernel32 = LoadLibraryW(L"kernel32.dll");
/* Get function pointers */
if (!wcscmp(pArgStart, L"/?"))
{
- LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
+ LoadStringW(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
wprintf(szStringBuf);
break;
}