Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-29 07:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DOSKEY]

Browse source 
- Fix compilation with msvc by GetProcAddress'ing undocumented functions
  - TCHAR -> WCHAR in the process

svn path=/trunk/; revision=48942
This commit is contained in:
Jérôme Gardou 2010-09-30 18:45:58 +00:00
parent efefc97901
commit ffeeddd5ee
2 changed files with 99 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
reactos/base/applications/cmdutils/doskey/doskey.c
View file

@ -1,11 +1,23 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <tchar.h> #include <wchar.h>
#include <assert.h>
#include "doskey.h" #include "doskey.h"
#define MAX_STRING 2000 #define MAX_STRING 2000
TCHAR szStringBuf[MAX_STRING]; WCHAR szStringBuf[MAX_STRING];
LPTSTR pszExeName = _T("cmd.exe"); LPWSTR pszExeName = L"cmd.exe";
/* Function pointers */
typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName);
typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName);
typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName);
typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName);
GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW;
GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW;
SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW;
ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW;
static VOID SetInsert(DWORD dwFlag) static VOID SetInsert(DWORD dwFlag)
{ {
@ -18,79 +30,74 @@ static VOID SetInsert(DWORD dwFlag)
static VOID PrintHistory(VOID) static VOID PrintHistory(VOID)
{ {
DWORD Length = GetConsoleCommandHistoryLength(pszExeName); DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName);
DWORD BufferLength;
PBYTE HistBuf; PBYTE HistBuf;
TCHAR *Hist; WCHAR *Hist;
TCHAR *HistEnd; WCHAR *HistEnd;
/* On Windows, the ANSI version of GetConsoleCommandHistory requires
* a buffer twice as large as the actual history length. */
BufferLength = Length * (sizeof(WCHAR) / sizeof(TCHAR)) * sizeof(BYTE);
HistBuf = HeapAlloc(GetProcessHeap(), HistBuf = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
BufferLength); Length);
if (!HistBuf) return; if (!HistBuf) return;
Hist = (TCHAR *)HistBuf; Hist = (WCHAR *)HistBuf;
HistEnd = (TCHAR *)&HistBuf[Length]; HistEnd = (WCHAR *)&HistBuf[Length];
if (GetConsoleCommandHistory(Hist, BufferLength, pszExeName)) if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName))
for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) for (; Hist < HistEnd; Hist += wcslen(Hist) + 1)
_tprintf(_T("%s\n"), Hist); wprintf(L"%s\n", Hist);
HeapFree(GetProcessHeap(), 0, HistBuf); HeapFree(GetProcessHeap(), 0, HistBuf);
} }
static INT SetMacro(LPTSTR definition) static INT SetMacro(LPWSTR definition)
{ {
TCHAR *name, *nameend, *text, temp; WCHAR *name, *nameend, *text, temp;
name = definition; name = definition;
while (*name == _T(' ')) while (*name == L' ')
name++; name++;
/* error if no '=' found */ /* error if no '=' found */
if ((nameend = _tcschr(name, _T('='))) != NULL) if ((nameend = wcschr(name, L'=')) != NULL)
{ {
text = nameend + 1; text = nameend + 1;
while (*text == _T(' ')) while (*text == L' ')
text++; text++;
while (nameend > name && nameend[-1] == _T(' ')) while (nameend > name && nameend[-1] == L' ')
nameend--; nameend--;
/* Split rest into name and substitute */ /* Split rest into name and substitute */
temp = *nameend; temp = *nameend;
*nameend = _T('\0'); *nameend = L'\0';
/* Don't allow spaces in the name, since such a macro would be unusable */ /* Don't allow spaces in the name, since such a macro would be unusable */
if (!_tcschr(name, _T(' ')) && AddConsoleAlias(name, text, pszExeName)) if (!wcschr(name, L' ') && AddConsoleAlias(name, text, pszExeName))
return 0; return 0;
*nameend = temp; *nameend = temp;
} }
LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING); LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING);
_tprintf(szStringBuf, definition); wprintf(szStringBuf, definition);
return 1; return 1;
} }
static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent)
{ {
DWORD Length = GetConsoleAliasesLength(pszExeName); DWORD Length = GetConsoleAliasesLength(pszExeName);
PBYTE AliasBuf; PBYTE AliasBuf;
TCHAR *Alias; WCHAR *Alias;
TCHAR *AliasEnd; WCHAR *AliasEnd;
AliasBuf = HeapAlloc(GetProcessHeap(), AliasBuf = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
Length * sizeof(BYTE)); Length * sizeof(BYTE));
if (!AliasBuf) return; if (!AliasBuf) return;
Alias = (TCHAR *)AliasBuf; Alias = (WCHAR *)AliasBuf;
AliasEnd = (TCHAR *)&AliasBuf[Length]; AliasEnd = (WCHAR *)&AliasBuf[Length];
if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName)) if (GetConsoleAliases(Alias, Length * sizeof(BYTE), pszExeName))
for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1)
_tprintf(_T("%s%s\n"), Indent, Alias); wprintf(L"%s%s\n", Indent, Alias);
HeapFree(GetProcessHeap(), 0, AliasBuf); HeapFree(GetProcessHeap(), 0, AliasBuf);
} }
@ -99,51 +106,47 @@ static VOID PrintAllMacros(VOID)
{ {
DWORD Length = GetConsoleAliasExesLength(); DWORD Length = GetConsoleAliasExesLength();
PBYTE ExeNameBuf; PBYTE ExeNameBuf;
TCHAR *ExeName; WCHAR *ExeName;
TCHAR *ExeNameEnd; WCHAR *ExeNameEnd;
ExeNameBuf = HeapAlloc(GetProcessHeap(), ExeNameBuf = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
Length * sizeof(BYTE)); Length * sizeof(BYTE));
if (!ExeNameBuf) return; if (!ExeNameBuf) return;
ExeName = (TCHAR *)ExeNameBuf; ExeName = (WCHAR *)ExeNameBuf;
ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; ExeNameEnd = (WCHAR *)&ExeNameBuf[Length];
if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE))) if (GetConsoleAliasExes(ExeName, Length * sizeof(BYTE)))
{ {
for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) for (; ExeName < ExeNameEnd; ExeName += wcslen(ExeName) + 1)
{ {
_tprintf(_T("[%s]\n"), ExeName); wprintf(L"[%s]\n", ExeName);
PrintMacros(ExeName, _T(" ")); PrintMacros(ExeName, L" ");
_tprintf(_T("\n")); wprintf(L"\n");
} }
} }
HeapFree(GetProcessHeap(), 0, ExeNameBuf); HeapFree(GetProcessHeap(), 0, ExeNameBuf);
} }
static VOID ReadFromFile(LPTSTR param) static VOID ReadFromFile(LPWSTR param)
{ {
FILE* fp; FILE* fp;
TCHAR line[MAX_PATH]; WCHAR line[MAX_PATH];
fp = _tfopen(param, _T("r")); fp = _wfopen(param, L"r");
if (!fp) if (!fp)
{ {
#ifdef UNICODE
_wperror(param); _wperror(param);
#else
perror(param);
#endif
return; return;
} }
while ( _fgetts(line, MAX_PATH, fp) != NULL) while ( fgetws(line, MAX_PATH, fp) != NULL)
{ {
/* Remove newline character */ /* Remove newline character */
TCHAR *end = &line[_tcslen(line) - 1]; WCHAR *end = &line[wcslen(line) - 1];
if (*end == _T('\n')) if (*end == L'\n')
*end = _T('\0'); *end = L'\0';
if (*line) if (*line)
SetMacro(line); SetMacro(line);
@ -154,43 +157,53 @@ static VOID ReadFromFile(LPTSTR param)
} }
/* Get the start and end of the next command-line argument. */ /* Get the start and end of the next command-line argument. */
static BOOL GetArg(TCHAR **pStart, TCHAR **pEnd) static BOOL GetArg(WCHAR **pStart, WCHAR **pEnd)
{ {
BOOL bInQuotes = FALSE; BOOL bInQuotes = FALSE;
TCHAR *p = *pEnd; WCHAR *p = *pEnd;
p += _tcsspn(p, _T(" \t")); p += wcsspn(p, L" \t");
if (!*p) if (!*p)
return FALSE; return FALSE;
*pStart = p; *pStart = p;
do do
{ {
if (!bInQuotes && (*p == _T(' ') || *p == _T('\t'))) if (!bInQuotes && (*p == L' ' || *p == L'\t'))
break; break;
bInQuotes ^= (*p++ == _T('"')); bInQuotes ^= (*p++ == L'"');
} while (*p); } while (*p);
*pEnd = p; *pEnd = p;
return TRUE; return TRUE;
} }
/* Remove starting and ending quotes from a string, if present */ /* Remove starting and ending quotes from a string, if present */
static LPTSTR RemoveQuotes(LPTSTR str) static LPWSTR RemoveQuotes(LPWSTR str)
{ {
TCHAR *end; WCHAR *end;
if (*str == _T('"') && *(end = str + _tcslen(str) - 1) == _T('"')) if (*str == L'"' && *(end = str + wcslen(str) - 1) == L'"')
{ {
str++; str++;
*end = _T('\0'); *end = L'\0';
} }
return str; return str;
} }
int int
_tmain(VOID) wmain(VOID)
{ {
/* Get the full command line using GetCommandLine(). We can't just use argv, /* 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. */ * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */
TCHAR *pArgStart; WCHAR *pArgStart;
TCHAR *pArgEnd = GetCommandLine(); WCHAR *pArgEnd = GetCommandLine();
HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll");
/* Get function pointers */
pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW");
pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryLengthW");
pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32, "SetConsoleNumberOfCommandsW");
pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW");
assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW &&
pSetConsoleNumberOfCommandsW && pSetConsoleNumberOfCommandsW);
/* Skip the application name */ /* Skip the application name */
GetArg(&pArgStart, &pArgEnd); GetArg(&pArgStart, &pArgEnd);
@ -198,55 +211,55 @@ _tmain(VOID)
while (GetArg(&pArgStart, &pArgEnd)) while (GetArg(&pArgStart, &pArgEnd))
{ {
/* NUL-terminate this argument to make processing easier */ /* NUL-terminate this argument to make processing easier */
TCHAR tmp = *pArgEnd; WCHAR tmp = *pArgEnd;
*pArgEnd = _T('\0'); *pArgEnd = L'\0';
if (!_tcscmp(pArgStart, _T("/?"))) if (!wcscmp(pArgStart, L"/?"))
{ {
LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING); LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING);
_tprintf(szStringBuf); wprintf(szStringBuf);
break; break;
} }
else if (!_tcsnicmp(pArgStart, _T("/EXENAME="), 9)) else if (!_wcsnicmp(pArgStart, L"/EXENAME=", 9))
{ {
pszExeName = RemoveQuotes(pArgStart + 9); pszExeName = RemoveQuotes(pArgStart + 9);
} }
else if (!_tcsicmp(pArgStart, _T("/H")) || else if (!wcsicmp(pArgStart, L"/H") ||
!_tcsicmp(pArgStart, _T("/HISTORY"))) !wcsicmp(pArgStart, L"/HISTORY"))
{ {
PrintHistory(); PrintHistory();
} }
else if (!_tcsnicmp(pArgStart, _T("/LISTSIZE="), 10)) else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10))
{ {
SetConsoleNumberOfCommands(_ttoi(pArgStart + 10), pszExeName); pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName);
} }
else if (!_tcsicmp(pArgStart, _T("/REINSTALL"))) else if (!wcsicmp(pArgStart, L"/REINSTALL"))
{ {
ExpungeConsoleCommandHistory(pszExeName); pExpungeConsoleCommandHistoryW(pszExeName);
} }
else if (!_tcsicmp(pArgStart, _T("/INSERT"))) else if (!wcsicmp(pArgStart, L"/INSERT"))
{ {
SetInsert(ENABLE_INSERT_MODE); SetInsert(ENABLE_INSERT_MODE);
} }
else if (!_tcsicmp(pArgStart, _T("/OVERSTRIKE"))) else if (!wcsicmp(pArgStart, L"/OVERSTRIKE"))
{ {
SetInsert(0); SetInsert(0);
} }
else if (!_tcsicmp(pArgStart, _T("/M")) || else if (!wcsicmp(pArgStart, L"/M") ||
!_tcsicmp(pArgStart, _T("/MACROS"))) !wcsicmp(pArgStart, L"/MACROS"))
{ {
PrintMacros(pszExeName, _T("")); PrintMacros(pszExeName, L"");
} }
else if (!_tcsnicmp(pArgStart, _T("/M:"), 3) || else if (!_wcsnicmp(pArgStart, L"/M:", 3) ||
!_tcsnicmp(pArgStart, _T("/MACROS:"), 8)) !_wcsnicmp(pArgStart, L"/MACROS:", 8))
{ {
LPTSTR exe = RemoveQuotes(_tcschr(pArgStart, _T(':')) + 1); LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1);
if (!_tcsicmp(exe, _T("ALL"))) if (!wcsicmp(exe, L"ALL"))
PrintAllMacros(); PrintAllMacros();
else else
PrintMacros(exe, _T("")); PrintMacros(exe, L"");
} }
else if (!_tcsnicmp(pArgStart, _T("/MACROFILE="), 11)) else if (!_wcsnicmp(pArgStart, L"/MACROFILE=", 11))
{ {
ReadFromFile(RemoveQuotes(pArgStart + 11)); ReadFromFile(RemoveQuotes(pArgStart + 11));
} }

20
reactos/base/applications/cmdutils/doskey/doskey.h
View file

@ -23,11 +23,6 @@ BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR);
BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR);
#define AddConsoleAlias TNAME(AddConsoleAlias) #define AddConsoleAlias TNAME(AddConsoleAlias)
#endif #endif
#ifndef ExpungeConsoleCommandHistory
BOOL WINAPI ExpungeConsoleCommandHistoryA(LPSTR);
BOOL WINAPI ExpungeConsoleCommandHistoryW(LPWSTR);
#define ExpungeConsoleCommandHistory TNAME(ExpungeConsoleCommandHistory)
#endif
#ifndef GetConsoleAliases #ifndef GetConsoleAliases
DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR);
DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR);
@ -48,20 +43,5 @@ DWORD WINAPI GetConsoleAliasExesLengthA(VOID);
DWORD WINAPI GetConsoleAliasExesLengthW(VOID); DWORD WINAPI GetConsoleAliasExesLengthW(VOID);
#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) #define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength)
#endif #endif
#ifndef GetConsoleCommandHistory
DWORD WINAPI GetConsoleCommandHistoryA(LPSTR, DWORD, LPSTR);
DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR, DWORD, LPWSTR);
#define GetConsoleCommandHistory TNAME(GetConsoleCommandHistory)
#endif
#ifndef GetConsoleCommandHistoryLength
DWORD WINAPI GetConsoleCommandHistoryLengthA(LPSTR);
DWORD WINAPI GetConsoleCommandHistoryLengthW(LPWSTR);
#define GetConsoleCommandHistoryLength TNAME(GetConsoleCommandHistoryLength)
#endif
#ifndef SetConsoleNumberOfCommands
BOOL WINAPI SetConsoleNumberOfCommandsA(DWORD, LPSTR);
BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD, LPWSTR);
#define SetConsoleNumberOfCommands TNAME(SetConsoleNumberOfCommands)
#endif
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */