Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[janderwald] 55348: - Remove old version of usbehci and usbhub

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 31 10:11:39 2012 New Revision: 55348 URL: http://svn.reactos.org/svn/reactos?rev=55348&view=rev Log: - Remove old version of usbehci and usbhub Removed: branches/usb-bringup-trunk/drivers/usb/usbehci/ branches/usb-bringup-trunk/drivers/usb/usbhub/

12 years, 8 months

[gadamopoulos] 55347: [user32_apitest] - Add a couple of tests for SPI_SETMOUSESPEED and SPI_GETMOUSESPEED - inspired by bug 905

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 31 09:58:05 2012 New Revision: 55347 URL: http://svn.reactos.org/svn/reactos?rev=55347&view=rev Log: [user32_apitest] - Add a couple of tests for SPI_SETMOUSESPEED and SPI_GETMOUSESPEED - inspired by bug 905 Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Jan 31 09:58:05 2012 @@ -134,6 +134,26 @@ COMPARE_CACHE(CaptionHeight_chain); } +static void Test_MouseSpeed() +{ + ULONG ulMouseSpeed, temp; + BOOL ret; + + ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &ulMouseSpeed, 0); + ok(ret, "SystemParametersInfo failed\n"); + ok(ulMouseSpeed >= 1 && ulMouseSpeed <=20, "Wrong mouse speed (%d)\n", (int)ulMouseSpeed); + + temp = 1; + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfo failed\n"); + ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); + ok(ret, "SystemParametersInfo failed\n"); + ok(temp == 1, "SPI_GETMOUSESPEED did not get value set by SPI_SETMOUSESPEED (%d instead of 1)\n", (int)temp); + + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfo failed\n"); +} + START_TEST(SystemParametersInfo) { RegisterSimpleClass(SysParamsTestProc, L"sysparamstest"); @@ -144,6 +164,7 @@ 200, 200, 300, 300, NULL, NULL, 0, NULL); Test_NonClientMetrics(); + Test_MouseSpeed(); DestroyWindow(hWnd1); DestroyWindow(hWnd2);

12 years, 8 months

[ion] 55346: [SMSS2]: Implement helper functions for reading and writing to the BSD (What lets Windows know if this was a good boot/shutdown or a bad one, and to display the recovery settings or no...

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 31 02:38:42 2012 New Revision: 55346 URL: http://svn.reactos.org/svn/reactos?rev=55346&view=rev Log: [SMSS2]: Implement helper functions for reading and writing to the BSD (What lets Windows know if this was a good boot/shutdown or a bad one, and to display the recovery settings or not (FreeLDR should do this...)). Implement the functions needed to launch native applications, and add support for launching autochk and any other bootexecute applications. Set the correct SessionID with the kernel by calling ProcessSessionInformation. Pending File Rename Operations are the last big thing left, plus actual pagefile creation. [SMSS2]: Fix a bug in SmpParseCommandLine. Modified: trunk/reactos/base/system/smss2/smsessn.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smsubsys.c trunk/reactos/base/system/smss2/smutil.c Modified: trunk/reactos/base/system/smss2/smsessn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsessn.… ============================================================================== --- trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] Tue Jan 31 02:38:42 2012 @@ -22,3 +22,25 @@ HANDLE SmpSessionsObjectDirectory; /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpSetProcessMuSessionId(IN HANDLE ProcessHandle, + IN ULONG SessionId) +{ + NTSTATUS Status; + + /* Tell the kernel about our session ID */ + Status = NtSetInformationProcess(ProcessHandle, + ProcessSessionInformation, + &SessionId, + sizeof(SessionId)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: SetProcessMuSessionId, Process=%x, Status=%x\n", + ProcessHandle, Status); + } + + /* Return */ + return Status; +} Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Tue Jan 31 02:38:42 2012 @@ -28,19 +28,271 @@ UNICODE_STRING SmpSystemRoot; ULONG AttachedSessionId = -1; -BOOLEAN SmpDebug; +BOOLEAN SmpDebug, SmpEnableDots; /* FUNCTIONS ******************************************************************/ + +/* GCC's incompetence strikes again */ +VOID +sprintf_nt(IN PCHAR Buffer, + IN PCHAR Format, + IN ...) +{ + va_list ap; + va_start(ap, Format); + sprintf(Buffer, Format, ap); + va_end(ap); +} + +NTSTATUS +NTAPI +SmpExecuteImage(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + IN ULONG Flags, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation) +{ + PRTL_USER_PROCESS_INFORMATION ProcessInfo; + NTSTATUS Status; + RTL_USER_PROCESS_INFORMATION LocalProcessInfo; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + + /* Use the input process information if we have it, otherwise use local */ + ProcessInfo = ProcessInformation; + if (!ProcessInfo) ProcessInfo = &LocalProcessInfo; + + /* Create parameters for the target process */ + Status = RtlCreateProcessParameters(&ProcessParameters, + FileName, + SmpDefaultLibPath.Length ? + &SmpDefaultLibPath : NULL, + Directory, + CommandLine, + SmpDefaultEnvironment, + NULL, + NULL, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + /* This is a pretty bad failure. ASSERT on checked builds and exit */ + ASSERTMSG(NT_SUCCESS(Status), "RtlCreateProcessParameters"); + DPRINT1("SMSS: RtlCreateProcessParameters failed for %wZ - Status == %lx\n", + FileName, Status); + return Status; + } + + /* Set the size field as required */ + ProcessInfo->Size = sizeof(RTL_USER_PROCESS_INFORMATION); + + /* Check if the debug flag was requested */ + if (Flags & SMP_DEBUG_FLAG) + { + /* Write it in the process parameters */ + ProcessParameters->DebugFlags = 1; + } + else + { + /* Otherwise inherit the flag that was passed to SMSS itself */ + ProcessParameters->DebugFlags = SmpDebug; + } + + /* Subsystems get the first 1MB of memory reserved for DOS/IVT purposes */ + if (Flags & SMP_SUBSYSTEM_FLAG) + { + ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; + } + + /* And always force NX for anything that SMSS launches */ + ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_NX; + + /* Now create the process */ + Status = RtlCreateUserProcess(FileName, + OBJ_CASE_INSENSITIVE, + ProcessParameters, + NULL, + NULL, + NULL, + FALSE, + NULL, + NULL, + ProcessInfo); + RtlDestroyProcessParameters(ProcessParameters); + if (!NT_SUCCESS(Status)) + { + /* If we couldn't create it, fail back to the caller */ + DPRINT1("SMSS: Failed load of %wZ - Status == %lx\n", + FileName, Status); + return Status; + } + + /* Associate a session with this process */ + Status = SmpSetProcessMuSessionId(ProcessInfo->ProcessHandle, MuSessionId); + + /* If the application is deferred (suspended), there's nothing to do */ + if (Flags & SMP_DEFERRED_FLAG) return Status; + + /* Otherwise, get ready to start it, but make sure it's a native app */ + if (ProcessInfo->ImageInformation.SubSystemType == IMAGE_SUBSYSTEM_NATIVE) + { + /* Resume it */ + NtResumeThread(ProcessInfo->ThreadHandle, NULL); + if (!(Flags & SMP_ASYNC_FLAG)) + { + /* Block on it unless Async was requested */ + NtWaitForSingleObject(ProcessInfo->ThreadHandle, FALSE, NULL); + } + + /* It's up and running now, close our handles */ + NtClose(ProcessInfo->ThreadHandle); + NtClose(ProcessInfo->ProcessHandle); + } + else + { + /* This image is invalid, so kill it, close our handles, and fail */ + Status = STATUS_INVALID_IMAGE_FORMAT; + NtTerminateProcess(ProcessInfo->ProcessHandle, Status); + NtWaitForSingleObject(ProcessInfo->ThreadHandle, 0, 0); + NtClose(ProcessInfo->ThreadHandle); + NtClose(ProcessInfo->ProcessHandle); + DPRINT1("SMSS: Not an NT image - %wZ\n", FileName); + } + + /* Return the outcome of the process create */ + return Status; +} + +NTSTATUS +NTAPI +SmpInvokeAutoChk(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING Arguments, + IN ULONG Flags) +{ + ANSI_STRING DestinationString; + CHAR SourceString[256]; + UNICODE_STRING Destination; + WCHAR Buffer[1024]; + BOOLEAN BootState, BootOkay, ShutdownOkay; + + /* Check if autochk should show dots (if the user booted with /SOS) */ + if (SmpQueryRegistrySosOption()) SmpEnableDots = FALSE; + + /* Make sure autochk was actually found */ + if (Flags & SMP_INVALID_PATH) + { + /* It wasn't, so create an error message to print on the screen */ + sprintf_nt(SourceString, + "%wZ program not found - skipping AUTOCHECK\n", + FileName); + RtlInitAnsiString(&DestinationString, SourceString); + if (RtlAnsiStringToUnicodeString(&Destination, + &DestinationString, + TRUE)) + { + /* And show it */ + NtDisplayString(&Destination); + RtlFreeUnicodeString(&Destination); + } + } + else + { + /* Autochk is there, so record the BSD state */ + BootState = SmpSaveAndClearBootStatusData(&BootOkay, &ShutdownOkay); + + /* Build the path to autochk and place its arguments */ + RtlInitEmptyUnicodeString(&Destination, Buffer, sizeof(Buffer)); + RtlAppendUnicodeStringToString(&Destination, FileName); + RtlAppendUnicodeToString(&Destination, L" "); + RtlAppendUnicodeStringToString(&Destination, Arguments); + + /* Execute it */ + SmpExecuteImage(FileName, + Directory, + &Destination, + 0, + Flags & ~SMP_AUTOCHK_FLAG, + NULL); + + /* Restore the BSD state */ + if (BootState) SmpRestoreBootStatusData(BootOkay, ShutdownOkay); + } + + /* We're all done! */ + return STATUS_SUCCESS; +} NTSTATUS NTAPI SmpExecuteCommand(IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PULONG ProcessId, + OUT PHANDLE ProcessId, IN ULONG Flags) { - DPRINT1("Should run: %wZ for session %d\n", CommandLine, MuSessionId); - return STATUS_SUCCESS; + NTSTATUS Status; + UNICODE_STRING Arguments, Directory, FileName; + + /* There's no longer a debugging subsystem */ + if (Flags & SMP_DEBUG_FLAG) return STATUS_SUCCESS; + + /* Parse the command line to see what execution flags are requested */ + Status = SmpParseCommandLine(CommandLine, + &Flags, + &FileName, + &Directory, + &Arguments); + if (!NT_SUCCESS(Status)) + { + /* Fail if we couldn't do that */ + DPRINT1("SMSS: SmpParseCommand( %wZ ) failed - Status == %lx\n", + CommandLine, Status); + return Status; + } + + /* Check if autochk is requested */ + if (Flags & SMP_AUTOCHK_FLAG) + { + /* Run it */ + Status = SmpInvokeAutoChk(&FileName, &Directory, &Arguments, Flags); + } + else if (Flags & SMP_SUBSYSTEM_FLAG) + { + Status = SmpLoadSubSystem(&FileName, + &Directory, + CommandLine, + MuSessionId, + ProcessId); + } + else if (Flags & SMP_INVALID_PATH) + { + /* An invalid image was specified, fail */ + DPRINT1("SMSS: Image file (%wZ) not found\n", &FileName); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* An actual image name was present -- execute it */ + Status = SmpExecuteImage(&FileName, + &Directory, + CommandLine, + MuSessionId, + Flags, + NULL); + } + + /* Free all the token parameters */ + if (FileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); + if (Directory.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Directory.Buffer); + if (Arguments.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Arguments.Buffer); + + /* Return to the caller */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Command '%wZ' failed - Status == %x\n", + CommandLine, Status); + } + return Status; } NTSTATUS Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Tue Jan 31 02:38:42 2012 @@ -33,7 +33,9 @@ #define SMP_DEBUG_FLAG 0x01 #define SMP_ASYNC_FLAG 0x02 #define SMP_AUTOCHK_FLAG 0x04 +#define SMP_SUBSYSTEM_FLAG 0x08 #define SMP_INVALID_PATH 0x10 +#define SMP_DEFERRED_FLAG 0x20 /* EXTERNALS ******************************************************************/ @@ -102,7 +104,7 @@ SmpExecuteCommand( IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PULONG ProcessId, + OUT PHANDLE ProcessId, IN ULONG Flags ); @@ -141,3 +143,42 @@ OUT PUNICODE_STRING Directory, OUT PUNICODE_STRING Arguments ); + +NTSTATUS +NTAPI +SmpLoadSubSystem( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + OUT PHANDLE ProcessId +); + +NTSTATUS +NTAPI +SmpSetProcessMuSessionId( + IN HANDLE ProcessHandle, + IN ULONG SessionId +); + +BOOLEAN +NTAPI +SmpQueryRegistrySosOption( + VOID +); + +BOOLEAN +NTAPI +SmpSaveAndClearBootStatusData( + OUT PBOOLEAN BootOkay, + OUT PBOOLEAN ShutdownOkay +); + +VOID +NTAPI +SmpRestoreBootStatusData( + IN BOOLEAN BootOkay, + IN BOOLEAN ShutdownOkay +); + + Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Tue Jan 31 02:38:42 2012 @@ -24,6 +24,18 @@ NTSTATUS NTAPI +SmpLoadSubSystem(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + OUT PHANDLE ProcessId) +{ + DPRINT1("Should start subsystem %wZ for Session: %lx\n", FileName, MuSessionId); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId, OUT PHANDLE ProcessId, IN PUNICODE_STRING InitialCommand) Modified: trunk/reactos/base/system/smss2/smutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smutil.c… ============================================================================== --- trunk/reactos/base/system/smss2/smutil.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smutil.c [iso-8859-1] Tue Jan 31 02:38:42 2012 @@ -13,6 +13,11 @@ #include "debug.h" /* GLOBALS ********************************************************************/ + +// +// Taken from an ASSERT +// +#define VALUE_BUFFER_SIZE (sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 512) typedef struct _SMP_PRIVILEGE_STATE { @@ -399,8 +404,7 @@ else { /* There is a directory, and a filename -- separate those two */ - FilePart -= sizeof(UNICODE_NULL); - *FilePart = UNICODE_NULL; + *--FilePart = UNICODE_NULL; RtlCreateUnicodeString(Directory, PathBuffer); } } @@ -408,3 +412,139 @@ /* We are done -- move on to the second pass to get the arguments */ return SmpParseToken(&CmdLineCopy, TRUE, Arguments); } + +BOOLEAN +NTAPI +SmpQueryRegistrySosOption(VOID) +{ + NTSTATUS Status; + UNICODE_STRING KeyName, ValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + WCHAR ValueBuffer[VALUE_BUFFER_SIZE]; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PVOID)ValueBuffer; + ULONG Length; + + /* Open the key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: can't open control key: 0x%x\n", Status); + return FALSE; + } + + /* Query the value */ + RtlInitUnicodeString(&ValueName, L"SystemStartOptions"); + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + PartialInfo, + sizeof(ValueBuffer), + &Length); + ASSERT(Length < VALUE_BUFFER_SIZE); + NtClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: can't query value key: 0x%x\n", Status); + return FALSE; + } + + /* Check if it's set to SOS or sos */ + if (!(wcsstr((PWCHAR)PartialInfo->Data, L"SOS")) || + (wcsstr((PWCHAR)PartialInfo->Data, L"sos"))) + { + /* It's not set, return FALSE */ + return FALSE; + } + + /* It's set, return TRUE */ + return TRUE; +} + +BOOLEAN +NTAPI +SmpSaveAndClearBootStatusData(OUT PBOOLEAN BootOkay, + OUT PBOOLEAN ShutdownOkay) +{ + NTSTATUS Status; + BOOLEAN Value = TRUE; + PVOID BootStatusDataHandle; + + /* Assume failure */ + *BootOkay = FALSE; + *ShutdownOkay = FALSE; + + /* Lock the BSD and fail if we couldn't */ + Status = RtlLockBootStatusData(&BootStatusDataHandle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Read the old settings */ + RtlGetSetBootStatusData(BootStatusDataHandle, + TRUE, + RtlBsdItemBootGood, + BootOkay, + sizeof(BOOLEAN), + NULL); + RtlGetSetBootStatusData(BootStatusDataHandle, + TRUE, + RtlBsdItemBootShutdown, + ShutdownOkay, + sizeof(BOOLEAN), + NULL); + + /* Set new ones indicating we got at least this far */ + RtlGetSetBootStatusData(BootStatusDataHandle, + FALSE, + RtlBsdItemBootGood, + &Value, + sizeof(Value), + NULL); + RtlGetSetBootStatusData(BootStatusDataHandle, + FALSE, + RtlBsdItemBootShutdown, + &Value, + sizeof(Value), + NULL); + + /* Unlock the BSD and return */ + RtlUnlockBootStatusData(BootStatusDataHandle); + return TRUE; +} + +VOID +NTAPI +SmpRestoreBootStatusData(IN BOOLEAN BootOkay, + IN BOOLEAN ShutdownOkay) +{ + NTSTATUS Status; + PVOID BootState; + + /* Lock the BSD */ + Status = RtlLockBootStatusData(&BootState); + if (NT_SUCCESS(Status)) + { + /* Write the bootokay and bootshudown values */ + RtlGetSetBootStatusData(BootState, + FALSE, + RtlBsdItemBootGood, + &BootOkay, + sizeof(BootOkay), + NULL); + RtlGetSetBootStatusData(BootState, + FALSE, + RtlBsdItemBootShutdown, + &ShutdownOkay, + sizeof(ShutdownOkay), + NULL); + + /* Unlock the BSD and return */ + RtlUnlockBootStatusData(BootState); + } +}

12 years, 8 months

[ion] 55345: [NDK/RTL]: Fix RtlGetSetBootStatusData prototype and add the BSD Items that can be set with it.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 31 02:33:02 2012 New Revision: 55345 URL: http://svn.reactos.org/svn/reactos?rev=55345&view=rev Log: [NDK/RTL]: Fix RtlGetSetBootStatusData prototype and add the BSD Items that can be set with it. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jan 31 02:33:02 2012 @@ -3877,12 +3877,12 @@ NTSTATUS NTAPI RtlGetSetBootStatusData( - HANDLE FileHandle, - BOOLEAN WriteMode, - DWORD DataClass, - PVOID Buffer, - ULONG BufferSize, - DWORD DataClass2 + IN HANDLE FileHandle, + IN BOOLEAN WriteMode, + IN RTL_BSD_ITEM_TYPE DataClass, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PULONG ReturnLength OPTIONAL ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Tue Jan 31 02:33:02 2012 @@ -366,6 +366,20 @@ #endif /* NTOS_MODE_USER */ #ifdef NTOS_MODE_USER + +// +// Boot Status Data Field Types +// +typedef enum _RTL_BSD_ITEM_TYPE +{ + RtlBsdItemVersionNumber, + RtlBsdItemProductType, + RtlBsdItemAabEnabled, + RtlBsdItemAabTimeout, + RtlBsdItemBootGood, + RtlBsdItemBootShutdown, + RtlBsdItemMax +} RTL_BSD_ITEM_TYPE, *PRTL_BSD_ITEM_TYPE; // // Table and Compare result types Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=553… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Tue Jan 31 02:33:02 2012 @@ -686,12 +686,12 @@ */ NTSTATUS NTAPI -RtlGetSetBootStatusData(HANDLE Filehandle, - BOOLEAN WriteMode, - DWORD DataClass, - PVOID Buffer, - ULONG BufferSize, - DWORD DataClass2) +RtlGetSetBootStatusData(IN HANDLE Filehandle, + IN BOOLEAN WriteMode, + IN RTL_BSD_ITEM_TYPE DataClass, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PULONG ReturnLength) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

12 years, 8 months

[zguo] 55344: Really update the release version this time.

by zguo＠svn.reactos.org

Author: zguo Date: Tue Jan 31 01:41:32 2012 New Revision: 55344 URL: http://svn.reactos.org/svn/reactos?rev=55344&view=rev Log: Really update the release version this time. Modified: branches/ros-branch-0_3_14/include/reactos/version.h Modified: branches/ros-branch-0_3_14/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/include/react… ============================================================================== --- branches/ros-branch-0_3_14/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/include/reactos/version.h [iso-8859-1] Tue Jan 31 01:41:32 2012 @@ -18,8 +18,8 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 14 #define COPYRIGHT_YEAR "2012"

12 years, 8 months

[ion] 55343: [SMSS2]: Implement SmpCreateDynamicEnvironmentVariables such that all the SMSS-generated variables are created. Compared to SMSS it has some bug fixes and also handles the safe-mode op...

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 31 01:19:14 2012 New Revision: 55343 URL: http://svn.reactos.org/svn/reactos?rev=55343&view=rev Log: [SMSS2]: Implement SmpCreateDynamicEnvironmentVariables such that all the SMSS-generated variables are created. Compared to SMSS it has some bug fixes and also handles the safe-mode options key. Next step is to handle boot/setup/execute keys and get autochk running from SMSS2. [SMSS]: No longer initialize the registry, let SMSS2 do that now. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss2/sminit.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -326,6 +326,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); + DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/init.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -33,7 +33,7 @@ {FALSE, SmUpdateEnvironment, "update environment variables"}, {FALSE, SmLoadKnownDlls, "preload system DLLs"}, {TRUE, SmCreatePagingFiles, "create paging files"}, - {TRUE, SmInitializeRegistry, "initialize the registry"}, +// {TRUE, SmInitializeRegistry, "initialize the registry"}, {TRUE, SmInitializeClientManagement, "initialize client management"}, {TRUE, SmLoadSubsystems, "load subsystems"} }; Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -1507,6 +1507,322 @@ NTAPI SmpCreateDynamicEnvironmentVariables(VOID) { + NTSTATUS Status; + SYSTEM_BASIC_INFORMATION BasicInfo; + SYSTEM_PROCESSOR_INFORMATION ProcessorInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ValueName, DestinationString; + HANDLE KeyHandle, KeyHandle2; + ULONG ResultLength; + PWCHAR ArchName; + WCHAR ValueBuffer[512], ValueBuffer2[512]; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PVOID)ValueBuffer; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo2 = (PVOID)ValueBuffer2; + + /* Get system basic information -- we'll need the CPU count */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to query system basic information - %x\n", Status); + return Status; + } + + /* Get the processor information, we'll query a bunch of revision info */ + Status = NtQuerySystemInformation(SystemProcessorInformation, + &ProcessorInfo, + sizeof(ProcessorInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to query system processor information - %x\n", Status); + return Status; + } + + /* We'll be writing all these environment variables over here */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + "Control\\Session Manager\\Environment"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, GENERIC_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to open %wZ - %x\n", &DestinationString, Status); + return Status; + } + + /* First let's write the OS variable */ + RtlInitUnicodeString(&ValueName, L"OS"); + DPRINT1("Setting %wZ to %S\n", &ValueName, L"Windows_NT"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + L"Windows_NT", + wcslen(L"Windows_NT") * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Next, let's write the CPU architecture variable */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_ARCHITECTURE"); + switch (ProcessorInfo.ProcessorArchitecture) + { + /* Pick the correct string that matches the architecture */ + case PROCESSOR_ARCHITECTURE_INTEL: + ArchName = L"x86"; + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + ArchName = L"AMD64"; + break; + + case PROCESSOR_ARCHITECTURE_IA64: + ArchName = L"IA64"; + break; + + default: + ArchName = L"Unknown"; + break; + } + + /* Set it */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ArchName); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ArchName, + wcslen(ArchName) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* And now let's write the processor level */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_LEVEL"); + swprintf(ValueBuffer, L"%u", ProcessorInfo.ProcessorLevel); + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now open the hardware CPU key */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\Hardware\\Description\\System\\" + "CentralProcessor\\0"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle2, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Unable to open %wZ - %x\n", &DestinationString, Status); + NtClose(KeyHandle); + return Status; + } + + /* So that we can read the identifier out of it... */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo, + sizeof(ValueBuffer), + &ResultLength); + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle2); + NtClose(KeyHandle); + DPRINT1("SMSS: Unable to read %wZ\\%wZ - %x\n", + &DestinationString, &ValueName, Status); + return Status; + } + + /* As well as the vendor... */ + RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo2, + sizeof(ValueBuffer2), + &ResultLength); + NtClose(KeyHandle2); + if (NT_SUCCESS(Status)) + { + /* To combine it into a single string */ + swprintf((PWCHAR)PartialInfo->Data + wcslen((PWCHAR)PartialInfo->Data), + L", %ws", + PartialInfo2->Data); + } + + /* So that we can set this as the PROCESSOR_IDENTIFIER variable */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_IDENTIFIER"); + DPRINT1("Setting %wZ to %S\n", &ValueName, PartialInfo->Data); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + PartialInfo->Data, + wcslen((PWCHAR)PartialInfo->Data) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now let's get the processor architecture */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_REVISION"); + switch (ProcessorInfo.ProcessorArchitecture) + { + /* Check if this is an older Intel CPU */ + case PROCESSOR_ARCHITECTURE_INTEL: + if ((ProcessorInfo.ProcessorRevision >> 8) == 0xFF) + { + /* These guys used a revision + stepping, so get the rev only */ + swprintf(ValueBuffer, L"%02x", ProcessorInfo.ProcessorRevision & 0xFF); + _wcsupr(ValueBuffer); + break; + } + + /* Modern Intel, as well as 64-bit CPUs use a revision without stepping */ + case PROCESSOR_ARCHITECTURE_IA64: + case PROCESSOR_ARCHITECTURE_AMD64: + swprintf(ValueBuffer, L"%04x", ProcessorInfo.ProcessorRevision); + break; + + /* And anything else we'll just read the whole revision identifier */ + default: + swprintf(ValueBuffer, L"%u", ProcessorInfo.ProcessorRevision); + break; + } + + /* Write the revision to the registry */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* And finally, write the number of CPUs */ + RtlInitUnicodeString(&ValueName, L"NUMBER_OF_PROCESSORS"); + swprintf(ValueBuffer, L"%u", BasicInfo.NumberOfProcessors); + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now we need to write the safeboot option key in a different format */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + "Control\\Safeboot\\Option"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle2, KEY_ALL_ACCESS, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* This was indeed a safeboot, so check what kind of safeboot it was */ + RtlInitUnicodeString(&ValueName, L"OptionValue"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo, + sizeof(ValueBuffer), + &ResultLength); + NtClose(KeyHandle2); + if (NT_SUCCESS(Status)) + { + /* Convert from the integer value to the correct specifier */ + RtlInitUnicodeString(&ValueName, L"SAFEBOOT_OPTION"); + switch (*(PULONG)PartialInfo->Data) + { + case 1: + wcscpy(ValueBuffer, L"MINIMAL"); + break; + case 2: + wcscpy(ValueBuffer, L"NETWORK"); + break; + case 3: + wcscpy(ValueBuffer, L"DSREPAIR"); + break; + } + + /* And write it in the environment! */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + } + else + { + DPRINT1("SMSS: Failed querying safeboot option = %x\n", Status); + } + } + + /* We are all done now */ + NtClose(KeyHandle); return STATUS_SUCCESS; } @@ -1698,7 +2014,7 @@ SmpCreatePagingFiles(); /* Tell Cm it's now safe to fully enable write access to the registry */ - // NtInitializeRegistry(FALSE); Later... + NtInitializeRegistry(CM_BOOT_FLAG_SMSS); /* Create all the system-based environment variables for later inheriting */ Status = SmpCreateDynamicEnvironmentVariables();

12 years, 8 months

[ion] 55342: [NDK]: D'oh.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 22:55:24 2012 New Revision: 55342 URL: http://svn.reactos.org/svn/reactos?rev=55342&view=rev Log: [NDK]: D'oh. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Mon Jan 30 22:55:24 2012 @@ -122,7 +122,14 @@ // Device Charactertics // #define FILE_REMOVABLE_MEDIA 0x00000001 +#define FILE_READ_ONLY_DEVICE 0x00000002 +#define FILE_FLOPPY_DISKETTE 0x00000004 +#define FILE_WRITE_ONCE_MEDIA 0x00000008 #define FILE_REMOTE_DEVICE 0x00000010 +#define FILE_DEVICE_IS_MOUNTED 0x00000020 +#define FILE_VIRTUAL_VOLUME 0x00000040 +#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 +#define FILE_DEVICE_SECURE_OPEN 0x00000100 // // File Object Flags

12 years, 8 months

[cgutman] 55341: [USBEHCI] - Remove debug spam

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 22:54:40 2012 New Revision: 55341 URL: http://svn.reactos.org/svn/reactos?rev=55341&view=rev Log: [USBEHCI] - Remove debug spam Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Mon Jan 30 22:54:40 2012 @@ -1090,7 +1090,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; - DPRINT1("CStatus %x\n", CStatus); + DPRINT("CStatus %x\n", CStatus); // // check for completion of async schedule

12 years, 8 months

[ion] 55340: [SMSS2]: Create and define the volume descriptor structure, and go ahead and build some volume descriptors!

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 22:50:37 2012 New Revision: 55340 URL: http://svn.reactos.org/svn/reactos?rev=55340&view=rev Log: [SMSS2]: Create and define the volume descriptor structure, and go ahead and build some volume descriptors! Modified: trunk/reactos/base/system/smss2/pagefile.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 22:50:37 2012 @@ -20,6 +20,9 @@ #define STANDARD_PAGING_FILE_NAME L"\\??\\?:\\pagefile.sys" #define STANDARD_DRIVE_LETTER_OFFSET 4 +// +// Structure and flags describing each pagefile +// #define SMP_PAGEFILE_CREATED 0x01 #define SMP_PAGEFILE_DEFAULT 0x02 #define SMP_PAGEFILE_SYSTEM_MANAGED 0x04 @@ -38,6 +41,20 @@ LARGE_INTEGER ActualMaxSize; ULONG Flags; } SMP_PAGEFILE_DESCRIPTOR, *PSMP_PAGEFILE_DESCRIPTOR; + +// +// Structure and flags describing each volume +// +#define SMP_VOLUME_INSERTED 0x01 +#define SMP_VOLUME_IS_BOOT 0x08 +typedef struct _SMP_VOLUME_DESCRIPTOR +{ + LIST_ENTRY Entry; + ULONG Flags; + WCHAR DriveLetter; + LARGE_INTEGER FreeSpace; + FILE_FS_DEVICE_INFORMATION DeviceInfo; +} SMP_VOLUME_DESCRIPTOR, *PSMP_VOLUME_DESCRIPTOR; LIST_ENTRY SmpPagingFileDescriptorList, SmpVolumeDescriptorList; BOOLEAN SmpRegistrySpecifierPresent; @@ -411,7 +428,184 @@ NTAPI SmpCreateVolumeDescriptors(VOID) { - return STATUS_SUCCESS; + NTSTATUS Status; + UNICODE_STRING VolumePath; + ULONG Length; + BOOLEAN BootVolumeFound = FALSE; + WCHAR StartChar, Drive, DriveDiff; + HANDLE VolumeHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PROCESS_DEVICEMAP_INFORMATION ProcessInformation; + FILE_FS_DEVICE_INFORMATION DeviceInfo; + FILE_FS_SIZE_INFORMATION SizeInfo; + PSMP_VOLUME_DESCRIPTOR Volume; + LARGE_INTEGER FreeSpace, FinalFreeSpace; + WCHAR Buffer[32]; + + /* We should be starting with an empty list */ + ASSERT(IsListEmpty(&SmpVolumeDescriptorList)); + + /* Query the device map so we can get the drive letters */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDeviceMap, + &ProcessInformation, + sizeof(ProcessInformation), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X \n", + Status); + return Status; + } + + /* Build the volume string, starting with A: (we'll edit this in place) */ + wcscpy(Buffer, L"\\??\\A:\\"); + Length = wcslen(Buffer); + VolumePath.Buffer = Buffer; + VolumePath.Length = Length * sizeof(WCHAR); + VolumePath.MaximumLength = Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Start with the C drive except on weird Japanese NECs... */ + StartChar = SharedUserData->AlternativeArchitecture ? L'A' : L'C'; + for (Drive = StartChar, DriveDiff = StartChar - 'A'; Drive <= L'Z'; Drive++, DriveDiff++) + { + /* Skip the disk if it's not in the drive map */ + if (!((1 << DriveDiff) & ProcessInformation.Query.DriveMap)) continue; + + /* Write the drive letter and try to open the volume */ + VolumePath.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Drive; + InitializeObjectAttributes(&ObjectAttributes, + &VolumePath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&VolumeHandle, + FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + /* Skip the volume if we failed */ + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", + &VolumePath, Status); + continue; + } + + /* Now query device information on the volume */ + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &DeviceInfo, + sizeof(DeviceInfo), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + { + /* Move to the next volume if we failed */ + DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for device info" + " failed with status %X \n", + &VolumePath, + VolumeHandle, + Status); + NtClose(VolumeHandle); + continue; + } + + /* Check if this is a fixed disk */ + if (DeviceInfo.Characteristics & (FILE_FLOPPY_DISKETTE | + FILE_READ_ONLY_DEVICE | + FILE_REMOTE_DEVICE | + FILE_REMOVABLE_MEDIA)) + { + /* It isn't, so skip it */ + DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file \n", + &VolumePath, + DeviceInfo.Characteristics); + NtClose(VolumeHandle); + continue; + } + + /* We found a fixed volume, allocate a descriptor for it */ + Volume = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SMP_VOLUME_DESCRIPTOR)); + if (!Volume) + { + /* Failed to allocate memory, try the next disk */ + DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes) \n", + sizeof(SMP_VOLUME_DESCRIPTOR)); + NtClose(VolumeHandle); + continue; + } + + /* Save the drive letter and device information */ + Volume->DriveLetter = Drive; + Volume->DeviceInfo = DeviceInfo; + + /* Check if this is the boot volume */ + if (RtlUpcaseUnicodeChar(Drive) == + RtlUpcaseUnicodeChar(SharedUserData->NtSystemRoot[0])) + { + /* Save it */ + ASSERT(BootVolumeFound == FALSE); + Volume->Flags |= SMP_VOLUME_IS_BOOT; + BootVolumeFound = TRUE; + } + + /* Now get size information on the volume */ + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &SizeInfo, + sizeof(SizeInfo), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) + { + /* We failed -- keep going */ + DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" + " with status %X \n", + &VolumePath, + VolumeHandle, + Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, Volume); + NtClose(VolumeHandle); + continue; + } + + /* Done querying volume information, close the handle */ + NtClose(VolumeHandle); + + /* Compute how much free space we have */ + FreeSpace.QuadPart = SizeInfo.AvailableAllocationUnits.QuadPart * + SizeInfo.SectorsPerAllocationUnit; + FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; + Volume->FreeSpace = FinalFreeSpace; + + /* Check if there's less than 32MB free so we don't starve the disk */ + if (FinalFreeSpace.QuadPart <= 0x2000000) + { + /* In this case, act as if there's no free space */ + Volume->FreeSpace.QuadPart = 0; + } + else + { + /* Trim off 32MB to give the disk a bit of breathing room */ + Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - 0x2000000; + } + + /* All done, add this volume to our descriptor list */ + InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); + Volume->Flags |= SMP_VOLUME_INSERTED; + DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + } + + /* We must've found at least the boot volume */ + ASSERT(BootVolumeFound == TRUE); + ASSERT(!IsListEmpty(&SmpVolumeDescriptorList)); + if (!IsListEmpty(&SmpVolumeDescriptorList)) return STATUS_SUCCESS; + + /* Something is really messed up if we found no disks at all */ + return STATUS_UNEXPECTED_IO_ERROR; } NTSTATUS

12 years, 8 months

[cgutman] 55339: [USBHUB] - Missed a fix from last commit - Wait for the device status change work item to complete - The USB stack is now properly constructed for USB booting

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 22:45:16 2012 New Revision: 55339 URL: http://svn.reactos.org/svn/reactos?rev=55339&view=rev Log: [USBHUB] - Missed a fix from last commit - Wait for the device status change work item to complete - The USB stack is now properly constructed for USB booting Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 30 22:45:16 2012 @@ -260,8 +260,6 @@ PORT_STATUS_CHANGE PortStatus; LONG PortId; - static LONG failsafe = 0; - DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); WorkItemData = (PWORK_ITEM_DATA)Context; @@ -408,20 +406,7 @@ } } - // - // FIXME: Still in testing - // - failsafe++; - if (failsafe > 100) - { - DPRINT1("SCE completed over 100 times but no action has been taken to clear the Change of any ports.\n"); - // - // Return and dont send any more SCE Requests - // - return; - } - - ExFreePool(WorkItemData); + KeSetEvent(&WorkItemData->Event, IO_NO_INCREMENT, FALSE); // // Send another SCE Request @@ -460,6 +445,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } WorkItemData->Context = RealDeviceObject; + KeInitializeEvent(&WorkItemData->Event, NotificationEvent, FALSE); DPRINT1("Initialize work item\n"); ExInitializeWorkItem(&WorkItemData->WorkItem, DeviceStatusChangeThread, (PVOID)WorkItemData); @@ -467,6 +453,16 @@ // Queue the work item to handle initializing the device // ExQueueWorkItem(&WorkItemData->WorkItem, DelayedWorkQueue); + + // + // Wait for the work item + // + KeWaitForSingleObject(&WorkItemData->Event, + Executive, + KernelMode, + FALSE, + NULL); + ExFreePool(WorkItemData); // // Return more processing required so the IO Manger doesnât try to mess with IRP just freed @@ -1823,6 +1819,11 @@ } else { + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + // // reset ports // @@ -1848,11 +1849,6 @@ } } } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); } ExFreePool(Urb); Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Mon Jan 30 22:45:16 2012 @@ -44,6 +44,7 @@ typedef struct _WORK_ITEM_DATA { WORK_QUEUE_ITEM WorkItem; + KEVENT Event; PVOID Context; } WORK_ITEM_DATA, *PWORK_ITEM_DATA;

12 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 2012