Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 71672: [SHELL32_APITEST] - Add a test for CShellLink GetPath/SetPath behavior with environment variables. Patch by Andreas Maier. ROSTESTS-229 #resolve
by tfaber＠svn.reactos.org 25 Jun '16

25 Jun '16

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

1 0

[hbelusca] 71671: Fix build (i.e. a change that shouldn't have been done).
by hbelusca＠svn.reactos.org 25 Jun '16

25 Jun '16

Author: hbelusca Date: Sat Jun 25 20:12:18 2016 New Revision: 71671 URL: http://svn.reactos.org/svn/reactos?rev=71671&view=rev Log: Fix build (i.e. a change that shouldn't have been done). Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Jun 25 20:12:18 2016 @@ -569,7 +569,7 @@ HANDLE hEventLog; EVENTLOGRECORD *pevlr; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength; - SIZE_T cchRemaining; + size_t cchRemaining; LPWSTR lpszSourceName; LPWSTR lpszComputerName; BOOL bResult = TRUE; /* Read succeeded */

1 0

[hbelusca] 71670: [EVENTVWR] - Remove a unused header. - Start (re)working on the functions that retrieve strings associated to event categories and messages. - Just display the event category numb...
by hbelusca＠svn.reactos.org 25 Jun '16

25 Jun '16

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

1 0

[hbelusca] 71669: [EVENTVWR] - Use C-style comments. - Move the helper FreeRecords function closer to where it is used. - Use the EVENTLOG_BASE_KEY define instead of re-hardcoding the registry path...
by hbelusca＠svn.reactos.org 25 Jun '16

25 Jun '16

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

1 0

[akhaldi] 71668: [MSI_WINETEST] Sync with Wine Staging 1.9.12. CORE-11266
by akhaldi＠svn.reactos.org 25 Jun '16

25 Jun '16

Author: akhaldi Date: Sat Jun 25 11:28:00 2016 New Revision: 71668 URL: http://svn.reactos.org/svn/reactos?rev=71668&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.12. CORE-11266 Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/package.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Sat Jun 25 11:28:00 2016 @@ -21,6 +21,7 @@ #define _WIN32_MSI 300 #include <stdio.h> +#include <stdlib.h> #include <windows.h> #include <msiquery.h> @@ -28,6 +29,9 @@ #include <msi.h> #include <fci.h> #include <srrestoreptapi.h> +#include <wtypes.h> +#include <shellapi.h> +#include <winsvc.h> #include "wine/test.h" @@ -230,7 +234,7 @@ "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\n" + "TestService\tTestService\tTestService\t2\t3\t32768\t\t\tTestService\t\t\tservice_comp\t\n" "TestService4\tTestService4\tTestService4\t2\t3\t0\t\t\tTestService4\t\t\tservice_comp3\t\n"; static const char service_control_dat[] = @@ -5423,6 +5427,30 @@ DeleteFileA(msifile); } +static void delete_TestService(void) +{ + BOOL ret; + SC_HANDLE manager, service; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) + return; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService doesn't exist\n"); + + if (service) + { + ret = DeleteService( service ); + ok( ret, "failed to delete service %u\n", GetLastError() ); + + CloseServiceHandle(service); + } + CloseServiceHandle(manager); + +} + static void test_delete_services(void) { UINT r; @@ -5488,6 +5516,7 @@ ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); } @@ -5496,7 +5525,9 @@ { UINT r; SC_HANDLE manager, service; - BOOL ret; + LONG res; + HKEY hKey; + DWORD err_control, err_controlsize, err_controltype; if (is_process_limited()) { @@ -5528,6 +5559,19 @@ service = OpenServiceA(manager, "TestService4", GENERIC_ALL); ok(service == NULL, "TestService4 installed\n"); CloseServiceHandle(manager); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + if (res == ERROR_SUCCESS) + { + err_control = 0xBEEF; + err_controltype = REG_DWORD; + err_controlsize = sizeof(err_control); + res = RegQueryValueExA(hKey, "ErrorControl", NULL, &err_controltype, (LPBYTE)&err_control, &err_controlsize); + ok(err_control == 0, "TestService.ErrorControl wrong, expected 0, got %u\n", err_control); + RegCloseKey(hKey); + } r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5546,20 +5590,8 @@ ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(manager != NULL, "can't open service manager\n"); - if (!manager) goto error; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); - - ret = DeleteService( service ); - ok( ret, "failed to delete service %u\n", GetLastError() ); - - CloseServiceHandle(service); - CloseServiceHandle(manager); - error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); } @@ -5882,7 +5914,7 @@ size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); ok(res == ERROR_SUCCESS, "components key not created %d\n", res); @@ -5908,7 +5940,7 @@ size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); if (pRegDeleteKeyExA) res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Sat Jun 25 11:28:00 2016 @@ -29,6 +29,7 @@ #include <msidefs.h> #include <msi.h> #include <fci.h> +#include <oaidl.h> #include "wine/test.h" @@ -600,10 +601,7 @@ while (ptr->name) { dispid = get_dispid(pInstaller, ptr->name); - if (ptr->todo) - todo_wine - ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); - else + todo_wine_if (ptr->todo) ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); ptr++; } @@ -884,9 +882,7 @@ if (hr == S_OK) { - if (_invoke_todo_vtResult) todo_wine - ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); - else + todo_wine_if (_invoke_todo_vtResult) ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); if (vtResult != VT_EMPTY) { Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=71… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Sat Jun 25 11:28:00 2016 @@ -23,11 +23,10 @@ #include <stdio.h> #include <windows.h> +#include <objidl.h> #include <msi.h> #include <msidefs.h> #include <msiquery.h> - -#include <objidl.h> #include "wine/test.h" @@ -8069,7 +8068,7 @@ r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* column sting types don't match exactly */ + /* column string types don't match exactly */ r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Sat Jun 25 11:28:00 2016 @@ -2482,7 +2482,7 @@ r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* database exists, but is emtpy */ + /* database exists, but is empty */ sprintf(name, "#%d", hdb); r = MsiOpenPackageA(name, &hpack); ok(r == ERROR_INSTALL_PACKAGE_INVALID, @@ -2638,19 +2638,14 @@ { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); - else - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); } else { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); } @@ -2669,21 +2664,15 @@ { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); - else - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); } else { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", - line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); }

1 0

[akhaldi] 71667: [MSI] Sync with Wine Staging 1.9.12. CORE-11266
by akhaldi＠svn.reactos.org 25 Jun '16

25 Jun '16

Author: akhaldi Date: Sat Jun 25 11:27:22 2016 New Revision: 71667 URL: http://svn.reactos.org/svn/reactos?rev=71667&view=rev Log: [MSI] Sync with Wine Staging 1.9.12. CORE-11266 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/msvchelper.h trunk/reactos/dll/win32/msi/where.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -2987,11 +2987,7 @@ { *p = 0; if (!p[1]) continue; /* trailing backslash */ -#ifdef __REACTOS__ /* CORE-10587 */ hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); -#else - hkey = open_key( comp, root, subkey, FALSE, access ); -#endif if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); @@ -5806,6 +5802,7 @@ LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; + BOOL is_vital; SERVICE_DESCRIPTIONW sd = {NULL}; UINT ret = ERROR_SUCCESS; @@ -5844,6 +5841,13 @@ deformat_string(package, MSI_RecordGetString(rec, 11), &args); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); + /* Should the complete install fail if CreateService fails? */ + is_vital = (err_control & msidbServiceInstallErrorControlVital); + + /* Remove the msidbServiceInstallErrorControlVital-flag from err_control. + CreateService (under Windows) would fail if not. */ + err_control &= ~msidbServiceInstallErrorControlVital; + /* fetch the service path */ row = MSI_QueryGetRecord(package->db, query, comp); if (!row) @@ -5885,7 +5889,12 @@ if (!service) { if (GetLastError() != ERROR_SERVICE_EXISTS) - ERR("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + { + WARN("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + if (is_vital) + ret = ERROR_INSTALL_FAILURE; + + } } else if (sd.lpDescription) { Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/custom.c [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -527,6 +527,7 @@ __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" "movl 8(%ebp),%eax\n\t" "call *%eax\n\t" Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -3590,7 +3590,7 @@ dialog->size.cx = sz.cx; dialog->size.cy = sz.cy; - TRACE("%u %u %u %u\n", pos->left, pos->top, pos->right, pos->bottom); + TRACE("%s\n", wine_dbgstr_rect(pos)); style = GetWindowLongPtrW( dialog->hwnd, GWL_STYLE ); AdjustWindowRect( pos, style, FALSE ); Modified: trunk/reactos/dll/win32/msi/msvchelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msvchelper.h… ============================================================================== --- trunk/reactos/dll/win32/msi/msvchelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msvchelper.h [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -14,6 +14,7 @@ { push ebp mov ebp, esp + sub esp, 4 push dword ptr [ebp + 12] mov eax, dword ptr [ebp + 8] call eax Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/where.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/where.c [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -578,7 +578,7 @@ default: ERR("Invalid expression type\n"); - break; + return ERROR_FUNCTION_FAILED; } return ERROR_SUCCESS; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 25 11:27:22 2016 @@ -114,7 +114,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.4 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.9.4 +reactos/dll/win32/msi # Synced to WineStaging-1.9.12 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.4 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.4 reactos/dll/win32/msisip # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71666: [PSDK] Add missing msidbServiceInstallErrorControl enum.
by akhaldi＠svn.reactos.org 25 Jun '16

25 Jun '16

Author: akhaldi Date: Sat Jun 25 11:26:38 2016 New Revision: 71666 URL: http://svn.reactos.org/svn/reactos?rev=71666&view=rev Log: [PSDK] Add missing msidbServiceInstallErrorControl enum. Modified: trunk/reactos/sdk/include/psdk/msidefs.h Modified: trunk/reactos/sdk/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/msidefs.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/msidefs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/msidefs.h [iso-8859-1] Sat Jun 25 11:26:38 2016 @@ -198,6 +198,11 @@ msidbServiceControlEventUninstallStart = 0x00000010, msidbServiceControlEventUninstallStop = 0x00000020, msidbServiceControlEventUninstallDelete = 0x00000080, +}; + +enum msidbServiceInstallErrorControl +{ + msidbServiceInstallErrorControlVital = 0x00008000 }; enum msidbMoveFileOptions

1 0

[zhu] 71665: Server now handles multiple connections without crashing, as long as each connection terminates before the next one is established. Removed misuse of the datagram request lock. Added t...
by zhu＠svn.reactos.org 24 Jun '16

24 Jun '16

Author: zhu Date: Fri Jun 24 16:11:18 2016 New Revision: 71665 URL: http://svn.reactos.org/svn/reactos?rev=71665&view=rev Log: Server now handles multiple connections without crashing, as long as each connection terminates before the next one is established. Removed misuse of the datagram request lock. Added two more memory allocation tags, one for connection contexts and one for TCP requests. Added state variable to ADDRESS_FILE struct to make socket state management cleaner. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Fri Jun 24 16:11:18 2016 @@ -22,13 +22,15 @@ /* The pool tags we will use for all of our allocation */ #define TAG_ADDRESS_FILE 'FrdA' +#define TAG_TCP_CONTEXT 'TCPx' +#define TAG_TCP_REQUEST 'TCPr' /* The list of shared addresses */ static KSPIN_LOCK AddressListLock; static LIST_ENTRY AddressListHead; /* implementation in testing */ -NTSTATUS +PTCP_REQUEST PrepareIrpForCancel( PIRP Irp, PDRIVER_CANCEL CancelRoutine, @@ -46,10 +48,10 @@ if (!Irp->Cancel) { - Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_ADDRESS_FILE); + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_TCP_REQUEST); if (!Request) { - return STATUS_NO_MEMORY; + return NULL; } Request->PendingIrp = Irp; Request->CancelMode = CancelMode; @@ -63,7 +65,7 @@ DPRINT1("Prepared for cancel\n"); - return STATUS_SUCCESS; + return Request; } DPRINT1("Already cancelled\n"); @@ -73,10 +75,11 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; - return Irp->IoStatus.Status; + return NULL; } /* implementation in testing */ +/* Does not dequeue the request, simply marks it as cancelled */ VOID NTAPI CancelRequestRoutine( @@ -115,11 +118,12 @@ Irp->IoStatus.Information = 0; switch(MinorFunction) { + case TDI_LISTEN: + DPRINT1("TDI_LISTEN Cancel\n"); + Context->AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + break; case TDI_SEND: DPRINT1("TDI_SEND Cancel\n"); - break; - case TDI_LISTEN: - DPRINT1("TDI_LISTEN Cancel\n"); break; case TDI_CONNECT: DPRINT1("TDI_CONNECT Cancel\n"); @@ -142,7 +146,7 @@ Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); if (Request->PendingIrp == Irp) { - RemoveEntryList(Entry); + DPRINT1("Found matching request\n"); switch (Request->CancelMode) { case TCP_REQUEST_CANCEL_MODE_ABORT: @@ -261,7 +265,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); /* Start again from the beginning */ IoAcquireCancelSpinLock(&OldIrql); @@ -306,14 +310,13 @@ PLIST_ENTRY Head; PLIST_ENTRY Entry; - PLIST_ENTRY Temp; DPRINT1("lwIP TCP Accept Callback\n"); AddressFile = (PADDRESS_FILE)arg; - if (AddressFile->ContextCount == 0) - { - DPRINT1("\n Callback on address file with no contexts\n"); + if (AddressFile->TcpState != TCP_STATE_LISTENING) + { + DPRINT1("Accept callback on an address file that's not listening\n"); return ERR_ABRT; } Head = &AddressFile->ConnectionContext->ListEntry; @@ -334,12 +337,10 @@ Irp = Request->PendingIrp; if (!Irp) { - DPRINT1("Found cancelled IRP\n"); - Temp = Entry->Blink; - RemoveEntryList(Entry); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); - Entry = Temp; - continue; + DPRINT1("Request has been cancelled\n"); + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + return ERR_ABRT; } break; } @@ -363,7 +364,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -388,7 +389,8 @@ if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_ABRT; } @@ -402,7 +404,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -444,16 +446,12 @@ if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_ABRT; } IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; - if (!Context->lwip_tcp_pcb) - { - DPRINT1("Context pcb is NULL\n"); - return ERR_ABRT; - } if (Context->lwip_tcp_pcb != tpcb) { DPRINT1("Receive tcp_pcb mismatch\n"); @@ -462,7 +460,12 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + return ERR_ABRT; + } + if (!(Context->AddressFile->TcpState & (TCP_STATE_LISTENING|TCP_STATE_CONNECTED))) + { + DPRINT1("Invalid TCP state\n"); return ERR_ABRT; } @@ -538,7 +541,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -591,13 +594,14 @@ /* implementation in testing */ static err_t -lwip_tcp_Connected_callback( +lwip_tcp_connected_callback( void *arg, struct tcp_pcb *tpcb, err_t err) { PTCP_REQUEST Request; PTCP_CONTEXT Context; + PADDRESS_FILE AddressFile; PIO_STACK_LOCATION IrpSp; PIRP Irp; KIRQL OldIrql; @@ -609,33 +613,31 @@ if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_ABRT; } IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; - if (Context->AddressFile->ConnectionContext->lwip_tcp_pcb == tpcb) - { - DPRINT1("Same as old pcb\n"); - } - else - { - DPRINT1("Connected callback assigns new pcb\n"); - } - Context->lwip_tcp_pcb = tpcb; - Context->AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + AddressFile = Context->AddressFile; + if (AddressFile->TcpState != TCP_STATE_CONNECTING) + { + DPRINT1("Invalid TCP state\n"); + } IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; IoReleaseCancelSpinLock(OldIrql); + AddressFile->TcpState = TCP_STATE_CONNECTED; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -764,9 +766,9 @@ ip_addr_t IpAddr; ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - + AddressFile->TcpState = TCP_STATE_CREATED; TcpContext - = ExAllocatePoolWithTag(NonPagedPool, sizeof(TCP_CONTEXT), TAG_ADDRESS_FILE); + = ExAllocatePoolWithTag(NonPagedPool, sizeof(TCP_CONTEXT), TAG_TCP_CONTEXT); InitializeListHead(&TcpContext->ListEntry); TcpContext->AddressFile = AddressFile; TcpContext->Protocol = IPPROTO_TCP; @@ -832,26 +834,10 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; - -// ULONG *temp; IrpSp = IoGetCurrentIrpStackLocation(Irp); -/* temp = (ULONG*)Address; - DPRINT1("\n TcpIpCreateAddress Input Dump\n %08x %08x %08x %08x\n", - temp[3], temp[2], - temp[1], temp[0]); - if (IrpSp->FileObject && IrpSp->FileObject->FsContext) - { - temp = IrpSp->FileObject->FsContext; - if (temp) { - DPRINT1("\n IrpSp Dump\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); - } - }*/ - - Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_ADDRESS_FILE); + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_TCP_CONTEXT); if (!Context) { return STATUS_NO_MEMORY; @@ -879,12 +865,9 @@ _Inout_ ADDRESS_FILE* AddressFile ) { - LIST_ENTRY *Entry; - LIST_ENTRY *Temp; - LIST_ENTRY *Head; - PTCP_CONTEXT CurrentContext; - KIRQL OldIrql; + + err_t lwip_err; /* Lock the global address list */ KeAcquireSpinLock(&AddressListLock, &OldIrql); @@ -898,51 +881,36 @@ } /* remove the lwip pcb */ - if (AddressFile->Protocol == IPPROTO_UDP) - udp_remove(AddressFile->lwip_udp_pcb); - else if (AddressFile->Protocol == IPPROTO_TCP) - { - DPRINT1("Closing TCP address\n"); - if (AddressFile->ContextCount != 0) - { - DPRINT1("Closing open contexts\n"); - Head = &AddressFile->ConnectionContext->ListEntry; - Entry = Head->Flink; - while (Entry != Head) - { - Temp = Entry->Flink; - - CurrentContext = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); - RemoveEntryList(Entry); - if (!IsListEmpty(&CurrentContext->RequestListHead)) - { - DPRINT1("Address has non-empty request queue\n"); - return STATUS_NOT_IMPLEMENTED; - } - if (CurrentContext->lwip_tcp_pcb != AddressFile->ConnectionContext->lwip_tcp_pcb - && CurrentContext->lwip_tcp_pcb) - { - DPRINT1("Freeing connected tcp_pcb\n"); - tcp_abort(CurrentContext->lwip_tcp_pcb); - } - ExFreePoolWithTag(CurrentContext, TAG_ADDRESS_FILE); - AddressFile->ContextCount--; - Entry = Temp; - } + switch (AddressFile->Protocol) + { + case IPPROTO_UDP : + udp_remove(AddressFile->lwip_udp_pcb); + break; + case IPPROTO_TCP : if (AddressFile->ContextCount != 0) { - DPRINT1("Still contexts remaining after deallocation\n"); - return STATUS_UNSUCCESSFUL; + DPRINT1("Calling close on TCP address with open contexts\n"); + return STATUS_INVALID_PARAMETER; } - } - if (AddressFile->ConnectionContext->lwip_tcp_pcb) - { - tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); - } - ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_ADDRESS_FILE); - } - else if (AddressFile->Protocol == IPPROTO_RAW) - raw_remove(AddressFile->lwip_raw_pcb); + if (AddressFile->ConnectionContext->lwip_tcp_pcb) + { + lwip_err = tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); + if (lwip_err != ERR_OK) + { + DPRINT1("lwIP tcp_close error: %d", lwip_err); + return STATUS_UNSUCCESSFUL; + } + AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + } + ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_TCP_CONTEXT); + break; + case IPPROTO_RAW : + raw_remove(AddressFile->lwip_raw_pcb); + break; + default : + DPRINT1("Unknown protocol\n"); + return STATUS_INVALID_ADDRESS; + } /* Remove from the list and free the structure */ RemoveEntryList(&AddressFile->ListEntry); @@ -953,6 +921,66 @@ ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); return STATUS_SUCCESS; +} + +/* implementation in testing */ +NTSTATUS +TcpIpCloseContext( + _In_ PTCP_CONTEXT Context) +{ + err_t lwip_err; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PTCP_REQUEST Request; + PIRP Irp; + PIO_STACK_LOCATION IrpSp; + + if (Context->Protocol != IPPROTO_TCP) + { + DPRINT1("Invalid protocol\n"); + return STATUS_INVALID_PARAMETER; + } + if (Context->AddressFile) + { + DPRINT1("Context retains association\n"); + return STATUS_UNSUCCESSFUL; + } + + if (Context->lwip_tcp_pcb) + { + lwip_err = tcp_close(Context->lwip_tcp_pcb); + if (lwip_err != ERR_OK) + { + DPRINT1("lwIP tcp_close error: %d", lwip_err); + return STATUS_UNSUCCESSFUL; + } + } + + Head = &Context->RequestListHead; + Entry = Head->Flink; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + Irp = Request->PendingIrp; + if (Irp) + { + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if (IrpSp->FileObject->FsContext != Context) + { + DPRINT1("IRP context mismatch\n"); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("Closing outstanding request on context\n"); + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + } + Entry = Entry->Flink; + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + } + + return STATUS_SUCCESS; } static @@ -1023,7 +1051,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } /* implementation in testing */ @@ -1055,6 +1083,11 @@ if (Context->AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + if (Context->AddressFile->TcpState != TCP_STATE_BOUND) + { + DPRINT1("Connecting on address that's not bound\n"); return STATUS_INVALID_ADDRESS; } @@ -1075,7 +1108,7 @@ lwip_err = tcp_connect(Context->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, - lwip_tcp_Connected_callback); + lwip_tcp_connected_callback); // DPRINT1("lwip error %d\n", lwip_err); switch (lwip_err) { @@ -1115,12 +1148,12 @@ } case (ERR_OK) : { - PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_ABORT); - Request = CONTAINING_RECORD( - Context->RequestListHead.Blink, - TCP_REQUEST, - ListEntry); + Request = PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_ABORT); tcp_arg(Context->lwip_tcp_pcb, Request); + Context->AddressFile->TcpState = TCP_STATE_CONNECTING; break; } default : @@ -1144,7 +1177,6 @@ PADDRESS_FILE AddressFile; PTDI_REQUEST_KERNEL_ASSOCIATE RequestInfo; PFILE_OBJECT FileObject; - KIRQL OldIrql; err_t lwip_err; NTSTATUS Status; @@ -1195,18 +1227,12 @@ ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } - - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); if (AddressFile->Address.in_addr == 0) { // should really look through address file list for an interface AddressFile->Address.in_addr = 0x0100007f; } - -/* DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", - AddressFile->Address.sin_port, - AddressFile->Address.in_addr);*/ Context->AddressFile = AddressFile; Context->lwip_tcp_pcb = AddressFile->ConnectionContext->lwip_tcp_pcb; @@ -1214,61 +1240,66 @@ &Context->ListEntry); AddressFile->ContextCount++; - if (AddressFile->ContextCount <= 1) - { - /* Finally calling into lwip to perform socket bind */ - lwip_err = tcp_bind( - Context->lwip_tcp_pcb, - (ip_addr_t *)&AddressFile->Address.in_addr, - AddressFile->Address.sin_port); - ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); - DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", - lwip_err, - Context->lwip_tcp_pcb->local_ip, - Context->lwip_tcp_pcb->local_port, - Context->lwip_tcp_pcb->remote_ip, - Context->lwip_tcp_pcb->remote_port); - - if (lwip_err != ERR_OK) - { - switch (lwip_err) + switch (AddressFile->TcpState) + { + case TCP_STATE_CREATED : + /* Finally calling into lwip to perform socket bind */ + lwip_err = tcp_bind( + Context->lwip_tcp_pcb, + (ip_addr_t *)&AddressFile->Address.in_addr, + AddressFile->Address.sin_port); + ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); + DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", + lwip_err, + Context->lwip_tcp_pcb->local_ip, + Context->lwip_tcp_pcb->local_port, + Context->lwip_tcp_pcb->remote_ip, + Context->lwip_tcp_pcb->remote_port); + if (lwip_err != ERR_OK) { - case (ERR_BUF) : + switch (lwip_err) { - DPRINT1("lwIP ERR_BUFF\n"); - Status = STATUS_NO_MEMORY; - goto LEAVE; - } - case (ERR_VAL) : - { - DPRINT1("lwIP ERR_VAL\n"); - Status = STATUS_INVALID_PARAMETER; - goto LEAVE; - } - case (ERR_USE) : - { - DPRINT1("lwIP ERR_USE\n"); - Status = STATUS_ADDRESS_ALREADY_EXISTS; - goto LEAVE; - } - case (ERR_OK) : - { - DPRINT1("lwIP ERR_OK\n"); - break; - } - default : - { - DPRINT1("lwIP unexpected error\n"); - Status = STATUS_NOT_IMPLEMENTED; - goto LEAVE; + case (ERR_BUF) : + { + DPRINT1("lwIP ERR_BUFF\n"); + Status = STATUS_NO_MEMORY; + goto LEAVE; + } + case (ERR_VAL) : + { + DPRINT1("lwIP ERR_VAL\n"); + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + case (ERR_USE) : + { + DPRINT1("lwIP ERR_USE\n"); + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + case (ERR_OK) : + { + DPRINT1("lwIP ERR_OK\n"); + break; + } + default : + { + DPRINT1("lwIP unexpected error\n"); + Status = STATUS_NOT_IMPLEMENTED; + goto LEAVE; + } } } - } - } - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - Status = STATUS_SUCCESS; + AddressFile->TcpState = TCP_STATE_BOUND; + case TCP_STATE_BOUND : + case TCP_STATE_LISTENING : + Status = STATUS_SUCCESS; + break; + default : + DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); + Status = STATUS_UNSUCCESSFUL; + } + LEAVE: return Status; } @@ -1282,7 +1313,6 @@ PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; PADDRESS_FILE AddressFile; - KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) @@ -1304,21 +1334,27 @@ return STATUS_INVALID_ADDRESS; } - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - RemoveEntryList(&Context->ListEntry); - if (!IsListEmpty(&Context->RequestListHead)) - { - DPRINT1("Disassociating context with pending requests\n"); - } - if (Context->lwip_tcp_pcb != AddressFile->ConnectionContext->lwip_tcp_pcb) - { - tcp_abort(Context->lwip_tcp_pcb); - } - ExFreePoolWithTag(Context, TAG_ADDRESS_FILE); - AddressFile->ContextCount--; - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - return STATUS_SUCCESS; + switch (AddressFile->TcpState) + { + case TCP_STATE_BOUND : + tcp_close(Context->lwip_tcp_pcb); + case TCP_STATE_CONNECTED : + AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; + Context->lwip_tcp_pcb = NULL; + case TCP_STATE_LISTENING : + RemoveEntryList(&Context->ListEntry); + Context->AddressFile = NULL; + AddressFile->ContextCount--; + if (AddressFile->ContextCount == 0) + { + return TcpIpCloseAddress(AddressFile); + } + return STATUS_SUCCESS; + default : + DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); + // TODO: more case statements for better error reporting + return STATUS_UNSUCCESSFUL; + } } /* Implementation in testing */ @@ -1330,8 +1366,6 @@ PADDRESS_FILE AddressFile; PTCP_CONTEXT ConnectionContext; - KIRQL OldIrql; - struct tcp_pcb *lpcb; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1352,31 +1386,36 @@ return STATUS_INVALID_ADDRESS; } - if (AddressFile->ContextCount == 1) - { - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - /* Call down into lwip to initiate a listen */ - lpcb = tcp_listen(ConnectionContext->lwip_tcp_pcb); - DPRINT1("lwip tcp_listen returned\n"); - if (lpcb == NULL) - { - /* tcp_listen returning NULL can mean - either INVALID_ADDRESS or NO_MEMORY - if SO_REUSE is enabled in lwip options */ - DPRINT1("lwip tcp_listen error\n"); - return STATUS_INVALID_ADDRESS; - } - AddressFile->ConnectionContext->lwip_tcp_pcb = lpcb; - ConnectionContext->lwip_tcp_pcb = lpcb; - tcp_arg(ConnectionContext->lwip_tcp_pcb, AddressFile); - tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - } - - PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE); - - return STATUS_PENDING; + switch (AddressFile->TcpState) + { + case TCP_STATE_BOUND : + /* Call down into lwip to initiate a listen */ + lpcb = tcp_listen(AddressFile->ConnectionContext->lwip_tcp_pcb); + DPRINT1("lwip tcp_listen returned\n"); + if (lpcb == NULL) + { + /* tcp_listen returning NULL can mean + either INVALID_ADDRESS or NO_MEMORY + if SO_REUSE is enabled in lwip options */ + DPRINT1("lwip tcp_listen error\n"); + return STATUS_INVALID_ADDRESS; + } + AddressFile->ConnectionContext->lwip_tcp_pcb = lpcb; + tcp_arg(lpcb, AddressFile); + tcp_accept(lpcb, lwip_tcp_accept_callback); + AddressFile->TcpState = TCP_STATE_LISTENING; + case TCP_STATE_LISTENING : + ConnectionContext->lwip_tcp_pcb + = AddressFile->ConnectionContext->lwip_tcp_pcb; + PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_CLOSE); + return STATUS_PENDING; + default : + DPRINT1("Invalid TCP sate\n"); + return STATUS_UNSUCCESSFUL; + } } NTSTATUS @@ -1401,6 +1440,23 @@ return STATUS_INVALID_PARAMETER; } Context = IrpSp->FileObject->FsContext; + + switch (Context->AddressFile->TcpState) + { + case TCP_STATE_LISTENING : + if (Context->lwip_tcp_pcb == Context->AddressFile->ConnectionContext->lwip_tcp_pcb) + { + DPRINT1("Has the PCB been assigned by an lwIP callback?\n"); + // TODO: change to better error + return STATUS_UNSUCCESSFUL; + } + case TCP_STATE_CONNECTED : + break; + default : + DPRINT1("Invalid TCP state: %d\n", Context->AddressFile->TcpState); + // TODO: more cases for better error reporting + return STATUS_UNSUCCESSFUL; + } if (!Irp->MdlAddress) { @@ -1439,9 +1495,10 @@ return STATUS_NOT_IMPLEMENTED; } - PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_ABORT); - TcpRequest = CONTAINING_RECORD(Context->RequestListHead.Blink, - TCP_REQUEST, ListEntry); + TcpRequest = PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_ABORT); tcp_arg(Context->lwip_tcp_pcb, TcpRequest); tcp_sent(Context->lwip_tcp_pcb, lwip_tcp_sent_callback); @@ -1454,6 +1511,7 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + PADDRESS_FILE AddressFile; PTCP_REQUEST Request; PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; @@ -1462,32 +1520,35 @@ if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) { - DPRINT1("TcpIpReceive on something that is not an address file\n"); + DPRINT1("TcpIpReceive on something that is not a connection context\n"); return STATUS_INVALID_PARAMETER; } Context = IrpSp->FileObject->FsContext; - - if (!Context->lwip_tcp_pcb) - { - DPRINT1("Connection context does not contain a lwIP tcp_pcb\n"); - return STATUS_INVALID_ADDRESS; - } - if (Context->lwip_tcp_pcb == Context->AddressFile->ConnectionContext->lwip_tcp_pcb) - { - DPRINT1("Has the pcb been assigned by a lwIP callback?\n"); - return STATUS_INVALID_ADDRESS; - } - - RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; - DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); - - PrepareIrpForCancel(Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE); - Request = CONTAINING_RECORD(Context->RequestListHead.Blink, - TCP_REQUEST, ListEntry); - tcp_arg(Context->lwip_tcp_pcb, Request); - tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); - - return STATUS_PENDING; + AddressFile = Context->AddressFile; + switch (AddressFile->TcpState) + { + case TCP_STATE_LISTENING : + if (Context->lwip_tcp_pcb == AddressFile->ConnectionContext->lwip_tcp_pcb) + { + DPRINT1("Has the PCB been assigned by an lwIP callback?\n"); + return STATUS_INVALID_ADDRESS; + } + case TCP_STATE_CONNECTED : + RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; + DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); + + Request = PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_CLOSE); + tcp_arg(Context->lwip_tcp_pcb, Request); + tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); + + return STATUS_PENDING; + default : + DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); + return STATUS_INVALID_PARAMETER; + } } NTSTATUS @@ -1520,7 +1581,7 @@ } /* Queue the request */ - Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_ADDRESS_FILE); + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_TCP_REQUEST); if (!Request) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1570,7 +1631,7 @@ Failure: if (Request) - ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return Status; Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Fri Jun 24 16:11:18 2016 @@ -3,6 +3,12 @@ #define TCP_REQUEST_CANCEL_MODE_ABORT 1 #define TCP_REQUEST_CANCEL_MODE_CLOSE 2 + +#define TCP_STATE_CREATED 1 // created, unbound +#define TCP_STATE_BOUND 2 // bound, not listening or trying to connect +#define TCP_STATE_LISTENING 4 // listening, may or may not have connected clients +#define TCP_STATE_CONNECTING 8 // trying to connect as a client +#define TCP_STATE_CONNECTED 16 // connected as client typedef struct _ADDRESS_FILE { LIST_ENTRY ListEntry; @@ -13,6 +19,7 @@ TCPIP_INSTANCE Instance; KSPIN_LOCK RequestLock; LIST_ENTRY RequestListHead; + UCHAR TcpState; union { struct raw_pcb* lwip_raw_pcb; @@ -26,6 +33,7 @@ PADDRESS_FILE AddressFile; IPPROTO Protocol; TDI_ADDRESS_IP RequestAddress; + KSPIN_LOCK RequestListLock; // TODO: implement LIST_ENTRY RequestListHead; struct tcp_pcb* lwip_tcp_pcb; } TCP_CONTEXT, *PTCP_CONTEXT; @@ -56,6 +64,11 @@ NTSTATUS TcpIpCloseAddress( _Inout_ ADDRESS_FILE* AddressFile +); + +NTSTATUS +TcpIpCloseContext( + _In_ PTCP_CONTEXT Context ); NTSTATUS Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Fri Jun 24 16:11:18 2016 @@ -370,7 +370,7 @@ case TDI_CONNECTION_FILE: DPRINT1("TCPIP Close Connection Context\n"); Context = IrpSp->FileObject->FsContext; - Status = TcpIpCloseAddress(Context->AddressFile); + Status = TcpIpCloseContext(Context); break; case TDI_CONTROL_CHANNEL_FILE: /* We didn't allocate anything for this. */

1 0

[tthompson] 71664: [NTFS] Update a file's size in the relevant $FILE_NAME attribute of the index entry in the parent directory. +UpdateFileNameRecord() - Searches a parent directory for the proper ...
by tthompson＠svn.reactos.org 23 Jun '16

23 Jun '16

Author: tthompson Date: Thu Jun 23 18:02:03 2016 New Revision: 71664 URL: http://svn.reactos.org/svn/reactos?rev=71664&view=rev Log: [NTFS] Update a file's size in the relevant $FILE_NAME attribute of the index entry in the parent directory. +UpdateFileNameRecord() - Searches a parent directory for the proper index entry, then updates the file sizes in that entry. +UpdateIndexEntryFileNameSize() - Recursively searches directory index and applies the size update. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jun 23 18:02:03 2016 @@ -685,6 +685,212 @@ return FixupUpdateSequenceArray(Vcb, &file->Ntfs); } + +/** +* Searches a file's parent directory (given the parent's index in the mft) +* for the given file. Upon finding an index entry for that file, updates +* Data Size and Allocated Size values in the $FILE_NAME attribute of that entry. +* +* (Most of this code was copied from NtfsFindMftRecord) +*/ +NTSTATUS +UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG ParentMFTIndex, + PUNICODE_STRING FileName, + BOOLEAN DirSearch, + ULONGLONG NewDataSize, + ULONGLONG NewAllocationSize) +{ + PFILE_RECORD_HEADER MftRecord; + PNTFS_ATTR_CONTEXT IndexRootCtx; + PINDEX_ROOT_ATTRIBUTE IndexRoot; + PCHAR IndexRecord; + PINDEX_ENTRY_ATTRIBUTE IndexEntry, IndexEntryEnd; + NTSTATUS Status; + ULONG CurrentEntry = 0; + + DPRINT("UpdateFileNameRecord(%p, %I64d, %wZ, %u, %I64u, %I64u)\n", Vcb, ParentMFTIndex, FileName, DirSearch, NewDataSize, NewAllocationSize); + + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + Vcb->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, ParentMFTIndex, MftRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx, NULL); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + IndexRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); + if (IndexRecord == NULL) + { + ReleaseAttributeContext(IndexRootCtx); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); + IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); + // Index root is always resident. + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexRoot->Header.TotalSizeOfEntries); + + DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); + + Status = UpdateIndexEntryFileNameSize(Vcb, + MftRecord, + IndexRecord, + IndexRoot->SizeOfEntry, + IndexEntry, + IndexEntryEnd, + FileName, + &CurrentEntry, + &CurrentEntry, + DirSearch, + NewDataSize, + NewAllocationSize); + + ReleaseAttributeContext(IndexRootCtx); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + + return Status; +} + +/** +* Recursively searches directory index and applies the size update to the $FILE_NAME attribute of the +* proper index entry. +* (Heavily based on BrowseIndexEntries) +*/ +NTSTATUS +UpdateIndexEntryFileNameSize(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER MftRecord, + PCHAR IndexRecord, + ULONG IndexBlockSize, + PINDEX_ENTRY_ATTRIBUTE FirstEntry, + PINDEX_ENTRY_ATTRIBUTE LastEntry, + PUNICODE_STRING FileName, + PULONG StartEntry, + PULONG CurrentEntry, + BOOLEAN DirSearch, + ULONGLONG NewDataSize, + ULONGLONG NewAllocatedSize) +{ + NTSTATUS Status; + ULONG RecordOffset; + PINDEX_ENTRY_ATTRIBUTE IndexEntry; + PNTFS_ATTR_CONTEXT IndexAllocationCtx; + ULONGLONG IndexAllocationSize; + PINDEX_BUFFER IndexBuffer; + + DPRINT("UpdateIndexEntrySize(%p, %p, %p, %u, %p, %p, %wZ, %u, %u, %u, %I64u, %I64u)\n", Vcb, MftRecord, IndexRecord, IndexBlockSize, FirstEntry, LastEntry, FileName, *StartEntry, *CurrentEntry, DirSearch, NewDataSize, NewAllocatedSize); + + // find the index entry responsible for the file we're trying to update + IndexEntry = FirstEntry; + while (IndexEntry < LastEntry && + !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) + { + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && + *CurrentEntry >= *StartEntry && + IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && + CompareFileName(FileName, IndexEntry, DirSearch)) + { + *StartEntry = *CurrentEntry; + IndexEntry->FileName.DataSize = NewDataSize; + IndexEntry->FileName.AllocatedSize = NewAllocatedSize; + // indicate that the caller will still need to write the structure to the disk + return STATUS_PENDING; + } + + (*CurrentEntry) += 1; + ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + } + + /* If we're already browsing a subnode */ + if (IndexRecord == NULL) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + /* If there's no subnode */ + if (!(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("Corrupted filesystem!\n"); + return Status; + } + + IndexAllocationSize = AttributeDataLength(&IndexAllocationCtx->Record); + Status = STATUS_OBJECT_PATH_NOT_FOUND; + for (RecordOffset = 0; RecordOffset < IndexAllocationSize; RecordOffset += IndexBlockSize) + { + ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); + Status = FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs); + if (!NT_SUCCESS(Status)) + { + break; + } + + IndexBuffer = (PINDEX_BUFFER)IndexRecord; + ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); + ASSERT(IndexBuffer->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); + FirstEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); + + Status = UpdateIndexEntryFileNameSize(NULL, NULL, NULL, 0, FirstEntry, LastEntry, FileName, StartEntry, CurrentEntry, DirSearch, NewDataSize, NewAllocatedSize); + if (Status == STATUS_PENDING) + { + // write the index record back to disk + ULONG Written; + + // first we need to update the fixup values for the index block + Status = AddFixupArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Failed to update fixup sequence array!\n"); + break; + } + + Status = WriteAttribute(Vcb, IndexAllocationCtx, RecordOffset, (const PUCHAR)IndexRecord, IndexBlockSize, &Written); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR Performing write!\n"); + break; + } + + Status = STATUS_SUCCESS; + break; + } + if (NT_SUCCESS(Status)) + { + break; + } + } + + ReleaseAttributeContext(IndexAllocationCtx); + return Status; +} + /** * UpdateFileRecord * @implemented Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jun 23 18:02:03 2016 @@ -778,10 +778,37 @@ ULONG AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord); +BOOLEAN +CompareFileName(PUNICODE_STRING FileName, + PINDEX_ENTRY_ATTRIBUTE IndexEntry, + BOOLEAN DirSearch); + NTSTATUS ReadFileRecord(PDEVICE_EXTENSION Vcb, ULONGLONG index, PFILE_RECORD_HEADER file); + +NTSTATUS +UpdateIndexEntryFileNameSize(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER MftRecord, + PCHAR IndexRecord, + ULONG IndexBlockSize, + PINDEX_ENTRY_ATTRIBUTE FirstEntry, + PINDEX_ENTRY_ATTRIBUTE LastEntry, + PUNICODE_STRING FileName, + PULONG StartEntry, + PULONG CurrentEntry, + BOOLEAN DirSearch, + ULONGLONG NewDataSize, + ULONGLONG NewAllocatedSize); + +NTSTATUS +UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG ParentMFTIndex, + PUNICODE_STRING FileName, + BOOLEAN DirSearch, + ULONGLONG NewDataSize, + ULONGLONG NewAllocationSize); NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Thu Jun 23 18:02:03 2016 @@ -410,6 +410,9 @@ { LARGE_INTEGER DataSize; ULONGLONG AllocationSize; + PFILENAME_ATTRIBUTE fileNameAttribute; + ULONGLONG ParentMFTId; + UNICODE_STRING filename; DataSize.QuadPart = WriteOffset + Length; @@ -427,7 +430,19 @@ } // now we need to update this file's size in every directory index entry that references it - // (saved for a later commit) + // TODO: put this code in its own function and adapt it to work with every filename / hardlink + // stored in the file record. + fileNameAttribute = GetBestFileNameFromRecord(Fcb->Vcb, FileRecord); + ASSERT(fileNameAttribute); + + ParentMFTId = fileNameAttribute->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + + filename.Buffer = fileNameAttribute->Name; + filename.Length = fileNameAttribute->NameLength * sizeof(WCHAR); + filename.MaximumLength = filename.Length; + + Status = UpdateFileNameRecord(Fcb->Vcb, ParentMFTId, &filename, FALSE, DataSize.QuadPart, AllocationSize); + } else {

1 0

[zhu] 71663: Added my user-mode test programs
by zhu＠svn.reactos.org 23 Jun '16

23 Jun '16

Author: zhu Date: Thu Jun 23 16:03:13 2016 New Revision: 71663 URL: http://svn.reactos.org/svn/reactos?rev=71663&view=rev Log: Added my user-mode test programs Added: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/CMakeLists.txt (with props) branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c (with props) branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/CMakeLists.txt (with props) branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c (with props) Added: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/CMakeLists.txt (added) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/CMakeLists.txt [iso-8859-1] Thu Jun 23 16:03:13 2016 @@ -0,0 +1,11 @@ + +add_definitions(-D__USE_W32_SOCKETS) +add_executable(client main.c) +set_module_type(client win32cui UNICODE) +add_importlibs(client user32 ws2_32 msvcrt kernel32) + +if(MSVC) + add_importlibs(client ntdll) +endif() + +add_cd_file(TARGET client DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c (added) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] Thu Jun 23 16:03:13 2016 @@ -0,0 +1,49 @@ +#include <stdlib.h> +#include <stdio.h> +#include <winsock2.h> + +int wmain(int argc, LPWSTR argv[]) { + WSADATA wsa; + SOCKET sock; + struct sockaddr_in server; + + int ret; + + char buff[256]; + + ret = WSAStartup(MAKEWORD(2, 2), &wsa); + if (ret != 0) { + printf("Windows Socket API Startup Failed: %d", WSAGetLastError()); + return 1; + } + + printf("Attempt socket creation\n"); + fgets(&buff[0], 255, stdin); + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock == INVALID_SOCKET) { + printf("Socket Creation Failed: %d", WSAGetLastError()); + return 1; + } + + server.sin_addr.s_addr = inet_addr("127.0.0.1"); + server.sin_family = AF_INET; + server.sin_port = htons(10000); + + printf("Attempt connect\n"); + fgets(&buff[0], 255, stdin); + ret = connect(sock, (struct sockaddr *)&server, sizeof(server)); + if (ret < 0) { + printf("Socket Connection Failed: %d", WSAGetLastError()); + return 1; + } + + printf("Connected\n"); + + fgets(&buff[0], 255, stdin); + ret = send(sock, &buff[0], 256, MSG_OOB); + printf("Sent %d bytes", ret); + + fgets(&buff[0], 255, stdin); + + return 0; +} Propchange: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/CMakeLists.txt (added) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/CMakeLists.txt [iso-8859-1] Thu Jun 23 16:03:13 2016 @@ -0,0 +1,11 @@ + +add_definitions(-D__USE_W32_SOCKETS) +add_executable(server main.c) +set_module_type(server win32cui UNICODE) +add_importlibs(server user32 ws2_32 msvcrt kernel32) + +if(MSVC) + add_importlibs(server ntdll) +endif() + +add_cd_file(TARGET server DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c (added) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] Thu Jun 23 16:03:13 2016 @@ -0,0 +1,73 @@ +#include <stdio.h> +#include <WinSock2.h> + +int wmain(int argc, LPWSTR argv[]) { + WSADATA wsa; + SOCKET sock; + SOCKET accepted; + struct sockaddr_in server; + struct sockaddr_in client; + + int c; + int ret; + + char buff[256]; + + memset(&server, 0, sizeof(struct sockaddr_in)); + memset(&client, 0, sizeof(struct sockaddr_in)); + + ret = WSAStartup(MAKEWORD(2, 2), &wsa); + if (ret != 0) { + printf("Windows Socket API Startup Failed: %d", WSAGetLastError()); + exit(1); + } + + printf("Attempt socket creation\n"); + fgets(&buff[0], 255, stdin); + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock == INVALID_SOCKET) { + printf("Socket Creation Failed: %d", WSAGetLastError()); + exit(1); + } + + server.sin_family = AF_INET; + server.sin_addr.s_addr = inet_addr("127.0.0.1"); + server.sin_port = htons(10000); + + printf("Attempt bind\n"); + fgets(&buff[0], 255, stdin); + ret = bind(sock, (struct sockaddr *)&server, sizeof(server)); + if (ret == SOCKET_ERROR) { + printf("Socket Bind Failed: %d", WSAGetLastError()); + exit(1); + } + + printf("Attempt listen\n"); + fgets(&buff[0], 255, stdin); + ret = listen(sock, 3); + if (ret != 0) { + printf("Socket Listen Failed: %d", WSAGetLastError()); + exit(1); + } + + printf("Listening for connections on LOOPBACK port 10000\n"); + + c = sizeof(struct sockaddr_in); + + printf("Enter accept loop\n"); + fgets(&buff[0], 255, stdin); + while(1) { + accepted = accept(sock, (struct sockaddr *)&client, &c); + if (accepted == INVALID_SOCKET) { + printf("Socket Connection Acceptance Failed: %d", WSAGetLastError()); + exit(1); + } else { + printf("Socket connection accepted\n"); + ret = recv(accepted, &buff[0], 256, MSG_OOB); + printf("Received %d bytes\n", ret); + printf("Message: %s", &buff[0]); + } + } + + exit(1); +} Propchange: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c ------------------------------------------------------------------------------ svn:eol-style = native

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