Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 71872: [SERVMAN] Add logon and recovery property pages. Still work in progress.
by ekohl＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: ekohl Date: Sat Jul 9 16:51:21 2016 New Revision: 71872 URL: http://svn.reactos.org/svn/reactos?rev=71872&view=rev Log: [SERVMAN] Add logon and recovery property pages. Still work in progress. Added: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c (with props) trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c (with props) Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

1 0

[pschweitzer] 71871: [FLTMGR] Fix GCC build
by pschweitzer＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: pschweitzer Date: Sat Jul 9 16:41:18 2016 New Revision: 71871 URL: http://svn.reactos.org/svn/reactos?rev=71871&view=rev Log: [FLTMGR] Fix GCC build Modified: trunk/reactos/drivers/filters/CMakeLists.txt trunk/reactos/drivers/filters/fltmgr/Object.c trunk/reactos/drivers/filters/fltmgr/Registration.c Modified: trunk/reactos/drivers/filters/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/CMakeLists… ============================================================================== --- trunk/reactos/drivers/filters/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/CMakeLists.txt [iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -1,2 +1,2 @@ - +add_subdirectory(fltmgr) add_subdirectory(mountmgr) Modified: trunk/reactos/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Obj… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -25,10 +25,10 @@ NTSTATUS -NTAPI -FltObjectReference(_Inout_ PFLT_OBJECT Object) +FLTAPI +FltObjectReference(_Inout_ PVOID Object) { - if (!FltpExAcquireRundownProtection(&Object->RundownRef)) + if (!FltpExAcquireRundownProtection(&((PFLT_OBJECT)Object)->RundownRef)) { return STATUS_FLT_DELETING_OBJECT; } @@ -37,10 +37,10 @@ } VOID -NTAPI -FltObjectDereference(_Inout_ PFLT_OBJECT Object) +FLTAPI +FltObjectDereference(_Inout_ PVOID Object) { - FltpExReleaseRundownProtection(&Object->RundownRef); + FltpExReleaseRundownProtection(&((PFLT_OBJECT)Object)->RundownRef); } Modified: trunk/reactos/drivers/filters/fltmgr/Registration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Reg… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Registration.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Registration.c [iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -205,6 +205,7 @@ Instance = CONTAINING_RECORD(CurrentEntry, FLT_INSTANCE, FilterLink); // FIXME: implement + (void)Instance; /* Reset the pointer and move to next entry */ Instance = NULL;

1 0

[pschweitzer] 71870: [DDK] MS DDK defines FLT_CALLBACK_DATA_QUEUE_FLAGS as ULONG.
by pschweitzer＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: pschweitzer Date: Sat Jul 9 16:40:31 2016 New Revision: 71870 URL: http://svn.reactos.org/svn/reactos?rev=71870&view=rev Log: [DDK] MS DDK defines FLT_CALLBACK_DATA_QUEUE_FLAGS as ULONG. Modified: trunk/reactos/sdk/include/ddk/fltkernel.h Modified: trunk/reactos/sdk/include/ddk/fltkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fltkernel.… ============================================================================== --- trunk/reactos/sdk/include/ddk/fltkernel.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fltkernel.h [iso-8859-1] Sat Jul 9 16:40:31 2016 @@ -911,7 +911,7 @@ _Inout_ PFLT_CALLBACK_DATA_QUEUE Cbdq, _Inout_ PFLT_CALLBACK_DATA Cbd); -typedef enum _FLT_CALLBACK_DATA_QUEUE_FLAGS FLT_CALLBACK_DATA_QUEUE_FLAGS; +typedef ULONG FLT_CALLBACK_DATA_QUEUE_FLAGS; typedef struct _FLT_CALLBACK_DATA_QUEUE { IO_CSQ Csq;

1 0

[pschweitzer] 71869: [NTFS][FREELDR] Cherrypick r71807 by Trevor Thompson
by pschweitzer＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: pschweitzer Date: Sat Jul 9 16:21:13 2016 New Revision: 71869 URL: http://svn.reactos.org/svn/reactos?rev=71869&view=rev Log: [NTFS][FREELDR] Cherrypick r71807 by Trevor Thompson Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/f… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c [iso-8859-1] Sat Jul 9 16:21:13 2016 @@ -320,9 +320,6 @@ } else DataRunStartLCN = -1; - - if (*DataRun == 0) - return AlreadyRead; } while (Length > 0) Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sat Jul 9 16:21:13 2016 @@ -273,9 +273,6 @@ } else DataRunStartLCN = -1; - - if (*DataRun == 0) - return AlreadyRead; } while (Length > 0)

1 0

[tfaber] 71868: [ACPI] - This bus hosts all physical hardware. Surely some of it can be in the paging path...
by tfaber＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: tfaber Date: Sat Jul 9 15:40:02 2016 New Revision: 71868 URL: http://svn.reactos.org/svn/reactos?rev=71868&view=rev Log: [ACPI] - This bus hosts all physical hardware. Surely some of it can be in the paging path... Modified: trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Sat Jul 9 15:40:02 2016 @@ -461,8 +461,6 @@ pdoData->Common.DevicePowerState = ntState; pdoData->Common.SystemPowerState = FdoData->Common.SystemPowerState; - - Pdo->Flags |= DO_POWER_PAGABLE; ExAcquireFastMutex (&FdoData->Mutex); InsertTailList(&FdoData->ListOfPDOs, &pdoData->Link);

1 0

[hbelusca] 71867: [EVENTVWR] - Display 3 different "types" of logs in the tree: "system logs": Application, Security, System, that are the minimal set of standard logs present on NT systems; "appli...
by hbelusca＠svn.reactos.org 09 Jul '16

09 Jul '16

Author: hbelusca Date: Sat Jul 9 12:32:21 2016 New Revision: 71867 URL: http://svn.reactos.org/svn/reactos?rev=71867&view=rev Log: [EVENTVWR] - Display 3 different "types" of logs in the tree: "system logs": Application, Security, System, that are the minimal set of standard logs present on NT systems; "application logs": all the other logs, that are available to the event log service (both "system" and "application" logs are registered in the registry, under the "EventLog" service key). Finally comes the "user logs" that consists in all the log files that are manually opened by the user inthe event log viewer. - Use 'PEVENTLOGRECORD' instead of 'EVENTLOGRECORD *'. - Don't hardcode the buffer length values in the size parameters used in the GetEventUserName function. - Merge both GetDisplayNameFile and GetDisplayNameID helpers into a single GetDisplayNameFileAndID function, since the former two were always called in tandem. - Forbid editing the labels of the tree root nodes "system"/"application"/"user" logs. - Splitter bar: set the cursor only when it is on the bar, not when it is above the status bar... - Resize the status bar only in WM_SIZE events. - Remove few dead code. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Jul 9 12:32:21 2016 @@ -56,8 +56,16 @@ HFONT hMonospaceFont; } DETAILDATA, *PDETAILDATA; -static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name */ -static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const LPCWSTR szWindowClass = L"EVENTVWR"; /* The main window class name */ +static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; + +/* The 3 system logs that should always exist in the user's system */ +static const LPCWSTR SystemLogs[] = +{ + L"Application", + L"Security", + L"System" +}; /* MessageFile message buffer size */ #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 @@ -73,7 +81,7 @@ #define SPLIT_WIDTH 4 /* Globals */ -HINSTANCE hInst; /* current instance */ +HINSTANCE hInst; /* Current instance */ WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ WCHAR szTitleTemplate[MAX_LOADSTRING]; /* The logged-on title bar text */ WCHAR szSaveFilter[MAX_LOADSTRING]; /* Filter Mask for the save Dialog */ @@ -85,7 +93,7 @@ HMENU hMainMenu; /* The application's main menu */ WCHAR szStatusBarTemplate[MAX_LOADSTRING]; /* The status bar text */ -HTREEITEM htiSystemLogs = NULL, htiUserLogs = NULL; +HTREEITEM htiSystemLogs = NULL, htiAppLogs = NULL, htiUserLogs = NULL; BOOL NewestEventsFirst = TRUE; PEVENTLOGRECORD *g_RecordPtrs = NULL; @@ -98,7 +106,7 @@ DWORD dwNumLogs = 0; LPWSTR* LogNames = NULL; -/* Forward declarations of functions included in this code module: */ +/* Forward declarations of functions included in this code module */ ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); @@ -276,7 +284,7 @@ BOOL GetEventCategory(IN LPCWSTR KeyName, IN LPCWSTR SourceName, - IN EVENTLOGRECORD *pevlr, + IN PEVENTLOGRECORD pevlr, OUT PWCHAR CategoryName) // TODO: Add IN DWORD BufLen { BOOL Success = FALSE; @@ -334,7 +342,7 @@ BOOL GetEventMessage(IN LPCWSTR KeyName, IN LPCWSTR SourceName, - IN EVENTLOGRECORD *pevlr, + IN PEVENTLOGRECORD pevlr, OUT PWCHAR EventText) // TODO: Add IN DWORD BufLen { BOOL Success = FALSE; @@ -390,7 +398,7 @@ LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary == NULL) { - /* The DLL could not be loaded try the next one (if any) */ + /* The DLL could not be loaded, try the next one (if any) */ szDll = wcstok(NULL, EVENT_DLL_SEPARATOR); continue; } @@ -482,15 +490,15 @@ } BOOL -GetEventUserName(EVENTLOGRECORD *pelr, +GetEventUserName(PEVENTLOGRECORD pelr, OUT PWCHAR pszUser) { PSID lpSid; WCHAR szName[1024]; WCHAR szDomain[1024]; SID_NAME_USE peUse; - DWORD cbName = 1024; - DWORD cbDomain = 1024; + DWORD cchName = ARRAYSIZE(szName); + DWORD cchDomain = ARRAYSIZE(szDomain); /* Point to the SID */ lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); @@ -501,9 +509,9 @@ if (LookupAccountSidW(NULL, lpSid, szName, - &cbName, + &cchName, szDomain, - &cbDomain, + &cchDomain, &peUse)) { StringCchCopyW(pszUser, MAX_PATH, szName); @@ -745,7 +753,7 @@ ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpszComputerName); dwRead -= pevlr->Length; - pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); + pevlr = (PEVENTLOGRECORD)((LPBYTE) pevlr + pevlr->Length); } dwRecordsToRead--; @@ -911,14 +919,18 @@ BOOL -GetDisplayNameFile(IN LPCWSTR lpLogName, - OUT PWCHAR lpModuleName) +GetDisplayNameFileAndID(IN LPCWSTR lpLogName, + OUT PWCHAR lpModuleName, + OUT PDWORD pdwMessageID) { HKEY hKey; WCHAR *KeyPath; - WCHAR szModuleName[MAX_PATH]; DWORD cbData; SIZE_T cbKeyPath; + DWORD dwMessageID = 0; + WCHAR szModuleName[MAX_PATH]; + + *pdwMessageID = 0; cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); @@ -930,7 +942,7 @@ StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY); StringCbCatW(KeyPath, cbKeyPath, lpLogName); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, KeyPath); return FALSE; @@ -942,45 +954,15 @@ ExpandEnvironmentStringsW(szModuleName, lpModuleName, MAX_PATH); } + cbData = sizeof(dwMessageID); + RegQueryValueExW(hKey, L"DisplayNameID", NULL, NULL, (LPBYTE)&dwMessageID, &cbData); + RegCloseKey(hKey); HeapFree(GetProcessHeap(), 0, KeyPath); + *pdwMessageID = dwMessageID; + return TRUE; -} - - -DWORD -GetDisplayNameID(IN LPCWSTR lpLogName) -{ - HKEY hKey; - WCHAR *KeyPath; - DWORD dwMessageID = 0; - DWORD cbData; - SIZE_T cbKeyPath; - - cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); - KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); - if (!KeyPath) - { - return 0; - } - - StringCbCopyW(KeyPath, cbKeyPath, EVENTLOG_BASE_KEY); - StringCbCatW(KeyPath, cbKeyPath, lpLogName); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, KeyPath); - return 0; - } - - cbData = sizeof(dwMessageID); - RegQueryValueExW(hKey, L"DisplayNameID", NULL, NULL, (LPBYTE)&dwMessageID, &cbData); - - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, KeyPath); - - return dwMessageID; } @@ -1018,7 +1000,7 @@ DWORD dwMessageID; LPWSTR lpDisplayName; HMODULE hLibrary = NULL; - HTREEITEM hItem = NULL, hItemDefault = NULL; + HTREEITEM hRootNode = NULL, hItem = NULL, hItemDefault = NULL; /* Open the EventLog key */ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS) @@ -1082,10 +1064,8 @@ lpDisplayName = NULL; ZeroMemory(szModuleName, sizeof(szModuleName)); - if (GetDisplayNameFile(LogNames[dwIndex], szModuleName)) - { - dwMessageID = GetDisplayNameID(LogNames[dwIndex]); - + if (GetDisplayNameFileAndID(LogNames[dwIndex], szModuleName, &dwMessageID)) + { hLibrary = LoadLibraryExW(szModuleName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); if (hLibrary != NULL) { @@ -1102,12 +1082,27 @@ } } - hItem = TreeViewAddItem(hwndTreeView, htiSystemLogs, + /* + * Select the correct tree root node, whether the log is a System + * or an Application log. Default to Application log otherwise. + */ + hRootNode = htiAppLogs; + for (lpcName = 0; lpcName < ARRAYSIZE(SystemLogs); ++lpcName) + { + /* Check whether the log name is part of the system logs */ + if (wcsicmp(LogNames[dwIndex], SystemLogs[lpcName]) == 0) + { + hRootNode = htiSystemLogs; + break; + } + } + + hItem = TreeViewAddItem(hwndTreeView, hRootNode, (lpDisplayName ? lpDisplayName : LogNames[dwIndex]), 2, 3, dwIndex); /* Try to get the default event log: "Application" */ - if ((hItemDefault == NULL) && (wcsicmp(LogNames[dwIndex], L"Application") == 0)) + if ((hItemDefault == NULL) && (wcsicmp(LogNames[dwIndex], SystemLogs[0]) == 0)) { hItemDefault = hItem; } @@ -1121,9 +1116,12 @@ RegCloseKey(hKey); /* Select the default event log */ - TreeView_Expand(hwndTreeView, htiSystemLogs, TVE_EXPAND); - TreeView_SelectItem(hwndTreeView, hItemDefault); - TreeView_EnsureVisible(hwndTreeView, hItemDefault); + if (hItemDefault) + { + // TreeView_Expand(hwndTreeView, hRootNode, TVE_EXPAND); + TreeView_SelectItem(hwndTreeView, hItemDefault); + TreeView_EnsureVisible(hwndTreeView, hItemDefault); + } SetFocus(hwndTreeView); return; @@ -1236,9 +1234,12 @@ // "System Logs" LoadStringW(hInstance, IDS_EVENTLOG_SYSTEM, szTemp, ARRAYSIZE(szTemp)); htiSystemLogs = TreeViewAddItem(hwndTreeView, NULL, szTemp, 0, 1, (LPARAM)-1); + // "Application Logs" + LoadStringW(hInstance, IDS_EVENTLOG_APP, szTemp, ARRAYSIZE(szTemp)); + htiAppLogs = TreeViewAddItem(hwndTreeView, NULL, szTemp, 0, 1, (LPARAM)-1); // "User Logs" LoadStringW(hInstance, IDS_EVENTLOG_USER, szTemp, ARRAYSIZE(szTemp)); - htiUserLogs = TreeViewAddItem(hwndTreeView, NULL, szTemp, 0, 1, (LPARAM)-1); + htiUserLogs = TreeViewAddItem(hwndTreeView, NULL, szTemp, 0, 1, (LPARAM)-1); /* Create the ListView */ hwndListView = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -1370,8 +1371,8 @@ RECT rs; LONG StatusHeight; - /* Size status bar */ - SendMessage(hwndStatus, WM_SIZE, 0, 0); + /* Resize the status bar -- now done in WM_SIZE */ + // SendMessage(hwndStatus, WM_SIZE, 0, 0); GetWindowRect(hwndStatus, &rs); StatusHeight = rs.bottom - rs.top; @@ -1444,6 +1445,16 @@ { switch (hdr->code) { + case TVN_BEGINLABELEDIT: + { + HTREEITEM hItem = ((LPNMTVDISPINFO)lParam)->item.hItem; + + /* Disable label editing for root nodes */ + return ((hItem == htiSystemLogs) || + (hItem == htiAppLogs) || + (hItem == htiUserLogs)); + } + case TVN_SELCHANGED: { DWORD dwIndex = ((LPNMTREEVIEW)lParam)->itemNew.lParam; @@ -1535,8 +1546,14 @@ ScreenToClient(hWnd, &pt); if (pt.x >= nSplitPos - SPLIT_WIDTH/2 && pt.x < nSplitPos + SPLIT_WIDTH/2 + 1) { - SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); - return TRUE; + RECT rs; + GetClientRect(hWnd, &rect); + GetWindowRect(hwndStatus, &rs); + if (pt.y >= rect.top && pt.y < rect.bottom - (rs.bottom - rs.top)) + { + SetCursor(LoadCursorW(NULL, IDC_SIZEWE)); + return TRUE; + } } } goto Default; @@ -1544,7 +1561,6 @@ case WM_LBUTTONDOWN: { INT x = GET_X_LPARAM(lParam); - GetClientRect(hWnd, &rect); if (x >= nSplitPos - SPLIT_WIDTH/2 && x < nSplitPos + SPLIT_WIDTH/2 + 1) { SetCapture(hWnd); @@ -1563,11 +1579,6 @@ } break; - // case WM_CAPTURECHANGED: - // if (GetCapture() == hWnd && last_split>=0) - // draw_splitbar(hWnd, last_split); - // break; - case WM_MOUSEMOVE: if (GetCapture() == hWnd) { @@ -1586,7 +1597,7 @@ case WM_SIZE: { - // GetClientRect(hWnd, &rect); + SendMessage(hwndStatus, WM_SIZE, 0, 0); ResizeWnd(LOWORD(lParam), HIWORD(lParam)); break; } 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 Jul 9 12:32:21 2016 @@ -89,6 +89,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ðµ ( %lu ) Ð² Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº ( %s ). ÐÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð¼ÐµÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ Ð´Ð° Ð½ÑÐ¼Ð° Ð½ÑÐ¶Ð½Ð¸ÑÐµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ð¸Ð»Ð¸ DLL ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑ, Ð½ÑÐ¶Ð½Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½ ÐºÐ¾Ð¼Ð¿ÑÑÑÑ.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" 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 Jul 9 12:32:21 2016 @@ -89,6 +89,7 @@ IDS_APP_TITLE_EX "%s - Protkol %s na \\\\" IDS_STATUS_MSG "PoÄet udÃ¡lostÃ v protokolu %s: %lu" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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 "ÎÏÎ¬Î»Î¼Î±" 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 Jul 9 12:32:21 2016 @@ -97,6 +97,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - Registro de %s en \\\\" IDS_STATUS_MSG "%s tiene %lu evento(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripciÃ³n para el evento con ID (%lu) y origen (%s). El equipo local puede no tener la informaciÃ³n necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "Error" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - Journal %s sur \\\\" IDS_STATUS_MSG "%s contient %lu Ã©vÃ©nement(s)" IDS_EVENTLOG_SYSTEM "Journaux systÃ¨me" + IDS_EVENTLOG_APP "Journaux d'application" IDS_EVENTLOG_USER "Journaux de l'utilisateur" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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 "×©××××" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "( %s ) ì ì´ë²¤í¸ID ( %lu ) ì ëí ì¤ëªì ì°¾ì ì ììµëë¤. ë¡ì»¬ ì»´í¨í°ê° ìê²© ì»´í¨í°ì ë©ì¸ì§ë¥¼ íìíëë° íìí ë ì§ì¤í¸ë¦¬ë DLL íì¼ì ê°ì§ì§ ìê³ ììì ììµëë¤.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_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 Jul 9 12:32:21 2016 @@ -89,6 +89,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -93,6 +93,7 @@ IDS_APP_TITLE_EX "%s - %s Log na \\\\" IDS_STATUS_MSG "%s posiada %lu zdarzeÅ" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -94,6 +94,7 @@ IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" IDS_STATUS_MSG "%s are %lu eveniment(e)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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\nInformaÈii aferente evenimentului:\n\n" IDS_EVENTLOG_ERROR_TYPE "Eroare" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ Ñ ÐºÐ¾Ð´Ð¾Ð¼ ( %lu ) Ð² Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐµ ( %s ). ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð½Ð° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð½ÐµÑ Ð½ÑÐ¶Ð½ÑÑ Ð´Ð°Ð½Ð½ÑÑ Ð² ÑÐµÐµÑÑÑÐµ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð² DLL ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_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 Jul 9 12:32:21 2016 @@ -94,6 +94,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -97,6 +97,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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" 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 Jul 9 12:32:21 2016 @@ -97,6 +97,7 @@ IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\" IDS_STATUS_MSG "%s -> %lu olay var." IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" 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\nAÅaÄÄ±daki bilgi olayÄ±n parÃ§asÄ±dÄ±r:\n\n" IDS_EVENTLOG_ERROR_TYPE "YanlÄ±ÅlÄ±k" 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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "ÐÐ¿Ð¸Ñ Ð´Ð»Ñ ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÑ( %lu ) Ð·Ð° Ð´Ð¶ÐµÑÐµÐ»Ð¾Ð¼ ( %s ) Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾. ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¼Ð°ÑÐ¸ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð² ÑÐµÑÑÑÑÑ ÑÐ¸ DLL ÑÐ°Ð¹Ð»ÑÐ² Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ, ÑÐ¾ Ð½Ð°Ð´ÑÐ¾Ð´ÑÑÑ Ð²ÑÐ´ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°.\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "æ¥æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°æ æ³æ¾å°ãæ¬å°è®¡ç®æºå¯è½æ²¡ææ¾ç¤ºæ¥èªè¿ç¨è®¡ç®æºæ¶æ¯æå¿éçæ³¨åè¡¨ä¿¡æ¯ææ¶æ¯ DLL æä»¶ã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_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 Jul 9 12:32:21 2016 @@ -91,6 +91,7 @@ IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" IDS_EVENTLOG_SYSTEM "System Logs" + IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" IDS_EVENTSTRINGIDNOTFOUND "ä¾æº ( %s ) ä¸çäºä»¶ ID ( %lu ) çæè¿°ç¡æ³æ¾å°ã æ¬å°é»è¦å¯è½æ²æé¡¯ç¤ºä¾èªé ç«¯é»è¦æ¶æ¯æå¿éçè¨»åè¡¨è³è¨ææ¶æ¯ DLL æªã\n\nThe following information is part of the event:\n\n" IDS_EVENTLOG_ERROR_TYPE "é¯èª¤" Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sat Jul 9 12:32:21 2016 @@ -62,7 +62,8 @@ #define IDS_APP_TITLE_EX 104 #define IDS_STATUS_MSG 106 #define IDS_EVENTLOG_SYSTEM 107 -#define IDS_EVENTLOG_USER 108 +#define IDS_EVENTLOG_APP 108 +#define IDS_EVENTLOG_USER 109 #define IDS_EVENTSTRINGIDNOTFOUND 209 #define IDS_EVENTLOG_ERROR_TYPE 251 #define IDS_EVENTLOG_WARNING_TYPE 252

1 0

[akhaldi] 71866: [FREETYPE] Update to v2.6.4. CORE-11553 CORE-11543
by akhaldi＠svn.reactos.org 08 Jul '16

08 Jul '16

Author: akhaldi Date: Fri Jul 8 21:07:25 2016 New Revision: 71866 URL: http://svn.reactos.org/svn/reactos?rev=71866&view=rev Log: [FREETYPE] Update to v2.6.4. CORE-11553 CORE-11543 Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog trunk/reactos/sdk/lib/3rdparty/freetype/README trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcache.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcffdrv.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcid.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftgzip.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftotval.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftsystem.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftttdrv.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/internal.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttables.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afranges.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftstream.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/md5.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvjust.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvkern.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrtypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshglob.c trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.h trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.h trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcffdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftgzip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftotval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftttdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvkern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshglob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/…

1 0

[zhu] 71865: Structural, style, correctness fixes.
by zhu＠svn.reactos.org 08 Jul '16

08 Jul '16

Author: zhu Date: Fri Jul 8 17:52:42 2016 New Revision: 71865 URL: http://svn.reactos.org/svn/reactos?rev=71865&view=rev Log: Structural, style, correctness fixes. 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 Jul 8 17:52:42 2016 @@ -14,12 +14,12 @@ typedef struct { - LIST_ENTRY ListEntry; - TDI_ADDRESS_IP RemoteAddress; - PIRP Irp; - PVOID Buffer; - ULONG BufferLength; - PTDI_CONNECTION_INFORMATION ReturnInfo; + LIST_ENTRY ListEntry; + TDI_ADDRESS_IP RemoteAddress; + PIRP Irp; + PVOID Buffer; + ULONG BufferLength; + PTDI_CONNECTION_INFORMATION ReturnInfo; } RECEIVE_DATAGRAM_REQUEST; /* The pool tags we will use for all of our allocation */ @@ -33,6 +33,8 @@ static LIST_ENTRY AddressListHead; /* implementation in testing */ +/* Must already hold the Context->RequestListLock */ +/* Context should be in ->FileObject->FsContext */ NTSTATUS PrepareIrpForCancel( PIRP Irp, @@ -44,7 +46,6 @@ PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; PTCP_REQUEST Request; - KIRQL OldIrql; NTSTATUS Status; DPRINT1("Prepare for cancel\n"); @@ -67,10 +68,8 @@ Request->CancelMode = CancelMode; Request->PendingMode = PendingMode; - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); IoSetCancelRoutine(Irp, CancelRoutine); InsertTailList(&Context->RequestListHead, &Request->ListEntry); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Status = STATUS_SUCCESS; DPRINT1("Prepared for cancel\n"); @@ -143,6 +142,7 @@ { AddressFile->lwip_tcp_pcb = NULL; } + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); @@ -207,8 +207,8 @@ void TcpIpInitializeAddresses(void) { - KeInitializeSpinLock(&AddressListLock); - InitializeListHead(&AddressListHead); + KeInitializeSpinLock(&AddressListLock); + InitializeListHead(&AddressListHead); PcbCount = 0; } @@ -216,9 +216,9 @@ static BOOLEAN AddrIsUnspecified( - _In_ PTDI_ADDRESS_IP Address) -{ - return ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)); + _In_ PTDI_ADDRESS_IP Address) +{ + return ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)); } /* Implementation in testing */ @@ -231,8 +231,8 @@ PTCP_CONTEXT Context; PTCP_REQUEST Request; PLIST_ENTRY Head; - PLIST_ENTRY HeadNest; - PLIST_ENTRY EntryNest; + PLIST_ENTRY RequestHead; + PLIST_ENTRY RequestEntry; PLIST_ENTRY Entry; PLIST_ENTRY Temp; PIRP Irp; @@ -267,11 +267,23 @@ Status = STATUS_ADDRESS_CLOSED; + if (!arg) + { + DPRINT1("We did the cancelling ourselves, no need to worry about deallocations\n"); + return; + } + + /* This switch relies on UCHAR Type being the first member in + _ADDRESS_FILE + _TCP_CONTEXT + This works assuming the compiler never adds padding before the first struct member + */ + DPRINT1("Type: %08x\n", *((UCHAR*)arg)); switch (*((UCHAR*)arg)) { case TDI_TRANSPORT_ADDRESS_FILE : AddressFile = (PADDRESS_FILE)arg; - DPRINT1("AddressFile at %08x\n", AddressFile); + DPRINT1("AddressFile at %p\n", AddressFile); KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); Head = &AddressFile->ContextListHead; @@ -281,11 +293,11 @@ Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); - HeadNest = &Context->RequestListHead; - EntryNest = HeadNest->Flink; - while (EntryNest != HeadNest) + RequestHead = &Context->RequestListHead; + RequestEntry = RequestHead->Flink; + while (RequestEntry != RequestHead) { - Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Request = CONTAINING_RECORD(RequestEntry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (Irp) { @@ -298,16 +310,17 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } - Temp = EntryNest->Flink; - RemoveEntryList(EntryNest); + Temp = RequestEntry->Flink; + RemoveEntryList(RequestEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - EntryNest = Temp; + RequestEntry = Temp; } KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); if (Context->lwip_tcp_pcb != AddressFile->lwip_tcp_pcb) { + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count\n", PcbCount); @@ -324,14 +337,14 @@ return; case TDI_CONNECTION_FILE : Context = (PTCP_CONTEXT)arg; - DPRINT1("AddressFile at %08x\n", Context->AddressFile); + DPRINT1("AddressFile at %p\n", Context->AddressFile); KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); - HeadNest = &Context->RequestListHead; - EntryNest = HeadNest->Flink; - while (EntryNest != HeadNest) + RequestHead = &Context->RequestListHead; + RequestEntry = RequestHead->Flink; + while (RequestEntry != RequestHead) { - Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Request = CONTAINING_RECORD(RequestEntry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (Irp) { @@ -344,10 +357,10 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } - Temp = EntryNest->Flink; - RemoveEntryList(EntryNest); + Temp = RequestEntry->Flink; + RemoveEntryList(RequestEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - EntryNest = Temp; + RequestEntry = Temp; } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); @@ -361,7 +374,7 @@ return; default : - DPRINT1("Invalid argument: %08x\n", arg); + DPRINT1("Invalid argument: %p\n", arg); return; } } @@ -369,96 +382,96 @@ static BOOLEAN ReceiveDatagram( - ADDRESS_FILE* AddressFile, - struct pbuf *p, - ip_addr_t *addr, - u16_t port) -{ - KIRQL OldIrql; - LIST_ENTRY* ListEntry; - RECEIVE_DATAGRAM_REQUEST* Request; - ip_addr_t RequestAddr; - BOOLEAN Result = FALSE; - - NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); - - DPRINT1("Receiving datagram for addr 0x%08x on port %u.\n", ip4_addr_get_u32(addr), port); - - /* Block any cancellation that could occur */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - - ListEntry = AddressFile->RequestListHead.Flink; - while (ListEntry != &AddressFile->RequestListHead) - { - Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); - ListEntry = ListEntry->Flink; - - ip4_addr_set_u32(&RequestAddr, Request->RemoteAddress.in_addr); - - if ((RequestAddr.addr == IPADDR_ANY) || - (ip_addr_cmp(&RequestAddr, addr) && - ((Request->RemoteAddress.sin_port == lwip_htons(port)) || !port))) - { - PTA_IP_ADDRESS ReturnAddress; - PIRP Irp; - - DPRINT1("Found a corresponding IRP.\n"); - - Irp = Request->Irp; - - /* We found a request for this one */ - IoSetCancelRoutine(Irp, NULL); - RemoveEntryList(&Request->ListEntry); - Result = TRUE; - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - /* In case of UDP, lwip provides a pbuf directly pointing to the data. - * In other case, we must skip the IP header */ - Irp->IoStatus.Information = pbuf_copy_partial( - p, - Request->Buffer, - Request->BufferLength, - 0); - ReturnAddress = Request->ReturnInfo->RemoteAddress; - ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; - ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - ReturnAddress->Address->Address->sin_port = lwip_htons(port); - ReturnAddress->Address->Address->in_addr = ip4_addr_get_u32(addr); - RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, - sizeof(ReturnAddress->Address->Address->sin_zero)); - - if (Request->BufferLength < p->tot_len) - Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - else - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); - - /* Start again from the beginning */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - } - } - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - return Result; + ADDRESS_FILE* AddressFile, + struct pbuf *p, + ip_addr_t *addr, + u16_t port) +{ + KIRQL OldIrql; + LIST_ENTRY* ListEntry; + RECEIVE_DATAGRAM_REQUEST* Request; + ip_addr_t RequestAddr; + BOOLEAN Result = FALSE; + + NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + + DPRINT1("Receiving datagram for addr 0x%08x on port %u.\n", ip4_addr_get_u32(addr), port); + + /* Block any cancellation that could occur */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + + ListEntry = AddressFile->RequestListHead.Flink; + while (ListEntry != &AddressFile->RequestListHead) + { + Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); + ListEntry = ListEntry->Flink; + + ip4_addr_set_u32(&RequestAddr, Request->RemoteAddress.in_addr); + + if ((RequestAddr.addr == IPADDR_ANY) || + (ip_addr_cmp(&RequestAddr, addr) && + ((Request->RemoteAddress.sin_port == lwip_htons(port)) || !port))) + { + PTA_IP_ADDRESS ReturnAddress; + PIRP Irp; + + DPRINT1("Found a corresponding IRP.\n"); + + Irp = Request->Irp; + + /* We found a request for this one */ + IoSetCancelRoutine(Irp, NULL); + RemoveEntryList(&Request->ListEntry); + Result = TRUE; + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + /* In case of UDP, lwip provides a pbuf directly pointing to the data. + * In other case, we must skip the IP header */ + Irp->IoStatus.Information = pbuf_copy_partial( + p, + Request->Buffer, + Request->BufferLength, + 0); + ReturnAddress = Request->ReturnInfo->RemoteAddress; + ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; + ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + ReturnAddress->Address->Address->sin_port = lwip_htons(port); + ReturnAddress->Address->Address->in_addr = ip4_addr_get_u32(addr); + RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, + sizeof(ReturnAddress->Address->Address->sin_zero)); + + if (Request->BufferLength < p->tot_len) + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + else + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + + /* Start again from the beginning */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + } + } + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + return Result; } static void lwip_udp_ReceiveDatagram_callback( - void *arg, - struct udp_pcb *pcb, - struct pbuf *p, - ip_addr_t *addr, - u16_t port) -{ - UNREFERENCED_PARAMETER(pcb); - - ReceiveDatagram(arg, p, addr, port); - pbuf_free(p); + void *arg, + struct udp_pcb *pcb, + struct pbuf *p, + ip_addr_t *addr, + u16_t port) +{ + UNREFERENCED_PARAMETER(pcb); + + ReceiveDatagram(arg, p, addr, port); + pbuf_free(p); } /* implementation in testing */ @@ -491,8 +504,7 @@ Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); if (Context->TcpState == TCP_STATE_LISTENING) { - KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); Context->lwip_tcp_pcb = newpcb; InterlockedIncrement(&PcbCount); @@ -504,14 +516,34 @@ Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - if (!Irp || IrpSp->MinorFunction != TDI_LISTEN) + if (!Irp) { DPRINT1("Received accept callback for cancelled TDI_LISTEN\n"); RemoveEntryList(Entry); - Entry = Entry->Flink; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + return ERR_ABRT; + } + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if (IrpSp->MinorFunction != TDI_LISTEN) + { + DPRINT1("The IRP is not a listening request, something is seriously wrong\n"); + /* this should maybe clean out the entire context, + since this should never happen */ + RemoveEntryList(Entry); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoSetCancelRoutine(Irp, NULL); + + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return ERR_ABRT; } @@ -520,7 +552,8 @@ IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -622,11 +655,6 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); RequestInfo = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, RequestInfo->SendLength, 0); - PrepareIrpForCancel( - Irp, - CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_PRESERVE, - TCP_REQUEST_PENDING_SEND); break; } Entry = Entry->Flink; @@ -662,6 +690,7 @@ UCHAR *CurrentSrceLocation; PLIST_ENTRY Head; PLIST_ENTRY Entry; + PLIST_ENTRY NextEntry; NTSTATUS Status; err_t lwip_err; @@ -692,9 +721,10 @@ DPRINT1("Request Fetched. Points to %08x\n", Request); if (!Request->PendingIrp) { DPRINT1("IRP pointer dereferenced\n"); + NextEntry = Entry->Flink; RemoveEntryList(Entry); DPRINT1("Entry removed\n"); - Entry = Entry->Flink; + Entry = NextEntry; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); continue; } @@ -718,6 +748,7 @@ if (Context->lwip_tcp_pcb != tpcb) { DPRINT1("Receive tcp_pcb mismatch\n"); + tcp_arg(tpcb, NULL); tcp_abort(tpcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count\n", PcbCount); @@ -795,14 +826,16 @@ tcp_recv(tpcb, lwip_tcp_receive_callback); break; } + Entry = Entry->Flink; } lwip_err = ERR_OK; BAD: RemoveEntryList(&Request->ListEntry); + + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = CopiedLength; @@ -814,46 +847,46 @@ static u8_t lwip_raw_ReceiveDatagram_callback( - void *arg, - struct raw_pcb *pcb, - struct pbuf *p, - ip_addr_t *addr) -{ - BOOLEAN Result; - ADDRESS_FILE* AddressFile = arg; - - UNREFERENCED_PARAMETER(pcb); - - /* If this is for ICMP, only process the "echo received" packets. - * The rest is processed by lwip. */ - if (AddressFile->Protocol == IPPROTO_ICMP) - { - /* See icmp_input */ - s16_t hlen; - struct ip_hdr *iphdr; - - iphdr = (struct ip_hdr *)p->payload; - hlen = IPH_HL(iphdr) * 4; - - /* Adjust the pbuf to skip the IP header */ - if (pbuf_header(p, -hlen)) - return FALSE; - - if (*((u8_t*)p->payload) != ICMP_ER) - { - pbuf_header(p, hlen); - return FALSE; - } - - pbuf_header(p, hlen); - } - - Result = ReceiveDatagram(arg, p, addr, 0); - - if (Result) - pbuf_free(p); - - return Result; + void *arg, + struct raw_pcb *pcb, + struct pbuf *p, + ip_addr_t *addr) +{ + BOOLEAN Result; + ADDRESS_FILE* AddressFile = arg; + + UNREFERENCED_PARAMETER(pcb); + + /* If this is for ICMP, only process the "echo received" packets. + * The rest is processed by lwip. */ + if (AddressFile->Protocol == IPPROTO_ICMP) + { + /* See icmp_input */ + s16_t hlen; + struct ip_hdr *iphdr; + + iphdr = (struct ip_hdr *)p->payload; + hlen = IPH_HL(iphdr) * 4; + + /* Adjust the pbuf to skip the IP header */ + if (pbuf_header(p, -hlen)) + return FALSE; + + if (*((u8_t*)p->payload) != ICMP_ER) + { + pbuf_header(p, hlen); + return FALSE; + } + + pbuf_header(p, hlen); + } + + Result = ReceiveDatagram(arg, p, addr, 0); + + if (Result) + pbuf_free(p); + + return Result; } /* implementation in testing */ @@ -877,24 +910,20 @@ Context = (PTCP_CONTEXT)arg; KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); Head = &Context->RequestListHead; - Entry = Head->Flink; - if (Head == Entry) + if (IsListEmpty(Head)) { DPRINT1("Request list is empty\n"); KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return ERR_ARG; } + Entry = RemoveHeadList(Head); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); - - RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Request->Context->RequestListLock, OldIrql); - return ERR_ABRT; } IoSetCancelRoutine(Irp, NULL); @@ -910,11 +939,7 @@ lwip_err = ERR_OK; FINISH: - - RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -925,176 +950,178 @@ /* implementation in testing */ NTSTATUS TcpIpCreateAddress( - _Inout_ PIRP Irp, - _In_ PTDI_ADDRESS_IP Address, - _In_ IPPROTO Protocol + _Inout_ PIRP Irp, + _In_ PTDI_ADDRESS_IP Address, + _In_ IPPROTO Protocol ) { - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - PADDRESS_FILE AddressFile; - LIST_ENTRY* ListEntry; - KIRQL OldIrql; - - USHORT Port = 1; - - /* See if this port is already taken, and find a free one if needed. */ - KeAcquireSpinLock(&AddressListLock, &OldIrql); + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PADDRESS_FILE AddressFile; + LIST_ENTRY* ListEntry; + KIRQL OldIrql; + + USHORT Port = 1; + + /* See if this port is already taken, and find a free one if needed. */ + KeAcquireSpinLock(&AddressListLock, &OldIrql); DPRINT1("Search through used ports\n"); - ListEntry = AddressListHead.Flink; - while (ListEntry != &AddressListHead) - { - AddressFile = CONTAINING_RECORD(ListEntry, ADDRESS_FILE, ListEntry); - - if (Address->sin_port) - { - if ((AddressFile->Protocol == Protocol) && - (AddressFile->Address.sin_port == Address->sin_port)) - { - if (IrpSp->Parameters.Create.ShareAccess) - { - /* Good, we found the shared address we were looking for */ - InterlockedIncrement(&AddressFile->RefCount); - KeReleaseSpinLock(&AddressListLock, OldIrql); - goto Success; - } - - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_ADDRESS_ALREADY_EXISTS; - } - } - else if ((AddressFile->Address.sin_port == lwip_htons(Port)) - && AddressFile->Protocol == Protocol) - { - Port++; - if (Port == 0) - { - /* Oh no. Already 65535 ports occupied! */ - DPRINT1("No more free ports for protocol %d!\n", Protocol); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_TOO_MANY_ADDRESSES; - } - - /* We must start anew to check again the previous entries in the list */ - ListEntry = &AddressListHead; - } - ListEntry = ListEntry->Flink; - } + ListEntry = AddressListHead.Flink; + while (ListEntry != &AddressListHead) + { + AddressFile = CONTAINING_RECORD(ListEntry, ADDRESS_FILE, ListEntry); + + if (Address->sin_port) + { + if ((AddressFile->Protocol == Protocol) && + (AddressFile->Address.sin_port == Address->sin_port)) + { + if (IrpSp->Parameters.Create.ShareAccess) + { + /* Good, we found the shared address we were looking for */ + InterlockedIncrement(&AddressFile->RefCount); + DPRINT1("RefCount increment to %d\n", AddressFile->RefCount); + KeReleaseSpinLock(&AddressListLock, OldIrql); + goto Success; + } + + KeReleaseSpinLock(&AddressListLock, OldIrql); + DPRINT1("Address taken\n"); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + } + else if ((AddressFile->Address.sin_port == lwip_htons(Port)) + && AddressFile->Protocol == Protocol) + { + Port++; + if (Port == 0) + { + /* Oh no. Already 65535 ports occupied! */ + DPRINT1("No more free ports for protocol %d!\n", Protocol); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_TOO_MANY_ADDRESSES; + } + + /* We must start anew to check again the previous entries in the list */ + ListEntry = &AddressListHead; + } + ListEntry = ListEntry->Flink; + } DPRINT1("Find local interface for address\n"); - if (!AddrIsUnspecified(Address)) - { - /* Find the local interface for this address */ - struct netif* lwip_netif = netif_list; - ip_addr_t IpAddr; - - ip4_addr_set_u32(&IpAddr, Address->in_addr); - while (lwip_netif) - { + if (!AddrIsUnspecified(Address)) + { + /* Find the local interface for this address */ + struct netif* lwip_netif = netif_list; + ip_addr_t IpAddr; + + ip4_addr_set_u32(&IpAddr, Address->in_addr); + while (lwip_netif) + { // DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); - if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) - { - break; - } - lwip_netif = lwip_netif->next; - } - - if (!lwip_netif) - { - DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - } + if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) + { + break; + } + lwip_netif = lwip_netif->next; + } + + if (!lwip_netif) + { + DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_INVALID_ADDRESS; + } + } DPRINT1("Allocate address file\n"); - /* Allocate our new address file */ - AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); - if (!AddressFile) - { + /* Allocate our new address file */ + AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); + if (!AddressFile) + { KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_NO_MEMORY; - } - - RtlZeroMemory(AddressFile, sizeof(*AddressFile)); + return STATUS_NO_MEMORY; + } + + RtlZeroMemory(AddressFile, sizeof(*AddressFile)); AddressFile->Type = TDI_TRANSPORT_ADDRESS_FILE; - AddressFile->RefCount = 1; - RtlCopyMemory(&AddressFile->Address, Address, sizeof(*Address)); - AddressFile->Protocol = Protocol; - if (!Address->sin_port) - AddressFile->Address.sin_port = lwip_htons(Port); - - /* Initialize the datagram request stuff */ - KeInitializeSpinLock(&AddressFile->RequestLock); - InitializeListHead(&AddressFile->RequestListHead); + AddressFile->RefCount = 1; + RtlCopyMemory(&AddressFile->Address, Address, sizeof(*Address)); + AddressFile->Protocol = Protocol; + if (!Address->sin_port) + AddressFile->Address.sin_port = lwip_htons(Port); + + /* Initialize the datagram request stuff */ + KeInitializeSpinLock(&AddressFile->RequestLock); + InitializeListHead(&AddressFile->RequestListHead); DPRINT1("Protocol-dependent operations\n"); - /* Give it an entity ID and open a PCB if needed. */ - switch (Protocol) - { - case IPPROTO_TCP: + /* Give it an entity ID and open a PCB if needed. */ + switch (Protocol) + { + case IPPROTO_TCP: { ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); AddressFile->ContextCount = 0; AddressFile->lwip_tcp_pcb = tcp_new(); InterlockedIncrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); tcp_arg(AddressFile->lwip_tcp_pcb, AddressFile); tcp_err(AddressFile->lwip_tcp_pcb, lwip_tcp_err_callback); - break; - } - case IPPROTO_UDP: - { - ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); - AddressFile->lwip_udp_pcb = udp_new(); - udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); - ip_set_option(AddressFile->lwip_udp_pcb, SOF_BROADCAST); - /* Register our recv handler to lwip */ - udp_recv( - AddressFile->lwip_udp_pcb, - lwip_udp_ReceiveDatagram_callback, - AddressFile); - break; - } - default: - { - ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - if (Protocol == IPPROTO_ICMP) - InsertEntityInstance(ER_ENTITY, &AddressFile->Instance); - else - InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); - AddressFile->lwip_raw_pcb = raw_new(Protocol); - raw_bind(AddressFile->lwip_raw_pcb, &IpAddr); - ip_set_option(AddressFile->lwip_raw_pcb, SOF_BROADCAST); - /* Register our recv handler for lwip */ - raw_recv( - AddressFile->lwip_raw_pcb, - lwip_raw_ReceiveDatagram_callback, - AddressFile); - break; - } - } + break; + } + case IPPROTO_UDP: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); + AddressFile->lwip_udp_pcb = udp_new(); + udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); + ip_set_option(AddressFile->lwip_udp_pcb, SOF_BROADCAST); + /* Register our recv handler to lwip */ + udp_recv( + AddressFile->lwip_udp_pcb, + lwip_udp_ReceiveDatagram_callback, + AddressFile); + break; + } + default: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + if (Protocol == IPPROTO_ICMP) + InsertEntityInstance(ER_ENTITY, &AddressFile->Instance); + else + InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); + AddressFile->lwip_raw_pcb = raw_new(Protocol); + raw_bind(AddressFile->lwip_raw_pcb, &IpAddr); + ip_set_option(AddressFile->lwip_raw_pcb, SOF_BROADCAST); + /* Register our recv handler for lwip */ + raw_recv( + AddressFile->lwip_raw_pcb, + lwip_raw_ReceiveDatagram_callback, + AddressFile); + break; + } + } DPRINT1("Insert into address list\n"); - /* Insert it into the list. */ - InsertTailList(&AddressListHead, &AddressFile->ListEntry); - KeReleaseSpinLock(&AddressListLock, OldIrql); + /* Insert it into the list. */ + InsertTailList(&AddressListHead, &AddressFile->ListEntry); + KeReleaseSpinLock(&AddressListLock, OldIrql); Success: - IrpSp->FileObject->FsContext = AddressFile; - IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; - - return STATUS_SUCCESS; + IrpSp->FileObject->FsContext = AddressFile; + IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; + + return STATUS_SUCCESS; } /* implementation in testing */ @@ -1138,25 +1165,27 @@ /* implementation in testing */ NTSTATUS TcpIpCloseAddress( - _Inout_ ADDRESS_FILE* AddressFile + _Inout_ ADDRESS_FILE* AddressFile ) { - KIRQL OldIrql; + KIRQL OldIrql; + NTSTATUS Status; err_t lwip_err; - /* Lock the global address list */ - KeAcquireSpinLock(&AddressListLock, &OldIrql); - - if (InterlockedDecrement(&AddressFile->RefCount) != 0) - { - /* There are still some open handles for this address */ - DPRINT1("TcpIpCloseAddress on address with open handles\n"); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_SUCCESS; - } - - /* remove the lwip pcb */ + /* Lock the global address list */ + KeAcquireSpinLock(&AddressListLock, &OldIrql); + + InterlockedDecrement(&AddressFile->RefCount); + if (AddressFile->RefCount != 0) + { + /* There are still some open handles for this address */ + DPRINT1("TcpIpCloseAddress on address with %d open handles\n", AddressFile->RefCount); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_SUCCESS; + } + + /* remove the lwip pcb */ switch (AddressFile->Protocol) { case IPPROTO_UDP : @@ -1166,6 +1195,7 @@ if (AddressFile->ContextCount != 0) { DPRINT1("Calling close on TCP address with open contexts\n"); + // Should never happen due to how callers are written. KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_PARAMETER; } @@ -1177,6 +1207,7 @@ } else { + tcp_arg(AddressFile->lwip_tcp_pcb, NULL); tcp_abort(AddressFile->lwip_tcp_pcb); lwip_err = ERR_OK; } @@ -1185,29 +1216,35 @@ if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_UNSUCCESSFUL; + // TODO: better return code + Status = STATUS_UNSUCCESSFUL; } + Status = STATUS_SUCCESS; + break; } break; case IPPROTO_RAW : raw_remove(AddressFile->lwip_raw_pcb); + Status = STATUS_SUCCESS; break; default : DPRINT1("Unknown protocol\n"); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - - /* Remove from the list and free the structure */ - RemoveEntryList(&AddressFile->ListEntry); - KeReleaseSpinLock(&AddressListLock, OldIrql); - - RemoveEntityInstance(&AddressFile->Instance); - - ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); - - return STATUS_SUCCESS; + // Should never happen due to how callers are written. + // This case is particularly bad since we don't know what needs + // to be deallocated at all. + Status = STATUS_INVALID_ADDRESS; + break; + } + + /* Remove from the list and free the structure */ + RemoveEntryList(&AddressFile->ListEntry); + KeReleaseSpinLock(&AddressListLock, OldIrql); + + RemoveEntityInstance(&AddressFile->Instance); + + ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); + + return Status; } /* implementation in testing */ @@ -1218,6 +1255,7 @@ err_t lwip_err; PLIST_ENTRY Head; PLIST_ENTRY Entry; + PADDRESS_FILE AddressFile; PTCP_REQUEST Request; PIRP Irp; PIO_STACK_LOCATION IrpSp; @@ -1229,7 +1267,7 @@ DPRINT1("Invalid protocol\n"); return STATUS_INVALID_PARAMETER; } - if (Context->AddressFile) + if (!(Context->TcpState & TCP_STATE_DISASSOCIATED)) { DPRINT1("Context retains association\n"); return STATUS_UNSUCCESSFUL; @@ -1245,6 +1283,7 @@ } else { + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); lwip_err = ERR_OK; } @@ -1284,7 +1323,16 @@ KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + AddressFile = Context->AddressFile; + ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); + + if (AddressFile->ContextCount == 0) + { + DPRINT1("Closing Address File at %p from TcpIpCloseContext on Context at %p\n", + AddressFile, Context); + return TcpIpCloseAddress(AddressFile); + } return STATUS_SUCCESS; } @@ -1292,73 +1340,73 @@ static NTSTATUS ExtractAddressFromList( - _In_ PTRANSPORT_ADDRESS AddressList, - _Out_ PTDI_ADDRESS_IP Address) -{ - PTA_ADDRESS CurrentAddress; - INT i; - - CurrentAddress = &AddressList->Address[0]; - - /* We can only use IP addresses. Search the list until we find one */ - for (i = 0; i < AddressList->TAAddressCount; i++) - { - if (CurrentAddress->AddressType == TDI_ADDRESS_TYPE_IP) - { - if (CurrentAddress->AddressLength == TDI_ADDRESS_LENGTH_IP) - { - /* This is an IPv4 address */ - RtlCopyMemory(Address, &CurrentAddress->Address[0], CurrentAddress->AddressLength); - return STATUS_SUCCESS; - } - } - CurrentAddress = (PTA_ADDRESS)&CurrentAddress->Address[CurrentAddress->AddressLength]; - } - return STATUS_INVALID_ADDRESS; + _In_ PTRANSPORT_ADDRESS AddressList, + _Out_ PTDI_ADDRESS_IP Address) +{ + PTA_ADDRESS CurrentAddress; + INT i; + + CurrentAddress = &AddressList->Address[0]; + + /* We can only use IP addresses. Search the list until we find one */ + for (i = 0; i < AddressList->TAAddressCount; i++) + { + if (CurrentAddress->AddressType == TDI_ADDRESS_TYPE_IP) + { + if (CurrentAddress->AddressLength == TDI_ADDRESS_LENGTH_IP) + { + /* This is an IPv4 address */ + RtlCopyMemory(Address, &CurrentAddress->Address[0], CurrentAddress->AddressLength); + return STATUS_SUCCESS; + } + } + CurrentAddress = (PTA_ADDRESS)&CurrentAddress->Address[CurrentAddress->AddressLength]; + } + return STATUS_INVALID_ADDRESS; } static VOID NTAPI CancelReceiveDatagram( - _Inout_ struct _DEVICE_OBJECT* DeviceObject, - _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp) -{ - PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE* AddressFile; - RECEIVE_DATAGRAM_REQUEST* Request; - LIST_ENTRY* ListEntry; - KIRQL OldIrql; - - IoReleaseCancelSpinLock(Irp->CancelIrql); - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = IrpSp->FileObject->FsContext; - - /* Find this IRP in the list of requests */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - ListEntry = AddressFile->RequestListHead.Flink; - while (ListEntry != &AddressFile->RequestListHead) - { - Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); - if (Request->Irp == Irp) - break; - ListEntry = ListEntry->Flink; - } - - /* We must have found it */ - NT_ASSERT(ListEntry != &AddressFile->RequestListHead); - - RemoveEntryList(&Request->ListEntry); - - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + _Inout_ struct _DEVICE_OBJECT* DeviceObject, + _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE* AddressFile; + RECEIVE_DATAGRAM_REQUEST* Request; + LIST_ENTRY* ListEntry; + KIRQL OldIrql; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = IrpSp->FileObject->FsContext; + + /* Find this IRP in the list of requests */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + ListEntry = AddressFile->RequestListHead.Flink; + while (ListEntry != &AddressFile->RequestListHead) + { + Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); + if (Request->Irp == Irp) + break; + ListEntry = ListEntry->Flink; + } + + /* We must have found it */ + NT_ASSERT(ListEntry != &AddressFile->RequestListHead); + + RemoveEntryList(&Request->ListEntry); + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); } /* implementation in testing */ @@ -1370,6 +1418,7 @@ PTCP_CONTEXT Context; PTDI_REQUEST_KERNEL_CONNECT Parameters; PTRANSPORT_ADDRESS RemoteTransportAddress; + KIRQL OldIrql; struct sockaddr *SocketAddressRemote; struct sockaddr_in *SocketAddressInRemote; @@ -1412,10 +1461,13 @@ Context->lwip_tcp_pcb->local_ip, Context->lwip_tcp_pcb->local_port); + DPRINT1("Call into lwIP tcp_connect(). Context at %p, pcb at %p\n", + Context, Context->lwip_tcp_pcb); lwip_err = tcp_connect(Context->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_connected_callback); + DPRINT1("Return from lwIP tcp_connect()\n"); switch (lwip_err) { case (ERR_VAL) : @@ -1454,6 +1506,7 @@ } case (ERR_OK) : { + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, CancelRequestRoutine, @@ -1461,6 +1514,7 @@ TCP_REQUEST_PENDING_GENERAL); tcp_arg(Context->lwip_tcp_pcb, Context); Context->TcpState = TCP_STATE_CONNECTING; + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } default : @@ -1662,12 +1716,13 @@ if (Request->PendingIrp) { IrpSp = IoGetCurrentIrpStackLocation(Request->PendingIrp); - DPRINT1("Pending IRP Control Code: %08x\n", IrpSp->MinorFunction); + DPRINT1("Pending IRP MonorFunction: %08x\n", IrpSp->MinorFunction); } else { DPRINT1("IRP is NULL\n"); } + Entry = Entry->Flink; } } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); @@ -1675,13 +1730,8 @@ KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); RemoveEntryList(&Context->ListEntry); AddressFile->ContextCount--; - Context->AddressFile = NULL; + Context->TcpState |= TCP_STATE_DISASSOCIATED; KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - - if (AddressFile->ContextCount == 0) - { - return TcpIpCloseAddress(AddressFile); - } return STATUS_SUCCESS; } @@ -1738,12 +1788,14 @@ } KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE, TCP_REQUEST_PENDING_GENERAL); Context->TcpState = TCP_STATE_LISTENING; + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } @@ -1861,10 +1913,11 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + KIRQL OldIrql; PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; - DPRINT1("Receive IRP Address: %08x\n", Irp); + DPRINT1("Receive IRP Address: %p\n", Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1880,6 +1933,8 @@ { RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); + + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, @@ -1894,6 +1949,7 @@ Context->TcpState |= TCP_STATE_RECEIVING; } + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } DPRINT1("Invalid TCP state: %d\n", Context->TcpState); @@ -1903,275 +1959,275 @@ NTSTATUS TcpIpReceiveDatagram( - _Inout_ PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - ADDRESS_FILE *AddressFile; - RECEIVE_DATAGRAM_REQUEST* Request = NULL; - PTDI_REQUEST_KERNEL_RECEIVEDG RequestInfo; - NTSTATUS Status; - - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - Status = STATUS_FILE_INVALID; - goto Failure; - } - - /* Get the address file */ - AddressFile = IrpSp->FileObject->FsContext; - - if (AddressFile->Protocol == IPPROTO_TCP) - { - /* TCP has no such thing as datagrams */ - DPRINT1("Received TDI_RECEIVE_DATAGRAM for a TCP adress file.\n"); - Status = STATUS_INVALID_ADDRESS; - goto Failure; - } - - /* Queue the request */ - Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_DGRAM_REQST); - if (!Request) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Failure; - } - RtlZeroMemory(Request, sizeof(*Request)); - Request->Irp = Irp; - - /* Get details about what we should be receiving */ - RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&IrpSp->Parameters; - - /* Get the address */ - if (RequestInfo->ReceiveDatagramInformation->RemoteAddressLength != 0) - { - Status = ExtractAddressFromList( - RequestInfo->ReceiveDatagramInformation->RemoteAddress, - &Request->RemoteAddress); - if (!NT_SUCCESS(Status)) - goto Failure; - } - - DPRINT1("Queuing datagram receive on address 0x%08x, port %u.\n", - Request->RemoteAddress.in_addr, Request->RemoteAddress.sin_port); - - /* Get the buffer */ - Request->Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - Request->BufferLength = MmGetMdlByteCount(Irp->MdlAddress); - - Request->ReturnInfo = RequestInfo->ReturnDatagramInformation; - - /* Mark pending */ - Irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(Irp); - IoSetCancelRoutine(Irp, CancelReceiveDatagram); - - /* We're ready to go */ - ExInterlockedInsertTailList( - &AddressFile->RequestListHead, - &Request->ListEntry, - &AddressFile->RequestLock); - - return STATUS_PENDING; + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + ADDRESS_FILE *AddressFile; + RECEIVE_DATAGRAM_REQUEST* Request = NULL; + PTDI_REQUEST_KERNEL_RECEIVEDG RequestInfo; + NTSTATUS Status; + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + Status = STATUS_FILE_INVALID; + goto Failure; + } + + /* Get the address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol == IPPROTO_TCP) + { + /* TCP has no such thing as datagrams */ + DPRINT1("Received TDI_RECEIVE_DATAGRAM for a TCP adress file.\n"); + Status = STATUS_INVALID_ADDRESS; + goto Failure; + } + + /* Queue the request */ + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_DGRAM_REQST); + if (!Request) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; + } + RtlZeroMemory(Request, sizeof(*Request)); + Request->Irp = Irp; + + /* Get details about what we should be receiving */ + RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&IrpSp->Parameters; + + /* Get the address */ + if (RequestInfo->ReceiveDatagramInformation->RemoteAddressLength != 0) + { + Status = ExtractAddressFromList( + RequestInfo->ReceiveDatagramInformation->RemoteAddress, + &Request->RemoteAddress); + if (!NT_SUCCESS(Status)) + goto Failure; + } + + DPRINT1("Queuing datagram receive on address 0x%08x, port %u.\n", + Request->RemoteAddress.in_addr, Request->RemoteAddress.sin_port); + + /* Get the buffer */ + Request->Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + Request->BufferLength = MmGetMdlByteCount(Irp->MdlAddress); + + Request->ReturnInfo = RequestInfo->ReturnDatagramInformation; + + /* Mark pending */ + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + IoSetCancelRoutine(Irp, CancelReceiveDatagram); + + /* We're ready to go */ + ExInterlockedInsertTailList( + &AddressFile->RequestListHead, + &Request->ListEntry, + &AddressFile->RequestLock); + + return STATUS_PENDING; Failure: - if (Request) - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - return Status; + if (Request) + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return Status; } NTSTATUS TcpIpSendDatagram( - _Inout_ PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - ADDRESS_FILE *AddressFile; - PTDI_REQUEST_KERNEL_SENDDG RequestInfo; - NTSTATUS Status; - ip_addr_t IpAddr; - u16_t Port; - PVOID Buffer; - ULONG BufferLength; - struct pbuf* p = NULL; - err_t lwip_error; - - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - Status = STATUS_FILE_INVALID; - goto Finish; - } - - /* Get the address file */ - AddressFile = IrpSp->FileObject->FsContext; - - if (AddressFile->Protocol == IPPROTO_TCP) - { - /* TCP has no such thing as datagrams */ - DPRINT1("Received TDI_SEND_DATAGRAM for a TCP adress file.\n"); - Status = STATUS_INVALID_ADDRESS; - goto Finish; - } - - /* Get details about what we should be receiving */ - RequestInfo = (PTDI_REQUEST_KERNEL_SENDDG)&IrpSp->Parameters; - - /* Get the address */ - if (RequestInfo->SendDatagramInformation->RemoteAddressLength != 0) - { - TDI_ADDRESS_IP Address; - Status = ExtractAddressFromList( - RequestInfo->SendDatagramInformation->RemoteAddress, - &Address); - if (!NT_SUCCESS(Status)) - goto Finish; - ip4_addr_set_u32(&IpAddr, Address.in_addr); - Port = lwip_ntohs(Address.sin_port); - } - else - { - ip_addr_set_any(&IpAddr); - Port = 0; - } - - DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), lwip_ntohs(Port)); - - /* Get the buffer */ - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - BufferLength = MmGetMdlByteCount(Irp->MdlAddress); - p = pbuf_alloc(PBUF_RAW, BufferLength, PBUF_REF); - if (!p) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Finish; - } - p->payload = Buffer; - - /* Send it for real */ - switch (AddressFile->Protocol) - { - case IPPROTO_UDP: - if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || - (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && - (Port == 67) && (AddressFile->Address.in_addr == 0)) - { - struct netif* lwip_netif = netif_list; - - /* - * This is a DHCP packet for an address file with address 0.0.0.0. - * Try to find an ethernet interface with no address set, - * and send the packet through it. - */ - while (lwip_netif != NULL) - { - if (ip4_addr_get_u32(&lwip_netif->ip_addr) == 0) - break; - lwip_netif = lwip_netif->next; - } - - if (lwip_netif == NULL) - { - /* Do a regular send. (This will most likely fail) */ - lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); - } - else - { - /* We found an interface with address being 0.0.0.0 */ - lwip_error = udp_sendto_if(AddressFile->lwip_udp_pcb, p, &IpAddr, Port, lwip_netif); - } - } - else - { - lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); - } - break; - default: - lwip_error = raw_sendto(AddressFile->lwip_raw_pcb, p, &IpAddr); - break; - } - - switch (lwip_error) - { - case ERR_OK: - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = BufferLength; - break; - case ERR_MEM: - case ERR_BUF: - DPRINT1("Received ERR_MEM from lwip.\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - case ERR_RTE: - DPRINT1("Received ERR_RTE from lwip.\n"); - Status = STATUS_INVALID_ADDRESS; - break; - case ERR_VAL: - DPRINT1("Received ERR_VAL from lwip.\n"); - Status = STATUS_INVALID_PARAMETER; - break; - default: - DPRINT1("Received error %d from lwip.\n", lwip_error); - Status = STATUS_UNEXPECTED_NETWORK_ERROR; - } + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + ADDRESS_FILE *AddressFile; + PTDI_REQUEST_KERNEL_SENDDG RequestInfo; + NTSTATUS Status; + ip_addr_t IpAddr; + u16_t Port; + PVOID Buffer; + ULONG BufferLength; + struct pbuf* p = NULL; + err_t lwip_error; + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + Status = STATUS_FILE_INVALID; + goto Finish; + } + + /* Get the address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol == IPPROTO_TCP) + { + /* TCP has no such thing as datagrams */ + DPRINT1("Received TDI_SEND_DATAGRAM for a TCP adress file.\n"); + Status = STATUS_INVALID_ADDRESS; + goto Finish; + } + + /* Get details about what we should be receiving */ + RequestInfo = (PTDI_REQUEST_KERNEL_SENDDG)&IrpSp->Parameters; + + /* Get the address */ + if (RequestInfo->SendDatagramInformation->RemoteAddressLength != 0) + { + TDI_ADDRESS_IP Address; + Status = ExtractAddressFromList( + RequestInfo->SendDatagramInformation->RemoteAddress, + &Address); + if (!NT_SUCCESS(Status)) + goto Finish; + ip4_addr_set_u32(&IpAddr, Address.in_addr); + Port = lwip_ntohs(Address.sin_port); + } + else + { + ip_addr_set_any(&IpAddr); + Port = 0; + } + + DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), lwip_ntohs(Port)); + + /* Get the buffer */ + Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + BufferLength = MmGetMdlByteCount(Irp->MdlAddress); + p = pbuf_alloc(PBUF_RAW, BufferLength, PBUF_REF); + if (!p) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + p->payload = Buffer; + + /* Send it for real */ + switch (AddressFile->Protocol) + { + case IPPROTO_UDP: + if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || + (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && + (Port == 67) && (AddressFile->Address.in_addr == 0)) + { + struct netif* lwip_netif = netif_list; + + /* + * This is a DHCP packet for an address file with address 0.0.0.0. + * Try to find an ethernet interface with no address set, + * and send the packet through it. + */ + while (lwip_netif != NULL) + { + if (ip4_addr_get_u32(&lwip_netif->ip_addr) == 0) + break; + lwip_netif = lwip_netif->next; + } + + if (lwip_netif == NULL) + { + /* Do a regular send. (This will most likely fail) */ + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } + else + { + /* We found an interface with address being 0.0.0.0 */ + lwip_error = udp_sendto_if(AddressFile->lwip_udp_pcb, p, &IpAddr, Port, lwip_netif); + } + } + else + { + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } + break; + default: + lwip_error = raw_sendto(AddressFile->lwip_raw_pcb, p, &IpAddr); + break; + } + + switch (lwip_error) + { + case ERR_OK: + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = BufferLength; + break; + case ERR_MEM: + case ERR_BUF: + DPRINT1("Received ERR_MEM from lwip.\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + case ERR_RTE: + DPRINT1("Received ERR_RTE from lwip.\n"); + Status = STATUS_INVALID_ADDRESS; + break; + case ERR_VAL: + DPRINT1("Received ERR_VAL from lwip.\n"); + Status = STATUS_INVALID_PARAMETER; + break; + default: + DPRINT1("Received error %d from lwip.\n", lwip_error); + Status = STATUS_UNEXPECTED_NETWORK_ERROR; + } Finish: - if (p) - pbuf_free(p); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - return Status; + if (p) + pbuf_free(p); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return Status; } NTSTATUS AddressSetIpDontFragment( - _In_ TDIEntityID ID, - _In_ PVOID InBuffer, - _In_ ULONG BufferSize) -{ - /* Silently ignore. - * lwip doesn't have such thing, and already tries to fragment data as less as possible */ - return STATUS_SUCCESS; + _In_ TDIEntityID ID, + _In_ PVOID InBuffer, + _In_ ULONG BufferSize) +{ + /* Silently ignore. + * lwip doesn't have such thing, and already tries to fragment data as less as possible */ + return STATUS_SUCCESS; } NTSTATUS AddressSetTtl( - _In_ TDIEntityID ID, - _In_ PVOID InBuffer, - _In_ ULONG BufferSize) -{ - ADDRESS_FILE* AddressFile; - TCPIP_INSTANCE* Instance; - NTSTATUS Status; - ULONG Value; - - if (BufferSize < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - - /* Get the address file */ - Status = GetInstance(ID, &Instance); - if (!NT_SUCCESS(Status)) - return Status; - - AddressFile = CONTAINING_RECORD(Instance, ADDRESS_FILE, Instance); - - /* Get the value */ - Value = *((ULONG*)InBuffer); - - switch (AddressFile->Protocol) - { - case IPPROTO_TCP: - DPRINT1("TCP not supported yet.\n"); - break; - case IPPROTO_UDP: - AddressFile->lwip_udp_pcb->ttl = Value; - break; - default: - AddressFile->lwip_raw_pcb->ttl = Value; - break; - } - - return STATUS_SUCCESS; -} + _In_ TDIEntityID ID, + _In_ PVOID InBuffer, + _In_ ULONG BufferSize) +{ + ADDRESS_FILE* AddressFile; + TCPIP_INSTANCE* Instance; + NTSTATUS Status; + ULONG Value; + + if (BufferSize < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + /* Get the address file */ + Status = GetInstance(ID, &Instance); + if (!NT_SUCCESS(Status)) + return Status; + + AddressFile = CONTAINING_RECORD(Instance, ADDRESS_FILE, Instance); + + /* Get the value */ + Value = *((ULONG*)InBuffer); + + switch (AddressFile->Protocol) + { + case IPPROTO_TCP: + DPRINT1("TCP not supported yet.\n"); + break; + case IPPROTO_UDP: + AddressFile->lwip_udp_pcb->ttl = Value; + break; + default: + AddressFile->lwip_raw_pcb->ttl = Value; + break; + } + + return STATUS_SUCCESS; +} 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 Jul 8 17:52:42 2016 @@ -9,18 +9,19 @@ #define TCP_REQUEST_PENDING_SEND 1 #define TCP_REQUEST_PENDING_RECEIVE 2 -#define TCP_STATE_CREATED 0x1 << 0 -#define TCP_STATE_BOUND 0x1 << 1 -#define TCP_STATE_LISTENING 0x1 << 2 -#define TCP_STATE_ACCEPTED 0x1 << 3 -#define TCP_STATE_RECEIVING 0x1 << 4 -#define TCP_STATE_ABORTED 0x1 << 5 -#define TCP_STATE_CONNECTING 0x1 << 6 -#define TCP_STATE_CONNECTED 0x1 << 7 -#define TCP_STATE_SENDING 0x1 << 8 +#define TCP_STATE_CREATED 0x1 << 0 +#define TCP_STATE_BOUND 0x1 << 1 +#define TCP_STATE_LISTENING 0x1 << 2 +#define TCP_STATE_ACCEPTED 0x1 << 3 +#define TCP_STATE_RECEIVING 0x1 << 4 +#define TCP_STATE_ABORTED 0x1 << 5 +#define TCP_STATE_CONNECTING 0x1 << 6 +#define TCP_STATE_CONNECTED 0x1 << 7 +#define TCP_STATE_SENDING 0x1 << 8 +#define TCP_STATE_DISASSOCIATED 0x1 << 9 typedef struct _ADDRESS_FILE { - UCHAR Type; + UCHAR Type; // must be the first member LIST_ENTRY ListEntry; LONG RefCount; LONG ContextCount; @@ -46,7 +47,7 @@ } ADDRESS_FILE, *PADDRESS_FILE; typedef struct _TCP_CONTEXT { - UCHAR Type; + UCHAR Type; // must be the first member LIST_ENTRY ListEntry; PADDRESS_FILE AddressFile; IPPROTO Protocol; 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 Jul 8 17:52:42 2016 @@ -360,7 +360,6 @@ { case TDI_TRANSPORT_ADDRESS_FILE: DPRINT1("TCPIP Close Transport Address\n"); - if (!IrpSp->FileObject->FsContext) { DPRINT1("TCPIP: Got a close request without a file to close!\n");

1 0

[hbelusca] 71864: [FLTMGR]: Remove a MSVC warning: FltObjectDereference, whose prototype is publicly defined in fltkernel.h, doesn't return any value.
by hbelusca＠svn.reactos.org 08 Jul '16

08 Jul '16

Author: hbelusca Date: Fri Jul 8 17:44:59 2016 New Revision: 71864 URL: http://svn.reactos.org/svn/reactos?rev=71864&view=rev Log: [FLTMGR]: Remove a MSVC warning: FltObjectDereference, whose prototype is publicly defined in fltkernel.h, doesn't return any value. Modified: trunk/reactos/drivers/filters/fltmgr/Object.c Modified: trunk/reactos/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Obj… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] Fri Jul 8 17:44:59 2016 @@ -36,11 +36,11 @@ return STATUS_SUCCESS; } -BOOLEAN +VOID NTAPI FltObjectDereference(_Inout_ PFLT_OBJECT Object) { - return FltpExReleaseRundownProtection(&Object->RundownRef); + FltpExReleaseRundownProtection(&Object->RundownRef); }

1 0

[gedmurphy] 71863: - Slight code cleanup - Add missing PAGED_CODE (thanks thomas)
by gedmurphy＠svn.reactos.org 08 Jul '16

08 Jul '16

Author: gedmurphy Date: Fri Jul 8 13:41:31 2016 New Revision: 71863 URL: http://svn.reactos.org/svn/reactos?rev=71863&view=rev Log: - Slight code cleanup - Add missing PAGED_CODE (thanks thomas) Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Fri Jul 8 13:41:31 2016 @@ -1352,8 +1352,8 @@ PFILE_OBJECT_EXTENSION FileObjectExtension; ASSERT(FALSE); - /* The extension buffer comes directly after the file object */ - FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + /* Cast the buffer to something we understand */ + FileObjectExtension = FileObject->FileObjectExtension; /* Check if have a replacement top level device */ if (FileObjectExtension->TopDeviceObjectHint) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Jul 8 13:41:31 2016 @@ -818,6 +818,7 @@ FileObject->Flags |= FO_FILE_OBJECT_HAS_EXTENSION; FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + FileObject->FileObjectExtension = FileObjectExtension; /* Add the top level device which we'll send the request to */ if (OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) @@ -2669,6 +2670,8 @@ { ULONG Flags = 0; + PAGED_CODE(); + /* Check if we were passed a device to send the create request to*/ if (DeviceObject) {

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