Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 55453: [SMSS2]: Implement SmpProcessFileRenames and actually create the paging file now. All initialization work is now done by SMSS2. [SMSS]: Neuter away most of the code and only keep SMSS ...
by ion＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: ion Date: Mon Feb 6 09:06:38 2012 New Revision: 55453 URL: http://svn.reactos.org/svn/reactos?rev=55453&view=rev Log: [SMSS2]: Implement SmpProcessFileRenames and actually create the paging file now. All initialization work is now done by SMSS2. [SMSS]: Neuter away most of the code and only keep SMSS around for managing the API port. Next step is to make the SMSS2 API port go into use. Modified: trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/sminit.c 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] Mon Feb 6 09:06:38 2012 @@ -23,16 +23,16 @@ PCHAR ErrorMessage; } InitRoutine [] = { {TRUE, SmCreateHeap, "create private heap, aborting"}, - {TRUE, SmCreateObjectDirectories, "create object directories"}, +// {TRUE, SmCreateObjectDirectories, "create object directories"}, {TRUE, SmCreateApiPort, "create \\SmApiPort"}, {TRUE, SmCreateEnvironment, "create the system environment"}, - {TRUE, SmSetEnvironmentVariables, "set system environment variables"}, - {TRUE, SmInitDosDevices, "create dos device links"}, - {TRUE, SmRunBootApplications, "run boot applications"}, - {TRUE, SmProcessFileRenameList, "process the file rename list"}, +// {TRUE, SmSetEnvironmentVariables, "set system environment variables"}, +// {TRUE, SmInitDosDevices, "create dos device links"}, +// {TRUE, SmRunBootApplications, "run boot applications"}, +// {TRUE, SmProcessFileRenameList, "process the file rename list"}, {FALSE, SmUpdateEnvironment, "update environment variables"}, - {FALSE, SmLoadKnownDlls, "preload system DLLs"}, - {TRUE, SmCreatePagingFiles, "create paging files"}, +// {FALSE, SmLoadKnownDlls, "preload system DLLs"}, +// {TRUE, SmCreatePagingFiles, "create paging files"}, // {TRUE, SmInitializeRegistry, "initialize the registry"}, {TRUE, SmInitializeClientManagement, "initialize client management"}, {TRUE, SmLoadSubsystems, "load subsystems"} 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 Feb 6 09:06:38 2012 @@ -451,11 +451,9 @@ IN ULONG Priority) { NTSTATUS Status; - DPRINT1("Should request pagefile: %wZ with size %I64x and %I64x\n", Name, MinSize->QuadPart, MaxSize->QuadPart); /* Tell the kernel to create the pagefile */ - Status = STATUS_SUCCESS; - //Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); + Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", 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] Mon Feb 6 09:06:38 2012 @@ -1827,7 +1827,211 @@ NTAPI SmpProcessFileRenames(VOID) { - return STATUS_SUCCESS; + BOOLEAN OldState, HavePrivilege; + NTSTATUS Status; + HANDLE FileHandle, OtherFileHandle; + FILE_INFORMATION_CLASS InformationClass; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING FileString; + FILE_BASIC_INFORMATION BasicInfo; + FILE_DISPOSITION_INFORMATION DeleteInformation; + PFILE_RENAME_INFORMATION Buffer; + PLIST_ENTRY Head, NextEntry; + PSMP_REGISTRY_VALUE RegEntry; + PWCHAR FileName; + ULONG ValueLength, Length; + + /* Give us access to restore any files we want */ + Status = RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, TRUE, FALSE, &OldState); + if (NT_SUCCESS(Status)) HavePrivilege = TRUE; + + /* Process pending files to rename */ + Head = &SmpFileRenameList; + while (!IsListEmpty(Head)) + { + /* Get this entry */ + NextEntry = RemoveHeadList(Head); + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + DPRINT1("Processing PFRO: %wZ/%wZ\n", &RegEntry->Value, &RegEntry->Name); + + /* Skip past the '@' marker */ + if (!(RegEntry->Value.Length) && (*RegEntry->Name.Buffer == L'@')) + { + RegEntry->Name.Length -= sizeof(UNICODE_NULL); + RegEntry->Name.Buffer++; + } + + /* Open the file for delete access */ + InitializeObjectAttributes(&ObjectAttributes, + &RegEntry->Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&OtherFileHandle, + DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if it's a rename or just a delete */ + ValueLength = RegEntry->Value.Length; + if (!ValueLength) + { + /* Just a delete, set up the class, length and buffer */ + InformationClass = FileDispositionInformation; + Length = sizeof(DeleteInformation); + Buffer = (PFILE_RENAME_INFORMATION)&DeleteInformation; + + /* Set the delete disposition */ + DeleteInformation.DeleteFile = TRUE; + } + else + { + /* This is a rename, setup the class and length */ + InformationClass = FileRenameInformation; + Length = ValueLength + sizeof(FILE_RENAME_INFORMATION); + + /* Skip past the special markers */ + FileName = RegEntry->Value.Buffer; + if ((*FileName == L'!') || (*FileName == L'@')) + { + FileName++; + Length -= sizeof(UNICODE_NULL); + } + + /* Now allocate the buffer for the rename information */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), SmBaseTag, Length); + if (Buffer) + { + /* Setup the buffer to point to the filename, and copy it */ + Buffer->RootDirectory = NULL; + Buffer->FileNameLength = Length - sizeof(FILE_RENAME_INFORMATION); + Buffer->ReplaceIfExists = FileName != RegEntry->Value.Buffer; + RtlCopyMemory(Buffer->FileName, FileName, Buffer->FileNameLength); + } + else + { + /* Fail */ + Status = STATUS_NO_MEMORY; + } + } + + /* Check if everything is okay till here */ + if (NT_SUCCESS(Status)) + { + /* Now either rename or delete the file as requested */ + Status = NtSetInformationFile(OtherFileHandle, + &IoStatusBlock, + Buffer, + Length, + InformationClass); + + /* Check if we seem to have failed because the file was readonly */ + if ((NT_SUCCESS(Status) && + (InformationClass == FileRenameInformation) && + (Status == STATUS_OBJECT_NAME_COLLISION) && + (Buffer->ReplaceIfExists))) + { + /* Open the file for write attribute access this time... */ + DPRINT1("\nSMSS: %wZ => %wZ failed - Status == %x, Possible readonly target\n", + &RegEntry->Name, + &RegEntry->Value, + STATUS_OBJECT_NAME_COLLISION); + FileString.Length = RegEntry->Value.Length - sizeof(WCHAR); + FileString.MaximumLength = RegEntry->Value.MaximumLength - sizeof(WCHAR); + FileString.Buffer = FileName; + InitializeObjectAttributes(&ObjectAttributes, + &FileString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + /* That didn't work, so bail out */ + DPRINT1(" SMSS: Open Existing file Failed - Status == %x\n", + Status); + } + else + { + /* Now remove the read-only attribute from the file */ + DPRINT1(" SMSS: Open Existing Success\n"); + RtlZeroMemory(&BasicInfo, sizeof(BasicInfo)); + BasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &BasicInfo, + sizeof(BasicInfo), + FileBasicInformation); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + /* That didn't work, bail out */ + DPRINT1(" SMSS: Set To NORMAL Failed - Status == %x\n", + Status); + } + else + { + /* Now that the file is no longer read-only, delete! */ + DPRINT1(" SMSS: Set To NORMAL OK\n"); + Status = NtSetInformationFile(OtherFileHandle, + &IoStatusBlock, + Buffer, + Length, + FileRenameInformation); + if (!NT_SUCCESS(Status)) + { + /* That failed too! */ + DPRINT1(" SMSS: Re-Rename Failed - Status == %x\n", + Status); + } + else + { + /* Everything ok */ + DPRINT1(" SMSS: Re-Rename Worked OK\n"); + } + } + } + } + } + + /* Close the file handle and check the operation result */ + NtClose(OtherFileHandle); +Quickie: + if (!NT_SUCCESS(Status)) + { + /* We totally failed */ + DPRINT1("SMSS: %wZ => %wZ failed - Status == %x\n", + &RegEntry->Name, &RegEntry->Value, Status); + } + else if (RegEntry->Value.Length) + { + /* We succeed with a rename */ + DPRINT1("SMSS: %wZ (renamed to) %wZ\n", &RegEntry->Name, &RegEntry->Value); + } + else + { + /* We suceeded with a delete */ + DPRINT1("SMSS: %wZ (deleted)\n", &RegEntry->Name); + } + + /* Now free this entry and keep going */ + if (RegEntry->AnsiValue) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->AnsiValue); + if (RegEntry->Value.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry); + } + + /* Put back the restore privilege if we had requested it, and return */ + if (HavePrivilege) RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, FALSE, FALSE, &OldState); + return Status; } NTSTATUS

1 0

[ion] 55452: [NTOSKRNL]: Finish implementation of NtAreMappedFilesTheSame based on what winetests revealed. Should fix all 20+ winetests in this area, on top of making Ldr suck less.
by ion＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: ion Date: Mon Feb 6 08:17:03 2012 New Revision: 55452 URL: http://svn.reactos.org/svn/reactos?rev=55452&view=rev Log: [NTOSKRNL]: Finish implementation of NtAreMappedFilesTheSame based on what winetests revealed. Should fix all 20+ winetests in this area, on top of making Ldr suck less. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Feb 6 08:17:03 2012 @@ -1387,8 +1387,6 @@ PMEMORY_AREA MemoryArea1, MemoryArea2; PROS_SECTION_OBJECT Section1, Section2; - DPRINT1("Is image: %p the same as file: %p?\n", File1MappedAsAnImage, File2MappedAsFile); - /* Lock address space */ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); @@ -1398,7 +1396,6 @@ if (!MemoryArea1) { /* Fail, the address does not exist */ - DPRINT1("Invalid address\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_INVALID_ADDRESS; } @@ -1407,7 +1404,6 @@ if (MemoryArea1->Type != MEMORY_AREA_SECTION_VIEW) { /* Fail, the address is not a section */ - DPRINT1("Invalid address (not a section)\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } @@ -1416,7 +1412,6 @@ Section1 = MemoryArea1->Data.SectionData.Section; if (Section1->FileObject == NULL) { - DPRINT1("No file object\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } @@ -1426,7 +1421,6 @@ if (!MemoryArea2) { /* Fail, the address does not exist */ - DPRINT1("Invalid address\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_INVALID_ADDRESS; } @@ -1435,7 +1429,6 @@ if (MemoryArea2->Type != MEMORY_AREA_SECTION_VIEW) { /* Fail, the address is not a section */ - DPRINT1("Invalid address (not a section)\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } @@ -1444,23 +1437,17 @@ Section2 = MemoryArea2->Data.SectionData.Section; if (Section2->FileObject == NULL) { - DPRINT1("No file object\n"); MmUnlockAddressSpace(AddressSpace); return STATUS_CONFLICTING_ADDRESSES; } - /* These dbgprints should allow me to see what should w ecompare in ROS's section implementation once the winetests are run... for now lie and say they're not equal. */ - DPRINT1("FO1/2: %p %p\n", Section1->FileObject, Section2->FileObject); - DPRINT1("SOP: %p %p\n", - Section1->FileObject->SectionObjectPointer, - Section2->FileObject->SectionObjectPointer); - DPRINT1("SCM: %p %p\n", - Section1->FileObject->SectionObjectPointer->SharedCacheMap, - Section2->FileObject->SectionObjectPointer->SharedCacheMap); - DPRINT1("ISO: %p %p\n", - Section1->FileObject->SectionObjectPointer->ImageSectionObject, - Section2->FileObject->SectionObjectPointer->ImageSectionObject); - DPRINT1("SISO: %p %p\n", Section1->ImageSection, Section2->ImageSection); + /* The shared cache map seems to be the same if both of these are equal */ + if (Section1->FileObject->SectionObjectPointer->SharedCacheMap == + Section2->FileObject->SectionObjectPointer->SharedCacheMap) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_SUCCESS; + } /* Unlock address space */ MmUnlockAddressSpace(AddressSpace);

1 0

[janderwald] 55451: [DISK] - Add more structures to ntdddisk.h - Fix more compile errors in disk_new - disk_new builds but fails to link as classpnp import lib is broken
by janderwald＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: janderwald Date: Mon Feb 6 08:15:21 2012 New Revision: 55451 URL: http://svn.reactos.org/svn/reactos?rev=55451&view=rev Log: [DISK] - Add more structures to ntdddisk.h - Fix more compile errors in disk_new - disk_new builds but fails to link as classpnp import lib is broken Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt branches/usb-bringup-trunk/include/psdk/ntdddisk.h Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] Mon Feb 6 08:15:21 2012 @@ -1201,6 +1201,7 @@ break; } +#if(_WIN32_WINNT >= 0x0500) case IOCTL_DISK_GET_WRITE_CACHE_STATE: { PDISK_WRITE_CACHE_STATE writeCacheState = (PDISK_WRITE_CACHE_STATE)Irp->AssociatedIrp.SystemBuffer; @@ -1248,6 +1249,7 @@ status = STATUS_SUCCESS; break; } +#endif case SMART_GET_VERSION: { Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Mon Feb 6 08:15:21 2012 @@ -281,7 +281,7 @@ // // Enable SMART // -_inline NTSTATUS +__inline NTSTATUS DiskEnableSmart( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -302,7 +302,7 @@ // // Disable SMART // -_inline NTSTATUS +__inline NTSTATUS DiskDisableSmart( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -322,7 +322,7 @@ // // Enable Attribute Autosave // -_inline NTSTATUS +__inline NTSTATUS DiskEnableSmartAttributeAutosave( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -342,7 +342,7 @@ // // Disable Attribute Autosave // -_inline NTSTATUS +__inline NTSTATUS DiskDisableSmartAttributeAutosave( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -362,7 +362,7 @@ // // Initialize execution of SMART online diagnostics // -_inline NTSTATUS +__inline NTSTATUS DiskExecuteSmartDiagnostics( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, UCHAR Subcommand Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1] Mon Feb 6 08:15:21 2012 @@ -646,7 +646,7 @@ ULONG partitionOrdinal; ULONG newPartitionNumber; - PPARTITION_INFORMATION_EX partitionEntry; + PPARTITION_INFORMATION_EX partitionEntry = NULL; PDISK_DATA pdoData; PARTITION_STYLE partitionStyle; Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Feb 6 08:15:21 2012 @@ -42,4 +42,5 @@ target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) +add_importlib_target(class.spec) add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/… ============================================================================== --- branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] Mon Feb 6 08:15:21 2012 @@ -581,6 +581,29 @@ #if(_WIN32_WINNT >= 0x0500) + +typedef struct _CREATE_DISK_GPT +{ + GUID DiskId; + ULONG MaxPartitionCount; +} CREATE_DISK_GPT, *PCREATE_DISK_GPT; + +typedef struct _CREATE_DISK_MBR +{ + ULONG Signature; +} CREATE_DISK_MBR, *PCREATE_DISK_MBR; + + +typedef struct _CREATE_DISK +{ + PARTITION_STYLE PartitionStyle; + union { + CREATE_DISK_MBR Mbr; + CREATE_DISK_GPT Gpt; + }; +} CREATE_DISK, *PCREATE_DISK; + + typedef enum { EqualPriority, KeepPrefetchedData,

1 0

[cgutman] 55450: [USBEHCI] - Implement ResetController and call it before setting up the controller - Don't disable 64-bit addressing until the BIOS gives up control of the controller - Comment out...
by cgutman＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: cgutman Date: Mon Feb 6 07:41:20 2012 New Revision: 55450 URL: http://svn.reactos.org/svn/reactos?rev=55450&view=rev Log: [USBEHCI] - Implement ResetController and call it before setting up the controller - Don't disable 64-bit addressing until the BIOS gives up control of the controller - Comment out manually clearing the SMI interrupt and the BIOS owned flag by request of janderwald - EHCI no longer hangs for me on real hardware during controller initialization 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 Feb 6 07:41:20 2012 @@ -567,17 +567,6 @@ LARGE_INTEGER Timeout; // - // check caps - // - if (m_Capabilities.HCCParams.CurAddrBits) - { - // - // disable 64-bit addressing - // - EHCI_WRITE_REGISTER_ULONG(EHCI_CTRLDSSEGMENT, 0x0); - } - - // // are extended caps supported // ExtendedCapsSupport = (m_Capabilities.HCCParamsLong >> EHCI_ECP_SHIFT) & EHCI_ECP_MASK; @@ -648,7 +637,7 @@ // DPRINT1("[EHCI] acquired ownership\n"); } - +#if 0 // // explictly clear the bios owned flag 2.1.7 // @@ -660,15 +649,11 @@ // Caps = 4; m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Caps, ExtendedCapsSupport+4, sizeof(ULONG)); - - +#endif } } } - - -#if 1 // // Stop the controller if its running // @@ -678,7 +663,22 @@ DPRINT1("Stopping Controller %x\n", UsbSts); StopController(); } -#endif + + // + // Reset the controller + // + ResetController(); + + // + // check caps + // + if (m_Capabilities.HCCParams.CurAddrBits) + { + // + // disable 64-bit addressing + // + EHCI_WRITE_REGISTER_ULONG(EHCI_CTRLDSSEGMENT, 0x0); + } // // Enable Interrupts and start execution @@ -692,7 +692,6 @@ DPRINT1("Interrupt Mask %x\n", Status); ASSERT((Status & Mask) == Mask); - // // Assign the SyncList Register @@ -827,8 +826,28 @@ NTSTATUS CUSBHardwareDevice::ResetController(void) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + EHCI_USBCMD_CONTENT UsbCmd; + ULONG FailSafe; + + GetCommandRegister(&UsbCmd); + UsbCmd.HCReset = TRUE; + SetCommandRegister(&UsbCmd); + + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(100); + GetCommandRegister(&UsbCmd); + if (!UsbCmd.HCReset) + break; + } + + if (UsbCmd.HCReset) + { + DPRINT1("EHCI ERROR: Controller is not responding to reset request!\n"); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; } NTSTATUS

1 0

[janderwald] 55449: [DDK] - More header fixes for disk_new
by janderwald＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: janderwald Date: Mon Feb 6 07:35:22 2012 New Revision: 55449 URL: http://svn.reactos.org/svn/reactos?rev=55449&view=rev Log: [DDK] - More header fixes for disk_new Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/… ============================================================================== --- branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] Mon Feb 6 07:35:22 2012 @@ -178,8 +178,17 @@ #define SMART_SEND_DRIVE_COMMAND \ CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_UPDATE_PROPERTIES \ - CTL_CODE(IOCTL_DISK_BASE, 0x50, METHOD_BUFFERED, FILE_ANY_ACCESS) +#if(_WIN32_WINNT >= 0x0500) +#define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0035, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_WRITE_CACHE_STATE CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_UPDATE_PROPERTIES CTL_CODE(IOCTL_DISK_BASE, 0x0050, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_DRIVE CTL_CODE(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_SENSE_DEVICE CTL_CODE(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #define PARTITION_ENTRY_UNUSED 0x00 #define PARTITION_FAT_12 0x01 @@ -465,38 +474,6 @@ ULONG Length; } VERIFY_INFORMATION, *PVERIFY_INFORMATION; -typedef enum { - EqualPriority, - KeepPrefetchedData, - KeepReadData -} DISK_CACHE_RETENTION_PRIORITY; - -typedef struct _DISK_CACHE_INFORMATION { - BOOLEAN ParametersSavable; - BOOLEAN ReadCacheEnabled; - BOOLEAN WriteCacheEnabled; - DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; - DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; - USHORT DisablePrefetchTransferLength; - BOOLEAN PrefetchScalar; - _ANONYMOUS_UNION union { - struct { - USHORT Minimum; - USHORT Maximum; - USHORT MaximumBlocks; - } ScalarPrefetch; - struct { - USHORT Minimum; - USHORT Maximum; - } BlockPrefetch; - } DUMMYUNIONNAME; -} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION; - -typedef struct _DISK_GROW_PARTITION { - ULONG PartitionNumber; - LARGE_INTEGER BytesToGrow; -} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION; - /* GETVERSIONINPARAMS.fCapabilities constants */ #define CAP_ATA_ID_CMD 1 #define CAP_ATAPI_ID_CMD 2 @@ -602,6 +579,52 @@ } MAPPED_ADDRESS, *PMAPPED_ADDRESS; + +#if(_WIN32_WINNT >= 0x0500) +typedef enum { + EqualPriority, + KeepPrefetchedData, + KeepReadData +} DISK_CACHE_RETENTION_PRIORITY; + +typedef enum _DISK_WRITE_CACHE_STATE { + DiskWriteCacheNormal, + DiskWriteCacheForceDisable, + DiskWriteCacheDisableNotSupported +} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE; + + +typedef struct _DISK_CACHE_INFORMATION +{ + BOOLEAN ParametersSavable; + BOOLEAN ReadCacheEnabled; + BOOLEAN WriteCacheEnabled; + DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; + DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; + USHORT DisablePrefetchTransferLength; + BOOLEAN PrefetchScalar; + union { + struct { + USHORT Minimum; + USHORT Maximum; + USHORT MaximumBlocks; + } ScalarPrefetch; + + struct { + USHORT Minimum; + USHORT Maximum; + } BlockPrefetch; + }; + +} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION; + +typedef struct _DISK_GROW_PARTITION { + ULONG PartitionNumber; + LARGE_INTEGER BytesToGrow; +} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION; +#endif + + #ifdef __cplusplus } #endif

1 0

[ion] 55448: [NTOSKRNL]: Partly implement NtAreMappedFilesTheSame... [NTDLL]: Fix (although I'm not sure quite why) LdrpCheckForLoadedDll which was crashing now that I've fixed PAGE_EXECUTE section...
by ion＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: ion Date: Mon Feb 6 06:53:28 2012 New Revision: 55448 URL: http://svn.reactos.org/svn/reactos?rev=55448&view=rev Log: [NTOSKRNL]: Partly implement NtAreMappedFilesTheSame... [NTDLL]: Fix (although I'm not sure quite why) LdrpCheckForLoadedDll which was crashing now that I've fixed PAGE_EXECUTE sections with only FILE_EXECUTE handles. Ironically, this meant that LdrpCheckForLoadedDll never worked until my previous fix some revisions ago, it always returned FALSE. This should fix KVM/QEMU crashes... Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Feb 6 06:53:28 2012 @@ -2204,12 +2204,7 @@ { /* Headers match too! Finally ask the kernel to compare mapped files */ Status = ZwAreMappedFilesTheSame(CurEntry->DllBase, ViewBase); - if (!NT_SUCCESS(Status)) - { - /* Almost identical, but not quite, keep trying */ - _SEH2_YIELD(continue;) - } - else + if (NT_SUCCESS(Status)) { /* This is our entry!, unmap and return success */ *LdrEntry = CurEntry; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Feb 6 06:53:28 2012 @@ -1383,8 +1383,88 @@ NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, IN PVOID File2MappedAsFile) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PVOID AddressSpace; + PMEMORY_AREA MemoryArea1, MemoryArea2; + PROS_SECTION_OBJECT Section1, Section2; + + DPRINT1("Is image: %p the same as file: %p?\n", File1MappedAsAnImage, File2MappedAsFile); + + /* Lock address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Locate the memory area for the process by address */ + MemoryArea1 = MmLocateMemoryAreaByAddress(AddressSpace, File1MappedAsAnImage); + if (!MemoryArea1) + { + /* Fail, the address does not exist */ + DPRINT1("Invalid address\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_INVALID_ADDRESS; + } + + /* Check if it's a section view (RosMm section) or ARM3 section */ + if (MemoryArea1->Type != MEMORY_AREA_SECTION_VIEW) + { + /* Fail, the address is not a section */ + DPRINT1("Invalid address (not a section)\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_CONFLICTING_ADDRESSES; + } + + /* Get the section pointer to the SECTION_OBJECT */ + Section1 = MemoryArea1->Data.SectionData.Section; + if (Section1->FileObject == NULL) + { + DPRINT1("No file object\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_CONFLICTING_ADDRESSES; + } + + /* Locate the memory area for the process by address */ + MemoryArea2 = MmLocateMemoryAreaByAddress(AddressSpace, File2MappedAsFile); + if (!MemoryArea2) + { + /* Fail, the address does not exist */ + DPRINT1("Invalid address\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_INVALID_ADDRESS; + } + + /* Check if it's a section view (RosMm section) or ARM3 section */ + if (MemoryArea2->Type != MEMORY_AREA_SECTION_VIEW) + { + /* Fail, the address is not a section */ + DPRINT1("Invalid address (not a section)\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_CONFLICTING_ADDRESSES; + } + + /* Get the section pointer to the SECTION_OBJECT */ + Section2 = MemoryArea2->Data.SectionData.Section; + if (Section2->FileObject == NULL) + { + DPRINT1("No file object\n"); + MmUnlockAddressSpace(AddressSpace); + return STATUS_CONFLICTING_ADDRESSES; + } + + /* These dbgprints should allow me to see what should w ecompare in ROS's section implementation once the winetests are run... for now lie and say they're not equal. */ + DPRINT1("FO1/2: %p %p\n", Section1->FileObject, Section2->FileObject); + DPRINT1("SOP: %p %p\n", + Section1->FileObject->SectionObjectPointer, + Section2->FileObject->SectionObjectPointer); + DPRINT1("SCM: %p %p\n", + Section1->FileObject->SectionObjectPointer->SharedCacheMap, + Section2->FileObject->SectionObjectPointer->SharedCacheMap); + DPRINT1("ISO: %p %p\n", + Section1->FileObject->SectionObjectPointer->ImageSectionObject, + Section2->FileObject->SectionObjectPointer->ImageSectionObject); + DPRINT1("SISO: %p %p\n", Section1->ImageSection, Section2->ImageSection); + + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + return STATUS_NOT_SAME_DEVICE; } /*

1 0

[janderwald] 55447: [DISK_NEW] - Fix compilation of new disk driver - Patch by Alex Ionescu
by janderwald＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: janderwald Date: Mon Feb 6 06:50:19 2012 New Revision: 55447 URL: http://svn.reactos.org/svn/reactos?rev=55447&view=rev Log: [DISK_NEW] - Fix compilation of new disk driver - Patch by Alex Ionescu Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/class/disk_new/data.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/geometry.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -1,13 +1,14 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories(..) add_library(disk SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) +if(ARCH MATCHES i386) + add_target_compile_flags(disk "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") +endif() + set_module_type(disk kernelmodedriver) add_importlibs(disk - class2 + classpnp scsiport ntoskrnl hal) Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/data.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/data.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/data.c [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -60,15 +60,20 @@ { NULL , NULL , NULL, 0x0 } }; +// +// ======== ROS DIFF ======== +// Added MediaTypes in their own brace nesting level +// ======== ROS DIFF ======== +// DISK_MEDIA_TYPES_LIST const DiskMediaTypes[] = { - { "COMPAQ" , "PD-1 LF-1094" , NULL, 1, 1, PC_5_RW , 0 , 0 , 0 }, - { "HP" , NULL , NULL, 2, 2, MO_5_WO , MO_5_RW, 0 , 0 }, - { "iomega" , "jaz" , NULL, 1, 1, IOMEGA_JAZ , 0 , 0 , 0 }, - { "IOMEGA" , "ZIP" , NULL, 1, 1, IOMEGA_ZIP , 0 , 0 , 0 }, - { "PINNACLE", "Apex 4.6GB" , NULL, 3, 2, PINNACLE_APEX_5_RW, MO_5_RW, MO_5_WO, 0 }, - { "SONY" , "SMO-F541" , NULL, 2, 2, MO_5_WO , MO_5_RW, 0 , 0 }, - { "SONY" , "SMO-F551" , NULL, 2, 2, MO_5_WO , MO_5_RW, 0 , 0 }, - { NULL , NULL , NULL, 0, 0, 0 , 0 , 0 , 0 } + { "COMPAQ" , "PD-1 LF-1094" , NULL, 1, 1, {PC_5_RW , 0 , 0 , 0 }}, + { "HP" , NULL , NULL, 2, 2, {MO_5_WO , MO_5_RW, 0 , 0 }}, + { "iomega" , "jaz" , NULL, 1, 1, {IOMEGA_JAZ , 0 , 0 , 0 }}, + { "IOMEGA" , "ZIP" , NULL, 1, 1, {IOMEGA_ZIP , 0 , 0 , 0 }}, + { "PINNACLE", "Apex 4.6GB" , NULL, 3, 2, {PINNACLE_APEX_5_RW, MO_5_RW, MO_5_WO, 0 }}, + { "SONY" , "SMO-F541" , NULL, 2, 2, {MO_5_WO , MO_5_RW, 0 , 0 }}, + { "SONY" , "SMO-F551" , NULL, 2, 2, {MO_5_WO , MO_5_RW, 0 , 0 }}, + { NULL , NULL , NULL, 0, 0, {0 , 0 , 0 , 0 }} }; #ifdef ALLOC_DATA_PRAGMA Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -173,6 +173,7 @@ NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -1304,7 +1305,7 @@ // buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1341,7 +1342,7 @@ if (NT_SUCCESS(status)) { buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; RtlMoveMemory (Irp->AssociatedIrp.SystemBuffer, buffer, sizeof(GETVERSIONINPARAMS)); @@ -1444,7 +1445,7 @@ // buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1494,7 +1495,7 @@ // buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; if (NT_SUCCESS(status)) { @@ -1640,7 +1641,7 @@ // buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; // // Ensure correct target is set in the cmd parameters. @@ -1690,7 +1691,7 @@ // buffer = (PUCHAR)srbControl; - (ULONG_PTR)buffer += srbControl->HeaderLength; + buffer += srbControl->HeaderLength; // // Update the return buffer size based on the sub-command. @@ -1828,7 +1829,7 @@ // blockDescriptor = (PMODE_PARAMETER_BLOCK)modeData; - (ULONG_PTR)blockDescriptor += sizeof(MODE_PARAMETER_HEADER); + blockDescriptor = (PMODE_PARAMETER_BLOCK)((ULONG_PTR)blockDescriptor + sizeof(MODE_PARAMETER_HEADER)); // // Do some validation. @@ -2165,7 +2166,7 @@ IoMarkIrpPending(Irp); IoQueueWorkItem(Context->WorkItem, - DiskIoctlVerify, + (PIO_WORKITEM_ROUTINE)DiskIoctlVerify, DelayedWorkQueue, Context); @@ -3521,7 +3522,7 @@ ((PMODE_PARAMETER_HEADER)buffer)->BlockDescriptorLength = sizeof(MODE_PARAMETER_BLOCK); - (PULONG)blockDescriptor = (buffer + 1); + blockDescriptor = (PMODE_PARAMETER_BLOCK)(buffer + 1); // // Set size @@ -3888,7 +3889,7 @@ if (workItem) { IoQueueWorkItem(workItem, - DisableWriteCache, + (PIO_WORKITEM_ROUTINE)DisableWriteCache, CriticalWorkQueue, workItem); } Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -19,6 +19,9 @@ Revision History: --*/ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0501 +#define NTDDI_VERSION NTDDI_WINXP #include "ntddk.h" #include "scsi.h" Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -546,7 +546,7 @@ // buffer = (PUCHAR)SrbControl; - (ULONG_PTR)buffer += sizeof(SRB_IO_CONTROL); + buffer += sizeof(SRB_IO_CONTROL); cmdInParameters = (PSENDCMDINPARAMS)buffer; cmdOutParameters = (PSENDCMDOUTPARAMS)buffer; @@ -641,11 +641,16 @@ break; } + default: + controlCode = 0; + break; + } } else if (Command == ID_CMD) { controlCode = IOCTL_SCSI_MINIPORT_IDENTIFY; lengthNeeded = IDENTIFY_BUFFER_SIZE + sizeof(SENDCMDOUTPARAMS) -1; } else { + controlCode = 0; ASSERT(FALSE); } @@ -1393,8 +1398,10 @@ retry = TRUE; } - if (retry && ((ULONG)(ULONG_PTR)irpStack->Parameters.Others.Argument4)--) - { + if (retry && irpStack->Parameters.Others.Argument4) + { + irpStack->Parameters.Others.Argument4 = + (PVOID)((ULONG_PTR)irpStack->Parameters.Others.Argument4 - 1); // // Retry request. @@ -2798,6 +2805,7 @@ // case ReadLogSectors: { + sizeNeeded = 0; if (diskData->FailurePredictionCapability == FailurePredictionSmart) { @@ -2853,6 +2861,7 @@ // ); case WriteLogSectors: { + sizeNeeded = 0; if (diskData->FailurePredictionCapability == FailurePredictionSmart) { @@ -2911,6 +2920,7 @@ // uint32 ReturnCode); case ExecuteSelfTest: { + sizeNeeded = 0; if (diskData->FailurePredictionCapability == FailurePredictionSmart) { Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/geometry.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/geometry.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/geometry.c [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -1002,7 +1002,7 @@ KeInitializeEvent(&event, SynchronizationEvent, FALSE); IoSetCompletionRoutine(irp, - ClassSignalCompletion, + (PIO_COMPLETION_ROUTINE)ClassSignalCompletion, &event, TRUE, TRUE, @@ -1348,7 +1348,7 @@ { ULONG i; BOOLEAN found; - PDISK_DETECT_INFO diskInfo; + PDISK_DETECT_INFO diskInfo = NULL; PDISK_DATA diskData = FdoExtension->CommonExtension.DriverData; PAGED_CODE (); Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] Mon Feb 6 06:50:19 2012 @@ -424,7 +424,7 @@ HalExamineMBR(fdoExtension->CommonExtension.DeviceObject, fdoExtension->DiskGeometry.BytesPerSector, (ULONG)0x54, - &dmSkew); + (PVOID*)&dmSkew); if (dmSkew) {

1 0

[tkreuzer] 55446: [NTOSKRNL] In PeFmtCreateSection don't use the ImageBase field of the ImageOptionalHeader directly, since it's different between PE32 and PE64. Use the ImageSectionObject->ImageBa...
by tkreuzer＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: tkreuzer Date: Mon Feb 6 00:29:50 2012 New Revision: 55446 URL: http://svn.reactos.org/svn/reactos?rev=55446&view=rev Log: [NTOSKRNL] In PeFmtCreateSection don't use the ImageBase field of the ImageOptionalHeader directly, since it's different between PE32 and PE64. Use the ImageSectionObject->ImageBase field instead, which already contains the correct value. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Feb 6 00:29:50 2012 @@ -402,7 +402,7 @@ break; } - /* PE32+ */ + /* PE64 */ case IMAGE_NT_OPTIONAL_HDR64_MAGIC: { const IMAGE_OPTIONAL_HEADER64 * pioh64OptHeader; @@ -463,7 +463,7 @@ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { - ImageSectionObject->EntryPoint = piohOptHeader->ImageBase + + ImageSectionObject->EntryPoint = ImageSectionObject->ImageBase + piohOptHeader->AddressOfEntryPoint; }

1 0

[tkreuzer] 55445: [NTOSKRNL] - Add MM_HAL_VA_END and use it in MiAddHalIoMappings instead of making assumptions about the page tables - Add MM_SHARED_USER_DATA_VA for x86 - use MM_SHARED_USER_DATA_...
by tkreuzer＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: tkreuzer Date: Mon Feb 6 00:24:31 2012 New Revision: 55445 URL: http://svn.reactos.org/svn/reactos?rev=55445&view=rev Log: [NTOSKRNL] - Add MM_HAL_VA_END and use it in MiAddHalIoMappings instead of making assumptions about the page tables - Add MM_SHARED_USER_DATA_VA for x86 - use MM_SHARED_USER_DATA_VA in Mm to avoid ambiguities - fix or comment out USER_SHARED_DATA in asm headers, as it should be the kernel mode address here - set Teb->ExceptionList to NULL on amd64, it is used as a link to the Wow64 TEB, if any Modified: trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/include/asm/ksx.template.h trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/reactos/ks386.inc trunk/reactos/include/reactos/ksamd64.inc trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -19,10 +19,10 @@ const UCHAR HalpClockVector = 0xD1; BOOLEAN HalpClockSetMSRate; UCHAR HalpNextMSRate; -UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7,8 ms */ +UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7.8 ms */ ULONG HalpCurrentTimeIncrement; -static UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 16 Hz / 62,5 ms */ -static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3,9 ms */ +static UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 16 Hz / 62.5 ms */ +static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3.9 ms */ ULONG @@ -131,7 +131,7 @@ if (HalpClockSetMSRate) { /* Set new clock rate */ - RtcSetClockRate(HalpCurrentRate); + RtcSetClockRate(HalpNextMSRate); /* We're done */ HalpClockSetMSRate = FALSE; Modified: trunk/reactos/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksx.template.h… ============================================================================== --- trunk/reactos/include/asm/ksx.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ksx.template.h [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -240,7 +240,7 @@ CONSTANT(FALSE), CONSTANT(TRUE), CONSTANT(DBG_STATUS_CONTROL_C), -CONSTANTPTR(USER_SHARED_DATA), +//CONSTANTPTR(USER_SHARED_DATA), // FIXME: we need the kernel mode address here! //CONSTANT(MM_SHARED_USER_DATA_VA), CONSTANT(PAGE_SIZE), //CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -164,6 +164,7 @@ #define INITIAL_STALL_COUNT 100 #define HYPERSPACE_BASE 0xfffff70000000000ULL #define MM_HAL_VA_START 0xFFFFFFFFFFC00000ULL /* This is Vista+ */ +#define MM_HAL_VA_END 0xFFFFFFFFFFFFFFFFULL #define APIC_BASE 0xFFFFFFFFFFFE0000ULL // Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -142,6 +142,7 @@ #define HYPERSPACE_BASE 0xc0800000 #endif #define MM_HAL_VA_START 0xFFC00000 +#define MM_HAL_VA_END 0xFFFFFFFF #define APIC_BASE 0xFFFE0000 // Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -30,6 +30,11 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L + +// +// Address of the shared user page +// +#define MM_SHARED_USER_DATA_VA 0x7FFE0000 // // Sanity checks for Paging Macros Modified: trunk/reactos/include/reactos/ks386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ks386.inc?… ============================================================================== --- trunk/reactos/include/reactos/ks386.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/ks386.inc [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -182,7 +182,7 @@ FALSE = 0x0 TRUE = 0x1 DBG_STATUS_CONTROL_C = 0x1 -USER_SHARED_DATA = 0x7ffe0000 +USER_SHARED_DATA = 0xffdf0000 PAGE_SIZE = 0x1000 MAXIMUM_IDTVECTOR = 0xff PRIMARY_VECTOR_BASE = 0x30 Modified: trunk/reactos/include/reactos/ksamd64.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ksamd64.in… ============================================================================== --- trunk/reactos/include/reactos/ksamd64.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/ksamd64.inc [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -182,7 +182,7 @@ FALSE = 0x0 TRUE = 0x1 DBG_STATUS_CONTROL_C = 0x1 -USER_SHARED_DATA = 0x7ffe0000 +USER_SHARED_DATA = 0xffdf0000 PAGE_SIZE = 0x1000 MAXIMUM_IDTVECTOR = 0xff PRIMARY_VECTOR_BASE = 0x30 Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -1284,9 +1284,9 @@ MiAddHalIoMappings(VOID) { PVOID BaseAddress; - PMMPDE PointerPde; + PMMPDE PointerPde, LastPde; PMMPTE PointerPte; - ULONG i, j, PdeCount; + ULONG j; PFN_NUMBER PageFrameIndex; /* HAL Heap address -- should be on a PDE boundary */ @@ -1295,8 +1295,9 @@ /* Check how many PDEs the heap has */ PointerPde = MiAddressToPde(BaseAddress); - PdeCount = PDE_COUNT - MiGetPdeOffset(BaseAddress); - for (i = 0; i < PdeCount; i++) + LastPde = MiAddressToPde((PVOID)MM_HAL_VA_END); + + while (PointerPde <= LastPde) { /* Does the HAL own this mapping? */ if ((PointerPde->u.Hard.Valid == 1) && Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -56,7 +56,7 @@ ASSERT(MI_IS_SESSION_ADDRESS(VirtualAddress) == FALSE); /* Special case for shared data */ - if (PAGE_ALIGN(VirtualAddress) == (PVOID)USER_SHARED_DATA) + if (PAGE_ALIGN(VirtualAddress) == (PVOID)MM_SHARED_USER_DATA_VA) { /* It's a read-only page */ *ProtectCode = MM_READONLY; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -29,7 +29,7 @@ NTSTATUS Status; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; - PVOID AllocatedBase = (PVOID)USER_SHARED_DATA; + PVOID AllocatedBase = (PVOID)MM_SHARED_USER_DATA_VA; BoundaryAddressMultiple.QuadPart = 0; Status = MmCreateMemoryArea(&Process->Vm, @@ -830,7 +830,11 @@ // // Set TIB Data // +#ifdef _M_AMD64 + Teb->NtTib.ExceptionList = NULL; +#else Teb->NtTib.ExceptionList = EXCEPTION_CHAIN_END; +#endif Teb->NtTib.Self = (PNT_TIB)Teb; // Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Feb 6 00:24:31 2012 @@ -2360,7 +2360,7 @@ /* Check for illegal addresses in user-space, or the shared memory area */ if ((BaseAddress > MM_HIGHEST_VAD_ADDRESS) || - (PAGE_ALIGN(BaseAddress) == (PVOID)USER_SHARED_DATA)) + (PAGE_ALIGN(BaseAddress) == (PVOID)MM_SHARED_USER_DATA_VA)) { Address = PAGE_ALIGN(BaseAddress); @@ -2370,9 +2370,9 @@ MemoryInfo.Type = MEM_PRIVATE; /* Special case for shared data */ - if (Address == (PVOID)USER_SHARED_DATA) - { - MemoryInfo.AllocationBase = (PVOID)USER_SHARED_DATA; + if (Address == (PVOID)MM_SHARED_USER_DATA_VA) + { + MemoryInfo.AllocationBase = (PVOID)MM_SHARED_USER_DATA_VA; MemoryInfo.State = MEM_COMMIT; MemoryInfo.Protect = PAGE_READONLY; MemoryInfo.RegionSize = PAGE_SIZE;

1 0

[akhaldi] 55444: * Fix wallpaper names in reactos.dff.
by akhaldi＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: akhaldi Date: Sun Feb 5 22:33:16 2012 New Revision: 55444 URL: http://svn.reactos.org/svn/reactos?rev=55444&view=rev Log: * Fix wallpaper names in reactos.dff. Modified: branches/ros-branch-0_3_14/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_14/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/boot/bootdata… ============================================================================== --- branches/ros-branch-0_3_14/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Feb 5 22:33:16 2012 @@ -888,6 +888,6 @@ modules\rostests\kmtests\ntos_io\iodeviceobject_drv.sys 7 optional modules\rostests\kmtests\ntos_io\iohelper_drv.sys 7 optional -modules\wallpaper\RainInTheScreen.4x3.bmp 4 optional +modules\wallpaper\Angelus_ReactOS7_Dark_4-3.bmp 4 optional modules\wallpaper\Angelus_Sea04_FarBeyondTheSea_4x3.bmp 4 optional -modules\wallpaper\Angelus.ReactOS7.Dark_4-3.bmp 4 optional +modules\wallpaper\RainInTheScreen_4x3.bmp 4 optional

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs