Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 22 May '16

22 May '16

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

1 0

[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 22 May '16

22 May '16

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;

1 0

[pschweitzer] 71369: [SYSSETUP] Update acknowledgements regarding imported FSDs in ReactOS. Thanks Matt Wu and Mark Harmstone for your great work!
by pschweitzer＠svn.reactos.org 22 May '16

22 May '16

Author: pschweitzer Date: Sun May 22 07:56:23 2016 New Revision: 71369 URL: http://svn.reactos.org/svn/reactos?rev=71369&view=rev Log: [SYSSETUP] Update acknowledgements regarding imported FSDs in ReactOS. Thanks Matt Wu and Mark Harmstone for your great work! Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sun May 22 07:56:23 2016 @@ -26,7 +26,7 @@ STRINGTABLE BEGIN - IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nSYSLINUX - http://syslinux.zytor.com\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nQEMU - http://fabrice.bellard.free.fr/qemu\nMesa3D - http://www.mesa3d.org\nadns - http://www.gnu.org/software/adns\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://winext2fsd.sourceforge.net/\nGNU FreeFont - http://savannah.gnu.org/projects/freefont/\nDejaVu Fonts - http://dejavu.sourceforge.net\nLiberation(tm) Fonts - https://fedorahosted.org/liberation-fonts/" + IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nSYSLINUX - http://syslinux.zytor.com\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nQEMU - http://fabrice.bellard.free.fr/qemu\nMesa3D - http://www.mesa3d.org\nadns - http://www.gnu.org/software/adns\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://www.ext2fsd.com/\nGNU FreeFont - http://savannah.gnu.org/projects/freefont/\nDejaVu Fonts - http://dejavu.sourceforge.net\nLiberation(tm) Fonts - https://fedorahosted.org/liberation-fonts/\nBtrfs - https://github.com/maharmstone/btrfs" END IDR_GPL RT_TEXT "COPYING"

1 0

[hbelusca] 71368: [EVENTVWR] - Fix the window styles of the edit boxes in the event details dialog. - Refactor some parts of the code to reduce the level of code indentation. - Replace malloc/free ...
by hbelusca＠svn.reactos.org 22 May '16

22 May '16

Author: hbelusca Date: Sun May 22 00:34:40 2016 New Revision: 71368 URL: http://svn.reactos.org/svn/reactos?rev=71368&view=rev Log: [EVENTVWR] - Fix the window styles of the edit boxes in the event details dialog. - Refactor some parts of the code to reduce the level of code indentation. - Replace malloc/free by their Win32 counterparts HeapAlloc/HeapFree. - When caching the full contents of a given event log, don't load at this point the event text/data. Only load those when opening the event details dialog. 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 00:34:40 2016 @@ -44,8 +44,8 @@ #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 #define EVENT_DLL_SEPARATOR L";" +#define EVENT_CATEGORY_MESSAGE_FILE L"CategoryMessageFile" #define EVENT_MESSAGE_FILE L"EventMessageFile" -#define EVENT_CATEGORY_MESSAGE_FILE L"CategoryMessageFile" #define EVENT_PARAMETER_MESSAGE_FILE L"ParameterMessageFile" #define MAX_LOADSTRING 255 @@ -260,50 +260,54 @@ IN EVENTLOGRECORD *pevlr, OUT PWCHAR CategoryName) { - HANDLE hLibrary = NULL; + BOOL Success = FALSE; + HMODULE hLibrary = NULL; WCHAR szMessageDLL[MAX_PATH]; - LPVOID lpMsgBuf = NULL; - - if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) - { - hLibrary = LoadLibraryExW(szMessageDLL, NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - if (hLibrary != NULL) - { - /* Retrieve the message string. */ - if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventCategory, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, - EVENT_MESSAGE_FILE_BUFFER, - NULL) != 0) - { - /* Trim the string */ - TrimNulls(lpMsgBuf); - - /* Copy the category name */ - StringCchCopyW(CategoryName, MAX_PATH, lpMsgBuf); - } - else - { - LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); - } - - if (hLibrary != NULL) - FreeLibrary(hLibrary); - - /* Free the buffer allocated by FormatMessage */ - if (lpMsgBuf) - LocalFree(lpMsgBuf); - - return TRUE; - } - } - - LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); - - return FALSE; + LPWSTR lpMsgBuf = NULL; + + if (!GetEventMessageFileDLL(KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE, szMessageDLL)) + goto Quit; + + hLibrary = LoadLibraryExW(szMessageDLL, NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary == NULL) + goto Quit; + + /* Retrieve the message string. */ + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + hLibrary, + pevlr->EventCategory, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, + EVENT_MESSAGE_FILE_BUFFER, + NULL) != 0) + { + /* Trim the string */ + TrimNulls(lpMsgBuf); + + /* Copy the category name */ + StringCchCopyW(CategoryName, MAX_PATH, lpMsgBuf); + } + else + { + LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); + } + + /* Free the buffer allocated by FormatMessage */ + if (lpMsgBuf) + LocalFree(lpMsgBuf); + + if (hLibrary != NULL) + FreeLibrary(hLibrary); + + Success = TRUE; + +Quit: + if (!Success) + LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); + + return Success; } @@ -313,106 +317,109 @@ IN EVENTLOGRECORD *pevlr, OUT PWCHAR EventText) { + BOOL Success = FALSE; DWORD i; - HANDLE hLibrary = NULL; + HMODULE hLibrary = NULL; WCHAR SourceModuleName[1000]; WCHAR ParameterModuleName[1000]; + BOOL IsParamModNameCached = FALSE; LPWSTR lpMsgBuf = NULL; WCHAR szStringIDNotFound[MAX_LOADSTRING]; LPWSTR szDll; LPWSTR szMessage; LPWSTR *szArguments; - BOOL bDone = FALSE; - - /* TODO : GetEventMessageFileDLL can return a comma separated list of DLLs */ - if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_MESSAGE_FILE, SourceModuleName)) - { - /* Get the event message */ - szMessage = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); - - /* Allocate space for parameters */ - szArguments = malloc(sizeof(LPVOID) * pevlr->NumStrings); - if (!szArguments) - { - return FALSE; - } - - for (i = 0; i < pevlr->NumStrings ; i++) - { - if (wcsstr(szMessage , L"%%")) + + /* NOTE: GetEventMessageFileDLL can return a comma-separated list of DLLs */ + + if (!GetEventMessageFileDLL(KeyName, SourceName, EVENT_MESSAGE_FILE, SourceModuleName)) + { + // goto Quit; + return FALSE; + } + + /* Get the event message */ + szMessage = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); + + /* Allocate space for parameters */ + szArguments = HeapAlloc(GetProcessHeap(), 0, pevlr->NumStrings * sizeof(LPVOID)); + if (!szArguments) + { + // goto Quit; + return FALSE; + } + + for (i = 0; i < pevlr->NumStrings; i++) + { + if (wcsstr(szMessage, L"%%")) + { + if (!IsParamModNameCached && GetEventMessageFileDLL(KeyName, SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) { - if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) - { - /* Not yet support for reading messages from parameter message DLL */ - } + /* Now that the parameter file list is loaded, no need to reload it at the next run! */ + IsParamModNameCached = TRUE; + + /* Not yet support for reading messages from parameter message DLL */ } - - szArguments[i] = szMessage; - szMessage += wcslen(szMessage) + 1; - } - - szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); - while ((szDll != NULL) && (!bDone)) - { - hLibrary = LoadLibraryExW(szDll, NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - if (hLibrary == NULL) - { - /* The DLL could not be loaded try the next one (if any) */ - szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); - } - else - { - /* Retrieve the message string. */ - if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventID, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, - 0, - (va_list*)szArguments) == 0) - { - /* We haven't found the string , get next DLL (if any) */ - szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); - } - else - { - if (lpMsgBuf) - { - /* The ID was found and the message was formated */ - bDone = TRUE; - - /* Trim the string */ - TrimNulls((LPWSTR)lpMsgBuf); - - /* Copy the event text */ - StringCchCopyW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, lpMsgBuf); - } - } - - FreeLibrary(hLibrary); - } - } - - if (!bDone) - { - LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); - StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); - } - - free(szArguments); - - /* No more dlls to try, return result */ - return bDone; - } - - LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); - StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); - - return FALSE; + } + + szArguments[i] = szMessage; + szMessage += wcslen(szMessage) + 1; + } + + /* Loop through the list of event message DLLs */ + szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); + while ((szDll != NULL) && (!Success)) + { + hLibrary = LoadLibraryExW(szDll, NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary == NULL) + { + /* The DLL could not be loaded try the next one (if any) */ + szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); + continue; + } + + /* Retrieve the message string. */ + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + hLibrary, + pevlr->EventID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, + 0, + (va_list*)szArguments) == 0) + { + /* We haven't found the string, get next DLL (if any) */ + szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); + } + else if (lpMsgBuf) + { + /* The ID was found and the message was formated */ + Success = TRUE; + + /* Trim the string */ + TrimNulls((LPWSTR)lpMsgBuf); + + /* Copy the event text */ + StringCchCopyW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, lpMsgBuf); + } + + /* Free the buffer allocated by FormatMessage */ + if (lpMsgBuf) + LocalFree(lpMsgBuf); + + FreeLibrary(hLibrary); + } + + HeapFree(GetProcessHeap(), 0, szArguments); + +// Quit: + if (!Success) + { + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); + StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); + } + + return Success; } @@ -521,7 +528,6 @@ size_t cchRemaining; LPWSTR lpSourceName; LPWSTR lpComputerName; - LPSTR lpData; BOOL bResult = TRUE; /* Read succeeded. */ WCHAR szWindowTitle[MAX_PATH]; @@ -532,9 +538,7 @@ WCHAR szEventTypeText[MAX_LOADSTRING]; WCHAR szCategoryID[MAX_PATH]; WCHAR szUsername[MAX_PATH]; - WCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER]; WCHAR szCategory[MAX_PATH]; - WCHAR szData[MAX_PATH]; PWCHAR lpTitleTemplateEnd; SYSTEMTIME time; @@ -557,13 +561,13 @@ SendMessageW(hwndListView, WM_SETREDRAW, FALSE, 0); /* Clear the list view */ - (void)ListView_DeleteAllItems (hwndListView); + (void)ListView_DeleteAllItems(hwndListView); FreeRecords(); GetOldestEventLogRecord(hEventLog, &dwThisRecord); /* Get the total number of event log records. */ - GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); + GetNumberOfEventLogRecords(hEventLog, &dwTotalRecords); g_TotalRecords = dwTotalRecords; if (dwTotalRecords > 0) @@ -619,9 +623,8 @@ while (dwRead > 0) { - LoadStringW(hInst, IDS_NOT_AVAILABLE, szUsername, MAX_PATH); - LoadStringW(hInst, IDS_NOT_AVAILABLE, szEventText, MAX_PATH); - LoadStringW(hInst, IDS_NONE, szCategory, MAX_PATH); + LoadStringW(hInst, IDS_NOT_AVAILABLE, szUsername, ARRAYSIZE(szUsername)); + LoadStringW(hInst, IDS_NONE, szCategory, ARRAYSIZE(szCategory)); // Get the event source name. lpSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); @@ -629,17 +632,14 @@ // Get the computer name lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); - // This is the data section of the current event - lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset); - // Compute the event type EventTimeToSystemTime(pevlr->TimeWritten, &time); // Get the username that generated the event GetEventUserName(pevlr, szUsername); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); - GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, MAX_PATH); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate)); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); @@ -689,13 +689,6 @@ ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); - MultiByteToWideChar(CP_ACP, - 0, - lpData, - pevlr->DataLength, - szData, - MAX_PATH); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, szData); // Event Text dwRead -= pevlr->Length; pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); @@ -947,7 +940,7 @@ DWORD dwMaxKeyLength; WCHAR szModuleName[MAX_PATH]; LPWSTR lpDisplayName; - HANDLE hLibrary = NULL; + HMODULE hLibrary = NULL; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { @@ -1012,7 +1005,9 @@ InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); } - LocalFree(lpDisplayName); + /* Free the buffer allocated by FormatMessage */ + if (lpDisplayName) + LocalFree(lpDisplayName); } } } @@ -1188,14 +1183,6 @@ lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 7, &lvc); - lvc.cx = 0; - LoadStringW(hInstance, - IDS_COLUMNEVENTDATA, - szTemp, - ARRAYSIZE(szTemp)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(hwndListView, 8, &lvc); - // Initialize the save Dialog ZeroMemory(&sfn, sizeof(sfn)); ZeroMemory(szSaveFilter, sizeof(szSaveFilter)); @@ -1246,7 +1233,7 @@ case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { - case NM_DBLCLK : + case NM_DBLCLK: hdr = (NMHDR FAR*)lParam; if (hdr->hwndFrom == hwndListView) { @@ -1388,61 +1375,63 @@ // Get index of selected item iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); - - li.mask = LVIF_PARAM; - li.iItem = iIndex; - li.iSubItem = 0; - - (void)ListView_GetItem(hwndListView, &li); - - pevlr = (EVENTLOGRECORD*)li.lParam; - - if (iIndex != -1) - { - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, ARRAYSIZE(szEventType)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, ARRAYSIZE(szDate)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, ARRAYSIZE(szTime)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, ARRAYSIZE(szSource)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, ARRAYSIZE(szCategory)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, ARRAYSIZE(szEventID)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, ARRAYSIZE(szUser)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, ARRAYSIZE(szComputer)); - - bEventData = !(pevlr->DataLength == 0); - - if (pevlr->DataLength > 0) - { - MultiByteToWideChar(CP_ACP, - 0, - (LPCSTR)((LPBYTE)pevlr + pevlr->DataOffset), - pevlr->DataLength, - szEventData, - MAX_PATH); - } - - GetEventMessage(lpSourceLogName, szSource, pevlr, szEventText); - - EnableWindow(GetDlgItem(hDlg, IDC_BYTESRADIO), bEventData); - EnableWindow(GetDlgItem(hDlg, IDC_WORDRADIO), bEventData); - - SetDlgItemTextW(hDlg, IDC_EVENTDATESTATIC, szDate); - SetDlgItemTextW(hDlg, IDC_EVENTTIMESTATIC, szTime); - SetDlgItemTextW(hDlg, IDC_EVENTUSERSTATIC, szUser); - SetDlgItemTextW(hDlg, IDC_EVENTSOURCESTATIC, szSource); - SetDlgItemTextW(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); - SetDlgItemTextW(hDlg, IDC_EVENTCATEGORYSTATIC, szCategory); - SetDlgItemTextW(hDlg, IDC_EVENTIDSTATIC, szEventID); - SetDlgItemTextW(hDlg, IDC_EVENTTYPESTATIC, szEventType); - SetDlgItemTextW(hDlg, IDC_EVENTTEXTEDIT, szEventText); - SetDlgItemTextW(hDlg, IDC_EVENTDATAEDIT, szEventData); - } - else + 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; + + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, ARRAYSIZE(szEventType)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, ARRAYSIZE(szDate)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, ARRAYSIZE(szTime)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, ARRAYSIZE(szSource)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, ARRAYSIZE(szCategory)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, ARRAYSIZE(szEventID)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, ARRAYSIZE(szUser)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, ARRAYSIZE(szComputer)); + + SetDlgItemTextW(hDlg, IDC_EVENTDATESTATIC, szDate); + SetDlgItemTextW(hDlg, IDC_EVENTTIMESTATIC, szTime); + SetDlgItemTextW(hDlg, IDC_EVENTUSERSTATIC, szUser); + SetDlgItemTextW(hDlg, IDC_EVENTSOURCESTATIC, szSource); + SetDlgItemTextW(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); + SetDlgItemTextW(hDlg, IDC_EVENTCATEGORYSTATIC, szCategory); + SetDlgItemTextW(hDlg, IDC_EVENTIDSTATIC, szEventID); + 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); } VOID @@ -1502,14 +1491,14 @@ IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: - { return TRUE; - } } return FALSE; } @@ -1574,9 +1563,11 @@ CopyEventEntry(hDlg); return (INT_PTR)TRUE; + // UNIMPLEMENTED! case IDC_BYTESRADIO: return (INT_PTR)TRUE; + // UNIMPLEMENTED! case IDC_WORDRADIO: return (INT_PTR)TRUE; 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 00:34:40 2016 @@ -76,12 +76,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "&ÐÐ°Ð½Ð½Ð¸:", IDC_STATIC, 8, 169, 25, 8 CONTROL "&ÐÐ°Ð¹ÑÐ¾Ð²Ðµ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 40, 8 CONTROL "&ÐÑÐ¼Ð¸", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 85, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "ÐÐ¾Ð¼Ð¾&Ñ", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", IDOK, 206, 228, 50, 14 @@ -114,7 +114,6 @@ IDS_COLUMNEVENT "Ð¡ÑÐ±Ð¸ÑÐ¸Ðµ" IDS_COLUMNUSER "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»" IDS_COLUMNCOMPUTER "ÐÐ¾Ð¼Ð¿ÑÑÑÑ" - IDS_COLUMNEVENTDATA "ÐÐ°Ð½Ð½Ð¸ Ð·Ð° ÑÑÐ±Ð¸ÑÐ¸ÐµÑÐ¾" END STRINGTABLE 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 00:34:40 2016 @@ -76,12 +76,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Byty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&NÃ¡povÄda", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&ZavÅÃt", IDOK, 206, 228, 50, 14 @@ -114,7 +114,6 @@ IDS_COLUMNEVENT "UdÃ¡lost" IDS_COLUMNUSER "UÅ¾ivatel" IDS_COLUMNCOMPUTER "PoÄÃtaÄ" - IDS_COLUMNEVENTDATA "Data udÃ¡losti" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&aten:", IDC_STATIC, 8, 169, 24, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Hilfe", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&SchlieÃen", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Ereignis" IDS_COLUMNUSER "Benutzer" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Ereignisdaten" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "Î&ÎµÎ´Î¿Î¼ÎÎ½Î±:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&ÎÎ¿Î®Î¸ÎµÎ¹Î±", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&ÎÎ»ÎµÎ¯ÏÎ¹Î¼Î¿", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -89,7 +89,7 @@ LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Help", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Close", IDOK, 206, 228, 50, 14 @@ -122,7 +122,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&atos:", IDC_STATIC, 8, 169, 25, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Ayuda", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Cerrar", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Evento" IDS_COLUMNUSER "Usuario" IDS_COLUMNCOMPUTER "Equipo" - IDS_COLUMNEVENTDATA "Datos del evento" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "DonnÃ©es :", IDC_STATIC, 8, 169, 35, 8 CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 50, 169, 34, 8 CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 88, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "Aide", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "Fermer", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "ÃvÃ©nement" IDS_COLUMNUSER "Utilisateur" IDS_COLUMNCOMPUTER "Ordinateur" - IDS_COLUMNEVENTDATA "DonnÃ©es" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "× ×ª×× ××:", IDC_STATIC, 8, 169, 20, 8 CONTROL "××ª××", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "×××××", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "×¢××¨×", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "×¡×××¨", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "×××¨××¢" IDS_COLUMNUSER "××©×ª××©" IDS_COLUMNCOMPUTER "×××©×" - IDS_COLUMNEVENTDATA "××××¢ ××××" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ati:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Aiuto", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Chiudi", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Evento" IDS_COLUMNUSER "Utente" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Dati Evento" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "ãã¼ã¿(&A):", IDC_STATIC, 8, 169, 20, 8 CONTROL "ãã¤ã(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "ã¯ã¼ã(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "ãã«ã(&H)", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "éãã(&C)", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "ë°ì´í°(&A):", IDC_STATIC, 8, 169, 20, 8 CONTROL "ë°ì´í¸(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "ê¸ì(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "ëìë§(&H)", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "ë«ê¸°(&C)", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -76,12 +76,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ata", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Tegn", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Hjelp", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Lukk", IDOK, 206, 228, 50, 14 @@ -114,7 +114,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -80,12 +80,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ane", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&SÅowa", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "Po&moc", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Zamknij", IDOK, 206, 228, 50, 14 @@ -118,7 +118,6 @@ IDS_COLUMNEVENT "Zdarzenie" IDS_COLUMNUSER "UÅ¼ytkownik" IDS_COLUMNCOMPUTER "Komputer" - IDS_COLUMNEVENTDATA "Dane zdarzenia" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "Dad&os:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "A&juda", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Fechar", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Evento" IDS_COLUMNUSER "UsuÃ¡rio" IDS_COLUMNCOMPUTER "Computador" - IDS_COLUMNEVENTDATA "Dados do Evento" END STRINGTABLE 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 00:34:40 2016 @@ -81,12 +81,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ate:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&8 biÈi", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&16 biÈi", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&Manualâ¦", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "Ã&nchide", IDOK, 206, 228, 50, 14 @@ -119,7 +119,6 @@ IDS_COLUMNEVENT "Eveniment" IDS_COLUMNUSER "Utilizator" IDS_COLUMNCOMPUTER "Calculator" - IDS_COLUMNEVENTDATA "Date eveniment" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "ÐÐ°Ð½Ð½ÑÐµ:", IDC_STATIC, 8, 169, 30, 8 CONTROL "&ÐÐ°Ð¹ÑÑ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 49, 169, 34, 8 CONTROL "&Ð¡Ð»Ð¾Ð²Ð°", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 87, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "Ð&Ð¾Ð¼Ð¾ÑÑ", IDHELP, 8, 228, 55, 14 DEFPUSHBUTTON "&ÐÐ°ÐºÑÑÑÑ", IDOK, 199, 228, 55, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "Ð¡Ð¾Ð±ÑÑÐ¸Ðµ" IDS_COLUMNUSER "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" IDS_COLUMNCOMPUTER "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ" - IDS_COLUMNEVENTDATA "ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾Ð±ÑÑÐ¸Ñ" END STRINGTABLE 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 00:34:40 2016 @@ -81,12 +81,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "Ã&daje:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bajty", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&SlovÃ¡", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&PomocnÃk", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&ZavrieÅ¥", IDOK, 206, 228, 50, 14 @@ -119,7 +119,6 @@ IDS_COLUMNEVENT "Event" IDS_COLUMNUSER "User" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" END STRINGTABLE 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 00:34:40 2016 @@ -84,12 +84,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ata:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Bytes", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Word", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "NdihmÃ«", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "Mbylle", IDOK, 206, 228, 50, 14 @@ -122,7 +122,6 @@ IDS_COLUMNEVENT "Ngjarja" IDS_COLUMNUSER "PÃ«rdoruesi" IDS_COLUMNCOMPUTER "Kompjuter" - IDS_COLUMNEVENTDATA "Data e Ngjarjes" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "D&ata", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Byte", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Ord", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&HjÃ¤lp", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&StÃ¤ng", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "HÃ¤ndelse" IDS_COLUMNUSER "AnvÃ¤ndare" IDS_COLUMNCOMPUTER "Dator" - IDS_COLUMNEVENTDATA "HÃ¤ndelsedata" END STRINGTABLE 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 00:34:40 2016 @@ -84,12 +84,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "Veri:", IDC_STATIC, 8, 169, 20, 8 CONTROL "&Ãoklu", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "SÃ¶&zcÃ¼k", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&YardÄ±m", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&Kapat", IDOK, 206, 228, 50, 14 @@ -122,7 +122,6 @@ IDS_COLUMNEVENT "Olay" IDS_COLUMNUSER "KullanÄ±cÄ±" IDS_COLUMNCOMPUTER "Bilgisayar" - IDS_COLUMNEVENTDATA "Olay Verisi" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "Ð&aÑÐ°", IDC_STATIC, 8, 169, 20, 8 CONTROL "&ÐÐ°Ð¹Ñ", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "&Ð¡Ð»Ð¾Ð²Ð¾", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "&ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "&ÐÐ°ÐºÑÐ¸ÑÐ¸", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "ÐÐ¾Ð´ÑÑ" IDS_COLUMNUSER "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ" IDS_COLUMNCOMPUTER "ÐÐ¾Ð¼Ð¿'ÑÑÐµÑ" - IDS_COLUMNEVENTDATA "ÐÐ°Ð½Ñ Ð¿Ð¾Ð´ÑÑ" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "æ°æ®(&A)", IDC_STATIC, 8, 169, 20, 8 CONTROL "åè(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "å(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "å¸®å©(&H)", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "å³é(&C)", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "äºä»¶" IDS_COLUMNUSER "ç¨æ·" IDS_COLUMNCOMPUTER "è®¡ç®æº" - IDS_COLUMNEVENTDATA "äºä»¶æ°æ®" END STRINGTABLE 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 00:34:40 2016 @@ -78,12 +78,12 @@ 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 + EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER LTEXT "è³æ(&A)", IDC_STATIC, 8, 169, 20, 8 CONTROL "ä½åçµ(&B)", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 169, 34, 8 CONTROL "ä½å(&W)", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 169, 33, 8 - EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EVENTDATAEDIT, 8, 179, 247, 44, ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_BORDER PUSHBUTTON "èª¬æ(&H)", IDHELP, 8, 228, 50, 14 DEFPUSHBUTTON "éé(&C)", IDOK, 206, 228, 50, 14 @@ -116,7 +116,6 @@ IDS_COLUMNEVENT "äºä»¶" IDS_COLUMNUSER "ä½¿ç¨è" IDS_COLUMNCOMPUTER "é»è¦" - IDS_COLUMNEVENTDATA "äºä»¶è³æ" END STRINGTABLE 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 00:34:40 2016 @@ -76,7 +76,6 @@ #define IDS_COLUMNEVENT 305 #define IDS_COLUMNUSER 306 #define IDS_COLUMNCOMPUTER 307 -#define IDS_COLUMNEVENTDATA 308 #define IDS_COPY 400

1 0

[hbelusca] 71367: [EVENTVWR] - Finish to convert the app to full unicode; - Don't hardcode buffer lengths in function calls; - Remove useless #pragma incantation; - Whitespace fix.
by hbelusca＠svn.reactos.org 21 May '16

21 May '16

Author: hbelusca Date: Sat May 21 21:44:14 2016 New Revision: 71367 URL: http://svn.reactos.org/svn/reactos?rev=71367&view=rev Log: [EVENTVWR] - Finish to convert the app to full unicode; - Don't hardcode buffer lengths in function calls; - Remove useless #pragma incantation; - Whitespace fix. 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] Sat May 21 21:44:14 2016 @@ -37,13 +37,8 @@ #include "resource.h" -#if _MSC_VER - #pragma warning(disable: 4996) /* 'strdup' was declared deprecated */ - #define _CRT_SECURE_NO_DEPRECATE /* all deprecated unsafe string functions */ -#endif - -static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name*/ -static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name */ +static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; // MessageFile message buffer size #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 @@ -74,7 +69,7 @@ LPWSTR lpComputerName = NULL; DWORD dwNumLogs = 0; -WCHAR **LogNames; +LPWSTR* LogNames; /* Forward declarations of functions included in this code module: */ ATOM MyRegisterClass(HINSTANCE hInstance); @@ -101,14 +96,14 @@ /* Whenever any of the common controls are used in your app, * you must call InitCommonControlsEx() to register the classes * for those controls. */ - iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwSize = sizeof(iccx); iccx.dwICC = ICC_LISTVIEW_CLASSES; InitCommonControlsEx(&iccx); /* Initialize global strings */ - LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadStringW(hInstance, IDS_APP_TITLE_EX, szTitleTemplate, MAX_LOADSTRING); - LoadStringW(hInstance, IDS_STATUS_MSG, szStatusBarTemplate, MAX_LOADSTRING); + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAYSIZE(szTitle)); + LoadStringW(hInstance, IDS_APP_TITLE_EX, szTitleTemplate, ARRAYSIZE(szTitleTemplate)); + LoadStringW(hInstance, IDS_STATUS_MSG, szStatusBarTemplate, ARRAYSIZE(szStatusBarTemplate)); MyRegisterClass(hInstance); /* Perform application initialization: */ @@ -117,7 +112,7 @@ return FALSE; } - hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDA_EVENTVWR)); + hAccelTable = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDA_EVENTVWR)); /* Main message loop: */ while (GetMessageW(&msg, NULL, 0, 0)) @@ -125,7 +120,7 @@ if (!TranslateAcceleratorW(msg.hwnd, hAccelTable, &msg)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } @@ -207,7 +202,7 @@ OUT PWCHAR ExpandedName) { DWORD dwSize; - BYTE szModuleName[MAX_PATH]; + WCHAR szModuleName[MAX_PATH]; WCHAR szKeyName[MAX_PATH]; HKEY hAppKey = NULL; HKEY hSourceKey = NULL; @@ -217,27 +212,27 @@ StringCbCatW(szKeyName, sizeof(szKeyName), lpLogName); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - szKeyName, - 0, - KEY_READ, - &hAppKey) == ERROR_SUCCESS) + szKeyName, + 0, + KEY_READ, + &hAppKey) == ERROR_SUCCESS) { if (RegOpenKeyExW(hAppKey, - SourceName, - 0, - KEY_READ, - &hSourceKey) == ERROR_SUCCESS) - { - dwSize = MAX_PATH; + SourceName, + 0, + KEY_READ, + &hSourceKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szModuleName); if (RegQueryValueExW(hSourceKey, - EntryName, - NULL, - NULL, - (LPBYTE)szModuleName, - &dwSize) == ERROR_SUCCESS) + EntryName, + NULL, + NULL, + (LPBYTE)szModuleName, + &dwSize) == ERROR_SUCCESS) { /* Returns a string containing the requested substituted environment variable. */ - ExpandEnvironmentStringsW((LPCWSTR)szModuleName, ExpandedName, MAX_PATH); + ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); /* Successful */ bReturn = TRUE; @@ -269,21 +264,20 @@ WCHAR szMessageDLL[MAX_PATH]; LPVOID lpMsgBuf = NULL; - if (GetEventMessageFileDLL (KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) - { - hLibrary = LoadLibraryExW(szMessageDLL, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) + { + hLibrary = LoadLibraryExW(szMessageDLL, NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary != NULL) { /* Retrieve the message string. */ if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventCategory, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, - EVENT_MESSAGE_FILE_BUFFER, - NULL) != 0) + hLibrary, + pevlr->EventCategory, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, + EVENT_MESSAGE_FILE_BUFFER, + NULL) != 0) { /* Trim the string */ TrimNulls(lpMsgBuf); @@ -331,7 +325,7 @@ BOOL bDone = FALSE; /* TODO : GetEventMessageFileDLL can return a comma separated list of DLLs */ - if (GetEventMessageFileDLL (KeyName, SourceName, EVENT_MESSAGE_FILE, SourceModuleName)) + if (GetEventMessageFileDLL(KeyName, SourceName, EVENT_MESSAGE_FILE, SourceModuleName)) { /* Get the event message */ szMessage = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); @@ -360,9 +354,8 @@ szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); while ((szDll != NULL) && (!bDone)) { - hLibrary = LoadLibraryExW(szDll, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + hLibrary = LoadLibraryExW(szDll, NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary == NULL) { /* The DLL could not be loaded try the next one (if any) */ @@ -372,15 +365,15 @@ { /* Retrieve the message string. */ if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventID, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, - 0, - (va_list*)szArguments) == 0) + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ARGUMENT_ARRAY, + hLibrary, + pevlr->EventID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuf, + 0, + (va_list*)szArguments) == 0) { /* We haven't found the string , get next DLL (if any) */ szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); @@ -406,7 +399,7 @@ if (!bDone) { - LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); } @@ -416,7 +409,7 @@ return bDone; } - LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); return FALSE; @@ -471,12 +464,12 @@ if (pelr->UserSidLength > 0) { if (LookupAccountSidW(NULL, - lpSid, - szName, - &cbName, - szDomain, - &cbDomain, - &peUse)) + lpSid, + szName, + &cbName, + szDomain, + &cbDomain, + &peUse)) { StringCchCopyW(pszUser, MAX_PATH, szName); return TRUE; @@ -494,11 +487,11 @@ HWND hWnd; MSG Msg; - hWnd = CreateDialogParam(hInst, - MAKEINTRESOURCE(IDD_PROGRESSBOX), - GetDesktopWindow(), - StatusMessageWindowProc, - (LPARAM)NULL); + hWnd = CreateDialogParamW(hInst, + MAKEINTRESOURCEW(IDD_PROGRESSBOX), + GetDesktopWindow(), + StatusMessageWindowProc, + (LPARAM)NULL); if (!hWnd) return 0; @@ -507,10 +500,10 @@ ShowWindow(hWnd, SW_SHOW); /* Message loop for the Status window */ - while (GetMessage(&Msg, NULL, 0, 0)) + while (GetMessageW(&Msg, NULL, 0, 0)) { TranslateMessage(&Msg); - DispatchMessage(&Msg); + DispatchMessageW(&Msg); } return 0; @@ -550,8 +543,7 @@ dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; /* Open the event log. */ - hEventLog = OpenEventLogW(lpMachineName, - lpLogName); + hEventLog = OpenEventLogW(lpMachineName, lpLogName); if (hEventLog == NULL) { ShowLastWin32Error(); @@ -562,7 +554,7 @@ lpComputerName = lpMachineName; /* Disable listview redraw */ - SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); + SendMessageW(hwndListView, WM_SETREDRAW, FALSE, 0); /* Clear the list view */ (void)ListView_DeleteAllItems (hwndListView); @@ -585,7 +577,7 @@ EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED); } - g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PVOID)); + g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs)); /* If we have at least 1000 records show the waiting dialog */ if (dwTotalRecords > 1000) @@ -600,29 +592,29 @@ while (dwCurrentRecord < dwTotalRecords) { - pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(*pevlr)); g_RecordPtrs[dwCurrentRecord] = pevlr; - bResult = ReadEventLog(hEventLog, // Event log handle - dwFlags, // Sequential read - 0, // Ignored for sequential read - pevlr, // Pointer to buffer - sizeof(EVENTLOGRECORD), // Size of buffer - &dwRead, // Number of bytes read - &dwNeeded); // Bytes in the next record - if((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) + bResult = ReadEventLogW(hEventLog, // Event log handle + dwFlags, // Sequential read + 0, // Ignored for sequential read + pevlr, // Pointer to buffer + sizeof(*pevlr), // Size of buffer + &dwRead, // Number of bytes read + &dwNeeded); // Bytes in the next record + if ((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) { HeapFree(GetProcessHeap(), 0, pevlr); pevlr = HeapAlloc(GetProcessHeap(), 0, dwNeeded); g_RecordPtrs[dwCurrentRecord] = pevlr; ReadEventLogW(hEventLog, // event log handle - dwFlags, // read flags - 0, // offset; default is 0 - pevlr, // pointer to buffer - dwNeeded, // size of buffer - &dwRead, // number of bytes read - &dwNeeded); // bytes in next record + dwFlags, // read flags + 0, // offset; default is 0 + pevlr, // pointer to buffer + dwNeeded, // size of buffer + &dwRead, // number of bytes read + &dwNeeded); // bytes in next record } while (dwRead > 0) @@ -637,7 +629,7 @@ // Get the computer name lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); - // This ist the data section of the current event + // This is the data section of the current event lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset); // Compute the event type @@ -695,15 +687,15 @@ ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpSourceName); ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, szCategory); ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User - ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer + ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); MultiByteToWideChar(CP_ACP, 0, lpData, pevlr->DataLength, szData, MAX_PATH); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, szData); //Event Text + ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, szData); // Event Text dwRead -= pevlr->Length; pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); @@ -714,11 +706,11 @@ } // All events loaded - if(hwndDlg) + if (hwndDlg) EndDialog(hwndDlg, 0); StringCchPrintfExW(szWindowTitle, - sizeof(szWindowTitle) / sizeof(WCHAR), + ARRAYSIZE(szWindowTitle), &lpTitleTemplateEnd, &cchRemaining, 0, @@ -757,7 +749,7 @@ ZeroMemory(szFileName, sizeof(szFileName)); sfn.lpstrFile = szFileName; - sfn.nMaxFile = MAX_PATH; + sfn.nMaxFile = ARRAYSIZE(szFileName); if (!GetSaveFileNameW(&sfn)) { @@ -790,10 +782,10 @@ ZeroMemory(szFileName, sizeof(szFileName)); ZeroMemory(szMessage, sizeof(szMessage)); - LoadStringW(hInst, IDS_CLEAREVENTS_MSG, szMessage, MAX_LOADSTRING); + LoadStringW(hInst, IDS_CLEAREVENTS_MSG, szMessage, ARRAYSIZE(szMessage)); sfn.lpstrFile = szFileName; - sfn.nMaxFile = MAX_PATH; + sfn.nMaxFile = ARRAYSIZE(szFileName); switch (MessageBoxW(hwndMainWindow, szMessage, szTitle, MB_YESNOCANCEL | MB_ICONINFORMATION)) { @@ -851,23 +843,23 @@ { WNDCLASSEXW wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(wcex); wcex.style = 0; wcex.lpfnWndProc = WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EVENTVWR)); - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_EVENTVWR)); + wcex.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wcex.lpszMenuName = MAKEINTRESOURCE(IDM_EVENTVWR); + wcex.lpszMenuName = MAKEINTRESOURCEW(IDM_EVENTVWR); wcex.lpszClassName = szWindowClass; - wcex.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_EVENTVWR), - IMAGE_ICON, - 16, - 16, - LR_SHARED); + wcex.hIconSm = (HICON)LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_EVENTVWR), + IMAGE_ICON, + 16, + 16, + LR_SHARED); return RegisterClassExW(&wcex); } @@ -974,7 +966,7 @@ return; } - LogNames = HeapAlloc(GetProcessHeap(), 0, (dwNumLogs + 1) * sizeof(WCHAR*)); + LogNames = HeapAlloc(GetProcessHeap(), 0, (dwNumLogs + 1) * sizeof(LPWSTR)); if (!LogNames) { @@ -1001,7 +993,13 @@ 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); + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, + hLibrary, + dwMessageID, + 0, + (LPWSTR)&lpDisplayName, + 0, + NULL); FreeLibrary(hLibrary); } @@ -1068,43 +1066,43 @@ hInst = hInstance; // Store instance handle in our global variable hwndMainWindow = CreateWindowW(szWindowClass, - szTitle, - WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, - NULL, - NULL, - hInstance, - NULL); + szTitle, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + NULL, + NULL, + hInstance, + NULL); if (!hwndMainWindow) { return FALSE; } hwndStatus = CreateWindowExW(0, // no extended styles - STATUSCLASSNAMEW, // status bar - L"Done.", // no text - WS_CHILD | WS_BORDER | WS_VISIBLE, // styles - 0, 0, 0, 0, // x, y, cx, cy - hwndMainWindow, // parent window - (HMENU)100, // window ID - hInstance, // instance - NULL); // window data + STATUSCLASSNAMEW, // status bar + L"", // no text + WS_CHILD | WS_BORDER | WS_VISIBLE, // styles + 0, 0, 0, 0, // x, y, cx, cy + hwndMainWindow, // parent window + (HMENU)100, // window ID + hInstance, // instance + NULL); // window data // Create our listview child window. Note that I use WS_EX_CLIENTEDGE // and WS_BORDER to create the normal "sunken" look. Also note that // LVS_EX_ styles cannot be set in CreateWindowEx(). hwndListView = CreateWindowExW(WS_EX_CLIENTEDGE, - WC_LISTVIEWW, - L"", - LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, - 0, - 0, - 243, - 200, - hwndMainWindow, - NULL, - hInstance, - NULL); + WC_LISTVIEWW, + L"", + LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, + 0, + 0, + 243, + 200, + hwndMainWindow, + NULL, + hInstance, + NULL); // After the ListView is created, we can add extended list view styles. (void)ListView_SetExtendedListViewStyle (hwndListView, LVS_EX_FULLROWSELECT); @@ -1117,12 +1115,12 @@ 1); // Add event type icons to ImageList - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_INFORMATIONICON))); - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WARNINGICON))); - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ERRORICON))); + ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_INFORMATIONICON))); + ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WARNINGICON))); + ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_ERRORICON))); // Assign ImageList to List View - (void)ListView_SetImageList (hwndListView, hSmall, LVSIL_SMALL); + (void)ListView_SetImageList(hwndListView, hSmall, LVSIL_SMALL); // Now set up the listview with its columns. lvc.mask = LVCF_TEXT | LVCF_WIDTH; @@ -1130,7 +1128,7 @@ LoadStringW(hInstance, IDS_COLUMNTYPE, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 0, &lvc); @@ -1138,7 +1136,7 @@ LoadStringW(hInstance, IDS_COLUMNDATE, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 1, &lvc); @@ -1146,7 +1144,7 @@ LoadStringW(hInstance, IDS_COLUMNTIME, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 2, &lvc); @@ -1154,7 +1152,7 @@ LoadStringW(hInstance, IDS_COLUMNSOURCE, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 3, &lvc); @@ -1162,7 +1160,7 @@ LoadStringW(hInstance, IDS_COLUMNCATEGORY, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 4, &lvc); @@ -1170,7 +1168,7 @@ LoadStringW(hInstance, IDS_COLUMNEVENT, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 5, &lvc); @@ -1178,7 +1176,7 @@ LoadStringW(hInstance, IDS_COLUMNUSER, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 6, &lvc); @@ -1186,7 +1184,7 @@ LoadStringW(hInstance, IDS_COLUMNCOMPUTER, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 7, &lvc); @@ -1194,7 +1192,7 @@ LoadStringW(hInstance, IDS_COLUMNEVENTDATA, szTemp, - sizeof(szTemp) / sizeof(WCHAR)); + ARRAYSIZE(szTemp)); lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 8, &lvc); @@ -1202,7 +1200,7 @@ ZeroMemory(&sfn, sizeof(sfn)); ZeroMemory(szSaveFilter, sizeof(szSaveFilter)); - LoadStringW(hInst, IDS_SAVE_FILTER, szSaveFilter, MAX_LOADSTRING); + LoadStringW(hInst, IDS_SAVE_FILTER, szSaveFilter, ARRAYSIZE(szSaveFilter)); sfn.lStructSize = sizeof(sfn); sfn.hwndOwner = hwndMainWindow; @@ -1236,6 +1234,14 @@ case WM_CREATE: hMainMenu = GetMenu(hWnd); break; + + case WM_DESTROY: + { + FreeRecords(); + FreeLogList(); + PostQuitMessage(0); + break; + } case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) @@ -1248,10 +1254,10 @@ if (lpnmitem->iItem != -1) { - DialogBox(hInst, - MAKEINTRESOURCE(IDD_EVENTPROPERTIES), - hWnd, - EventDetails); + DialogBoxW(hInst, + MAKEINTRESOURCEW(IDD_EVENTPROPERTIES), + hWnd, + EventDetails); } } break; @@ -1259,6 +1265,7 @@ break; case WM_COMMAND: + { // Parse the menu selections: if ((LOWORD(wParam) >= ID_FIRST_LOG) && (LOWORD(wParam) <= ID_FIRST_LOG + dwNumLogs)) @@ -1291,26 +1298,28 @@ break; case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_ABOUTBOX), hWnd, About); break; case IDM_HELP: MessageBoxW(hwndMainWindow, - L"Help not implemented yet!", - L"Event Log", - MB_OK | MB_ICONINFORMATION); - break; + L"Help not implemented yet!", + L"Event Log", + MB_OK | MB_ICONINFORMATION); + break; case IDM_EXIT: DestroyWindow(hWnd); break; default: - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); } break; + } case WM_SIZE: + { // Gets the window rectangle GetClientRect(hWnd, &rect); @@ -1323,17 +1332,12 @@ 1); // Resize the statusbar; - SendMessage(hwndStatus, message, wParam, lParam); + SendMessageW(hwndStatus, message, wParam, lParam); break; - - case WM_DESTROY: - FreeRecords(); - FreeLogList(); - PostQuitMessage(0); - break; + } default: - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); } return 0; @@ -1348,9 +1352,9 @@ switch (message) { case WM_INITDIALOG: - { - return (INT_PTR)TRUE; - } + { + return (INT_PTR)TRUE; + } case WM_COMMAND: if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) @@ -1383,7 +1387,7 @@ int iIndex; // Get index of selected item - iIndex = (int)SendMessage (hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); + iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); li.mask = LVIF_PARAM; li.iItem = iIndex; @@ -1395,14 +1399,14 @@ if (iIndex != -1) { - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) / sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, ARRAYSIZE(szEventType)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, ARRAYSIZE(szDate)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, ARRAYSIZE(szTime)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, ARRAYSIZE(szSource)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, ARRAYSIZE(szCategory)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, ARRAYSIZE(szEventID)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, ARRAYSIZE(szUser)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, ARRAYSIZE(szComputer)); bEventData = !(pevlr->DataLength == 0); @@ -1423,7 +1427,6 @@ SetDlgItemTextW(hDlg, IDC_EVENTDATESTATIC, szDate); SetDlgItemTextW(hDlg, IDC_EVENTTIMESTATIC, szTime); - SetDlgItemTextW(hDlg, IDC_EVENTUSERSTATIC, szUser); SetDlgItemTextW(hDlg, IDC_EVENTSOURCESTATIC, szSource); SetDlgItemTextW(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); @@ -1436,9 +1439,9 @@ else { MessageBoxW(NULL, - L"No Items in ListView", - L"Error", - MB_OK | MB_ICONINFORMATION); + L"No Items in ListView", + L"Error", + MB_OK | MB_ICONINFORMATION); } } @@ -1464,18 +1467,18 @@ EmptyClipboard(); /* Get the formatted text needed to place the content into */ - LoadStringW(hInst, IDS_COPY, tmpHeader, sizeof(tmpHeader) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_COPY, tmpHeader, ARRAYSIZE(tmpHeader)); /* Grabs all the information and get it ready for the clipboard */ - GetDlgItemText(hWnd, IDC_EVENTTYPESTATIC, szEventType, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTSOURCESTATIC, szSource, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTCATEGORYSTATIC, szCategory, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTIDSTATIC, szEventID, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTDATESTATIC, szDate, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTTIMESTATIC, szTime, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTUSERSTATIC, szUser, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ENTRY_SIZE); + GetDlgItemTextW(hWnd, IDC_EVENTTYPESTATIC, szEventType, ARRAYSIZE(szEventType)); + GetDlgItemTextW(hWnd, IDC_EVENTSOURCESTATIC, szSource, ARRAYSIZE(szSource)); + GetDlgItemTextW(hWnd, IDC_EVENTCATEGORYSTATIC, szCategory, ARRAYSIZE(szCategory)); + GetDlgItemTextW(hWnd, IDC_EVENTIDSTATIC, szEventID, ARRAYSIZE(szEventID)); + GetDlgItemTextW(hWnd, IDC_EVENTDATESTATIC, szDate, ARRAYSIZE(szDate)); + GetDlgItemTextW(hWnd, IDC_EVENTTIMESTATIC, szTime, ARRAYSIZE(szTime)); + GetDlgItemTextW(hWnd, IDC_EVENTUSERSTATIC, szUser, ARRAYSIZE(szUser)); + GetDlgItemTextW(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, ARRAYSIZE(szComputer)); + GetDlgItemTextW(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ARRAYSIZE(evtDesc)); /* Consolidate the information into on big piece */ wsprintfW(output, tmpHeader, szEventType, szSource, szCategory, szEventID, szDate, szTime, szUser, szComputer, evtDesc); @@ -1515,13 +1518,13 @@ VOID InitDetailsDlg(HWND hDlg) { - HANDLE nextIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_NEXT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - HANDLE prevIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_PREV), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - HANDLE copyIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_COPY), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - - SendMessage(GetDlgItem(hDlg, IDC_NEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); - SendMessage(GetDlgItem(hDlg, IDC_PREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); - SendMessage(GetDlgItem(hDlg, IDC_COPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); + 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); } // Message handler for event details box. @@ -1533,11 +1536,13 @@ switch (message) { case WM_INITDIALOG: + { InitDetailsDlg(hDlg); // Show event info on dialog box DisplayEvent(hDlg); return (INT_PTR)TRUE; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -1548,18 +1553,22 @@ return (INT_PTR)TRUE; case IDC_PREVIOUS: - SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0); + { + SendMessageW(hwndListView, WM_KEYDOWN, VK_UP, 0); // Show event info on dialog box DisplayEvent(hDlg); return (INT_PTR)TRUE; + } case IDC_NEXT: - SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0); + { + SendMessageW(hwndListView, WM_KEYDOWN, VK_DOWN, 0); // Show event info on dialog box DisplayEvent(hDlg); return (INT_PTR)TRUE; + } case IDC_COPY: CopyEventEntry(hDlg); @@ -1573,9 +1582,9 @@ case IDHELP: MessageBoxW(hDlg, - L"Help not implemented yet!", - L"Event Log", - MB_OK | MB_ICONINFORMATION); + L"Help not implemented yet!", + L"Event Log", + MB_OK | MB_ICONINFORMATION); return (INT_PTR)TRUE; default:

1 0

[hbelusca] 71366: [FREELDR]: Increase again the number of BIOS memory descriptors to 80. CORE-11247 #comment Please retest.
by hbelusca＠svn.reactos.org 21 May '16

21 May '16

Author: hbelusca Date: Sat May 21 16:12:31 2016 New Revision: 71366 URL: http://svn.reactos.org/svn/reactos?rev=71366&view=rev Log: [FREELDR]: Increase again the number of BIOS memory descriptors to 80. CORE-11247 #comment Please retest. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sat May 21 16:12:31 2016 @@ -27,7 +27,7 @@ DBG_DEFAULT_CHANNEL(MEMORY); -#define MAX_BIOS_DESCRIPTORS 40 +#define MAX_BIOS_DESCRIPTORS 80 BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; ULONG PcBiosMapCount;

1 0

[ekohl] 71365: [SAMSRV] Implement SamrGetDomainPasswordInformation.
by ekohl＠svn.reactos.org 21 May '16

21 May '16

Author: ekohl Date: Sat May 21 15:05:49 2016 New Revision: 71365 URL: http://svn.reactos.org/svn/reactos?rev=71365&view=rev Log: [SAMSRV] Implement SamrGetDomainPasswordInformation. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat May 21 15:05:49 2016 @@ -9212,6 +9212,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 56 */ NTSTATUS NTAPI @@ -9219,8 +9220,59 @@ IN PRPC_UNICODE_STRING Unused, OUT PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SAMPR_HANDLE ServerHandle = NULL; + PSAM_DB_OBJECT DomainObject = NULL; + SAM_DOMAIN_FIXED_DATA FixedData; + ULONG Length; + NTSTATUS Status; + + TRACE("(%p %p %p)\n", BindingHandle, Unused, PasswordInformation); + + Status = SamrConnect(NULL, + &ServerHandle, + SAM_SERVER_LOOKUP_DOMAIN); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrConnect() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampOpenDbObject((PSAM_DB_OBJECT)ServerHandle, + L"Domains", + L"Account", + 0, + SamDbDomainObject, + DOMAIN_READ_PASSWORD_PARAMETERS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampOpenDbObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + &FixedData, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + + PasswordInformation->MinPasswordLength = FixedData.MinPasswordLength; + PasswordInformation->PasswordProperties = FixedData.PasswordProperties; + +done: + if (DomainObject != NULL) + SampCloseDbObject(DomainObject); + + if (ServerHandle != NULL) + SamrCloseHandle(ServerHandle); + + return Status; }

1 0

[ekohl] 71364: [SAMSRV] Add LM_OWF_PASSWORD and NT_OWF_PASSWORD types and use them. See MS-NRPC sections 2.2.1.1.1 to 2.2.1.1.4.
by ekohl＠svn.reactos.org 21 May '16

21 May '16

Author: ekohl Date: Sat May 21 13:12:53 2016 New Revision: 71364 URL: http://svn.reactos.org/svn/reactos?rev=71364&view=rev Log: [SAMSRV] Add LM_OWF_PASSWORD and NT_OWF_PASSWORD types and use them. See MS-NRPC sections 2.2.1.1.1 to 2.2.1.1.4. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/sdk/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat May 21 13:12:53 2016 @@ -300,10 +300,10 @@ IN PUNICODE_STRING OldPassword, IN PUNICODE_STRING NewPassword) { - ENCRYPTED_NT_OWF_PASSWORD OldNtPassword; - ENCRYPTED_NT_OWF_PASSWORD NewNtPassword; - ENCRYPTED_LM_OWF_PASSWORD OldLmPassword; - ENCRYPTED_LM_OWF_PASSWORD NewLmPassword; + NT_OWF_PASSWORD OldNtPassword; + NT_OWF_PASSWORD NewNtPassword; + LM_OWF_PASSWORD OldLmPassword; + LM_OWF_PASSWORD NewLmPassword; OEM_STRING LmPwdString; CHAR LmPwdBuffer[15]; BOOLEAN OldLmPasswordPresent = FALSE; @@ -312,8 +312,8 @@ ENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm; ENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm; - ENCRYPTED_LM_OWF_PASSWORD OldNtEncryptedWithNewNt; - ENCRYPTED_LM_OWF_PASSWORD NewNtEncryptedWithOldNt; + ENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt; + ENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt; PENCRYPTED_LM_OWF_PASSWORD pOldLmEncryptedWithNewLm = NULL; PENCRYPTED_LM_OWF_PASSWORD pNewLmEncryptedWithOldLm = NULL; @@ -377,6 +377,7 @@ if (OldLmPasswordPresent && NewLmPasswordPresent) { + /* Encrypt the old LM hash with the new LM hash */ Status = SystemFunction012((const BYTE *)&OldLmPassword, (const BYTE *)&NewLmPassword, (LPBYTE)&OldLmEncryptedWithNewLm); @@ -386,6 +387,7 @@ return Status; } + /* Encrypt the new LM hash with the old LM hash */ Status = SystemFunction012((const BYTE *)&NewLmPassword, (const BYTE *)&OldLmPassword, (LPBYTE)&NewLmEncryptedWithOldLm); @@ -399,6 +401,7 @@ pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm; } + /* Encrypt the old NT hash with the new NT hash */ Status = SystemFunction012((const BYTE *)&OldNtPassword, (const BYTE *)&NewNtPassword, (LPBYTE)&OldNtEncryptedWithNewNt); @@ -408,6 +411,7 @@ return Status; } + /* Encrypt the new NT hash with the old NT hash */ Status = SystemFunction012((const BYTE *)&NewNtPassword, (const BYTE *)&OldNtPassword, (LPBYTE)&NewNtEncryptedWithOldNt); Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat May 21 13:12:53 2016 @@ -8047,10 +8047,10 @@ { ENCRYPTED_LM_OWF_PASSWORD StoredLmPassword; ENCRYPTED_NT_OWF_PASSWORD StoredNtPassword; - ENCRYPTED_LM_OWF_PASSWORD OldLmPassword; - ENCRYPTED_LM_OWF_PASSWORD NewLmPassword; - ENCRYPTED_NT_OWF_PASSWORD OldNtPassword; - ENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + LM_OWF_PASSWORD OldLmPassword; + LM_OWF_PASSWORD NewLmPassword; + NT_OWF_PASSWORD OldNtPassword; + NT_OWF_PASSWORD NewNtPassword; BOOLEAN StoredLmPresent = FALSE; BOOLEAN StoredNtPresent = FALSE; BOOLEAN StoredLmEmpty = TRUE; Modified: trunk/reactos/sdk/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/sa… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/sam.idl [iso-8859-1] Sat May 21 13:12:53 2016 @@ -28,7 +28,10 @@ typedef struct _ENCRYPTED_LM_OWF_PASSWORD { char data[16]; -} ENCRYPTED_LM_OWF_PASSWORD, *PENCRYPTED_LM_OWF_PASSWORD, ENCRYPTED_NT_OWF_PASSWORD, *PENCRYPTED_NT_OWF_PASSWORD; +} LM_OWF_PASSWORD, *PLM_OWF_PASSWORD, + NT_OWF_PASSWORD, *PNT_OWF_PASSWORD, + ENCRYPTED_LM_OWF_PASSWORD, *PENCRYPTED_LM_OWF_PASSWORD, + ENCRYPTED_NT_OWF_PASSWORD, *PENCRYPTED_NT_OWF_PASSWORD; typedef struct _SAMPR_ULONG_ARRAY {

1 0

[pschweitzer] 71363: [NETSHELL] Update French translation CORE-10955
by pschweitzer＠svn.reactos.org 21 May '16

21 May '16

Author: pschweitzer Date: Sat May 21 09:40:18 2016 New Revision: 71363 URL: http://svn.reactos.org/svn/reactos?rev=71363&view=rev Log: [NETSHELL] Update French translation CORE-10955 Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc [iso-8859-1] Sat May 21 09:40:18 2016 @@ -78,44 +78,44 @@ IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connetions using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "Faut-il utiliser des paramÃ¨tres par dÃ©faut ou des spÃ©cifiques :", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "ParamÃ¨tres par dÃ©faut", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ParamÃ¨tres spÃ©cifiques", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "CrÃ©e les connexion rÃ©seau en utilisant le client pour les rÃ©seaux ReactOS, le partage des fichiers et des imprimantes pour les rÃ©seaux ReactOS, et le protocole de transport TCP/IP avec adressage automatique.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Cela vous autorise Ã configurer manuellement les composants rÃ©seau.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 - LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 + LTEXT "Pour le pÃ©riphÃ©rique :", IDC_STATIC, 33, 2, 100, 50 + LTEXT "s. o.", IDC_NETWORK_DEVICE, 105, 2, 253, 20 + LTEXT "Les composants sÃ©lectionnÃ©s sont utilisÃ©s par cette connexion :", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Installer...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&DÃ©-installer", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&PropriÃ©tÃ©s", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "Voulez-vous que cet ordinateur soit membre d'un domaine ?\n\ +(Vous pouvez obtenir cette information de votre administrateur rÃ©seau.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Non, cet ordinateur fera parti d'un groupe de travail.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Oui, cet ordinateur fera parti d'un domaine.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Nom du groupe de travail ou du domaine :", IDC_STATIC, 33, 72, 150, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTE : Si cet ordinateur ne fera pas parti d'un rÃ©seau, si vous n'avez pas assez de droits pour rejoindre un rÃ©seau, ou si vous ne savez pas quoi entrer, choisissez groupe de travail pour l'instant. Ces options peuvent Ãªtre changÃ©es ultÃ©rieurement.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -165,12 +165,12 @@ STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administator. A workgroup is a group of computers sharing the same workgroup name." - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_NETWORKSETTINGSTITLE "ParamÃ¨tres rÃ©seau" + IDS_NETWORKSETTINGSSUBTITLE "Installe les logiciels rÃ©seau utilisÃ©s pour se connecter Ã d'autres rÃ©seaux, ordinateurs et Ã l'Internet." + IDS_NETWORKCOMPONENTTITLE "Composants rÃ©seau" + IDS_NETWORKCOMPONENTSUBTITLE "DÃ©termine quels composants rÃ©seaux sont utilisÃ©s sur votre ordinateur. Pour ajouter de nouveaux composants, cliquez sur Installer." + IDS_NETWORKDOMAINTITLE "Groupe de travail ou domaine" + IDS_NETWORKDOMAINSUBTITLE "Un domaine est un groupe d'ordinateurs dÃ©fini par un administrateur rÃ©seau. Un groupe de travail est un groupe d'ordinateurs partageant le mÃªme nom de groupe de travail." + IDS_REACTOS_SETUP "Installation de ReactOS" + IDS_WZD_DOMAIN_NAME "L'installation ne peut pas continuer tant que\nvous n'entrez pas le nom du domaine\nou celui du groupe de travail." END

1 0

[mjansen] 71362: [MBEDTLS][SCHANNEL] Export mbedtls_ssl_config_free and use it. Patch by Peter Hater. CORE-11270 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 20 May '16

20 May '16

Author: mjansen Date: Fri May 20 17:09:56 2016 New Revision: 71362 URL: http://svn.reactos.org/svn/reactos?rev=71362&view=rev Log: [MBEDTLS][SCHANNEL] Export mbedtls_ssl_config_free and use it. Patch by Peter Hater. CORE-11270 #resolve #comment Thanks! Modified: trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec trunk/reactos/dll/win32/schannel/schannel_mbedtls.c Modified: trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/mbedt… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec [iso-8859-1] Fri May 20 17:09:56 2016 @@ -23,6 +23,7 @@ @ cdecl mbedtls_ssl_write(ptr ptr ptr) @ cdecl mbedtls_ssl_get_peer_cert(ptr) @ cdecl mbedtls_ssl_config_init(ptr) +@ cdecl mbedtls_ssl_config_free(ptr) @ cdecl mbedtls_ssl_config_defaults(ptr long long long) @ cdecl mbedtls_ssl_conf_dbg(ptr ptr ptr) @ cdecl mbedtls_ssl_setup(ptr ptr) 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] Fri May 20 17:09:56 2016 @@ -244,6 +244,7 @@ mbedtls_ssl_free(&s->ssl); mbedtls_ctr_drbg_free(&s->ctr_drbg); mbedtls_entropy_free(&s->entropy); + mbedtls_ssl_config_free(&s->conf); /* safely overwrite the freed context with zeroes */ HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, s);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs