Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/05: [APPHELP] Implement SdbQueryData[Ex][TagID]
by Mark Jansen 12 Apr '18

12 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74a3fecad67e8504a517… commit d74a3fecad67e8504a51706851436d7ae423dcfa Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 10 22:42:03 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:25 2018 +0200 [APPHELP] Implement SdbQueryData[Ex][TagID] --- dll/appcompat/apphelp/apphelp.h | 6 ++ dll/appcompat/apphelp/apphelp.spec | 6 +- dll/appcompat/apphelp/hsdb.c | 52 ++++++++++++++++- dll/appcompat/apphelp/sdbapi.c | 114 ++++++++++++++++++++++++++++++++++++- dll/appcompat/apphelp/sdbread.c | 9 +-- 5 files changed, 175 insertions(+), 12 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.h b/dll/appcompat/apphelp/apphelp.h index f2af2b0afc..5d7e4c3b7f 100644 --- a/dll/appcompat/apphelp/apphelp.h +++ b/dll/appcompat/apphelp/apphelp.h @@ -90,6 +90,8 @@ BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid); HRESULT WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size); LPWSTR WINAPI SdbGetStringTagPtr(PDB pdb, TAGID tagid); TAGID WINAPI SdbFindFirstNamedTag(PDB pdb, TAGID root, TAGID find, TAGID nametag, LPCWSTR find_name); +DWORD WINAPI SdbQueryDataExTagID(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGID *ptiData); + /* sdbread.c */ BOOL WINAPI SdbpReadData(PDB pdb, PVOID dest, DWORD offset, DWORD num); @@ -101,6 +103,9 @@ DWORD WINAPI SdbReadDWORDTag(PDB pdb, TAGID tagid, DWORD ret); QWORD WINAPI SdbReadQWORDTag(PDB pdb, TAGID tagid, QWORD ret); TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent); TAGID WINAPI SdbGetNextChild(PDB pdb, TAGID parent, TAGID prev_child); +DWORD WINAPI SdbGetTagDataSize(PDB pdb, TAGID tagid); +LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size); + /* sdbfileattr.c*/ BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO *attr_info_ret, LPDWORD attr_count); @@ -116,6 +121,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, LPCW BOOL WINAPI SdbTagIDToTagRef(HSDB hsdb, PDB pdb, TAGID tiWhich, TAGREF* ptrWhich); BOOL WINAPI SdbTagRefToTagID(HSDB hsdb, TAGREF trWhich, PDB* ppdb, TAGID* ptiWhich); BOOL WINAPI SdbUnpackAppCompatData(HSDB hsdb, LPCWSTR pszImageName, PVOID pData, PSDBQUERYRESULT pQueryResult); +DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize); #define ATTRIBUTE_AVAILABLE 0x1 #define ATTRIBUTE_FAILED 0x2 diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index d2def1a93f..9509e6e975 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -108,9 +108,9 @@ @ stub SdbQueryApphelpInformation @ stub SdbQueryBlockUpgrade @ stub SdbQueryContext -@ stub SdbQueryData -@ stub SdbQueryDataEx -@ stub SdbQueryDataExTagID +@ stdcall SdbQueryData(ptr long wstr ptr ptr ptr) +@ stdcall SdbQueryDataEx(ptr long wstr ptr ptr ptr ptr) +@ stdcall SdbQueryDataExTagID(ptr long wstr ptr ptr ptr ptr) @ stub SdbQueryFlagInfo @ stub SdbQueryName @ stub SdbQueryReinstallUpgrade diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 6c23ec6fa3..ddc501b539 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -753,7 +753,57 @@ DWORD WINAPI SdbGetAppCompatDataSize(ShimData* pData) if (!pData || pData->dwMagic != SHIMDATA_MAGIC) return 0; - return pData->dwSize; } + +/** +* Retrieve a Data entry +* +* @param [in] hsdb The multi-database. +* @param [in] trExe The tagRef to start at +* @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. +* @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... +* @param [out] lpBuffer The output buffer +* @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes +* @param [out,opt] ptrData The tagRef of the data +* +* @return ERROR_SUCCESS +*/ +DWORD WINAPI SdbQueryDataEx(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGREF *ptrData) +{ + PDB pdb; + TAGID tiWhich, tiData; + DWORD dwResult; + + if (!SdbTagRefToTagID(hsdb, trWhich, &pdb, &tiWhich)) + { + SHIM_WARN("Unable to translate trWhich=0x%x\n", trWhich); + return ERROR_NOT_FOUND; + } + + dwResult = SdbQueryDataExTagID(pdb, tiWhich, lpszDataName, lpdwDataType, lpBuffer, lpcbBufferSize, &tiData); + + if (dwResult == ERROR_SUCCESS && ptrData) + SdbTagIDToTagRef(hsdb, pdb, tiData, ptrData); + + return dwResult; +} + + +/** +* Retrieve a Data entry +* +* @param [in] hsdb The multi-database. +* @param [in] trExe The tagRef to start at +* @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. +* @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... +* @param [out] lpBuffer The output buffer +* @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes +* +* @return ERROR_SUCCESS +*/ +DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize) +{ + return SdbQueryDataEx(hsdb, trWhich, lpszDataName, lpdwDataType, lpBuffer, lpcbBufferSize, NULL); +} diff --git a/dll/appcompat/apphelp/sdbapi.c b/dll/appcompat/apphelp/sdbapi.c index ba60048ca5..0f380d0c1e 100644 --- a/dll/appcompat/apphelp/sdbapi.c +++ b/dll/appcompat/apphelp/sdbapi.c @@ -4,7 +4,7 @@ * PURPOSE: Sdb low level glue layer * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "ntndk.h" @@ -476,7 +476,7 @@ BOOL WINAPI SdbGetDatabaseVersion(LPCWSTR database, PDWORD VersionHi, PDWORD Ver /** * Find the first named child tag. * - * @param [in] database The database. + * @param [in] pdb The database. * @param [in] root The tag to start at * @param [in] find The tag type to find * @param [in] nametag The child of 'find' that contains the name @@ -534,6 +534,116 @@ TAGREF WINAPI SdbGetLayerTagRef(HSDB hsdb, LPCWSTR layerName) } +#ifndef REG_SZ +#define REG_SZ 1 +#define REG_DWORD 4 +#define REG_QWORD 11 +#endif + + +/** + * Retrieve a Data entry + * + * @param [in] pdb The database. + * @param [in] tiExe The tagID to start at + * @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. + * @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... + * @param [out] lpBuffer The output buffer + * @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes + * @param [out,opt] ptiData The tagID of the data + * + * @return ERROR_SUCCESS + */ +DWORD WINAPI SdbQueryDataExTagID(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGID *ptiData) +{ + TAGID tiData, tiValueType, tiValue; + DWORD dwDataType, dwSizeRequired, dwInputSize; + LPCWSTR lpStringData; + /* Not supported yet */ + if (!lpszDataName) + return ERROR_INVALID_PARAMETER; + + tiData = SdbFindFirstNamedTag(pdb, tiExe, TAG_DATA, TAG_NAME, lpszDataName); + if (tiData == TAGID_NULL) + { + SHIM_INFO("No data tag found\n"); + return ERROR_NOT_FOUND; + } + + if (ptiData) + *ptiData = tiData; + + tiValueType = SdbFindFirstTag(pdb, tiData, TAG_DATA_VALUETYPE); + if (tiValueType == TAGID_NULL) + { + SHIM_WARN("Data tag (0x%x) without valuetype\n", tiData); + return ERROR_INTERNAL_DB_CORRUPTION; + } + + dwDataType = SdbReadDWORDTag(pdb, tiValueType, 0); + switch (dwDataType) + { + case REG_SZ: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_STRING); + break; + case REG_DWORD: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_DWORD); + break; + case REG_QWORD: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_QWORD); + break; + default: + /* Not supported (yet) */ + SHIM_WARN("Unsupported dwDataType=0x%x\n", dwDataType); + return ERROR_INVALID_PARAMETER; + } + + if (lpdwDataType) + *lpdwDataType = dwDataType; + + if (tiValue == TAGID_NULL) + { + SHIM_WARN("Data tag (0x%x) without data\n", tiData); + return ERROR_INTERNAL_DB_CORRUPTION; + } + + if (dwDataType != REG_SZ) + { + dwSizeRequired = SdbGetTagDataSize(pdb, tiValue); + } + else + { + lpStringData = SdbpGetString(pdb, tiValue, &dwSizeRequired); + if (lpStringData == NULL) + { + return ERROR_INTERNAL_DB_CORRUPTION; + } + } + if (!lpcbBufferSize) + return ERROR_INSUFFICIENT_BUFFER; + + dwInputSize = *lpcbBufferSize; + *lpcbBufferSize = dwSizeRequired; + + if (dwInputSize < dwSizeRequired || lpBuffer == NULL) + { + SHIM_WARN("dwInputSize %u not sufficient to hold %u bytes\n", dwInputSize, dwSizeRequired); + return ERROR_INSUFFICIENT_BUFFER; + } + + if (dwDataType != REG_SZ) + { + SdbpReadData(pdb, lpBuffer, tiValue + sizeof(TAG), dwSizeRequired); + } + else + { + StringCbCopyNW(lpBuffer, dwInputSize, lpStringData, dwSizeRequired); + } + + return ERROR_SUCCESS; +} + + /** * Converts the specified string to an index key. * diff --git a/dll/appcompat/apphelp/sdbread.c b/dll/appcompat/apphelp/sdbread.c index 4b4845c290..08bc5f49dc 100644 --- a/dll/appcompat/apphelp/sdbread.c +++ b/dll/appcompat/apphelp/sdbread.c @@ -4,16 +4,13 @@ * PURPOSE: Shim database query functions * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "windef.h" #include "apphelp.h" -DWORD WINAPI SdbGetTagDataSize(PDB pdb, TAGID tagid); - - BOOL WINAPI SdbpReadData(PDB pdb, PVOID dest, DWORD offset, DWORD num) { DWORD size = offset + num; @@ -47,7 +44,7 @@ static DWORD WINAPI SdbpGetTagSize(PDB pdb, TAGID tagid) return size; } -static LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) +LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) { TAG tag; TAGID offset; @@ -79,7 +76,7 @@ static LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) } /* Optionally read string size */ - if (size && !SdbpReadData(pdb, size, tagid + sizeof(TAG), sizeof(*size))) + if (size && !SdbpReadData(pdb, size, offset - sizeof(TAGID), sizeof(*size))) return FALSE; return (LPWSTR)(&pdb->data[offset]);

1 0

01/05: [XML2SDB] Add support for DATA in Layers.
by Mark Jansen 12 Apr '18

12 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767fc4a6ade47be16125f… commit 767fc4a6ade47be16125f1844e61f9836543c2ae Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 10 22:39:29 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:12 2018 +0200 [XML2SDB] Add support for DATA in Layers. --- sdk/tools/xml2sdb/xml2sdb.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++- sdk/tools/xml2sdb/xml2sdb.h | 17 +++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/sdk/tools/xml2sdb/xml2sdb.cpp b/sdk/tools/xml2sdb/xml2sdb.cpp index 091177362f..3478e0561b 100644 --- a/sdk/tools/xml2sdb/xml2sdb.cpp +++ b/sdk/tools/xml2sdb/xml2sdb.cpp @@ -14,7 +14,7 @@ using tinyxml2::XMLText; static const GUID GUID_NULL = { 0 }; -static const char szCompilerVersion[] = "1.7.0.0"; +static const char szCompilerVersion[] = "1.7.0.1"; #if !defined(C_ASSERT) #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] @@ -398,6 +398,69 @@ bool Flag::toSdb(PDB pdb, Database& db) } +/*********************************************************************** + * Data + */ + +#ifndef REG_SZ +#define REG_SZ 1 +//#define REG_BINARY 3 +#define REG_DWORD 4 +#define REG_QWORD 11 +#endif + + +bool Data::fromXml(XMLHandle dbNode) +{ + Name = ReadStringNode(dbNode, "NAME"); + + StringData = ReadStringNode(dbNode, "DATA_STRING"); + if (!StringData.empty()) + { + DataType = REG_SZ; + return !Name.empty(); + } + DWordData = ReadDWordNode(dbNode, "DATA_DWORD"); + if (DWordData) + { + DataType = REG_DWORD; + return !Name.empty(); + } + QWordData = ReadQWordNode(dbNode, "DATA_QWORD"); + if (QWordData) + { + DataType = REG_QWORD; + return !Name.empty(); + } + + SHIM_ERR("Data node (%s) without value!\n", Name.c_str()); + return false; +} + +bool Data::toSdb(PDB pdb, Database& db) +{ + Tagid = db.BeginWriteListTag(pdb, TAG_DATA); + db.WriteString(pdb, TAG_NAME, Name, true); + db.WriteDWord(pdb, TAG_DATA_VALUETYPE, DataType, true); + switch (DataType) + { + case REG_SZ: + db.WriteString(pdb, TAG_DATA_STRING, StringData); + break; + case REG_DWORD: + db.WriteDWord(pdb, TAG_DATA_DWORD, DWordData); + break; + case REG_QWORD: + db.WriteQWord(pdb, TAG_DATA_QWORD, QWordData); + break; + default: + SHIM_ERR("Data node (%s) with unknown type (0x%x)\n", Name.c_str(), DataType); + return false; + } + + return !!db.EndWriteListTag(pdb, Tagid); +} + /*********************************************************************** * Layer */ @@ -407,6 +470,7 @@ bool Layer::fromXml(XMLHandle dbNode) Name = ReadStringNode(dbNode, "NAME"); ReadGeneric(dbNode, ShimRefs, "SHIM_REF"); ReadGeneric(dbNode, FlagRefs, "FLAG_REF"); + ReadGeneric(dbNode, Datas, "DATA"); return true; } @@ -418,6 +482,8 @@ bool Layer::toSdb(PDB pdb, Database& db) return false; if (!WriteGeneric(pdb, FlagRefs, db)) return false; + if (!WriteGeneric(pdb, Datas, db)) + return false; return !!db.EndWriteListTag(pdb, Tagid); } diff --git a/sdk/tools/xml2sdb/xml2sdb.h b/sdk/tools/xml2sdb/xml2sdb.h index 031b9ffcea..df9e391b44 100644 --- a/sdk/tools/xml2sdb/xml2sdb.h +++ b/sdk/tools/xml2sdb/xml2sdb.h @@ -91,6 +91,22 @@ struct Flag }; +struct Data +{ + Data() : Tagid(0), DataType(0), DWordData(0), QWordData(0) { ; } + + bool fromXml(XMLHandle dbNode); + bool toSdb(PDB pdb, Database& db); + + std::string Name; + TAGID Tagid; + DWORD DataType; + + std::string StringData; + DWORD DWordData; + QWORD QWordData; +}; + struct Layer { Layer() : Tagid(0) { ; } @@ -102,6 +118,7 @@ struct Layer TAGID Tagid; std::list<ShimRef> ShimRefs; std::list<FlagRef> FlagRefs; + std::list<Data> Datas; }; struct MatchingFile

1 0

01/01: [USER32] Fix compilation when USE_VERSIONED_CLASSES is not defined
by Joachim Henze 12 Apr '18

12 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=083c3d992b73fbc20ce45… commit 083c3d992b73fbc20ce455ba1e301656e1716b2f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Apr 12 17:57:38 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Apr 12 17:57:38 2018 +0200 [USER32] Fix compilation when USE_VERSIONED_CLASSES is not defined Variable 'Status' would be set but not used otherwise in this case. This commit will not fix or improve CORE-13278, but was spotted when having a look at that. --- win32ss/user/user32/windows/class.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index b7451639ba..7208b36c10 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -90,7 +90,9 @@ ClassNameToVersion( BOOL bAnsi) { LPCWSTR VersionedClass = NULL; +#ifdef USE_VERSIONED_CLASSES NTSTATUS Status; +#endif UNICODE_STRING SectionName; WCHAR SectionNameBuf[MAX_PATH] = {0}; ACTCTX_SECTION_KEYED_DATA KeyedData = { sizeof(KeyedData) }; @@ -126,13 +128,13 @@ ClassNameToVersion( RtlInitUnicodeString(&SectionName, lpszClass); } } +#ifdef USE_VERSIONED_CLASSES Status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, &SectionName, &KeyedData ); -#ifdef USE_VERSIONED_CLASSES if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1) { struct strsection_header *SectionHeader = KeyedData.lpSectionBase;

1 0

02/02: [EVENTVWR] Add support for a command-line for the Event Log Viewer. CORE-12269
by Hermès Bélusca-Maïto 12 Apr '18

12 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1afc87ee572d4306564ea… commit 1afc87ee572d4306564ea5fb1e8a325f0fee89a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 12 02:45:37 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 12 02:45:37 2018 +0200 [EVENTVWR] Add support for a command-line for the Event Log Viewer. CORE-12269 - Add support for '/?' and '/l:' switches. The former displays usage information. The latter allows to specify an event log file to load. Also one can specify the computer name from which one wants to retrieve events for display (work in progress). - In EnumEventsThread(), move around the code that updates the application title and status bar, so that the selected event log name and loading status is always displayed first, while loading itself is in progress. --- base/applications/mscutils/eventvwr/eventvwr.c | 294 ++++++++++++++++++++-- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 18 ++ base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 18 ++ base/applications/mscutils/eventvwr/lang/de-DE.rc | 18 ++ base/applications/mscutils/eventvwr/lang/el-GR.rc | 18 ++ base/applications/mscutils/eventvwr/lang/en-US.rc | 18 ++ base/applications/mscutils/eventvwr/lang/es-ES.rc | 20 +- base/applications/mscutils/eventvwr/lang/fr-FR.rc | 36 ++- base/applications/mscutils/eventvwr/lang/he-IL.rc | 18 ++ base/applications/mscutils/eventvwr/lang/it-IT.rc | 18 ++ base/applications/mscutils/eventvwr/lang/ja-JP.rc | 18 ++ base/applications/mscutils/eventvwr/lang/ko-KR.rc | 18 ++ base/applications/mscutils/eventvwr/lang/no-NO.rc | 18 ++ base/applications/mscutils/eventvwr/lang/pl-PL.rc | 18 ++ base/applications/mscutils/eventvwr/lang/pt-BR.rc | 18 ++ base/applications/mscutils/eventvwr/lang/ro-RO.rc | 20 +- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 18 ++ base/applications/mscutils/eventvwr/lang/sk-SK.rc | 18 ++ base/applications/mscutils/eventvwr/lang/sq-AL.rc | 18 ++ base/applications/mscutils/eventvwr/lang/sv-SE.rc | 18 ++ base/applications/mscutils/eventvwr/lang/tr-TR.rc | 18 ++ base/applications/mscutils/eventvwr/lang/uk-UA.rc | 20 +- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 36 ++- base/applications/mscutils/eventvwr/lang/zh-TW.rc | 36 ++- base/applications/mscutils/eventvwr/resource.h | 2 + 25 files changed, 715 insertions(+), 55 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index c184bb2a6a..6801b275e4 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -87,6 +87,10 @@ HMENU hMainMenu; /* The application's main menu */ HTREEITEM htiSystemLogs = NULL, htiAppLogs = NULL, htiUserLogs = NULL; +LPWSTR lpComputerName = NULL; /* NULL: local user computer (default) */ +LPWSTR lpszzUserLogsToLoad = NULL; /* The list of user logs to load at startup (multi-string) */ +SIZE_T cbUserLogsSize = 0; + /* Global event records cache for the current active event log filter */ DWORD g_TotalRecords = 0; @@ -118,6 +122,8 @@ OPENFILENAMEW sfn; static DWORD WINAPI StartStopEnumEventsThread(IN LPVOID lpParameter); +VOID OpenUserEventLogFile(IN LPCWSTR lpszFileName); + VOID BuildLogListAndFilterList(IN LPCWSTR lpComputerName); VOID FreeLogList(VOID); VOID FreeLogFilterList(VOID); @@ -155,6 +161,184 @@ ShowWin32Error(IN DWORD dwError) LocalFree(lpMessageBuffer); } +VOID +DisplayUsage(VOID) +{ + LPWSTR lpBuffer; + LPCWSTR lpUsage; + INT iUsageLen = LoadStringW(hInst, IDS_USAGE, (LPWSTR)&lpUsage, 0); + + if (iUsageLen == 0) + return; + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, (iUsageLen + 1) * sizeof(WCHAR)); + if (!lpBuffer) + return; + + StringCchCopyNW(lpBuffer, iUsageLen + 1, lpUsage, iUsageLen); + MessageBoxW(NULL, lpBuffer, szTitle, MB_OK | MB_ICONINFORMATION); + + HeapFree(GetProcessHeap(), 0, lpBuffer); +} + +BOOL +ProcessCmdLine(IN LPWSTR lpCmdLine) +{ + BOOL Success = FALSE; + INT i, argc; + LPWSTR* argv; + + /* Skip any leading whitespace */ + if (lpCmdLine) + { + while (iswspace(*lpCmdLine)) + ++lpCmdLine; + } + + /* No command line means no processing needed */ + if (!lpCmdLine || !*lpCmdLine) + return TRUE; + + /* Build the arguments vector */ + argv = CommandLineToArgvW(lpCmdLine, &argc); + if (!argv) + return FALSE; + + /* Parse the command line for options (skip the program name) */ + for (i = 1; i < argc; ++i) + { + /* Check for new options */ + if (argv[i][0] == L'-' || argv[i][0] == L'/') + { + if (argv[i][1] == L'?' && argv[i][2] == 0) + { + /* Display help */ + DisplayUsage(); + goto Quit; + } + else + if (argv[i][2] == L':') + { + switch (towupper(argv[i][1])) + { + case L'L': + { + LPWSTR lpNewBuffer; + LPWSTR lpFileName = argv[i] + 3; + SIZE_T cbFileName; + + /* Check for a quoted file name */ + if (*lpFileName == L'\"') + { + /* Skip this quote, and the last one too if any */ + ++lpFileName; + cbFileName = wcslen(lpFileName); + if (cbFileName > 0 && lpFileName[cbFileName - 1] == L'\"') + lpFileName[cbFileName - 1] = UNICODE_NULL; + } + + /* Skip this one if we do not actually have a file name */ + if (!*lpFileName) + continue; + + cbFileName = (wcslen(lpFileName) + 1) * sizeof(WCHAR); + + /* Reallocate the list of user logs to load */ + if (lpszzUserLogsToLoad) + { + lpNewBuffer = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + lpszzUserLogsToLoad, + /* Count the multi-string NULL-terminator */ + cbUserLogsSize + cbFileName + sizeof(WCHAR)); + } + else + { + cbUserLogsSize = 0; + lpNewBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + /* Count the multi-string NULL-terminator */ + cbUserLogsSize + cbFileName + sizeof(WCHAR)); + } + + if (!lpNewBuffer) + { + ShowWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto Quit; + } + + lpszzUserLogsToLoad = lpNewBuffer; + lpNewBuffer = (LPWSTR)((ULONG_PTR)lpNewBuffer + cbUserLogsSize); + cbUserLogsSize += cbFileName; + + /* Save the file name */ + StringCbCopyW(lpNewBuffer, cbFileName, lpFileName); + + continue; + } + + default: + break; + } + } + + /* Unknown argument: display help and bail out */ + DisplayUsage(); + goto Quit; + } + else + { + /* + * An argument that does not start with the switch character. + * If this is the first argument then this corresponds to the + * optional computer name. Otherwise this is a wrong argument. + */ + if (i == 1) + { + /* Store the computer name */ + SIZE_T cbLength; + + cbLength = (wcslen(argv[i]) + 1) * sizeof(WCHAR); + lpComputerName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbLength); + if (lpComputerName) + { + StringCbCopyW(lpComputerName, cbLength, argv[i]); + } + /* else, fall back to local computer */ + } + else + { + /* Invalid syntax: display help and bail out */ + DisplayUsage(); + goto Quit; + } + } + } + + Success = TRUE; + +Quit: + /* In case of failure, free anything we have allocated */ + if (!Success) + { + if (lpszzUserLogsToLoad) + { + cbUserLogsSize = 0; + HeapFree(GetProcessHeap(), 0, lpszzUserLogsToLoad); + lpszzUserLogsToLoad = NULL; + } + if (lpComputerName) + { + HeapFree(GetProcessHeap(), 0, lpComputerName); + lpComputerName = NULL; + } + } + + /* Free the arguments vector and exit */ + LocalFree(argv); + return Success; +} + int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -194,6 +378,14 @@ wWinMain(HINSTANCE hInstance, LoadStringW(hInstance, IDS_LOADING_WAIT, szLoadingWait, ARRAYSIZE(szLoadingWait)); LoadStringW(hInstance, IDS_NO_ITEMS, szEmptyList, ARRAYSIZE(szEmptyList)); + /* + * Process the command-line arguments. Note that we need the full + * command-line, with the program file included, and not just what + * WinMain() provides in its lpCmdLine parameter. + */ + if (!ProcessCmdLine(GetCommandLineW())) + goto Quit; + if (!MyRegisterClass(hInstance)) goto Quit; @@ -223,12 +415,22 @@ wWinMain(HINSTANCE hInstance, /* Retrieve the available event logs on this computer and create filters for them */ InitializeListHead(&EventLogList); InitializeListHead(&EventLogFilterList); - // TODO: Implement connection to remote computer... - // At the moment we only support the user local computer. - BuildLogListAndFilterList(NULL); + BuildLogListAndFilterList(lpComputerName); - // TODO: If the user wants to open an external event log with the Event Log Viewer - // (via the command line), it's here that the log should be opened. + /* Open the user-specified logs if any are present on the command-line */ + if (lpszzUserLogsToLoad) + { + LPWSTR lpUserLog; + for (lpUserLog = lpszzUserLogsToLoad; *lpUserLog; lpUserLog += wcslen(lpUserLog) + 1) + { + OpenUserEventLogFile(lpUserLog); + } + + /* Now cleanup the list of user logs */ + cbUserLogsSize = 0; + HeapFree(GetProcessHeap(), 0, lpszzUserLogsToLoad); + lpszzUserLogsToLoad = NULL; + } /* Main message loop */ while (GetMessageW(&msg, NULL, 0, 0)) @@ -256,6 +458,18 @@ Cleanup: CloseHandle(hStartStopEnumEvent); Quit: + /* Final cleanup */ + if (lpszzUserLogsToLoad) + { + cbUserLogsSize = 0; + HeapFree(GetProcessHeap(), 0, lpszzUserLogsToLoad); + lpszzUserLogsToLoad = NULL; + } + if (lpComputerName) + { + HeapFree(GetProcessHeap(), 0, lpComputerName); + lpComputerName = NULL; + } FreeLibrary(hRichEdit); return (int)msg.wParam; @@ -1433,7 +1647,6 @@ static DWORD WINAPI EnumEventsThread(IN LPVOID lpParameter) { PEVENTLOGFILTER EventLogFilter = (PEVENTLOGFILTER)lpParameter; - LPWSTR lpMachineName = NULL; // EventLogFilter->ComputerName; PEVENTLOG EventLog; ULONG LogIndex; @@ -1473,6 +1686,54 @@ EnumEventsThread(IN LPVOID lpParameter) EventLogFilter_AddRef(EventLogFilter); ActiveFilter = EventLogFilter; + + /** HACK!! **/ + EventLog = EventLogFilter->EventLogs[0]; + + // FIXME: Use something else instead of EventLog->LogName !! + + /* + * Use a different formatting, whether the event log filter holds + * only one log, or many logs (the latter case is WIP TODO!) + */ + if (EventLogFilter->NumOfEventLogs <= 1) + { + StringCchPrintfExW(szWindowTitle, + ARRAYSIZE(szWindowTitle), + &lpTitleTemplateEnd, + &cchRemaining, + 0, + szTitleTemplate, szTitle, EventLog->LogName); /* i = number of characters written */ + dwMaxLength = (DWORD)cchRemaining; + if (!EventLog->ComputerName) + GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength); + else + StringCchCopyW(lpTitleTemplateEnd, dwMaxLength, EventLog->ComputerName); + + StringCbPrintfW(szStatusText, + sizeof(szStatusText), + szStatusBarTemplate, + EventLog->LogName, + 0, + 0); + } + else + { + // TODO: Use a different title & implement filtering for multi-log filters !! + // (EventLogFilter->NumOfEventLogs > 1) + MessageBoxW(hwndMainWindow, + L"Many-logs filtering is not implemented yet!!", + L"Event Log", + MB_OK | MB_ICONINFORMATION); + } + + /* Set the window title */ + SetWindowTextW(hwndMainWindow, szWindowTitle); + + /* Update the status bar */ + StatusBar_SetText(hwndStatus, 0, szStatusText); + + /* Disable list view redraw */ SendMessageW(hwndListView, WM_SETREDRAW, FALSE, 0); @@ -1699,18 +1960,6 @@ Cleanup: */ if (EventLogFilter->NumOfEventLogs <= 1) { - StringCchPrintfExW(szWindowTitle, - ARRAYSIZE(szWindowTitle), - &lpTitleTemplateEnd, - &cchRemaining, - 0, - szTitleTemplate, szTitle, EventLog->LogName); /* i = number of characters written */ - dwMaxLength = (DWORD)cchRemaining; - if (!lpMachineName) - GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength); - else - StringCchCopyW(lpTitleTemplateEnd, dwMaxLength, lpMachineName); - StringCbPrintfW(szStatusText, sizeof(szStatusText), szStatusBarTemplate, @@ -1722,18 +1971,11 @@ Cleanup: { // TODO: Use a different title & implement filtering for multi-log filters !! // (EventLogFilter->NumOfEventLogs > 1) - MessageBoxW(hwndMainWindow, - L"Many-logs filtering is not implemented yet!!", - L"Event Log", - MB_OK | MB_ICONINFORMATION); } /* Update the status bar */ StatusBar_SetText(hwndStatus, 0, szStatusText); - /* Set the window title */ - SetWindowTextW(hwndMainWindow, szWindowTitle); - /* Resume list view redraw */ SendMessageW(hwndListView, WM_SETREDRAW, TRUE, 0); @@ -2240,6 +2482,8 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) HTREEITEM hRootNode = NULL, hItem = NULL, hItemDefault = NULL; /* Open the EventLog key */ + // TODO: Implement connection to remote computer... + // At the moment we only support the user local computer. // FIXME: Use local or remote computer Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hEventLogKey); if (Result != ERROR_SUCCESS) diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 53eda36d8b..5f65551548 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -142,6 +142,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Error" diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index 7fcc447c0b..cb2abd9fde 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -142,6 +142,24 @@ BEGIN IDS_SAVE_FILTER "Protokol událostí (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Chyba" diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index cbfd581e60..b87bddf4fa 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Ereignisprotokoll (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Fehler" diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index d013895697..0eafda6725 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Αφάλμα" diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index c1c776e90f..0d4ab4af97 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -150,6 +150,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Error" diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index 992f70768e..5c3da85040 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -139,11 +139,29 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripción para el evento con ID (%lu) y origen (%s). El equipo local puede no tener la información necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" + IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripción para el evento con ID ( %lu ) y origen ( %s ). El equipo local puede no tener la información necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" IDS_CLEAREVENTS_MSG "¿Desea guardar este registro de eventos antes de borrarlo?" IDS_SAVE_FILTER "Registro de eventos (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Error" diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index ba64ada0e9..cc71f90514 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Journal d'événements (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "Visionneuse d'événements ReactOS\n\ +\n\ +EventVwr [nom ordinateur] [/l:<fichier journal>] [/?]\n\ +\n\ +""nom ordinateur"" : Spécifie l'ordinateur distant auquel se connecter\n\ +\tpour récupérer les événements à afficher. Si aucun nom n'est spécifié,\n\ +\tl'ordinateur local est utilisé.\n\ +\n\ +/l:<fichier journal> : Spécifie quel fichier journal ouvrir.\n\ +\tSeuls les fichiers au format .evt (NT ≤ 5.2) sont supportés.\n\ +\n\ +/? : Affiche ce message d'aide.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Erreur" @@ -175,15 +193,15 @@ END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ -Event Source: %s\r\n\ -Event Category: %s\r\n\ -Event ID: %s\r\n\ -Date: %s\r\n\ -Time: %s\r\n\ -User: %s\r\n\ -Computer: %s\r\n\ -Description:\r\n%s" + IDS_COPY "Type d'événement : %s\r\n\ +Source de l'événement : %s\r\n\ +Catégorie de l'événement : %s\r\n\ +ID de l'événement : %s\r\n\ +Date : %s\r\n\ +Heure : %s\r\n\ +Utilisateur : %s\r\n\ +Ordinateur : %s\r\n\ +Description :\r\n%s" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index f42f474c9d..85e2667ff2 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "שגיאה" diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index 24cc8adaed..b86672b388 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Errore" diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 29bea7d8c2..817c30e4dd 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "エラー" diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index de0f02fe26..3749b92732 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "에러" diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index a979794d0d..21944f9d5c 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -142,6 +142,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Feil" diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 04a028dd48..5e6cd7de61 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -146,6 +146,24 @@ BEGIN IDS_SAVE_FILTER "Dziennik zdarzeń (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Błąd" diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index 3e0e30c4ac..e56007504b 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Erro" diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index f479f2ed02..b63ba71def 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -147,6 +147,24 @@ BEGIN IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Eroare" @@ -186,7 +204,7 @@ Dată: %s\r\n\ Oră: %s\r\n\ Utilizator: %s\r\n\ Calculator: %s\r\n\ -Descriere :\r\n%s" +Descriere:\r\n%s" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index b50945b793..e9969417b6 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Журнал событий (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Ошибка" diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index a89594bbe0..aed4e951d8 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -147,6 +147,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Chyba" diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 897daa8f59..08c7bd0fe3 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -150,6 +150,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Error" diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index b06daf20fb..77e4a321d0 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Fel" diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 1d1e6925e8..221660b379 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -150,6 +150,24 @@ BEGIN IDS_SAVE_FILTER "Olay Kaydı (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Yanlışlık" diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index b7d863e252..8a5dc3cbbb 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -139,11 +139,29 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події( %lu ) за джерелом ( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера.\n\nThe following information is part of the event:\n\n" + IDS_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події ( %lu ) за джерелом ( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера.\n\nThe following information is part of the event:\n\n" IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "Помилка" diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index 510987035c..bcac2394b9 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "事件日志 (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "错误" @@ -175,15 +193,15 @@ END STRINGTABLE BEGIN - IDS_COPY "事件类型: %s\r\n\ -事件源: %s\r\n\ -事件类别: %s\r\n\ -事件 ID: %s\r\n\ -日期: %s\r\n\ -时间: %s\r\n\ -用户: %s\r\n\ -电脑: %s\r\n\ -描述:\n%s" + IDS_COPY "事件类型: %s\r\n\ +事件源: %s\r\n\ +事件类别: %s\r\n\ +事件 ID: %s\r\n\ +日期: %s\r\n\ +时间: %s\r\n\ +用户: %s\r\n\ +电脑: %s\r\n\ +描述:\r\n%s" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index 3bed36acd4..b43acc5f84 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -144,6 +144,24 @@ BEGIN IDS_SAVE_FILTER "事件日誌 (*.evt)\0*.evt\0" END +STRINGTABLE +BEGIN +/* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ + IDS_USAGE "ReactOS Event Viewer\n\ +\n\ +EventVwr [computer name] [/l:<event log file>] [/?]\n\ +\n\ +""computer name"" : Specifies the remote computer where to connect\n\ +\tto retrieve the events to display. If no name is specified, the\n\ +\tlocal computer is used.\n\ +\n\ +/l:<event log file> : Specifies which event log file to open.\n\ +\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +\n\ +/? : Displays this help message.\n\ +" +END + STRINGTABLE BEGIN IDS_EVENTLOG_ERROR_TYPE "錯誤" @@ -175,15 +193,15 @@ END STRINGTABLE BEGIN - IDS_COPY "事件種類: %s\r\n\ -事件源: %s\r\n\ -事件種類: %s\r\n\ -事件 ID: %s\r\n\ -日期: %s\r\n\ -時間: %s\r\n\ -使用者: %s\r\n\ -電腦: %s\r\n\ -描述:\n%s" + IDS_COPY "事件種類: %s\r\n\ +事件源: %s\r\n\ +事件種類: %s\r\n\ +事件 ID: %s\r\n\ +日期: %s\r\n\ +時間: %s\r\n\ +使用者: %s\r\n\ +電腦: %s\r\n\ +描述:\r\n%s" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index 525cce9c55..a5c88a4a05 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -93,6 +93,8 @@ #define IDS_CLEAREVENTS_MSG 110 #define IDS_SAVE_FILTER 111 +#define IDS_USAGE 120 + #define IDS_EVENTLOG_ERROR_TYPE 200 #define IDS_EVENTLOG_WARNING_TYPE 201 #define IDS_EVENTLOG_INFORMATION_TYPE 202

1 0

01/02: [EVENTVWR] Enhancements to the event log viewer.
by Hermès Bélusca-Maïto 12 Apr '18

12 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb2934df0e721b734dd33… commit eb2934df0e721b734dd337025724b426fea970af Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 12 02:32:37 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 12 02:32:37 2018 +0200 [EVENTVWR] Enhancements to the event log viewer. - Initialize hwndMainWindow as it can be used before it is properly initialized with an existing window handle. - Transform ShowLastWin32Error() to a more generic ShowWin32Error(). - Use iswdigit() instead of isdigit(). - Add extra heap buffer cleanup. - Split OpenUserEventLog() in two: OpenUserEventLog() that displays an open-file dialog, and OpenUserEventLogFile() that does the real work of allocating internal structures and opening the log file using the event-log service. We also check that the file really exists before proceeding further. - Force treeview repaint when *children* items are inserted, because otherwise the expand/collapse buttons do not display next to parent items (this problem happens on Windows too). - Reshuffle the resource string IDs. --- base/applications/mscutils/eventvwr/eventvwr.c | 153 +++++++++++++++---------- base/applications/mscutils/eventvwr/resource.h | 62 +++++----- 2 files changed, 124 insertions(+), 91 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 53838f8022..c184bb2a6a 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -77,7 +77,7 @@ BYTE bSplit = 0; /* Splitter state: * 2: Horizontal splitting. */ -HWND hwndMainWindow; /* Main window */ +HWND hwndMainWindow = NULL; /* Main window */ HWND hwndTreeView; /* TreeView control */ HWND hwndListView; /* ListView control */ // NOTE: Used by evtdetctl.c HWND hwndEventDetails; /* Event details pane */ @@ -90,7 +90,7 @@ HTREEITEM htiSystemLogs = NULL, htiAppLogs = NULL, htiUserLogs = NULL; /* Global event records cache for the current active event log filter */ DWORD g_TotalRecords = 0; -PEVENTLOGRECORD *g_RecordPtrs = NULL; +PEVENTLOGRECORD* g_RecordPtrs = NULL; /* Lists of event logs and event log filters */ LIST_ENTRY EventLogList; @@ -129,6 +129,32 @@ INT_PTR EventLogProperties(HINSTANCE, HWND, PEVENTLOGFILTER); INT_PTR CALLBACK EventDetails(HWND, UINT, WPARAM, LPARAM); +/* MAIN FUNCTIONS *************************************************************/ + +VOID +ShowWin32Error(IN DWORD dwError) +{ + LPWSTR lpMessageBuffer; + + if (dwError == ERROR_SUCCESS) + return; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMessageBuffer, + 0, NULL)) + { + return; + } + + MessageBoxW(hwndMainWindow, lpMessageBuffer, szTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMessageBuffer); +} + int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -158,6 +184,9 @@ wWinMain(HINSTANCE hInstance, msg.wParam = (WPARAM)-1; + /* Store the instance handle in the global variable */ + hInst = hInstance; + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAYSIZE(szTitle)); LoadStringW(hInstance, IDS_APP_TITLE_EX, szTitleTemplate, ARRAYSIZE(szTitleTemplate)); @@ -235,32 +264,6 @@ Quit: /* GENERIC HELPER FUNCTIONS ***************************************************/ -VOID -ShowLastWin32Error(VOID) -{ - DWORD dwError; - LPWSTR lpMessageBuffer; - - dwError = GetLastError(); - if (dwError == ERROR_SUCCESS) - return; - - if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dwError, - LANG_USER_DEFAULT, - (LPWSTR)&lpMessageBuffer, - 0, NULL)) - { - return; - } - - MessageBoxW(hwndMainWindow, lpMessageBuffer, szTitle, MB_OK | MB_ICONERROR); - LocalFree(lpMessageBuffer); -} - VOID EventTimeToSystemTime(IN DWORD EventTime, OUT PSYSTEMTIME pSystemTime) @@ -475,10 +478,10 @@ ApplyParameterStringsToMessage( while ((pTempMessage = wcschr(pTempMessage, L'%'))) { pTempMessage++; - if (isdigit(*pTempMessage)) + if (iswdigit(*pTempMessage)) { dwParamCount++; - while (isdigit(*++pTempMessage)) ; + while (iswdigit(*++pTempMessage)) ; } } } @@ -487,10 +490,10 @@ ApplyParameterStringsToMessage( while ((pTempMessage = wcsstr(pTempMessage, L"%%"))) { pTempMessage += 2; - if (isdigit(*pTempMessage)) + if (iswdigit(*pTempMessage)) { dwParamCount++; - while (isdigit(*++pTempMessage)) ; + while (iswdigit(*++pTempMessage)) ; } } } @@ -520,12 +523,12 @@ ApplyParameterStringsToMessage( while ((pTempMessage = wcschr(pTempMessage, L'%')) && (i < dwParamCount)) { pTempMessage++; - if (isdigit(*pTempMessage)) + if (iswdigit(*pTempMessage)) { pParamData[i].pStartingAddress = pTempMessage-1; pParamData[i].pParameterID = (DWORD)_wtol(pTempMessage); - while (isdigit(*++pTempMessage)) ; + while (iswdigit(*++pTempMessage)) ; pParamData[i].pEndingAddress = pTempMessage; i++; @@ -537,12 +540,12 @@ ApplyParameterStringsToMessage( while ((pTempMessage = wcsstr(pTempMessage, L"%%")) && (i < dwParamCount)) { pTempMessage += 2; - if (isdigit(*pTempMessage)) + if (iswdigit(*pTempMessage)) { pParamData[i].pStartingAddress = pTempMessage-2; pParamData[i].pParameterID = (DWORD)_wtol(pTempMessage); - while (isdigit(*++pTempMessage)) ; + while (iswdigit(*++pTempMessage)) ; pParamData[i].pEndingAddress = pTempMessage; i++; @@ -847,6 +850,8 @@ AllocEventLog(IN PCWSTR ComputerName OPTIONAL, EventLog->LogName = HeapAlloc(GetProcessHeap(), 0, cchName * sizeof(WCHAR)); if (!EventLog->LogName) { + if (EventLog->ComputerName) + HeapFree(GetProcessHeap(), 0, EventLog->ComputerName); HeapFree(GetProcessHeap(), 0, EventLog); return NULL; } @@ -863,6 +868,9 @@ EventLog_Free(IN PEVENTLOG EventLog) if (EventLog->LogName) HeapFree(GetProcessHeap(), 0, EventLog->LogName); + if (EventLog->ComputerName) + HeapFree(GetProcessHeap(), 0, EventLog->ComputerName); + if (EventLog->FileName) HeapFree(GetProcessHeap(), 0, EventLog->FileName); @@ -1164,7 +1172,7 @@ GetEventMessage(IN LPCWSTR KeyName, lpMsgBuf = szMessage; while ((lpMsgBuf = wcsstr(lpMsgBuf, L"%%"))) { - if (isdigit(lpMsgBuf[2])) + if (iswdigit(lpMsgBuf[2])) { RtlMoveMemory(lpMsgBuf, lpMsgBuf+1, ((szStringArray + cch) - lpMsgBuf - 1) * sizeof(WCHAR)); } @@ -1493,7 +1501,7 @@ EnumEventsThread(IN LPVOID lpParameter) if (hEventLog == NULL) { - ShowLastWin32Error(); + ShowWin32Error(GetLastError()); goto Cleanup; } @@ -1517,7 +1525,7 @@ EnumEventsThread(IN LPVOID lpParameter) g_RecordPtrs = HeapAlloc(hProcessHeap, HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs)); if (!g_RecordPtrs) { - // ShowLastWin32Error(); + // ShowWin32Error(GetLastError()); goto Quit; } g_TotalRecords = dwTotalRecords; @@ -1890,26 +1898,31 @@ GetSelectedFilter(OUT HTREEITEM* phti OPTIONAL) VOID -OpenUserEventLog(VOID) +OpenUserEventLogFile(IN LPCWSTR lpszFileName) { + WIN32_FIND_DATAW FindData; + HANDLE hFind; PEVENTLOG EventLog; PEVENTLOGFILTER EventLogFilter; + SIZE_T cchFileName; HTREEITEM hItem = NULL; - WCHAR szFileName[MAX_PATH]; - ZeroMemory(szFileName, sizeof(szFileName)); - - sfn.lpstrFile = szFileName; - sfn.nMaxFile = ARRAYSIZE(szFileName); - - if (!GetOpenFileNameW(&sfn)) + /* Check whether the file actually exists */ + hFind = FindFirstFileW(lpszFileName, &FindData); + if (hFind == INVALID_HANDLE_VALUE) + { + ShowWin32Error(GetLastError()); return; - sfn.lpstrFile[sfn.nMaxFile-1] = UNICODE_NULL; + } + FindClose(hFind); /* Allocate a new event log entry */ - EventLog = AllocEventLog(NULL, sfn.lpstrFile, FALSE); + EventLog = AllocEventLog(NULL, lpszFileName, FALSE); if (EventLog == NULL) + { + ShowWin32Error(ERROR_NOT_ENOUGH_MEMORY); return; + } /* Allocate a new event log filter entry for this event log */ EventLogFilter = AllocEventLogFilter(// LogName, @@ -1918,7 +1931,8 @@ OpenUserEventLog(VOID) 1, &EventLog); if (EventLogFilter == NULL) { - HeapFree(GetProcessHeap(), 0, EventLog); + ShowWin32Error(ERROR_NOT_ENOUGH_MEMORY); + EventLog_Free(EventLog); return; } @@ -1927,12 +1941,13 @@ OpenUserEventLog(VOID) InsertTailList(&EventLogFilterList, &EventLogFilter->ListEntry); /* Retrieve and cache the event log file */ - EventLog->FileName = HeapAlloc(GetProcessHeap(), 0, sfn.nMaxFile * sizeof(WCHAR)); + cchFileName = wcslen(lpszFileName) + 1; + EventLog->FileName = HeapAlloc(GetProcessHeap(), 0, cchFileName * sizeof(WCHAR)); if (EventLog->FileName) - StringCchCopyW(EventLog->FileName, sfn.nMaxFile, sfn.lpstrFile); + StringCchCopyW(EventLog->FileName, cchFileName, lpszFileName); hItem = TreeViewAddItem(hwndTreeView, htiUserLogs, - szFileName, + (LPWSTR)lpszFileName, 2, 3, (LPARAM)EventLogFilter); /* Select the event log */ @@ -1942,9 +1957,27 @@ OpenUserEventLog(VOID) TreeView_SelectItem(hwndTreeView, hItem); TreeView_EnsureVisible(hwndTreeView, hItem); } + InvalidateRect(hwndTreeView, NULL, FALSE); SetFocus(hwndTreeView); } +VOID +OpenUserEventLog(VOID) +{ + WCHAR szFileName[MAX_PATH]; + + ZeroMemory(szFileName, sizeof(szFileName)); + + sfn.lpstrFile = szFileName; + sfn.nMaxFile = ARRAYSIZE(szFileName); + + if (!GetOpenFileNameW(&sfn)) + return; + sfn.lpstrFile[sfn.nMaxFile-1] = UNICODE_NULL; + + OpenUserEventLogFile(sfn.lpstrFile); +} + VOID SaveEventLog(IN PEVENTLOGFILTER EventLogFilter) { @@ -1973,12 +2006,12 @@ SaveEventLog(IN PEVENTLOGFILTER EventLogFilter) if (!hEventLog) { - ShowLastWin32Error(); + ShowWin32Error(GetLastError()); return; } if (!BackupEventLogW(hEventLog, szFileName)) - ShowLastWin32Error(); + ShowWin32Error(GetLastError()); CloseEventLog(hEventLog); } @@ -2013,6 +2046,7 @@ CloseUserEventLog(IN PEVENTLOGFILTER EventLogFilter, IN HTREEITEM hti) // // TreeView_Expand(hwndTreeView, htiUserLogs, TVE_EXPAND); // TreeView_SelectItem(hwndTreeView, hItem); // TreeView_EnsureVisible(hwndTreeView, hItem); + InvalidateRect(hwndTreeView, NULL, FALSE); SetFocus(hwndTreeView); } @@ -2062,13 +2096,13 @@ ClearEvents(IN PEVENTLOGFILTER EventLogFilter) if (!hEventLog) { - ShowLastWin32Error(); + ShowWin32Error(GetLastError()); return FALSE; } Success = ClearEventLogW(hEventLog, sfn.lpstrFile); if (!Success) - ShowLastWin32Error(); + ShowWin32Error(GetLastError()); CloseEventLog(hEventLog); return Success; @@ -2254,7 +2288,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) 1, &EventLog); if (EventLogFilter == NULL) { - HeapFree(GetProcessHeap(), 0, EventLog); + EventLog_Free(EventLog); continue; } @@ -2369,6 +2403,7 @@ Quit: TreeView_SelectItem(hwndTreeView, hItemDefault); TreeView_EnsureVisible(hwndTreeView, hItemDefault); } + InvalidateRect(hwndTreeView, NULL, FALSE); SetFocus(hwndTreeView); return; @@ -2418,8 +2453,6 @@ InitInstance(HINSTANCE hInstance, LVCOLUMNW lvc = {0}; WCHAR szTemp[256]; - hInst = hInstance; // Store instance handle in our global variable - /* Create the main window */ hwndMainWindow = CreateWindowW(szWindowClass, szTitle, diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index d36afe2af5..525cce9c55 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -80,39 +80,39 @@ /* String IDs */ -#define IDS_COPYRIGHT 102 -#define IDS_APP_TITLE 103 -#define IDS_APP_TITLE_EX 104 -#define IDS_STATUS_MSG 105 -#define IDS_LOADING_WAIT 106 -#define IDS_NO_ITEMS 107 -#define IDS_EVENTLOG_SYSTEM 108 -#define IDS_EVENTLOG_APP 109 -#define IDS_EVENTLOG_USER 110 -#define IDS_EVENTSTRINGIDNOTFOUND 209 -#define IDS_CLEAREVENTS_MSG 210 -#define IDS_SAVE_FILTER 211 +#define IDS_COPYRIGHT 100 +#define IDS_APP_TITLE 101 +#define IDS_APP_TITLE_EX 102 +#define IDS_STATUS_MSG 103 +#define IDS_LOADING_WAIT 104 +#define IDS_NO_ITEMS 105 +#define IDS_EVENTLOG_SYSTEM 106 +#define IDS_EVENTLOG_APP 107 +#define IDS_EVENTLOG_USER 108 +#define IDS_EVENTSTRINGIDNOTFOUND 109 +#define IDS_CLEAREVENTS_MSG 110 +#define IDS_SAVE_FILTER 111 -#define IDS_EVENTLOG_ERROR_TYPE 251 -#define IDS_EVENTLOG_WARNING_TYPE 252 -#define IDS_EVENTLOG_INFORMATION_TYPE 253 -#define IDS_EVENTLOG_AUDIT_SUCCESS 254 -#define IDS_EVENTLOG_AUDIT_FAILURE 255 -#define IDS_EVENTLOG_SUCCESS 256 -#define IDS_EVENTLOG_UNKNOWN_TYPE 257 +#define IDS_EVENTLOG_ERROR_TYPE 200 +#define IDS_EVENTLOG_WARNING_TYPE 201 +#define IDS_EVENTLOG_INFORMATION_TYPE 202 +#define IDS_EVENTLOG_AUDIT_SUCCESS 203 +#define IDS_EVENTLOG_AUDIT_FAILURE 204 +#define IDS_EVENTLOG_SUCCESS 205 +#define IDS_EVENTLOG_UNKNOWN_TYPE 206 -#define IDS_BYTES_FORMAT 260 +#define IDS_BYTES_FORMAT 210 -#define IDS_COLUMNTYPE 300 -#define IDS_COLUMNDATE 301 -#define IDS_COLUMNTIME 302 -#define IDS_COLUMNSOURCE 303 -#define IDS_COLUMNCATEGORY 304 -#define IDS_COLUMNEVENT 305 -#define IDS_COLUMNUSER 306 -#define IDS_COLUMNCOMPUTER 307 +#define IDS_COLUMNTYPE 220 +#define IDS_COLUMNDATE 221 +#define IDS_COLUMNTIME 222 +#define IDS_COLUMNSOURCE 223 +#define IDS_COLUMNCATEGORY 224 +#define IDS_COLUMNEVENT 225 +#define IDS_COLUMNUSER 226 +#define IDS_COLUMNCOMPUTER 227 -#define IDS_COPY 400 +#define IDS_COPY 240 -#define IDS_NONE 320 -#define IDS_NOT_AVAILABLE 321 +#define IDS_NONE 250 +#define IDS_NOT_AVAILABLE 251

1 0

01/01: [NET] Replace remaining hard-coded strings by string resources for the NET STATISTICS command.
by Eric Kohl 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef0f6861fbcd8691c7166… commit ef0f6861fbcd8691c7166c603b42b5474ed40fdd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Apr 12 00:58:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Apr 12 00:58:30 2018 +0200 [NET] Replace remaining hard-coded strings by string resources for the NET STATISTICS command. --- base/applications/network/net/cmdStatistics.c | 84 +++++++++++++++++++-------- base/applications/network/net/lang/en-US.rc | 20 ++++++- base/applications/network/net/lang/es-ES.rc | 20 ++++++- base/applications/network/net/lang/ro-RO.rc | 20 ++++++- base/applications/network/net/lang/ru-RU.rc | 20 ++++++- base/applications/network/net/lang/tr-TR.rc | 20 ++++++- base/applications/network/net/lang/zh-CN.rc | 20 ++++++- base/applications/network/net/lang/zh-TW.rc | 20 ++++++- base/applications/network/net/resource.h | 21 ++++++- 9 files changed, 211 insertions(+), 34 deletions(-) diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c index 23a6e5f0df..62bbca716c 100644 --- a/base/applications/network/net/cmdStatistics.c +++ b/base/applications/network/net/cmdStatistics.c @@ -19,7 +19,7 @@ DisplayServerStatistics(VOID) FILETIME FileTime, LocalFileTime; SYSTEMTIME SystemTime; WORD wHour; - INT nPaddedLength = 33; + INT nPaddedLength = 35; NET_API_STATUS Status; Status = NetServerGetInfo(NULL, 100, (PBYTE*)&ServerInfo); @@ -127,6 +127,7 @@ DisplayWorkstationStatistics(VOID) FILETIME FileTime, LocalFileTime; SYSTEMTIME SystemTime; WORD wHour; + INT nPaddedLength = 47; NET_API_STATUS Status; Status = NetWkstaGetInfo(NULL, @@ -166,30 +167,63 @@ DisplayWorkstationStatistics(VOID) SystemTime.wMonth, SystemTime.wDay, SystemTime.wYear, wHour, SystemTime.wMinute, (SystemTime.wHour >= 1 && SystemTime.wHour < 13) ? L"AM" : L"PM"); - printf("Bytes received %I64u\n", StatisticsInfo->BytesReceived.QuadPart); - printf("Server Message Blocks (SMBs) received %I64u\n", StatisticsInfo->SmbsReceived.QuadPart); - printf("Bytes transmitted %I64u\n", StatisticsInfo->BytesTransmitted.QuadPart); - printf("Server Message Blocks (SMBs) transmitted %I64u\n", StatisticsInfo->SmbsTransmitted.QuadPart); - printf("Read operations %lu\n", StatisticsInfo->ReadOperations); - printf("Write operations %lu\n", StatisticsInfo->WriteOperations); - printf("Raw reads denied %lu\n", StatisticsInfo->RawReadsDenied); - printf("Raw writes denied %lu\n\n", StatisticsInfo->RawWritesDenied); - - printf("Network errors %lu\n", StatisticsInfo->NetworkErrors); - printf("Connections made %lu\n", StatisticsInfo->CoreConnects + - StatisticsInfo->Lanman20Connects + - StatisticsInfo->Lanman21Connects + - StatisticsInfo->LanmanNtConnects); - printf("Reconnections made %lu\n", StatisticsInfo->Reconnects); - printf("Server disconnects %lu\n\n", StatisticsInfo->ServerDisconnects); - - printf("Sessions started %lu\n", StatisticsInfo->Sessions); - printf("Hung sessions %lu\n", StatisticsInfo->HungSessions); - printf("Failed sessions %lu\n", StatisticsInfo->FailedSessions); - printf("Failed operations %lu\n", StatisticsInfo->InitiallyFailedOperations + - StatisticsInfo->FailedCompletionOperations); - printf("Use count %lu\n", StatisticsInfo->UseCount); - printf("Failed use count %lu\n\n", StatisticsInfo->FailedUseCount); + PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESRCVD, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesReceived.QuadPart); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSRCVD, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsReceived.QuadPart); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_BYTESTRANS, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->BytesTransmitted.QuadPart); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_SMBSTRANS, nPaddedLength); + ConPrintf(StdOut, L"%I64u\n", StatisticsInfo->SmbsTransmitted.QuadPart); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_READOPS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->ReadOperations); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEOPS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->WriteOperations); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_READDENIED, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->RawReadsDenied); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_WRITEDENIED, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->RawWritesDenied); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_NETWORKERROR, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->NetworkErrors); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_CONNECTS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->CoreConnects + + StatisticsInfo->Lanman20Connects + + StatisticsInfo->Lanman21Connects + + StatisticsInfo->LanmanNtConnects); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_RECONNECTS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Reconnects); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_DISCONNECTS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->ServerDisconnects); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_SESSIONS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->Sessions); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_HUNGSESSIONS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->HungSessions); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILSESSIONS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->FailedSessions); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILEDOPS, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->InitiallyFailedOperations + + StatisticsInfo->FailedCompletionOperations); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_USECOUNT, nPaddedLength); + ConPrintf(StdOut, L"%lu\n", StatisticsInfo->UseCount); + + PrintPaddedResourceString(IDS_STATISTICS_WKS_FAILUSECOUNT, nPaddedLength); + ConPrintf(StdOut, L"%lu\n\n", StatisticsInfo->FailedUseCount); done: if (StatisticsInfo != NULL) diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 5d7f207b12..d4417db80f 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -193,7 +193,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -211,6 +211,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "User accounts for \\\\%s" IDS_USER_NAME "User name" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index bb2a33ec6b..774c1f7c39 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -194,7 +194,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -212,6 +212,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "Cuentas de usuario en \\\\%s" IDS_USER_NAME "Nombre de usuario" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 6fc84bb0a9..f1869cbce8 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -197,7 +197,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -215,6 +215,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s" IDS_USER_NAME "Nume utilizator" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index 2c1df320eb..e220767605 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -193,7 +193,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -211,6 +211,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "Учетные записи пользователей для \\\\%s" IDS_USER_NAME "Имя пользователя" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index a27cf19e7d..9e64226ee6 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -193,7 +193,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -211,6 +211,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "\\\\%s için kullanıcı hesapları" IDS_USER_NAME "Kullanıcı adı" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index f1650effab..7ebbc12466 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -193,7 +193,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -211,6 +211,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "\\\\%s 的用户帐户" IDS_USER_NAME "用户名" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 89c63d0752..b7e25be658 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -193,7 +193,7 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ Server\n Workstation\n\n" - IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%d %s\n\n\n" + IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n" IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n" IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted" IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out" @@ -211,6 +211,24 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers" IDS_STATISTICS_SRV_REQBUFFERS " Request buffers" IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n" + IDS_STATISTICS_WKS_BYTESRCVD "Bytes received" + IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received" + IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted" + IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted" + IDS_STATISTICS_WKS_READOPS "Read operations" + IDS_STATISTICS_WKS_WRITEOPS "Write operations" + IDS_STATISTICS_WKS_READDENIED "Raw reads denied" + IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied" + IDS_STATISTICS_WKS_NETWORKERROR "Network errors" + IDS_STATISTICS_WKS_CONNECTS "Connections made" + IDS_STATISTICS_WKS_RECONNECTS "Reconnections made" + IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects" + IDS_STATISTICS_WKS_SESSIONS "Sessions started" + IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions" + IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions" + IDS_STATISTICS_WKS_FAILEDOPS "Failed operations" + IDS_STATISTICS_WKS_USECOUNT "Use count" + IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count" IDS_USER_ACCOUNTS "使用者帳戶 \\\\%s" IDS_USER_NAME "使用者名稱" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 441b00a2a4..9ecf1c2dc0 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -128,8 +128,25 @@ #define IDS_STATISTICS_SRV_BUFFERS 335 #define IDS_STATISTICS_SRV_BIGBUFFERS 336 #define IDS_STATISTICS_SRV_REQBUFFERS 337 - -#define IDS_STATISTICS_WKS_NAME 342 +#define IDS_STATISTICS_WKS_NAME 338 +#define IDS_STATISTICS_WKS_BYTESRCVD 339 +#define IDS_STATISTICS_WKS_SMBSRCVD 340 +#define IDS_STATISTICS_WKS_BYTESTRANS 341 +#define IDS_STATISTICS_WKS_SMBSTRANS 342 +#define IDS_STATISTICS_WKS_READOPS 343 +#define IDS_STATISTICS_WKS_WRITEOPS 344 +#define IDS_STATISTICS_WKS_READDENIED 345 +#define IDS_STATISTICS_WKS_WRITEDENIED 346 +#define IDS_STATISTICS_WKS_NETWORKERROR 347 +#define IDS_STATISTICS_WKS_CONNECTS 348 +#define IDS_STATISTICS_WKS_RECONNECTS 349 +#define IDS_STATISTICS_WKS_DISCONNECTS 350 +#define IDS_STATISTICS_WKS_SESSIONS 351 +#define IDS_STATISTICS_WKS_HUNGSESSIONS 352 +#define IDS_STATISTICS_WKS_FAILSESSIONS 353 +#define IDS_STATISTICS_WKS_FAILEDOPS 354 +#define IDS_STATISTICS_WKS_USECOUNT 355 +#define IDS_STATISTICS_WKS_FAILUSECOUNT 356 #define IDS_USER_ACCOUNTS 449 #define IDS_USER_NAME 450

1 0

01/01: [WIN32SS][NTDDRAW] Fix ddraw palette regression CORE-13714
by Joachim Henze 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14f0e62f9a3895699f920… commit 14f0e62f9a3895699f9202335516f16e610dd24d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Apr 11 15:39:54 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Apr 11 15:39:54 2018 +0200 [WIN32SS][NTDDRAW] Fix ddraw palette regression CORE-13714 This nice patch of Jerome Gardou improves palette when VBEMP & inbuilt Mesa is used for Diablo II, MS Age Of Empires 1, Anno 1602 to the state we had in SVN r75060 and below. We already committed this fix into 0.4.8-release before. --- win32ss/reactx/ntddraw/d3dkmt.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/win32ss/reactx/ntddraw/d3dkmt.c b/win32ss/reactx/ntddraw/d3dkmt.c index 2dae7ba1c4..cc0852e854 100644 --- a/win32ss/reactx/ntddraw/d3dkmt.c +++ b/win32ss/reactx/ntddraw/d3dkmt.c @@ -86,6 +86,17 @@ NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) /* Get the handle for the bitmap */ desc->hBitmap = (HBITMAP)psurf->SurfObj.hsurf; + /* Allocate a palette for this surface */ + if (format->bit_count <= 8) + { + PPALETTE palette = PALETTE_AllocPalette(PAL_INDEXED, 1 << format->bit_count, NULL, 0, 0, 0); + if (palette) + { + SURFACE_vSetPalette(psurf, palette); + PALETTE_ShareUnlockPalette(palette); + } + } + /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf);

1 0

01/01: [KERNEL32/STRING] Sync sortkey.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dabc7c9e92912be82a976… commit dabc7c9e92912be82a976f0d0af999270fe0124d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:49:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:49:52 2018 +0100 [KERNEL32/STRING] Sync sortkey.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/winnls/string/sortkey.c | 3 +-- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/sortkey.c b/dll/win32/kernel32/winnls/string/sortkey.c index 5ab4570649..453d620a3b 100644 --- a/dll/win32/kernel32/winnls/string/sortkey.c +++ b/dll/win32/kernel32/winnls/string/sortkey.c @@ -17,8 +17,7 @@ * 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 <wine/unicode.h> +#include "wine/unicode.h" #ifdef __REACTOS__ #define get_char_typeW(x) iswctype((x) >> 8, (x) & 0xFF) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ddaad4df37..6dc5502c87 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -284,7 +284,7 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 + reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-3.3 msvcrt - reactos/sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16

1 0

01/01: [KERNEL32/STRING] Sync lcformat.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf14b6b2f565df65d5db6… commit cf14b6b2f565df65d5db662f25da5148ae858fcf Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:48:50 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:48:50 2018 +0100 [KERNEL32/STRING] Sync lcformat.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/winnls/string/lcformat.c | 315 +++++++++++++++++++++++----- media/doc/README.WINE | 2 +- 2 files changed, 267 insertions(+), 50 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 73add2a4e4..7f57373e2d 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ + #include <k32.h> #define NDEBUG @@ -32,6 +34,28 @@ DEBUG_CHANNEL(nls); #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029 +#else /* __REACTOS__ */ + +#include "config.h" +#include "wine/port.h" + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "winternl.h" + +#include "kernel_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nls); + +#endif /* __REACTOS__ */ + #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ #define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */ @@ -81,7 +105,11 @@ static CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug = 0, 0, &NLS_FormatsCS, { &NLS_FormatsCS_debug.ProcessLocksList, &NLS_FormatsCS_debug.ProcessLocksList }, +#ifdef __REACTOS__ 0, 0, 0 +#else + 0, 0, { (DWORD_PTR)(__FILE__ ": NLS_Formats") } +#endif }; static CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; @@ -552,7 +580,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, ++format; } /* Only numeric day form matters */ - if (*format && *format == 'd') + if (*format == 'd') { INT dcount = 1; while (*++format == 'd') dcount++; @@ -838,6 +866,47 @@ INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpDateStr, cchOut); } +#ifndef __REACTOS__ +/****************************************************************************** + * GetDateFormatEx [KERNEL32.@] + * + * Format a date for a given locale. + * + * PARAMS + * localename [I] Locale to format for + * flags [I] LOCALE_ and DATE_ flags from "winnls.h" + * date [I] Date to format + * format [I] Format string, or NULL to use the locale defaults + * outbuf [O] Destination for formatted string + * bufsize [I] Size of outbuf, or 0 to calculate the resulting size + * calendar [I] Reserved, must be NULL + * + * See GetDateFormatA for notes. + * + * RETURNS + * Success: The number of characters written to outbuf, or that would have + * been written if bufsize is 0. + * Failure: 0. Use GetLastError() to determine the cause. + */ +INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags, + const SYSTEMTIME* date, LPCWSTR format, + LPWSTR outbuf, INT bufsize, LPCWSTR calendar) +{ + TRACE("(%s,0x%08x,%p,%s,%p,%d,%s)\n", debugstr_w(localename), flags, + date, debugstr_w(format), outbuf, bufsize, debugstr_w(calendar)); + + /* Parameter is currently reserved and Windows errors if set */ + if (calendar != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0), + flags | DATE_DATEVARSONLY, date, format, + outbuf, bufsize); +} +#endif /* !__REACTOS__ */ /****************************************************************************** * GetDateFormatW [KERNEL32.@] @@ -905,6 +974,40 @@ INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, lpFormat, lpTimeStr, cchOut); } +#ifndef __REACTOS__ +/****************************************************************************** + * GetTimeFormatEx [KERNEL32.@] + * + * Format a date for a given locale. + * + * PARAMS + * localename [I] Locale to format for + * flags [I] LOCALE_ and TIME_ flags from "winnls.h" + * time [I] Time to format + * format [I] Formatting overrides + * outbuf [O] Destination for formatted string + * bufsize [I] Size of outbuf, or 0 to calculate the resulting size + * + * See GetTimeFormatA for notes. + * + * RETURNS + * Success: The number of characters written to outbuf, or that would have + * have been written if bufsize is 0. + * Failure: 0. Use GetLastError() to determine the cause. + */ +INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags, + const SYSTEMTIME* time, LPCWSTR format, + LPWSTR outbuf, INT bufsize) +{ + TRACE("(%s,0x%08x,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time, + debugstr_w(format), outbuf, bufsize); + + return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0), + flags | TIME_TIMEVARSONLY, time, format, + outbuf, bufsize); +} +#endif /* !__REACTOS__ */ + /****************************************************************************** * GetTimeFormatW [KERNEL32.@] * @@ -1265,6 +1368,27 @@ error: return 0; } +#ifndef __REACTOS__ +/************************************************************************** + * GetNumberFormatEx (KERNEL32.@) + */ +INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, + LPCWSTR value, const NUMBERFMTW *format, + LPWSTR number, int numout) +{ + LCID lcid; + + TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(name), flags, + debugstr_w(value), format, number, numout); + + lcid = LocaleNameToLCID(name, 0); + if (!lcid) + return 0; + + return GetNumberFormatW(lcid, flags, value, format, number, numout); +} +#endif /* !__REACTOS__ */ + /************************************************************************** * GetCurrencyFormatA (KERNEL32.@) * @@ -1825,6 +1949,25 @@ BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumDateFormats(&ctxt); } +#ifndef __REACTOS__ +/************************************************************************** + * EnumDateFormatsExEx (KERNEL32.@) + */ +BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) +{ + struct enumdateformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROCEXEX; + ctxt.u.callbackexex = proc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.flags = flags; + ctxt.lParam = lParam; + ctxt.unicode = TRUE; + + return NLS_EnumDateFormats(&ctxt); +} +#endif /* !__REACTOS__ */ + struct enumtimeformats_context { enum enum_callback_type type; /* callback kind */ union { @@ -1930,6 +2073,25 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumTimeFormats(&ctxt); } +#ifndef __REACTOS__ +/************************************************************************** + * EnumTimeFormatsEx (KERNEL32.@) + */ +BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) +{ + struct enumtimeformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = proc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.flags = flags; + ctxt.lParam = lParam; + ctxt.unicode = TRUE; + + return NLS_EnumTimeFormats(&ctxt); +} +#endif /* !__REACTOS__ */ + struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { @@ -2159,6 +2321,28 @@ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, return NLS_EnumCalendarInfo(&ctxt); } +#ifndef __REACTOS__ +/****************************************************************************** + * EnumCalendarInfoExEx [KERNEL32.@] + */ +BOOL WINAPI EnumCalendarInfoExEx( CALINFO_ENUMPROCEXEX calinfoproc, LPCWSTR locale, CALID calendar, + LPCWSTR reserved, CALTYPE caltype, LPARAM lParam) +{ + struct enumcalendar_context ctxt; + + TRACE("(%p,%s,0x%08x,%p,0x%08x,0x%ld)\n", calinfoproc, debugstr_w(locale), calendar, reserved, caltype, lParam); + + ctxt.type = CALLBACK_ENUMPROCEXEX; + ctxt.u.callbackexex = calinfoproc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.lParam = lParam; + ctxt.unicode = TRUE; + return NLS_EnumCalendarInfo(&ctxt); +} +#endif /* !__REACTOS__ */ + /********************************************************************* * GetCalendarInfoA (KERNEL32.@) * @@ -2197,6 +2381,71 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPWSTR lpCalData, int cchData, LPDWORD lpValue) { + static const LCTYPE caltype_lctype_map[] = { + 0, /* not used */ + 0, /* CAL_ICALINTVALUE */ + 0, /* CAL_SCALNAME */ + 0, /* CAL_IYEAROFFSETRANGE */ + 0, /* CAL_SERASTRING */ + LOCALE_SSHORTDATE, + LOCALE_SLONGDATE, + LOCALE_SDAYNAME1, + LOCALE_SDAYNAME2, + LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, + LOCALE_SDAYNAME5, + LOCALE_SDAYNAME6, + LOCALE_SDAYNAME7, + LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, + LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SABBREVDAYNAME7, + LOCALE_SMONTHNAME1, + LOCALE_SMONTHNAME2, + LOCALE_SMONTHNAME3, + LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, + LOCALE_SMONTHNAME6, + LOCALE_SMONTHNAME7, + LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, + LOCALE_SMONTHNAME10, + LOCALE_SMONTHNAME11, + LOCALE_SMONTHNAME12, + LOCALE_SMONTHNAME13, + LOCALE_SABBREVMONTHNAME1, + LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, + LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, + LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, + LOCALE_SABBREVMONTHNAME12, + LOCALE_SABBREVMONTHNAME13, + LOCALE_SYEARMONTH, + 0, /* CAL_ITWODIGITYEARMAX */ +#if (WINVER >= 0x0600) /* ReactOS */ + LOCALE_SSHORTESTDAYNAME1, + LOCALE_SSHORTESTDAYNAME2, + LOCALE_SSHORTESTDAYNAME3, + LOCALE_SSHORTESTDAYNAME4, + LOCALE_SSHORTESTDAYNAME5, + LOCALE_SSHORTESTDAYNAME6, + LOCALE_SSHORTESTDAYNAME7, +#endif + LOCALE_SMONTHDAY, + 0, /* CAL_SABBREVERASTRING */ + }; + DWORD localeflags = 0; + CALTYPE calinfo; + if (CalType & CAL_NOUSEROVERRIDE) FIXME("flag CAL_NOUSEROVERRIDE used, not fully implemented\n"); if (CalType & CAL_USE_CP_ACP) @@ -2219,108 +2468,76 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, /* FIXME: No verification is made yet wrt Locale * for the CALTYPES not requiring GetLocaleInfoA */ - switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { + + calinfo = CalType & 0xffff; + +#ifdef __REACTOS__ + if (CalType & LOCALE_RETURN_GENITIVE_NAMES) +#else + if (CalType & CAL_RETURN_GENITIVE_NAMES) +#endif + localeflags |= LOCALE_RETURN_GENITIVE_NAMES; + + switch (calinfo) { case CAL_ICALINTVALUE: if (CalType & CAL_RETURN_NUMBER) return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER | LOCALE_ICALENDARTYPE, (LPWSTR)lpValue, 2); return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); if (lpCalData) *lpCalData = 0; return 1; case CAL_IYEAROFFSETRANGE: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); return 0; case CAL_SERASTRING: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); return 0; case CAL_SSHORTDATE: - return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); case CAL_SLONGDATE: - return GetLocaleInfoW(Locale, LOCALE_SLONGDATE, lpCalData, cchData); case CAL_SDAYNAME1: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME1, lpCalData, cchData); case CAL_SDAYNAME2: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME2, lpCalData, cchData); case CAL_SDAYNAME3: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME3, lpCalData, cchData); case CAL_SDAYNAME4: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME4, lpCalData, cchData); case CAL_SDAYNAME5: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME5, lpCalData, cchData); case CAL_SDAYNAME6: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME6, lpCalData, cchData); case CAL_SDAYNAME7: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME7, lpCalData, cchData); case CAL_SABBREVDAYNAME1: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME1, lpCalData, cchData); case CAL_SABBREVDAYNAME2: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME2, lpCalData, cchData); case CAL_SABBREVDAYNAME3: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME3, lpCalData, cchData); case CAL_SABBREVDAYNAME4: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME4, lpCalData, cchData); case CAL_SABBREVDAYNAME5: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME5, lpCalData, cchData); case CAL_SABBREVDAYNAME6: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME6, lpCalData, cchData); case CAL_SABBREVDAYNAME7: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME7, lpCalData, cchData); case CAL_SMONTHNAME1: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME1, lpCalData, cchData); case CAL_SMONTHNAME2: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME2, lpCalData, cchData); case CAL_SMONTHNAME3: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME3, lpCalData, cchData); case CAL_SMONTHNAME4: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME4, lpCalData, cchData); case CAL_SMONTHNAME5: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME5, lpCalData, cchData); case CAL_SMONTHNAME6: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME6, lpCalData, cchData); case CAL_SMONTHNAME7: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME7, lpCalData, cchData); case CAL_SMONTHNAME8: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME8, lpCalData, cchData); case CAL_SMONTHNAME9: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME9, lpCalData, cchData); case CAL_SMONTHNAME10: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME10, lpCalData, cchData); case CAL_SMONTHNAME11: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME11, lpCalData, cchData); case CAL_SMONTHNAME12: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME12, lpCalData, cchData); case CAL_SMONTHNAME13: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME13, lpCalData, cchData); case CAL_SABBREVMONTHNAME1: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME1, lpCalData, cchData); case CAL_SABBREVMONTHNAME2: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME2, lpCalData, cchData); case CAL_SABBREVMONTHNAME3: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME3, lpCalData, cchData); case CAL_SABBREVMONTHNAME4: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME4, lpCalData, cchData); case CAL_SABBREVMONTHNAME5: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME5, lpCalData, cchData); case CAL_SABBREVMONTHNAME6: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME6, lpCalData, cchData); case CAL_SABBREVMONTHNAME7: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME7, lpCalData, cchData); case CAL_SABBREVMONTHNAME8: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME8, lpCalData, cchData); case CAL_SABBREVMONTHNAME9: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME9, lpCalData, cchData); case CAL_SABBREVMONTHNAME10: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME10, lpCalData, cchData); case CAL_SABBREVMONTHNAME11: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME11, lpCalData, cchData); case CAL_SABBREVMONTHNAME12: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME12, lpCalData, cchData); case CAL_SABBREVMONTHNAME13: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME13, lpCalData, cchData); case CAL_SYEARMONTH: - return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); + return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) { @@ -2343,7 +2560,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } break; default: - FIXME("Unknown caltype %d\n",CalType & 0xffff); + FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS); return 0; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a383f14231..ddaad4df37 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -282,7 +282,7 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/fold.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-1.7.55 + reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16

1 0

01/01: [KERNEL32/STRING] Sync format_msg.c with Wine Staging 3.3. CORE-14434
by Amine Khaldi 11 Apr '18

11 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaa9d0d12c0ecd08a379a… commit eaa9d0d12c0ecd08a379a8f4289b0a9171bf4bf7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Apr 11 12:47:12 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Apr 11 12:47:12 2018 +0100 [KERNEL32/STRING] Sync format_msg.c with Wine Staging 3.3. CORE-14434 --- dll/win32/kernel32/winnls/string/format_msg.c | 42 ++++++++++++++++++++++++--- media/doc/README.WINE | 2 +- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/format_msg.c b/dll/win32/kernel32/winnls/string/format_msg.c index 389cf1fad8..ff6f083703 100644 --- a/dll/win32/kernel32/winnls/string/format_msg.c +++ b/dll/win32/kernel32/winnls/string/format_msg.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ + #include <k32.h> #define NDEBUG @@ -27,6 +29,30 @@ DEBUG_CHANNEL(resource); extern HMODULE kernel32_handle; +#else /* __REACTOS__ */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winternl.h" +#include "winuser.h" +#include "winnls.h" +#include "wine/unicode.h" +#include "kernel_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(resource); + +#endif /* __REACTOS__ */ + struct format_args { ULONG_PTR *args; @@ -61,17 +87,25 @@ struct format_args */ static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) { +#ifdef __REACTOS__ MESSAGE_RESOURCE_ENTRY *mre; +#else + const MESSAGE_RESOURCE_ENTRY *mre; +#endif WCHAR *buffer; - NTSTATUS Status; + NTSTATUS status; TRACE("module = %p, id = %08x\n", module, id ); if (!module) module = GetModuleHandleW( NULL ); - Status = RtlFindMessage(module, (ULONG_PTR)RT_MESSAGETABLE, lang, id, &mre); - if (!NT_SUCCESS(Status)) +#ifdef __REACTOS__ + status = RtlFindMessage(module, (ULONG_PTR)RT_MESSAGETABLE, lang, id, &mre); + if (!NT_SUCCESS(status)) +#else + if ((status = RtlFindMessage( module, RT_MESSAGETABLE, lang, id, &mre )) != STATUS_SUCCESS) +#endif { - SetLastError(RtlNtStatusToDosError(Status)); + SetLastError( RtlNtStatusToDosError(status) ); return NULL; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c99a0ce3ea..a383f14231 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -280,7 +280,7 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/collation.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/digitmap.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/fold.c # Synced to WineStaging-3.3 - reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-1.7.55 + reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754

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