Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 73043: [EVENTVWR] - Fix FormatMessage flags sanitization. - Use "LANG_USER_DEFAULT" instead of MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) (these are the same, but one is shorter than the ...
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 20:32:11 2016 New Revision: 73043 URL: http://svn.reactos.org/svn/reactos?rev=73043&view=rev Log: [EVENTVWR] - Fix FormatMessage flags sanitization. - Use "LANG_USER_DEFAULT" instead of MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) (these are the same, but one is shorter than the other). - In case LookupAccountSidW fails to retrieve the user name of an associated SID, use ConvertSidToStringSidW to get the SID string directly and display it, instead of claiming there is no associated user for a given event. - In addition to display (in the status bar) the number of events in the selected log, display the number of events actually listed. This can be useful when events filtering will be completely implemented, and it can be also useful for detecting possible corrupted logs where the number of enumerable events is different (less) than the total number of events in the log... ==> To translators: please update the translations! CORE-11637 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -29,9 +29,9 @@ #include "eventvwr.h" #include "evtdetctl.h" +#include <sddl.h> // For ConvertSidToStringSidW #include <shellapi.h> #include <shlwapi.h> -#include <strsafe.h> // #include "resource.h" @@ -306,6 +306,10 @@ if (hLibrary == NULL) return NULL; + /* Sanitize dwFlags */ + dwFlags &= ~FORMAT_MESSAGE_FROM_STRING; + dwFlags |= FORMAT_MESSAGE_FROM_HMODULE; + _SEH2_TRY { /* @@ -319,7 +323,7 @@ FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, */ hLibrary, dwMessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + LANG_USER_DEFAULT, (LPWSTR)&lpMsgBuf, nSize, Arguments); @@ -350,10 +354,10 @@ dwLength = FormatMessageW(dwFlags, hLibrary, dwMessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + LANG_USER_DEFAULT, (LPWSTR)&lpMsgBuf, nSize, - Arguments); + NULL /* Arguments */); } } _SEH2_END; @@ -409,7 +413,7 @@ szDll = wcstok(szMessageDllList, EVENT_DLL_SEPARATOR); while ((szDll != NULL) && !Success) { - // Uses MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT) + // Uses LANG_USER_DEFAULT lpMsgBuf = GetMessageStringFromDll(szDll, dwFlags, dwMessageId, @@ -1261,7 +1265,8 @@ GetEventUserName(IN PEVENTLOGRECORD pelr, OUT PWCHAR pszUser) // TODO: Add IN DWORD BufLen { - PSID lpSid; + PSID pSid; + PWSTR StringSid; WCHAR szName[1024]; WCHAR szDomain[1024]; SID_NAME_USE peUse; @@ -1269,13 +1274,19 @@ DWORD cchDomain = ARRAYSIZE(szDomain); /* Point to the SID */ - lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); + pSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); /* User SID */ if (pelr->UserSidLength > 0) { + /* + * Try to retrieve the user account name and domain name corresponding + * to the SID. If it cannot be retrieved, try to convert the SID to a + * string-form. It should not be bigger than the user-provided buffer + * 'pszUser', otherwise we return an error. + */ if (LookupAccountSidW(NULL, // FIXME: Use computer name? From the particular event? - lpSid, + pSid, szName, &cchName, szDomain, @@ -1284,6 +1295,27 @@ { StringCchCopyW(pszUser, MAX_PATH, szName); return TRUE; + } + else if (ConvertSidToStringSidW(pSid, &StringSid)) + { + BOOL Success; + + /* Copy the string only if the user-provided buffer is small enough */ + if (wcslen(StringSid) + 1 <= MAX_PATH) // + 1 for NULL-terminator + { + StringCchCopyW(pszUser, MAX_PATH, StringSid); + Success = TRUE; + } + else + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + Success = FALSE; + } + + /* Free the allocated buffer */ + LocalFree(StringSid); + + return Success; } } @@ -1672,7 +1704,8 @@ sizeof(szStatusText), szStatusBarTemplate, EventLog->LogName, - dwTotalRecords); + dwTotalRecords, + ListView_GetItemCount(hwndListView)); } else { Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -131,7 +131,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ñ" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸ÑÑÐ°. ÐÐ¾ÑÐ°ÐºÐ°Ð¹ÑÐµ..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -131,7 +131,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ProhlÃÅ¾eÄ udÃ¡lostÃ" IDS_APP_TITLE_EX "%s - Protkol %s na \\\\" - IDS_STATUS_MSG "PoÄet udÃ¡lostÃ v protokolu %s: %lu" + IDS_STATUS_MSG "PoÄet udÃ¡lostÃ v protokolu %s: %lu (listed: %lu)" IDS_LOADING_WAIT "NaÄÃtÃ¡m protokol udÃ¡lostÃ. ProsÃm Äekejte..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Ereignisanzeige" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Ereignis-Protokolle werden geladen. Bitte warten..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Event Viewer" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "ÎÎ¯Î½ÎµÏÎ±Î¹ ÏÏÏÏÏÏÎ· ÏÏÎ½ Logs ÏÏÎ¼Î²Î¬Î½ÏÏÎ½. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -139,7 +139,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Event Viewer" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Loading Event Logs. Please wait..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Visor de eventos" IDS_APP_TITLE_EX "%s - Registro de %s en \\\\" - IDS_STATUS_MSG "%s tiene %lu evento(s)" + IDS_STATUS_MSG "%s tiene %lu evento(s) (listed: %lu)" IDS_LOADING_WAIT "Recuperando eventos. Espere un momento..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Visionneuse d'Ã©vÃ©nements" IDS_APP_TITLE_EX "%s - Journal %s sur \\\\" - IDS_STATUS_MSG "%s contient %lu Ã©vÃ©nement(s)" + IDS_STATUS_MSG "%s contient %lu Ã©vÃ©nement(s) (listÃ©s : %lu)" IDS_LOADING_WAIT "Chargement des journaux d'Ã©vÃ©nements. Veuillez patienter..." IDS_NO_ITEMS "Aucun Ã©lÃ©ment Ã afficher dans cet aperÃ§u." // "No events in this log." IDS_EVENTLOG_SYSTEM "Journaux systÃ¨me" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "×××× ××××¨××¢××" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "×××¢× ×××× × ×××¨××¢××, × × ××××ª××..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Visualizzatore eventi" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Caricamento eventi in corso. Attendere..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ã¤ãã³ã ãã¥ã¼ã¢" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "ã¤ãã³ã ãã°ãèªã¿è¾¼ãã§ãã¾ãã ãå¾ã¡ãã ãã..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ì´ë²¤í¸ ë·°ì´" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "ì´ë²¤í¸ ë¡ê·¸ ë¡ë©ì¤. ê¸°ë¤ë ¤ì£¼ì¸ì..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -131,7 +131,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Hendelseliste" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Laster Hendelseliste. Venligst vent..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -135,7 +135,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "PodglÄd zdarzeÅ" IDS_APP_TITLE_EX "%s - %s Log na \\\\" - IDS_STATUS_MSG "%s posiada %lu zdarzeÅ" + IDS_STATUS_MSG "%s posiada %lu zdarzeÅ (listed: %lu)" IDS_LOADING_WAIT "Åadowanie logÃ³w zdarzeÅ. ProszÄ czekaÄ..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Visualizador de Eventos" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Carregando Registros de Eventos. Por favor aguarde..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -136,7 +136,7 @@ IDS_COPYRIGHT "Drept de autor (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Observator de evenimente" IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" - IDS_STATUS_MSG "%s are %lu eveniment(e)" + IDS_STATUS_MSG "%s are %lu eveniment(e) (listed: %lu)" IDS_LOADING_WAIT "Se Ã®ncarcÄ jurnalul de evenimentele. AÈteptaÈiâ¦" IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° (Ð¡) 2007 ÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð±ÑÑÐ¸Ð¹" IDS_APP_TITLE_EX "%s - %s Ð¶ÑÑÐ½Ð°Ð» Ð½Ð° \\\\" - IDS_STATUS_MSG "%s ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ %lu ÑÐ¾Ð±ÑÑÐ¸Ðµ (Ð¸Ð¹)" + IDS_STATUS_MSG "%s ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ %lu ÑÐ¾Ð±ÑÑÐ¸Ðµ(Ð¸Ð¹) (listed: %lu)" IDS_LOADING_WAIT "ÐÐ´ÐµÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ°. ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ..." IDS_NO_ITEMS "ÐÐµÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð² Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð² ÑÑÐ¾Ð¼ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¸." // "No events in this log." IDS_EVENTLOG_SYSTEM "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð¶ÑÑÐ½Ð°Ð»" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -136,7 +136,7 @@ IDS_COPYRIGHT "AutorskÃ© prÃ¡va (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ZobrazovaÄ udalostÃ" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "NahrÃ¡vam zÃ¡znamy s udalosÅ¥ami. PoÄkajte, prosÃm..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -139,7 +139,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Shikues ngjarjesh" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Ngarkim loget e ngjarjeve. Ju lutem prisni..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "HÃ¤ndelselogg" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "Laddar in HÃ¤ndelseloggen. VÃ¤nligen vÃ¤nta..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -139,7 +139,7 @@ IDS_COPYRIGHT "Telif HakkÄ±: 2007 - Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "Olay GÃ¶rÃ¼ntÃ¼leyicisi" IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\" - IDS_STATUS_MSG "%s -> %lu olay var." + IDS_STATUS_MSG "%s -> %lu olay var (listed: %lu)" IDS_LOADING_WAIT "Olay kayÄ±tlarÄ± yÃ¼kleniyor. LÃ¼tfen bekleyiniz..." IDS_NO_ITEMS "Bu gÃ¶rÃ¼nÃ¼mde gÃ¶rÃ¼ntÃ¼lenecek bir Ã¶Äe bile yok." // "No events in this log." IDS_EVENTLOG_SYSTEM "Dizge KayÄ±tlarÄ±" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "ÐÐ³Ð»ÑÐ´Ð°Ñ Ð¿Ð¾Ð´ÑÐ¹" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ²ÑÑÑ Ð¿Ð¾Ð´ÑÐ¹. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐµÐºÐ°Ð¹ÑÐµ..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "çæææ (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "äºä»¶æ¥çå¨" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "æ£å¨è½½å¥æ¥å¿ãè¯·ç¨å..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc [iso-8859-1] Wed Oct 26 20:32:11 2016 @@ -133,7 +133,7 @@ IDS_COPYRIGHT "çæ¬ææ (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "äºä»¶æª¢è¦å¨" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" IDS_LOADING_WAIT "æ£å¨è¼å¥æ¥èªã è«ç¨å..." IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." IDS_EVENTLOG_SYSTEM "System Logs"

1 0

[janderwald] 73042: [USBAUDIO] - implement audio volume property handler
by janderwald＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: janderwald Date: Wed Oct 26 18:09:19 2016 New Revision: 73042 URL: http://svn.reactos.org/svn/reactos?rev=73042&view=rev Log: [USBAUDIO] - implement audio volume property handler Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Wed Oct 26 18:09:19 2016 @@ -157,7 +157,6 @@ /* submit urb */ Status = SubmitUrbSync(DeviceObject, Urb); - DPRINT1("UsbAudioGetSetProperty Status %x\n", Status); FreeFunction(Urb); return Status; } @@ -215,12 +214,12 @@ FeatureUnitDescriptor = (PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR)NodeContext->Descriptor; if (Property->NodeProperty.Property.Flags & KSPROPERTY_TYPE_GET) { - Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x81, 0x100, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_IN); + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x81, 0x1 << 8, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_IN); Irp->IoStatus.Information = sizeof(BOOL); } else { - Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x01, 0x100, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_OUT); + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x01, 0x1 << 8, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_OUT); } } } @@ -234,8 +233,85 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - UNIMPLEMENTED - return STATUS_SUCCESS; + PKSNODEPROPERTY_AUDIO_CHANNEL Property; + PKSFILTER Filter; + PFILTER_CONTEXT FilterContext; + PNODE_CONTEXT NodeContext; + PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; + PSHORT TransferBuffer; + LONG Value; + NTSTATUS Status = STATUS_INVALID_PARAMETER; + + + /* get filter from irp */ + Filter = KsGetFilterFromIrp(Irp); + + if (Filter) + { + /* get property */ + Property = (PKSNODEPROPERTY_AUDIO_CHANNEL)Request; + + /* get filter context */ + FilterContext = (PFILTER_CONTEXT)Filter->Context; + + TransferBuffer = AllocFunction(sizeof(USHORT) * 3); + ASSERT(TransferBuffer); + + Value = *(PLONG)Data; + + /* search for node context */ + NodeContext = FindNodeContextWithNode(FilterContext->DeviceExtension->NodeContext, FilterContext->DeviceExtension->NodeContextCount, Property->NodeProperty.NodeId); + if (NodeContext) + { + FeatureUnitDescriptor = (PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR)NodeContext->Descriptor; + if (Property->NodeProperty.Property.Flags & KSPROPERTY_TYPE_GET) + { + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x81, 0x2 << 8, FeatureUnitDescriptor->bUnitID << 8, &TransferBuffer[0], sizeof(USHORT), USBD_TRANSFER_DIRECTION_IN); + Value = (LONG)TransferBuffer[0] * 256; + + *(PLONG)Data = Value; + Irp->IoStatus.Information = sizeof(BOOL); + } + else + { + /* downscale value */ + Value /= 256; + + /* get minimum value */ + UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x82, 0x2 << 8, FeatureUnitDescriptor->bUnitID << 8, &TransferBuffer[0], sizeof(USHORT), USBD_TRANSFER_DIRECTION_IN); + + /* get maximum value */ + UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x83, 0x2 << 8, FeatureUnitDescriptor->bUnitID << 8, &TransferBuffer[1], sizeof(USHORT), USBD_TRANSFER_DIRECTION_IN); + + if (TransferBuffer[0] > Value) + { + /* use minimum value */ + Value = TransferBuffer[0]; + } + + if (TransferBuffer[1] < Value) + { + /* use maximum value */ + Value = TransferBuffer[1]; + } + + /* store value */ + TransferBuffer[2] = Value; + + /* set volume request */ + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x01, 0x2 << 8, FeatureUnitDescriptor->bUnitID << 8, &TransferBuffer[2], sizeof(USHORT), USBD_TRANSFER_DIRECTION_OUT); + if (NT_SUCCESS(Status)) + { + /* store number of bytes transferred*/ + Irp->IoStatus.Information = sizeof(LONG); + } + } + } + + /* free transfer buffer */ + FreeFunction(TransferBuffer); + } + return Status; } Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Wed Oct 26 18:09:19 2016 @@ -88,61 +88,6 @@ *OutUrb = Urb; return STATUS_SUCCESS; -} - -NTSTATUS -UsbAudioSetVolume( - IN PKSPIN Pin) -{ - PURB Urb; - PUCHAR SampleRateBuffer; - PPIN_CONTEXT PinContext; - NTSTATUS Status; - - /* allocate sample rate buffer */ - SampleRateBuffer = AllocFunction(sizeof(ULONG)); - if (!SampleRateBuffer) - { - /* no memory */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* allocate urb */ - Urb = AllocFunction(sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); - if (!Urb) - { - /* no memory */ - FreeFunction(SampleRateBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* FIXME: determine controls and format urb */ - UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_INTERFACE, - sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), - USBD_TRANSFER_DIRECTION_OUT, - 0, - 0x01, - 0x200, - 0x300, - SampleRateBuffer, - NULL, - 2, - NULL); - - /* get pin context */ - PinContext = Pin->Context; - - SampleRateBuffer[0] = 0xC2; - SampleRateBuffer[1] = 0xFE; - - /* submit urb */ - Status = SubmitUrbSync(PinContext->LowerDevice, Urb); - - DPRINT1("UsbAudioSetVolume Pin %p Status %x\n", Pin, Status); - FreeFunction(Urb); - FreeFunction(SampleRateBuffer); - return Status; } NTSTATUS @@ -642,9 +587,6 @@ Status = _KsEdit(Pin->Bag, (PVOID*)&Pin->Descriptor->AllocatorFraming, sizeof(KSALLOCATOR_FRAMING_EX), sizeof(KSALLOCATOR_FRAMING_EX), USBAUDIO_TAG); ASSERT(Status == STATUS_SUCCESS); } - - /* FIXME move to build filter topology*/ - UsbAudioSetVolume(Pin); /* select streaming interface */ Status = USBAudioSelectAudioStreamingInterface(PinContext, PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor); Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Wed Oct 26 18:09:19 2016 @@ -61,8 +61,6 @@ DEFINE_KSPROPERTY_TABLE(TopologySet) {\ DEFINE_KSPROPERTY_ITEM_AUDIO_MUTE(Handler)\ } - - #include <pshpack1.h>

1 0

[cfinck] 73041: My branch has served its purpose. One step closer to freedom!
by cfinck＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: cfinck Date: Wed Oct 26 12:52:01 2016 New Revision: 73041 URL: http://svn.reactos.org/svn/reactos?rev=73041&view=rev Log: My branch has served its purpose. One step closer to freedom! Removed: branches/colins-printing-for-freedom/

1 0

[cfinck] 73040: [LOCALUI] Replace the "localui.dll" from my branch with the newer version in trunk. This is one of the very few (if not the only) printing component that we can continue to sync wit...
by cfinck＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: cfinck Date: Wed Oct 26 12:47:39 2016 New Revision: 73040 URL: http://svn.reactos.org/svn/reactos?rev=73040&view=rev Log: [LOCALUI] Replace the "localui.dll" from my branch with the newer version in trunk. This is one of the very few (if not the only) printing component that we can continue to sync with WINE, because it only uses Win32 API to communicate with the Local Port Monitor (localmon.dll in our implementation). Added: trunk/reactos/win32ss/printing/monitors/localmon/ui/ - copied from r73039, trunk/reactos/dll/win32/localui/ Removed: trunk/reactos/dll/win32/localui/

1 0

[cfinck] 73039: [PRINTING] Finally merge my branch "colins-printing-for-freedom", giving us an initial implementation of a Win32-compatible Printing Stack (localmon, localspl, spoolss, spoolsv, win...
by cfinck＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: cfinck Date: Wed Oct 26 12:37:27 2016 New Revision: 73039 URL: http://svn.reactos.org/svn/reactos?rev=73039&view=rev Log: [PRINTING] Finally merge my branch "colins-printing-for-freedom", giving us an initial implementation of a Win32-compatible Printing Stack (localmon, localspl, spoolss, spoolsv, winspool) You can now send raw data to parallel port printers using documented Win32 API. An example application is in my "winspool_print" commandline tool merged to rosapps. ReactOS folks, thanks for your support during the development of this, making my bachelor's thesis a reality! :) Documentation/Thesis: https://svn.reactos.org/reactos/trunk/documentation/articles/Printing%20Sta… Video: https://www.youtube.com/watch?v=cNzePucTOLY CORE-10489 Added: trunk/reactos/sdk/include/psdk/winspool.h - copied unchanged from r73027, branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h trunk/reactos/sdk/include/reactos/idl/winspool.idl - copied unchanged from r73027, branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl trunk/reactos/sdk/lib/skiplist/ - copied from r73027, branches/colins-printing-for-freedom/reactos/lib/skiplist/ trunk/reactos/win32ss/printing/ - copied from r73027, branches/colins-printing-for-freedom/reactos/win32ss/printing/ trunk/rosapps/applications/cmdutils/winspool_print/ - copied from r73027, branches/colins-printing-for-freedom/reactos/temp/winspool_print/ trunk/rostests/apitests/localspl/ - copied from r73027, branches/colins-printing-for-freedom/rostests/apitests/localspl/ trunk/rostests/apitests/spoolss/ - copied from r73027, branches/colins-printing-for-freedom/rostests/apitests/spoolss/ trunk/rostests/apitests/winprint/ - copied from r73027, branches/colins-printing-for-freedom/rostests/apitests/winprint/ trunk/rostests/apitests/winspool/ - copied from r73027, branches/colins-printing-for-freedom/rostests/apitests/winspool/ Removed: trunk/reactos/base/services/spoolsv/ trunk/reactos/dll/win32/localspl/ trunk/reactos/dll/win32/ntprint/ trunk/reactos/dll/win32/spoolss/ trunk/reactos/dll/win32/winspool/ Modified: trunk/ (props changed) trunk/reactos/ (props changed) trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/sdk/lib/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt trunk/reactos/win32ss/printing/monitors/localmon/ui/CMakeLists.txt trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rostests/ (props changed) trunk/rostests/apitests/CMakeLists.txt trunk/rostests/winetests/CMakeLists.txt Propchange: trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Oct 26 12:37:27 2016 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 12:37:27 2016 @@ -4,6 +4,7 @@ /branches/GSoC_2016/USB:72366,72376 /branches/GSoC_Network:51545-51546 /branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/colins-printing-for-freedom/reactos:67543-68405,68407-68414,68417-70595 /branches/condrv_restructure:63104-65657 /branches/header-work:45691-47721 /branches/kd++:58883-58973 Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -4,7 +4,6 @@ add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(schedsvc) -add_subdirectory(spoolsv) add_subdirectory(srvsvc) add_subdirectory(svchost) add_subdirectory(tcpsvcs) Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -1252,13 +1252,37 @@ HKLM,"SYSTEM\CurrentControlSet\Control\PnP\Pci\CardList","Ali",0x00030003,\ 01,00,00,00,b9,10,21,15,00,00,00,00,00,00,00,00 + +; Printing HKLM,"SYSTEM\CurrentControlSet\Control\Print","MajorVersion",0x00010001,2 -HKLM,"SYSTEM\CurrentControlSet\Control\Print","MinorVersion",0x00010003,0 -HKLM,"SYSTEM\CurrentControlSet\Control\Print","PriorityClass",0x00010003,0 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",2,"localspl.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Print","MinorVersion",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Control\Print","PriorityClass",0x00010001,0 + +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86","Directory",,"W32X86" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86\Print Processors",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Environments\Windows NT x86\Print Processors\winprint","Driver",,"winprint.dll" + +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port","Driver",,"localmon.dll" + HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Attributes",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Datatype",,"RAW" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Description",,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Default DevMode",1,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,dc,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Port",,"LPT1:" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Print Processor",,"winprint" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Printer Driver",,"Dummy Printer Driver" +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Printers\Dummy Printer On LPT1","Status",0x00010001,0 + +HKLM,"SYSTEM\CurrentControlSet\Control\Print\Providers",,0x00000010 + HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"ServerNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"Terminal Server" Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -72,8 +72,6 @@ add_subdirectory(kernel32) add_subdirectory(kernel32_vista) add_subdirectory(loadperf) -add_subdirectory(localspl) -add_subdirectory(localui) add_subdirectory(lpk) add_subdirectory(lsasrv) add_subdirectory(lz32) @@ -139,7 +137,6 @@ add_subdirectory(ntdsapi) add_subdirectory(ntlanman) add_subdirectory(ntmarta) -add_subdirectory(ntprint) add_subdirectory(objsel) add_subdirectory(odbc32) add_subdirectory(odbccp32) @@ -194,7 +191,6 @@ add_subdirectory(sndblst) add_subdirectory(snmpapi) add_subdirectory(softpub) -add_subdirectory(spoolss) add_subdirectory(srclient) add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) @@ -238,7 +234,6 @@ add_subdirectory(wininet) add_subdirectory(winmm) add_subdirectory(winscard) -add_subdirectory(winspool) add_subdirectory(winsta) add_subdirectory(wintrust) add_subdirectory(wlanapi) Modified: trunk/reactos/sdk/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -42,6 +42,7 @@ add_subdirectory(rtl) add_subdirectory(scrnsave) +add_subdirectory(skiplist) add_subdirectory(strmiids) add_subdirectory(smlib) add_subdirectory(tdilib) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -16,6 +16,7 @@ endif() add_subdirectory(gdi/gdi32) +add_subdirectory(printing) add_subdirectory(reactx) add_subdirectory(user/user32) add_subdirectory(user/winsrv) Modified: trunk/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -1,6 +1,6 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) -add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/winspool.idl) list(APPEND SOURCE forms.c Modified: trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -1,6 +1,6 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) -add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/winspool.idl) spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/win32ss/printing/monitors/localmon/ui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/ui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/ui/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(localui.dll localui.spec) list(APPEND SOURCE Modified: trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -1,7 +1,7 @@ spec2def(localspl.dll localspl.spec ADD_IMPORTLIB) -include_directories(${REACTOS_SOURCE_DIR}/lib/skiplist) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/skiplist) list(APPEND SOURCE jobs.c Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -5,4 +5,5 @@ add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) +add_subdirectory(winspool_print) add_subdirectory(y) Propchange: trunk/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 12:37:27 2016 @@ -1,2 +1,3 @@ /branches/GSoC_2011/KMTestSuite:51165-53670 +/branches/colins-printing-for-freedom/rostests:67543-68405,68417-70595 /branches/ros-amd64-bringup/rostests:44459,44462,44537 Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -15,6 +15,7 @@ if(NOT ARCH STREQUAL "amd64") add_subdirectory(kernel32) endif() +add_subdirectory(localspl) add_subdirectory(msgina) add_subdirectory(msvcrt) add_subdirectory(ntdll) @@ -24,6 +25,7 @@ add_subdirectory(sdk) add_subdirectory(setupapi) add_subdirectory(shell32) +add_subdirectory(spoolss) add_subdirectory(psapi) add_subdirectory(user32) add_subdirectory(user32_dynamic) @@ -33,4 +35,6 @@ endif() add_subdirectory(winhttp) add_subdirectory(wininet) +add_subdirectory(winprint) +add_subdirectory(winspool) add_subdirectory(ws2_32) Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Oct 26 12:37:27 2016 @@ -112,7 +112,7 @@ add_subdirectory(winhttp) add_subdirectory(wininet) add_subdirectory(winmm) -add_subdirectory(winspool) +#add_subdirectory(winspool) add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32)

1 0

[khornicek] 73038: [WIN32K] - fix a typo in the default logical palette copy - fix color table computation for 8 bpp in GreGetDIBitsInternal (formula taken from gdi32:bitmap winetest)
by khornicek＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: khornicek Date: Wed Oct 26 10:21:46 2016 New Revision: 73038 URL: http://svn.reactos.org/svn/reactos?rev=73038&view=rev Log: [WIN32K] - fix a typo in the default logical palette copy - fix color table computation for 8 bpp in GreGetDIBitsInternal (formula taken from gdi32:bitmap winetest) Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Oct 26 10:21:46 2016 @@ -48,7 +48,7 @@ { 0xf0, 0xfb, 0xff, 0x00 }, { 0xa4, 0xa0, 0xa0, 0x00 }, { 0x80, 0x80, 0x80, 0x00 }, - { 0x00, 0x00, 0xf0, 0x00 }, + { 0x00, 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0x00, 0x00 }, { 0x00, 0xff, 0xff, 0x00 }, { 0xff, 0x00, 0x00, 0x00 }, @@ -794,8 +794,8 @@ case 8: Info->bmiHeader.biClrUsed = 0; - /* If the bitmap if a DIB section and has the same format than what - * we're asked, go ahead! */ + /* If the bitmap is a DIB section and has the same format as what + * is requested, go ahead! */ if((psurf->hSecure) && (BitsPerFormat(psurf->SurfObj.iBitmapFormat) == bpp)) { @@ -863,26 +863,17 @@ case 8: { - INT r, g, b; - RGBQUAD *color; - memcpy(rgbQuads, DefLogPaletteQuads, - 10 * sizeof(RGBQUAD)); - memcpy(rgbQuads + 246, DefLogPaletteQuads + 10, - 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; - for(r = 0; r <= 5; r++) /* FIXME */ + INT i; + + memcpy(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); + memcpy(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); + + for (i = 10; i < 246; i++) { - for(g = 0; g <= 5; g++) - { - for(b = 0; b <= 5; b++) - { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } + rgbQuads[i].rgbRed = (i & 0x07) << 5; + rgbQuads[i].rgbGreen = (i & 0x38) << 2; + rgbQuads[i].rgbBlue = i & 0xc0; + rgbQuads[i].rgbReserved = 0; } } }

1 0

[zguo] 73037: [0.4.3] Branch in preparation of 0.4.3 release.
by zguo＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: zguo Date: Wed Oct 26 02:26:31 2016 New Revision: 73037 URL: http://svn.reactos.org/svn/reactos?rev=73037&view=rev Log: [0.4.3] Branch in preparation of 0.4.3 release. Added: branches/ros-branch-0_4_3/ - copied from r73036, trunk/

1 0

[hbelusca] 73036: And the usual thing... "fix build".
by hbelusca＠svn.reactos.org 25 Oct '16

25 Oct '16

Author: hbelusca Date: Tue Oct 25 23:57:35 2016 New Revision: 73036 URL: http://svn.reactos.org/svn/reactos?rev=73036&view=rev Log: And the usual thing... "fix build". Modified: trunk/reactos/sdk/lib/CMakeLists.txt Modified: trunk/reactos/sdk/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] Tue Oct 25 23:57:35 2016 @@ -22,6 +22,7 @@ add_subdirectory(drivers) add_subdirectory(dxguid) add_subdirectory(epsapi) +add_subdirectory(evtlib) add_subdirectory(fast486) add_subdirectory(fslib)

1 0

[hbelusca] 73035: [EVTLIB]: Create a EvtLib library for manipulating the event log file format from anywhere. [EVENTLOG]: Make usage of this library. CORE-11868 #resolve #comment Committed in r7303...
by hbelusca＠svn.reactos.org 25 Oct '16

25 Oct '16

Author: hbelusca Date: Tue Oct 25 23:50:31 2016 New Revision: 73035 URL: http://svn.reactos.org/svn/reactos?rev=73035&view=rev Log: [EVTLIB]: Create a EvtLib library for manipulating the event log file format from anywhere. [EVENTLOG]: Make usage of this library. CORE-11868 #resolve #comment Committed in r73035. [EVENTLOG]: Protect the global handle table with a lock as it seems to me that this needs serialization. Please notify me if you think this is not actually necessary (and I'll revert that in case). Added: trunk/reactos/sdk/lib/evtlib/ trunk/reactos/sdk/lib/evtlib/CMakeLists.txt (with props) trunk/reactos/sdk/lib/evtlib/evtlib.c - copied, changed from r73034, trunk/reactos/base/services/eventlog/file.c trunk/reactos/sdk/lib/evtlib/evtlib.h - copied, changed from r73034, trunk/reactos/base/services/eventlog/eventlog.h Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… Added: trunk/reactos/sdk/lib/evtlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/evtlib/CMakeLists.… Copied: trunk/reactos/sdk/lib/evtlib/evtlib.c (from r73034, trunk/reactos/base/services/eventlog/file.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/evtlib/evtlib.c?p2… Copied: trunk/reactos/sdk/lib/evtlib/evtlib.h (from r73034, trunk/reactos/base/services/eventlog/eventlog.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/evtlib/evtlib.h?p2…

1 0

[hbelusca] 73034: [EVENTLOG] - Update code source files headers. - Use explicit unicode functions for RegOpen/Query/SetXXX and safe-string APIs. - Use GetSystemWindowsDirectoryW where needed instea...
by hbelusca＠svn.reactos.org 25 Oct '16

25 Oct '16

Author: hbelusca Date: Tue Oct 25 23:32:20 2016 New Revision: 73034 URL: http://svn.reactos.org/svn/reactos?rev=73034&view=rev Log: [EVENTLOG] - Update code source files headers. - Use explicit unicode functions for RegOpen/Query/SetXXX and safe-string APIs. - Use GetSystemWindowsDirectoryW where needed instead of GetWindowsDirectoryW (TS-safe). - Fix some variable names & types. - Improve some DPRINTs. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/eventsource.c trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,17 +1,16 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/eventlog.c - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2002 Eric Kohl - * Copyright 2005 Saveliy Tretiakov - * Hermes Belusca-Maito + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/eventlog.c + * PURPOSE: Event logging service + * COPYRIGHT: Copyright 2002 Eric Kohl + * Copyright 2005 Saveliy Tretiakov + * Hermes Belusca-Maito */ /* INCLUDES *****************************************************************/ #include "eventlog.h" - #include <stdio.h> #include <netevent.h> @@ -200,20 +199,20 @@ cchRemain++; /* Read 'CurrentType' from the registry and write it into the buffer */ - lResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", - 0, - KEY_QUERY_VALUE, - &hKey); + lResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, + KEY_QUERY_VALUE, + &hKey); if (lResult == ERROR_SUCCESS) { dwValueLength = cchRemain; - lResult = RegQueryValueEx(hKey, - L"CurrentType", - NULL, - &dwType, - (LPBYTE)str, - &dwValueLength); + lResult = RegQueryValueExW(hKey, + L"CurrentType", + NULL, + &dwType, + (LPBYTE)str, + &dwValueLength); RegCloseKey(hKey); } @@ -289,7 +288,7 @@ ULONG ulMaxSize, ulRetention; NTSTATUS Status; - DPRINT("LoadLogFile: %S\n", LogName); + DPRINT("LoadLogFile: `%S'\n", LogName); Result = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxValueLen, NULL, NULL); @@ -346,7 +345,7 @@ ValueLen); if (Result != ERROR_SUCCESS) { - DPRINT1("RegSetValueEx failed: %lu\n", Result); + DPRINT1("RegSetValueExW failed: %lu\n", Result); HeapFree(GetProcessHeap(), 0, Buf); return NULL; } @@ -431,8 +430,8 @@ { LONG Result; DWORD MaxLognameLen, LognameLen; + DWORD dwIndex; PWSTR Buf = NULL; - DWORD dwIndex; PLOGFILE pLogFile; Result = RegQueryInfoKeyW(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, @@ -464,7 +463,7 @@ DPRINT("%S\n", Buf); - Result = RegOpenKeyEx(eventlogKey, Buf, 0, KEY_ALL_ACCESS, &SubKey); + Result = RegOpenKeyExW(eventlogKey, Buf, 0, KEY_ALL_ACCESS, &SubKey); if (Result != ERROR_SUCCESS) { DPRINT1("Failed to open %S key.\n", Buf); @@ -496,15 +495,15 @@ int wmain(int argc, WCHAR* argv[]) { - WCHAR LogPath[MAX_PATH]; INT RetCode = 0; LONG Result; HKEY elogKey; + WCHAR LogPath[MAX_PATH]; LogfListInitialize(); InitEventSourceList(); - GetWindowsDirectoryW(LogPath, MAX_PATH); + GetSystemWindowsDirectoryW(LogPath, ARRAYSIZE(LogPath)); if (GetDriveTypeW(LogPath) == DRIVE_CDROM) { @@ -513,12 +512,11 @@ } else { - Result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\EventLog", - 0, - KEY_ALL_ACCESS, - &elogKey); - + Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\EventLog", + 0, + KEY_ALL_ACCESS, + &elogKey); if (Result != ERROR_SUCCESS) { DPRINT1("Fatal error: cannot open eventlog registry key.\n"); @@ -532,7 +530,7 @@ EventLogSource = GetEventSourceByName(L"EventLog"); if (!EventLogSource) { - DPRINT1("No EventLog source available, the EventLog service will not be able to log its own events.\n"); + DPRINT1("The 'EventLog' source is unavailable. The EventLog service will not be able to log its own events.\n"); } StartServiceCtrlDispatcher(ServiceTable); Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/eventlog.h - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2005 Saveliy Tretiakov + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/eventlog.h + * PURPOSE: Precompiled Header for the Event logging service + * COPYRIGHT: Copyright 2005 Saveliy Tretiakov */ #ifndef __EVENTLOG_H__ @@ -145,13 +145,9 @@ /* file.c */ VOID LogfListInitialize(VOID); - DWORD LogfListItemCount(VOID); - PLOGFILE LogfListItemByIndex(DWORD Index); - PLOGFILE LogfListItemByName(LPCWSTR Name); - // DWORD LogfListItemIndexByName(WCHAR * Name); @@ -195,19 +191,19 @@ VOID LogfCloseAll(VOID); PEVENTLOGRECORD -LogfAllocAndBuildNewRecord(PULONG lpRecSize, - ULONG Time, - USHORT wType, - USHORT wCategory, - ULONG dwEventId, - PCWSTR SourceName, - PCWSTR ComputerName, - ULONG dwSidLength, - PSID lpUserSid, - USHORT wNumStrings, - PWSTR lpStrings, - ULONG dwDataSize, - PVOID lpRawData); +LogfAllocAndBuildNewRecord(PSIZE_T pRecSize, + ULONG Time, + USHORT wType, + USHORT wCategory, + ULONG dwEventId, + PCWSTR SourceName, + PCWSTR ComputerName, + ULONG dwSidLength, + PSID pUserSid, + USHORT wNumStrings, + PWSTR pStrings, + ULONG dwDataSize, + PVOID pRawData); static __inline void LogfFreeRecord(PEVENTLOGRECORD Record) { @@ -219,9 +215,9 @@ USHORT wCategory, ULONG dwEventId, USHORT wNumStrings, - PWSTR lpStrings, + PWSTR pStrings, ULONG dwDataSize, - PVOID lpRawData); + PVOID pRawData); /* logport.c */ Modified: trunk/reactos/base/services/eventlog/eventsource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventsource.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventsource.c [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/eventsource.c - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2011 Eric Kohl + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/eventsource.c + * PURPOSE: Event log sources support + * COPYRIGHT: Copyright 2011 Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -176,15 +176,15 @@ } /* Save the list of sources in the registry */ - Result = RegSetValueEx(hKey, - L"Sources", - 0, - REG_MULTI_SZ, - (LPBYTE)SourceList, - (MaxValueLen - cchRemaining + 1) * sizeof(WCHAR)); + Result = RegSetValueExW(hKey, + L"Sources", + 0, + REG_MULTI_SZ, + (LPBYTE)SourceList, + (MaxValueLen - cchRemaining + 1) * sizeof(WCHAR)); if (Result != ERROR_SUCCESS) { - DPRINT1("RegSetValueEx failed: %lu\n", Result); + DPRINT1("RegSetValueExW failed: %lu\n", Result); } if (SourceList) Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,17 +1,16 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/file.c - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2005 Saveliy Tretiakov - * Michael Martin - * Hermes Belusca-Maito + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/file.c + * PURPOSE: Event log file support wrappers + * COPYRIGHT: Copyright 2005 Saveliy Tretiakov + * Michael Martin + * Hermes Belusca-Maito */ /* INCLUDES ******************************************************************/ #include "eventlog.h" - #include <ndk/iofuncs.h> #include <ndk/kefuncs.h> @@ -1086,7 +1085,7 @@ } if (LogName) - StringCchCopy(pLogFile->LogName, LogNameLen, LogName); + StringCchCopyW(pLogFile->LogName, LogNameLen, LogName); pLogFile->FileName = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -1099,9 +1098,9 @@ goto Quit; } - StringCchCopy(pLogFile->FileName, - /*wcslen(FileName->Buffer) + 1*/ (FileName->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR), - FileName->Buffer); + StringCchCopyW(pLogFile->FileName, + /*wcslen(FileName->Buffer) + 1*/ (FileName->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR), + FileName->Buffer); pLogFile->OffsetInfo = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2128,57 +2127,57 @@ PEVENTLOGRECORD -LogfAllocAndBuildNewRecord(PULONG lpRecSize, - ULONG Time, - USHORT wType, - USHORT wCategory, - ULONG dwEventId, - PCWSTR SourceName, - PCWSTR ComputerName, - ULONG dwSidLength, - PSID lpUserSid, - USHORT wNumStrings, - PWSTR lpStrings, - ULONG dwDataSize, - PVOID lpRawData) -{ - DWORD dwRecSize; +LogfAllocAndBuildNewRecord(PSIZE_T pRecSize, + ULONG Time, + USHORT wType, + USHORT wCategory, + ULONG dwEventId, + PCWSTR SourceName, + PCWSTR ComputerName, + ULONG dwSidLength, + PSID pUserSid, + USHORT wNumStrings, + PWSTR pStrings, + ULONG dwDataSize, + PVOID pRawData) +{ + SIZE_T RecSize; + PBYTE Buffer; PEVENTLOGRECORD pRec; PWSTR str; UINT i, pos; SIZE_T SourceNameLen, ComputerNameLen, StringLen; - PBYTE Buffer; SourceNameLen = (SourceName ? wcslen(SourceName) : 0) + 1; ComputerNameLen = (ComputerName ? wcslen(ComputerName) : 0) + 1; - dwRecSize = sizeof(EVENTLOGRECORD) + (SourceNameLen + ComputerNameLen) * sizeof(WCHAR); + RecSize = sizeof(EVENTLOGRECORD) + (SourceNameLen + ComputerNameLen) * sizeof(WCHAR); /* Align on DWORD boundary for the SID */ - dwRecSize = ROUND_UP(dwRecSize, sizeof(ULONG)); - - dwRecSize += dwSidLength; + RecSize = ROUND_UP(RecSize, sizeof(ULONG)); + + RecSize += dwSidLength; /* Add the sizes for the strings array */ - ASSERT((lpStrings == NULL && wNumStrings == 0) || - (lpStrings != NULL && wNumStrings >= 0)); - for (i = 0, str = lpStrings; i < wNumStrings; i++) + ASSERT((pStrings == NULL && wNumStrings == 0) || + (pStrings != NULL && wNumStrings >= 0)); + for (i = 0, str = pStrings; i < wNumStrings; i++) { StringLen = wcslen(str) + 1; // str must be != NULL - dwRecSize += StringLen * sizeof(WCHAR); + RecSize += StringLen * sizeof(WCHAR); str += StringLen; } /* Add the data size */ - dwRecSize += dwDataSize; + RecSize += dwDataSize; /* Align on DWORD boundary for the full structure */ - dwRecSize = ROUND_UP(dwRecSize, sizeof(ULONG)); + RecSize = ROUND_UP(RecSize, sizeof(ULONG)); /* Size of the trailing 'Length' member */ - dwRecSize += sizeof(ULONG); - - Buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRecSize); + RecSize += sizeof(ULONG); + + Buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, RecSize); if (!Buffer) { DPRINT1("Cannot allocate heap!\n"); @@ -2186,7 +2185,7 @@ } pRec = (PEVENTLOGRECORD)Buffer; - pRec->Length = dwRecSize; + pRec->Length = RecSize; pRec->Reserved = LOGFILE_SIGNATURE; /* @@ -2211,10 +2210,10 @@ pos = sizeof(EVENTLOGRECORD); if (SourceName) - StringCchCopy((PWSTR)(Buffer + pos), SourceNameLen, SourceName); + StringCchCopyW((PWSTR)(Buffer + pos), SourceNameLen, SourceName); pos += SourceNameLen * sizeof(WCHAR); if (ComputerName) - StringCchCopy((PWSTR)(Buffer + pos), ComputerNameLen, ComputerName); + StringCchCopyW((PWSTR)(Buffer + pos), ComputerNameLen, ComputerName); pos += ComputerNameLen * sizeof(WCHAR); /* Align on DWORD boundary for the SID */ @@ -2224,17 +2223,17 @@ pRec->UserSidOffset = 0; if (dwSidLength) { - RtlCopyMemory(Buffer + pos, lpUserSid, dwSidLength); + RtlCopyMemory(Buffer + pos, pUserSid, dwSidLength); pRec->UserSidLength = dwSidLength; pRec->UserSidOffset = pos; pos += dwSidLength; } pRec->StringOffset = pos; - for (i = 0, str = lpStrings; i < wNumStrings; i++) + for (i = 0, str = pStrings; i < wNumStrings; i++) { StringLen = wcslen(str) + 1; // str must be != NULL - StringCchCopy((PWSTR)(Buffer + pos), StringLen, str); + StringCchCopyW((PWSTR)(Buffer + pos), StringLen, str); str += StringLen; pos += StringLen * sizeof(WCHAR); } @@ -2244,7 +2243,7 @@ pRec->DataOffset = 0; if (dwDataSize) { - RtlCopyMemory(Buffer + pos, lpRawData, dwDataSize); + RtlCopyMemory(Buffer + pos, pRawData, dwDataSize); pRec->DataLength = dwDataSize; pRec->DataOffset = pos; pos += dwDataSize; @@ -2254,9 +2253,9 @@ pos = ROUND_UP(pos, sizeof(ULONG)); /* Initialize the trailing 'Length' member */ - *((PDWORD) (Buffer + pos)) = dwRecSize; - - *lpRecSize = dwRecSize; + *((PDWORD)(Buffer + pos)) = RecSize; + + *pRecSize = RecSize; return pRec; } @@ -2265,17 +2264,17 @@ USHORT wCategory, ULONG dwEventId, USHORT wNumStrings, - PWSTR lpStrings, + PWSTR pStrings, ULONG dwDataSize, - PVOID lpRawData) + PVOID pRawData) { NTSTATUS Status; WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwComputerNameLength = MAX_COMPUTERNAME_LENGTH + 1; - PEVENTLOGRECORD logBuffer; + PEVENTLOGRECORD LogBuffer; LARGE_INTEGER SystemTime; ULONG Time; - DWORD recSize; + SIZE_T RecSize; if (!EventLogSource) return; @@ -2288,7 +2287,7 @@ NtQuerySystemTime(&SystemTime); RtlTimeToSecondsSince1970(&SystemTime, &Time); - logBuffer = LogfAllocAndBuildNewRecord(&recSize, + LogBuffer = LogfAllocAndBuildNewRecord(&RecSize, Time, wType, wCategory, @@ -2298,16 +2297,16 @@ 0, NULL, wNumStrings, - lpStrings, + pStrings, dwDataSize, - lpRawData); - - Status = LogfWriteRecord(EventLogSource->LogFile, recSize, logBuffer); + pRawData); + + Status = LogfWriteRecord(EventLogSource->LogFile, RecSize, LogBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("ERROR WRITING TO EventLog %S (Status 0x%08lx)\n", - EventLogSource->LogFile->FileName, Status); - } - - LogfFreeRecord(logBuffer); + DPRINT1("ERROR writing to event log `%S' (Status 0x%08lx)\n", + EventLogSource->LogFile->LogName, Status); + } + + LogfFreeRecord(LogBuffer); } Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,16 +1,15 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/logport.c - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2002 Eric Kohl - * Copyright 2005 Saveliy Tretiakov + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/logport.c + * PURPOSE: LPC Port Interface support + * COPYRIGHT: Copyright 2002 Eric Kohl + * Copyright 2005 Saveliy Tretiakov */ /* INCLUDES *****************************************************************/ #include "eventlog.h" - #include <ndk/lpcfuncs.h> #define NDEBUG @@ -46,10 +45,10 @@ NTSTATUS InitLogPort(VOID) { + NTSTATUS Status; + UNICODE_STRING PortName; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PortName; PORT_MESSAGE Request; - NTSTATUS Status; ConnectPortHandle = NULL; MessagePortHandle = NULL; @@ -105,12 +104,12 @@ NTSTATUS ProcessPortMessage(VOID) { + NTSTATUS Status; IO_ERROR_LPC Request; PIO_ERROR_LOG_MESSAGE Message; ULONG Time; PEVENTLOGRECORD pRec; - DWORD dwRecSize; - NTSTATUS Status; + SIZE_T RecSize; PLOGFILE SystemLog = NULL; WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwComputerNameLength = MAX_COMPUTERNAME_LENGTH + 1; @@ -160,7 +159,7 @@ // TODO: Log more information?? pRec = LogfAllocAndBuildNewRecord( - &dwRecSize, + &RecSize, Time, Message->Type, Message->EntryData.EventCategory, @@ -180,7 +179,7 @@ return STATUS_NO_MEMORY; } - DPRINT("dwRecSize = %d\n", dwRecSize); + DPRINT("RecSize = %d\n", RecSize); DPRINT("\n --- EVENTLOG RECORD ---\n"); PRINT_RECORD(pRec); @@ -188,10 +187,10 @@ if (!onLiveCD && SystemLog) { - Status = LogfWriteRecord(SystemLog, dwRecSize, pRec); + Status = LogfWriteRecord(SystemLog, RecSize, pRec); if (!NT_SUCCESS(Status)) { - DPRINT1("ERROR WRITING TO EventLog %S (Status 0x%08lx)\n", + DPRINT1("ERROR writing to event log `%S' (Status 0x%08lx)\n", SystemLog->FileName, Status); } } Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Tue Oct 25 23:32:20 2016 @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/services/eventlog/rpc.c - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2005 Saveliy Tretiakov - * Copyright 2008 Michael Martin - * Copyright 2010-2011 Eric Kohl + * PROJECT: ReactOS EventLog Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/eventlog/rpc.c + * PURPOSE: RPC Port Interface support + * COPYRIGHT: Copyright 2005 Saveliy Tretiakov + * Copyright 2008 Michael Martin + * Copyright 2010-2011 Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -55,26 +55,26 @@ BOOLEAN Create) { NTSTATUS Status = STATUS_SUCCESS; - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; PLOGFILE currentLogFile = NULL; DWORD i, LogsActive; PEVENTSOURCE pEventSource; - DPRINT("ElfCreateEventLogHandle(Name: %wZ)\n", LogName); + DPRINT("ElfCreateEventLogHandle(%wZ)\n", LogName); *LogHandle = NULL; i = (LogName->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); - lpLogHandle = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - FIELD_OFFSET(LOGHANDLE, szName[i])); - if (!lpLogHandle) + pLogHandle = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + FIELD_OFFSET(LOGHANDLE, szName[i])); + if (!pLogHandle) { DPRINT1("Failed to allocate Heap!\n"); return STATUS_NO_MEMORY; } - StringCchCopy(lpLogHandle->szName, i, LogName->Buffer); + StringCchCopyW(pLogHandle->szName, i, LogName->Buffer); /* Get the number of Log Files the EventLog service found */ // NOTE: We could just as well loop only once within the list of logs @@ -95,19 +95,19 @@ if (pEventSource) { DPRINT("EventSource LogFile: %p\n", pEventSource->LogFile); - lpLogHandle->LogFile = pEventSource->LogFile; + pLogHandle->LogFile = pEventSource->LogFile; } else { DPRINT("EventSource LogFile: Application log file\n"); - lpLogHandle->LogFile = LogfListItemByName(L"Application"); + pLogHandle->LogFile = LogfListItemByName(L"Application"); } - DPRINT("LogHandle LogFile: %p\n", lpLogHandle->LogFile); + DPRINT("LogHandle LogFile: %p\n", pLogHandle->LogFile); } else { - lpLogHandle->LogFile = NULL; + pLogHandle->LogFile = NULL; for (i = 1; i <= LogsActive; i++) { @@ -115,16 +115,16 @@ if (_wcsicmp(LogName->Buffer, currentLogFile->LogName) == 0) { - lpLogHandle->LogFile = currentLogFile; + pLogHandle->LogFile = currentLogFile; break; } } /* Use the application log if the desired log does not exist */ - if (lpLogHandle->LogFile == NULL) + if (pLogHandle->LogFile == NULL) { - lpLogHandle->LogFile = LogfListItemByName(L"Application"); - if (lpLogHandle->LogFile == NULL) + pLogHandle->LogFile = LogfListItemByName(L"Application"); + if (pLogHandle->LogFile == NULL) { DPRINT1("Application log is missing!\n"); Status = STATUS_UNSUCCESSFUL; @@ -133,22 +133,22 @@ } /* Reset the current record */ - lpLogHandle->CurrentRecord = 0; - } - - if (!lpLogHandle->LogFile) + pLogHandle->CurrentRecord = 0; + } + + if (!pLogHandle->LogFile) Status = STATUS_UNSUCCESSFUL; Done: if (NT_SUCCESS(Status)) { /* Append log handle */ - InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry); - *LogHandle = lpLogHandle; + InsertTailList(&LogHandleListHead, &pLogHandle->LogHandleListEntry); + *LogHandle = pLogHandle; } else { - HeapFree(GetProcessHeap(), 0, lpLogHandle); + HeapFree(GetProcessHeap(), 0, pLogHandle); } return Status; @@ -160,21 +160,23 @@ PUNICODE_STRING FileName) { NTSTATUS Status = STATUS_SUCCESS; - PLOGHANDLE lpLogHandle; - - DPRINT("ElfCreateBackupLogHandle(FileName: %wZ)\n", FileName); + PLOGHANDLE pLogHandle; + + DPRINT("ElfCreateBackupLogHandle(%wZ)\n", FileName); *LogHandle = NULL; - lpLogHandle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGHANDLE)); - if (lpLogHandle == NULL) + pLogHandle = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LOGHANDLE)); + if (pLogHandle == NULL) { DPRINT1("Failed to allocate Heap!\n"); return STATUS_NO_MEMORY; } /* Create the log file */ - Status = LogfCreate(&lpLogHandle->LogFile, + Status = LogfCreate(&pLogHandle->LogFile, NULL, FileName, 0, @@ -188,21 +190,21 @@ } /* Set the backup flag */ - lpLogHandle->Flags |= LOG_HANDLE_BACKUP_FILE; + pLogHandle->Flags |= LOG_HANDLE_BACKUP_FILE; /* Reset the current record */ - lpLogHandle->CurrentRecord = 0; + pLogHandle->CurrentRecord = 0; Done: if (NT_SUCCESS(Status)) { /* Append log handle */ - InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry); - *LogHandle = lpLogHandle; + InsertTailList(&LogHandleListHead, &pLogHandle->LogHandleListEntry); + *LogHandle = pLogHandle; } else { - HeapFree(GetProcessHeap(), 0, lpLogHandle); + HeapFree(GetProcessHeap(), 0, pLogHandle); } return Status; @@ -213,18 +215,18 @@ ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle) { PLIST_ENTRY CurrentEntry; - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; CurrentEntry = LogHandleListHead.Flink; while (CurrentEntry != &LogHandleListHead) { - lpLogHandle = CONTAINING_RECORD(CurrentEntry, - LOGHANDLE, - LogHandleListEntry); + pLogHandle = CONTAINING_RECORD(CurrentEntry, + LOGHANDLE, + LogHandleListEntry); CurrentEntry = CurrentEntry->Flink; - if (lpLogHandle == EventLogHandle) - return lpLogHandle; + if (pLogHandle == EventLogHandle) + return pLogHandle; } return NULL; @@ -234,16 +236,16 @@ static NTSTATUS ElfDeleteEventLogHandle(PIELF_HANDLE LogHandle) { - PLOGHANDLE lpLogHandle; - - lpLogHandle = ElfGetLogHandleEntryByHandle(*LogHandle); - if (!lpLogHandle) + PLOGHANDLE pLogHandle; + + pLogHandle = ElfGetLogHandleEntryByHandle(*LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; - RemoveEntryList(&lpLogHandle->LogHandleListEntry); - LogfClose(lpLogHandle->LogFile, FALSE); - - HeapFree(GetProcessHeap(), 0, lpLogHandle); + RemoveEntryList(&pLogHandle->LogHandleListEntry); + LogfClose(pLogHandle->LogFile, FALSE); + + HeapFree(GetProcessHeap(), 0, pLogHandle); *LogHandle = NULL; @@ -257,19 +259,19 @@ IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; DPRINT("ElfrClearELFW()\n"); - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; /* Fail, if the log file is a backup file */ - if (lpLogHandle->Flags & LOG_HANDLE_BACKUP_FILE) + if (pLogHandle->Flags & LOG_HANDLE_BACKUP_FILE) return STATUS_INVALID_HANDLE; - return LogfClearFile(lpLogHandle->LogFile, + return LogfClearFile(pLogHandle->LogFile, (PUNICODE_STRING)BackupFileName); } @@ -280,15 +282,15 @@ IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; DPRINT("ElfrBackupELFW()\n"); - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; - return LogfBackupFile(lpLogHandle->LogFile, + return LogfBackupFile(pLogHandle->LogFile, (PUNICODE_STRING)BackupFileName); } @@ -317,25 +319,25 @@ IELF_HANDLE LogHandle, PULONG NumberOfRecords) { - PLOGHANDLE lpLogHandle; - PLOGFILE lpLogFile; + PLOGHANDLE pLogHandle; + PLOGFILE pLogFile; DPRINT("ElfrNumberOfRecords()\n"); - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; if (!NumberOfRecords) return STATUS_INVALID_PARAMETER; - lpLogFile = lpLogHandle->LogFile; + pLogFile = pLogHandle->LogFile; DPRINT("Oldest: %lu Current: %lu\n", - lpLogFile->Header.OldestRecordNumber, - lpLogFile->Header.CurrentRecordNumber); - - if (lpLogFile->Header.OldestRecordNumber == 0) + pLogFile->Header.OldestRecordNumber, + pLogFile->Header.CurrentRecordNumber); + + if (pLogFile->Header.OldestRecordNumber == 0) { /* OldestRecordNumber == 0 when the log is empty */ *NumberOfRecords = 0; @@ -343,8 +345,8 @@ else { /* The log contains events */ - *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - - lpLogFile->Header.OldestRecordNumber; + *NumberOfRecords = pLogFile->Header.CurrentRecordNumber - + pLogFile->Header.OldestRecordNumber; } return STATUS_SUCCESS; @@ -357,16 +359,16 @@ IELF_HANDLE LogHandle, PULONG OldestRecordNumber) { - PLOGHANDLE lpLogHandle; - - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + PLOGHANDLE pLogHandle; + + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; if (!OldestRecordNumber) return STATUS_INVALID_PARAMETER; - *OldestRecordNumber = lpLogHandle->LogFile->Header.OldestRecordNumber; + *OldestRecordNumber = pLogHandle->LogFile->Header.OldestRecordNumber; return STATUS_SUCCESS; } @@ -477,11 +479,11 @@ PULONG MinNumberOfBytesNeeded) { NTSTATUS Status; - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; ULONG RecordNumber; - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; if (!Buffer) @@ -490,14 +492,14 @@ /* If sequential read, retrieve the CurrentRecord from this log handle */ if (ReadFlags & EVENTLOG_SEQUENTIAL_READ) { - RecordNumber = lpLogHandle->CurrentRecord; + RecordNumber = pLogHandle->CurrentRecord; } else // (ReadFlags & EVENTLOG_SEEK_READ) { RecordNumber = RecordOffset; } - Status = LogfReadEvents(lpLogHandle->LogFile, + Status = LogfReadEvents(pLogHandle->LogFile, ReadFlags, &RecordNumber, NumberOfBytesToRead, @@ -509,7 +511,7 @@ /* Update the handle's CurrentRecord if success */ if (NT_SUCCESS(Status)) { - lpLogHandle->CurrentRecord = RecordNumber; + pLogHandle->CurrentRecord = RecordNumber; } return Status; @@ -536,16 +538,16 @@ PULONG TimeWritten) { NTSTATUS Status; - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; PEVENTLOGRECORD LogBuffer; USHORT i; - ULONG recSize; + SIZE_T RecSize; ULONG dwStringsSize = 0; ULONG dwUserSidLength = 0; PWSTR lpStrings, str; - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; /* Flags must be 0 */ @@ -606,14 +608,14 @@ if (UserSID) dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); - LogBuffer = LogfAllocAndBuildNewRecord(&recSize, + LogBuffer = LogfAllocAndBuildNewRecord(&RecSize, Time, EventType, EventCategory, EventID, (SourceName && SourceName->Buffer) ? SourceName->Buffer - : lpLogHandle->szName, + : pLogHandle->szName, ComputerName->Buffer, dwUserSidLength, UserSID, @@ -622,11 +624,11 @@ DataSize, Data); - Status = LogfWriteRecord(lpLogHandle->LogFile, recSize, LogBuffer); + Status = LogfWriteRecord(pLogHandle->LogFile, RecSize, LogBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("ERROR WRITING TO EventLog %S (Status 0x%08lx)\n", - lpLogHandle->LogFile->FileName, Status); + DPRINT1("ERROR writing to event log `%S' (Status 0x%08lx)\n", + pLogHandle->LogFile->LogName, Status); } if (NT_SUCCESS(Status)) @@ -689,8 +691,8 @@ IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { + NTSTATUS Status; UNICODE_STRING BackupFileNameW; - NTSTATUS Status; Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, (PANSI_STRING)BackupFileName, @@ -713,8 +715,8 @@ IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { + NTSTATUS Status; UNICODE_STRING BackupFileNameW; - NTSTATUS Status; Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, (PANSI_STRING)BackupFileName, @@ -741,8 +743,8 @@ ULONG MinorVersion, PIELF_HANDLE LogHandle) { + NTSTATUS Status; UNICODE_STRING ModuleNameW; - NTSTATUS Status; if ((MajorVersion != 1) || (MinorVersion != 1)) return STATUS_INVALID_PARAMETER; @@ -777,8 +779,8 @@ ULONG MinorVersion, PIELF_HANDLE LogHandle) { + NTSTATUS Status; UNICODE_STRING ModuleNameW; - NTSTATUS Status; Status = RtlAnsiStringToUnicodeString(&ModuleNameW, (PANSI_STRING)ModuleName, @@ -823,8 +825,8 @@ ULONG MinorVersion, PIELF_HANDLE LogHandle) { + NTSTATUS Status; UNICODE_STRING BackupFileNameW; - NTSTATUS Status; DPRINT("ElfrOpenBELA(%Z)\n", BackupFileName); @@ -868,11 +870,11 @@ PULONG MinNumberOfBytesNeeded) { NTSTATUS Status; - PLOGHANDLE lpLogHandle; + PLOGHANDLE pLogHandle; ULONG RecordNumber; - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; if (!Buffer) @@ -881,14 +883,14 @@ /* If sequential read, retrieve the CurrentRecord from this log handle */ if (ReadFlags & EVENTLOG_SEQUENTIAL_READ) { - RecordNumber = lpLogHandle->CurrentRecord; + RecordNumber = pLogHandle->CurrentRecord; } else // (ReadFlags & EVENTLOG_SEEK_READ) { RecordNumber = RecordOffset; } - Status = LogfReadEvents(lpLogHandle->LogFile, + Status = LogfReadEvents(pLogHandle->LogFile, ReadFlags, &RecordNumber, NumberOfBytesToRead, @@ -900,7 +902,7 @@ /* Update the handle's CurrentRecord if success */ if (NT_SUCCESS(Status)) { - lpLogHandle->CurrentRecord = RecordNumber; + pLogHandle->CurrentRecord = RecordNumber; } return Status; @@ -925,9 +927,9 @@ PULONG RecordNumber, PULONG TimeWritten) { + NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ComputerNameW; PUNICODE_STRING *StringsArrayW = NULL; - NTSTATUS Status = STATUS_SUCCESS; USHORT i; DPRINT("ElfrReportEventA(%hu)\n", NumStrings); @@ -1009,13 +1011,10 @@ { for (i = 0; i < NumStrings; i++) { - if (StringsArrayW[i] != NULL) + if ((StringsArrayW[i] != NULL) && (StringsArrayW[i]->Buffer)) { - if (StringsArrayW[i]->Buffer) - { - RtlFreeUnicodeString(StringsArrayW[i]); - HeapFree(GetProcessHeap(), 0, StringsArrayW[i]); - } + RtlFreeUnicodeString(StringsArrayW[i]); + HeapFree(GetProcessHeap(), 0, StringsArrayW[i]); } } @@ -1068,10 +1067,10 @@ PULONG pcbBytesNeeded) { NTSTATUS Status = STATUS_SUCCESS; - PLOGHANDLE lpLogHandle; - - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + PLOGHANDLE pLogHandle; + + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; switch (InfoLevel) @@ -1110,10 +1109,10 @@ ElfrFlushEL( IELF_HANDLE LogHandle) { - PLOGHANDLE lpLogHandle; - - lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); - if (!lpLogHandle) + PLOGHANDLE pLogHandle; + + pLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!pLogHandle) return STATUS_INVALID_HANDLE; UNIMPLEMENTED;

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