Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove warnings

Browse source 
svn path=/trunk/; revision=17578
This commit is contained in:
Hervé Poussineau 2005-08-28 09:04:39 +00:00
parent 84b33992c6
commit d8fe2ffd8e
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rosapps/sysutils/ctm/ctm.c
View file

@ -7,7 +7,7 @@
Most of the code dealing with getting system parameters is taken from Most of the code dealing with getting system parameters is taken from
ReactOS Task Manager written by Brian Palmer (brianp@reactos.org) ReactOS Task Manager written by Brian Palmer (brianp@reactos.org)
Localization features added by Hervé Poussineau (hpoussineau@fr.st) Localization features added by Hervé Poussineau (hpoussin@reactos.org)
History: History:
24 October 2004 - added localization features 24 October 2004 - added localization features
@ -138,10 +138,9 @@ void DisplayScreen()
{ {
COORD pos; COORD pos;
TCHAR lpStr[80]; TCHAR lpStr[80];
int posStr;
DWORD numChars; DWORD numChars;
int lines; int lines;
int idx, i; int idx;
if (first == 0) if (first == 0)
{ {
@ -170,14 +169,13 @@ void DisplayScreen()
first = 1; first = 1;
} }
// Processess // Processess
lines = ProcessCount; lines = ProcessCount;
if (lines > MAX_PROC) if (lines > MAX_PROC)
lines = MAX_PROC; lines = MAX_PROC;
for (idx=0; idx<MAX_PROC; idx++) for (idx=0; idx<MAX_PROC; idx++)
{ {
int len, i; int len, i;
TCHAR imgName[MAX_PATH];
TCHAR lpPid[8]; TCHAR lpPid[8];
TCHAR lpCpu[6]; TCHAR lpCpu[6];
TCHAR lpMemUsg[12]; TCHAR lpMemUsg[12];
@ -351,14 +349,15 @@ void PerfDataRefresh()
LONG status; LONG status;
ULONG ulSize; ULONG ulSize;
LPBYTE pBuffer; LPBYTE pBuffer;
ULONG BufferSize;
ULONG Idx, Idx2; ULONG Idx, Idx2;
HANDLE hProcess;
HANDLE hProcessToken;
PSYSTEM_PROCESS_INFORMATION pSPI; PSYSTEM_PROCESS_INFORMATION pSPI;
PPERFDATA pPDOld; PPERFDATA pPDOld;
#ifdef EXTRA_INFO
HANDLE hProcess;
HANDLE hProcessToken;
TCHAR szTemp[MAX_PATH]; TCHAR szTemp[MAX_PATH];
DWORD dwSize; DWORD dwSize;
#endif
#ifdef TIMES #ifdef TIMES
LARGE_INTEGER liCurrentKernelTime; LARGE_INTEGER liCurrentKernelTime;
LARGE_INTEGER liCurrentIdleTime; LARGE_INTEGER liCurrentIdleTime;
@ -501,7 +500,7 @@ void PerfDataRefresh()
//pPerfData[Idx].SessionId = pSPI->SessionId; //pPerfData[Idx].SessionId = pSPI->SessionId;
#ifdef EXTRA_INFO #ifdef EXTRA_INFO
hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pSPI->UniqueProcessId); hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pSPI->UniqueProcessId);
if (hProcess) { if (hProcess) {
if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) {
ImpersonateLoggedOnUser(hProcessToken); ImpersonateLoggedOnUser(hProcessToken);
@ -510,16 +509,6 @@ void PerfDataRefresh()
GetUserName(szTemp, &dwSize); GetUserName(szTemp, &dwSize);
#ifndef UNICODE #ifndef UNICODE
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH); MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH);
/*
int MultiByteToWideChar(
UINT CodePage, // code page
DWORD dwFlags, // character-type options
LPCSTR lpMultiByteStr, // string to map
int cbMultiByte, // number of bytes in string
LPWSTR lpWideCharStr, // wide-character buffer
int cchWideChar // size of buffer
);
*/
#endif #endif
RevertToSelf(); RevertToSelf();
CloseHandle(hProcessToken); CloseHandle(hProcessToken);
@ -541,7 +530,6 @@ int MultiByteToWideChar(
// Code partly taken from slw32tty.c from mc/slang // Code partly taken from slw32tty.c from mc/slang
unsigned int GetKeyPressed(int events) unsigned int GetKeyPressed(int events)
{ {
long key;
DWORD bytesRead; DWORD bytesRead;
INPUT_RECORD record; INPUT_RECORD record;
int i; int i;

2
rosapps/sysutils/ctm/ctm.xml
View file

@ -1,4 +1,4 @@
<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" warnings="true"> <module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe">
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="UNICODE" /> <define name="UNICODE" />
<define name="_UNICODE" /> <define name="_UNICODE" />