Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71381: [APPHELP][APPHELP_APITEST] Add more db tests and implement SdbGetDatabaseVersion. CORE-10367
by mjansen＠svn.reactos.org 22 May '16

22 May '16

Author: mjansen Date: Sun May 22 20:39:41 2016 New Revision: 71381 URL: http://svn.reactos.org/svn/reactos?rev=71381&view=rev Log: [APPHELP][APPHELP_APITEST] Add more db tests and implement SdbGetDatabaseVersion. CORE-10367 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/data.c trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun May 22 20:39:41 2016 @@ -58,7 +58,7 @@ @ stub SdbGetDatabaseInformation @ stub SdbGetDatabaseInformationByName @ stub SdbGetDatabaseMatch -@ stub SdbGetDatabaseVersion +@ stdcall SdbGetDatabaseVersion(wstr ptr ptr) @ stub SdbGetDllPath @ stub SdbGetEntryFlags @ stdcall SdbGetFileAttributes(wstr ptr ptr) Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun May 22 20:39:41 2016 @@ -313,6 +313,78 @@ return SdbpCheckTagType(tag, type); } +PDB SdbpOpenDatabase(LPCWSTR path, PATH_TYPE type, PDWORD major, PDWORD minor) +{ + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + PDB db; + NTSTATUS Status; + BYTE header[12]; + + if (type == DOS_PATH) + { + if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) + return NULL; + } + else + RtlInitUnicodeString(&str, path); + + db = SdbpCreate(); + if (!db) + { + SHIM_ERR("Failed to allocate memory for shim database\n"); + return NULL; + } + + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, + &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + + if (type == DOS_PATH) + RtlFreeUnicodeString(&str); + + if (!NT_SUCCESS(Status)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to open shim database file: 0x%lx\n", Status); + return NULL; + } + + db->size = GetFileSize(db->file, NULL); + db->data = SdbAlloc(db->size); + Status = NtReadFile(db->file, NULL, NULL, NULL, &io, db->data, db->size, NULL, NULL); + + if (!NT_SUCCESS(Status)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to open shim database file: 0x%lx\n", Status); + return NULL; + } + + if (!SdbpReadData(db, &header, 0, 12)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to read shim database header\n"); + return NULL; + } + + if (memcmp(&header[8], "sdbf", 4) != 0) + { + SdbCloseDatabase(db); + SHIM_ERR("Shim database header is invalid\n"); + return NULL; + } + + *major = *(DWORD*)&header[0]; + *minor = *(DWORD*)&header[4]; + + return db; +} + + /** * Opens specified shim database file. * @@ -323,64 +395,14 @@ */ PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) { - NTSTATUS Status; - IO_STATUS_BLOCK io; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING str; PDB db; - BYTE header[12]; - DWORD dwRead = 0; - - if (type == DOS_PATH) - { - if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) - return NULL; - } - else - RtlInitUnicodeString(&str, path); - - db = SdbpCreate(); + DWORD major, minor; + + db = SdbpOpenDatabase(path, type, &major, &minor); if (!db) - { - SHIM_ERR("Failed to allocate memory for shim database\n"); return NULL; - } - - InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, - &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - - if (type == DOS_PATH) - RtlFreeUnicodeString(&str); - - if (!NT_SUCCESS(Status)) - { - SdbCloseDatabase(db); - SHIM_ERR("Failed to open shim database file: 0x%lx\n", Status); - return NULL; - } - - db->size = GetFileSize(db->file, NULL); - db->data = SdbAlloc(db->size); - ReadFile(db->file, db->data, db->size, &dwRead, NULL); - - if (!SdbpReadData(db, &header, 0, 12)) - { - SdbCloseDatabase(db); - SHIM_ERR("Failed to read shim database header\n"); - return NULL; - } - - if (memcmp(&header[8], "sdbf", 4) != 0) - { - SdbCloseDatabase(db); - SHIM_ERR("Shim database header is invalid\n"); - return NULL; - } - - if (*(DWORD*)&header[0] != (DWORD)2) + + if (major != 2) { SdbCloseDatabase(db); SHIM_ERR("Invalid shim database version\n"); @@ -490,6 +512,26 @@ { memcpy(Guid, copy_from, sizeof(GUID)); } + return TRUE; +} + +/** + * Read the database version from the specified database. + * + * @param [in] database The database. + * @param [out] VersionHi The first part of the version number. + * @param [out] VersionLo The second part of the version number. + * + * @return TRUE if it succeeds or fails, FALSE if ??? + */ +BOOL WINAPI SdbGetDatabaseVersion(LPCWSTR database, PDWORD VersionHi, PDWORD VersionLo) +{ + PDB db; + + db = SdbpOpenDatabase(database, DOS_PATH, VersionHi, VersionLo); + if (db) + SdbCloseDatabase(db); + return TRUE; } Modified: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Sun May 22 20:39:41 2016 @@ -571,3 +571,215 @@ } } +static unsigned char rawData[2356] = { + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x73, 0x64, 0x62, 0x66, + 0x02, 0x78, 0x3E, 0x01, 0x00, 0x00, 0x03, 0x78, 0x44, 0x00, 0x00, 0x00, + 0x02, 0x38, 0x07, 0x70, 0x03, 0x38, 0x01, 0x60, 0x16, 0x40, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x98, 0x30, 0x00, 0x00, 0x00, 0x4C, 0x4C, 0x41, 0x5F, + 0x54, 0x53, 0x45, 0x54, 0xC6, 0x01, 0x00, 0x00, 0x53, 0x49, 0x44, 0x5F, + 0x54, 0x53, 0x45, 0x54, 0x56, 0x02, 0x00, 0x00, 0x57, 0x45, 0x4E, 0x5F, + 0x54, 0x53, 0x45, 0x54, 0xEC, 0x02, 0x00, 0x00, 0x4B, 0x32, 0x57, 0x5F, + 0x54, 0x53, 0x45, 0x54, 0x7C, 0x03, 0x00, 0x00, 0x03, 0x78, 0x0E, 0x00, + 0x00, 0x00, 0x02, 0x38, 0x07, 0x70, 0x03, 0x38, 0x0B, 0x60, 0x01, 0x98, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x38, + 0x07, 0x70, 0x03, 0x38, 0x20, 0x60, 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x78, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x38, 0x04, 0x70, 0x03, 0x38, + 0x01, 0x60, 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x26, 0x00, + 0x00, 0x00, 0x02, 0x38, 0x0D, 0x70, 0x03, 0x38, 0x15, 0x40, 0x01, 0x98, + 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x74, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x50, 0x04, 0x00, 0x00, 0x03, 0x78, 0x14, 0x00, 0x00, 0x00, 0x02, 0x38, + 0x10, 0x70, 0x03, 0x38, 0x01, 0x60, 0x16, 0x40, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x0E, 0x00, 0x00, 0x00, + 0x02, 0x38, 0x12, 0x70, 0x03, 0x38, 0x06, 0x90, 0x01, 0x98, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x78, 0x14, 0x00, 0x00, 0x00, 0x02, 0x38, 0x12, 0x70, + 0x03, 0x38, 0x04, 0x90, 0x16, 0x40, 0x01, 0x00, 0x00, 0x00, 0x01, 0x98, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x78, 0x3E, 0x00, 0x00, 0x00, 0x02, 0x38, + 0x07, 0x70, 0x03, 0x38, 0x04, 0x90, 0x01, 0x98, 0x30, 0x00, 0x00, 0x00, + 0xB5, 0x16, 0xDD, 0x96, 0xC9, 0x6B, 0xC5, 0x04, 0x7C, 0x03, 0x00, 0x00, + 0xCA, 0xA0, 0x3C, 0x5A, 0xDD, 0xFC, 0x99, 0x19, 0xC6, 0x01, 0x00, 0x00, + 0x72, 0xC6, 0xBB, 0xB9, 0x20, 0x71, 0xE3, 0x27, 0xEC, 0x02, 0x00, 0x00, + 0xBF, 0x27, 0xFB, 0xFF, 0x09, 0xB0, 0x4D, 0x8E, 0x56, 0x02, 0x00, 0x00, + 0x01, 0x70, 0x42, 0x03, 0x00, 0x00, 0x01, 0x50, 0x3E, 0x96, 0x3F, 0x00, + 0xE6, 0xF3, 0xD0, 0x01, 0x22, 0x60, 0x06, 0x00, 0x00, 0x00, 0x01, 0x60, + 0x1C, 0x00, 0x00, 0x00, 0x23, 0x40, 0x01, 0x00, 0x00, 0x00, 0x07, 0x90, + 0x10, 0x00, 0x00, 0x00, 0xB7, 0x9A, 0x98, 0x6E, 0x4D, 0x86, 0x75, 0x45, + 0x87, 0x34, 0x90, 0x36, 0x4A, 0xC6, 0x4F, 0xBD, 0x02, 0x70, 0x00, 0x00, + 0x00, 0x00, 0x0B, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x3E, 0x00, + 0x00, 0x00, 0x09, 0x70, 0x26, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x00, + 0x00, 0x00, 0x08, 0x60, 0x82, 0x00, 0x00, 0x00, 0x03, 0x70, 0x08, 0x00, + 0x00, 0x00, 0x01, 0x10, 0x03, 0x60, 0xA0, 0x00, 0x00, 0x00, 0x03, 0x70, + 0x06, 0x00, 0x00, 0x00, 0x03, 0x60, 0xBE, 0x00, 0x00, 0x00, 0x07, 0x70, + 0x8A, 0x00, 0x00, 0x00, 0x01, 0x60, 0xDC, 0x00, 0x00, 0x00, 0x06, 0x60, + 0x00, 0x01, 0x00, 0x00, 0x05, 0x60, 0x2C, 0x01, 0x00, 0x00, 0x04, 0x90, + 0x10, 0x00, 0x00, 0x00, 0x52, 0x35, 0x26, 0x1A, 0x04, 0xE9, 0xB2, 0x41, + 0x98, 0x95, 0x1A, 0x40, 0xD9, 0x15, 0x2B, 0x58, 0x0D, 0x70, 0x24, 0x00, + 0x00, 0x00, 0x17, 0x40, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x01, 0x00, + 0x00, 0x00, 0x15, 0x40, 0x04, 0x00, 0x00, 0x00, 0x24, 0x40, 0x78, 0x00, + 0x30, 0x00, 0x25, 0x40, 0x22, 0x00, 0x20, 0x00, 0x26, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, + 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x13, 0x60, 0xB8, 0x01, + 0x00, 0x00, 0x06, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x0D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x70, + 0x90, 0x00, 0x00, 0x00, 0x01, 0x60, 0xCE, 0x01, 0x00, 0x00, 0x06, 0x60, + 0xF8, 0x01, 0x00, 0x00, 0x05, 0x60, 0x2A, 0x02, 0x00, 0x00, 0x04, 0x90, + 0x10, 0x00, 0x00, 0x00, 0x2D, 0xE0, 0x94, 0xAE, 0x00, 0x63, 0xE3, 0x4E, + 0x92, 0xC7, 0x6F, 0x51, 0x09, 0xD3, 0xAE, 0xC0, 0x0D, 0x70, 0x24, 0x00, + 0x00, 0x00, 0x17, 0x40, 0x01, 0x00, 0x00, 0x00, 0x10, 0x40, 0x02, 0x00, + 0x00, 0x00, 0x15, 0x40, 0x03, 0x00, 0x00, 0x00, 0x24, 0x40, 0x65, 0x00, + 0x20, 0x00, 0x25, 0x40, 0x00, 0x00, 0x00, 0x00, 0x26, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x70, 0x38, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, + 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0B, 0x40, 0x48, 0x18, 0x00, 0x00, 0x13, 0x60, + 0xB8, 0x01, 0x00, 0x00, 0x07, 0x70, 0x8A, 0x00, 0x00, 0x00, 0x01, 0x60, + 0x60, 0x02, 0x00, 0x00, 0x06, 0x60, 0x80, 0x02, 0x00, 0x00, 0x05, 0x60, + 0x9E, 0x02, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0xC0, 0x58, + 0x69, 0x5B, 0x84, 0x60, 0x7B, 0x4F, 0xB2, 0x9E, 0xD2, 0xE2, 0xA4, 0x11, + 0x98, 0x68, 0x08, 0x70, 0x32, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x00, 0x00, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, + 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x13, 0x60, 0xB8, 0x01, 0x00, 0x00, 0x08, 0x70, + 0x12, 0x00, 0x00, 0x00, 0x01, 0x60, 0xC0, 0x02, 0x00, 0x00, 0x01, 0x40, + 0x04, 0x00, 0x00, 0x00, 0x03, 0x40, 0xB0, 0xB0, 0xB0, 0xB0, 0x0B, 0x70, + 0x0C, 0x00, 0x00, 0x00, 0x01, 0x60, 0x3E, 0x00, 0x00, 0x00, 0x1A, 0x40, + 0x8E, 0x01, 0x00, 0x00, 0x07, 0x70, 0xCE, 0x00, 0x00, 0x00, 0x01, 0x60, + 0xEC, 0x02, 0x00, 0x00, 0x06, 0x60, 0x0E, 0x03, 0x00, 0x00, 0x05, 0x60, + 0x26, 0x03, 0x00, 0x00, 0x04, 0x90, 0x10, 0x00, 0x00, 0x00, 0x36, 0x9B, + 0x3E, 0x8A, 0xD0, 0xAF, 0xD0, 0x42, 0x83, 0x8D, 0xE3, 0x1C, 0x19, 0xC4, + 0x15, 0x46, 0x08, 0x70, 0x94, 0x00, 0x00, 0x00, 0x01, 0x60, 0x5C, 0x01, + 0x00, 0x00, 0x01, 0x40, 0x00, 0x08, 0x00, 0x00, 0x03, 0x40, 0xFE, 0x26, + 0x08, 0x55, 0x09, 0x60, 0x66, 0x01, 0x00, 0x00, 0x10, 0x60, 0x84, 0x01, + 0x00, 0x00, 0x11, 0x60, 0xA2, 0x01, 0x00, 0x00, 0x12, 0x60, 0x42, 0x03, + 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x03, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x40, + 0x03, 0x00, 0x00, 0x00, 0x09, 0x40, 0x04, 0x00, 0x00, 0x00, 0x0A, 0x40, + 0x01, 0x00, 0x00, 0x00, 0x0B, 0x40, 0x48, 0x18, 0x00, 0x00, 0x1C, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x13, 0x60, 0xB8, 0x01, 0x00, 0x00, 0x14, 0x60, + 0x68, 0x03, 0x00, 0x00, 0x15, 0x60, 0x90, 0x03, 0x00, 0x00, 0x16, 0x60, + 0xB0, 0x03, 0x00, 0x00, 0x06, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x0D, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x1D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x40, 0x00, 0x00, 0x00, 0x00, + 0x0B, 0x70, 0x06, 0x00, 0x00, 0x00, 0x01, 0x60, 0xD4, 0x03, 0x00, 0x00, + 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x04, 0x00, 0x00, 0x00, + 0x0E, 0x70, 0x06, 0x00, 0x00, 0x00, 0x19, 0x60, 0xEC, 0x03, 0x00, 0x00, + 0x1B, 0x60, 0x00, 0x01, 0x00, 0x00, 0x18, 0x60, 0x24, 0x04, 0x00, 0x00, + 0x0D, 0x70, 0x1E, 0x00, 0x00, 0x00, 0x15, 0x40, 0x03, 0x00, 0x00, 0x00, + 0x0E, 0x70, 0x06, 0x00, 0x00, 0x00, 0x19, 0x60, 0x3E, 0x04, 0x00, 0x00, + 0x1B, 0x60, 0xF8, 0x01, 0x00, 0x00, 0x18, 0x60, 0x7C, 0x04, 0x00, 0x00, + 0x01, 0x78, 0x96, 0x04, 0x00, 0x00, 0x01, 0x88, 0x10, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x2E, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00, + 0x33, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1C, 0x00, 0x00, 0x00, 0x61, 0x00, + 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, + 0x5F, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x31, 0x00, + 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, + 0x73, 0x00, 0x74, 0x00, 0x4E, 0x00, 0x65, 0x00, 0x77, 0x00, 0x4D, 0x00, + 0x6F, 0x00, 0x64, 0x00, 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x20, 0x00, + 0x00, 0x00, 0x56, 0x00, 0x69, 0x00, 0x72, 0x00, 0x74, 0x00, 0x75, 0x00, + 0x61, 0x00, 0x6C, 0x00, 0x52, 0x00, 0x65, 0x00, 0x67, 0x00, 0x69, 0x00, + 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x79, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x18, 0x00, 0x00, 0x00, 0x54, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6D, 0x00, + 0x65, 0x00, 0x41, 0x00, 0x63, 0x00, 0x74, 0x00, 0x69, 0x00, 0x76, 0x00, + 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x69, 0x00, + 0x6E, 0x00, 0x63, 0x00, 0x6C, 0x00, 0x75, 0x00, 0x64, 0x00, 0x65, 0x00, + 0x2E, 0x00, 0x64, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x18, 0x00, 0x00, 0x00, 0x65, 0x00, 0x78, 0x00, 0x63, 0x00, 0x6C, 0x00, + 0x75, 0x00, 0x64, 0x00, 0x65, 0x00, 0x2E, 0x00, 0x64, 0x00, 0x6C, 0x00, + 0x6C, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1E, 0x00, 0x00, 0x00, 0x74, 0x00, + 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, 0x61, 0x00, 0x6C, 0x00, + 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, + 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x26, 0x00, 0x00, 0x00, 0x61, 0x00, + 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, + 0x5F, 0x00, 0x6E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x5F, 0x00, + 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, + 0x01, 0x88, 0x2A, 0x00, 0x00, 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, 0x00, + 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, 0x5F, 0x00, 0x76, 0x00, + 0x65, 0x00, 0x6E, 0x00, 0x64, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x5F, 0x00, + 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, + 0x01, 0x88, 0x04, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x18, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x70, 0x00, + 0x61, 0x00, 0x6E, 0x00, 0x79, 0x00, 0x4E, 0x00, 0x61, 0x00, 0x6D, 0x00, + 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x50, 0x00, + 0x72, 0x00, 0x6F, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, 0x00, + 0x4E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x10, 0x00, 0x00, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00, + 0x30, 0x00, 0x2E, 0x00, 0x31, 0x00, 0x00, 0x00, 0x01, 0x88, 0x10, 0x00, + 0x00, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, + 0x2E, 0x00, 0x30, 0x00, 0x00, 0x00, 0x01, 0x88, 0x24, 0x00, 0x00, 0x00, + 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, 0x64, 0x00, + 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, + 0x77, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00, + 0x01, 0x88, 0x2C, 0x00, 0x00, 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, 0x00, + 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, 0x5F, 0x00, 0x6E, 0x00, + 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x5F, 0x00, 0x64, 0x00, 0x69, 0x00, + 0x73, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, + 0x00, 0x00, 0x01, 0x88, 0x30, 0x00, 0x00, 0x00, 0x61, 0x00, 0x70, 0x00, + 0x70, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, 0x5F, 0x00, + 0x76, 0x00, 0x65, 0x00, 0x6E, 0x00, 0x64, 0x00, 0x6F, 0x00, 0x72, 0x00, + 0x5F, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6C, 0x00, + 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1A, 0x00, + 0x00, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, + 0x6E, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, + 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x18, 0x00, 0x00, 0x00, 0x66, 0x00, + 0x69, 0x00, 0x78, 0x00, 0x6E, 0x00, 0x65, 0x00, 0x77, 0x00, 0x5F, 0x00, + 0x6E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x1C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x69, 0x00, 0x78, 0x00, 0x6E, 0x00, + 0x65, 0x00, 0x77, 0x00, 0x5F, 0x00, 0x76, 0x00, 0x65, 0x00, 0x6E, 0x00, + 0x64, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x00, 0x00, 0x01, 0x88, 0x26, 0x00, + 0x00, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, + 0x63, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x66, 0x00, + 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x2E, 0x00, 0x74, 0x00, 0x78, 0x00, + 0x74, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1C, 0x00, 0x00, 0x00, 0x74, 0x00, + 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x5F, 0x00, 0x77, 0x00, 0x32, 0x00, + 0x6B, 0x00, 0x33, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, + 0x00, 0x00, 0x01, 0x88, 0x12, 0x00, 0x00, 0x00, 0x66, 0x00, 0x69, 0x00, + 0x78, 0x00, 0x5F, 0x00, 0x6E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, + 0x00, 0x00, 0x01, 0x88, 0x16, 0x00, 0x00, 0x00, 0x66, 0x00, 0x69, 0x00, + 0x78, 0x00, 0x5F, 0x00, 0x76, 0x00, 0x65, 0x00, 0x6E, 0x00, 0x64, 0x00, + 0x6F, 0x00, 0x72, 0x00, 0x00, 0x00, 0x01, 0x88, 0x20, 0x00, 0x00, 0x00, + 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x44, 0x00, 0x65, 0x00, + 0x73, 0x00, 0x63, 0x00, 0x72, 0x00, 0x69, 0x00, 0x70, 0x00, 0x74, 0x00, + 0x69, 0x00, 0x6F, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x01, 0x88, 0x22, 0x00, + 0x00, 0x00, 0x4F, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, + 0x6E, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, + 0x65, 0x00, 0x6E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, + 0x01, 0x88, 0x1A, 0x00, 0x00, 0x00, 0x49, 0x00, 0x6E, 0x00, 0x74, 0x00, + 0x65, 0x00, 0x72, 0x00, 0x6E, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x4E, 0x00, + 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1E, 0x00, + 0x00, 0x00, 0x4C, 0x00, 0x65, 0x00, 0x67, 0x00, 0x61, 0x00, 0x6C, 0x00, + 0x43, 0x00, 0x6F, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, + 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x00, 0x00, 0x01, 0x88, 0x12, 0x00, + 0x00, 0x00, 0x57, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x53, 0x00, 0x72, 0x00, + 0x76, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00, 0x01, 0x88, 0x32, 0x00, + 0x00, 0x00, 0x68, 0x00, 0x74, 0x00, 0x74, 0x00, 0x70, 0x00, 0x3A, 0x00, + 0x2F, 0x00, 0x2F, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x63, 0x00, + 0x74, 0x00, 0x6F, 0x00, 0x73, 0x00, 0x2E, 0x00, 0x6F, 0x00, 0x72, 0x00, + 0x67, 0x00, 0x2F, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, + 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, 0x14, 0x00, 0x00, 0x00, 0x41, 0x00, + 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x20, 0x00, 0x69, 0x00, + 0x74, 0x00, 0x21, 0x00, 0x00, 0x00, 0x01, 0x88, 0x38, 0x00, 0x00, 0x00, + 0x68, 0x00, 0x74, 0x00, 0x74, 0x00, 0x70, 0x00, 0x3A, 0x00, 0x2F, 0x00, + 0x2F, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x63, 0x00, 0x74, 0x00, + 0x6F, 0x00, 0x73, 0x00, 0x2E, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x67, 0x00, + 0x2F, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6C, 0x00, + 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x00, 0x00, 0x01, 0x88, 0x1A, 0x00, + 0x00, 0x00, 0x4E, 0x00, 0x6F, 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, + 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x77, 0x00, 0x65, 0x00, 0x64, 0x00, + 0x21, 0x00, 0x00, 0x00 +}; + +void test_create_db(const char* name) +{ + HANDLE file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); + if(file != INVALID_HANDLE_VALUE) + { + DWORD size; + WriteFile(file, rawData, sizeof(rawData), &size, NULL); + CloseHandle(file); + } +} + Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Sun May 22 20:39:41 2016 @@ -36,6 +36,9 @@ #include "wine/test.h" +/* data.c */ +void test_create_db(const char* name); + typedef WORD TAG; typedef DWORD TAGID; typedef DWORD TAGREF; @@ -61,21 +64,72 @@ #define TAG_TYPE_STRING 0x8000 #define TAG_TYPE_BINARY 0x9000 #define TAG_NULL 0x0 + +#define TAG_INCLUDE (0x1 | TAG_TYPE_NULL) + +#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) + #define TAG_SIZE (0x1 | TAG_TYPE_DWORD) - -#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) - +#define TAG_CHECKSUM (0x3 | TAG_TYPE_DWORD) +#define TAG_MODULE_TYPE (0x6 | TAG_TYPE_DWORD) +#define TAG_VERFILEOS (0x9 | TAG_TYPE_DWORD) +#define TAG_VERFILETYPE (0xA | TAG_TYPE_DWORD) +#define TAG_PE_CHECKSUM (0xB | TAG_TYPE_DWORD) +#define TAG_PROBLEMSEVERITY (0x10 | TAG_TYPE_DWORD) +#define TAG_HTMLHELPID (0x15 | TAG_TYPE_DWORD) +#define TAG_FLAGS (0x17 | TAG_TYPE_DWORD) +#define TAG_LAYER_TAGID (0x1A | TAG_TYPE_DWORD) +#define TAG_LINKER_VERSION (0x1C | TAG_TYPE_DWORD) +#define TAG_LINK_DATE (0x1D | TAG_TYPE_DWORD) +#define TAG_UPTO_LINK_DATE (0x1E | TAG_TYPE_DWORD) +#define TAG_APP_NAME_RC_ID (0x24 | TAG_TYPE_DWORD) +#define TAG_VENDOR_NAME_RC_ID (0x25 | TAG_TYPE_DWORD) +#define TAG_SUMMARY_MSG_RC_ID (0x26 | TAG_TYPE_DWORD) +#define TAG_OS_PLATFORM (0x23 | TAG_TYPE_DWORD) + +#define TAG_TIME (0x1 | TAG_TYPE_QWORD) +#define TAG_BIN_FILE_VERSION (0x2 | TAG_TYPE_QWORD) +#define TAG_BIN_PRODUCT_VERSION (0x3 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_PRODUCT_VERSION (0x6 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_FILE_VERSION (0xD | TAG_TYPE_QWORD) #define TAG_FLAG_LUA (0x10 | TAG_TYPE_QWORD) +#define TAG_DATABASE (0x1 | TAG_TYPE_LIST) +#define TAG_INEXCLUD (0x3 | TAG_TYPE_LIST) +#define TAG_EXE (0x7 | TAG_TYPE_LIST) +#define TAG_MATCHING_FILE (0x8 | TAG_TYPE_LIST) +#define TAG_SHIM_REF (0x9| TAG_TYPE_LIST) +#define TAG_LAYER (0xB | TAG_TYPE_LIST) +#define TAG_APPHELP (0xD | TAG_TYPE_LIST) +#define TAG_LINK (0xE | TAG_TYPE_LIST) #define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) +#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) + #define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) -#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) - +#define TAG_MODULE (0x3 | TAG_TYPE_STRINGREF) +#define TAG_VENDOR (0x5 | TAG_TYPE_STRINGREF) +#define TAG_APP_NAME (0x6 | TAG_TYPE_STRINGREF) +#define TAG_COMMAND_LINE (0x8 | TAG_TYPE_STRINGREF) +#define TAG_COMPANY_NAME (0x9 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_NAME (0x10 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_VERSION (0x11 | TAG_TYPE_STRINGREF) +#define TAG_FILE_DESCRIPTION (0x12 | TAG_TYPE_STRINGREF) +#define TAG_FILE_VERSION (0x13 | TAG_TYPE_STRINGREF) +#define TAG_ORIGINAL_FILENAME (0x14 | TAG_TYPE_STRINGREF) +#define TAG_INTERNAL_NAME (0x15 | TAG_TYPE_STRINGREF) +#define TAG_LEGAL_COPYRIGHT (0x16 | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_DETAILS (0x18 | TAG_TYPE_STRINGREF) +#define TAG_LINK_URL (0x19 | TAG_TYPE_STRINGREF) +#define TAG_APPHELP_TITLE (0x1B | TAG_TYPE_STRINGREF) + +#define TAG_COMPILER_VERSION (0x22 | TAG_TYPE_STRINGREF) #define TAG_GENERAL (0x2 | TAG_TYPE_NULL) +#define TAG_EXE_ID (0x4 | TAG_TYPE_BINARY) #define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) +#define TAG_DATABASE_ID (0x7 | TAG_TYPE_BINARY) @@ -83,6 +137,7 @@ static LPCWSTR (WINAPI *pSdbTagToString)(TAG); static PDB (WINAPI *pSdbOpenDatabase)(LPCWSTR, PATH_TYPE); static PDB (WINAPI *pSdbCreateDatabase)(LPCWSTR, PATH_TYPE); +static BOOL (WINAPI *pSdbGetDatabaseVersion)(LPCWSTR, PDWORD, PDWORD); static void (WINAPI *pSdbCloseDatabase)(PDB); static void (WINAPI *pSdbCloseDatabaseWrite)(PDB); static TAG (WINAPI *pSdbGetTagFromTagID)(PDB, TAGID); @@ -95,6 +150,8 @@ static BOOL (WINAPI *pSdbWriteStringRefTag)(PDB, TAG, TAGID); static TAGID (WINAPI *pSdbBeginWriteListTag)(PDB, TAG); static BOOL (WINAPI *pSdbEndWriteListTag)(PDB, TAGID); +static TAGID (WINAPI *pSdbFindFirstTag)(PDB, TAGID, TAG); +static TAGID (WINAPI *pSdbFindNextTag)(PDB, TAGID, TAGID); static WORD (WINAPI *pSdbReadWORDTag)(PDB, TAGID, WORD); static DWORD (WINAPI *pSdbReadDWORDTag)(PDB, TAGID, DWORD); static QWORD (WINAPI *pSdbReadQWORDTag)(PDB, TAGID, QWORD); @@ -105,6 +162,8 @@ static LPWSTR (WINAPI *pSdbGetStringTagPtr)(PDB, TAGID); static TAGID (WINAPI *pSdbGetFirstChild)(PDB, TAGID); static TAGID (WINAPI *pSdbGetNextChild)(PDB, TAGID, TAGID); +static BOOL (WINAPI *pSdbGetDatabaseID)(PDB, GUID*); +static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); static void Write(HANDLE file, LPCVOID buffer, DWORD size) { @@ -114,8 +173,9 @@ static void test_Sdb(void) { - static const WCHAR path[] = {'t','e','m','p',0}; - static const WCHAR path2[] = {'t','e','m','p','2',0}; + static const WCHAR temp[] = {'t','e','m','p',0}; + static const WCHAR path1[] = {'t','e','m','p','.','s','d','b',0}; + static const WCHAR path2[] = {'t','e','m','p','2','.','b','i','n',0}; static const WCHAR tag_size_string[] = {'S','I','Z','E',0}; static const WCHAR tag_flag_lua_string[] = {'F','L','A','G','_','L','U','A',0}; static const TAG tags[5] = { @@ -134,7 +194,7 @@ LPCWSTR string; PBYTE binary; - pdb = pSdbCreateDatabase(path, DOS_PATH); + pdb = pSdbCreateDatabase(path1, DOS_PATH); ok (pdb != NULL, "failed to create database\n"); if(pdb != NULL) { @@ -146,7 +206,7 @@ ok (ret, "failed to write stringref tag\n"); tagid = pSdbBeginWriteListTag(pdb, tags[3]); ok (tagid != TAGID_NULL, "unexpected NULL tagid\n"); - ret = pSdbWriteStringTag(pdb, tags[4], path); + ret = pSdbWriteStringTag(pdb, tags[4], temp); ok (ret, "failed to write string tag\n"); ret = pSdbWriteNULLTag(pdb, TAG_GENERAL); ok (ret, "failed to write NULL tag\n"); @@ -159,7 +219,7 @@ } /* [Err ][SdbGetDatabaseID ] Failed to get root tag */ - pdb = pSdbOpenDatabase(path, DOS_PATH); + pdb = pSdbOpenDatabase(path1, DOS_PATH); ok(pdb != NULL, "unexpected NULL handle\n"); if(pdb) @@ -193,15 +253,15 @@ tagid = pSdbGetNextChild(pdb, TAGID_ROOT, tagid); string = pSdbGetStringTagPtr(pdb, tagid); - ok (string && (lstrcmpW(string, path) == 0), "unexpected string %s, expected %s\n", - wine_dbgstr_w(string), wine_dbgstr_w(path)); + ok (string && (lstrcmpW(string, temp) == 0), "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(temp)); ptagid = pSdbGetNextChild(pdb, TAGID_ROOT, tagid); tagid = pSdbGetFirstChild(pdb, ptagid); string = pSdbGetStringTagPtr(pdb, tagid); - ok (string && (lstrcmpW(string, path) == 0), "unexpected string %s, expected %s\n", - wine_dbgstr_w(string), wine_dbgstr_w(path)); + ok (string && (lstrcmpW(string, temp) == 0), "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(temp)); ok (pSdbReadStringTag(pdb, tagid, buffer, 6), "failed to write string to buffer\n"); /* [Err ][SdbpReadTagData ] Buffer too small. Avail: 6, Need: 10. */ @@ -219,14 +279,14 @@ pSdbCloseDatabase(pdb); } - DeleteFileW(path); + DeleteFileW(path1); file = CreateFileW(path2, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok (file != INVALID_HANDLE_VALUE, "failed to open file\n"); Write(file, &qword, 8); CloseHandle(file); - pdb = pSdbCreateDatabase(path, DOS_PATH); + pdb = pSdbCreateDatabase(path1, DOS_PATH); ok(pdb != NULL, "unexpected NULL handle\n"); if(pdb) @@ -236,7 +296,7 @@ pSdbCloseDatabaseWrite(pdb); /* [Err ][SdbCloseDatabase ] Failed to close the file. */ DeleteFileW(path2); - pdb = pSdbOpenDatabase(path, DOS_PATH); + pdb = pSdbOpenDatabase(path1, DOS_PATH); ok(pdb != NULL, "unexpected NULL handle\n"); binary = pSdbGetBinaryTagData(pdb, _TAGID_ROOT); ok(memcmp(binary, &qword, 8) == 0, "binary data is corrupt\n"); @@ -245,7 +305,447 @@ ok(memcmp(buffer, &qword, 8) == 0, "binary data is corrupt\n"); pSdbCloseDatabase(pdb); } - DeleteFileW(path); + DeleteFileW(path1); +} + +static void match_str_attr_imp(PDB pdb, TAGID parent, TAG find, const char* compare) +{ + TAGID attr = pSdbFindFirstTag(pdb, parent, find); + winetest_ok(attr != TAG_NULL, "Could not find: %x\n", find); + if (attr != TAG_NULL) + { + LPWSTR name = pSdbGetStringTagPtr(pdb, attr); + winetest_ok(name != NULL, "Could not convert attr to str.\n"); + if (name) + { + char name_a[100]; + WideCharToMultiByte(CP_ACP, 0, name, -1, name_a, sizeof(name_a), NULL, NULL); + winetest_ok(strcmp(name_a, compare) == 0, "Expected tagid %x to be %s, was %s\n", attr, compare, name_a); + } + } +} + +static void match_dw_attr_imp(PDB pdb, TAGID parent, TAG find, DWORD compare) +{ + TAGID attr = pSdbFindFirstTag(pdb, parent, find); + winetest_ok(attr != TAG_NULL, "Could not find: %x\n", find); + if (attr != TAG_NULL) + { + DWORD val = pSdbReadDWORDTag(pdb, attr, 0x1234567); + winetest_ok(val == compare, "Expected tagid %x to be 0x%x, was 0x%x\n", attr, compare, val); + } +} + +static void match_qw_attr_imp(PDB pdb, TAGID parent, TAG find, QWORD compare) +{ + TAGID attr = pSdbFindFirstTag(pdb, parent, find); + winetest_ok(attr != TAG_NULL, "Could not find: %x\n", find); + if (attr != TAG_NULL) + { + QWORD val = pSdbReadQWORDTag(pdb, attr, 0x123456789abcdef); + winetest_ok(val == compare, "Expected tagid %x to be 0x%I64x, was 0x%I64x\n", attr, compare, val); + } +} + +static void match_guid_attr_imp(PDB pdb, TAGID parent, TAG find, const GUID* compare) +{ + TAGID attr = pSdbFindFirstTag(pdb, parent, find); + winetest_ok(attr != TAG_NULL, "Could not find: %x\n", find); + if (attr != TAG_NULL) + { + GUID guid = {0}; + BOOL result = pSdbReadBinaryTag(pdb, attr, (PBYTE)&guid, sizeof(guid)); + winetest_ok(result, "expected pSdbReadBinaryTag not to fail.\n"); + winetest_ok(IsEqualGUID(&guid, compare), "expected guids to be equal(%s:%s)\n", wine_dbgstr_guid(&guid), wine_dbgstr_guid(compare)); + } +} + +#define match_str_attr (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : match_str_attr_imp +#define match_dw_attr (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : match_dw_attr_imp +#define match_qw_attr (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : match_qw_attr_imp +#define match_guid_attr (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : match_guid_attr_imp + + +//The application name cannot contain any of the following characters: +// \ / < > : * ? | " + +static void check_db_properties(PDB pdb, TAGID root) +{ + TAGID iter = pSdbFindFirstTag(pdb, root, TAG_DATABASE_ID); + ok(iter != TAGID_NULL, "expected a result, got TAGID_NULL\n"); + if(iter != TAGID_NULL) + { + GUID guid = {0}, guid2 = {0}; + BOOL result = pSdbReadBinaryTag(pdb, iter, (PBYTE)&guid, sizeof(guid)); + ok(result, "expected SdbReadBinaryTag not to fail.\n"); + if(result) + { + WCHAR guid_wstr[50]; + result = pSdbGUIDToString(&guid, guid_wstr, 50); + ok(result, "expected SdbGUIDToString not to fail.\n"); + if(result) + { + char guid_str[50]; + WideCharToMultiByte( CP_ACP, 0, guid_wstr, -1, guid_str, sizeof(guid_str), NULL, NULL ); + ok_str(guid_str, "{6e989ab7-864d-4575-8734-90364ac64fbd}"); + } + ok(pSdbGetDatabaseID(pdb, &guid2),"expected SdbGetDatabaseID not to fail.\n"); + ok(IsEqualGUID(&guid, &guid2), "expected guids to be equal(%s:%s)\n", wine_dbgstr_guid(&guid), wine_dbgstr_guid(&guid2)); + } + } + match_qw_attr(pdb, root, TAG_TIME, 0x1d0f3e6003f963e); + match_str_attr(pdb, root, TAG_COMPILER_VERSION, "2.1.0.3"); + match_str_attr(pdb, root, TAG_NAME, "apphelp_test1"); + match_dw_attr(pdb, root, TAG_OS_PLATFORM, 1); +} + +static void check_db_layer(PDB pdb, TAGID layer) +{ + TAGID shimref, inexclude, is_include; + ok(layer != TAGID_NULL, "Expected a valid layer, got NULL\n"); + if(!layer) + return; + + match_str_attr(pdb, layer, TAG_NAME, "TestNewMode"); + shimref = pSdbFindFirstTag(pdb, layer, TAG_SHIM_REF); + ok(shimref != TAGID_NULL, "Expected a valid shim ref, got NULL\n"); + if(!shimref) + return; + + match_str_attr(pdb, shimref, TAG_NAME, "VirtualRegistry"); + match_str_attr(pdb, shimref, TAG_COMMAND_LINE, "ThemeActive"); + inexclude = pSdbFindFirstTag(pdb, shimref, TAG_INEXCLUD); + ok(inexclude != TAGID_NULL, "Expected a valid in/exclude ref, got NULL\n"); + if(!inexclude) + return; + + is_include = pSdbFindFirstTag(pdb, inexclude, TAG_INCLUDE); + ok(is_include != TAGID_NULL, "Expected a valid include ref, got NULL\n"); + match_str_attr(pdb, inexclude, TAG_MODULE, "include.dll"); + + inexclude = pSdbFindNextTag(pdb, shimref, inexclude); + ok(inexclude != TAGID_NULL, "Expected a valid in/exclude ref, got NULL\n"); + if(!inexclude) + return; + + is_include = pSdbFindFirstTag(pdb, inexclude, TAG_INCLUDE); + ok(is_include == TAGID_NULL, "Expected a NULL include ref, but got one anyway.\n"); + match_str_attr(pdb, inexclude, TAG_MODULE, "exclude.dll"); +} + +static void check_matching_file(PDB pdb, TAGID exe, TAGID matching_file, int num) +{ + ok(matching_file != TAGID_NULL, "Expected to find atleast 1 matching file.\n"); + if(matching_file == TAGID_NULL) + return; + + ok(num < 4, "Too many matches, expected only 4!\n"); + if (num >= 4) + return; + + + match_str_attr(pdb, matching_file, TAG_NAME, "*"); + match_str_attr(pdb, matching_file, TAG_COMPANY_NAME, "CompanyName"); + match_str_attr(pdb, matching_file, TAG_PRODUCT_NAME, "ProductName"); + match_str_attr(pdb, matching_file, TAG_PRODUCT_VERSION, "1.0.0.1"); + match_str_attr(pdb, matching_file, TAG_FILE_VERSION, "1.0.0.0"); + + if( num == 0 || num == 3) + { + match_qw_attr(pdb, matching_file, TAG_UPTO_BIN_PRODUCT_VERSION, 0x1000000000001); + match_qw_attr(pdb, matching_file, TAG_UPTO_BIN_FILE_VERSION, 0x1000000000000); + } + if(num == 1 || num == 3) + { + match_dw_attr(pdb, matching_file, TAG_PE_CHECKSUM, 0x1848); + } + if(num != 0) + { + match_qw_attr(pdb, matching_file, TAG_BIN_PRODUCT_VERSION, 0x1000000000001); + match_qw_attr(pdb, matching_file, TAG_BIN_FILE_VERSION, 0x1000000000000); + } + if(num == 3) + { + match_dw_attr(pdb, matching_file, TAG_SIZE, 0x800); + match_dw_attr(pdb, matching_file, TAG_CHECKSUM, 0x550826fe); + match_str_attr(pdb, matching_file, TAG_FILE_DESCRIPTION, "FileDescription"); + match_dw_attr(pdb, matching_file, TAG_MODULE_TYPE, 3); + match_dw_attr(pdb, matching_file, TAG_VERFILEOS, 4); + match_dw_attr(pdb, matching_file, TAG_VERFILETYPE, 1); + match_dw_attr(pdb, matching_file, TAG_LINKER_VERSION, 0); + match_str_attr(pdb, matching_file, TAG_ORIGINAL_FILENAME, "OriginalFilename"); + match_str_attr(pdb, matching_file, TAG_INTERNAL_NAME, "InternalName"); + match_str_attr(pdb, matching_file, TAG_LEGAL_COPYRIGHT, "LegalCopyright"); + match_dw_attr(pdb, matching_file, TAG_LINK_DATE, 0); + match_dw_attr(pdb, matching_file, TAG_UPTO_LINK_DATE, 0); + } + if(num > 3) + { + ok(0, "unknown case: %d\n", num); + } + matching_file = pSdbFindNextTag(pdb, exe, matching_file); + if(num == 2) + { + ok(matching_file != TAGID_NULL, "Did expect a secondary match on %d\n", num); + match_str_attr(pdb, matching_file, TAG_NAME, "test_checkfile.txt"); + match_dw_attr(pdb, matching_file, TAG_SIZE, 0x4); + match_dw_attr(pdb, matching_file, TAG_CHECKSUM, 0xb0b0b0b0); + } + else + { + ok(matching_file == TAGID_NULL, "Did not expect a secondary match on %d\n", num); + } +} + +static void check_matching_apphelp(PDB pdb, TAGID apphelp, int num) +{ + if(num == 0) + { +/* +[Window Title] +Program Compatibility Assistant + +[Main Instruction] +This program has known compatibility issues + +[Expanded Information] +Allow it! + +[^] Hide details [ ] Don't show this message again [Check for solutions online] [Run program] [Cancel] +*/ + match_dw_attr(pdb, apphelp, TAG_FLAGS, 1); + match_dw_attr(pdb, apphelp, TAG_PROBLEMSEVERITY, 1); + match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 4); + match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x300078); + match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0x200022); + match_dw_attr(pdb, apphelp, TAG_SUMMARY_MSG_RC_ID, 0); + } + else + { +/* +[Window Title] +Program Compatibility Assistant + +[Main Instruction] +This program is blocked due to compatibility issues + +[Expanded Information] +Not allowed! + +[^] Hide details [Check for solutions online] [Cancel] +*/ + match_dw_attr(pdb, apphelp, TAG_FLAGS, 1); + match_dw_attr(pdb, apphelp, TAG_PROBLEMSEVERITY, 2); + match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, 3); + match_dw_attr(pdb, apphelp, TAG_APP_NAME_RC_ID, 0x200065); + match_dw_attr(pdb, apphelp, TAG_VENDOR_NAME_RC_ID, 0); + match_dw_attr(pdb, apphelp, TAG_SUMMARY_MSG_RC_ID, 0); + } + apphelp = pSdbFindNextTag(pdb, apphelp, apphelp); + ok(apphelp == TAGID_NULL, "Did not expect a secondary match on %d\n", num); +} + +static void check_matching_layer(PDB pdb, TAGID layer, int num) +{ + if(num == 2) + { + match_dw_attr(pdb, layer, TAG_LAYER_TAGID, 0x18e); + match_str_attr(pdb, layer, TAG_NAME, "TestNewMode"); + } + else + { + TAGID layer_tagid = pSdbFindFirstTag(pdb, layer, TAG_LAYER_TAGID); + ok(layer_tagid == TAGID_NULL, "expected not to find a layer tagid, got %x\n", layer_tagid); + match_str_attr(pdb, layer, TAG_NAME, "WinSrv03"); + } +} + +static struct +{ + const char* name; + const char* app_name; + const char* vendor; + GUID exe_id; + const char* extra_file; + DWORD dwLayerCount; + TAGREF atrExes_0; + TAGREF atrLayers_0; +} test_exedata[4] = { + { + "test_allow.exe", + "apphelp_name_allow", + "apphelp_vendor_allow", + {0x1a263552,0xe904,0x41b2,{0x98,0x95,0x1a,0x40,0xd9,0x15,0x2b,0x58}}, + NULL, + 0, + 0x1c6, + 0, + }, + { + "test_disallow.exe", + "apphelp_name_disallow", + "apphelp_vendor_disallow", + {0xae94e02d,0x6300,0x4ee3,{0x92,0xc7,0x6f,0x51,0x09,0xd3,0xae,0xc0}}, + NULL, + 0, + 0x256, + 0, + }, + { + "test_new.exe", + "fixnew_name", + "fixnew_vendor", + {0x5b6958c0,0x6084,0x4f7b,{0xb2,0x9e,0xd2,0xe2,0xa4,0x11,0x98,0x68}}, + "test_checkfile.txt", + 1, + 0x2ec, + 0x18e, + }, + { + "test_w2k3.exe", + "fix_name", + "fix_vendor", + {0x8a3e9b36,0xafd0,0x42d0,{0x83,0x8d,0xe3,0x1c,0x19,0xc4,0x15,0x46}}, + NULL, + 0, + 0x37c, + 0, + }, +}; + +static void check_db_exes(PDB pdb, TAGID root) +{ + int num = 0; + TAGID exe = pSdbFindFirstTag(pdb, root, TAG_EXE); + while (exe != TAGID_NULL) + { + TAGID apphelp, layer; + ok(num < 4, "Too many matches, expected only 4!\n"); + if(num >= 4) + break; + match_str_attr(pdb, exe, TAG_NAME, test_exedata[num].name); + match_str_attr(pdb, exe, TAG_APP_NAME, test_exedata[num].app_name); + match_str_attr(pdb, exe, TAG_VENDOR, test_exedata[num].vendor); + match_guid_attr(pdb, exe, TAG_EXE_ID, &test_exedata[num].exe_id); + check_matching_file(pdb, exe, pSdbFindFirstTag(pdb, exe, TAG_MATCHING_FILE), num); + apphelp = pSdbFindFirstTag(pdb, exe, TAG_APPHELP); + if(num == 0 || num == 1) + { + ok(apphelp != TAGID_NULL, "Expected to find a valid apphelp match on %d.\n", num); + if(apphelp) + check_matching_apphelp(pdb, apphelp, num); + } + else + { + ok(apphelp == TAGID_NULL, "Did not expect an apphelp match on %d\n", num); + } + layer = pSdbFindFirstTag(pdb, exe, TAG_LAYER); + if(num == 2 || num == 3) + { + ok(layer != TAGID_NULL, "Expected to find a valid layer match on %d.\n", num); + if(layer) + check_matching_layer(pdb, layer, num); + } + else + { + ok(layer == TAGID_NULL, "Did not expect a layer match on %d\n", num); + } + ++num; + exe = pSdbFindNextTag(pdb, root, exe); + } + ok(num == 4, "Expected to find 4 exe tags, found: %d\n", num); +} + +static struct +{ + DWORD htmlhelpid; + const char* link; + const char* apphelp_title; + const char* apphelp_details; +} test_layerdata[2] = { + { + 4, + "http://reactos.org/allow", + "apphelp_name_allow", + "Allow it!", + }, + { + 3, + "http://reactos.org/disallow", + "apphelp_name_disallow", + "Not allowed!", + }, +}; + +static void check_db_apphelp(PDB pdb, TAGID root) +{ + int num = 0; + TAGID apphelp = pSdbFindFirstTag(pdb, root, TAG_APPHELP); + while (apphelp != TAGID_NULL) + { + TAGID link; + ok(num < 2, "Too many matches, expected only 4!\n"); + if(num >= 2) + break; + match_dw_attr(pdb, apphelp, TAG_HTMLHELPID, test_layerdata[num].htmlhelpid); + link = pSdbFindFirstTag(pdb, apphelp, TAG_LINK); + ok(link != TAGID_NULL, "expected to find a link tag\n"); + if (link != TAGID_NULL) + { + match_str_attr(pdb, link, TAG_LINK_URL, test_layerdata[num].link); + } + match_str_attr(pdb, apphelp, TAG_APPHELP_TITLE, test_layerdata[num].apphelp_title); + match_str_attr(pdb, apphelp, TAG_APPHELP_DETAILS, test_layerdata[num].apphelp_details); + apphelp = pSdbFindNextTag(pdb, root, apphelp); + num++; + } + ok(num == 2, "Expected to find 2 layer tags, found: %d\n", num); +} + +static void test_CheckDatabaseManually(void) +{ + static const WCHAR path[] = {'t','e','s','t','_','d','b','.','s','d','b',0}; + TAGID root; + PDB pdb; + BOOL ret; + DWORD ver_hi, ver_lo; + + test_create_db("test_db.sdb"); + + /* both ver_hi and ver_lo cannot be null, it'll crash. */ + ver_hi = ver_lo = 0x12345678; + ret = pSdbGetDatabaseVersion(path, &ver_hi, &ver_lo); + ok(ret,"Expected SdbGetDatabaseVersion to succeed\n"); + ok(ver_hi == 2,"Expected ver_hi to be 2, was: %d\n", ver_hi); + ok(ver_lo == 1,"Expected ver_lo to be 1, was: %d\n", ver_lo); + + ver_hi = ver_lo = 0x12345678; + ret = pSdbGetDatabaseVersion(NULL, &ver_hi, &ver_lo); + ok(ret,"Expected SdbGetDatabaseVersion to succeed\n"); + ok(ver_hi == 0x12345678,"Expected ver_hi to be 0x12345678, was: 0x%x\n", ver_hi); + ok(ver_lo == 0x12345678,"Expected ver_lo to be 0x12345678, was: 0x%x\n", ver_lo); + + ver_hi = ver_lo = 0x12345678; + ret = pSdbGetDatabaseVersion(path + 1, &ver_hi, &ver_lo); + ok(ret,"Expected SdbGetDatabaseVersion to succeed\n"); + ok(ver_hi == 0x12345678,"Expected ver_hi to be 0x12345678, was: 0x%x\n", ver_hi); + ok(ver_lo == 0x12345678,"Expected ver_lo to be 0x12345678, was: 0x%x\n", ver_lo); + + pdb = pSdbOpenDatabase(path, DOS_PATH); + ok(pdb != NULL, "unexpected NULL handle\n"); + + root = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); + ok(root != TAGID_NULL, "expected to find a root tag\n"); + if (root != TAGID_NULL) + { + check_db_properties(pdb, root); + check_db_layer(pdb, pSdbFindFirstTag(pdb, root, TAG_LAYER)); + check_db_exes(pdb, root); + check_db_apphelp(pdb, root); + } + + pSdbCloseDatabase(pdb); + DeleteFileA("test_db.sdb"); } START_TEST(db) @@ -256,6 +756,7 @@ pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); pSdbOpenDatabase = (void *) GetProcAddress(hdll, "SdbOpenDatabase"); pSdbCreateDatabase = (void *) GetProcAddress(hdll, "SdbCreateDatabase"); + pSdbGetDatabaseVersion = (void *) GetProcAddress(hdll, "SdbGetDatabaseVersion"); pSdbCloseDatabase = (void *) GetProcAddress(hdll, "SdbCloseDatabase"); pSdbCloseDatabaseWrite = (void *) GetProcAddress(hdll, "SdbCloseDatabaseWrite"); pSdbGetTagFromTagID = (void *) GetProcAddress(hdll, "SdbGetTagFromTagID"); @@ -268,6 +769,8 @@ pSdbWriteStringRefTag = (void *) GetProcAddress(hdll, "SdbWriteStringRefTag"); pSdbBeginWriteListTag = (void *)GetProcAddress(hdll, "SdbBeginWriteListTag"); pSdbEndWriteListTag = (void *) GetProcAddress(hdll, "SdbEndWriteListTag"); + pSdbFindFirstTag = (void *) GetProcAddress(hdll, "SdbFindFirstTag"); + pSdbFindNextTag = (void *) GetProcAddress(hdll, "SdbFindNextTag"); pSdbReadWORDTag = (void *) GetProcAddress(hdll, "SdbReadWORDTag"); pSdbReadDWORDTag = (void *) GetProcAddress(hdll, "SdbReadDWORDTag"); pSdbReadQWORDTag = (void *) GetProcAddress(hdll, "SdbReadQWORDTag"); @@ -278,6 +781,9 @@ pSdbGetStringTagPtr = (void *) GetProcAddress(hdll, "SdbGetStringTagPtr"); pSdbGetFirstChild = (void *) GetProcAddress(hdll, "SdbGetFirstChild"); pSdbGetNextChild = (void *) GetProcAddress(hdll, "SdbGetNextChild"); + pSdbGetDatabaseID = (void *) GetProcAddress(hdll, "SdbGetDatabaseID"); + pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); test_Sdb(); -} + test_CheckDatabaseManually(); +}

1 0

[mjansen] 71380: [APPHELP][APPHELP_APITEST] Implement most of sdbread and sdbwrite, mainly the work of Mislav Blaževic, with some small additions from me. CORE-10367
by mjansen＠svn.reactos.org 22 May '16

22 May '16

Author: mjansen Date: Sun May 22 20:27:02 2016 New Revision: 71380 URL: http://svn.reactos.org/svn/reactos?rev=71380&view=rev Log: [APPHELP][APPHELP_APITEST] Implement most of sdbread and sdbwrite, mainly the work of Mislav Blaževic, with some small additions from me. CORE-10367 Added: trunk/reactos/dll/appcompat/apphelp/sdbread.c (with props) trunk/reactos/dll/appcompat/apphelp/sdbwrite.c (with props) trunk/rostests/apitests/apphelp/db.c (with props) Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/testlist.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sun May 22 20:27:02 2016 @@ -5,6 +5,8 @@ apphelp.c layer.c sdbapi.c + sdbread.c + sdbwrite.c sdbfileattr.c apphelp.spec apphelp.h Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun May 22 20:27:02 2016 @@ -32,6 +32,19 @@ #define TAGREF_NULL (0) #define TAGREF_ROOT (0) +typedef struct _DB { + HANDLE file; + DWORD size; + PBYTE data; + TAGID stringtable; + DWORD write_iter; + GUID database_id; +} DB, *PDB; + +/* Flags for SdbInitDatabase */ +#define HID_DOS_PATHS 0x1 +#define HID_DATABASE_FULLPATH 0x2 +#define HID_NO_DATABASE 0x4 #define HID_DATABASE_TYPE_MASK 0xF00F0000 #define SDB_DATABASE_MAIN_MSI 0x80020000 #define SDB_DATABASE_MAIN_SHIM 0x80030000 @@ -47,6 +60,11 @@ }; } ATTRINFO, *PATTRINFO; +typedef enum _PATH_TYPE { + DOS_PATH, + NT_PATH +} PATH_TYPE; + typedef enum _SHIM_LOG_LEVEL { SHIM_ERR = 1, SHIM_WARN = 2, @@ -99,6 +117,18 @@ void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping); DWORD SdbpStrlen(LPCWSTR string); PWSTR SdbpStrDup(LPCWSTR string); +BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); +BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); +PDB WINAPI SdbpCreate(void); +PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); +void WINAPI SdbCloseDatabase(PDB); +BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid); + +/* sdbread.c */ +BOOL WINAPI SdbpReadData(PDB db, PVOID dest, DWORD offset, DWORD num); +TAG WINAPI SdbGetTagFromTagID(PDB db, TAGID tagid); +TAGID WINAPI SdbFindFirstTag(PDB db, TAGID parent, TAG tag); +BOOL WINAPI SdbGetDatabaseID(PDB db, GUID* Guid); /* layer.c */ Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun May 22 20:27:02 2016 @@ -20,32 +20,32 @@ @ stub SdbAddLayerTagRefToQuery @ stub SdbApphelpNotify @ stub SdbApphelpNotifyExSdbApphelpNotifyEx -@ stub SdbBeginWriteListTag +@ stdcall SdbBeginWriteListTag(ptr long) @ stub SdbBuildCompatEnvVariables @ stub SdbCloseApphelpInformation -@ stub SdbCloseDatabase -@ stub SdbCloseDatabaseWrite +@ stdcall SdbCloseDatabase(ptr) +@ stdcall SdbCloseDatabaseWrite(ptr) @ stub SdbCloseLocalDatabase @ stub SdbCommitIndexes -@ stub SdbCreateDatabase +@ stdcall SdbCreateDatabase(wstr long) @ stub SdbCreateHelpCenterURL @ stub SdbCreateMsiTransformFile @ stub SdbDeclareIndex @ stub SdbDumpSearchPathPartCaches @ stub SdbEnumMsiTransforms -@ stub SdbEndWriteListTag +@ stdcall SdbEndWriteListTag(ptr long) @ stub SdbEscapeApphelpURL @ stub SdbFindFirstDWORDIndexedTag @ stub SdbFindFirstMsiPackage @ stub SdbFindFirstMsiPackage_Str @ stub SdbFindFirstNamedTag @ stub SdbFindFirstStringIndexedTag -@ stub SdbFindFirstTag +@ stdcall SdbFindFirstTag(ptr long long) @ stub SdbFindFirstTagRef @ stub SdbFindNextDWORDIndexedTag @ stub SdbFindNextMsiPackage @ stub SdbFindNextStringIndexedTag -@ stub SdbFindNextTag +@ stdcall SdbFindNextTag(ptr long long) @ stub SdbFindNextTagRef @ stub SdbFreeDatabaseInformation @ stdcall SdbFreeFileAttributes(ptr) @@ -53,8 +53,8 @@ @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize @ stub SdbGetAppPatchDir -@ stub SdbGetBinaryTagData -@ stub SdbGetDatabaseID +@ stdcall SdbGetBinaryTagData(ptr long) +@ stdcall SdbGetDatabaseID(ptr ptr) @ stub SdbGetDatabaseInformation @ stub SdbGetDatabaseInformationByName @ stub SdbGetDatabaseMatch @@ -65,7 +65,7 @@ @ stub SdbGetFileImageType @ stub SdbGetFileImageTypeEx @ stub SdbGetFileInfo -@ stub SdbGetFirstChild +@ stdcall SdbGetFirstChild(ptr long) @ stub SdbGetIndex @ stub SdbGetItemFromItemRef @ stub SdbGetLayerName @@ -74,15 +74,15 @@ @ stub SdbGetMatchingExe @ stub SdbGetMsiPackageInformation @ stub SdbGetNamedLayer -@ stub SdbGetNextChild +@ stdcall SdbGetNextChild(ptr long long) @ stub SdbGetNthUserSdb @ stdcall SdbGetPermLayerKeys(wstr wstr ptr long) @ stub SdbGetShowDebugInfoOption @ stub SdbGetShowDebugInfoOptionValue @ stdcall SdbGetStandardDatabaseGUID(long ptr) -@ stub SdbGetStringTagPtr -@ stub SdbGetTagDataSize -@ stub SdbGetTagFromTagID +@ stdcall SdbGetStringTagPtr(ptr long) +@ stdcall SdbGetTagDataSize(ptr long) +@ stdcall SdbGetTagFromTagID(ptr long) @ stub SdbGrabMatchingInfo @ stub SdbGrabMatchingInfoEx @ stdcall SdbGUIDFromString(wstr ptr) @@ -100,7 +100,7 @@ @ stub SdbOpenApphelpInformation @ stub SdbOpenApphelpInformationByID @ stub SdbOpenApphelpResourceFile -@ stub SdbOpenDatabase +@ stdcall SdbOpenDatabase(wstr long) @ stub SdbOpenDbFromGuid @ stub SdbOpenLocalDatabase @ stub SdbPackAppCompatData @@ -115,18 +115,18 @@ @ stub SdbQueryReinstallUpgrade @ stub SdbReadApphelpData @ stub SdbReadApphelpDetailsData -@ stub SdbReadBinaryTag +@ stdcall SdbReadBinaryTag(ptr long ptr long) @ stub SdbReadBYTETag -@ stub SdbReadDWORDTag +@ stdcall SdbReadDWORDTag(ptr long long) @ stub SdbReadDWORDTagRef @ stub SdbReadEntryInformation @ stub SdbReadMsiTransformInfo @ stub SdbReadPatchBits -@ stub SdbReadQWORDTag +@ stdcall SdbReadQWORDTag(ptr long int64) @ stub SdbReadQWORDTagRef -@ stub SdbReadStringTag +@ stdcall SdbReadStringTag(ptr long wstr long) @ stub SdbReadStringTagRef -@ stub SdbReadWORDTag +@ stdcall SdbReadWORDTag(ptr long long) @ stub SdbReadWORDTagRef @ stub SdbRegisterDatabase @ stub SdbReleaseDatabase @@ -147,16 +147,16 @@ @ stub SdbTagRefToTagID @ stdcall SdbTagToString(long) @ stub SdbUnregisterDatabase -@ stub SdbWriteBinaryTag -@ stub SdbWriteBinaryTagFromFile +@ stdcall SdbWriteBinaryTag(ptr long ptr long) +@ stdcall SdbWriteBinaryTagFromFile(ptr long wstr) @ stub SdbWriteBYTETag -@ stub SdbWriteDWORDTag -@ stub SdbWriteNULLTag -@ stub SdbWriteQWORDTag -@ stub SdbWriteStringRefTag -@ stub SdbWriteStringTag +@ stdcall SdbWriteDWORDTag(ptr long long) +@ stdcall SdbWriteNULLTag(ptr long) +@ stdcall SdbWriteQWORDTag(ptr long int64) +@ stdcall SdbWriteStringRefTag(ptr long long) +@ stdcall SdbWriteStringTag(ptr long wstr) @ stub SdbWriteStringTagDirect -@ stub SdbWriteWORDTag +@ stdcall SdbWriteWORDTag(ptr long long) @ stub SE_DllLoaded @ stub SE_DllUnloaded @ stub SE_GetHookAPIs Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun May 22 20:27:02 2016 @@ -1,7 +1,7 @@ /* * Copyright 2011 AndrÃ© Hentschel * Copyright 2013 Mislav BlaÅ¾eviÄ - * Copyright 2015 Mark Jansen + * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -202,6 +202,12 @@ HeapFree(SdbpHeap(), 0, mem); } +PDB WINAPI SdbpCreate(void) +{ + PDB db = (PDB)SdbAlloc(sizeof(DB)); + /* SdbAlloc zeroes the memory. */ + return db; +} DWORD SdbpStrlen(PCWSTR string) { return (lstrlenW(string) + 1) * sizeof(WCHAR); @@ -290,6 +296,119 @@ NtClose(mapping->section); NtClose(mapping->file); RtlZeroMemory(mapping, sizeof(*mapping)); +} + +BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type) +{ + if ((tag & TAG_TYPE_MASK) != type) + return FALSE; + return TRUE; +} + +BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type) +{ + TAG tag = SdbGetTagFromTagID(db, tagid); + if (tag == TAG_NULL) + return FALSE; + return SdbpCheckTagType(tag, type); +} + +/** + * Opens specified shim database file. + * + * @param [in] path Path to the shim database. + * @param [in] type Type of path. Either DOS_PATH or NT_PATH. + * + * @return Success: Handle to the shim database, NULL otherwise. + */ +PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) +{ + NTSTATUS Status; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + PDB db; + BYTE header[12]; + DWORD dwRead = 0; + + if (type == DOS_PATH) + { + if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) + return NULL; + } + else + RtlInitUnicodeString(&str, path); + + db = SdbpCreate(); + if (!db) + { + SHIM_ERR("Failed to allocate memory for shim database\n"); + return NULL; + } + + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, + &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + + if (type == DOS_PATH) + RtlFreeUnicodeString(&str); + + if (!NT_SUCCESS(Status)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to open shim database file: 0x%lx\n", Status); + return NULL; + } + + db->size = GetFileSize(db->file, NULL); + db->data = SdbAlloc(db->size); + ReadFile(db->file, db->data, db->size, &dwRead, NULL); + + if (!SdbpReadData(db, &header, 0, 12)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to read shim database header\n"); + return NULL; + } + + if (memcmp(&header[8], "sdbf", 4) != 0) + { + SdbCloseDatabase(db); + SHIM_ERR("Shim database header is invalid\n"); + return NULL; + } + + if (*(DWORD*)&header[0] != (DWORD)2) + { + SdbCloseDatabase(db); + SHIM_ERR("Invalid shim database version\n"); + return NULL; + } + + db->stringtable = SdbFindFirstTag(db, TAGID_ROOT, TAG_STRINGTABLE); + if(!SdbGetDatabaseID(db, &db->database_id)) + { + SHIM_INFO("Failed to get the database id\n"); + } + return db; +} + +/** + * Closes specified database and frees its memory. + * + * @param [in] db Handle to the shim database. + */ +void WINAPI SdbCloseDatabase(PDB db) +{ + if (!db) + return; + + if (db->file) + NtClose(db->file); + SdbFree(db->data); + SdbFree(db); } /** @@ -380,6 +499,8 @@ * @param [in] tag The tag which will be converted to a string. * * @return Success: Pointer to the string matching specified tag, or L"InvalidTag" on failure. + * + * @todo: Convert this into a lookup table, this is wasting alot of space. */ LPCWSTR WINAPI SdbTagToString(TAG tag) { Added: trunk/reactos/dll/appcompat/apphelp/sdbread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbr… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbread.c (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbread.c [iso-8859-1] Sun May 22 20:27:02 2016 @@ -0,0 +1,439 @@ +/* + * Copyright 2011 André Hentschel + * Copyright 2013 Mislav Blaevic + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "apphelp.h" + +#include "wine/unicode.h" + + +DWORD WINAPI SdbGetTagDataSize(PDB db, TAGID tagid); + + +BOOL WINAPI SdbpReadData(PDB db, PVOID dest, DWORD offset, DWORD num) +{ + DWORD size = offset + num; + + /* Either overflow or no data to read */ + if (size <= offset) + return FALSE; + + /* Overflow */ + if (db->size < size) + return FALSE; + + memcpy(dest, db->data + offset, num); + return TRUE; +} + +static DWORD WINAPI SdbpGetTagSize(PDB db, TAGID tagid) +{ + WORD type; + DWORD size; + + type = SdbGetTagFromTagID(db, tagid) & TAG_TYPE_MASK; + if (type == TAG_NULL) + return 0; + + size = SdbGetTagDataSize(db, tagid); + if (type <= TAG_TYPE_STRINGREF) + return size += sizeof(TAG); + else size += (sizeof(TAG) + sizeof(DWORD)); + + return size; +} + +static LPWSTR WINAPI SdbpGetString(PDB db, TAGID tagid, PDWORD size) +{ + TAG tag; + TAGID offset; + + tag = SdbGetTagFromTagID(db, tagid); + if (tag == TAG_NULL) + return NULL; + + if ((tag & TAG_TYPE_MASK) == TAG_TYPE_STRINGREF) + { + /* No stringtable; all references are invalid */ + if (db->stringtable == TAGID_NULL) + return NULL; + + /* TAG_TYPE_STRINGREF contains offset of string relative to stringtable */ + if (!SdbpReadData(db, &tagid, tagid + sizeof(TAG), sizeof(TAGID))) + return NULL; + + offset = db->stringtable + tagid + sizeof(TAG) + sizeof(TAGID); + } + else if ((tag & TAG_TYPE_MASK) == TAG_TYPE_STRING) + { + offset = tagid + sizeof(TAG) + sizeof(TAGID); + } + else + { + SHIM_ERR("Tag 0x%u at tagid %u is neither a string or reference to string\n", tag, tagid); + return NULL; + } + + /* Optionally read string size */ + if (size && !SdbpReadData(db, size, tagid + sizeof(TAG), sizeof(*size))) + return FALSE; + + return (LPWSTR)(&db->data[offset]); +} + +/** + * Searches shim database for the tag associated with specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid The TAGID of the tag. + * + * @return Success: The tag associated with specified tagid, Failure: TAG_NULL. + */ +TAG WINAPI SdbGetTagFromTagID(PDB db, TAGID tagid) +{ + TAG data; + if (!SdbpReadData(db, &data, tagid, sizeof(data))) + return TAG_NULL; + return data; +} + +/** + * Retrieves size of data at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid Tagid of tag whose size is queried. + * + * @return Success: Size of data at specified tagid, Failure: 0. + */ +DWORD WINAPI SdbGetTagDataSize(PDB db, TAGID tagid) +{ + /* sizes of data types with fixed size */ + static const SIZE_T sizes[6] = { + 0, /* NULL */ 1, /* BYTE */ + 2, /* WORD */ 4, /* DWORD */ + 8, /* QWORD */ 4 /* STRINGREF */ + }; + WORD type; + DWORD size; + + type = SdbGetTagFromTagID(db, tagid) & TAG_TYPE_MASK; + if (type == TAG_NULL) + return 0; + + if (type <= TAG_TYPE_STRINGREF) + return sizes[(type >> 12) - 1]; + + /* tag with dynamic size (e.g. list): must read size */ + if (!SdbpReadData(db, &size, tagid + sizeof(TAG), sizeof(size))) + return 0; + + return size; +} + +/** + * Searches shim database for a child of specified parent tag. + * + * @param [in] db Handle to the shim database. + * @param [in] parent TAGID of parent. + * + * @return Success: TAGID of child tag, Failure: TAGID_NULL. + */ +TAGID WINAPI SdbGetFirstChild(PDB db, TAGID parent) +{ + /* if we are at beginning of database */ + if (parent == TAGID_ROOT) + { + /* header only database: no tags */ + if (db->size <= _TAGID_ROOT) + return TAGID_NULL; + /* return *real* root tagid */ + else return _TAGID_ROOT; + } + + /* only list tag can have children */ + if ((SdbGetTagFromTagID(db, parent) & TAG_TYPE_MASK) != TAG_TYPE_LIST) + return TAGID_NULL; + + /* first child is sizeof(TAG) + sizeof(DWORD) bytes after beginning of list */ + return parent + sizeof(TAG) + sizeof(DWORD); +} + +/** + * Searches shim database for next child of specified parent tag. + * + * @param [in] db Handle to the shim database. + * @param [in] parent TAGID of parent. + * @param [in] prev_child TAGID of previous child. + * + * @return Success: TAGID of next child tag, Failure: TAGID_NULL. + */ +TAGID WINAPI SdbGetNextChild(PDB db, TAGID parent, TAGID prev_child) +{ + TAGID next_child; + DWORD prev_child_size, parent_size; + + prev_child_size = SdbpGetTagSize(db, prev_child); + if (prev_child_size == 0) + return TAGID_NULL; + + /* Bound check */ + next_child = prev_child + prev_child_size; + if (next_child >= db->size) + return TAGID_NULL; + + if (parent == TAGID_ROOT) + return next_child; + + parent_size = SdbpGetTagSize(db, parent); + if (parent_size == 0) + return TAGID_NULL; + + /* Specified parent has no more children */ + if (next_child >= parent + parent_size) + return TAGID_NULL; + + return next_child; +} + +/** + * Searches shim database for a tag within specified domain. + * + * @param [in] db Handle to the shim database. + * @param [in] parent TAGID of parent. + * @param [in] tag TAG to be located. + * + * @return Success: TAGID of first matching tag, Failure: TAGID_NULL. + */ +TAGID WINAPI SdbFindFirstTag(PDB db, TAGID parent, TAG tag) +{ + TAGID iter; + + iter = SdbGetFirstChild(db, parent); + while (iter != TAGID_NULL) + { + if (SdbGetTagFromTagID(db, iter) == tag) + return iter; + iter = SdbGetNextChild(db, parent, iter); + } + return TAGID_NULL; +} + +/** + * Searches shim database for a next tag which matches prev_child within parent's domain. + * + * @param [in] db Handle to the shim database. + * @param [in] parent TAGID of parent. + * @param [in] prev_child TAGID of previous match. + * + * @return Success: TAGID of next match, Failure: TAGID_NULL. + */ +TAGID WINAPI SdbFindNextTag(PDB db, TAGID parent, TAGID prev_child) +{ + TAG tag; + TAGID iter; + + tag = SdbGetTagFromTagID(db, prev_child); + iter = SdbGetNextChild(db, parent, prev_child); + + while (iter != TAGID_NULL) + { + if (SdbGetTagFromTagID(db, iter) == tag) + return iter; + iter = SdbGetNextChild(db, parent, iter); + } + return TAGID_NULL; +} + +/** + * Searches shim database for string associated with specified tagid and copies string into a + * buffer. + * + * If size parameter is less than number of characters in string, this function shall fail and + * no data shall be copied. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of string or stringref associated with the string. + * @param [out] buffer Buffer in which string will be copied. + * @param [in] size Number of characters to copy. + * + * @return TRUE if string was successfully copied to the buffer FALSE if string was not copied + * to the buffer. + */ +BOOL WINAPI SdbReadStringTag(PDB db, TAGID tagid, LPWSTR buffer, DWORD size) +{ + LPWSTR string; + DWORD string_size; + + string = SdbpGetString(db, tagid, &string_size); + if (!string) + return FALSE; + + /* Check if buffer is too small */ + if (size * sizeof(WCHAR) < string_size) + return FALSE; + + memcpy(buffer, string, string_size); + return TRUE; +} + +/** + * Reads WORD value at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of WORD value. + * @param [in] ret Default return value in case function fails. + * + * @return Success: WORD value at specified tagid, or ret on failure. + */ +WORD WINAPI SdbReadWORDTag(PDB db, TAGID tagid, WORD ret) +{ + if (SdbpCheckTagIDType(db, tagid, TAG_TYPE_WORD)) + SdbpReadData(db, &ret, tagid + 2, sizeof(WORD)); + return ret; +} + +/** + * Reads DWORD value at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of DWORD value. + * @param [in] ret Default return value in case function fails. + * + * @return Success: DWORD value at specified tagid, otherwise ret. + */ +DWORD WINAPI SdbReadDWORDTag(PDB db, TAGID tagid, DWORD ret) +{ + if (SdbpCheckTagIDType(db, tagid, TAG_TYPE_DWORD)) + SdbpReadData(db, &ret, tagid + 2, sizeof(DWORD)); + return ret; +} + +/** + * Reads QWORD value at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of QWORD value. + * @param [in] ret Default return value in case function fails. + * + * @return Success: QWORD value at specified tagid, otherwise ret. + */ +QWORD WINAPI SdbReadQWORDTag(PDB db, TAGID tagid, QWORD ret) +{ + if (SdbpCheckTagIDType(db, tagid, TAG_TYPE_QWORD)) + SdbpReadData(db, &ret, tagid + sizeof(TAG), sizeof(QWORD)); + return ret; +} + +/** + * Reads binary data at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of binary data. + * @param [out] buffer Buffer in which data will be copied. + * @param [in] size Size of the buffer. + * + * @return TRUE if data was successfully written, or FALSE otherwise. + */ +BOOL WINAPI SdbReadBinaryTag(PDB db, TAGID tagid, PBYTE buffer, DWORD size) +{ + DWORD data_size = 0; + + if (SdbpCheckTagIDType(db, tagid, TAG_TYPE_BINARY)) + { + SdbpReadData(db, &data_size, tagid + sizeof(TAG), sizeof(data_size)); + if (size >= data_size) + return SdbpReadData(db, buffer, tagid + sizeof(TAG) + sizeof(data_size), data_size); + } + + return FALSE; +} + +/** + * Retrieves binary data at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of binary data. + * + * @return Success: Pointer to binary data at specified tagid, or NULL on failure. + */ +PVOID WINAPI SdbGetBinaryTagData(PDB db, TAGID tagid) +{ + if (!SdbpCheckTagIDType(db, tagid, TAG_TYPE_BINARY)) + return NULL; + return &db->data[tagid + sizeof(TAG) + sizeof(DWORD)]; +} + +/** + * Searches shim database for string associated with specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of string or stringref associated with the string. + * + * @return the LPWSTR associated with specified tagid, or NULL on failure. + */ +LPWSTR WINAPI SdbGetStringTagPtr(PDB db, TAGID tagid) +{ + return SdbpGetString(db, tagid, NULL); +} + +/** + * Reads binary data at specified tagid. + * + * @param [in] db Handle to the shim database. + * @param [out] Guid Database ID. + * + * @return true if the ID was found FALSE otherwise. + */ +BOOL WINAPI SdbGetDatabaseID(PDB db, GUID* Guid) +{ + if(SdbIsNullGUID(&db->database_id)) + { + TAGID root = SdbFindFirstTag(db, TAGID_ROOT, TAG_DATABASE); + if(root != TAGID_NULL) + { + TAGID id = SdbFindFirstTag(db, root, TAG_DATABASE_ID); + if(id != TAGID_NULL) + { + if(!SdbReadBinaryTag(db, id, (PBYTE)&db->database_id, sizeof(db->database_id))) + { + memset(&db->database_id, 0, sizeof(db->database_id)); + } + } + else + { + /* Should we silence this if we are opening a system db? */ + SHIM_ERR("Failed to get the database id\n"); + } + } + else + { + /* Should we silence this if we are opening a system db? */ + SHIM_ERR("Failed to get root tag\n"); + } + } + if(!SdbIsNullGUID(&db->database_id)) + { + memcpy(Guid, &db->database_id, sizeof(db->database_id)); + return TRUE; + } + return FALSE; +} + Propchange: trunk/reactos/dll/appcompat/apphelp/sdbread.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Sun May 22 20:27:02 2016 @@ -0,0 +1,328 @@ +/* + * Copyright 2011 André Hentschel + * Copyright 2013 Mislav Blaevic + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_NO_STATUS +#include "windows.h" +#include "ntndk.h" +#include "apphelp.h" + +#include "wine/unicode.h" + + +static void WINAPI SdbpFlush(PDB db) +{ + IO_STATUS_BLOCK io; + NTSTATUS Status = NtWriteFile(db->file, NULL, NULL, NULL, &io, + db->data, db->write_iter, NULL, NULL); + if( !NT_SUCCESS(Status)) + SHIM_WARN("failed with 0x%lx\n", Status); +} + +static void WINAPI SdbpWrite(PDB db, LPCVOID data, DWORD size) +{ + if (db->write_iter + size > db->size) + { + /* Round to powers of two to prevent too many reallocations */ + while (db->size < db->write_iter + size) db->size <<= 1; + db->data = SdbReAlloc(db->data, db->size); + } + + memcpy(db->data + db->write_iter, data, size); + db->write_iter += size; +} + +/** + * Creates new shim database file + * + * If a file already exists on specified path, that file shall be overwritten. + * + * @note Use SdbCloseDatabasWrite to close the database opened with this function. + * + * @param [in] path Path to the new shim database. + * @param [in] type Type of path. Either DOS_PATH or NT_PATH. + * + * @return Success: Handle to the newly created shim database, NULL otherwise. + */ +PDB WINAPI SdbCreateDatabase(LPCWSTR path, PATH_TYPE type) +{ + static const DWORD version_major = 2, version_minor = 1; + static const char* magic = "sdbf"; + NTSTATUS Status; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + PDB db; + + if (type == DOS_PATH) + { + if (!RtlDosPathNameToNtPathName_U(path, &str, NULL, NULL)) + return NULL; + } + else + RtlInitUnicodeString(&str, path); + + db = SdbpCreate(); + if (!db) + { + SHIM_ERR("Failed to allocate memory for shim database\n"); + return NULL; + } + + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile(&db->file, FILE_GENERIC_WRITE | SYNCHRONIZE, + &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, + FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + + if (type == DOS_PATH) + RtlFreeUnicodeString(&str); + + if (!NT_SUCCESS(Status)) + { + SdbCloseDatabase(db); + SHIM_ERR("Failed to create shim database file: %lx\n", Status); + return NULL; + } + + db->size = sizeof(DWORD) + sizeof(DWORD) + strlen(magic); + db->data = SdbAlloc(db->size); + + SdbpWrite(db, &version_major, sizeof(DWORD)); + SdbpWrite(db, &version_minor, sizeof(DWORD)); + SdbpWrite(db, magic, strlen(magic)); + + return db; +} + +/** + * Closes specified database and writes data to file. + * + * @param [in] db Handle to the shim database. + */ +void WINAPI SdbCloseDatabaseWrite(PDB db) +{ + SdbpFlush(db); + SdbCloseDatabase(db); +} + +/** + * Writes a tag-only (NULL) entry to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteNULLTag(PDB db, TAG tag) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_NULL)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + return TRUE; +} + +/** + * Writes a WORD entry to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] data WORD entry which will be written to the database. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteWORDTag(PDB db, TAG tag, WORD data) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_WORD)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &data, sizeof(data)); + return TRUE; +} + +/** + * Writes a DWORD entry to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] data DWORD entry which will be written to the database. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteDWORDTag(PDB db, TAG tag, DWORD data) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_DWORD)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &data, sizeof(data)); + return TRUE; +} + +/** + * Writes a DWORD entry to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] data QWORD entry which will be written to the database. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteQWORDTag(PDB db, TAG tag, QWORD data) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_QWORD)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &data, sizeof(data)); + return TRUE; +} + +/** + * Writes a wide string entry to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] string Wide string entry which will be written to the database. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteStringTag(PDB db, TAG tag, LPCWSTR string) +{ + DWORD size; + + if (!SdbpCheckTagType(tag, TAG_TYPE_STRING)) + return FALSE; + + size = SdbpStrlen(string); + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &size, sizeof(size)); + SdbpWrite(db, string, size); + return TRUE; +} + +/** + * Writes a stringref tag to specified database + * @note Reference (tagid) is not checked for validity. + * + * @param [in] db Handle to the shim database. + * @param [in] tag TAG which will be written. + * @param [in] tagid TAGID of the string tag refers to. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_STRINGREF)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &tagid, sizeof(tagid)); + return TRUE; +} + +/** + * Writes data the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] data Pointer to data. + * @param [in] size Number of bytes to write. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteBinaryTag(PDB db, TAG tag, PBYTE data, DWORD size) +{ + if (!SdbpCheckTagType(tag, TAG_TYPE_BINARY)) + return FALSE; + + SdbpWrite(db, &tag, sizeof(TAG)); + SdbpWrite(db, &size, sizeof(size)); + SdbpWrite(db, data, size); + return TRUE; +} + +/** + * Writes data from a file to the specified shim database. + * + * @param [in] db Handle to the shim database. + * @param [in] tag A tag for the entry. + * @param [in] path Path of the input file. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbWriteBinaryTagFromFile(PDB db, TAG tag, LPCWSTR path) +{ + MEMMAPPED mapped; + + if (!SdbpCheckTagType(tag, TAG_TYPE_BINARY)) + return FALSE; + + if (!SdbpOpenMemMappedFile(path, &mapped)) + return FALSE; + + SdbWriteBinaryTag(db, tag, mapped.view, mapped.size); + SdbpCloseMemMappedFile(&mapped); + return TRUE; +} + +/** + * Writes a list tag to specified database All subsequent SdbWrite* functions shall write to + * newly created list untill TAGID of that list is passed to SdbEndWriteListTag. + * + * @param [in] db Handle to the shim database. + * @param [in] tag TAG for the list + * + * RETURNS Success: TAGID of the newly created list, or TAGID_NULL on failure. + * + * @return A TAGID. + */ +TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag) +{ + TAGID list_id; + + if (!SdbpCheckTagType(tag, TAG_TYPE_LIST)) + return TAGID_NULL; + + list_id = db->write_iter; + SdbpWrite(db, &tag, sizeof(TAG)); + db->write_iter += sizeof(DWORD); /* reserve some memory for storing list size */ + return list_id; +} + +/** + * Marks end of the specified list. + * + * @param [in] db Handle to the shim database. + * @param [in] tagid TAGID of the list. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid) +{ + if (!SdbpCheckTagIDType(db, tagid, TAG_TYPE_LIST)) + return FALSE; + + /* Write size of list to list tag header */ + *(DWORD*)&db->data[tagid + sizeof(TAG)] = db->write_iter - tagid - sizeof(TAG); + return TRUE; +} + Propchange: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Sun May 22 20:27:02 2016 @@ -4,6 +4,7 @@ list(APPEND SOURCE apphelp.c data.c + db.c layerapi.c testlist.c) Added: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c (added) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Sun May 22 20:27:02 2016 @@ -0,0 +1,283 @@ +/* + * Copyright 2012 Detlef Riekenberg + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015,2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <shlwapi.h> +#include <winnt.h> +#ifdef __REACTOS__ +#include <ntndk.h> +#else +#include <winternl.h> +#endif + +#include <winerror.h> +#include <stdio.h> +#include <initguid.h> + +#include "wine/test.h" + +typedef WORD TAG; +typedef DWORD TAGID; +typedef DWORD TAGREF; +typedef UINT64 QWORD; +typedef VOID* PDB; +typedef INT PATH_TYPE; +#define DOS_PATH 0 + +#define TAGID_NULL 0x0 +#define TAGID_ROOT 0x0 +#define _TAGID_ROOT 12 + + +#define TAG_TYPE_MASK 0xF000 + +#define TAG_TYPE_NULL 0x1000 +#define TAG_TYPE_BYTE 0x2000 +#define TAG_TYPE_WORD 0x3000 +#define TAG_TYPE_DWORD 0x4000 +#define TAG_TYPE_QWORD 0x5000 +#define TAG_TYPE_STRINGREF 0x6000 +#define TAG_TYPE_LIST 0x7000 +#define TAG_TYPE_STRING 0x8000 +#define TAG_TYPE_BINARY 0x9000 +#define TAG_NULL 0x0 +#define TAG_SIZE (0x1 | TAG_TYPE_DWORD) + +#define TAG_MATCH_MODE (0x1 | TAG_TYPE_WORD) + +#define TAG_FLAG_LUA (0x10 | TAG_TYPE_QWORD) + +#define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) + +#define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) +#define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) + + +#define TAG_GENERAL (0x2 | TAG_TYPE_NULL) + +#define TAG_DATA_BITS (0x5 | TAG_TYPE_BINARY) + + + +static HMODULE hdll; +static LPCWSTR (WINAPI *pSdbTagToString)(TAG); +static PDB (WINAPI *pSdbOpenDatabase)(LPCWSTR, PATH_TYPE); +static PDB (WINAPI *pSdbCreateDatabase)(LPCWSTR, PATH_TYPE); +static void (WINAPI *pSdbCloseDatabase)(PDB); +static void (WINAPI *pSdbCloseDatabaseWrite)(PDB); +static TAG (WINAPI *pSdbGetTagFromTagID)(PDB, TAGID); +static BOOL (WINAPI *pSdbWriteNULLTag)(PDB, TAG); +static BOOL (WINAPI *pSdbWriteWORDTag)(PDB, TAG, WORD); +static BOOL (WINAPI *pSdbWriteDWORDTag)(PDB, TAG, DWORD); +static BOOL (WINAPI *pSdbWriteQWORDTag)(PDB, TAG, QWORD); +static BOOL (WINAPI *pSdbWriteBinaryTagFromFile)(PDB, TAG, LPCWSTR); +static BOOL (WINAPI *pSdbWriteStringTag)(PDB, TAG, LPCWSTR); +static BOOL (WINAPI *pSdbWriteStringRefTag)(PDB, TAG, TAGID); +static TAGID (WINAPI *pSdbBeginWriteListTag)(PDB, TAG); +static BOOL (WINAPI *pSdbEndWriteListTag)(PDB, TAGID); +static WORD (WINAPI *pSdbReadWORDTag)(PDB, TAGID, WORD); +static DWORD (WINAPI *pSdbReadDWORDTag)(PDB, TAGID, DWORD); +static QWORD (WINAPI *pSdbReadQWORDTag)(PDB, TAGID, QWORD); +static BOOL (WINAPI *pSdbReadBinaryTag)(PDB, TAGID, PBYTE, DWORD); +static BOOL (WINAPI *pSdbReadStringTag)(PDB, TAGID, LPWSTR, DWORD); +static DWORD (WINAPI *pSdbGetTagDataSize)(PDB, TAGID); +static PVOID (WINAPI *pSdbGetBinaryTagData)(PDB, TAGID); +static LPWSTR (WINAPI *pSdbGetStringTagPtr)(PDB, TAGID); +static TAGID (WINAPI *pSdbGetFirstChild)(PDB, TAGID); +static TAGID (WINAPI *pSdbGetNextChild)(PDB, TAGID, TAGID); + +static void Write(HANDLE file, LPCVOID buffer, DWORD size) +{ + DWORD dwWritten = 0; + WriteFile(file, buffer, size, &dwWritten, NULL); +} + +static void test_Sdb(void) +{ + static const WCHAR path[] = {'t','e','m','p',0}; + static const WCHAR path2[] = {'t','e','m','p','2',0}; + static const WCHAR tag_size_string[] = {'S','I','Z','E',0}; + static const WCHAR tag_flag_lua_string[] = {'F','L','A','G','_','L','U','A',0}; + static const TAG tags[5] = { + TAG_SIZE, TAG_FLAG_LUA, TAG_NAME, + TAG_STRINGTABLE, TAG_STRINGTABLE_ITEM + }; + WCHAR buffer[6] = {0}; + PDB pdb; + QWORD qword; + DWORD dword; + WORD word; + BOOL ret; + HANDLE file; /* temp file created for testing purpose */ + TAG tag; + TAGID tagid, ptagid, stringref = 6; + LPCWSTR string; + PBYTE binary; + + pdb = pSdbCreateDatabase(path, DOS_PATH); + ok (pdb != NULL, "failed to create database\n"); + if(pdb != NULL) + { + ret = pSdbWriteDWORDTag(pdb, tags[0], 0xDEADBEEF); + ok (ret, "failed to write DWORD tag\n"); + ret = pSdbWriteQWORDTag(pdb, tags[1], 0xDEADBEEFBABE); + ok (ret, "failed to write QWORD tag\n"); + ret = pSdbWriteStringRefTag(pdb, tags[2], stringref); + ok (ret, "failed to write stringref tag\n"); + tagid = pSdbBeginWriteListTag(pdb, tags[3]); + ok (tagid != TAGID_NULL, "unexpected NULL tagid\n"); + ret = pSdbWriteStringTag(pdb, tags[4], path); + ok (ret, "failed to write string tag\n"); + ret = pSdbWriteNULLTag(pdb, TAG_GENERAL); + ok (ret, "failed to write NULL tag\n"); + ret = pSdbWriteWORDTag(pdb, TAG_MATCH_MODE, 0xACE); + ok (ret, "failed to write WORD tag\n"); + ret = pSdbEndWriteListTag(pdb, tagid); + ok (ret, "failed to update list size\n"); + /* [Err ][SdbCloseDatabase ] Failed to close the file. */ + pSdbCloseDatabaseWrite(pdb); + } + + /* [Err ][SdbGetDatabaseID ] Failed to get root tag */ + pdb = pSdbOpenDatabase(path, DOS_PATH); + ok(pdb != NULL, "unexpected NULL handle\n"); + + if(pdb) + { + tagid = pSdbGetFirstChild(pdb, TAGID_ROOT); + ok(tagid == _TAGID_ROOT, "unexpected tagid %u, expected %u\n", tagid, _TAGID_ROOT); + + tag = pSdbGetTagFromTagID(pdb, tagid); + ok(tag == TAG_SIZE, "unexpected tag 0x%x, expected 0x%x\n", tag, TAG_SIZE); + + string = pSdbTagToString(tag); + ok(lstrcmpW(string, tag_size_string) == 0, "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(tag_size_string)); + + dword = pSdbReadDWORDTag(pdb, tagid, 0); + ok(dword == 0xDEADBEEF, "unexpected value %u, expected 0xDEADBEEF\n", dword); + + tagid = pSdbGetNextChild(pdb, TAGID_ROOT, tagid); + ok(tagid == _TAGID_ROOT + sizeof(TAG) + sizeof(DWORD), "unexpected tagid %u, expected %u\n", + tagid, _TAGID_ROOT + sizeof(TAG) + sizeof(DWORD)); + + tag = pSdbGetTagFromTagID(pdb, tagid); + ok (tag == TAG_FLAG_LUA, "unexpected tag 0x%x, expected 0x%x\n", tag, TAG_FLAG_LUA); + + string = pSdbTagToString(tag); + ok(lstrcmpW(string, tag_flag_lua_string) == 0, "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(tag_flag_lua_string)); + + qword = pSdbReadQWORDTag(pdb, tagid, 0); + ok(qword == 0xDEADBEEFBABE, "unexpected value 0x%I64x, expected 0xDEADBEEFBABE\n", qword); + + tagid = pSdbGetNextChild(pdb, TAGID_ROOT, tagid); + string = pSdbGetStringTagPtr(pdb, tagid); + ok (string && (lstrcmpW(string, path) == 0), "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(path)); + + ptagid = pSdbGetNextChild(pdb, TAGID_ROOT, tagid); + tagid = pSdbGetFirstChild(pdb, ptagid); + + string = pSdbGetStringTagPtr(pdb, tagid); + ok (string && (lstrcmpW(string, path) == 0), "unexpected string %s, expected %s\n", + wine_dbgstr_w(string), wine_dbgstr_w(path)); + + ok (pSdbReadStringTag(pdb, tagid, buffer, 6), "failed to write string to buffer\n"); + /* [Err ][SdbpReadTagData ] Buffer too small. Avail: 6, Need: 10. */ + ok (!pSdbReadStringTag(pdb, tagid, buffer, 3), "string was written to buffer, but failure was expected"); + ok (pSdbGetTagDataSize(pdb, tagid) == 5 * sizeof(WCHAR), "string has unexpected size\n"); + + tagid = pSdbGetNextChild(pdb, ptagid, tagid); + tag = pSdbGetTagFromTagID(pdb, tagid); + ok (tag == TAG_GENERAL, "unexpected tag 0x%x, expected 0x%x\n", tag, TAG_GENERAL); + ok (pSdbGetTagDataSize(pdb, tagid) == 0, "null tag with size > 0\n"); + + tagid = pSdbGetNextChild(pdb, ptagid, tagid); + word = pSdbReadWORDTag(pdb, tagid, 0); + ok (word == 0xACE, "unexpected value 0x%x, expected 0x%x\n", word, 0xACE); + + pSdbCloseDatabase(pdb); + } + DeleteFileW(path); + + file = CreateFileW(path2, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok (file != INVALID_HANDLE_VALUE, "failed to open file\n"); + Write(file, &qword, 8); + CloseHandle(file); + + pdb = pSdbCreateDatabase(path, DOS_PATH); + ok(pdb != NULL, "unexpected NULL handle\n"); + + if(pdb) + { + ret = pSdbWriteBinaryTagFromFile(pdb, TAG_DATA_BITS, path2); + ok(ret, "failed to write tag from binary file\n"); + pSdbCloseDatabaseWrite(pdb); /* [Err ][SdbCloseDatabase ] Failed to close the file. */ + DeleteFileW(path2); + + pdb = pSdbOpenDatabase(path, DOS_PATH); + ok(pdb != NULL, "unexpected NULL handle\n"); + binary = pSdbGetBinaryTagData(pdb, _TAGID_ROOT); + ok(memcmp(binary, &qword, 8) == 0, "binary data is corrupt\n"); + ret = pSdbReadBinaryTag(pdb, _TAGID_ROOT, (PBYTE)buffer, 12); + ok(ret, "failed to read binary tag\n"); + ok(memcmp(buffer, &qword, 8) == 0, "binary data is corrupt\n"); + pSdbCloseDatabase(pdb); + } + DeleteFileW(path); +} + +START_TEST(db) +{ + //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); + //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); + hdll = LoadLibraryA("apphelp.dll"); + pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); + pSdbOpenDatabase = (void *) GetProcAddress(hdll, "SdbOpenDatabase"); + pSdbCreateDatabase = (void *) GetProcAddress(hdll, "SdbCreateDatabase"); + pSdbCloseDatabase = (void *) GetProcAddress(hdll, "SdbCloseDatabase"); + pSdbCloseDatabaseWrite = (void *) GetProcAddress(hdll, "SdbCloseDatabaseWrite"); + pSdbGetTagFromTagID = (void *) GetProcAddress(hdll, "SdbGetTagFromTagID"); + pSdbWriteNULLTag = (void *) GetProcAddress(hdll, "SdbWriteNULLTag"); + pSdbWriteWORDTag = (void *) GetProcAddress(hdll, "SdbWriteWORDTag"); + pSdbWriteDWORDTag = (void *) GetProcAddress(hdll, "SdbWriteDWORDTag"); + pSdbWriteQWORDTag = (void *) GetProcAddress(hdll, "SdbWriteQWORDTag"); + pSdbWriteBinaryTagFromFile = (void *) GetProcAddress(hdll, "SdbWriteBinaryTagFromFile"); + pSdbWriteStringTag = (void *) GetProcAddress(hdll, "SdbWriteStringTag"); + pSdbWriteStringRefTag = (void *) GetProcAddress(hdll, "SdbWriteStringRefTag"); + pSdbBeginWriteListTag = (void *)GetProcAddress(hdll, "SdbBeginWriteListTag"); + pSdbEndWriteListTag = (void *) GetProcAddress(hdll, "SdbEndWriteListTag"); + pSdbReadWORDTag = (void *) GetProcAddress(hdll, "SdbReadWORDTag"); + pSdbReadDWORDTag = (void *) GetProcAddress(hdll, "SdbReadDWORDTag"); + pSdbReadQWORDTag = (void *) GetProcAddress(hdll, "SdbReadQWORDTag"); + pSdbReadBinaryTag = (void *) GetProcAddress(hdll, "SdbReadBinaryTag"); + pSdbReadStringTag = (void *) GetProcAddress(hdll, "SdbReadStringTag"); + pSdbGetTagDataSize = (void *) GetProcAddress(hdll, "SdbGetTagDataSize"); + pSdbGetBinaryTagData = (void *) GetProcAddress(hdll, "SdbGetBinaryTagData"); + pSdbGetStringTagPtr = (void *) GetProcAddress(hdll, "SdbGetStringTagPtr"); + pSdbGetFirstChild = (void *) GetProcAddress(hdll, "SdbGetFirstChild"); + pSdbGetNextChild = (void *) GetProcAddress(hdll, "SdbGetNextChild"); + + test_Sdb(); +} Propchange: trunk/rostests/apitests/apphelp/db.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/apphelp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/testlist… ============================================================================== --- trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/testlist.c [iso-8859-1] Sun May 22 20:27:02 2016 @@ -4,11 +4,13 @@ #include <wine/test.h> extern void func_apphelp(void); +extern void func_db(void); extern void func_layerapi(void); const struct test winetest_testlist[] = { { "apphelp", func_apphelp }, + { "db", func_db }, { "layerapi", func_layerapi }, { 0, 0 } };

1 0

[tfaber] 71379: [SETUPAPI] - Fix Buffer overflow in FixupServiceBinaryPath
by tfaber＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[hbelusca] 71378: [EVENTVWR] - Fix the flags used in LoadLibraryEx calls for loading DLLs as resource files. - Use a nice flag (FORMAT_MESSAGE_MAX_WIDTH_MASK) in FormatMessage calls so that no usel...
by hbelusca＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[hbelusca] 71377: [EVENTVWR] - Set window parent for different MessageBox calls. - Add a notice in ShowStatusMessageThread concerning a potential bug. - Rename strings "Save Protocol" into "Save Ev...
by hbelusca＠svn.reactos.org 22 May '16

22 May '16

Author: hbelusca Date: Sun May 22 17:17:33 2016 New Revision: 71377 URL: http://svn.reactos.org/svn/reactos?rev=71377&view=rev Log: [EVENTVWR] - Set window parent for different MessageBox calls. - Add a notice in ShowStatusMessageThread concerning a potential bug. - Rename strings "Save Protocol" into "Save Event Log"; adjust translations in this regard. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 22 17:17:33 2016 @@ -515,18 +515,27 @@ static DWORD WINAPI ShowStatusMessageThread(IN LPVOID lpParameter) { - HWND *phWnd = (HWND *)lpParameter; + HWND* phWnd = (HWND*)lpParameter; HWND hWnd; MSG Msg; - hWnd = CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_PROGRESSBOX), - GetDesktopWindow(), - StatusMessageWindowProc, - (LPARAM)NULL); + hWnd = CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_PROGRESSBOX), + GetDesktopWindow(), // hwndMainWindow, + StatusMessageWindowProc); if (!hWnd) return 0; + /* + * FIXME: With this technique, there is one problem, namely that if + * for some reason, the call to CreateDialogW takes longer than the + * whole event-loading code to execute, then it may happen that the + * event-loading code tries to close this dialog *BEFORE* we had the + * time to return the window handle, hence the progress dialog would + * be created *AFTER* the event-loading code has finished its job and + * as a result, we would have a orphan window floating around. + */ + *phWnd = hWnd; ShowWindow(hWnd, SW_SHOW); @@ -537,6 +546,8 @@ TranslateMessage(&Msg); DispatchMessageW(&Msg); } + + DestroyWindow(hWnd); return 0; } @@ -598,12 +609,12 @@ if (dwTotalRecords > 0) { EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED); - EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED); + EnableMenuItem(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_ENABLED); } else { EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED); - EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_GRAYED); } g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs)); @@ -759,7 +770,7 @@ VOID -SaveProtocol(VOID) +SaveEventLog(VOID) { HANDLE hEventLog; WCHAR szFileName[MAX_PATH]; @@ -1023,11 +1034,11 @@ if (lpDisplayName) { - InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); + InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); } else { - InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); + InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); } /* Free the buffer allocated by FormatMessage */ @@ -1037,7 +1048,7 @@ } } - InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); + InsertMenuW(hMainMenu, IDM_SAVE_EVENTLOG, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); RegCloseKey(hKey); @@ -1293,8 +1304,8 @@ switch (LOWORD(wParam)) { - case IDM_SAVE_PROTOCOL: - SaveProtocol(); + case IDM_SAVE_EVENTLOG: + SaveEventLog(); break; case IDM_CLEAR_EVENTS: @@ -1400,7 +1411,7 @@ iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); if (iIndex == -1) { - MessageBoxW(NULL, + MessageBoxW(hDlg, L"No Items in ListView", L"Error", MB_OK | MB_ICONINFORMATION); @@ -1526,7 +1537,7 @@ iIndex = (int)SendMessageW(hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); if (iIndex == -1) { - MessageBoxW(NULL, + MessageBoxW(hDlg, L"No Items in ListView", L"Error", MB_OK | MB_ICONINFORMATION); Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ BEGIN POPUP "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ BEGIN POPUP "&Protokol" BEGIN - MENUITEM "UloÅ¾it &Protokol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "&Odstranit udÃ¡losti", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Protokoll" BEGIN - MENUITEM "Protokoll s&peichern...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "Alle E&reignisse lÃ¶schen", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Registro" BEGIN - MENUITEM "Guardar &protocolo...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,15 +4,15 @@ IDM_EVENTVWR MENU BEGIN - POPUP "Journa&l" + POPUP "&Journal" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Enregistrer le fichier journal &sous...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR - MENUITEM "Effacer tous &les Ã©vÃ©nements", IDM_CLEAR_EVENTS, GRAYED + MENUITEM "&Effacer tous les Ã©vÃ©nements", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Quitter", IDM_EXIT END - POPUP "Affichage" + POPUP "&Affichage" BEGIN MENUITEM "&RafraÃ®chir", IDM_REFRESH END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "××¦×× ××××¨××¢×× (××§×××)" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "ãã°(&L)" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "ë¡ê·¸(&L)" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -4,7 +4,7 @@ BEGIN POPUP "&Logg" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -8,7 +8,7 @@ BEGIN POPUP "&Logi" BEGIN - MENUITEM "Zapisz &protokÃ³Å...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "W&yczyÅÄ wszystkie zdarzenia", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Registro" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -9,7 +9,7 @@ BEGIN POPUP "&Jurnal" BEGIN - MENUITEM "PÄstrare p&rotocolâ¦", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "ÃnlÄt&urÄ toate evenimentele", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "Ð¡&Ð¾Ð±ÑÑÐ¸Ñ" BEGIN - MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "ÐÑÐ¸ÑÑÐ¸ÑÑ &Ð²ÑÐµ ÑÐ¾Ð±ÑÑÐ¸Ñ", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -9,7 +9,7 @@ BEGIN POPUP "&ZÃ¡znam" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&Logg" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -12,7 +12,7 @@ BEGIN POPUP "&KayÄ±t" BEGIN - MENUITEM "&ProtokolÃ¼ Sakla...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "&TÃ¼m OlaylarÄ± Sil", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "&ÐÐ²ÑÑ" BEGIN - MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "æ¥å¿(&L)" BEGIN - MENUITEM "ä¿ååè®®...(&P)", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "æ¸é¤ææäºä»¶(&L)", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] Sun May 22 17:17:33 2016 @@ -6,7 +6,7 @@ BEGIN POPUP "æ¥èª(&L)" BEGIN - MENUITEM "ä¿ååå®...(&P)", IDM_SAVE_PROTOCOL, GRAYED + MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "æ¸é¤ææäºä»¶(&L)", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun May 22 17:17:33 2016 @@ -43,7 +43,7 @@ /* Menu IDs */ #define IDM_EVENTVWR 32771 #define IDM_CLEAR_EVENTS 32772 -#define IDM_SAVE_PROTOCOL 32773 +#define IDM_SAVE_EVENTLOG 32773 #define IDM_EXIT 32774 #define IDM_REFRESH 32775 #define IDM_OPTIONS 32776

1 0

[hbelusca] 71376: [EVENTVWR] - Fix a typo in the "loading, wait" dialog. - Use a RichEdit control for the detailed event description text, so that we can have for free clickable URLs. - Use "Courie...
by hbelusca＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[pschweitzer] 71375: [PSDK] Define STATUS_FILE_LOCKED_WITH_ONLY_READERS and STATUS_FILE_LOCKED_WITH_WRITERS CORE-11295
by pschweitzer＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[ekohl] 71374: [EVENTVWR] Display event data properly.
by ekohl＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[tfaber] 71373: [SCHANNEL] - Set received length to zero when the receive result is MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY instead of pretending we got data CORE-11285 #resolve
by tfaber＠svn.reactos.org 22 May '16

22 May '16

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

1 0

[tfaber] 71372: [SCHANNEL] - Correctly check for ROS_SCHAN_IS_BLOCKING CORE-11285
by tfaber＠svn.reactos.org 22 May '16

22 May '16

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

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