Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 01:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EVENTVWR]

Browse source 
- Fix handling of NULL lpComputerName.
- Handle lpData conversion to a wide string and make sure it's NULL terminated.
- Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl>
See issue #5926 for more details.

svn path=/trunk/; revision=50822
This commit is contained in:
Amine Khaldi 2011-02-19 21:24:47 +00:00
parent 3eb47ac17d
commit 7d2277a1ea
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/base/applications/mscutils/eventvwr/eventvwr.c
View file

@ -503,11 +503,12 @@ QueryEventMessages(LPWSTR lpMachineName,
HWND hwndDlg; HWND hwndDlg;
HANDLE hEventLog; HANDLE hEventLog;
EVENTLOGRECORD *pevlr; EVENTLOGRECORD *pevlr;
DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags, dwMaxLength;
LPWSTR lpSourceName; LPWSTR lpSourceName;
LPWSTR lpComputerName; LPWSTR lpComputerName;
LPWSTR lpData; LPSTR lpData;
BOOL bResult = TRUE; /* Read succeeded. */ BOOL bResult = TRUE; /* Read succeeded. */
int i;
WCHAR szWindowTitle[MAX_PATH]; WCHAR szWindowTitle[MAX_PATH];
WCHAR szStatusText[MAX_PATH]; WCHAR szStatusText[MAX_PATH];
@ -519,6 +520,7 @@ QueryEventMessages(LPWSTR lpMachineName,
WCHAR szUsername[MAX_PATH]; WCHAR szUsername[MAX_PATH];
WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER]; WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER];
WCHAR szCategory[MAX_PATH]; WCHAR szCategory[MAX_PATH];
WCHAR szData[MAX_PATH];
SYSTEMTIME time; SYSTEMTIME time;
LVITEMW lviEventItem; LVITEMW lviEventItem;
@ -606,7 +608,7 @@ QueryEventMessages(LPWSTR lpMachineName,
lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR));
// This ist the data section of the current event // This ist the data section of the current event
lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset); lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset);
// Compute the event type // Compute the event type
EventTimeToSystemTime(pevlr->TimeWritten, &time); EventTimeToSystemTime(pevlr->TimeWritten, &time);
@ -665,7 +667,13 @@ QueryEventMessages(LPWSTR lpMachineName,
ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID);
ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User
ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer
ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text MultiByteToWideChar(CP_ACP,
0,
lpData,
pevlr->DataLength,
szData,
MAX_PATH);
ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, szData); //Event Text
dwRead -= pevlr->Length; dwRead -= pevlr->Length;
pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length);
@ -678,7 +686,15 @@ QueryEventMessages(LPWSTR lpMachineName,
// All events loaded // All events loaded
EndDialog(hwndDlg, 0); EndDialog(hwndDlg, 0);
swprintf(szWindowTitle, L"%s - %s Log on \\\\%s", szTitle, lpLogName, lpComputerName);
i = swprintf(szWindowTitle, L"%s - %s Log on \\\\", szTitle, lpLogName); /* i = number of characters written */
/* lpComputerName can be NULL here if no records was read */
dwMaxLength = sizeof(szWindowTitle)/sizeof(WCHAR)-i;
if(!lpComputerName)
GetComputerNameW(szWindowTitle+i, &dwMaxLength);
else
_snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName);
swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords); swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords);
// Update the status bar // Update the status bar