mirror of
https://github.com/reactos/reactos.git
synced 2024-07-05 12:15:46 +00:00
[EVENTVWR]
- Set window parent for different MessageBox calls. - Add a notice in ShowStatusMessageThread concerning a potential bug. - Rename strings "Save Protocol" into "Save Event Log"; adjust translations in this regard. svn path=/trunk/; revision=71377
This commit is contained in:
parent
bd5fd5d6c0
commit
5e80e9c714
|
@ -515,18 +515,27 @@ GetEventUserName(EVENTLOGRECORD *pelr,
|
|||
static DWORD WINAPI
|
||||
ShowStatusMessageThread(IN LPVOID lpParameter)
|
||||
{
|
||||
HWND *phWnd = (HWND *)lpParameter;
|
||||
HWND* phWnd = (HWND*)lpParameter;
|
||||
HWND hWnd;
|
||||
MSG Msg;
|
||||
|
||||
hWnd = CreateDialogParamW(hInst,
|
||||
hWnd = CreateDialogW(hInst,
|
||||
MAKEINTRESOURCEW(IDD_PROGRESSBOX),
|
||||
GetDesktopWindow(),
|
||||
StatusMessageWindowProc,
|
||||
(LPARAM)NULL);
|
||||
GetDesktopWindow(), // hwndMainWindow,
|
||||
StatusMessageWindowProc);
|
||||
if (!hWnd)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* FIXME: With this technique, there is one problem, namely that if
|
||||
* for some reason, the call to CreateDialogW takes longer than the
|
||||
* whole event-loading code to execute, then it may happen that the
|
||||
* event-loading code tries to close this dialog *BEFORE* we had the
|
||||
* time to return the window handle, hence the progress dialog would
|
||||
* be created *AFTER* the event-loading code has finished its job and
|
||||
* as a result, we would have a orphan window floating around.
|
||||
*/
|
||||
|
||||
*phWnd = hWnd;
|
||||
|
||||
ShowWindow(hWnd, SW_SHOW);
|
||||
|
@ -538,6 +547,8 @@ ShowStatusMessageThread(IN LPVOID lpParameter)
|
|||
DispatchMessageW(&Msg);
|
||||
}
|
||||
|
||||
DestroyWindow(hWnd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -598,12 +609,12 @@ QueryEventMessages(LPWSTR lpMachineName,
|
|||
if (dwTotalRecords > 0)
|
||||
{
|
||||
EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED);
|
||||
EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED);
|
||||
EnableMenuItem(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_ENABLED);
|
||||
}
|
||||
else
|
||||
{
|
||||
EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED);
|
||||
EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED);
|
||||
EnableMenuItem(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_GRAYED);
|
||||
}
|
||||
|
||||
g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs));
|
||||
|
@ -759,7 +770,7 @@ QueryEventMessages(LPWSTR lpMachineName,
|
|||
|
||||
|
||||
VOID
|
||||
SaveProtocol(VOID)
|
||||
SaveEventLog(VOID)
|
||||
{
|
||||
HANDLE hEventLog;
|
||||
WCHAR szFileName[MAX_PATH];
|
||||
|
@ -1023,11 +1034,11 @@ BuildLogList(void)
|
|||
|
||||
if (lpDisplayName)
|
||||
{
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName);
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName);
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]);
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]);
|
||||
}
|
||||
|
||||
/* Free the buffer allocated by FormatMessage */
|
||||
|
@ -1037,7 +1048,7 @@ BuildLogList(void)
|
|||
}
|
||||
}
|
||||
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
|
||||
InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
|
||||
|
||||
RegCloseKey(hKey);
|
||||
|
||||
|
@ -1293,8 +1304,8 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
|
||||
switch (LOWORD(wParam))
|
||||
{
|
||||
case IDM_SAVE_PROTOCOL:
|
||||
SaveProtocol();
|
||||
case IDM_SAVE_EVENTLOG:
|
||||
SaveEventLog();
|
||||
break;
|
||||
|
||||
case IDM_CLEAR_EVENTS:
|
||||
|
@ -1400,7 +1411,7 @@ DisplayEvent(HWND hDlg)
|
|||
iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED);
|
||||
if (iIndex == -1)
|
||||
{
|
||||
MessageBoxW(NULL,
|
||||
MessageBoxW(hDlg,
|
||||
L"No Items in ListView",
|
||||
L"Error",
|
||||
MB_OK | MB_ICONINFORMATION);
|
||||
|
@ -1526,7 +1537,7 @@ DisplayEventData(HWND hDlg, BOOL bDisplayWords)
|
|||
iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED);
|
||||
if (iIndex == -1)
|
||||
{
|
||||
MessageBoxW(NULL,
|
||||
MessageBoxW(hDlg,
|
||||
L"No Items in ListView",
|
||||
L"Error",
|
||||
MB_OK | MB_ICONINFORMATION);
|
||||
|
|
|
@ -4,7 +4,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Дневник"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -4,7 +4,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Protokol"
|
||||
BEGIN
|
||||
MENUITEM "Uložit &Protokol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Protokoll"
|
||||
BEGIN
|
||||
MENUITEM "Protokoll s&peichern...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Alle E&reignisse löschen", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Log"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -12,7 +12,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Log"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Registro"
|
||||
BEGIN
|
||||
MENUITEM "Guardar &protocolo...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -4,15 +4,15 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
|
|||
|
||||
IDM_EVENTVWR MENU
|
||||
BEGIN
|
||||
POPUP "Journa&l"
|
||||
POPUP "&Journal"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Enregistrer le fichier journal &sous...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Effacer tous &les événements", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM "&Effacer tous les événements", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Quitter", IDM_EXIT
|
||||
END
|
||||
POPUP "Affichage"
|
||||
POPUP "&Affichage"
|
||||
BEGIN
|
||||
MENUITEM "&Rafraîchir", IDM_REFRESH
|
||||
END
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "מציג האירועים (מקומי)"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Log"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "ログ(&L)"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "로그(&L)"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -4,7 +4,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Logg"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -8,7 +8,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Logi"
|
||||
BEGIN
|
||||
MENUITEM "Zapisz &protokół...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "W&yczyść wszystkie zdarzenia", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Registro"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -9,7 +9,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Jurnal"
|
||||
BEGIN
|
||||
MENUITEM "Păstrare p&rotocol…", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Înlăt&ură toate evenimentele", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "С&обытия"
|
||||
BEGIN
|
||||
MENUITEM "Сохранить &протокол...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Очистить &все события", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -9,7 +9,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Záznam"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -12,7 +12,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Log"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Logg"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -12,7 +12,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Kayıt"
|
||||
BEGIN
|
||||
MENUITEM "&Protokolü Sakla...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Tüm Olayları Sil", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "&Звіт"
|
||||
BEGIN
|
||||
MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "日志(&L)"
|
||||
BEGIN
|
||||
MENUITEM "保存协议...(&P)", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "清除所有事件(&L)", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -6,7 +6,7 @@ IDM_EVENTVWR MENU
|
|||
BEGIN
|
||||
POPUP "日誌(&L)"
|
||||
BEGIN
|
||||
MENUITEM "保存協定...(&P)", IDM_SAVE_PROTOCOL, GRAYED
|
||||
MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "清除所有事件(&L)", IDM_CLEAR_EVENTS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
/* Menu IDs */
|
||||
#define IDM_EVENTVWR 32771
|
||||
#define IDM_CLEAR_EVENTS 32772
|
||||
#define IDM_SAVE_PROTOCOL 32773
|
||||
#define IDM_SAVE_EVENTLOG 32773
|
||||
#define IDM_EXIT 32774
|
||||
#define IDM_REFRESH 32775
|
||||
#define IDM_OPTIONS 32776
|
||||
|
|
Loading…
Reference in a new issue