Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[hbelusca] 71678: [EVENTVWR] - No need to pop up an error box if we cannot find an event message resource DLL for the current event log. - Flatten out GetEventMessageFileDLL a bit. - Fix a comment.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 26 19:36:38 2016 New Revision: 71678 URL: http://svn.reactos.org/svn/reactos?rev=71678&view=rev Log: [EVENTVWR] - No need to pop up an error box if we cannot find an event message resource DLL for the current event log. - Flatten out GetEventMessageFileDLL a bit. - Fix a comment. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Jun 26 19:36:38 2016 @@ -226,40 +226,36 @@ szKeyName, 0, KEY_READ, - &hAppKey) == ERROR_SUCCESS) - { - if (RegOpenKeyExW(hAppKey, - SourceName, - 0, - KEY_READ, - &hSourceKey) == ERROR_SUCCESS) - { - dwSize = sizeof(szModuleName); - if (RegQueryValueExW(hSourceKey, - EntryName, - NULL, - NULL, - (LPBYTE)szModuleName, - &dwSize) == ERROR_SUCCESS) - { - /* Returns a string containing the requested substituted environment variable */ - ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); - - /* Successful */ - bReturn = TRUE; - } - } - } - else - { - ShowLastWin32Error(); - } - - if (hSourceKey != NULL) + &hAppKey) != ERROR_SUCCESS) + { + return FALSE; + } + + if (RegOpenKeyExW(hAppKey, + SourceName, + 0, + KEY_READ, + &hSourceKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szModuleName); + if (RegQueryValueExW(hSourceKey, + EntryName, + NULL, + NULL, + (LPBYTE)szModuleName, + &dwSize) == ERROR_SUCCESS) + { + /* Returns a string containing the requested substituted environment variable */ + ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); + + /* Successful */ + bReturn = TRUE; + } + RegCloseKey(hSourceKey); - - if (hAppKey != NULL) - RegCloseKey(hAppKey); + } + + RegCloseKey(hAppKey); return bReturn; } @@ -677,14 +673,13 @@ /* Get the computer name */ lpszComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR)); - /* Compute the event type */ + /* Compute the event time */ EventTimeToSystemTime(pevlr->TimeWritten, &time); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate)); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); /* Get the username that generated the event */ GetEventUserName(pevlr, szUsername); - - 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, lpszSourceName, pevlr, szCategory);

8 years, 7 months

[tthompson] 71677: [NTFS] Remove unused parameter from SetAttributeDataLength.

by tthompson＠svn.reactos.org

Author: tthompson Date: Sun Jun 26 17:03:31 2016 New Revision: 71677 URL: http://svn.reactos.org/svn/reactos?rev=71677&view=rev Log: [NTFS] Remove unused parameter from SetAttributeDataLength. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Jun 26 17:03:31 2016 @@ -177,7 +177,6 @@ PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER DataSize) { if (AttrContext->Record.IsNonResident) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Jun 26 17:03:31 2016 @@ -772,7 +772,6 @@ PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER DataSize); ULONG Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Jun 26 17:03:31 2016 @@ -419,7 +419,7 @@ AllocationSize = ROUND_UP(DataSize.QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); // set the attribute data length - Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, DeviceExt, &DataSize); + Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, &DataSize); if (!NT_SUCCESS(Status)) {

8 years, 7 months

[ekohl] 71676: [SERVICES] Use self-relative security descriptors only: - Convert the default service security descriptor to the self-relative format. - Remove security descriptor format conversions...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 26 15:02:48 2016 New Revision: 71676 URL: http://svn.reactos.org/svn/reactos?rev=71676&view=rev Log: [SERVICES] Use self-relative security descriptors only: - Convert the default service security descriptor to the self-relative format. - Remove security descriptor format conversions from ScmReadSecurityDescriptor and ScmWriteSecurityDescriptor. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/security.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Jun 26 15:02:48 2016 @@ -14,6 +14,11 @@ #define NDEBUG #include <debug.h> + +ULONG +NTAPI +RtlLengthSecurityDescriptor( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); /* FUNCTIONS *****************************************************************/ @@ -504,45 +509,11 @@ _In_ HKEY hServiceKey, _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) { - PSECURITY_DESCRIPTOR pRelativeSD = NULL; HKEY hSecurityKey = NULL; - DWORD dwBufferLength = 0; DWORD dwDisposition; DWORD dwError; - NTSTATUS Status; DPRINT1("ScmWriteSecurityDescriptor(%p %p)\n", hServiceKey, pSecurityDescriptor); - - Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, - NULL, - &dwBufferLength); - if (Status != STATUS_BUFFER_TOO_SMALL) - { -DPRINT1("\n"); - return RtlNtStatusToDosError(Status); - } - - DPRINT1("BufferLength %lu\n", dwBufferLength); - - pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwBufferLength); - if (pRelativeSD == NULL) - { -DPRINT1("\n"); - return ERROR_OUTOFMEMORY; - } - -DPRINT1("\n"); - Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, - pRelativeSD, - &dwBufferLength); - if (!NT_SUCCESS(Status)) - { -DPRINT1("\n"); - dwError = RtlNtStatusToDosError(Status); - goto done; - } DPRINT1("\n"); dwError = RegCreateKeyExW(hServiceKey, @@ -565,17 +536,14 @@ L"Security", 0, REG_BINARY, - (LPBYTE)pRelativeSD, - dwBufferLength); + (LPBYTE)pSecurityDescriptor, + RtlLengthSecurityDescriptor(pSecurityDescriptor)); DPRINT1("\n"); done: if (hSecurityKey != NULL) RegCloseKey(hSecurityKey); - if (pRelativeSD != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); - return dwError; } @@ -586,13 +554,10 @@ _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pRelativeSD = NULL; - PSECURITY_DESCRIPTOR pResizedBuffer = NULL; HKEY hSecurityKey = NULL; DWORD dwBufferLength = 0; - DWORD dwAbsoluteSDSize = 0; DWORD dwType; DWORD dwError; - NTSTATUS Status; DPRINT("ScmReadSecurityDescriptor()\n"); @@ -650,36 +615,6 @@ goto done; } - Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, - &dwAbsoluteSDSize); - if (Status == STATUS_BUFFER_TOO_SMALL) - { - pResizedBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), - 0, - pRelativeSD, - dwAbsoluteSDSize); - if (pResizedBuffer == NULL) - { - dwError = ERROR_OUTOFMEMORY; - goto done; - } - - pRelativeSD = pResizedBuffer; - Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, - &dwAbsoluteSDSize); - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - goto done; - } - } - else if (!NT_SUCCESS(Status)) - { - - dwError = RtlNtStatusToDosError(Status); - goto done; - } - *ppSecurityDescriptor = pRelativeSD; done: Modified: trunk/reactos/base/system/services/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/secur… ============================================================================== --- trunk/reactos/base/system/services/security.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/security.c [iso-8859-1] Sun Jun 26 15:02:48 2016 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; +PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; /* Self-relative SD */ static PSID pNullSid = NULL; static PSID pLocalSystemSid = NULL; @@ -110,6 +110,7 @@ PACL pDacl = NULL; PACL pSacl = NULL; ULONG ulLength; + DWORD dwBufferLength = 0; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; @@ -166,14 +167,14 @@ FALSE, TRUE); - + /* Create the absolute security descriptor */ pServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SECURITY_DESCRIPTOR)); if (pServiceSD == NULL) { dwError = ERROR_OUTOFMEMORY; goto done; } -DPRINT1("pServiceSD %p\n", pServiceSD); + DPRINT("pServiceSD %p\n", pServiceSD); Status = RtlCreateSecurityDescriptor(pServiceSD, SECURITY_DESCRIPTOR_REVISION); @@ -221,22 +222,54 @@ goto done; } - - pDefaultServiceSD = pServiceSD; -DPRINT1("pDefaultServiceSD %p\n", pDefaultServiceSD); + /* Convert the absolute SD to a self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(pServiceSD, + NULL, + &dwBufferLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + DPRINT("BufferLength %lu\n", dwBufferLength); + + pDefaultServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufferLength); + if (pDefaultServiceSD == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + DPRINT("pDefaultServiceSD %p\n", pDefaultServiceSD); + + Status = RtlAbsoluteToSelfRelativeSD(pServiceSD, + pDefaultServiceSD, + &dwBufferLength); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + } done: if (dwError != ERROR_SUCCESS) { - if (pDacl != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pDacl); - - if (pSacl != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pSacl); - - if (pServiceSD != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pServiceSD); - } + if (pDefaultServiceSD != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pDefaultServiceSD); + pDefaultServiceSD = NULL; + } + } + + if (pServiceSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pServiceSD); + + if (pSacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pSacl); + + if (pDacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDacl); return dwError; }

8 years, 7 months

[mjansen] 71675: [SCHANNEL] add missing function to the delayload header. Spotted by Peter Hater. CORE-11270 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Jun 26 12:52:46 2016 New Revision: 71675 URL: http://svn.reactos.org/svn/reactos?rev=71675&view=rev Log: [SCHANNEL] add missing function to the delayload header. Spotted by Peter Hater. CORE-11270 #resolve Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] Sun Jun 26 12:52:46 2016 @@ -49,6 +49,7 @@ MAKE_FUNCPTR(mbedtls_ssl_write) MAKE_FUNCPTR(mbedtls_ssl_get_peer_cert) MAKE_FUNCPTR(mbedtls_ssl_config_init) +MAKE_FUNCPTR(mbedtls_ssl_config_free) MAKE_FUNCPTR(mbedtls_ssl_config_defaults) MAKE_FUNCPTR(mbedtls_ssl_conf_dbg) MAKE_FUNCPTR(mbedtls_ssl_setup) @@ -103,6 +104,7 @@ LOAD_FUNCPTR(mbedtls_ssl_write) LOAD_FUNCPTR(mbedtls_ssl_get_peer_cert) LOAD_FUNCPTR(mbedtls_ssl_config_init) + LOAD_FUNCPTR(mbedtls_ssl_config_free) LOAD_FUNCPTR(mbedtls_ssl_config_defaults) LOAD_FUNCPTR(mbedtls_ssl_conf_dbg) LOAD_FUNCPTR(mbedtls_ssl_setup) @@ -162,6 +164,7 @@ #define mbedtls_ssl_write pmbedtls_ssl_write #define mbedtls_ssl_get_peer_cert pmbedtls_ssl_get_peer_cert #define mbedtls_ssl_config_init pmbedtls_ssl_config_init +#define mbedtls_ssl_config_free pmbedtls_ssl_config_free #define mbedtls_ssl_config_defaults pmbedtls_ssl_config_defaults #define mbedtls_ssl_conf_dbg pmbedtls_ssl_conf_dbg #define mbedtls_ssl_setup pmbedtls_ssl_setup

8 years, 7 months

[pschweitzer] 71674: [FASTFAT] Don't allow renaming a directory if there are opened files in it. The way we do it for now isn't fully optimal and could be really improved, but that's a first step i...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 26 10:23:35 2016 New Revision: 71674 URL: http://svn.reactos.org/svn/reactos?rev=71674&view=rev Log: [FASTFAT] Don't allow renaming a directory if there are opened files in it. The way we do it for now isn't fully optimal and could be really improved, but that's a first step in the right direction. This should help getting rid of FAT volumes corruption. This also fixes a few winetests it seems. CORE-11426 #comment Patch that fixes bug 3 committed in r71674 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Jun 26 10:23:35 2016 @@ -704,6 +704,27 @@ vfatSplitPathName(&NewName, &NewPath, &NewFile); DPRINT("New dir: %wZ, New file: %wZ\n", &NewPath, &NewFile); + /* FIXME: Do it in a more efficient way, like linking FCBs to their parent FCB so that we browse less FCBs + * Note: The FIXME is the way MS FastFAT seems to do it + */ + if (vfatFCBIsDirectory(FCB)) + { + PLIST_ENTRY Entry; + PVFATFCB VolFCB; + + for (Entry = DeviceExt->FcbListHead.Flink; Entry != &DeviceExt->FcbListHead; Entry = Entry->Flink) + { + VolFCB = CONTAINING_RECORD(Entry, VFATFCB, FcbListEntry); + if (VolFCB->parentFcb == FCB && VolFCB->OpenHandleCount != 0) + { + DPRINT1("At least one children file opened! %wZ (%u, %u)\n", &VolFCB->PathNameU, VolFCB->RefCount, VolFCB->OpenHandleCount); + Status = STATUS_ACCESS_DENIED; + ASSERT(OldReferences == FCB->parentFcb->RefCount); + goto Cleanup; + } + } + } + /* Are we working in place? */ if (FsRtlAreNamesEqual(&SourcePath, &NewPath, TRUE, NULL)) {

8 years, 7 months

[tfaber] 71673: [NTOS:LPC] - Avoid dereferencing a null pointer in LpcpDeletePort. By Samuel Serapión. CORE-6850 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 25 23:27:45 2016 New Revision: 71673 URL: http://svn.reactos.org/svn/reactos?rev=71673&view=rev Log: [NTOS:LPC] - Avoid dereferencing a null pointer in LpcpDeletePort. By Samuel Serapión. CORE-6850 #resolve Modified: trunk/reactos/ntoskrnl/lpc/close.c Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Sat Jun 25 23:27:45 2016 @@ -432,20 +432,20 @@ /* Dereference the object unless it's the same port */ if (ConnectionPort != Port) ObDereferenceObject(ConnectionPort); + + /* Check if this is a connection port with a server process */ + if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && + (ConnectionPort->ServerProcess)) + { + /* Dereference the server process */ + ObDereferenceObject(ConnectionPort->ServerProcess); + ConnectionPort->ServerProcess = NULL; + } } else { /* Release the lock */ KeReleaseGuardedMutex(&LpcpLock); - } - - /* Check if this is a connection port with a server process */ - if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && - (ConnectionPort->ServerProcess)) - { - /* Dereference the server process */ - ObDereferenceObject(ConnectionPort->ServerProcess); - ConnectionPort->ServerProcess = NULL; } /* Free client security */

8 years, 7 months

[tfaber] 71672: [SHELL32_APITEST] - Add a test for CShellLink GetPath/SetPath behavior with environment variables. Patch by Andreas Maier. ROSTESTS-229 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 25 22:09:49 2016 New Revision: 71672 URL: http://svn.reactos.org/svn/reactos?rev=71672&view=rev Log: [SHELL32_APITEST] - Add a test for CShellLink GetPath/SetPath behavior with environment variables. Patch by Andreas Maier. ROSTESTS-229 #resolve Added: trunk/rostests/apitests/shell32/CShellLink.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/testlist.c Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Sat Jun 25 22:09:49 2016 @@ -6,6 +6,7 @@ add_executable(shell32_apitest CMyComputer.cpp CShellDesktop.cpp + CShellLink.cpp menu.cpp shelltest.cpp SHParseDisplayName.cpp Added: trunk/rostests/apitests/shell32/CShellLink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellLi… ============================================================================== --- trunk/rostests/apitests/shell32/CShellLink.cpp (added) +++ trunk/rostests/apitests/shell32/CShellLink.cpp [iso-8859-1] Sat Jun 25 22:09:49 2016 @@ -0,0 +1,186 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CShellLink + * PROGRAMMER: Andreas Maier + */ + +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> +#include <strsafe.h> +#include <ndk/rtlfuncs.h> + +#define NDEBUG +#include <debug.h> +#include <shellutils.h> + +typedef +struct _TestShellLinkDef +{ + const WCHAR* pathIn; + HRESULT hrSetPath; + /* Test 1 - hrGetPathX = IShellLink::GetPath(pathOutX, ... , flagsX); */ + const WCHAR* pathOut1; + DWORD flags1; + HRESULT hrGetPath1; + bool expandPathOut1; + /* Test 2 */ + const WCHAR* pathOut2; + DWORD flags2; + HRESULT hrGetPath2; + bool expandPathOut2; +} TestShellLinkDef; + +/* Test IShellLink::SetPath with environment-variables, existing, non-existing, ...*/ +static struct _TestShellLinkDef linkTestList[] = +{ + { + L"%comspec%", S_OK, + L"%comspec%", SLGP_SHORTPATH, S_OK, TRUE, + L"%comspec%", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"%anyvar%", E_INVALIDARG, + L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, + L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE + }, + { + L"%anyvar%%comspec%", S_OK, + L"c:\\%anyvar%%comspec%", SLGP_SHORTPATH, S_OK, TRUE, + L"%anyvar%%comspec%", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"%temp%", S_OK, + L"%temp%", SLGP_SHORTPATH, S_OK, TRUE, + L"%temp%", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"%shell%", S_OK, + L"%systemroot%\\system32\\%shell%", SLGP_SHORTPATH, S_OK, TRUE, + L"%shell%", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"u:\\anypath\\%anyvar%", S_OK, + L"u:\\anypath\\%anyvar%", SLGP_SHORTPATH, S_OK, TRUE, + L"u:\\anypath\\%anyvar%", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"c:\\temp", S_OK, + L"c:\\temp", SLGP_SHORTPATH, S_OK, FALSE, + L"c:\\temp", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"cmd.exe", S_OK, + L"%comspec%", SLGP_SHORTPATH, S_OK, TRUE, + L"%comspec%", SLGP_RAWPATH, S_OK, TRUE + }, + { + L"c:\\non-existent-path\\non-existent-file", S_OK, + L"c:\\non-existent-path\\non-existent-file", SLGP_SHORTPATH, S_OK, FALSE, + L"c:\\non-existent-path\\non-existent-file", SLGP_RAWPATH, S_OK, FALSE + }, + { + L"non-existent-file", E_INVALIDARG, + L"", SLGP_SHORTPATH, ERROR_INVALID_FUNCTION, FALSE, + L"", SLGP_RAWPATH, ERROR_INVALID_FUNCTION, FALSE + }, + { NULL, 0, NULL, 0, 0, NULL, 0, 0 } +}; + +static const UINT evVarChLen = 255; +static WCHAR evVar[evVarChLen]; + +static +VOID +test_checklinkpath(TestShellLinkDef* testDef) +{ + HRESULT hr, expectedHr; + WCHAR wPathOut[255]; + bool expandPathOut; + const WCHAR* expectedPathOut; + IShellLinkW *psl; + UINT i1; + DWORD flags; + + hr = CoCreateInstance(CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellLinkW, &psl)); + ok(hr == S_OK, "CoCreateInstance, hr = %lx\n", hr); + if (FAILED(hr)) + { + skip("Could not instantiate CShellLink\n"); + return; + } + + hr = psl->SetPath(testDef->pathIn); + ok(hr == testDef->hrSetPath, "IShellLink::SetPath, got hr = %lx, expected %lx\n", hr, testDef->hrSetPath); + + expectedPathOut = NULL; + for (i1 = 0; i1 <= 1; i1++ ) + { + if (i1 == 1) + { + flags = testDef->flags1; + expandPathOut = testDef->expandPathOut1; + expectedPathOut = testDef->pathOut1; + expectedHr = testDef->hrGetPath1; + } + else + { + flags = testDef->flags2; + expandPathOut = testDef->expandPathOut2; + expectedPathOut = testDef->pathOut2; + expectedHr = testDef->hrGetPath2; + } + + /* Patch some variables */ + if (expandPathOut == TRUE) + { + ExpandEnvironmentStringsW(expectedPathOut,evVar,evVarChLen); + DPRINT("** %S **\n",evVar); + expectedPathOut = evVar; + } + + hr = psl->GetPath(wPathOut,sizeof(wPathOut),NULL,flags); + ok(hr == expectedHr, + "IShellLink::GetPath, flags %lx, got hr = %lx, expected %lx\n", + flags, hr, expectedHr); + ok(wcsicmp(wPathOut,expectedPathOut) == 0, + "IShellLink::GetPath, flags %lx, in %S, got %S, expected %S\n", + flags,testDef->pathIn,wPathOut,expectedPathOut); + } + + psl->Release(); +} + +static +VOID +TestShellLink(void) +{ + TestShellLinkDef *testDef; + UINT i1 = 0; + + /* needed for test */ + SetEnvironmentVariableW(L"shell",L"cmd.exe"); + + testDef = &linkTestList[i1]; + while (testDef->pathIn != NULL) + { + + DPRINT("IShellLink-Test: %S\n", testDef->pathIn); + test_checklinkpath(testDef); + i1++; + testDef = &linkTestList[i1]; + } + + SetEnvironmentVariableW(L"shell",NULL); +} + +START_TEST(CShellLink) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + TestShellLink(); +} Propchange: trunk/rostests/apitests/shell32/CShellLink.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Sat Jun 25 22:09:49 2016 @@ -5,6 +5,7 @@ extern void func_CMyComputer(void); extern void func_CShellDesktop(void); +extern void func_CShellLink(void); extern void func_menu(void); extern void func_SHParseDisplayName(void); @@ -12,6 +13,7 @@ { { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop }, + { "CShellLink", func_CShellLink }, { "menu", func_menu }, { "SHParseDisplayName", func_SHParseDisplayName }, { 0, 0 }

8 years, 7 months

[hbelusca] 71671: Fix build (i.e. a change that shouldn't have been done).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 25 20:12:18 2016 New Revision: 71671 URL: http://svn.reactos.org/svn/reactos?rev=71671&view=rev Log: Fix build (i.e. a change that shouldn't have been done). 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 Jun 25 20:12:18 2016 @@ -569,7 +569,7 @@ HANDLE hEventLog; EVENTLOGRECORD *pevlr; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength; - SIZE_T cchRemaining; + size_t cchRemaining; LPWSTR lpszSourceName; LPWSTR lpszComputerName; BOOL bResult = TRUE; /* Read succeeded */

8 years, 7 months

[hbelusca] 71670: [EVENTVWR] - Remove a unused header. - Start (re)working on the functions that retrieve strings associated to event categories and messages. - Just display the event category numb...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 25 20:08:58 2016 New Revision: 71670 URL: http://svn.reactos.org/svn/reactos?rev=71670&view=rev Log: [EVENTVWR] - Remove a unused header. - Start (re)working on the functions that retrieve strings associated to event categories and messages. - Just display the event category number if we are unable to retrieve its associated string. - If we cannot retrieve the event source for formatting purposes, use a default string and append the event strings to it. - Fix some problems related to the usage of 'lpComputerName': this global variable stores the computer name on which the Event Viewer is running (or connected to) and view the available logs. Don't overwrite it with computer names from the events. - Modify some localized strings in the resource files. Translators, please review/fix translations! 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 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 Jun 25 20:08:58 2016 @@ -25,7 +25,6 @@ #include <stdio.h> #include <stdlib.h> -#include <ctype.h> #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -80,8 +79,8 @@ DWORD g_TotalRecords = 0; OPENFILENAMEW sfn; +LPWSTR lpComputerName = NULL; LPWSTR lpSourceLogName = NULL; -LPWSTR lpComputerName = NULL; DWORD dwNumLogs = 0; LPWSTR* LogNames = NULL; @@ -211,7 +210,7 @@ GetEventMessageFileDLL(IN LPCWSTR lpLogName, IN LPCWSTR SourceName, IN LPCWSTR EntryName, - OUT PWCHAR ExpandedName) + OUT PWCHAR ExpandedName) // TODO: Add IN DWORD BufLen { DWORD dwSize; WCHAR szModuleName[MAX_PATH]; @@ -270,7 +269,7 @@ GetEventCategory(IN LPCWSTR KeyName, IN LPCWSTR SourceName, IN EVENTLOGRECORD *pevlr, - OUT PWCHAR CategoryName) + OUT PWCHAR CategoryName) // TODO: Add IN DWORD BufLen { BOOL Success = FALSE; HMODULE hLibrary = NULL; @@ -300,24 +299,25 @@ /* Copy the category name */ StringCchCopyW(CategoryName, MAX_PATH, lpMsgBuf); - } - else - { - LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); + + /* The ID was found and the message was formatted */ + Success = TRUE; } /* Free the buffer allocated by FormatMessage */ if (lpMsgBuf) LocalFree(lpMsgBuf); - if (hLibrary != NULL) - FreeLibrary(hLibrary); - - Success = TRUE; + FreeLibrary(hLibrary); Quit: if (!Success) - LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); + { + if (pevlr->EventCategory != 0) + StringCchPrintfW(CategoryName, MAX_PATH, L"(%lu)", pevlr->EventCategory); + else + LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH); + } return Success; } @@ -327,7 +327,7 @@ GetEventMessage(IN LPCWSTR KeyName, IN LPCWSTR SourceName, IN EVENTLOGRECORD *pevlr, - OUT PWCHAR EventText) + OUT PWCHAR EventText) // TODO: Add IN DWORD BufLen { BOOL Success = FALSE; DWORD i; @@ -336,39 +336,36 @@ WCHAR ParameterModuleName[1000]; BOOL IsParamModNameCached = FALSE; LPWSTR lpMsgBuf = NULL; - WCHAR szStringIDNotFound[MAX_LOADSTRING]; LPWSTR szDll; - LPWSTR szMessage; + LPWSTR szStringArray, szMessage; LPWSTR *szArguments; + /* Get the event string array */ + szStringArray = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); + /* 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); + goto Quit; /* Allocate space for parameters */ szArguments = HeapAlloc(GetProcessHeap(), 0, pevlr->NumStrings * sizeof(LPVOID)); if (!szArguments) - { - // goto Quit; - return FALSE; - } - + goto Quit; + + szMessage = szStringArray; for (i = 0; i < pevlr->NumStrings; i++) { if (wcsstr(szMessage, L"%%")) { - if (!IsParamModNameCached && GetEventMessageFileDLL(KeyName, SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) + if (!IsParamModNameCached) { /* Now that the parameter file list is loaded, no need to reload it at the next run! */ - IsParamModNameCached = TRUE; - + IsParamModNameCached = GetEventMessageFileDLL(KeyName, SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName); + // FIXME: If the string loading failed the first time, no need to retry it just after??? + } + + if (IsParamModNameCached) + { /* Not yet support for reading messages from parameter message DLL */ } } @@ -379,7 +376,7 @@ /* Loop through the list of event message DLLs */ szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); - while ((szDll != NULL) && (!Success)) + while ((szDll != NULL) && !Success) { hLibrary = LoadLibraryExW(szDll, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); @@ -405,14 +402,14 @@ } 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); + + /* The ID was found and the message was formatted */ + Success = TRUE; } /* Free the buffer allocated by FormatMessage */ @@ -424,11 +421,22 @@ HeapFree(GetProcessHeap(), 0, szArguments); -// Quit: +Quit: if (!Success) { - LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, ARRAYSIZE(szStringIDNotFound)); - StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); + /* Get a read-only pointer to the "event-not-found" string */ + lpMsgBuf = HeapAlloc(GetProcessHeap(), 0, EVENT_MESSAGE_EVENTTEXT_BUFFER * sizeof(WCHAR)); + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, lpMsgBuf, EVENT_MESSAGE_EVENTTEXT_BUFFER); + StringCchPrintfW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, lpMsgBuf, (pevlr->EventID & 0xFFFF), SourceName); + + /* Append the strings */ + szMessage = szStringArray; + for (i = 0; i < pevlr->NumStrings; i++) + { + StringCchCatW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, szMessage); + StringCchCatW(EventText, EVENT_MESSAGE_EVENTTEXT_BUFFER, L"\n"); + szMessage += wcslen(szMessage) + 1; + } } return Success; @@ -437,7 +445,7 @@ VOID GetEventType(IN WORD dwEventType, - OUT PWCHAR eventTypeText) + OUT PWCHAR eventTypeText) // TODO: Add IN DWORD BufLen { switch (dwEventType) { @@ -561,9 +569,9 @@ HANDLE hEventLog; EVENTLOGRECORD *pevlr; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength; - size_t cchRemaining; - LPWSTR lpSourceName; - LPWSTR lpComputerName; + SIZE_T cchRemaining; + LPWSTR lpszSourceName; + LPWSTR lpszComputerName; BOOL bResult = TRUE; /* Read succeeded */ WCHAR szWindowTitle[MAX_PATH]; @@ -590,8 +598,9 @@ return FALSE; } + /* Save the current computer name and log name globally */ + lpComputerName = lpMachineName; lpSourceLogName = lpLogName; - lpComputerName = lpMachineName; /* Disable list view redraw */ SendMessageW(hwndListView, WM_SETREDRAW, FALSE, 0); @@ -663,10 +672,10 @@ LoadStringW(hInst, IDS_NONE, szCategory, ARRAYSIZE(szCategory)); /* Get the event source name */ - lpSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); + lpszSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); /* Get the computer name */ - lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); + lpszComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR)); /* Compute the event type */ EventTimeToSystemTime(pevlr->TimeWritten, &time); @@ -678,7 +687,7 @@ GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); GetEventType(pevlr->EventType, szEventTypeText); - GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); + GetEventCategory(lpLogName, lpszSourceName, pevlr, szCategory); StringCbPrintfW(szEventID, sizeof(szEventID), L"%u", (pevlr->EventID & 0xFFFF)); StringCbPrintfW(szCategoryID, sizeof(szCategoryID), L"%u", pevlr->EventCategory); @@ -720,11 +729,11 @@ ListView_SetItemText(hwndListView, lviEventItem.iItem, 1, szLocalDate); ListView_SetItemText(hwndListView, lviEventItem.iItem, 2, szLocalTime); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpSourceName); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpszSourceName); ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, szCategory); ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpszComputerName); dwRead -= pevlr->Length; pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); @@ -744,12 +753,11 @@ &cchRemaining, 0, szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */ - /* lpComputerName can be NULL here if no records was read */ dwMaxLength = (DWORD)cchRemaining; - if (!lpComputerName) + if (!lpMachineName) GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength); else - StringCchCopyW(lpTitleTemplateEnd, dwMaxLength, lpComputerName); + StringCchCopyW(lpTitleTemplateEnd, dwMaxLength, lpMachineName); StringCbPrintfW(szStatusText, sizeof(szStatusText), szStatusBarTemplate, lpLogName, dwTotalRecords); @@ -862,8 +870,7 @@ VOID Refresh(VOID) { - QueryEventMessages(lpComputerName, - lpSourceLogName); + QueryEventMessages(lpComputerName, lpSourceLogName); } @@ -1087,7 +1094,7 @@ VOID -FreeLogList(void) +FreeLogList(VOID) { DWORD dwIndex; @@ -1111,6 +1118,9 @@ HeapFree(GetProcessHeap(), 0, LogNames); LogNames = NULL; dwNumLogs = 0; + + lpComputerName = NULL; + lpSourceLogName = NULL; return; } @@ -1265,6 +1275,10 @@ ShowWindow(hwndMainWindow, nCmdShow); UpdateWindow(hwndMainWindow); + /* Retrieve the available event logs on this computer */ + // TODO: Implement connection to remote computer (lpComputerName) + // At the moment we only support the user local computer. + lpComputerName = NULL; BuildLogList(); QueryEventMessages(lpComputerName, LogNames[0]); 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] Sat Jun 25 20:08:58 2016 @@ -92,7 +92,7 @@ IDS_APP_TITLE "ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ñ" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ðµ ( %lu ) Ð² Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº ( %s ). ÐÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð¼ÐµÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ Ð´Ð° Ð½ÑÐ¼Ð° Ð½ÑÐ¶Ð½Ð¸ÑÐµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ð¸Ð»Ð¸ DLL ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑ, Ð½ÑÐ¶Ð½Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ." + IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ðµ ( %lu ) Ð² Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº ( %s ). ÐÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð¼ÐµÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ Ð´Ð° Ð½ÑÐ¼Ð° Ð½ÑÐ¶Ð½Ð¸ÑÐµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ð¸Ð»Ð¸ DLL ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑ, Ð½ÑÐ¶Ð½Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Warning" IDS_EVENTLOG_INFORMATION_TYPE "Information" 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] Sat Jun 25 20:08:58 2016 @@ -92,7 +92,7 @@ IDS_APP_TITLE "ProhlÃÅ¾eÄ udÃ¡lostÃ" IDS_APP_TITLE_EX "%s - Protkol %s na \\\\" IDS_STATUS_MSG "PoÄet udÃ¡lostÃ v protokolu %s: %lu" - IDS_EVENTSTRINGIDNOTFOUND "Popis ID udÃ¡losti ( %lu ) zdroj ( %s ) nebyl nalezen. MÃstnÃ poÄÃtaÄ neobsahuje potÅebnÃ© informace v registru nebo chybÃ DLL soubory pro zobrazenÃ zprÃ¡v ze vzdÃ¡lenÃ©ho poÄÃtaÄe." + IDS_EVENTSTRINGIDNOTFOUND "Popis ID udÃ¡losti ( %lu ) zdroj ( %s ) nebyl nalezen. MÃstnÃ poÄÃtaÄ neobsahuje potÅebnÃ© informace v registru nebo chybÃ DLL soubory pro zobrazenÃ zprÃ¡v ze vzdÃ¡lenÃ©ho poÄÃtaÄe.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Chyba" IDS_EVENTLOG_WARNING_TYPE "UpozornÄnÃ" IDS_EVENTLOG_INFORMATION_TYPE "Informace" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "Ereignisanzeige" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung fÃ¼r die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es kÃ¶nnte sein, dass der Lokale Computer die notwendigen Registry EintrÃ¤ge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." + IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung fÃ¼r die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es kÃ¶nnte sein, dass der Lokale Computer die notwendigen Registry EintrÃ¤ge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Fehler" IDS_EVENTLOG_WARNING_TYPE "Warnung" IDS_EVENTLOG_INFORMATION_TYPE "Informationen" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "Event Viewer" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "ÎÏÎ¬Î»Î¼Î±" IDS_EVENTLOG_WARNING_TYPE "Î ÏÎ¿ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·" IDS_EVENTLOG_INFORMATION_TYPE "Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î±" 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] Sat Jun 25 20:08:58 2016 @@ -100,7 +100,7 @@ IDS_APP_TITLE "Event Viewer" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Warning" IDS_EVENTLOG_INFORMATION_TYPE "Information" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "Visor de eventos" IDS_APP_TITLE_EX "%s - Registro de %s en \\\\" IDS_STATUS_MSG "%s tiene %lu evento(s)" - IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripciÃ³n para el evento con ID (%lu) y origen (%s). El equipo local puede no tener la informaciÃ³n necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto." + IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripciÃ³n para el evento con ID (%lu) y origen (%s). El equipo local puede no tener la informaciÃ³n necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "Advertencia" IDS_EVENTLOG_INFORMATION_TYPE "InformaciÃ³n" 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] Sat Jun 25 20:08:58 2016 @@ -92,9 +92,9 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visionneuse d'Ã©vÃ©nements" - IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "La description pour l'Ã©vÃ©nement d'ID ( %lu ) dans la source ( %s ) ne peut Ãªtre trouvÃ©e. L'ordinateur local pourrait ne pas avoir les informations registres nÃ©cessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." + IDS_APP_TITLE_EX "%s - Journal %s sur \\\\" + IDS_STATUS_MSG "%s contient %lu Ã©vÃ©nement(s)" + IDS_EVENTSTRINGIDNOTFOUND "La description pour l'Ã©vÃ©nement d'ID ( %lu ) dans la source ( %s ) ne peut Ãªtre trouvÃ©e. L'ordinateur local pourrait ne pas avoir les informations registres nÃ©cessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant.\n\nLes informations suivantes font partie de l'Ã©vÃ©nement :\n\n" IDS_EVENTLOG_ERROR_TYPE "Erreur" IDS_EVENTLOG_WARNING_TYPE "Avertissement" IDS_EVENTLOG_INFORMATION_TYPE "Informations" @@ -102,8 +102,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Ãchec de l'audit" IDS_EVENTLOG_SUCCESS "SuccÃ¨s" IDS_EVENTLOG_UNKNOWN_TYPE "ÃvÃ©nement Inconnu" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" - IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Voulez-vous enregistrer ce journal d'Ã©vÃ©nements avant de l'effacer ?" + IDS_SAVE_FILTER "Journal d'Ã©vÃ©nements (*.evt)\0*.evt\0" END STRINGTABLE @@ -133,6 +133,6 @@ STRINGTABLE BEGIN - IDS_NONE "None" + IDS_NONE "Aucun" IDS_NOT_AVAILABLE "N/A" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "×××× ××××¨××¢××" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "×©××××" IDS_EVENTLOG_WARNING_TYPE "××××¨×" IDS_EVENTLOG_INFORMATION_TYPE "××××¢" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "Visualizzatore eventi" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non puÃ² essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto." + IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non puÃ² essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Errore" IDS_EVENTLOG_WARNING_TYPE "Avviso" IDS_EVENTLOG_INFORMATION_TYPE "Informazione" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "ã¤ãã³ã ãã¥ã¼ã¢" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã" + IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "ã¨ã©ã¼" IDS_EVENTLOG_WARNING_TYPE "è¦å" IDS_EVENTLOG_INFORMATION_TYPE "æå ±" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "ì´ë²¤í¸ ë·°ì´" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "( %s ) ì ì´ë²¤í¸ID ( %lu ) ì ëí ì¤ëªì ì°¾ì ì ììµëë¤. ë¡ì»¬ ì»´í¨í°ê° ìê²© ì»´í¨í°ì ë©ì¸ì§ë¥¼ íìíëë° íìí ë ì§ì¤í¸ë¦¬ë DLL íì¼ì ê°ì§ì§ ìê³ ììì ììµëë¤." + IDS_EVENTSTRINGIDNOTFOUND "( %s ) ì ì´ë²¤í¸ID ( %lu ) ì ëí ì¤ëªì ì°¾ì ì ììµëë¤. ë¡ì»¬ ì»´í¨í°ê° ìê²© ì»´í¨í°ì ë©ì¸ì§ë¥¼ íìíëë° íìí ë ì§ì¤í¸ë¦¬ë DLL íì¼ì ê°ì§ì§ ìê³ ììì ììµëë¤.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "ìë¬" IDS_EVENTLOG_WARNING_TYPE "ê²½ê³ " IDS_EVENTLOG_INFORMATION_TYPE "ì ë³´" 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] Sat Jun 25 20:08:58 2016 @@ -92,7 +92,7 @@ IDS_APP_TITLE "Hendelseliste" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nÃ¸dvendige register informasjon eller melding DLL filer for Ã¥ vise melding fra en fjern datamaskin." + IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nÃ¸dvendige register informasjon eller melding DLL filer for Ã¥ vise melding fra en fjern datamaskin.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Feil" IDS_EVENTLOG_WARNING_TYPE "Advarseler" IDS_EVENTLOG_INFORMATION_TYPE "Informasjon" 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] Sat Jun 25 20:08:58 2016 @@ -96,7 +96,7 @@ IDS_APP_TITLE "PodglÄd zdarzeÅ" IDS_APP_TITLE_EX "%s - %s Log na \\\\" IDS_STATUS_MSG "%s posiada %lu zdarzeÅ" - IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zostaÅ odnaleziony w ÅºrÃ³dle: ( %s ). Ten komputer moÅ¼e nie miec wystarczajÄcych informacji w rejestrze, albo bibliotek DLL, aby wyÅwietliÄ wiadomoÅci z komputera zdalnego." + IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID ( %lu ) nie zostaÅ odnaleziony w ÅºrÃ³dle ( %s ). Ten komputer moÅ¼e nie miec wystarczajÄcych informacji w rejestrze, albo bibliotek DLL, aby wyÅwietliÄ wiadomoÅci z komputera zdalnego.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "BÅÄd" IDS_EVENTLOG_WARNING_TYPE "OstrzeÅ¼enie" IDS_EVENTLOG_INFORMATION_TYPE "Informacja" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "Visualizador de Eventos" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "A descriÃ§Ã£o para Event ID ( %lu ) em Fonte ( %s ) nÃ£o foi encontrado. O computador local talvez nÃ£o possua a informaÃ§Ã£o de registro necessÃ¡ria ou mensagem de arquivos DLL para exibir mensagens de um computador remoto." + IDS_EVENTSTRINGIDNOTFOUND "A descriÃ§Ã£o para Event ID ( %lu ) em Fonte ( %s ) nÃ£o foi encontrado. O computador local talvez nÃ£o possua a informaÃ§Ã£o de registro necessÃ¡ria ou mensagem de arquivos DLL para exibir mensagens de um computador remoto.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Erro" IDS_EVENTLOG_WARNING_TYPE "Aviso" IDS_EVENTLOG_INFORMATION_TYPE "InformaÃ§Ã£o" 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] Sat Jun 25 20:08:58 2016 @@ -97,7 +97,7 @@ IDS_APP_TITLE "Observator de evenimente" IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" IDS_STATUS_MSG "%s are %lu eveniment(e)" - IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea." + IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Eroare" IDS_EVENTLOG_WARNING_TYPE "Avertisment" IDS_EVENTLOG_INFORMATION_TYPE "InformaÈie" @@ -136,6 +136,6 @@ STRINGTABLE BEGIN - IDS_NONE "nespecificatÄ" - IDS_NOT_AVAILABLE "nespecificat" + IDS_NONE "NespecificatÄ" + IDS_NOT_AVAILABLE "Nespecificat" END 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð±ÑÑÐ¸Ð¹" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ( %lu ) Ð² Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐµ ( %s ). ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð½ÐµÑ Ð½ÑÐ¶Ð½ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð² ÑÐµÐµÑÑÑÐµ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð² DLL ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°." + IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ( %lu ) Ð² Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐµ ( %s ). ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð½ÐµÑ Ð½ÑÐ¶Ð½ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð² ÑÐµÐµÑÑÑÐµ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð² DLL ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "ÐÑÐ¸Ð±ÐºÐ°" IDS_EVENTLOG_WARNING_TYPE "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" IDS_EVENTLOG_INFORMATION_TYPE "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ" 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] Sat Jun 25 20:08:58 2016 @@ -97,7 +97,7 @@ IDS_APP_TITLE "ZobrazovaÄ udalostÃ" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosÅ¥ ID ( %lu ) zo zdroja ( %s ) nebol nÃ¡jdenÃ½. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosÅ¥ ID ( %lu ) zo zdroja ( %s ) nebol nÃ¡jdenÃ½. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Chyba" IDS_EVENTLOG_WARNING_TYPE "Upozornenie" IDS_EVENTLOG_INFORMATION_TYPE "InformÃ¡cia" 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] Sat Jun 25 20:08:58 2016 @@ -100,7 +100,7 @@ IDS_APP_TITLE "Shikues ngjarjesh" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "PÃ«rshkrimi pÃ«r ngjarjet ID ( %lu ) nÃ« burim ( %s ) nuk gjindet. Kompjuter vendas mund tÃ« mos ketÃ« informacionin e regjistrit te nevojshem ose mesazhin pÃ«r dokumentat DLL pÃ«r tÃ« shfaqur nga njÃ« kompjuter nÃ« distancÃ«." + IDS_EVENTSTRINGIDNOTFOUND "PÃ«rshkrimi pÃ«r ngjarjet ID ( %lu ) nÃ« burim ( %s ) nuk gjindet. Kompjuter vendas mund tÃ« mos ketÃ« informacionin e regjistrit te nevojshem ose mesazhin pÃ«r dokumentat DLL pÃ«r tÃ« shfaqur nga njÃ« kompjuter nÃ« distancÃ«.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" IDS_EVENTLOG_WARNING_TYPE "ParalajmÃ«rim" IDS_EVENTLOG_INFORMATION_TYPE "Informacion" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "HÃ¤ndelselogg" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av HÃ¤ndelse ID ( %lu ) i kÃ¤llan ( %s ) kan inte hittas. Lokal dator har inte nÃ¶dvendig registerinformation eller meddelander DLL filer for Ã¥ vise meddelander frÃ¥n en fjÃ¤rr dator." + IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av HÃ¤ndelse ID ( %lu ) i kÃ¤llan ( %s ) kan inte hittas. Lokal dator har inte nÃ¶dvendig registerinformation eller meddelander DLL filer for Ã¥ vise meddelander frÃ¥n en fjÃ¤rr dator.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Fel" IDS_EVENTLOG_WARNING_TYPE "Varning" IDS_EVENTLOG_INFORMATION_TYPE "Information" 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] Sat Jun 25 20:08:58 2016 @@ -100,7 +100,7 @@ IDS_APP_TITLE "Olay GÃ¶rÃ¼ntÃ¼leyicisi" IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\" IDS_STATUS_MSG "%s -> %lu olay var." - IDS_EVENTSTRINGIDNOTFOUND "%s kaynaÄÄ±ndaki %lu olay kimliÄi iÃ§in aÃ§Ä±klama bulunamÄ±yor. Yerli bilgisayarda, uzak bilgisayardan iletileri gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli DeÄer Defteri bilgisi veyÃ¢ ileti DLL kÃ¼tÃ¼kleri olmayabilir." + IDS_EVENTSTRINGIDNOTFOUND "( %s ) kaynaÄÄ±ndaki ( %lu ) olay kimliÄi iÃ§in aÃ§Ä±klama bulunamÄ±yor. Yerli bilgisayarda, uzak bilgisayardan iletileri gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli DeÄer Defteri bilgisi veyÃ¢ ileti DLL kÃ¼tÃ¼kleri olmayabilir.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "YanlÄ±ÅlÄ±k" IDS_EVENTLOG_WARNING_TYPE "UyarÄ±" IDS_EVENTLOG_INFORMATION_TYPE "Bilgi" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "ÐÐ³Ð»ÑÐ´Ð°Ñ Ð¿Ð¾Ð´ÑÐ¹" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "ÐÐ¿Ð¸Ñ Ð´Ð»Ñ ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÑ( %lu ) Ð·Ð° Ð´Ð¶ÐµÑÐµÐ»Ð¾Ð¼( %s ) Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¼Ð°ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð² ÑÐµÑÑÑÑÑ ÑÐ¸ DLL ÑÐ°Ð¹Ð»ÑÐ² Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ, ÑÐ¾ Ð½Ð°Ð´ÑÐ¾Ð´ÑÑÑ Ð²ÑÐ´ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°." + IDS_EVENTSTRINGIDNOTFOUND "ÐÐ¿Ð¸Ñ Ð´Ð»Ñ ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÑ( %lu ) Ð·Ð° Ð´Ð¶ÐµÑÐµÐ»Ð¾Ð¼ ( %s ) Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¼Ð°ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð² ÑÐµÑÑÑÑÑ ÑÐ¸ DLL ÑÐ°Ð¹Ð»ÑÐ² Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ, ÑÐ¾ Ð½Ð°Ð´ÑÐ¾Ð´ÑÑÑ Ð²ÑÐ´ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" IDS_EVENTLOG_WARNING_TYPE "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ" IDS_EVENTLOG_INFORMATION_TYPE "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "äºä»¶æ¥çå¨" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "æ¥æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°æ æ³æ¾å°ãæ¬å°è®¡ç®æºå¯è½æ²¡ææ¾ç¤ºæ¥èªè¿ç¨è®¡ç®æºæ¶æ¯æå¿éçæ³¨åè¡¨ä¿¡æ¯ææ¶æ¯ DLL æä»¶ã" + IDS_EVENTSTRINGIDNOTFOUND "æ¥æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°æ æ³æ¾å°ãæ¬å°è®¡ç®æºå¯è½æ²¡ææ¾ç¤ºæ¥èªè¿ç¨è®¡ç®æºæ¶æ¯æå¿éçæ³¨åè¡¨ä¿¡æ¯ææ¶æ¯ DLL æä»¶ã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "éè¯¯" IDS_EVENTLOG_WARNING_TYPE "è¦å" IDS_EVENTLOG_INFORMATION_TYPE "ä¿¡æ¯" 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] Sat Jun 25 20:08:58 2016 @@ -94,7 +94,7 @@ IDS_APP_TITLE "äºä»¶æª¢è¦å¨" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "ä¾æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°ç¡æ³æ¾å°ã æ¬å°é»è¦å¯è½æ²æé¡¯ç¤ºä¾èªé ç«¯é»è¦æ¶æ¯æå¿éçè¨»åè¡¨è³è¨ææ¶æ¯ DLL æªã" + IDS_EVENTSTRINGIDNOTFOUND "ä¾æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°ç¡æ³æ¾å°ã æ¬å°é»è¦å¯è½æ²æé¡¯ç¤ºä¾èªé ç«¯é»è¦æ¶æ¯æå¿éçè¨»åè¡¨è³è¨ææ¶æ¯ DLL æªã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "é¯èª¤" IDS_EVENTLOG_WARNING_TYPE "è¦å" IDS_EVENTLOG_INFORMATION_TYPE "è³è¨"

8 years, 7 months

[hbelusca] 71669: [EVENTVWR] - Use C-style comments. - Move the helper FreeRecords function closer to where it is used. - Use the EVENTLOG_BASE_KEY define instead of re-hardcoding the registry path...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 25 19:36:59 2016 New Revision: 71669 URL: http://svn.reactos.org/svn/reactos?rev=71669&view=rev Log: [EVENTVWR] - Use C-style comments. - Move the helper FreeRecords function closer to where it is used. - Use the EVENTLOG_BASE_KEY define instead of re-hardcoding the registry path to the EventLog service. 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 Jun 25 19:36:59 2016 @@ -55,7 +55,7 @@ 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 +/* MessageFile message buffer size */ #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 #define EVENT_DLL_SEPARATOR L";" @@ -122,7 +122,7 @@ LoadStringW(hInstance, IDS_STATUS_MSG, szStatusBarTemplate, ARRAYSIZE(szStatusBarTemplate)); MyRegisterClass(hInstance); - /* Perform application initialization: */ + /* Perform application initialization */ if (!InitInstance(hInstance, nCmdShow)) { return FALSE; @@ -137,7 +137,7 @@ hAccelTable = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDA_EVENTVWR)); - /* Main message loop: */ + /* Main message loop */ while (GetMessageW(&msg, NULL, 0, 0)) { if (!TranslateAcceleratorW(msg.hwnd, hAccelTable, &msg)) @@ -150,19 +150,6 @@ FreeLibrary(hRichEdit); return (int)msg.wParam; -} - -static void FreeRecords(void) -{ - DWORD iIndex; - - if (!g_RecordPtrs) - return; - - for (iIndex = 0; iIndex < g_TotalRecords; iIndex++) - HeapFree(GetProcessHeap(), 0, g_RecordPtrs[iIndex]); - HeapFree(GetProcessHeap(), 0, g_RecordPtrs); - g_RecordPtrs = NULL; } VOID @@ -233,7 +220,7 @@ HKEY hSourceKey = NULL; BOOL bReturn = FALSE; - StringCbCopyW(szKeyName, sizeof(szKeyName), L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"); + StringCbCopyW(szKeyName, sizeof(szKeyName), EVENTLOG_BASE_KEY); StringCbCatW(szKeyName, sizeof(szKeyName), lpLogName); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -256,7 +243,7 @@ (LPBYTE)szModuleName, &dwSize) == ERROR_SUCCESS) { - /* Returns a string containing the requested substituted environment variable. */ + /* Returns a string containing the requested substituted environment variable */ ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); /* Successful */ @@ -489,7 +476,7 @@ DWORD cbName = 1024; DWORD cbDomain = 1024; - /* Point to the SID. */ + /* Point to the SID */ lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); /* User SID */ @@ -553,6 +540,19 @@ } +static VOID FreeRecords(VOID) +{ + DWORD iIndex; + + if (!g_RecordPtrs) + return; + + for (iIndex = 0; iIndex < g_TotalRecords; iIndex++) + HeapFree(GetProcessHeap(), 0, g_RecordPtrs[iIndex]); + HeapFree(GetProcessHeap(), 0, g_RecordPtrs); + g_RecordPtrs = NULL; +} + BOOL QueryEventMessages(LPWSTR lpMachineName, LPWSTR lpLogName) @@ -564,7 +564,7 @@ size_t cchRemaining; LPWSTR lpSourceName; LPWSTR lpComputerName; - BOOL bResult = TRUE; /* Read succeeded. */ + BOOL bResult = TRUE; /* Read succeeded */ WCHAR szWindowTitle[MAX_PATH]; WCHAR szStatusText[MAX_PATH]; @@ -582,7 +582,7 @@ dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; - /* Open the event log. */ + /* Open the event log */ hEventLog = OpenEventLogW(lpMachineName, lpLogName); if (hEventLog == NULL) { @@ -593,7 +593,7 @@ lpSourceLogName = lpLogName; lpComputerName = lpMachineName; - /* Disable listview redraw */ + /* Disable list view redraw */ SendMessageW(hwndListView, WM_SETREDRAW, FALSE, 0); /* Clear the list view */ @@ -602,7 +602,7 @@ GetOldestEventLogRecord(hEventLog, &dwThisRecord); - /* Get the total number of event log records. */ + /* Get the total number of event log records */ GetNumberOfEventLogRecords(hEventLog, &dwTotalRecords); g_TotalRecords = dwTotalRecords; @@ -662,16 +662,16 @@ LoadStringW(hInst, IDS_NOT_AVAILABLE, szUsername, ARRAYSIZE(szUsername)); LoadStringW(hInst, IDS_NONE, szCategory, ARRAYSIZE(szCategory)); - // Get the event source name. + /* Get the event source name */ lpSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); - // Get the computer name + /* Get the computer name */ lpComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpSourceName) + 1) * sizeof(WCHAR)); - // Compute the event type + /* Compute the event type */ EventTimeToSystemTime(pevlr->TimeWritten, &time); - // Get the username that generated the event + /* Get the username that generated the event */ GetEventUserName(pevlr, szUsername); GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate)); @@ -734,7 +734,7 @@ dwCurrentRecord++; } - // All events loaded + /* All events loaded */ if (hwndDlg) EndDialog(hwndDlg, 0); @@ -753,16 +753,16 @@ StringCbPrintfW(szStatusText, sizeof(szStatusText), szStatusBarTemplate, lpLogName, dwTotalRecords); - // Update the status bar + /* Update the status bar */ SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); - // Set the window title + /* Set the window title */ SetWindowTextW(hwndMainWindow, szWindowTitle); - // Resume list view redraw + /* Resume list view redraw */ SendMessageW(hwndListView, WM_SETREDRAW, TRUE, 0); - // Close the event log. + /* Close the event log */ CloseEventLog(hEventLog); return TRUE; @@ -969,7 +969,7 @@ VOID -BuildLogList(void) +BuildLogList(VOID) { HKEY hKey; DWORD dwIndex; @@ -1165,24 +1165,24 @@ hInstance, NULL); - // After the ListView is created, we can add extended list view styles. + /* After the ListView is created, we can add extended list view styles */ (void)ListView_SetExtendedListViewStyle (hwndListView, LVS_EX_FULLROWSELECT); - // Create the ImageList + /* Create the ImageList */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, // ILC_COLOR24 1, 1); - // Add event type icons to ImageList + /* Add event type icons to ImageList */ 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 + /* Assign ImageList to List View */ (void)ListView_SetImageList(hwndListView, hSmall, LVSIL_SMALL); - // Now set up the listview with its columns. + /* Now set up the listview with its columns */ lvc.mask = LVCF_TEXT | LVCF_WIDTH; lvc.cx = 90; LoadStringW(hInstance, @@ -1248,7 +1248,7 @@ lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 7, &lvc); - // Initialize the save Dialog + /* Initialize the save Dialog */ ZeroMemory(&sfn, sizeof(sfn)); ZeroMemory(szSaveFilter, sizeof(szSaveFilter)); @@ -1318,8 +1318,7 @@ case WM_COMMAND: { - // Parse the menu selections: - + /* Parse the menu selections */ if ((LOWORD(wParam) >= ID_FIRST_LOG) && (LOWORD(wParam) <= ID_FIRST_LOG + dwNumLogs)) { if (LogNames[LOWORD(wParam) - ID_FIRST_LOG]) @@ -1372,10 +1371,8 @@ case WM_SIZE: { - // Gets the window rectangle GetClientRect(hWnd, &rect); - // Relocate the listview MoveWindow(hwndListView, 0, 0, @@ -1383,7 +1380,6 @@ rect.bottom - 20, 1); - // Resize the statusbar; SendMessageW(hwndStatus, message, wParam, lParam); break; } @@ -1396,7 +1392,7 @@ } -// Message handler for about box. +/* Message handler for About box */ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1437,7 +1433,7 @@ EVENTLOGRECORD* pevlr; int iIndex; - // Get index of selected item + /* Get index of selected item */ iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); if (iIndex == -1) { @@ -1563,7 +1559,7 @@ UINT uBufferSize, uLineLength; PWCHAR pTextBuffer, pLine; - // Get index of selected item + /* Get index of selected item */ iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); if (iIndex == -1) { @@ -1671,7 +1667,7 @@ /* Get the formatted text needed to place the content into */ LoadStringW(hInst, IDS_COPY, tmpHeader, ARRAYSIZE(tmpHeader)); - /* Grabs all the information and get it ready for the clipboard */ + /* Grab all the information and get it ready for the clipboard */ GetDlgItemTextW(hWnd, IDC_EVENTTYPESTATIC, szEventType, ARRAYSIZE(szEventType)); GetDlgItemTextW(hWnd, IDC_EVENTSOURCESTATIC, szSource, ARRAYSIZE(szSource)); GetDlgItemTextW(hWnd, IDC_EVENTCATEGORYSTATIC, szCategory, ARRAYSIZE(szCategory)); @@ -1751,7 +1747,7 @@ SendDlgItemMessageW(hDlg, IDC_EVENTDATAEDIT, WM_SETFONT, (WPARAM)pData->hMonospaceFont, (LPARAM)TRUE); } -// Message handler for event details box. +/* Message handler for Event Details box */ INT_PTR CALLBACK EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1774,7 +1770,7 @@ InitDetailsDlg(hDlg, pData); - // Show event info on dialog box + /* Show event info on dialog box */ DisplayEvent(hDlg); DisplayEventData(hDlg, pData->bDisplayWords); } @@ -1797,7 +1793,7 @@ case IDC_PREVIOUS: SendMessageW(hwndListView, WM_KEYDOWN, VK_UP, 0); - // Show event info on dialog box + /* Show event info on dialog box */ if (pData) { DisplayEvent(hDlg); @@ -1808,7 +1804,7 @@ case IDC_NEXT: SendMessageW(hwndListView, WM_KEYDOWN, VK_DOWN, 0); - // Show event info on dialog box + /* Show event info on dialog box */ if (pData) { DisplayEvent(hDlg);

8 years, 7 months

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016