Ros-diffs January 2013

ros-diffs@reactos.org

11 participants
185 discussions

[hbelusca] 58237: [BOOTDATA-SMLIB] "SubSystems" name letter-case consistency modification.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 27 00:07:58 2013 New Revision: 58237 URL: http://svn.reactos.org/svn/reactos?rev=58237&view=rev Log: [BOOTDATA-SMLIB] "SubSystems" name letter-case consistency modification. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/lib/smlib/lookupss.c Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Sun Jan 27 00:07:58 2013 @@ -1236,13 +1236,13 @@ ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sun Jan 27 00:07:58 2013 @@ -788,13 +788,13 @@ ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Jan 27 00:07:58 2013 @@ -1236,13 +1236,13 @@ ; Memory Management HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 -; Subsystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" +; SubSystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/lib/smlib/lookupss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Sun Jan 27 00:07:58 2013 @@ -15,12 +15,12 @@ * * DESCRIPTION * Read from the registry key - * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems + * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems * the value which name is Name. * * ARGUMENTS * Name: name of the program to run, that is a value's name in - * the SM registry key Subsystems; + * the SM registry key SubSystems; * Data: what the registry gave back for Name; * DataLength: how much Data the registry returns; * DataType: what is Data?

11 years, 8 months

[hbelusca] 58236: [SMSS] Clarify a bit the code. No logical changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 23:56:07 2013 New Revision: 58236 URL: http://svn.reactos.org/svn/reactos?rev=58236&view=rev Log: [SMSS] Clarify a bit the code. No logical changes. Modified: trunk/reactos/base/system/smss/sminit.c trunk/reactos/base/system/smss/smsubsys.c Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Sat Jan 26 23:56:07 2013 @@ -463,15 +463,17 @@ IN PVOID EntryContext) { /* Check which value is being set */ - if (_wcsicmp(ValueName, L"DllDirectory")) + if (_wcsicmp(ValueName, L"DllDirectory") == 0) + { + /* This is the directory, initialize it */ + DPRINT("KnownDll Path: %S\n", ValueData); + return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength); + } + else { /* Add to the linked list -- this is a file */ return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); } - - /* This is the directory, initialize it */ - DPRINT("KnownDll Path: %S\n", ValueData); - return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength); } NTSTATUS @@ -499,7 +501,7 @@ } /* Check if the path is being set, and wait for the second instantiation */ - if (!(_wcsicmp(ValueName, L"Path")) && (++SmpCalledConfigEnv == 2)) + if ((_wcsicmp(ValueName, L"Path") == 0) && (++SmpCalledConfigEnv == 2)) { /* Allocate the path buffer */ SmpDefaultLibPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), @@ -528,12 +530,12 @@ PSMP_REGISTRY_VALUE RegEntry; PWCHAR SubsystemName; - /* Is this a required or optional subsystem */ - if ((_wcsicmp(ValueName, L"Required")) && - (_wcsicmp(ValueName, L"Optional"))) + /* Is this a required or optional subsystem? */ + if ((_wcsicmp(ValueName, L"Required") != 0) && + (_wcsicmp(ValueName, L"Optional") != 0)) { /* It isn't, is this the PSI flag? */ - if ((_wcsicmp(ValueName, L"PosixSingleInstance")) || + if ((_wcsicmp(ValueName, L"PosixSingleInstance") != 0) || (ValueType != REG_DWORD)) { /* It isn't, must be a subsystem entry, add it to the list */ @@ -567,17 +569,17 @@ RemoveEntryList(&RegEntry->Entry); /* Figure out which list to put it in */ - if (_wcsicmp(ValueName, L"Required")) + if (_wcsicmp(ValueName, L"Required") == 0) + { + /* Put it into the required list */ + DPRINT("Required\n"); + InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry); + } + else { /* Put it into the optional list */ DPRINT("Optional\n"); InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry); - } - else - { - /* Put it into the required list */ - DPRINT("Required\n"); - InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry); } } Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… ============================================================================== --- trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] Sat Jan 26 23:56:07 2013 @@ -595,7 +595,7 @@ { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (_wcsicmp(RegEntry->Name.Buffer, L"debug") == 0) + if (_wcsicmp(RegEntry->Name.Buffer, L"Debug") == 0) { /* Load the internal debug system */ Status = SmpExecuteCommand(&RegEntry->Value,

11 years, 8 months

[hbelusca] 58235: [SMSS] Load the Win32k driver from the path mentioned in the Kmode value of the registry, not via a hardcoded value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 23:43:28 2013 New Revision: 58235 URL: http://svn.reactos.org/svn/reactos?rev=58235&view=rev Log: [SMSS] Load the Win32k driver from the path mentioned in the Kmode value of the registry, not via a hardcoded value. Modified: trunk/reactos/base/system/smss/smsubsys.c Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… ============================================================================== --- trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] Sat Jan 26 23:43:28 2013 @@ -515,7 +515,7 @@ { NTSTATUS Status = STATUS_SUCCESS, Status2; PSMP_REGISTRY_VALUE RegEntry; - UNICODE_STRING DestinationString, NtPath; + UNICODE_STRING NtPath; PLIST_ENTRY NextEntry; LARGE_INTEGER Timeout; PVOID State; @@ -539,7 +539,7 @@ { /* Get the entry and check if this is the special Win32k entry */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (!_wcsicmp(RegEntry->Name.Buffer, L"Kmode")) + if (_wcsicmp(RegEntry->Name.Buffer, L"Kmode") == 0) { /* Translate it */ if (!RtlDosPathNameToNtPathName_U(RegEntry->Value.Buffer, @@ -571,11 +571,9 @@ AttachedSessionId = *MuSessionId; /* Start Win32k.sys on this session */ - RtlInitUnicodeString(&DestinationString, - L"\\SystemRoot\\System32\\win32k.sys"); Status = NtSetSystemInformation(SystemExtendServiceTableInformation, - &DestinationString, - sizeof(DestinationString)); + &NtPath, + sizeof(NtPath)); RtlFreeHeap(RtlGetProcessHeap(), 0, NtPath.Buffer); SmpReleasePrivilege(State); if (!NT_SUCCESS(Status)) @@ -597,21 +595,21 @@ { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - if (_wcsicmp(RegEntry->Name.Buffer, L"debug")) + if (_wcsicmp(RegEntry->Name.Buffer, L"debug") == 0) + { + /* Load the internal debug system */ + Status = SmpExecuteCommand(&RegEntry->Value, + *MuSessionId, + ProcessId, + SMP_DEBUG_FLAG | SMP_SUBSYSTEM_FLAG); + } + else { /* Load the required subsystem */ Status = SmpExecuteCommand(&RegEntry->Value, *MuSessionId, ProcessId, SMP_SUBSYSTEM_FLAG); - } - else - { - /* Load the internal debug system */ - Status = SmpExecuteCommand(&RegEntry->Value, - *MuSessionId, - ProcessId, - SMP_DEBUG_FLAG | SMP_SUBSYSTEM_FLAG); } if (!NT_SUCCESS(Status)) {

11 years, 8 months

[hbelusca] 58234: [CONSRV] Modify driver acquiring/releasing privilege according to r58233. The corresponding modification in services.c will be done at the next synchronization.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 23:16:34 2013 New Revision: 58234 URL: http://svn.reactos.org/svn/reactos?rev=58234&view=rev Log: [CONSRV] Modify driver acquiring/releasing privilege according to r58233. The corresponding modification in services.c will be done at the next synchronization. Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Sat Jan 26 23:16:34 2013 @@ -29,62 +29,19 @@ |** BlueScreen Driver management **| \**/ /* Code taken and adapted from base/system/services/driver.c */ -static DWORD EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) -{ - DWORD dwRet = ERROR_SUCCESS; - HANDLE hToken = NULL; - - if (OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES, - &hToken)) - { - TOKEN_PRIVILEGES tp; - - tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); - - if (LookupPrivilegeValueW(NULL, - lpszPrivilegeName, - &tp.Privileges[0].Luid)) - { - if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL)) - { - if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) - dwRet = ERROR_NOT_ALL_ASSIGNED; - } - else - { - dwRet = GetLastError(); - } - } - else - { - dwRet = GetLastError(); - } - - CloseHandle(hToken); - } - else - { - dwRet = GetLastError(); - } - - return dwRet; -} - static DWORD ScmLoadDriver(LPCWSTR lpServiceName) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ pszDriverPath = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); + HEAP_ZERO_MEMORY, + (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); if (pszDriverPath == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -99,44 +56,44 @@ DPRINT(" Path: %wZ\n", &DriverPath); /* Acquire driver-loading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("CONSRV: Cannot acquire driver-loading privilege, error = %lu\n", dwError); + DPRINT1("CONSRV: Cannot acquire driver-loading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtLoadDriver(&DriverPath); /* Release driver-loading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } #ifdef BLUESCREEN_DRIVER_UNLOADING static DWORD ScmUnloadDriver(LPCWSTR lpServiceName) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ pszDriverPath = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); + HEAP_ZERO_MEMORY, + (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); if (pszDriverPath == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -148,29 +105,31 @@ RtlInitUnicodeString(&DriverPath, pszDriverPath); + DPRINT(" Path: %wZ\n", &DriverPath); + /* Acquire driver-unloading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("CONSRV: Cannot acquire driver-unloading privilege, error = %lu\n", dwError); + DPRINT1("CONSRV: Cannot acquire driver-unloading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtUnloadDriver(&DriverPath); /* Release driver-unloading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } #endif /**\

11 years, 8 months

[hbelusca] 58233: [SERVICES] Fix acquiring/releasing driver-loading and unloading privilege (see r57754) by using the RtlAdjustPrivilege API instead of using the standard user-mode Win32 API (thus ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 23:14:05 2013 New Revision: 58233 URL: http://svn.reactos.org/svn/reactos?rev=58233&view=rev Log: [SERVICES] Fix acquiring/releasing driver-loading and unloading privilege (see r57754) by using the RtlAdjustPrivilege API instead of using the standard user-mode Win32 API (thus get rid of calling LSA when calling LookupPrivilegeValueW). Modified: trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/driver.c [iso-8859-1] Sat Jan 26 23:14:05 2013 @@ -16,57 +16,13 @@ /* FUNCTIONS ****************************************************************/ -static DWORD EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) -{ - DWORD dwRet = ERROR_SUCCESS; - HANDLE hToken = NULL; - - if (OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES, - &hToken)) - { - TOKEN_PRIVILEGES tp; - - tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); - - if (LookupPrivilegeValueW(NULL, - lpszPrivilegeName, - &tp.Privileges[0].Luid)) - { - if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL)) - { - if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) - dwRet = ERROR_NOT_ALL_ASSIGNED; - } - else - { - dwRet = GetLastError(); - } - } - else - { - dwRet = GetLastError(); - } - - CloseHandle(hToken); - } - else - { - dwRet = GetLastError(); - } - - return dwRet; -} - - DWORD ScmLoadDriver(PSERVICE lpService) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ @@ -87,38 +43,38 @@ DPRINT(" Path: %wZ\n", &DriverPath); /* Acquire driver-loading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("SERVICES: Cannot acquire driver-loading privilege, error = %lu\n", dwError); + DPRINT1("SERVICES: Cannot acquire driver-loading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtLoadDriver(&DriverPath); /* Release driver-loading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: HeapFree(GetProcessHeap(), 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } DWORD ScmUnloadDriver(PSERVICE lpService) { + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN WasPrivilegeEnabled = FALSE; PWSTR pszDriverPath; UNICODE_STRING DriverPath; - NTSTATUS Status; - DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ @@ -136,29 +92,31 @@ RtlInitUnicodeString(&DriverPath, pszDriverPath); + DPRINT(" Path: %wZ\n", &DriverPath); + /* Acquire driver-unloading privilege */ - dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); - if (dwError != ERROR_SUCCESS) + Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + TRUE, + FALSE, + &WasPrivilegeEnabled); + if (!NT_SUCCESS(Status)) { /* We encountered a failure, exit properly */ - DPRINT1("SERVICES: Cannot acquire driver-unloading privilege, error = %lu\n", dwError); + DPRINT1("SERVICES: Cannot acquire driver-unloading privilege, Status = 0x%08lx\n", Status); goto done; } Status = NtUnloadDriver(&DriverPath); /* Release driver-unloading privilege */ - EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); - - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - } + RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE, + WasPrivilegeEnabled, + FALSE, + &WasPrivilegeEnabled); done: HeapFree(GetProcessHeap(), 0, pszDriverPath); - - return dwError; + return RtlNtStatusToDosError(Status); } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sat Jan 26 23:14:05 2013 @@ -14,6 +14,7 @@ #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> #include <services/services.h> #include <svcctl_s.h>

11 years, 8 months

[hbelusca] 58232: [CSRSRV] - Zero-out some allocated memory. - During my investigations preceding the implementation of AttachConsole (r58166), I wanted (in a first attempt; finally I've found a be...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 21:23:10 2013 New Revision: 58232 URL: http://svn.reactos.org/svn/reactos?rev=58232&view=rev Log: [CSRSRV] - Zero-out some allocated memory. - During my investigations preceding the implementation of AttachConsole (r58166), I wanted (in a first attempt; finally I've found a better way to achieve what I wanted to do) to retrieve the CSR_PROCESS structure of the parent of a given process. I've found the 'Parent' member in the CSR_PROCESS structure, however this member was always initialized to NULL when new processes were created via CsrCreateProcess (and via the call to CsrInsertProcess). After looking at some informating here (http://svn.reactos.org/svn/reactos/trunk/reactos/include/subsys/csr/server.…) and there (http://forum.sysinternals.com/csrwalker-processes-detection-from-user-mode_…), I became convinced that the 'Parent' member was unexistent starting from Windows Server 2003. Also, after much more investigation, I've found that the CsrInsertProcess function was called with only two parameters starting from Windows Server 2003 (and still continues in Windows 7), the always-NULL paramater being removed. Therefore, I remove that unneeded parameter from CsrInsertProcess and the corresponding 'Parent' member from CSR_PROCESS. Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/wait.c Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -39,7 +39,6 @@ CLIENT_ID ClientId; LIST_ENTRY ListLink; LIST_ENTRY ThreadList; - struct _CSR_PROCESS *Parent; PCSR_NT_SESSION NtSession; ULONG ExpectedVersion; HANDLE ClientPort; Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -1171,7 +1171,7 @@ } _SEH2_END; /* We validated the incoming buffer, now allocate the remote one */ - RemoteCaptureBuffer = RtlAllocateHeap(CsrHeap, 0, Length); + RemoteCaptureBuffer = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Length); if (!RemoteCaptureBuffer) { /* We're out of memory */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -119,8 +119,7 @@ VOID NTAPI -CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, - IN PCSR_PROCESS CurrentProcess OPTIONAL, +CsrInsertProcess(IN PCSR_PROCESS ParentProcess OPTIONAL, IN PCSR_PROCESS CsrProcess); NTSTATUS Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -451,11 +451,8 @@ * The CsrInsertProcess routine inserts a CSR Process into the Process List * and notifies Server DLLs of the creation of a new CSR Process. * - * @param Parent - * Optional pointer to the CSR Process creating this CSR Process. - * - * @param CurrentProcess - * Optional pointer to the current CSR Process. + * @param ParentProcess + * Optional pointer to the Parent Process creating this CSR Process. * * @param CsrProcess * Pointer to the CSR Process which is to be inserted. @@ -467,17 +464,13 @@ *--*/ VOID NTAPI -CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, // ParentProcess - IN PCSR_PROCESS CurrentProcess OPTIONAL, // CallingProcess - IN PCSR_PROCESS CsrProcess) // Process +CsrInsertProcess(IN PCSR_PROCESS ParentProcess OPTIONAL, + IN PCSR_PROCESS CsrProcess) { PCSR_SERVER_DLL ServerDll; ULONG i; ASSERT(ProcessStructureListLocked()); - /* Set the parent */ - CsrProcess->Parent = Parent; - /* Insert it into the Root List */ InsertTailList(&CsrRootProcess->ListLink, &CsrProcess->ListLink); @@ -490,7 +483,7 @@ /* Make sure it's valid and that it has callback */ if (ServerDll && ServerDll->NewProcessCallback) { - ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); + ServerDll->NewProcessCallback(ParentProcess, CsrProcess); } } } @@ -706,7 +699,7 @@ CsrSetBackgroundPriority(CsrProcess); /* Insert the Process */ - CsrInsertProcess(NULL, CurrentProcess, CsrProcess); + CsrInsertProcess(CurrentProcess, CsrProcess); /* Release lock and return */ CsrReleaseProcessLock(); Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -43,11 +43,11 @@ }; PCSR_SERVER_DLL CsrLoadedServerDll[CSR_SERVER_DLL_MAX]; -PVOID CsrSrvSharedSectionHeap; -PVOID CsrSrvSharedSectionBase; -PVOID *CsrSrvSharedStaticServerData; -ULONG CsrSrvSharedSectionSize; -HANDLE CsrSrvSharedSection; +PVOID CsrSrvSharedSectionHeap = NULL; +PVOID CsrSrvSharedSectionBase = NULL; +PVOID *CsrSrvSharedStaticServerData = NULL; +ULONG CsrSrvSharedSectionSize = 0; +HANDLE CsrSrvSharedSection = NULL; /* PRIVATE FUNCTIONS **********************************************************/ Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -84,7 +84,7 @@ PCSR_NT_SESSION NtSession; /* Allocate an NT Session Object */ - NtSession = RtlAllocateHeap(CsrHeap, 0, sizeof(CSR_NT_SESSION)); + NtSession = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, sizeof(CSR_NT_SESSION)); if (NtSession) { /* Setup the Session Object */ @@ -331,7 +331,7 @@ } /* Insert the Process */ - CsrInsertProcess(NULL, NULL, CsrProcess); + CsrInsertProcess(NULL, CsrProcess); /* Activate the Thread */ ApiMessage->ReturnValue = NtResumeThread(hThread, NULL); Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Jan 26 21:23:10 2013 @@ -62,7 +62,7 @@ WaitApiMessage->Header.u1.s1.TotalLength; /* Allocate the Wait Block */ - WaitBlock = RtlAllocateHeap(CsrHeap, 0, Size); + WaitBlock = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Size); if (!WaitBlock) { /* Fail */

11 years, 8 months

[pschweitzer] 58231: [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeFastTraverseCheck for traverse access check

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 26 19:37:01 2013 New Revision: 58231 URL: http://svn.reactos.org/svn/reactos?rev=58231&view=rev Log: [NTOSKRNL] Fix a fixme in IopParseDevice() by calling SeFastTraverseCheck for traverse access check Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c 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] Sat Jan 26 19:37:01 2013 @@ -335,8 +335,11 @@ /* Check if this is a restricted token */ if (!(AccessState->Flags & TOKEN_IS_RESTRICTED)) { - /* FIXME: Do the FAST traverse check */ - AccessGranted = FALSE; + /* Do the FAST traverse check */ + AccessGranted = SeFastTraverseCheck(OriginalDeviceObject->SecurityDescriptor, + AccessState, + FILE_TRAVERSE, + UserMode); } else {

11 years, 8 months

[pschweitzer] 58230: [NTOSKRNL] Implement SeFastTraverseCheck(). For more information, see: - http://msdn.microsoft.com/en-us/library/windows/desktop/aa374872(v=vs.85).aspx - http://msdn.microsoft....

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jan 26 19:33:54 2013 New Revision: 58230 URL: http://svn.reactos.org/svn/reactos?rev=58230&view=rev Log: [NTOSKRNL] Implement SeFastTraverseCheck(). For more information, see: - http://msdn.microsoft.com/en-us/library/windows/desktop/aa374872(v=vs.85).a… - http://msdn.microsoft.com/en-us/library/windows/desktop/aa446683(v=vs.85).a… Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Jan 26 19:33:54 2013 @@ -490,6 +490,13 @@ SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); +BOOLEAN +NTAPI +SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PACCESS_STATE AccessState, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode); + #endif /* EOF */ Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=58… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sat Jan 26 19:33:54 2013 @@ -820,6 +820,73 @@ return ret; } +/* + * @implemented + */ +BOOLEAN +NTAPI +SeFastTraverseCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PACCESS_STATE AccessState, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE AccessMode) +{ + PACL Dacl; + ULONG AceIndex; + PKNOWN_ACE Ace; + + PAGED_CODE(); + + NT_ASSERT(AccessMode != KernelMode); + + if (SecurityDescriptor == NULL) + return FALSE; + + /* Get DACL */ + Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); + /* If no DACL, grant access */ + if (Dacl == NULL) + return TRUE; + + /* No ACE -> Deny */ + if (!Dacl->AceCount) + return FALSE; + + /* Can't perform the check on restricted token */ + if (AccessState->Flags & TOKEN_IS_RESTRICTED) + return FALSE; + + /* Browse the ACEs */ + for (AceIndex = 0, Ace = (PKNOWN_ACE)((ULONG_PTR)Dacl + sizeof(ACL)); + AceIndex < Dacl->AceCount; + AceIndex++, Ace = (PKNOWN_ACE)((ULONG_PTR)Ace + Ace->Header.AceSize)) + { + if (Ace->Header.AceFlags & INHERIT_ONLY_ACE) + continue; + + /* If access-allowed ACE */ + if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE) + { + /* Check if all accesses are granted */ + if (!(Ace->Mask & DesiredAccess)) + continue; + + /* Check SID and grant access if matching */ + if (RtlEqualSid(SeWorldSid, &(Ace->SidStart))) + return TRUE; + } + /* If access-denied ACE */ + else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE) + { + /* Here, only check if it denies all the access wanted and deny if so */ + if (Ace->Mask & DesiredAccess) + return FALSE; + } + } + + /* Faulty, deny */ + return FALSE; +} + /* SYSTEM CALLS ***************************************************************/ /*

11 years, 8 months

[hbelusca] 58229: [KERNEL32] Clean-up IntReadConsoleOutputCode a little bit. [CONSRV] Fix a buffer overflow in SrvReadConsoleOutputString, which was translated sometimes into heap corruption and as...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 26 19:07:59 2013 New Revision: 58229 URL: http://svn.reactos.org/svn/reactos?rev=58229&view=rev Log: [KERNEL32] Clean-up IntReadConsoleOutputCode a little bit. [CONSRV] Fix a buffer overflow in SrvReadConsoleOutputString, which was translated sometimes into heap corruption and assert, triggered when freeing a remote captured buffer in csrsrv, when executing kernel32_winetest console, just during a call to ReadConsoleOutputCharacterA. Nevertheless I still keep the culprit code (commented-out now) because it might be useful in the future. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c branches/ros-csrss/win32ss/user/consrv/conoutput.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Sat Jan 26 19:07:59 2013 @@ -351,33 +351,26 @@ ReadOutputCodeRequest->CodeType = CodeType; ReadOutputCodeRequest->ReadCoord = dwReadCoord; - // while (nLength > 0) - { - ReadOutputCodeRequest->NumCodesToRead = nLength; - // SizeBytes = ReadOutputCodeRequest->NumCodesToRead * CodeSize; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutputString), - sizeof(CONSOLE_READOUTPUTCODE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) - { - BaseSetLastNTError(Status); - CsrFreeCaptureBuffer(CaptureBuffer); - return FALSE; - } - - BytesRead = ReadOutputCodeRequest->CodesRead * CodeSize; - memcpy(pCode, ReadOutputCodeRequest->pCode.pCode, BytesRead); - // pCode = (PVOID)((ULONG_PTR)pCode + /*(ULONG_PTR)*/BytesRead); - // nLength -= ReadOutputCodeRequest->CodesRead; - // CodesRead += ReadOutputCodeRequest->CodesRead; - - ReadOutputCodeRequest->ReadCoord = ReadOutputCodeRequest->EndCoord; - } + ReadOutputCodeRequest->NumCodesToRead = nLength; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutputString), + sizeof(CONSOLE_READOUTPUTCODE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) + { + BaseSetLastNTError(Status); + CsrFreeCaptureBuffer(CaptureBuffer); + return FALSE; + } + + BytesRead = ReadOutputCodeRequest->CodesRead * CodeSize; + memcpy(pCode, ReadOutputCodeRequest->pCode.pCode, BytesRead); + + ReadOutputCodeRequest->ReadCoord = ReadOutputCodeRequest->EndCoord; if (lpNumberOfCodesRead != NULL) - *lpNumberOfCodesRead = /*CodesRead;*/ ReadOutputCodeRequest->CodesRead; + *lpNumberOfCodesRead = ReadOutputCodeRequest->CodesRead; CsrFreeCaptureBuffer(CaptureBuffer); Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sat Jan 26 19:07:59 2013 @@ -862,20 +862,20 @@ } } - switch (CodeType) - { - case CODE_UNICODE: - *(PWCHAR)ReadBuffer = 0; - break; - - case CODE_ASCII: - *(PCHAR)ReadBuffer = 0; - break; - - case CODE_ATTRIBUTE: - *(PWORD)ReadBuffer = 0; - break; - } + // switch (CodeType) + // { + // case CODE_UNICODE: + // *(PWCHAR)ReadBuffer = 0; + // break; + + // case CODE_ASCII: + // *(PCHAR)ReadBuffer = 0; + // break; + + // case CODE_ATTRIBUTE: + // *(PWORD)ReadBuffer = 0; + // break; + // } ReadOutputCodeRequest->EndCoord.X = Xpos; ReadOutputCodeRequest->EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY;

11 years, 8 months

[tfaber] 58228: [INCLUDE] - Actually put in the C++ headers what our CRT implements, instead of some random mix of libstdc++ and who knows what. This means the header contents are somewhat outdated...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 26 18:34:33 2013 New Revision: 58228 URL: http://svn.reactos.org/svn/reactos?rev=58228&view=rev Log: [INCLUDE] - Actually put in the C++ headers what our CRT implements, instead of some random mix of libstdc++ and who knows what. This means the header contents are somewhat outdated and non-standard, but that's preferable to unusable - Fix a forward declaration in math.h Modified: trunk/reactos/include/c++/exception trunk/reactos/include/c++/new trunk/reactos/include/c++/typeinfo trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/c++/exception URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/exception?… ============================================================================== --- trunk/reactos/include/c++/exception [iso-8859-1] (original) +++ trunk/reactos/include/c++/exception [iso-8859-1] Sat Jan 26 18:34:33 2013 @@ -5,56 +5,42 @@ extern "C++" { +class exception +{ +public: + exception() throw(); + exception(const char * const &) throw(); + exception(const char * const &, int) throw(); + + virtual ~exception() throw(); + + virtual const char *what() const throw(); +private: + const char *_name; + int _do_free; +}; + +class bad_exception : public exception +{ +public: + bad_exception(const char *name = "bad exception") throw() + : exception(name) { } + + virtual ~bad_exception() throw() { } +}; + namespace std { - /** - * @defgroup exceptions Exceptions - * @ingroup diagnostics - * - * Classes and functions for reporting errors via exception classes. - * @{ - */ + using ::exception; + using ::bad_exception; - /** - * @brief Base class for all library exceptions. - * - * This is the base class for all exceptions thrown by the standard - * library, and by certain language expressions. You are free to derive - * your own %exception classes, or use a different hierarchy, or to - * throw non-class data (e.g., fundamental types). - */ - class exception - { - public: - exception() throw() { } - virtual ~exception() throw(); + typedef void (*unexpected_handler) (); - /** Returns a C-style character string describing the general cause - * of the current error. */ - virtual const char* what() const throw(); - }; + unexpected_handler set_unexpected(unexpected_handler) throw(); - /** If an %exception is thrown which is not listed in a function's - * %exception specification, one of these may be thrown. */ - class bad_exception : public exception - { - public: - bad_exception() throw() { } + __MINGW_ATTRIB_NORETURN void unexpected(); - virtual ~bad_exception() throw(); - - virtual const char* what() const throw(); - }; - - typedef void (*unexpected_handler) (); - - unexpected_handler set_unexpected(unexpected_handler) throw(); - - __MINGW_ATTRIB_NORETURN void unexpected(); - - bool uncaught_exception() throw(); - - // @} group exceptions + bool uncaught_exception() throw(); } // namespace std typedef void (*terminate_handler) (); Modified: trunk/reactos/include/c++/new URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/new?rev=58… ============================================================================== --- trunk/reactos/include/c++/new [iso-8859-1] (original) +++ trunk/reactos/include/c++/new [iso-8859-1] Sat Jan 26 18:34:33 2013 @@ -8,24 +8,22 @@ extern "C++" { -namespace std +class bad_alloc : public exception { - class bad_alloc : public exception - { - public: - bad_alloc() throw() { } +public: + bad_alloc(const char *name = "bad alloc") throw() + : exception(name) { } - // This declaration is not useless: - // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118 - virtual ~bad_alloc() throw(); + virtual ~bad_alloc() throw() { } +}; - // See comment in eh_exception.cc. - virtual const char* what() const throw(); - }; +namespace std +{ + using ::bad_alloc; - struct nothrow_t { }; + struct nothrow_t { }; - extern const nothrow_t nothrow; + extern const nothrow_t nothrow; } // namespace std typedef void (*new_handler)(); @@ -43,7 +41,7 @@ void operator delete[] (void* ptr) throw (); void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw(); inline void operator delete[] (void* ptr, void* voidptr2) throw() { } -//@} + } // extern "C++" #endif Modified: trunk/reactos/include/c++/typeinfo URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/typeinfo?r… ============================================================================== --- trunk/reactos/include/c++/typeinfo [iso-8859-1] (original) +++ trunk/reactos/include/c++/typeinfo [iso-8859-1] Sat Jan 26 18:34:33 2013 @@ -7,41 +7,58 @@ extern "C++" { -namespace std +class type_info { +public: + virtual ~type_info(); + + int before(const type_info &) const; + const char *name() const; + const char *raw_name() const; + + int operator==(const type_info &) const; + int operator!=(const type_info &) const; +private: + char *_name; + char _mangled[32]; + + type_info(const type_info &); + type_info &operator=(const type_info &); +}; + +class bad_cast : public exception { +public: + bad_cast(const char *name = "bad cast") throw() + : exception(name) { } + bad_cast(const char * const *) throw(); + bad_cast(const char * const &) throw(); - class type_info { - public: - virtual ~type_info(); - bool before (const type_info& arg) const - { return __name < __arg.__name; } - bool operator==(const type_info& __arg) const - { return __name == __arg.__name; } - bool operator!=(const type_info& __arg) const - { return !operator==(__arg); } - const char* name() const; - protected: - const char* __name; - private: - type_info (const type_info& rhs); - type_info& operator= (const type_info& rhs); - }; + virtual ~bad_cast() throw() { } +}; - class bad_cast : public exception - { - public: - bad_cast() throw() { } - virtual ~bad_cast() throw(); - virtual const char* what() const throw(); - }; - - class bad_typeid : public exception - { - public: - bad_typeid () throw() { } - virtual ~bad_typeid() throw(); - virtual const char* what() const throw(); - }; +class bad_typeid : public exception +{ +public: + bad_typeid(const char *name = "bad typeid") throw() + : exception(name) { } + + virtual ~bad_typeid() throw() { } +}; + +class __non_rtti_object : public bad_typeid +{ +public: + __non_rtti_object(const char *name) throw() + : bad_typeid(name) { } + + virtual ~__non_rtti_object() throw() { } +}; + +namespace std +{ + using ::type_info; + using ::bad_cast; + using ::bad_typeid; } // namespace std } // extern "C++" Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=582… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sat Jan 26 18:34:33 2013 @@ -8,7 +8,7 @@ #include "crtdefs.h" -struct exception; +struct _exception; #pragma pack(push,_CRT_PACKING)

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2013