Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 59357: [SVCHOST] - Convert tabs to spaces. No code changes.
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 11:10:28 2013 New Revision: 59357 URL: http://svn.reactos.org/svn/reactos?rev=59357&view=rev Log: [SVCHOST] - Convert tabs to spaces. No code changes. Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Sat Jun 29 11:10:28 2013 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS SvcHost - * LICENSE: GPL - See COPYING in the top level directory - * FILE: /base/services/svchost/svchost.c - * PURPOSE: Provide dll service loader - * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) + * PROJECT: ReactOS SvcHost + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/svchost/svchost.c + * PURPOSE: Provide dll service loader + * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) */ /* INCLUDES ******************************************************************/ @@ -15,12 +15,12 @@ /* DEFINES *******************************************************************/ -static LPCTSTR SVCHOST_REG_KEY = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"); -static LPCTSTR SERVICE_KEY = _T("SYSTEM\\CurrentControlSet\\Services\\"); -static LPCTSTR PARAMETERS_KEY = _T("\\Parameters"); - -#define SERVICE_KEY_LENGTH _tcslen(SERVICE_KEY); -#define REG_MAX_DATA_SIZE 2048 +static LPCTSTR SVCHOST_REG_KEY = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"); +static LPCTSTR SERVICE_KEY = _T("SYSTEM\\CurrentControlSet\\Services\\"); +static LPCTSTR PARAMETERS_KEY = _T("\\Parameters"); + +#define SERVICE_KEY_LENGTH _tcslen(SERVICE_KEY); +#define REG_MAX_DATA_SIZE 2048 static PSERVICE FirstService = NULL; @@ -28,127 +28,127 @@ BOOL PrepareService(LPCTSTR ServiceName) { - HKEY hServiceKey; - TCHAR ServiceKeyBuffer[MAX_PATH + 1]; - DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]); - DWORD KeyType; - PTSTR Buffer = NULL; - DWORD BufferSize = MAX_PATH + 1; - LONG RetVal; - HINSTANCE hServiceDll; - TCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ - LPSERVICE_MAIN_FUNCTION ServiceMainFunc; - PSERVICE Service; - - /* Compose the registry path to the service's "Parameter" key */ - _tcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); - LeftOfBuffer -= _tcslen(SERVICE_KEY); - _tcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); - LeftOfBuffer -= _tcslen(ServiceName); - _tcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); - LeftOfBuffer -= _tcslen(PARAMETERS_KEY); - - if (LeftOfBuffer < 0) - { - DPRINT1("Buffer overflow for service name: '%s'\n", ServiceName); - return FALSE; - } - - /* Open the service registry key to find the dll name */ - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey)) - { - DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer); - return FALSE; - } - - do - { - if (Buffer) - HeapFree(GetProcessHeap(), 0, Buffer); - - Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); - if (NULL == Buffer) - { - DPRINT1("Not enough memory for service: %s\n", ServiceName); - return FALSE; - } - - RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); - - } while (ERROR_MORE_DATA == RetVal); - - - RegCloseKey(hServiceKey); - - if (ERROR_SUCCESS != RetVal || 0 == BufferSize) - { - DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal); - HeapFree(GetProcessHeap(), 0, Buffer); - return FALSE; - } - - /* Convert possible %SystemRoot% to a real path */ - BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath)); - if (0 == BufferSize) - { - DPRINT1("Invalid ServiceDll path: %s\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); - return FALSE; - } - - HeapFree(GetProcessHeap(), 0, Buffer); - - /* Load the service dll */ - DPRINT("Trying to load dll\n"); - hServiceDll = LoadLibrary(DllPath); - - if (NULL == hServiceDll) - { - DPRINT1("Unable to load ServiceDll: %s, ErrorCode: %u\n", DllPath, GetLastError()); - return FALSE; - } - - ServiceMainFunc = (LPSERVICE_MAIN_FUNCTION)GetProcAddress(hServiceDll, "ServiceMain"); - - /* Allocate a service node in the linked list */ - Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE)); - if (NULL == Service) - { - DPRINT1("Not enough memory for service: %s\n", ServiceName); - return FALSE; - } - - memset(Service, 0, sizeof(SERVICE)); - Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR)); - if (NULL == Service->Name) - { - DPRINT1("Not enough memory for service: %s\n", ServiceName); - HeapFree(GetProcessHeap(), 0, Service); - return FALSE; - } - _tcscpy(Service->Name, ServiceName); - - Service->hServiceDll = hServiceDll; - Service->ServiceMainFunc = ServiceMainFunc; - - Service->Next = FirstService; - FirstService = Service; - - return TRUE; + HKEY hServiceKey; + TCHAR ServiceKeyBuffer[MAX_PATH + 1]; + DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]); + DWORD KeyType; + PTSTR Buffer = NULL; + DWORD BufferSize = MAX_PATH + 1; + LONG RetVal; + HINSTANCE hServiceDll; + TCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ + LPSERVICE_MAIN_FUNCTION ServiceMainFunc; + PSERVICE Service; + + /* Compose the registry path to the service's "Parameter" key */ + _tcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); + LeftOfBuffer -= _tcslen(SERVICE_KEY); + _tcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); + LeftOfBuffer -= _tcslen(ServiceName); + _tcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); + LeftOfBuffer -= _tcslen(PARAMETERS_KEY); + + if (LeftOfBuffer < 0) + { + DPRINT1("Buffer overflow for service name: '%s'\n", ServiceName); + return FALSE; + } + + /* Open the service registry key to find the dll name */ + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey)) + { + DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer); + return FALSE; + } + + do + { + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (NULL == Buffer) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + return FALSE; + } + + RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); + + } while (ERROR_MORE_DATA == RetVal); + + + RegCloseKey(hServiceKey); + + if (ERROR_SUCCESS != RetVal || 0 == BufferSize) + { + DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + + /* Convert possible %SystemRoot% to a real path */ + BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, _countof(DllPath)); + if (0 == BufferSize) + { + DPRINT1("Invalid ServiceDll path: %s\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + + HeapFree(GetProcessHeap(), 0, Buffer); + + /* Load the service dll */ + DPRINT("Trying to load dll\n"); + hServiceDll = LoadLibrary(DllPath); + + if (NULL == hServiceDll) + { + DPRINT1("Unable to load ServiceDll: %s, ErrorCode: %u\n", DllPath, GetLastError()); + return FALSE; + } + + ServiceMainFunc = (LPSERVICE_MAIN_FUNCTION)GetProcAddress(hServiceDll, "ServiceMain"); + + /* Allocate a service node in the linked list */ + Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE)); + if (NULL == Service) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + return FALSE; + } + + memset(Service, 0, sizeof(SERVICE)); + Service->Name = HeapAlloc(GetProcessHeap(), 0, (_tcslen(ServiceName)+1) * sizeof(TCHAR)); + if (NULL == Service->Name) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + HeapFree(GetProcessHeap(), 0, Service); + return FALSE; + } + _tcscpy(Service->Name, ServiceName); + + Service->hServiceDll = hServiceDll; + Service->ServiceMainFunc = ServiceMainFunc; + + Service->Next = FirstService; + FirstService = Service; + + return TRUE; } VOID FreeServices(VOID) { - while (FirstService) - { - PSERVICE Service = FirstService; - FirstService = Service->Next; - - FreeLibrary(Service->hServiceDll); - - HeapFree(GetProcessHeap(), 0, Service->Name); - HeapFree(GetProcessHeap(), 0, Service); - } + while (FirstService) + { + PSERVICE Service = FirstService; + FirstService = Service->Next; + + FreeLibrary(Service->hServiceDll); + + HeapFree(GetProcessHeap(), 0, Service->Name); + HeapFree(GetProcessHeap(), 0, Service); + } } /* @@ -156,107 +156,107 @@ */ DWORD LoadServiceCategory(LPCTSTR ServiceCategory) { - HKEY hServicesKey; - DWORD KeyType; - DWORD BufferSize = REG_MAX_DATA_SIZE; - TCHAR Buffer[REG_MAX_DATA_SIZE]; - LPCTSTR ServiceName; - DWORD BufferIndex = 0; - DWORD NrOfServices = 0; - - /* Get all the services in this category */ - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey)) - { - DPRINT1("Could not open service category: %s\n", ServiceCategory); - return 0; - } - - if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize)) - { - DPRINT1("Could not open service category (2): %s\n", ServiceCategory); - RegCloseKey(hServicesKey); - return 0; - } - - /* Clean up */ - RegCloseKey(hServicesKey); - - /* Load services in the category */ - ServiceName = Buffer; - while (_T('\0') != ServiceName[0]) - { - size_t Length; - - Length = _tcslen(ServiceName); - if (0 == Length) - break; - - if (TRUE == PrepareService(ServiceName)) - ++NrOfServices; - - BufferIndex += Length + 1; - - ServiceName = &Buffer[BufferIndex]; - } - - return NrOfServices; + HKEY hServicesKey; + DWORD KeyType; + DWORD BufferSize = REG_MAX_DATA_SIZE; + TCHAR Buffer[REG_MAX_DATA_SIZE]; + LPCTSTR ServiceName; + DWORD BufferIndex = 0; + DWORD NrOfServices = 0; + + /* Get all the services in this category */ + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey)) + { + DPRINT1("Could not open service category: %s\n", ServiceCategory); + return 0; + } + + if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize)) + { + DPRINT1("Could not open service category (2): %s\n", ServiceCategory); + RegCloseKey(hServicesKey); + return 0; + } + + /* Clean up */ + RegCloseKey(hServicesKey); + + /* Load services in the category */ + ServiceName = Buffer; + while (_T('\0') != ServiceName[0]) + { + size_t Length; + + Length = _tcslen(ServiceName); + if (0 == Length) + break; + + if (TRUE == PrepareService(ServiceName)) + ++NrOfServices; + + BufferIndex += Length + 1; + + ServiceName = &Buffer[BufferIndex]; + } + + return NrOfServices; } int _tmain (int argc, LPTSTR argv []) { - DWORD NrOfServices; - LPSERVICE_TABLE_ENTRY ServiceTable; - - if (argc < 3) - { - /* MS svchost.exe doesn't seem to print help, should we? */ - return 0; - } - - if (_tcscmp(argv[1], _T("-k")) != 0) - { - /* For now, we only handle "-k" */ - return 0; - } - - NrOfServices = LoadServiceCategory(argv[2]); - - DPRINT("NrOfServices: %lu\n", NrOfServices); - if (0 == NrOfServices) - return 0; - - ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); - - if (NULL != ServiceTable) - { - DWORD i; - PSERVICE Service = FirstService; - - /* Fill the service table */ - for (i = 0; i < NrOfServices; i++) - { - DPRINT("Loading service: %s\n", Service->Name); - ServiceTable[i].lpServiceName = Service->Name; - ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; - Service = Service->Next; - } - - /* Set a NULL entry to end the service table */ - ServiceTable[i].lpServiceName = NULL; - ServiceTable[i].lpServiceProc = NULL; - - if (FALSE == StartServiceCtrlDispatcher(ServiceTable)) - DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); - - HeapFree(GetProcessHeap(), 0, ServiceTable); - } - else - { - DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); - } - - DPRINT("Freeing services...\n"); - FreeServices(); + DWORD NrOfServices; + LPSERVICE_TABLE_ENTRY ServiceTable; + + if (argc < 3) + { + /* MS svchost.exe doesn't seem to print help, should we? */ + return 0; + } + + if (_tcscmp(argv[1], _T("-k")) != 0) + { + /* For now, we only handle "-k" */ + return 0; + } + + NrOfServices = LoadServiceCategory(argv[2]); + + DPRINT("NrOfServices: %lu\n", NrOfServices); + if (0 == NrOfServices) + return 0; + + ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); + + if (NULL != ServiceTable) + { + DWORD i; + PSERVICE Service = FirstService; + + /* Fill the service table */ + for (i = 0; i < NrOfServices; i++) + { + DPRINT("Loading service: %s\n", Service->Name); + ServiceTable[i].lpServiceName = Service->Name; + ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; + Service = Service->Next; + } + + /* Set a NULL entry to end the service table */ + ServiceTable[i].lpServiceName = NULL; + ServiceTable[i].lpServiceProc = NULL; + + if (FALSE == StartServiceCtrlDispatcher(ServiceTable)) + DPRINT1("Failed to start service control dispatcher, ErrorCode: %lu\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, ServiceTable); + } + else + { + DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1)); + } + + DPRINT("Freeing services...\n"); + FreeServices(); return 0; } Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Sat Jun 29 11:10:28 2013 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS SvcHost - * LICENSE: GPL - See COPYING in the top level directory - * FILE: /base/services/svchost/svchost.h - * PURPOSE: Provide dll service loader - * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) + * PROJECT: ReactOS SvcHost + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/svchost/svchost.h + * PURPOSE: Provide dll service loader + * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) */ #pragma once @@ -24,15 +24,14 @@ /* DEFINES *******************************************************************/ -#define CS_TIMEOUT 1000 +#define CS_TIMEOUT 1000 typedef struct _SERVICE { - PTSTR Name; - HINSTANCE hServiceDll; - LPSERVICE_MAIN_FUNCTION ServiceMainFunc; - struct _SERVICE *Next; + PTSTR Name; + HINSTANCE hServiceDll; + LPSERVICE_MAIN_FUNCTION ServiceMainFunc; + struct _SERVICE *Next; } SERVICE, *PSERVICE; - /* FUNCTIONS *****************************************************************/

1 0

[tfaber] 59356: [QUARTZ_WINETEST] - Skip dsoundrender, filtergraph, misc, videorenderer tests because they cause testbot timeouts. ROSTESTS-116
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 08:36:39 2013 New Revision: 59356 URL: http://svn.reactos.org/svn/reactos?rev=59356&view=rev Log: [QUARTZ_WINETEST] - Skip dsoundrender, filtergraph, misc, videorenderer tests because they cause testbot timeouts. ROSTESTS-116 Modified: trunk/rostests/winetests/quartz/testlist.c Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Sat Jun 29 08:36:39 2013 @@ -18,12 +18,16 @@ const struct test winetest_testlist[] = { { "avisplitter", func_avisplitter }, - { "dsoundrender", func_dsoundrender }, - { "filtergraph", func_filtergraph }, - { "filtermapper", func_filtermapper }, - { "memallocator", func_memallocator }, - { "misc", func_misc }, - { "videorenderer", func_videorenderer }, - { "referenceclock", func_referenceclock }, +#ifdef ROSTESTS_116_FIXED + { "dsoundrender", func_dsoundrender }, + { "filtergraph", func_filtergraph }, +#endif /* ROSTESTS_116_FIXED */ + { "filtermapper", func_filtermapper }, + { "memallocator", func_memallocator }, +#ifdef ROSTESTS_116_FIXED + { "misc", func_misc }, + { "videorenderer", func_videorenderer }, +#endif /* ROSTESTS_116_FIXED */ + { "referenceclock", func_referenceclock }, { 0, 0 } };

1 0

[tfaber] 59355: [KERNEL32] - Fix use of uninitialized variables in failure case. Patch by Samuel Serapión CORE-7302 #resolve
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 06:08:57 2013 New Revision: 59355 URL: http://svn.reactos.org/svn/reactos?rev=59355&view=rev Log: [KERNEL32] - Fix use of uninitialized variables in failure case. Patch by Samuel Serapión CORE-7302 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sat Jun 29 06:08:57 2013 @@ -990,7 +990,7 @@ OUT LPSTR *lpFilePart) { NTSTATUS Status; - PWCHAR Buffer; + PWCHAR Buffer = NULL; ULONG PathSize, FilePartSize; ANSI_STRING AnsiString; UNICODE_STRING FileNameString, UniString; Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Jun 29 06:08:57 2013 @@ -309,7 +309,7 @@ { BOOL Result; ULONG RegionSize, EnvironmentSize = 0; - PWCHAR p, Environment, NewEnvironment; + PWCHAR p, Environment, NewEnvironment = NULL; NTSTATUS Status; /* Make sure we have both strings */

1 0

[tfaber] 59354: [CRT] - Handle realloc failure in SetEnv. Based on patch by Samuel Serapión CORE-7306 #resolve
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 06:04:58 2013 New Revision: 59354 URL: http://svn.reactos.org/svn/reactos?rev=59354&view=rev Log: [CRT] - Handle realloc failure in SetEnv. Based on patch by Samuel Serapión CORE-7306 #resolve Modified: trunk/reactos/lib/sdk/crt/misc/environ.c Modified: trunk/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/environ.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] Sat Jun 29 06:04:58 2013 @@ -214,6 +214,8 @@ wchar_t *woption; char *mboption; int remove, index, count, size, result = 0, found = 0; + wchar_t **wnewenv; + char **mbnewenv; if (option == NULL || (epos = wcschr(option, L'=')) == NULL) return -1; @@ -261,14 +263,18 @@ free(*wenvptr); for (count = index; *wenvptr != NULL; wenvptr++, count++) *wenvptr = *(wenvptr + 1); - _wenviron = realloc(_wenviron, count * sizeof(wchar_t*)); + wnewenv = realloc(_wenviron, count * sizeof(wchar_t*)); + if (wnewenv != NULL) + _wenviron = wnewenv; /* Remove the option from multibyte environment. We assume * the environments are in sync and the option is at the * same position. */ free(_environ[index]); memmove(&_environ[index], &_environ[index+1], (count - index) * sizeof(char*)); - _environ = realloc(_environ, count * sizeof(char*)); + mbnewenv = realloc(_environ, count * sizeof(char*)); + if (mbnewenv != NULL) + _environ = mbnewenv; result = SetEnvironmentVariableW(name, NULL) ? 0 : -1; } @@ -303,9 +309,6 @@ } else { - wchar_t **wnewenv; - char **mbnewenv; - /* Get the size of the original environment. */ for (count = index; *wenvptr != NULL; wenvptr++, count++) ;

1 0

[tfaber] 59353: [NDK] - Fix some lpcfuncs.h annotations. Includes patch by Ivan Rodionov. CORE-7329 #resolve #comment Thanks.
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 05:48:22 2013 New Revision: 59353 URL: http://svn.reactos.org/svn/reactos?rev=59353&view=rev Log: [NDK] - Fix some lpcfuncs.h annotations. Includes patch by Ivan Rodionov. CORE-7329 #resolve #comment Thanks. Modified: trunk/reactos/include/ndk/lpcfuncs.h Modified: trunk/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpcfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpcfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lpcfuncs.h [iso-8859-1] Sat Jun 29 05:48:22 2013 @@ -52,7 +52,7 @@ NTSTATUS NTAPI NtAcceptConnectPort( - _In_ PHANDLE PortHandle, + _Out_ PHANDLE PortHandle, _In_opt_ PVOID PortContext, _In_ PPORT_MESSAGE ConnectionRequest, _In_ BOOLEAN AcceptConnection, @@ -71,11 +71,11 @@ NTSTATUS NTAPI NtConnectPort( - _In_ PHANDLE PortHandle, + _Out_ PHANDLE PortHandle, _In_ PUNICODE_STRING PortName, _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, _In_opt_ PPORT_VIEW ClientView, - _In_opt_ PREMOTE_PORT_VIEW ServerViewONAL, + _In_opt_ PREMOTE_PORT_VIEW ServerView, _In_opt_ PULONG MaxMessageLength, _In_opt_ PVOID ConnectionInformation, _In_opt_ PULONG ConnectionInformationLength @@ -85,7 +85,7 @@ NTSTATUS NTAPI NtCreatePort( - _In_ PHANDLE PortHandle, + _Out_ PHANDLE PortHandle, _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG MaxConnectionInfoLength, _In_ ULONG MaxMessageLength, @@ -96,7 +96,7 @@ NTSTATUS NTAPI NtCreateWaitablePort( - _In_ PHANDLE PortHandle, + _Out_ PHANDLE PortHandle, _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG MaxConnectInfoLength, _In_ ULONG MaxDataLength, @@ -206,9 +206,9 @@ NTSTATUS NTAPI NtSecureConnectPort( - PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, + _Out_ PHANDLE PortHandle, + _In_ PUNICODE_STRING PortName, + _In_ PSECURITY_QUALITY_OF_SERVICE SecurityQos, _In_opt_ PPORT_VIEW ClientView, _In_opt_ PSID Sid, _In_opt_ PREMOTE_PORT_VIEW ServerView,

1 0

[tfaber] 59352: [NTOSKRNL] - Make MSVC analyzer happy by initializing the event before calling IoBuildDeviceIoControlRequest. Patch by Ivan Rodionov (overclocker at list dot ru). CORE-7328 #resolve...
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 05:40:09 2013 New Revision: 59352 URL: http://svn.reactos.org/svn/reactos?rev=59352&view=rev Log: [NTOSKRNL] - Make MSVC analyzer happy by initializing the event before calling IoBuildDeviceIoControlRequest. Patch by Ivan Rodionov (overclocker at list dot ru). CORE-7328 #resolve #comment Committed, thanks. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Jun 29 05:40:09 2013 @@ -84,7 +84,7 @@ #define EFI_HEADER_SIGNATURE 0x5452415020494645ULL /* Defines version 1.0 */ #define EFI_HEADER_REVISION_1 0x00010000 -/* Defines system type for MBR showing that a GPT is following */ +/* Defines system type for MBR showing that a GPT is following */ #define EFI_PMBR_OSTYPE_EFI 0xEE #define IS_VALID_DISK_INFO(Disk) \ @@ -1057,7 +1057,7 @@ } DriveLayoutEx->PartitionCount = PartitionCount; - /* If we updated partition table using backup table, rewrite partition table */ + /* If we updated partition table using backup table, rewrite partition table */ if (UpdatedPartitionTable) { IoWritePartitionTableEx(Disk->DeviceObject, @@ -1777,6 +1777,7 @@ } /* Prepare for getting disk geometry */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, DeviceObject, NULL, @@ -1793,7 +1794,6 @@ } /* Then, call the drive, and wait for it if needed */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { @@ -1886,6 +1886,7 @@ } /* And call the drive to get information about partition */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO_EX, DeviceObject, NULL, @@ -1903,7 +1904,6 @@ } /* Call & wait if needed */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { @@ -1957,6 +1957,7 @@ } /* And call the drive to get information about partition */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO_EX, DeviceObject, NULL, @@ -1974,7 +1975,6 @@ } /* Call & wait if needed */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) {

1 0

[tfaber] 59351: [KMTESTS] - Skip FsRtlMcb again to make testbot happy
by tfaber＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: tfaber Date: Sat Jun 29 05:38:37 2013 New Revision: 59351 URL: http://svn.reactos.org/svn/reactos?rev=59351&view=rev Log: [KMTESTS] - Skip FsRtlMcb again to make testbot happy Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Jun 29 05:38:37 2013 @@ -68,7 +68,8 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, - { "FsRtlMcb", Test_FsRtlMcb }, + /* Skipped on testman. See ROSTESTS-106. */ + { "-FsRtlMcb", Test_FsRtlMcb }, { "-FsRtlTunnel", Test_FsRtlTunnel }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent },

1 0

[aandrejevic] 59350: [NTVDM] Implement "Get DOS Version" API call. Implement BIOS keyboard IRQ handler and some "INT 16h" functions.
by aandrejevic＠svn.reactos.org 28 Jun '13

28 Jun '13

Author: aandrejevic Date: Fri Jun 28 20:52:40 2013 New Revision: 59350 URL: http://svn.reactos.org/svn/reactos?rev=59350&view=rev Log: [NTVDM] Implement "Get DOS Version" API call. Implement BIOS keyboard IRQ handler and some "INT 16h" functions. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Jun 28 20:52:40 2013 @@ -11,12 +11,17 @@ #include "bios.h" #include "emulator.h" #include "pic.h" +#include "ps2.h" #include "timer.h" /* PRIVATE VARIABLES **********************************************************/ static BYTE CursorRow, CursorCol; static WORD ConsoleWidth, ConsoleHeight; +static BYTE BiosKeyboardMap[256]; +static WORD BiosKbdBuffer[BIOS_KBD_BUFFER_SIZE]; +static UINT BiosKbdBufferStart = 0, BiosKbdBufferEnd = 0; +static BOOLEAN BiosKbdBufferEmpty = TRUE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -38,12 +43,54 @@ return Result; } +static BOOLEAN BiosKbdBufferPush(WORD Data) +{ + /* If it's full, fail */ + if (!BiosKbdBufferEmpty && (BiosKbdBufferStart == BiosKbdBufferEnd)) + { + return FALSE; + } + + /* Otherwise, add the value to the queue */ + BiosKbdBuffer[BiosKbdBufferEnd] = Data; + BiosKbdBufferEnd++; + BiosKbdBufferEnd %= BIOS_KBD_BUFFER_SIZE; + BiosKbdBufferEmpty = FALSE; + + /* Return success */ + return TRUE; +} + +static BOOLEAN BiosKbdBufferTop(LPWORD Data) +{ + /* If it's empty, fail */ + if (BiosKbdBufferEmpty) return FALSE; + + /* Otherwise, get the value and return success */ + *Data = BiosKbdBuffer[BiosKbdBufferStart]; + return TRUE; +} + +static BOOLEAN BiosKbdBufferPop() +{ + /* If it's empty, fail */ + if (BiosKbdBufferEmpty) return FALSE; + + /* Otherwise, remove the value and return success */ + BiosKbdBufferStart++; + BiosKbdBufferStart %= BIOS_KBD_BUFFER_SIZE; + if (BiosKbdBufferStart == BiosKbdBufferEnd) BiosKbdBufferEmpty = TRUE; + + return TRUE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN BiosInitialize() { INT i; WORD Offset = 0; + HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); HANDLE ConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); @@ -84,6 +131,9 @@ CursorRow = ConsoleInfo.dwCursorPosition.Y; ConsoleWidth = ConsoleInfo.dwSize.X; ConsoleHeight = ConsoleInfo.dwSize.Y; + + /* Set the console input mode */ + SetConsoleMode(ConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); /* Initialize the PIC */ PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); @@ -183,6 +233,56 @@ *(PCHAR)((ULONG_PTR)BaseAddress + i) = LOBYTE(Attribute); } } +} + +WORD BiosPeekCharacter() +{ + WORD CharacterData; + + /* Check if there is a key available */ + if (BiosKbdBufferEmpty) return 0xFFFF; + + /* Get the key from the queue, but don't remove it */ + BiosKbdBufferTop(&CharacterData); + + return CharacterData; +} + +WORD BiosGetCharacter() +{ + WORD CharacterData; + HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); + INPUT_RECORD InputRecord; + DWORD Count; + + /* Check if there is a key available */ + if (!BiosKbdBufferEmpty) + { + /* Get the key from the queue, and remove it */ + BiosKbdBufferTop(&CharacterData); + BiosKbdBufferPop(); + } + else + { + while (TRUE) + { + /* Wait for a console event */ + WaitForSingleObject(ConsoleInput, INFINITE); + + /* Read the event, and make sure it's a keypress */ + if (!ReadConsoleInput(ConsoleInput, &InputRecord, 1, &Count)) continue; + if (InputRecord.EventType != KEY_EVENT) continue; + if (!InputRecord.Event.KeyEvent.bKeyDown) continue; + + /* Save the scan code and end the loop */ + CharacterData = (InputRecord.Event.KeyEvent.wVirtualScanCode << 8) + | InputRecord.Event.KeyEvent.uChar.AsciiChar; + + break; + } + } + + return CharacterData; } VOID BiosVideoService() @@ -270,8 +370,100 @@ } } +VOID BiosKeyboardService() +{ + DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); + + switch (HIBYTE(Eax)) + { + case 0x00: + { + /* Read the character (and wait if necessary) */ + EmulatorSetRegister(EMULATOR_REG_AX, BiosGetCharacter()); + + break; + } + + case 0x01: + { + WORD Data = BiosPeekCharacter(); + + if (Data != 0xFFFF) + { + /* There is a character, clear ZF and return it */ + EmulatorSetRegister(EMULATOR_REG_AX, Data); + EmulatorClearFlag(EMULATOR_FLAG_ZF); + } + else + { + /* No character, set ZF */ + EmulatorSetFlag(EMULATOR_FLAG_ZF); + } + + break; + } + } +} + VOID BiosHandleIrq(BYTE IrqNumber) { + switch (IrqNumber) + { + /* PIT IRQ */ + case 0: + { + /* Perform the system timer interrupt */ + EmulatorInterrupt(0x1C); + + break; + } + + /* Keyboard IRQ */ + case 1: + { + BYTE ScanCode, VirtualKey; + WORD Character; + + /* Check if there is a scancode available */ + if (!(KeyboardReadStatus() & 1)) break; + + /* Get the scan code and virtual key code */ + ScanCode = KeyboardReadData(); + VirtualKey = MapVirtualKey(ScanCode, MAPVK_VSC_TO_VK); + + /* Check if this is a key press or release */ + if (!(ScanCode & (1 << 7))) + { + /* Key press */ + if (VirtualKey == VK_NUMLOCK + || VirtualKey == VK_CAPITAL + || VirtualKey == VK_SCROLL) + { + /* For toggle keys, toggle the lowest bit in the keyboard map */ + BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); + } + + /* Set the highest bit */ + BiosKeyboardMap[VirtualKey] |= (1 << 7); + + /* Find out which character this is */ + ToAscii(ScanCode, VirtualKey, BiosKeyboardMap, &Character, 0); + + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + } + else + { + /* Key release, unset the highest bit */ + BiosKeyboardMap[VirtualKey] &= ~(1 << 7); + } + + break; + } + } + + /* Send End-of-Interrupt to the PIC */ + if (IrqNumber > 8) PicWriteCommand(PIC_SLAVE_CMD, PIC_OCW2_EOI); PicWriteCommand(PIC_MASTER_CMD, PIC_OCW2_EOI); } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Fri Jun 28 20:52:40 2013 @@ -23,14 +23,19 @@ #define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 #define VIDEO_BIOS_INTERRUPT 0x10 +#define VIDEO_KBD_INTERRUPT 0x16 #define CONSOLE_FONT_HEIGHT 8 +#define BIOS_KBD_BUFFER_SIZE 256 /* FUNCTIONS ******************************************************************/ BOOLEAN BiosInitialize(); VOID BiosUpdateConsole(ULONG StartAddress, ULONG EndAddress); VOID BiosUpdateVideoMemory(ULONG StartAddress, ULONG EndAddress); +WORD BiosPeekCharacter(); +WORD BiosGetCharacter(); VOID BiosVideoService(); +VOID BiosKeyboardService(); VOID BiosHandleIrq(BYTE IrqNumber); #endif Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Fri Jun 28 20:52:40 2013 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "dos.h" +#include "bios.h" #include "emulator.h" /* PRIVATE VARIABLES **********************************************************/ @@ -83,6 +84,14 @@ *DestBuffer = 0; return DestSegment; +} + +static VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner) +{ + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment - 1); + + /* Just set the owner */ + Mcb->OwnerPsp = NewOwner; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -412,6 +421,9 @@ CommandLine, ExeSize + (sizeof(DOS_PSP) >> 4) + i, EnvBlock); + /* The process owns its own memory */ + DosChangeMemoryOwner(Segment, Segment); + /* Copy the program to Segment:0100 */ RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR(Segment, 0x100)), @@ -548,7 +560,13 @@ CHAR DosReadCharacter() { // TODO: STDIN can be redirected under DOS 2.0+ - return _getch(); + CHAR Character = 0; + + /* A zero value for the character indicates a special key */ + do Character = BiosGetCharacter(); + while (!Character); + + return Character; } VOID DosPrintCharacter(CHAR Character) @@ -749,6 +767,15 @@ break; } + /* Get DOS Version */ + case 0x30: + { + PDOS_PSP PspBlock = SEGMENT_TO_PSP(CurrentPsp); + + EmulatorSetRegister(EMULATOR_REG_AX, PspBlock->DosVersion); + break; + } + /* Get Interrupt Vector */ case 0x35: { @@ -879,6 +906,7 @@ /* Unsupported */ default: { + DPRINT1("DOS Function INT 0x21, AH = 0x%02X NOT IMPLEMENTED!\n", HIBYTE(Eax)); EmulatorSetFlag(EMULATOR_FLAG_CF); } } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Fri Jun 28 20:52:40 2013 @@ -15,7 +15,7 @@ /* DEFINES ********************************************************************/ -#define DOS_VERSION 0x0600 +#define DOS_VERSION MAKEWORD(6, 0) #define DOS_CONFIG_PATH L"%SystemRoot%\\system32\\CONFIG.NT" #define DOS_COMMAND_INTERPRETER L"%SystemRoot%\\system32\\COMMAND.COM /k %SystemRoot%\\system32\\AUTOEXEC.NT" #define FIRST_MCB_SEGMENT 0x1000 Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Jun 28 20:52:40 2013 @@ -214,6 +214,12 @@ BiosVideoService(); break; } + case VIDEO_KBD_INTERRUPT: + { + /* This is the keyboard BIOS interrupt, call the BIOS */ + BiosKeyboardService(); + break; + } case 0x20: { DosInt20h(CodeSegment);

1 0

[spetreolle] 59349: [KMTESTS:FSRTL] Enable FsRtlMcb tests.
by spetreolle＠svn.reactos.org 28 Jun '13

28 Jun '13

Author: spetreolle Date: Fri Jun 28 19:25:37 2013 New Revision: 59349 URL: http://svn.reactos.org/svn/reactos?rev=59349&view=rev Log: [KMTESTS:FSRTL] Enable FsRtlMcb tests. Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jun 28 19:25:37 2013 @@ -68,8 +68,7 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, - /* Skipped on testman. See ROSTESTS-106. */ - { "-FsRtlMcb", Test_FsRtlMcb }, + { "FsRtlMcb", Test_FsRtlMcb }, { "-FsRtlTunnel", Test_FsRtlTunnel }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent },

1 0

[fireball] 59348: [NTOS/FSRTL] - Implement FsRtlSplitLargeMcb. 168 tests executed / 59 failures.
by fireball＠svn.reactos.org 27 Jun '13

27 Jun '13

Author: fireball Date: Thu Jun 27 09:18:32 2013 New Revision: 59348 URL: http://svn.reactos.org/svn/reactos?rev=59348&view=rev Log: [NTOS/FSRTL] - Implement FsRtlSplitLargeMcb. 168 tests executed / 59 failures. Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Thu Jun 27 09:18:32 2013 @@ -975,11 +975,51 @@ IN LONGLONG Vbn, IN LONGLONG Amount) { - //PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - - UNIMPLEMENTED; - - return FALSE; + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; + PLARGE_MCB_MAPPING_ENTRY Run, InsertLowerRun = NULL, ExistingRun = NULL; + LARGE_MCB_MAPPING_ENTRY LowerRun; + BOOLEAN NewElement; + + /* Traverse the tree */ + for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + Run; + Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)) + { + /* unaffected run? */ + /* FIXME: performance: effective skip of all 'lower' runs without traversing them */ + if (Vbn >= Run->RunStartVbn.QuadPart) continue; + + /* crossing run to be split? + * 'lower_run' is created on the original place; just shortened. + * current 'run' is shifted up later + */ + if (Vbn < Run->RunEndVbn.QuadPart) + { + LowerRun = *Run; + LowerRun.RunEndVbn.QuadPart = Vbn; + /* FIXME: shift 'run->Lbn_start' ? */ + Run->RunStartVbn.QuadPart = Vbn; + + InsertLowerRun = &LowerRun; + } + + /* Shift the current 'run'. + * Ordering is not changed in Generic Tree so I hope I do not need to reinsert it. + */ + Run->RunStartVbn.QuadPart += Amount; + ASSERT(Run->RunEndVbn.QuadPart + Amount > Run->RunEndVbn.QuadPart); /* overflow? */ + Run->RunEndVbn.QuadPart += Amount; + /* FIXME: shift 'run->Lbn_start' ? */ + + /* continue the traversal */ + } + + if (InsertLowerRun) + ExistingRun = RtlInsertElementGenericTable(&Mcb->Mapping->Table, InsertLowerRun, sizeof(*InsertLowerRun), &NewElement); + + ASSERT(ExistingRun == NULL); + + return (InsertLowerRun != NULL); /* the hole was successfuly created? */ } /*

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