Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[tfaber] 71379: [SETUPAPI] - Fix Buffer overflow in FixupServiceBinaryPath

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 22 19:09:49 2016 New Revision: 71379 URL: http://svn.reactos.org/svn/reactos?rev=71379&view=rev Log: [SETUPAPI] - Fix Buffer overflow in FixupServiceBinaryPath Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun May 22 19:09:49 2016 @@ -1748,10 +1748,8 @@ /* Handle Win32-services differently */ if (ServiceType & SERVICE_WIN32) { - Win32Length = (ServiceLength - - RosDirLength - 1 + 13) * sizeof(WCHAR); - /* -1 to not count the separator after C:\ReactOS - wcslen(L"%SystemRoot%\\") = 13*sizeof(wchar_t) */ + Win32Length = (ServiceLength - RosDirLength) * sizeof(WCHAR) + - sizeof(L'\\') + sizeof(L"%SystemRoot%\\"); Buffer = MyMalloc(Win32Length); wcscpy(Buffer, L"%SystemRoot%\\");

8 years, 7 months

[hbelusca] 71378: [EVENTVWR] - Fix the flags used in LoadLibraryEx calls for loading DLLs as resource files. - Use a nice flag (FORMAT_MESSAGE_MAX_WIDTH_MASK) in FormatMessage calls so that no usel...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 22 19:00:55 2016 New Revision: 71378 URL: http://svn.reactos.org/svn/reactos?rev=71378&view=rev Log: [EVENTVWR] - Fix the flags used in LoadLibraryEx calls for loading DLLs as resource files. - Use a nice flag (FORMAT_MESSAGE_MAX_WIDTH_MASK) in FormatMessage calls so that no useless extra newlines are appended to the message strings that are recovered. This is especially useful when some strings as localized event log names are retrieved to be displayed in the menu (amongst other things)... This fixes CORE-8915 and fixes also the presentation of some event descriptions. - Fix BuildLogList. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 22 19:00:55 2016 @@ -83,8 +83,8 @@ LPWSTR lpSourceLogName = NULL; LPWSTR lpComputerName = NULL; -DWORD dwNumLogs = 0; -LPWSTR* LogNames; +DWORD dwNumLogs = 0; +LPWSTR* LogNames = NULL; /* Forward declarations of functions included in this code module: */ ATOM MyRegisterClass(HINSTANCE hInstance); @@ -294,13 +294,13 @@ goto Quit; hLibrary = LoadLibraryExW(szMessageDLL, NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary == NULL) goto Quit; - /* Retrieve the message string. */ + /* Retrieve the message string without appending extra newlines */ if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_MAX_WIDTH_MASK, hLibrary, pevlr->EventCategory, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), @@ -395,7 +395,7 @@ while ((szDll != NULL) && (!Success)) { hLibrary = LoadLibraryExW(szDll, NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary == NULL) { /* The DLL could not be loaded try the next one (if any) */ @@ -403,9 +403,9 @@ continue; } - /* Retrieve the message string. */ + /* Retrieve the message string without appending extra newlines */ if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_MAX_WIDTH_MASK, hLibrary, pevlr->EventID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), @@ -894,7 +894,7 @@ } -VOID +BOOL GetDisplayNameFile(IN LPCWSTR lpLogName, OUT PWCHAR lpModuleName) { @@ -908,7 +908,7 @@ KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); if (!KeyPath) { - return; + return FALSE; } StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY); @@ -917,7 +917,7 @@ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, KeyPath); - return; + return FALSE; } cbData = sizeof(szModuleName); @@ -928,6 +928,8 @@ RegCloseKey(hKey); HeapFree(GetProcessHeap(), 0, KeyPath); + + return TRUE; } @@ -970,86 +972,114 @@ BuildLogList(void) { HKEY hKey; + DWORD dwIndex; + DWORD dwMaxKeyLength; + LPWSTR LogName = NULL; + WCHAR szModuleName[MAX_PATH]; DWORD lpcName; - DWORD dwIndex; DWORD dwMessageID; - DWORD dwMaxKeyLength; - WCHAR szModuleName[MAX_PATH]; LPWSTR lpDisplayName; HMODULE hLibrary = NULL; + /* Open the EventLog key */ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { return; } + /* Retrieve the number of event logs enumerated as registry keys */ if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwNumLogs, &dwMaxKeyLength, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) { RegCloseKey(hKey); return; } - if (!dwNumLogs) { RegCloseKey(hKey); return; } - LogNames = HeapAlloc(GetProcessHeap(), 0, (dwNumLogs + 1) * sizeof(LPWSTR)); - - if (!LogNames) + /* Take the NULL terminator into account */ + ++dwMaxKeyLength; + + /* Allocate the temporary buffer */ + LogName = HeapAlloc(GetProcessHeap(), 0, dwMaxKeyLength * sizeof(WCHAR)); + if (!LogName) { RegCloseKey(hKey); return; } + /* Allocate the list of event logs (add 1 to dwNumLogs in order to have one guard entry) */ + LogNames = HeapAlloc(GetProcessHeap(), 0, (dwNumLogs + 1) * sizeof(LPWSTR)); + if (!LogNames) + { + HeapFree(GetProcessHeap(), 0, LogName); + RegCloseKey(hKey); + return; + } + + /* Enumerate and retrieve each event log name */ for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++) { - LogNames[dwIndex] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((dwMaxKeyLength + 1) * sizeof(WCHAR))); - - if (LogNames[dwIndex] != NULL) - { - lpcName = dwMaxKeyLength + 1; - - if (RegEnumKeyExW(hKey, dwIndex, LogNames[dwIndex], &lpcName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + lpcName = dwMaxKeyLength; + if (RegEnumKeyExW(hKey, dwIndex, LogName, &lpcName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + LogNames[dwIndex] = NULL; + continue; + } + + /* Take the NULL terminator into account */ + ++lpcName; + + /* Allocate the event log name string and copy it from the temporary buffer */ + LogNames[dwIndex] = HeapAlloc(GetProcessHeap(), 0, lpcName * sizeof(WCHAR)); + if (LogNames[dwIndex] == NULL) + continue; + + StringCchCopyW(LogNames[dwIndex], lpcName, LogName); + + /* Get the display name for the event log */ + lpDisplayName = NULL; + + ZeroMemory(szModuleName, sizeof(szModuleName)); + if (GetDisplayNameFile(LogNames[dwIndex], szModuleName)) + { + dwMessageID = GetDisplayNameID(LogNames[dwIndex]); + + hLibrary = LoadLibraryExW(szModuleName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary != NULL) { - lpDisplayName = NULL; - - ZeroMemory(szModuleName, sizeof(szModuleName)); - GetDisplayNameFile(LogNames[dwIndex], szModuleName); - dwMessageID = GetDisplayNameID(LogNames[dwIndex]); - - hLibrary = LoadLibraryExW(szModuleName, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - if (hLibrary != NULL) - { - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, - hLibrary, - dwMessageID, - 0, - (LPWSTR)&lpDisplayName, - 0, - NULL); - FreeLibrary(hLibrary); - } - - if (lpDisplayName) - { - InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); - } - else - { - InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); - } - - /* Free the buffer allocated by FormatMessage */ - if (lpDisplayName) - LocalFree(lpDisplayName); + /* Retrieve the message string without appending extra newlines */ + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, + hLibrary, + dwMessageID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpDisplayName, + 0, + NULL); + FreeLibrary(hLibrary); } } + + if (lpDisplayName) + { + InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); + } + else + { + InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); + } + + /* Free the buffer allocated by FormatMessage */ + if (lpDisplayName) + LocalFree(lpDisplayName); } InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); + HeapFree(GetProcessHeap(), 0, LogName); RegCloseKey(hKey); return; @@ -1079,7 +1109,7 @@ DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex + 1, MF_BYCOMMAND); HeapFree(GetProcessHeap(), 0, LogNames); - + LogNames = NULL; dwNumLogs = 0; return;

8 years, 7 months

[hbelusca] 71377: [EVENTVWR] - Set window parent for different MessageBox calls. - Add a notice in ShowStatusMessageThread concerning a potential bug. - Rename strings "Save Protocol" into "Save Ev...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 22 17:17:33 2016 New Revision: 71377 URL: http://svn.reactos.org/svn/reactos?rev=71377&view=rev Log: [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. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 22 17:17:33 2016 @@ -515,18 +515,27 @@ static DWORD WINAPI ShowStatusMessageThread(IN LPVOID lpParameter) { - HWND *phWnd = (HWND *)lpParameter; + HWND* phWnd = (HWND*)lpParameter; HWND hWnd; MSG Msg; - hWnd = CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_PROGRESSBOX), - GetDesktopWindow(), - StatusMessageWindowProc, - (LPARAM)NULL); + hWnd = CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_PROGRESSBOX), + 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); @@ -537,6 +546,8 @@ TranslateMessage(&Msg); DispatchMessageW(&Msg); } + + DestroyWindow(hWnd); return 0; } @@ -598,12 +609,12 @@ 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 @@ VOID -SaveProtocol(VOID) +SaveEventLog(VOID) { HANDLE hEventLog; WCHAR szFileName[MAX_PATH]; @@ -1023,11 +1034,11 @@ 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 @@ } } - 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 @@ switch (LOWORD(wParam)) { - case IDM_SAVE_PROTOCOL: - SaveProtocol(); + case IDM_SAVE_EVENTLOG: + SaveEventLog(); break; case IDM_CLEAR_EVENTS: @@ -1400,7 +1411,7 @@ 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 @@ 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); Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,15 +4,15 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -8,7 +8,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -9,7 +9,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -9,7 +9,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ 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 Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun May 22 17:17:33 2016 @@ -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

8 years, 7 months

[hbelusca] 71376: [EVENTVWR] - Fix a typo in the "loading, wait" dialog. - Use a RichEdit control for the detailed event description text, so that we can have for free clickable URLs. - Use "Courie...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 22 16:19:55 2016 New Revision: 71376 URL: http://svn.reactos.org/svn/reactos?rev=71376&view=rev Log: [EVENTVWR] - Fix a typo in the "loading, wait" dialog. - Use a RichEdit control for the detailed event description text, so that we can have for free clickable URLs. - Use "Courier New" as the font for the event data text, so that we can have finer grained control over the font size... Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 22 16:19:55 2016 @@ -33,8 +33,16 @@ #include <winnls.h> #include <winreg.h> #include <commctrl.h> +#include <richedit.h> #include <commdlg.h> #include <strsafe.h> + +/* Missing RichEdit flags in our richedit.h */ +#define AURL_ENABLEURL 1 +#define AURL_ENABLEEMAILADDR 2 +#define AURL_ENABLETELNO 4 +#define AURL_ENABLEEAURLS 8 +#define AURL_ENABLEDRIVELETTERS 16 #include "resource.h" @@ -96,6 +104,7 @@ MSG msg; HACCEL hAccelTable; INITCOMMONCONTROLSEX iccx; + HMODULE hRichEdit; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); @@ -119,6 +128,13 @@ return FALSE; } + /* Load the RichEdit DLL to add support for RichEdit controls */ + hRichEdit = LoadLibraryW(L"riched20.dll"); + if (!hRichEdit) + { + return FALSE; + } + hAccelTable = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDA_EVENTVWR)); /* Main message loop: */ @@ -130,6 +146,8 @@ DispatchMessageW(&msg); } } + + FreeLibrary(hRichEdit); return (int)msg.wParam; } @@ -1112,9 +1130,8 @@ // Create the ImageList hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - ILC_COLOR32, - 1, - 1); + ILC_COLOR32 | ILC_MASK, // ILC_COLOR24 + 1, 1); // Add event type icons to ImageList ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_INFORMATIONICON))); @@ -1580,7 +1597,7 @@ tmpFont.lfHeight = -MulDiv(8, GetDeviceCaps(hDc, LOGPIXELSY), 72); tmpFont.lfWeight = FW_NORMAL; - wcscpy(tmpFont.lfFaceName, L"Courier"); + wcscpy(tmpFont.lfFaceName, L"Courier New"); hFont = CreateFontIndirectW(&tmpFont); @@ -1662,13 +1679,32 @@ VOID InitDetailsDlg(HWND hDlg, PDETAILDATA pData) { + DWORD dwMask; + HANDLE nextIcon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_NEXT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); HANDLE prevIcon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_PREV), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); HANDLE copyIcon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_COPY), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - SendMessageW(GetDlgItem(hDlg, IDC_NEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); - SendMessageW(GetDlgItem(hDlg, IDC_PREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); - SendMessageW(GetDlgItem(hDlg, IDC_COPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); + SendDlgItemMessageW(hDlg, IDC_NEXT, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); + SendDlgItemMessageW(hDlg, IDC_PREVIOUS, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); + SendDlgItemMessageW(hDlg, IDC_COPY, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); + + /* Set the default read-only RichEdit color */ + SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_3DFACE)); + + /* Enable RichEdit coloured and underlined links */ + dwMask = SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_GETEVENTMASK, 0, 0); + SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_SETEVENTMASK, 0, dwMask | ENM_LINK | ENM_MOUSEEVENTS); + + /* + * Activate automatic URL recognition by the RichEdit control. For more information, see: + * https://blogs.msdn.microsoft.com/murrays/2009/08/31/automatic-richedit-hype… + * https://blogs.msdn.microsoft.com/murrays/2009/09/24/richedit-friendly-name-… + * https://msdn.microsoft.com/en-us/library/windows/desktop/bb787991(v=vs.85).… + */ + SendDlgItemMessageW(hDlg, IDC_EVENTTEXTEDIT, EM_AUTOURLDETECT, AURL_ENABLEURL /* | AURL_ENABLEEAURLS */, 0); + + /* Note that the RichEdit control never gets themed under WinXP+. One would have to write code to simulate Edit-control theming */ SendDlgItemMessageW(hDlg, pData->bDisplayWords ? IDC_WORDRADIO : IDC_BYTESRADIO, BM_SETCHECK, BST_CHECKED, 0); SendDlgItemMessageW(hDlg, IDC_EVENTDATAEDIT, WM_SETFONT, (WPARAM)pData->hMonospaceFont, (LPARAM)TRUE); @@ -1770,6 +1806,15 @@ break; } break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case EN_LINK: + // TODO: Act on the activated RichEdit link! + break; + } + break; } return (INT_PTR)FALSE; Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -1,5 +1,6 @@ #include <windef.h> #include <winuser.h> +#include <richedit.h> #include "resource.h" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -76,7 +76,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "&ÐÐ°Ð½Ð½Ð¸:", IDC_STATIC, 8, 169, 25, 8 CONTROL "&ÐÐ°Ð¹ÑÐ¾Ð²Ðµ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 40, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -42,10 +42,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Äekejte.." +CAPTION "Äekejte..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "NaÄÃtÃ¡m protokol udÃ¡lostÃ. ProsÃm Äekejte ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "NaÄÃtÃ¡m protokol udÃ¡lostÃ. ProsÃm Äekejte...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -76,7 +76,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Byty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,7 +44,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Bitte warten.." +CAPTION "Bitte warten..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "Ereignis-Protokolle werden geladen. Bitte warten...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Bezeichnung:", IDC_STATIC, 8, 65, 45, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&aten:", IDC_STATIC, 8, 169, 24, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -47,7 +47,7 @@ CAPTION "Î ÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "ÎÎ¯Î½ÎµÏÎ±Î¹ ÏÏÏÏÏÏÎ· ÏÏÎ½ Logs ÏÏÎ¼Î²Î¬Î½ÏÏÎ½. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "ÎÎ¯Î½ÎµÏÎ±Î¹ ÏÏÏÏÏÏÎ· ÏÏÎ½ Logs ÏÏÎ¼Î²Î¬Î½ÏÏÎ½. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "Î&ÎµÎ´Î¿Î¼ÎÎ½Î±:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -50,10 +50,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Wait.." +CAPTION "Wait..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Loading Event Logs. Please wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Loading Event Logs. Please wait...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -84,7 +84,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Description:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&DescripciÃ³n:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&atos:", IDC_STATIC, 8, 169, 25, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Description :", IDC_STATIC, 8, 65, 45, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "DonnÃ©es :", IDC_STATIC, 8, 169, 35, 8 CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 50, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "×ª××××¨:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "× ×ª×× ××:", IDC_STATIC, 8, 169, 20, 8 CONTROL "××ª××", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,7 +44,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Attendere.." +CAPTION "Attendere..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "Caricamento eventi in corso. Attendere...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Descrizione:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ati:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,10 +44,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "ãå¾ã¡ãã ãã.." +CAPTION "ãå¾ã¡ãã ãã..." FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - CTEXT "ã¤ãã³ã ãã°ãèªã¿è¾¼ãã§ãã¾ãã ãå¾ã¡ãã ãã ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "ã¤ãã³ã ãã°ãèªã¿è¾¼ãã§ãã¾ãã ãå¾ã¡ãã ãã...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "èª¬æ(&D):", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "ãã¼ã¿(&A):", IDC_STATIC, 8, 169, 20, 8 CONTROL "ãã¤ã(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,7 +44,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "ê¸°ë¤ë¦¬ì¸ì.." +CAPTION "ê¸°ë¤ë¦¬ì¸ì..." FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "ì´ë²¤í¸ ë¡ê·¸ ë¡ë©ì¤. ê¸°ë¤ë ¤ì£¼ì¸ì...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "ì¤ëª(&D):", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "ë°ì´í°(&A):", IDC_STATIC, 8, 169, 20, 8 CONTROL "ë°ì´í¸(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -42,10 +42,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Vent.." +CAPTION "Vent..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Laster Hendelseliste. Venligst vent ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Laster Hendelseliste. Venligst vent...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -76,7 +76,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Beskrivelse:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ata", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Tegn", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -46,10 +46,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Czekaj.." +CAPTION "Czekaj..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Åadowanie logÃ³w zdarzeÅ. ProszÄ czekaÄ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Åadowanie logÃ³w zdarzeÅ. ProszÄ czekaÄ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -80,7 +80,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Opis:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ane", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,10 +44,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Aguarde.." +CAPTION "Aguarde..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Carregando Registros de Eventos. Por favor aguarde ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Carregando Registros de Eventos. Por favor aguarde...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&DescriÃ§Ã£o:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "Dad&os:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -81,7 +81,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Descriere:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ate:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&8 biÈi", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "ÐÐ°Ð½Ð½ÑÐµ:", IDC_STATIC, 8, 169, 30, 8 CONTROL "&ÐÐ°Ð¹ÑÑ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 49, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -47,10 +47,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "PoÄkajte ..." +CAPTION "PoÄkajte..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "NahrÃ¡vam zÃ¡znamy s udalosÅ¥ami. PoÄkajte, prosÃm ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "NahrÃ¡vam zÃ¡znamy s udalosÅ¥ami. PoÄkajte, prosÃm...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -81,7 +81,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "Ã&daje:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -50,10 +50,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Prit.." +CAPTION "Prit..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Ngarkim loget e ngjarjeve. Ju lutem prisniPlease wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Ngarkim loget e ngjarjeve. Ju lutem prisni...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -84,7 +84,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "PÃ«rshkrimi:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,7 +44,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "VÃ¤nta.." +CAPTION "VÃ¤nta..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "Laddar in HÃ¤ndelseloggen. VÃ¤nligen vÃ¤nta...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Beskrivning:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "D&ata", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Byte", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -50,10 +50,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "YÃ¼kleniyor" +CAPTION "YÃ¼kleniyor.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Olay kayÄ±tlarÄ± yÃ¼kleniyor. LÃ¼tfen bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Olay kayÄ±tlarÄ± yÃ¼kleniyor. LÃ¼tfen bekleyiniz...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -84,7 +84,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "AÃ§Ä±klama:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "Veri:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Ãoklu", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -44,10 +44,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "ÐÐ°ÑÐµÐºÐ°Ð¹ÑÐµ.." +CAPTION "ÐÐ°ÑÐµÐºÐ°Ð¹ÑÐµ..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ²ÑÑÑ Ð¿Ð¾Ð´ÑÐ¹. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐµÐºÐ°Ð¹ÑÐµ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ²ÑÑÑ Ð¿Ð¾Ð´ÑÐ¹. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐµÐºÐ°Ð¹ÑÐµ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&ÐÐ¿Ð¸Ñ:", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "Ð&aÑÐ°", IDC_STATIC, 8, 169, 20, 8 CONTROL "&ÐÐ°Ð¹Ñ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "æè¿°(&D)ï¼", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "æ°æ®(&A)", IDC_STATIC, 8, 169, 20, 8 CONTROL "åè(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] Sun May 22 16:19:55 2016 @@ -78,7 +78,7 @@ PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "æè¿°(&D)ï¼", IDC_STATIC, 8, 65, 39, 8 - EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + CONTROL "", IDC_EVENTTEXTEDIT, RICHEDIT_CLASS, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER, 8, 76, 247, 88 LTEXT "è³æ(&A)", IDC_STATIC, 8, 169, 20, 8 CONTROL "ä½åçµ(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8

8 years, 7 months

[pschweitzer] 71375: [PSDK] Define STATUS_FILE_LOCKED_WITH_ONLY_READERS and STATUS_FILE_LOCKED_WITH_WRITERS CORE-11295

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 22 13:22:52 2016 New Revision: 71375 URL: http://svn.reactos.org/svn/reactos?rev=71375&view=rev Log: [PSDK] Define STATUS_FILE_LOCKED_WITH_ONLY_READERS and STATUS_FILE_LOCKED_WITH_WRITERS CORE-11295 Modified: trunk/reactos/sdk/include/psdk/ntstatus.h Modified: trunk/reactos/sdk/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntstatus.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] Sun May 22 13:22:52 2016 @@ -108,6 +108,8 @@ #define STATUS_PROCESS_IN_JOB ((NTSTATUS)0x00000124) #define STATUS_VOLSNAP_HIBERNATE_READY ((NTSTATUS)0x00000125) #define STATUS_FSFILTER_OP_COMPLETED_SUCCESSFULLY ((NTSTATUS)0x00000126) +#define STATUS_FILE_LOCKED_WITH_ONLY_READERS ((NTSTATUS)0x0000012A) +#define STATUS_FILE_LOCKED_WITH_WRITERS ((NTSTATUS)0x0000012B) #define STATUS_OBJECT_NAME_EXISTS ((NTSTATUS)0x40000000) #define STATUS_THREAD_WAS_SUSPENDED ((NTSTATUS)0x40000001)

8 years, 7 months

[ekohl] 71374: [EVENTVWR] Display event data properly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 22 12:15:30 2016 New Revision: 71374 URL: http://svn.reactos.org/svn/reactos?rev=71374&view=rev Log: [EVENTVWR] Display event data properly. Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Sun May 22 12:15:30 2016 @@ -3,7 +3,7 @@ add_rc_deps(eventvwr.rc ${eventvwr_rc_deps}) add_executable(eventvwr eventvwr.c eventvwr.rc) set_module_type(eventvwr win32gui UNICODE) -add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32) +add_importlibs(eventvwr user32 gdi32 comctl32 comdlg32 advapi32 msvcrt kernel32 ntdll) if(MSVC) add_importlibs(eventvwr ntdll) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 22 12:15:30 2016 @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> +#include <ctype.h> #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -36,6 +37,12 @@ #include <strsafe.h> #include "resource.h" + +typedef struct _DETAILDATA +{ + BOOL bDisplayWords; + HFONT hMonospaceFont; +} DETAILDATA, *PDETAILDATA; static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name */ static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; @@ -1367,7 +1374,6 @@ WCHAR szCategory[MAX_PATH]; WCHAR szEventID[MAX_PATH]; WCHAR szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; - WCHAR szEventData[MAX_PATH]; BOOL bEventData = FALSE; LVITEMW li; EVENTLOGRECORD* pevlr; @@ -1411,27 +1417,176 @@ SetDlgItemTextW(hDlg, IDC_EVENTTYPESTATIC, szEventType); bEventData = (pevlr->DataLength > 0); - if (bEventData) - { - // This is the data section of the current event - MultiByteToWideChar(CP_ACP, - 0, - (LPCSTR)((LPBYTE)pevlr + pevlr->DataOffset), - pevlr->DataLength, - szEventData, - MAX_PATH); - - SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, szEventData); - } - else - { - SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, L""); - } EnableWindow(GetDlgItem(hDlg, IDC_BYTESRADIO), bEventData); EnableWindow(GetDlgItem(hDlg, IDC_WORDRADIO), bEventData); GetEventMessage(lpSourceLogName, szSource, pevlr, szEventText); SetDlgItemTextW(hDlg, IDC_EVENTTEXTEDIT, szEventText); +} + +UINT +PrintByteDataLine(PWCHAR pBuffer, UINT uOffset, PBYTE pd, UINT uLength) +{ + PWCHAR p = pBuffer; + UINT n, i, r = 0; + + if (uOffset != 0) + { + n = swprintf(p, L"\r\n"); + p = p + n; + r += n; + } + + n = swprintf(p, L"%04lx:", uOffset); + p = p + n; + r += n; + + for (i = 0; i < uLength; i++) + { + n = swprintf(p, L" %02x", pd[i]); + p = p + n; + r += n; + } + + for (i = 0; i < 9 - uLength; i++) + { + n = swprintf(p, L" "); + p = p + n; + r += n; + } + + for (i = 0; i < uLength; i++) + { + n = swprintf(p, L"%c", iswprint(pd[i]) ? pd[i] : L'.'); + p = p + n; + r += n; + } + + return r; +} + +UINT +PrintWordDataLine(PWCHAR pBuffer, UINT uOffset, PULONG pData, UINT uLength) +{ + PWCHAR p = pBuffer; + UINT n, i, r = 0; + + if (uOffset != 0) + { + n = swprintf(p, L"\r\n"); + p = p + n; + r += n; + } + + n = swprintf(p, L"%04lx:", uOffset); + p = p + n; + r += n; + + for (i = 0; i < uLength / sizeof(ULONG); i++) + { + n = swprintf(p, L" %08lx", pData[i]); + p = p + n; + r += n; + } + + return r; +} + + +VOID +DisplayEventData(HWND hDlg, BOOL bDisplayWords) +{ + LVITEMW li; + EVENTLOGRECORD* pevlr; + int iIndex; + + LPBYTE pData; + UINT i, uOffset; + UINT uBufferSize, uLineLength; + PWCHAR pTextBuffer, pLine; + + // Get index of selected item + iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); + if (iIndex == -1) + { + MessageBoxW(NULL, + L"No Items in ListView", + L"Error", + MB_OK | MB_ICONINFORMATION); + return; + } + + li.mask = LVIF_PARAM; + li.iItem = iIndex; + li.iSubItem = 0; + + (void)ListView_GetItem(hwndListView, &li); + + pevlr = (EVENTLOGRECORD*)li.lParam; + if (pevlr->DataLength == 0) + { + SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, L""); + return; + } + + if (bDisplayWords) + uBufferSize = ((pevlr->DataLength / 8) + 1) * 26 * sizeof(WCHAR); + else + uBufferSize = ((pevlr->DataLength / 8) + 1) * 43 * sizeof(WCHAR); + + pTextBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, uBufferSize); + if (pTextBuffer) + { + pLine = pTextBuffer; + uOffset = 0; + + for (i = 0; i < pevlr->DataLength / 8; i++) + { + pData = (LPBYTE)((LPBYTE)pevlr + pevlr->DataOffset + uOffset); + + if (bDisplayWords) + uLineLength = PrintWordDataLine(pLine, uOffset, (PULONG)pData, 8); + else + uLineLength = PrintByteDataLine(pLine, uOffset, pData, 8); + pLine = pLine + uLineLength; + + uOffset += 8; + } + + if (pevlr->DataLength % 8 != 0) + { + pData = (LPBYTE)((LPBYTE)pevlr + pevlr->DataOffset + uOffset); + + if (bDisplayWords) + PrintWordDataLine(pLine, uOffset, (PULONG)pData, pevlr->DataLength % 8); + else + PrintByteDataLine(pLine, uOffset, pData, pevlr->DataLength % 8); + } + + SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, pTextBuffer); + + HeapFree(GetProcessHeap(), 0, pTextBuffer); + } +} + +HFONT +CreateMonospaceFont(VOID) +{ + LOGFONTW tmpFont = {0}; + HFONT hFont; + HDC hDc; + + hDc = GetDC(NULL); + + tmpFont.lfHeight = -MulDiv(8, GetDeviceCaps(hDc, LOGPIXELSY), 72); + tmpFont.lfWeight = FW_NORMAL; + wcscpy(tmpFont.lfFaceName, L"Courier"); + + hFont = CreateFontIndirectW(&tmpFont); + + ReleaseDC(NULL, hDc); + + return hFont; } VOID @@ -1505,7 +1660,7 @@ static VOID -InitDetailsDlg(HWND hDlg) +InitDetailsDlg(HWND hDlg, PDETAILDATA pData) { HANDLE nextIcon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_NEXT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); HANDLE prevIcon = LoadImageW(hInst, MAKEINTRESOURCEW(IDI_PREV), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); @@ -1514,24 +1669,45 @@ SendMessageW(GetDlgItem(hDlg, IDC_NEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); SendMessageW(GetDlgItem(hDlg, IDC_PREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); SendMessageW(GetDlgItem(hDlg, IDC_COPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); + + SendDlgItemMessageW(hDlg, pData->bDisplayWords ? IDC_WORDRADIO : IDC_BYTESRADIO, BM_SETCHECK, BST_CHECKED, 0); + SendDlgItemMessageW(hDlg, IDC_EVENTDATAEDIT, WM_SETFONT, (WPARAM)pData->hMonospaceFont, (LPARAM)TRUE); } // Message handler for event details box. INT_PTR CALLBACK EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + PDETAILDATA pData; + UNREFERENCED_PARAMETER(lParam); + pData = (PDETAILDATA)GetWindowLongPtr(hDlg, DWLP_USER); + switch (message) { case WM_INITDIALOG: - { - InitDetailsDlg(hDlg); - - // Show event info on dialog box - DisplayEvent(hDlg); + pData = (PDETAILDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DETAILDATA)); + if (pData) + { + SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pData); + + pData->bDisplayWords = FALSE; + pData->hMonospaceFont = CreateMonospaceFont(); + + InitDetailsDlg(hDlg, pData); + + // Show event info on dialog box + DisplayEvent(hDlg); + DisplayEventData(hDlg, pData->bDisplayWords); + } return (INT_PTR)TRUE; - } + + case WM_DESTROY: + if (pData->hMonospaceFont) + DeleteObject(pData->hMonospaceFont); + HeapFree(GetProcessHeap(), 0, pData); + return (INT_PTR)TRUE; case WM_COMMAND: switch (LOWORD(wParam)) @@ -1542,33 +1718,45 @@ return (INT_PTR)TRUE; case IDC_PREVIOUS: - { SendMessageW(hwndListView, WM_KEYDOWN, VK_UP, 0); // Show event info on dialog box - DisplayEvent(hDlg); + if (pData) + { + DisplayEvent(hDlg); + DisplayEventData(hDlg, pData->bDisplayWords); + } return (INT_PTR)TRUE; - } case IDC_NEXT: - { SendMessageW(hwndListView, WM_KEYDOWN, VK_DOWN, 0); // Show event info on dialog box - DisplayEvent(hDlg); + if (pData) + { + DisplayEvent(hDlg); + DisplayEventData(hDlg, pData->bDisplayWords); + } return (INT_PTR)TRUE; - } case IDC_COPY: CopyEventEntry(hDlg); return (INT_PTR)TRUE; - // UNIMPLEMENTED! case IDC_BYTESRADIO: + if (pData) + { + pData->bDisplayWords = FALSE; + DisplayEventData(hDlg, pData->bDisplayWords); + } return (INT_PTR)TRUE; - // UNIMPLEMENTED! case IDC_WORDRADIO: + if (pData) + { + pData->bDisplayWords = TRUE; + DisplayEventData(hDlg, pData->bDisplayWords); + } return (INT_PTR)TRUE; case IDHELP:

8 years, 7 months

[tfaber] 71373: [SCHANNEL] - Set received length to zero when the receive result is MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY instead of pretending we got data CORE-11285 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 22 10:56:22 2016 New Revision: 71373 URL: http://svn.reactos.org/svn/reactos?rev=71373&view=rev Log: [SCHANNEL] - Set received length to zero when the receive result is MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY instead of pretending we got data CORE-11285 #resolve Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls.c Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_mbedtls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_mbedtls.c [iso-8859-1] Sun May 22 10:56:22 2016 @@ -682,6 +682,7 @@ } else if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) { + *length = 0; TRACE("MBEDTLS schan_imp_recv: ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY -> SEC_E_OK\n"); return SEC_E_OK; }

8 years, 7 months

[tfaber] 71372: [SCHANNEL] - Correctly check for ROS_SCHAN_IS_BLOCKING CORE-11285

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 22 10:53:23 2016 New Revision: 71372 URL: http://svn.reactos.org/svn/reactos?rev=71372&view=rev Log: [SCHANNEL] - Correctly check for ROS_SCHAN_IS_BLOCKING CORE-11285 Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls.c Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_mbedtls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_mbedtls.c [iso-8859-1] Sun May 22 10:53:23 2016 @@ -46,9 +46,9 @@ #include <mbedtls/md_internal.h> #include <mbedtls/ssl_internal.h> -#define ROS_SCHAN_IS_BLOCKING (0xCCCFFFFF & 0xFFF00000) -#define ROS_SCHAN_IS_BLOCKING_MARSHALL(read_len) (ROS_SCHAN_IS_BLOCKING | (read_len & 0x000FFFFF)) -#define ROS_SCHAN_IS_BLOCKING_RETRIEVE(read_len) (read_len & 0x000FFFFF) +#define ROS_SCHAN_IS_BLOCKING(read_len) ((read_len & 0xFFF00000) == 0xCCC00000) +#define ROS_SCHAN_IS_BLOCKING_MARSHALL(read_len) ((read_len & 0x000FFFFF) | 0xCCC00000) +#define ROS_SCHAN_IS_BLOCKING_RETRIEVE(read_len) (read_len & 0x000FFFFF) #ifndef __REACTOS__ /* WINE defines the back-end glue in here */ @@ -281,7 +281,7 @@ TRACE("MBEDTLS schan_imp_handshake: %p err: %#x \n", session, err); - if ((err & ROS_SCHAN_IS_BLOCKING) == ROS_SCHAN_IS_BLOCKING) + if (ROS_SCHAN_IS_BLOCKING(err)) { TRACE("Received ERR_NET_WANT_READ/WRITE... let's try again!\n"); return SEC_I_CONTINUE_NEEDED; @@ -623,7 +623,7 @@ *length = ret; } - else if ((ret & ROS_SCHAN_IS_BLOCKING) == ROS_SCHAN_IS_BLOCKING) + else if (ROS_SCHAN_IS_BLOCKING(ret)) { *length = ROS_SCHAN_IS_BLOCKING_RETRIEVE(ret); @@ -665,7 +665,7 @@ *length = ret; } - else if ((ret & ROS_SCHAN_IS_BLOCKING) == ROS_SCHAN_IS_BLOCKING) + else if (ROS_SCHAN_IS_BLOCKING(ret)) { *length = ROS_SCHAN_IS_BLOCKING_RETRIEVE(ret);

8 years, 7 months

[tfaber] 71371: [UNIATA] - When handling CD READ_CAPACITY requests in AtapiInterrupt__, fully rewind the DataBuffer instead of relying on the last read length. Fixes crash on first stage boot in KV...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 22 10:25:24 2016 New Revision: 71371 URL: http://svn.reactos.org/svn/reactos?rev=71371&view=rev Log: [UNIATA] - When handling CD READ_CAPACITY requests in AtapiInterrupt__, fully rewind the DataBuffer instead of relying on the last read length. Fixes crash on first stage boot in KVM. CORE-11286 #resolve CORE-11296 Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun May 22 10:25:24 2016 @@ -5923,13 +5923,13 @@ // for that also. if (srb->Cdb[0] == SCSIOP_READ_CAPACITY) { - AtaReq->DataBuffer -= wordCount; + AtaReq->DataBuffer -= AtaReq->WordsTransfered; if (AtaReq->DataBuffer[0] == 0x00) { *((ULONG *) &(AtaReq->DataBuffer[0])) = 0xFFFFFF7F; } *((ULONG *) &(AtaReq->DataBuffer[2])) = 0x00080000; - AtaReq->DataBuffer += wordCount; + AtaReq->DataBuffer += AtaReq->WordsTransfered; } #ifndef UNIATA_INIT_CHANGERS else

8 years, 7 months

[pschweitzer] 71370: [VFATLIB] Update the amount of FAT entries taking into account that the first two are reserved and thus not usable. Patch by Wim Hueskes CORE-11283 #resolve #comment Committed ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 22 07:56:45 2016 New Revision: 71370 URL: http://svn.reactos.org/svn/reactos?rev=71370&view=rev Log: [VFATLIB] Update the amount of FAT entries taking into account that the first two are reserved and thus not usable. Patch by Wim Hueskes CORE-11283 #resolve #comment Committed in r71370, thanks for your patch! Modified: trunk/reactos/sdk/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/sdk/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatlib/fat3… ============================================================================== --- trunk/reactos/sdk/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun May 22 07:56:45 2016 @@ -397,6 +397,9 @@ ULONG TmpVal1; ULONG TmpVal2; NTSTATUS Status; + ULONG UsableFatEntries; + ULONG FirstDataSector; + ULONG DataClusters; /* Calculate cluster size */ if (ClusterSize == 0) @@ -469,6 +472,20 @@ BootSector.FATSectors32 = (TmpVal1 + (TmpVal2 - 1)) / TmpVal2; DPRINT("FATSectors32 = %lu\n", BootSector.FATSectors32); + /* edge case: first 2 fat entries are not usable, so the calculation might need a correction */ + UsableFatEntries = BootSector.FATSectors32 * (BootSector.BytesPerSector / 4) - 2; + FirstDataSector = BootSector.ReservedSectors + BootSector.FATCount * BootSector.FATSectors32; + DataClusters = (BootSector.SectorsHuge - FirstDataSector) / BootSector.SectorsPerCluster; + if (DataClusters > UsableFatEntries) + { + /* Need more fat entries */ + BootSector.FATSectors32 += (DataClusters - UsableFatEntries); + + DPRINT("UsableFatEntries = %lu\n", UsableFatEntries); + DPRINT("DataClusters = %lu\n", DataClusters); + DPRINT("BootSector.FATSectors32 incremented to %lu\n", BootSector.FATSectors32); + } + /* Init context data */ Context->TotalSectorCount = 2 + (BootSector.FATSectors32 * BootSector.FATCount) + BootSector.SectorsPerCluster;

8 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016