Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[hbelusca] 61469: [REACTOS] ReactOS 1.0 patch. ~=~=~= --_'_-- \o/ !!!! Happy New Year 2014 !!!! \o/ --_'_-- =~=~=~ Update bootlogo, WinLogon image (see rev. 58144 for details) etc...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 31 23:00:54 2013 New Revision: 61469 URL: http://svn.reactos.org/svn/reactos?rev=61469&view=rev Log: [REACTOS] ReactOS 1.0 patch. ~=~=~= --_'_-- \o/ !!!! Happy New Year 2014 !!!! \o/ --_'_-- =~=~=~ Update bootlogo, WinLogon image (see rev. 58144 for details) etc... Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/include/reactos/version.cmake trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== --- trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Tue Dec 31 23:00:54 2013 @@ -3110,5 +3110,5 @@ x="3.59375" y="83.363281" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright Â© 1996-2013 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright Â© 1996-2014 ReactOS Team & Contributors</tspan></text> </svg> Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Tue Dec 31 23:00:54 2013 @@ -34,7 +34,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2013") +set(COPYRIGHT_YEAR "2014") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN") Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

10 years, 8 months

[hbelusca] 61468: [NTOSKRNL] Fix user-mode access of pointers. From a patch by Sven Bjorn (private communication) and Aleksander Andrejevic. "[...]In the routine NtSetTimerResolution() the pointer ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 31 20:47:05 2013 New Revision: 61468 URL: http://svn.reactos.org/svn/reactos?rev=61468&view=rev Log: [NTOSKRNL] Fix user-mode access of pointers. From a patch by Sven Bjorn (private communication) and Aleksander Andrejevic. "[...]In the routine NtSetTimerResolution() the pointer "CurrentResolution" is checked using ProbeForWriteUlong(), but it is then accessed outside of a try-block. This should be an error, since the user mode memory can become invalid at any point in time and thus potentially make the kernel crash on access. [...]" CORE-7387 #comment A fix by Sven Bjorn was committed in revision 61468, thanks :) Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=614… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Tue Dec 31 20:47:05 2013 @@ -417,7 +417,6 @@ NtQuerySystemTime(OUT PLARGE_INTEGER SystemTime) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check if we were called from user-mode */ @@ -429,16 +428,16 @@ ProbeForWriteLargeInteger(SystemTime); /* - * It's safe to pass the pointer directly to KeQuerySystemTime as - * it's just a basic copy to this pointer. If it raises an + * It's safe to pass the pointer directly to KeQuerySystemTime + * as it's just a basic copy to this pointer. If it raises an * exception nothing dangerous can happen! */ KeQuerySystemTime(SystemTime); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } @@ -448,8 +447,8 @@ KeQuerySystemTime(SystemTime); } - /* Return status to caller */ - return Status; + /* Return success */ + return STATUS_SUCCESS; } /* @@ -485,7 +484,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - /* Check if the call came from user mode */ + /* Check if the call came from user-mode */ if (PreviousMode != KernelMode) { _SEH2_TRY @@ -494,6 +493,17 @@ ProbeForWriteUlong(MinimumResolution); ProbeForWriteUlong(MaximumResolution); ProbeForWriteUlong(ActualResolution); + + /* + * Set the parameters to the actual values. + * + * NOTE: + * MinimumResolution corresponds to the biggest time increment and + * MaximumResolution corresponds to the smallest time increment. + */ + *MinimumResolution = KeMaximumIncrement; + *MaximumResolution = KeMinimumIncrement; + *ActualResolution = KeTimeIncrement; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -502,17 +512,13 @@ } _SEH2_END; } - - /* - * Set the parameters to the actual values. - * - * NOTE: - * MinimumResolution corresponds to the biggest time increment and - * MaximumResolution corresponds to the smallest time increment. - */ - *MinimumResolution = KeMaximumIncrement; - *MaximumResolution = KeMinimumIncrement; - *ActualResolution = KeTimeIncrement; + else + { + /* Set the parameters to the actual values */ + *MinimumResolution = KeMaximumIncrement; + *MaximumResolution = KeMinimumIncrement; + *ActualResolution = KeTimeIncrement; + } /* Return success */ return STATUS_SUCCESS; @@ -532,7 +538,7 @@ PEPROCESS Process = PsGetCurrentProcess(); ULONG NewResolution; - /* Check if the call came from user mode */ + /* Check if the call came from user-mode */ if (PreviousMode != KernelMode) { _SEH2_TRY @@ -550,7 +556,24 @@ /* Set and return the new resolution */ NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); - *CurrentResolution = NewResolution; + + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + *CurrentResolution = NewResolution; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + *CurrentResolution = NewResolution; + } if (SetResolution || Process->SetTimerResolution) {

10 years, 8 months

[ekohl] 61467: [ADVAPI32] LogonUserW: Convert the logon type and pass it to LsaLogonUser.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Dec 31 09:05:31 2013 New Revision: 61467 URL: http://svn.reactos.org/svn/reactos?rev=61467&view=rev Log: [ADVAPI32] LogonUserW: Convert the logon type and pass it to LsaLogonUser. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Tue Dec 31 09:05:31 2013 @@ -316,20 +316,45 @@ LUID LogonId = {0, 0}; HANDLE TokenHandle = NULL; QUOTA_LIMITS QuotaLimits; + SECURITY_LOGON_TYPE LogonType; NTSTATUS SubStatus = STATUS_SUCCESS; NTSTATUS Status; *phToken = NULL; + switch (dwLogonType) + { + case LOGON32_LOGON_INTERACTIVE: + LogonType = Interactive; + break; + + case LOGON32_LOGON_NETWORK: + LogonType = Network; + break; + + case LOGON32_LOGON_BATCH: + LogonType = Batch; + break; + + case LOGON32_LOGON_SERVICE: + LogonType = Service; + break; + + default: + ERR("Invalid logon type: %ul\n", dwLogonType); + Status = STATUS_INVALID_PARAMETER; + goto done; + } + if (LsaHandle == NULL) { Status = OpenLogonLsaHandle(); if (!NT_SUCCESS(Status)) - return Status; + goto done; } RtlInitAnsiString((PANSI_STRING)&OriginName, - "Testapp"); + "Advapi32 Logon"); RtlInitUnicodeString(&DomainName, lpszDomain); @@ -443,7 +468,7 @@ Status = LsaLogonUser(LsaHandle, &OriginName, - Interactive, + LogonType, AuthenticationPackage, (PVOID)AuthInfo, AuthInfoLength, @@ -457,7 +482,7 @@ &SubStatus); if (!NT_SUCCESS(Status)) { - TRACE("LsaLogonUser failed (Status 0x%08lx)\n", Status); + ERR("LsaLogonUser failed (Status 0x%08lx)\n", Status); goto done; }

10 years, 8 months

[jgardou] 61466: [NTOSKRNL] - Fix compilation when not compiling in KDBG support.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 30 22:42:31 2013 New Revision: 61466 URL: http://svn.reactos.org/svn/reactos?rev=61466&view=rev Log: [NTOSKRNL] - Fix compilation when not compiling in KDBG support. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Dec 30 22:42:31 2013 @@ -394,12 +394,8 @@ kdbg/kdb_cli.c kdbg/kdb_expr.c kdbg/kdb_keyboard.c - kdbg/kdb_serial.c) - endif() - - if(DBG OR KDBG) - #list(APPEND SOURCE kdbg/kdb_symbols.cmake.c) - list(APPEND SOURCE kdbg/kdb_symbols.c) + kdbg/kdb_serial.c + kdbg/kdb_symbols.c) endif() list(APPEND SOURCE

10 years, 8 months

[ekohl] 61465: [SYSSETUP] Run an interactive logon for the administrator instead of a network logon.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Dec 30 22:38:14 2013 New Revision: 61465 URL: http://svn.reactos.org/svn/reactos?rev=61465&view=rev Log: [SYSSETUP] Run an interactive logon for the administrator instead of a network logon. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Dec 30 22:38:14 2013 @@ -933,7 +933,7 @@ HANDLE hToken; BOOL ret; - ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); + ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, &hToken); if (!ret) { FatalError("LogonUserW() failed!");

10 years, 8 months

[jgardou] 61464: [SACDRV] - Fix unsigned vs 0 comparison

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 30 22:00:49 2013 New Revision: 61464 URL: http://svn.reactos.org/svn/reactos?rev=61464&view=rev Log: [SACDRV] - Fix unsigned vs 0 comparison Modified: trunk/reactos/drivers/sac/driver/concmd.c Modified: trunk/reactos/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/concmd.… ============================================================================== --- trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] Mon Dec 30 22:00:49 2013 @@ -94,7 +94,7 @@ /* Make sure it's at least big enough to hold the static structure */ BufferLength = InputSize - sizeof(SAC_SYSTEM_INFORMATION); - if ((INT)InputSize - sizeof(SAC_SYSTEM_INFORMATION) < 0) + if (InputSize < sizeof(SAC_SYSTEM_INFORMATION)) { SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory (2).\n"); return STATUS_NO_MEMORY;

10 years, 8 months

[jgardou] 61463: [DESK.CPL] - remove unused variable

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 30 19:30:35 2013 New Revision: 61463 URL: http://svn.reactos.org/svn/reactos?rev=61463&view=rev Log: [DESK.CPL] - remove unused variable Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Mon Dec 30 19:30:35 2013 @@ -97,7 +97,7 @@ AppearancePage_OnInit(HWND hwndDlg) { INT iListIndex; - HWND hwndColor, hwndTheme; + HWND hwndTheme; GLOBALS *g; RECT rcPreview; HDC hdcScreen; @@ -142,7 +142,6 @@ SelectObject(g->hdcThemePreview, g->hbmpThemePreview); ReleaseDC(NULL, hdcScreen); - hwndColor = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME); hwndTheme = GetDlgItem(hwndDlg, IDC_APPEARANCE_VISUAL_STYLE); for (pTheme = g->pThemes; pTheme; pTheme = pTheme->NextTheme)

10 years, 8 months

[hbelusca] 61462: [NTVDM] Rework the resource files, and add a nice old-ish IBM PC AT icon (C) myself :) (only 32x32 256 colors for now).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 29 22:38:10 2013 New Revision: 61462 URL: http://svn.reactos.org/svn/reactos?rev=61462&view=rev Log: [NTVDM] Rework the resource files, and add a nice old-ish IBM PC AT icon (C) myself :) (only 32x32 256 colors for now). Added: branches/ntvdm/subsystems/ntvdm/res/ (with props) branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico (with props) Removed: branches/ntvdm/subsystems/ntvdm/rsrc.rc Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc branches/ntvdm/subsystems/ntvdm/resource.h Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.rc… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sun Dec 29 22:38:10 2013 @@ -1,5 +1,6 @@ #include <windef.h> #include <winuser.h> + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -9,4 +10,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "ntvdm.exe" #include <reactos/version.rc> -#include "rsrc.rc" +IDI_APPICON ICON "res/ntvdm.ico" + +/* UTF-8 */ +#pragma code_page(65001) Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 29 22:38:10 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/res/ntvd… ============================================================================== Binary file - no diff available. Propchange: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/ntvdm/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/resource… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/resource.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/resource.h [iso-8859-1] Sun Dec 29 22:38:10 2013 @@ -1,2 +1,5 @@ +#pragma once + +#define IDI_APPICON 1 /* EOF */ Removed: branches/ntvdm/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/rsrc.rc?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/rsrc.rc (removed) @@ -1,4 +0,0 @@ -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -// UTF-8 -#pragma code_page(65001)

10 years, 8 months

[ekohl] 61461: [ACPI] Take the processor information from HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0 and pass it to the device manager. CORE-5960 #comment Still WIP.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 29 11:14:09 2013 New Revision: 61461 URL: http://svn.reactos.org/svn/reactos?rev=61461&view=rev Log: [ACPI] Take the processor information from HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0 and pass it to the device manager. CORE-5960 #comment Still WIP. Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/include/acpisys.h trunk/reactos/drivers/bus/acpi/main.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Sun Dec 29 11:14:09 2013 @@ -1287,7 +1287,7 @@ case ACPI_BUS_TYPE_PROCESSOR: hid = ACPI_PROCESSOR_HID; uid = static_uid_buffer; - sprintf(uid, "%d", (ProcessorCount++)); + sprintf(uid, "_%d", (ProcessorCount++)); break; case ACPI_BUS_TYPE_SYSTEM: hid = ACPI_SYSTEM_HID; Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sun Dec 29 11:14:09 2013 @@ -406,7 +406,7 @@ PIRP Irp ) { PIO_STACK_LOCATION stack; - PWCHAR buffer; + PWCHAR buffer, src; WCHAR temp[256]; ULONG length; NTSTATUS status = STATUS_SUCCESS; @@ -490,15 +490,45 @@ { acpi_bus_get_device(DeviceData->AcpiHandle, &Device); - length += swprintf(&temp[length], - L"ACPI\\%hs", - Device->pnp.hardware_id); - length++; - - length += swprintf(&temp[length], - L"*%hs", - Device->pnp.hardware_id); - length++; + DPRINT1("Device name: %s\n", Device->pnp.device_name); + DPRINT1("Hardware ID: %s\n", Device->pnp.hardware_id); + + if (strcmp(Device->pnp.hardware_id, "Processor") == 0) + { +/* + length += swprintf(&temp[length], + L"ACPI\\%s - %s", + ProcessorVendorIdentifier, ProcessorIdentifier); + length++; + + length += swprintf(&temp[length], + L"*%s - %s", + ProcessorVendorIdentifier, ProcessorIdentifier); + length++; +*/ + length = ProcessorHardwareIds.Length / sizeof(WCHAR); + src = ProcessorHardwareIds.Buffer; + } + else + { + length += swprintf(&temp[length], + L"ACPI\\%hs", + Device->pnp.hardware_id); + length++; + + length += swprintf(&temp[length], + L"*%hs", + Device->pnp.hardware_id); + length++; + + temp[length] = UNICODE_NULL; + + length++; + + temp[length] = UNICODE_NULL; + src = temp; + + } } else { @@ -509,13 +539,15 @@ length += swprintf(&temp[length], L"*FixedButton"); length++; + + temp[length] = UNICODE_NULL; + + length++; + + temp[length] = UNICODE_NULL; + src = temp; } - temp[length] = UNICODE_NULL; - - length++; - - temp[length] = UNICODE_NULL; buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); @@ -524,9 +556,54 @@ break; } - RtlCopyMemory (buffer, temp, length * sizeof(WCHAR)); + RtlCopyMemory (buffer, src, length * sizeof(WCHAR)); Irp->IoStatus.Information = (ULONG_PTR) buffer; DPRINT("BusQueryHardwareIDs: %ls\n",buffer); + break; + + case BusQueryCompatibleIDs: + length = 0; + status = STATUS_NOT_SUPPORTED; + + /* See comment in BusQueryDeviceID case */ + if (DeviceData->AcpiHandle) + { + acpi_bus_get_device(DeviceData->AcpiHandle, &Device); + + if (strcmp(Device->pnp.hardware_id, "Processor") == 0) + { + DPRINT("Device name: %s\n", Device->pnp.device_name); + DPRINT("Hardware ID: %s\n", Device->pnp.hardware_id); + + length += swprintf(&temp[length], + L"ACPI\\%hs", + Device->pnp.hardware_id); + length++; + + length += swprintf(&temp[length], + L"*%hs", + Device->pnp.hardware_id); + length++; + + temp[length] = UNICODE_NULL; + + length++; + + temp[length] = UNICODE_NULL; + + buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); + if (!buffer) + { + status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + RtlCopyMemory (buffer, temp, length * sizeof(WCHAR)); + Irp->IoStatus.Information = (ULONG_PTR) buffer; + DPRINT("BusQueryHardwareIDs: %ls\n",buffer); + status = STATUS_SUCCESS; + } + } break; default: @@ -604,7 +681,12 @@ else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) Temp = L"ACPI Power Resource"; else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) - Temp = L"Processor"; + { + if (ProcessorNameString != NULL) + Temp = ProcessorNameString; + else + Temp = L"Processor"; + } else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) Temp = L"ACPI Thermal Zone"; else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) Modified: trunk/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] Sun Dec 29 11:14:09 2013 @@ -3,6 +3,10 @@ * FILE: acpi/ospm/include/acpisys.h * PURPOSE: ACPI bus driver definitions */ + +extern UNICODE_STRING ProcessorHardwareIds; +extern LPWSTR ProcessorNameString; + typedef enum _DEVICE_PNP_STATE { NotStarted = 0, // Not started yet Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Sun Dec 29 11:14:09 2013 @@ -27,6 +27,10 @@ extern struct acpi_device *sleep_button; extern struct acpi_device *power_button; + +UNICODE_STRING ProcessorHardwareIds = {0, 0, NULL}; +LPWSTR ProcessorNameString = NULL; + NTSTATUS NTAPI @@ -332,6 +336,285 @@ return status; } +static +NTSTATUS +AcpiRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + return ZwOpenKey(KeyHandle, + DesiredAccess, + &ObjectAttributes); +} + +static +NTSTATUS +AcpiRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING Name; + ULONG BufferLength = 0; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + ValueName); + + if (DataLength != NULL) + BufferLength = *DataLength; + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferLength, 'IPCA'); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &Name, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (Data != NULL)) + { + /* Copy it */ + RtlMoveMemory(Data, + ValueInfo->Data, + ValueInfo->DataLength); + + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (((ValueInfo->Type == REG_SZ) || (ValueInfo->Type == REG_EXPAND_SZ) || (ValueInfo->Type == REG_MULTI_SZ)) && + (ValueInfo->DataLength <= *DataLength - sizeof(WCHAR))) + { + WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); + if ((ptr > (WCHAR *)Data) && ptr[-1]) + *ptr = 0; + } + } + + /* Free the memory and return status */ + ExFreePoolWithTag(ValueInfo, 'IPCA'); + + if ((Data == NULL) && (Status == STATUS_BUFFER_OVERFLOW)) + Status = STATUS_SUCCESS; + + return Status; +} + +static +NTSTATUS +GetProcessorInformation(VOID) +{ + LPWSTR ProcessorIdentifier = NULL; + LPWSTR ProcessorVendorIdentifier = NULL; + LPWSTR HardwareIdsBuffer = NULL; + HANDLE ProcessorHandle = NULL; + ULONG Length, Level1Length = 0, Level2Length = 0, Level3Length = 0; + ULONG HardwareIdsLength = 0; + ULONG i; + PWCHAR Ptr; + NTSTATUS Status; + + DPRINT1("GetProcessorInformation()\n"); + + Status = AcpiRegOpenKey(NULL, + L"\\Registry\\Machine\\Hardware\\Description\\System\\CentralProcessor\\0", + KEY_READ, + &ProcessorHandle); + if (!NT_SUCCESS(Status)) + goto done; + + AcpiRegQueryValue(ProcessorHandle, + L"Identifier", + NULL, + NULL, + &Length); + + if (Length != 0) + { + ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + if (ProcessorIdentifier == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = AcpiRegQueryValue(ProcessorHandle, + L"Identifier", + NULL, + ProcessorIdentifier, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + } + + AcpiRegQueryValue(ProcessorHandle, + L"ProcessorNameString", + NULL, + NULL, + &Length); + + if (Length != 0) + { + ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + if (ProcessorNameString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = AcpiRegQueryValue(ProcessorHandle, + L"ProcessorNameString", + NULL, + ProcessorNameString, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + } + + AcpiRegQueryValue(ProcessorHandle, + L"VendorIdentifier", + NULL, + NULL, + &Length); + + if (Length != 0) + { + ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + if (ProcessorVendorIdentifier == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = AcpiRegQueryValue(ProcessorHandle, + L"VendorIdentifier", + NULL, + ProcessorVendorIdentifier, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Length = 0; + } + + for (i = 0; i < wcslen(ProcessorIdentifier); i++) + { + if (ProcessorIdentifier[i] == L' ') + ProcessorIdentifier[i] = L'_'; + } + + Ptr = wcsstr(ProcessorIdentifier, L"Stepping"); + if (Ptr != NULL) + { + Ptr--; + Level1Length = (ULONG)(Ptr - ProcessorIdentifier); + } + + Ptr = wcsstr(ProcessorIdentifier, L"Model"); + if (Ptr != NULL) + { + Ptr--; + Level2Length = (ULONG)(Ptr - ProcessorIdentifier); + } + + Ptr = wcsstr(ProcessorIdentifier, L"Family"); + if (Ptr != NULL) + { + Ptr--; + Level3Length = (ULONG)(Ptr - ProcessorIdentifier); + } + + HardwareIdsLength = 5 + wcslen(ProcessorVendorIdentifier) + 3 + Level1Length + 1 + + 1 + wcslen(ProcessorVendorIdentifier) + 3 + Level1Length + 1 + + 5 + wcslen(ProcessorVendorIdentifier) + 3 + Level2Length + 1 + + 1 + wcslen(ProcessorVendorIdentifier) + 3 + Level2Length + 1 + + 5 + wcslen(ProcessorVendorIdentifier) + 3 + Level3Length + 1 + + 1 + wcslen(ProcessorVendorIdentifier) + 3 + Level3Length + 1 + + 2; + + HardwareIdsBuffer = ExAllocatePoolWithTag(PagedPool, HardwareIdsLength * sizeof(WCHAR), 'IPCA'); + if (HardwareIdsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Length = 0; + Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier); + Length++; + + Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier); + Length++; + + Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier); + Length++; + + Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier); + Length++; + + Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier); + Length++; + + Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier); + Length++; + HardwareIdsBuffer[Length] = UNICODE_NULL; + + ProcessorHardwareIds.Length = HardwareIdsLength * sizeof(WCHAR); + ProcessorHardwareIds.MaximumLength = ProcessorHardwareIds.Length; + ProcessorHardwareIds.Buffer = HardwareIdsBuffer; + +done: + if (ProcessorHandle != NULL) + ZwClose(ProcessorHandle); + + if (ProcessorIdentifier != NULL) + ExFreePoolWithTag(ProcessorIdentifier, 'IPCA'); + + if (ProcessorVendorIdentifier != NULL) + ExFreePoolWithTag(ProcessorVendorIdentifier, 'IPCA'); + + if (!NT_SUCCESS(Status)) + { + if (HardwareIdsBuffer != NULL) + ExFreePoolWithTag(HardwareIdsBuffer, 'IPCA'); + } + + return Status; +} + NTSTATUS NTAPI DriverEntry ( @@ -341,6 +624,8 @@ { DPRINT("Driver Entry \n"); + GetProcessorInformation(); + // // Set entry points into the driver //

10 years, 8 months

[ekohl] 61460: [MSV1_0] - Code clean-up. - Take the user RID and pimary group RID from the user info data.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 28 23:47:04 2013 New Revision: 61460 URL: http://svn.reactos.org/svn/reactos?rev=61460&view=rev Log: [MSV1_0] - Code clean-up. - Take the user RID and pimary group RID from the user info data. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Dec 28 23:47:04 2013 @@ -257,7 +257,7 @@ if (User->User.Sid == NULL) { ERR("Could not create the user SID\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INSUFFICIENT_RESOURCES; } User->User.Attributes = 0; @@ -268,10 +268,26 @@ static NTSTATUS -BuildTokenGroups(IN PSID AccountDomainSid, - IN PLUID LogonId, - OUT PTOKEN_GROUPS *Groups, - OUT PSID *PrimaryGroupSid) +BuildTokenPrimaryGroup(OUT PTOKEN_PRIMARY_GROUP PrimaryGroup, + IN PSID AccountDomainSid, + IN ULONG RelativeId) +{ + PrimaryGroup->PrimaryGroup = AppendRidToSid(AccountDomainSid, + RelativeId); + if (PrimaryGroup->PrimaryGroup == NULL) + { + ERR("Could not create the primary group SID\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +BuildTokenGroups(OUT PTOKEN_GROUPS *Groups, + IN PSID AccountDomainSid) { SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; PTOKEN_GROUPS TokenGroups; @@ -297,7 +313,6 @@ TokenGroups->Groups[GroupCount].Sid = Sid; TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - *PrimaryGroupSid = Sid; GroupCount++; @@ -365,30 +380,6 @@ return Status; } - -static -NTSTATUS -BuildTokenPrimaryGroup(PTOKEN_PRIMARY_GROUP PrimaryGroup, - PSID PrimaryGroupSid) -{ - ULONG RidCount; - ULONG Size; - - RidCount = *RtlSubAuthorityCountSid(PrimaryGroupSid); - Size = RtlLengthRequiredSid(RidCount); - - PrimaryGroup->PrimaryGroup = DispatchTable.AllocateLsaHeap(Size); - if (PrimaryGroup->PrimaryGroup == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(PrimaryGroup->PrimaryGroup, - PrimaryGroupSid, - Size); - - return STATUS_SUCCESS; -} static NTSTATUS @@ -480,11 +471,9 @@ NTSTATUS BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, PRPC_SID AccountDomainSid, - ULONG RelativeId, - PLUID LogonId) + PSAMPR_USER_INFO_BUFFER UserInfo) { PLSA_TOKEN_INFORMATION_V1 Buffer = NULL; - PSID PrimaryGroupSid = NULL; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -501,19 +490,18 @@ Status = BuildTokenUser(&Buffer->User, (PSID)AccountDomainSid, - RelativeId); - if (!NT_SUCCESS(Status)) - goto done; - - Status = BuildTokenGroups((PSID)AccountDomainSid, - LogonId, - &Buffer->Groups, - &PrimaryGroupSid); + UserInfo->All.UserId); if (!NT_SUCCESS(Status)) goto done; Status = BuildTokenPrimaryGroup(&Buffer->PrimaryGroup, - PrimaryGroupSid); + (PSID)AccountDomainSid, + UserInfo->All.PrimaryGroupId); + if (!NT_SUCCESS(Status)) + goto done; + + Status = BuildTokenGroups(&Buffer->Groups, + (PSID)AccountDomainSid); if (!NT_SUCCESS(Status)) goto done; @@ -1047,8 +1035,7 @@ /* Build and fill the token information buffer */ Status = BuildTokenInformationBuffer((PLSA_TOKEN_INFORMATION_V1*)TokenInformation, AccountDomainSid, - RelativeIds.Element[0], - LogonId); + UserInfo); if (!NT_SUCCESS(Status)) { TRACE("BuildTokenInformationBuffer failed (Status %08lx)\n", Status);

10 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 December 2013