Ros-diffs

ros-diffs@reactos.org

81390 discussions

[apriyadarshi] 71822: - Handled DET = 03h case. - Registered (Interrupt enable and SERR clear) working port. Everything is working now! :D
by apriyadarshi＠svn.reactos.org 05 Jul '16

05 Jul '16

Author: apriyadarshi Date: Tue Jul 5 16:51:17 2016 New Revision: 71822 URL: http://svn.reactos.org/svn/reactos?rev=71822&view=rev Log: - Handled DET = 03h case. - Registered (Interrupt enable and SERR clear) working port. Everything is working now! :D Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jul 5 16:51:17 2016 @@ -209,6 +209,8 @@ { ULONG index; AHCI_PORT_CMD cmd; + AHCI_TASK_FILE_DATA tfd; + AHCI_INTERRUPT_ENABLE ie; AHCI_SERIAL_ATA_STATUS ssts; AHCI_SERIAL_ATA_CONTROL sctl; PAHCI_ADAPTER_EXTENSION AdapterExtension; @@ -268,13 +270,104 @@ } ssts.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SSTS); - if (ssts.DET == 0x4) - { - // no device found - return FALSE; - } - - DebugPrint("\tDET: %d %d\n", ssts.DET, cmd.ST); + switch (ssts.DET) + { + case 0x0: + case 0x1: + case 0x2: + default: + // unhandled case + DebugPrint("\tDET == %x Unsupported\n", ssts.DET); + return FALSE; + case 0x3: + { + NT_ASSERT(cmd.ST == 0); + + // make sure FIS Recieve is enabled (cmd.FRE) + index = 0; + do + { + StorPortStallExecution(10000); + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + cmd.FRE = 1; + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CMD, cmd.Status); + index++; + } + while((cmd.FR != 1) && (index < 3)); + + if (cmd.FR != 1) + { + // failed to start FIS DMA engine + // it can crash the driver later + return FALSE; + } + + // start port channel + // set cmd.ST + + NT_ASSERT(cmd.FRE == 1); + NT_ASSERT(cmd.CR == 0); + + // why assert? well If we face such condition on DET = 0x3 + // then we don't have port in idle state and hence before executing this part of code + // we must have restarted it. + tfd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->TFD); + + if ((tfd.STS.BSY) || (tfd.STS.DRQ)) + { + DebugPrint("\tUnhandled Case BSY-DRQ\n"); + } + + // clear pending interrupts + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->SERR, (ULONG)~0); + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->IS, (ULONG)~0); + StorPortWriteRegisterUlong(AdapterExtension, AdapterExtension->IS, (1 << PortExtension->PortNumber)); + + // set IE + ie.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->IE); + ie.DHRE = 1; + ie.PSE = 1; + ie.DSE = 1; + ie.SDBE = 1; + + ie.UFE = 0; + ie.DPE = 0; + ie.PCE = 1; + + ie.DMPE = 0; + + ie.PRCE = 1; + ie.IPME = 0; + ie.OFE = 1; + ie.INFE = 1; + ie.IFE = 1; + ie.HBDE = 1; + ie.HBFE = 1; + ie.TFEE = 1; + + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + ie.CPDE = cmd.CPD; + + StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->IE, ie.Status); + + cmd.ST = 1; + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CMD, cmd.Status); + cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + + if (cmd.ST != 1) + { + DebugPrint("\tFailed to start Port\n"); + return FALSE; + } + + return TRUE; + } + case 0x4: + // no device found + return FALSE; + } + + DebugPrint("\tInvalid DET value: %x\n", ssts.DET); return FALSE; }// -- AhciStartPort(); @@ -322,10 +415,6 @@ { PortExtension = &adapterExtension->PortExtension[index]; PortExtension->IsActive = AhciStartPort(PortExtension); - if (PortExtension->IsActive == FALSE) - { - DebugPrint("\tPort Disabled: %d\n", index); - } } } @@ -516,6 +605,7 @@ portPending = StorPortReadRegisterUlong(AdapterExtension, AdapterExtension->IS); // we process interrupt for implemented ports only portCount = AdapterExtension->PortCount; + DebugPrint("\tPortPending: %d\n", portPending); portPending = portPending & AdapterExtension->PortImplemented; if (portPending == 0) @@ -1207,7 +1297,9 @@ cmd.Status = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); if (cmd.ST == 0) // PxCMD.ST == 0 + { return; + } // get the lowest set bit tmp = QueueSlots & (QueueSlots - 1); @@ -1223,6 +1315,8 @@ // mark this CommandIssuedSlots // to validate in completeIssuedCommand PortExtension->CommandIssuedSlots |= slotToActivate; + + DebugPrint("\tslotToActivate: %d\n", slotToActivate); // tell the HBA to issue this Command Slot to the given port StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CI, slotToActivate); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jul 5 16:51:17 2016 @@ -66,7 +66,7 @@ #define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#if DEBUG +#ifdef DBG #define DebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) #endif @@ -295,6 +295,25 @@ ULONG Status; } AHCI_SERIAL_ATA_STATUS; +typedef union _AHCI_TASK_FILE_DATA +{ + struct + { + struct _STS + { + UCHAR ERR : 1; + UCHAR CS1 : 2; + UCHAR DRQ : 1; + UCHAR CS2 : 3; + UCHAR BSY : 1; + } STS; + UCHAR ERR; + USHORT RSV; + }; + + ULONG Status; +} AHCI_TASK_FILE_DATA; + typedef struct _AHCI_PRDT { ULONG DBA; @@ -365,27 +384,32 @@ ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific } AHCI_PORT, *PAHCI_PORT; -#ifdef DEBUG - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLB) == 0x00); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLBU) == 0x04); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FB) == 0x08); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBU) == 0x0C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, IS) == 0x10); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, IE) == 0x14); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CMD) == 0x18); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV0) == 0x1C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, TFD) == 0x20); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SIG) == 0x24); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SSTS) == 0x28); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SCTL) == 0x2C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SERR) == 0x30); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SACT) == 0x34); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, CI) == 0x38); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, SNTF) == 0x3C); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBS) == 0x40); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV1) == 0x44); - C_ASSERT(FIELD_OFFSET(AHCI_PORT, Vendor) == 0x70); -#endif +typedef struct _AHCI_INTERRUPT_ENABLE +{ + struct + { + ULONG DHRE :1; + ULONG PSE :1; + ULONG DSE :1; + ULONG SDBE :1; + ULONG UFE :1; + ULONG DPE :1; + ULONG PCE :1; + ULONG DMPE :1; + ULONG DW5_Reserved :14; + ULONG PRCE :1; + ULONG IPME :1; + ULONG OFE :1; + ULONG DW5_Reserved2 :1; + ULONG INFE :1; + ULONG IFE :1; + ULONG HBDE :1; + ULONG HBFE :1; + ULONG TFEE :1; + ULONG CPDE :1; + }; + ULONG Status; +} AHCI_INTERRUPT_ENABLE; typedef struct _AHCI_MEMORY_REGISTERS { @@ -406,22 +430,6 @@ AHCI_PORT PortList[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; -#ifdef DEBUG - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP) == 0x00); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, GHC) == 0x04); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, IS) == 0x08); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PI) == 0x0C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VS) == 0x10); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_CTL) == 0x14); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_PTS) == 0x18); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_LOC) == 0x1C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_CTL) == 0x20); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP2) == 0x24); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, BOHC) == 0x28); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, Reserved) == 0x2C); - C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VendorSpecific) == 0xA0); -#endif - // Holds information for each attached attached port to a given adapter. typedef struct _AHCI_PORT_EXTENSION { @@ -559,3 +567,42 @@ GetSrbExtension( __in PSCSI_REQUEST_BLOCK Srb ); + +////////////////////////////////////////////////////////////// +// Assertions // +////////////////////////////////////////////////////////////// + +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP) == 0x00); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, GHC) == 0x04); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, IS) == 0x08); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PI) == 0x0C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VS) == 0x10); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_CTL) == 0x14); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CCC_PTS) == 0x18); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_LOC) == 0x1C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, EM_CTL) == 0x20); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, CAP2) == 0x24); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, BOHC) == 0x28); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, Reserved) == 0x2C); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, VendorSpecific) == 0xA0); +C_ASSERT(FIELD_OFFSET(AHCI_MEMORY_REGISTERS, PortList) == 0x100); + +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLB) == 0x00); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CLBU) == 0x04); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FB) == 0x08); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBU) == 0x0C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, IS) == 0x10); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, IE) == 0x14); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CMD) == 0x18); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV0) == 0x1C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, TFD) == 0x20); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SIG) == 0x24); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SSTS) == 0x28); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SCTL) == 0x2C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SERR) == 0x30); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SACT) == 0x34); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, CI) == 0x38); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, SNTF) == 0x3C); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, FBS) == 0x40); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, RSV1) == 0x44); +C_ASSERT(FIELD_OFFSET(AHCI_PORT, Vendor) == 0x70);

1 0

[akhaldi] 71821: [SCHANNEL] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jul '16

05 Jul '16

Author: akhaldi Date: Tue Jul 5 10:38:15 2016 New Revision: 71821 URL: http://svn.reactos.org/svn/reactos?rev=71821&view=rev Log: [SCHANNEL] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/schannel/lsamode.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/lsamode… ============================================================================== --- trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Tue Jul 5 10:38:15 2016 @@ -104,6 +104,7 @@ NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -140,6 +141,7 @@ NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ } }; @@ -151,7 +153,7 @@ { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_7; *pcTables = 2; *ppTables = secPkgFunctionTable; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jul 5 10:38:15 2016 @@ -167,7 +167,7 @@ reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 -reactos/dll/win32/schannel # Synced to WineStaging-1.9.4 +reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 reactos/dll/win32/scrrun # Synced to WineStaging-1.9.11 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec)

1 0

[tthompson] 71820: [NTFS] Add ability to write to resident attributes. SetAttributeDataLength() - Check if the file is memory mapped before truncating +InternalSetResidentAttributeLength() - Used b...
by tthompson＠svn.reactos.org 05 Jul '16

05 Jul '16

Author: tthompson Date: Tue Jul 5 07:00:43 2016 New Revision: 71820 URL: http://svn.reactos.org/svn/reactos?rev=71820&view=rev Log: [NTFS] Add ability to write to resident attributes. SetAttributeDataLength() - Check if the file is memory mapped before truncating +InternalSetResidentAttributeLength() - Used by SetAttributeDataLength() Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -509,6 +509,8 @@ DbgPrint(" logical clusters: %I64u - %I64u\n", lcn, lcn + runcount - 1); } + else + DbgPrint(" %u bytes of data\n", Attribute->Resident.ValueLength); } } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -135,6 +135,8 @@ DPRINT("Found context\n"); *AttrCtx = PrepareAttributeContext(Attribute); + (*AttrCtx)->FileMFTIndex = MftRecord->MFTRecordNumber; + if (Offset != NULL) *Offset = Context.Offset; @@ -170,6 +172,50 @@ return AttrRecord->Resident.ValueLength; } +void +InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, + PFILE_RECORD_HEADER FileRecord, + ULONG AttrOffset, + ULONG DataSize) +{ + ULONG EndMarker = AttributeEnd; + ULONG FinalMarker = FILE_RECORD_END; + ULONG NextAttributeOffset; + ULONG Offset; + USHORT Padding; + + DPRINT("InternalSetResidentAttributeLength( %p, %p, %lu, %lu )\n", AttrContext, FileRecord, AttrOffset, DataSize); + + // update ValueLength Field + AttrContext->Record.Resident.ValueLength = DataSize; + Offset = AttrOffset + FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.ValueLength); + RtlCopyMemory((PCHAR)FileRecord + Offset, &DataSize, sizeof(ULONG)); + + // calculate the record length and end marker offset + AttrContext->Record.Length = DataSize + AttrContext->Record.Resident.ValueOffset; + NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + + // Ensure NextAttributeOffset is aligned to an 8-byte boundary + if (NextAttributeOffset % 8 != 0) + { + Padding = 8 - (NextAttributeOffset % 8); + NextAttributeOffset += Padding; + AttrContext->Record.Length += Padding; + } + + // update the record length + Offset = AttrOffset + FIELD_OFFSET(NTFS_ATTR_RECORD, Length); + RtlCopyMemory((PCHAR)FileRecord + Offset, &AttrContext->Record.Length, sizeof(ULONG)); + + // write the end marker + RtlCopyMemory((PCHAR)FileRecord + NextAttributeOffset, &EndMarker, sizeof(ULONG)); + + // write the final marker + Offset = NextAttributeOffset + sizeof(ULONG); + RtlCopyMemory((PCHAR)FileRecord + Offset, &FinalMarker, sizeof(ULONG)); + + FileRecord->BytesInUse = Offset + sizeof(ULONG); +} NTSTATUS SetAttributeDataLength(PFILE_OBJECT FileObject, @@ -179,6 +225,18 @@ PFILE_RECORD_HEADER FileRecord, PLARGE_INTEGER DataSize) { + NTSTATUS Status = STATUS_SUCCESS; + + // are we truncating the file? + if (DataSize->QuadPart < AttributeDataLength(&AttrContext->Record) + { + if (!MmCanFileBeTruncated(FileObject->SectionObjectPointer, (PLARGE_INTEGER)&AllocationSize)) + { + DPRINT1("Can't truncate a memory-mapped file!\n"); + return STATUS_USER_MAPPED_FILE; + } + } + if (AttrContext->Record.IsNonResident) { ULONG BytesPerCluster = Fcb->Vcb->NtfsInfo.BytesPerCluster; @@ -238,28 +296,59 @@ AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; + // copy the attribute record back into the FileRecord + RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); + } + else + { + // resident attribute + + // find the next attribute + ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // Do we need to increase the data length? + if (DataSize->QuadPart > AttrContext->Record.Resident.ValueLength) + { + // There's usually padding at the end of a record. Do we need to extend past it? + ULONG MaxValueLength = AttrContext->Record.Length - AttrContext->Record.Resident.ValueOffset; + if (MaxValueLength < DataSize->LowPart) + { + // If this is the last attribute, we could move the end marker to the very end of the file record + MaxValueLength += Fcb->Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); + + if (MaxValueLength < DataSize->LowPart || NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: Need to convert attribute to non-resident!\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + } + else if (DataSize->LowPart < AttrContext->Record.Resident.ValueLength) + { + // we need to decrease the length + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: Don't know how to decrease length of resident attribute unless it's the final attribute!\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); + } + + //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); + + // write the updated file record back to disk + Status = UpdateFileRecord(Fcb->Vcb, Fcb->MFTIndex, FileRecord); + + if (NT_SUCCESS(Status)) + { Fcb->RFCB.FileSize = *DataSize; Fcb->RFCB.ValidDataLength = *DataSize; - - DPRINT("Data Size: %I64u\n", Fcb->RFCB.FileSize.QuadPart); - - //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); - - // copy the attribute back into the FileRecord - RtlCopyMemory((PCHAR)FileRecord + AttrOffset, &AttrContext->Record, AttrContext->Record.Length); - - //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); - - // write the updated file record back to disk - UpdateFileRecord(Fcb->Vcb, Fcb->MFTIndex, FileRecord); - CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); - } - else - { - // we can't yet handle resident attributes - DPRINT1("FixMe: Can't handle increasing length of resident attribute\n"); - return STATUS_NOT_IMPLEMENTED; } return STATUS_SUCCESS; @@ -501,28 +590,75 @@ DPRINT("WriteAttribute(%p, %p, %I64u, %p, %lu, %p)\n", Vcb, Context, Offset, Buffer, Length, RealLengthWritten); + *RealLengthWritten = 0; + // is this a resident attribute? if (!Context->Record.IsNonResident) { - DPRINT1("FIXME: Writing to resident NTFS records (small files) is not supported at this time.\n"); - // (TODO: This should be really easy to implement) - - /* LeftOver code from ReadAttribute(), may be helpful: - if (Offset > Context->Record.Resident.ValueLength) - return 0; + ULONG AttributeOffset; + PNTFS_ATTR_CONTEXT FoundContext; + PFILE_RECORD_HEADER FileRecord; + if (Offset + Length > Context->Record.Resident.ValueLength) - Length = (ULONG)(Context->Record.Resident.ValueLength - Offset); - RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); - return Length;*/ - - return STATUS_NOT_IMPLEMENTED; // until we implement it + { + DPRINT1("DRIVER ERROR: Attribute is too small!\n"); + return STATUS_INVALID_PARAMETER; + } + + FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + + if (!FileRecord) + { + DPRINT1("Error: Couldn't allocate file record!\n"); + return STATUS_NO_MEMORY; + } + + // read the file record + ReadFileRecord(Vcb, Context->FileMFTIndex, FileRecord); + + // find where to write the attribute data to + Status = FindAttribute(Vcb, FileRecord, + Context->Record.Type, + (PCWSTR)((PCHAR)&Context->Record + Context->Record.NameOffset), + Context->Record.NameLength, + &FoundContext, + &AttributeOffset); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find matching attribute!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + DPRINT("Offset: %I64u, AttributeOffset: %u, ValueOffset: %u\n", Offset, AttributeOffset, Context->Record.Resident.ValueLength); + Offset += AttributeOffset + Context->Record.Resident.ValueOffset; + + if (Offset + Length > Vcb->NtfsInfo.BytesPerFileRecord) + { + DPRINT1("DRIVER ERROR: Data being written extends past end of file record!\n"); + ReleaseAttributeContext(FoundContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_INVALID_PARAMETER; + } + + // copy the data being written into the file record + RtlCopyMemory((PCHAR)FileRecord + Offset, Buffer, Length); + + Status = UpdateFileRecord(Vcb, Context->FileMFTIndex, FileRecord); + + ReleaseAttributeContext(FoundContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + if (NT_SUCCESS(Status)) + *RealLengthWritten = Length; + + return Status; } // This is a non-resident attribute. // I. Find the corresponding start data run. - - *RealLengthWritten = 0; // FIXME: Cache seems to be non-working. Disable it for now //if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) @@ -718,6 +854,7 @@ } /* Apply update sequence array fixups. */ + DPRINT("Sequence number: %u\n", file->SequenceNumber); return FixupUpdateSequenceArray(Vcb, &file->Ntfs); } @@ -948,8 +1085,6 @@ // write the file record to the master file table Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); - // TODO: Update MFT mirror - if (!NT_SUCCESS(Status)) { DPRINT1("UpdateFileRecord failed: %I64u written, %u expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -174,6 +174,10 @@ AttributeLoggedUtilityStream = 0x100, AttributeEnd = 0xFFFFFFFF } ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; + +// FILE_RECORD_END seems to follow AttributeEnd in every file record starting with $Quota. +// No clue what data is being represented here. +#define FILE_RECORD_END 0x11477982 #define NTFS_FILE_MFT 0 #define NTFS_FILE_MFTMIRR 1 @@ -433,6 +437,7 @@ ULONGLONG CacheRunLength; LONGLONG CacheRunLastLCN; ULONGLONG CacheRunCurrentOffset; + ULONGLONG FileMFTIndex; NTFS_ATTR_RECORD Record; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Tue Jul 5 07:00:43 2016 @@ -116,7 +116,6 @@ ULONGLONG BitmapDataSize; PCHAR BitmapData; ULONGLONG FreeClusters = 0; - ULONG Read = 0; RTL_BITMAP Bitmap; DPRINT1("NtfsAllocateClusters(%p, %lu, %lu, %p, %p)\n", DeviceExt, FirstDesiredCluster, DesiredClusters, FirstAssignedCluster, AssignedClusters); @@ -158,7 +157,7 @@ DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); - ReadAttribute(DeviceExt, DataContext, Read, (PCHAR)((ULONG_PTR)BitmapData + Read), (ULONG)BitmapDataSize); + ReadAttribute(DeviceExt, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize); RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap);

1 0

[hbelusca] 71819: [RTL]: Follow what I guess might be Alex' coding standards.
by hbelusca＠svn.reactos.org 05 Jul '16

05 Jul '16

Author: hbelusca Date: Tue Jul 5 00:38:28 2016 New Revision: 71819 URL: http://svn.reactos.org/svn/reactos?rev=71819&view=rev Log: [RTL]: Follow what I guess might be Alex' coding standards. Modified: trunk/reactos/sdk/lib/rtl/process.c Modified: trunk/reactos/sdk/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/process.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] Tue Jul 5 00:38:28 2016 @@ -75,7 +75,7 @@ PVOID BaseAddress = NULL; SIZE_T EnviroSize; SIZE_T Size; - PWCHAR Environment = 0; + PWCHAR Environment = NULL; DPRINT("RtlpInitEnvironment(ProcessHandle: %p, Peb: %p Params: %p)\n", ProcessHandle, Peb, ProcessParameters); @@ -301,7 +301,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } if (ProcessParameters->StandardOutput) @@ -315,7 +317,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } if (ProcessParameters->StandardError) @@ -329,7 +333,9 @@ DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (!NT_SUCCESS(Status)) + { _SEH2_LEAVE; + } } } _SEH2_FINALLY

1 0

[hbelusca] 71818: Fix misspelling "Detatch" --> "Detach"
by hbelusca＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: hbelusca Date: Mon Jul 4 22:35:15 2016 New Revision: 71818 URL: http://svn.reactos.org/svn/reactos?rev=71818&view=rev Log: Fix misspelling "Detatch" --> "Detach" Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Mon Jul 4 22:35:15 2016 @@ -385,13 +385,13 @@ } FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; -typedef struct _DETATCH_DEVICE_WORK_ITEM +typedef struct _DETACH_DEVICE_WORK_ITEM { WORK_QUEUE_ITEM WorkItem; PDEVICE_OBJECT SourceDevice; PDEVICE_OBJECT TargetDevice; -} DETATCH_DEVICE_WORK_ITEM, *PDETATCH_DEVICE_WORK_ITEM; +} DETACH_DEVICE_WORK_ITEM, *PDETACH_DEVICE_WORK_ITEM; /* DISPATCH ROUTINES **********************************************/ @@ -975,21 +975,21 @@ VOID NTAPI -FltpFastIoDetatchDeviceWorker(_In_ PVOID Parameter) -{ - PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem = Parameter; +FltpFastIoDetachDeviceWorker(_In_ PVOID Parameter) +{ + PDETACH_DEVICE_WORK_ITEM DetachDeviceWorkItem = Parameter; /* Run any cleanup routines */ - FltpCleanupDeviceObject(DetatchDeviceWorkItem->SourceDevice); - - /* Detatch from the target device */ - IoDetachDevice(DetatchDeviceWorkItem->TargetDevice); + FltpCleanupDeviceObject(DetachDeviceWorkItem->SourceDevice); + + /* Detach from the target device */ + IoDetachDevice(DetachDeviceWorkItem->TargetDevice); /* Delete the source */ - IoDeleteDevice(DetatchDeviceWorkItem->SourceDevice); + IoDeleteDevice(DetachDeviceWorkItem->SourceDevice); /* Free the pool we allocated in FltpFastIoDetachDevice */ - ExFreePoolWithTag(DetatchDeviceWorkItem, 0x1234); + ExFreePoolWithTag(DetachDeviceWorkItem, 0x1234); } VOID @@ -997,29 +997,29 @@ FltpFastIoDetachDevice(_In_ PDEVICE_OBJECT SourceDevice, _In_ PDEVICE_OBJECT TargetDevice) { - PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem; + PDETACH_DEVICE_WORK_ITEM DetachDeviceWorkItem; PAGED_CODE(); /* - * Detatching and deleting devices is a lot of work and takes too long + * Detaching and deleting devices is a lot of work and takes too long * to be a worthwhile FastIo candidate, so we defer this call to speed * it up. There's no return value so we're okay to do this. */ /* Allocate the work item and it's corresponding data */ - DetatchDeviceWorkItem = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DETATCH_DEVICE_WORK_ITEM), - 0x1234); - if (DetatchDeviceWorkItem) + DetachDeviceWorkItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DETACH_DEVICE_WORK_ITEM), + 0x1234); + if (DetachDeviceWorkItem) { /* Initialize the work item */ - ExInitializeWorkItem(&DetatchDeviceWorkItem->WorkItem, - FltpFastIoDetatchDeviceWorker, - DetatchDeviceWorkItem); + ExInitializeWorkItem(&DetachDeviceWorkItem->WorkItem, + FltpFastIoDetachDeviceWorker, + DetachDeviceWorkItem); /* Queue the work item and return the call */ - ExQueueWorkItem(&DetatchDeviceWorkItem->WorkItem, + ExQueueWorkItem(&DetachDeviceWorkItem->WorkItem, DelayedWorkQueue); } else @@ -1948,7 +1948,7 @@ } else { - /* Run the detatch routine */ + /* Run the detach routine */ FltpDetachFromFileSystemDevice(DeviceObject); } 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 Jul 4 22:35:15 2016 @@ -2841,7 +2841,7 @@ ZeroBits, AllocationType); - /* Detatch if needed, then return status */ + /* Detach if needed, then return status */ if (Attached) KeUnstackDetachProcess(&ApcState); return Status; }

1 0

[hbelusca] 71817: [NTOS]: Add a human-readable description for ObInitProcess as well.
by hbelusca＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: hbelusca Date: Mon Jul 4 22:30:40 2016 New Revision: 71817 URL: http://svn.reactos.org/svn/reactos?rev=71817&view=rev Log: [NTOS]: Add a human-readable description for ObInitProcess as well. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Jul 4 22:30:40 2016 @@ -2066,15 +2066,17 @@ /*++ * @name ObInitProcess * -* The ObInitProcess routine <FILLMEIN> +* The ObInitProcess routine initializes the handle table for the process +* to be initialized, by either creating a new one or duplicating it from +* the parent process. * * @param Parent -* <FILLMEIN>. +* A parent process (optional). * * @param Process -* <FILLMEIN>. -* -* @return <FILLMEIN>. +* The process to initialize. +* +* @return Success or failure. * * @remarks None. *

1 0

[hbelusca] 71816: [NTOS] - Document ObKillProcess. - Implement and document ObClearProcessHandleTable (based on ObKillProcess).
by hbelusca＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: hbelusca Date: Mon Jul 4 22:27:35 2016 New Revision: 71816 URL: http://svn.reactos.org/svn/reactos?rev=71816&view=rev Log: [NTOS] - Document ObKillProcess. - Implement and document ObClearProcessHandleTable (based on ObKillProcess). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Jul 4 22:27:35 2016 @@ -2004,17 +2004,69 @@ return Ret; } +/*++ +* @name ObClearProcessHandleTable +* +* The ObClearProcessHandleTable routine clears the handle table +* of the given process. +* +* @param Process +* The process of which the handle table should be cleared. +* +* @return None. +* +* @remarks None. +* +*--*/ VOID NTAPI ObClearProcessHandleTable(IN PEPROCESS Process) { - /* FIXME */ + PHANDLE_TABLE HandleTable; + OBP_CLOSE_HANDLE_CONTEXT Context; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + + ASSERT(Process); + + /* Ensure the handle table doesn't go away while we use it */ + HandleTable = ObReferenceProcessHandleTable(Process); + if (!HandleTable) return; + + /* Attach to the current process if needed */ + if (PsGetCurrentProcess() != Process) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Fill out the context */ + Context.AccessMode = UserMode; + Context.HandleTable = HandleTable; + + /* Sweep the handle table to close all handles */ + ExSweepHandleTable(HandleTable, + ObpCloseHandleCallback, + &Context); + + /* Leave the critical region */ + KeLeaveCriticalRegion(); + + /* Detach if needed */ + if (AttachedToProcess) + KeUnstackDetachProcess(&ApcState); + + /* Let the handle table go */ + ObDereferenceProcessHandleTable(Process); } /*++ -* @name ObpCreateHandleTable -* -* The ObpCreateHandleTable routine <FILLMEIN> +* @name ObInitProcess +* +* The ObInitProcess routine <FILLMEIN> * * @param Parent * <FILLMEIN>. @@ -2085,14 +2137,16 @@ /*++ * @name ObKillProcess * -* The ObKillProcess routine <FILLMEIN> +* The ObKillProcess routine performs rundown operations on the process, +* then clears and destroys its handle table. * * @param Process -* <FILLMEIN>. +* The process to be killed. * * @return None. * -* @remarks None. +* @remarks Called by the Object Manager cleanup code (kernel) +* when a process is to be destroyed. * *--*/ VOID

1 0

[hbelusca] 71815: [NTOS]: Exit gently in MmCreateTeb if the call to MiCreatePebOrTeb failed. This is OK since the callers of MmCreateTeb check for its failure, and also perform cleanup & exit in ac...
by hbelusca＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: hbelusca Date: Mon Jul 4 22:23:07 2016 New Revision: 71815 URL: http://svn.reactos.org/svn/reactos?rev=71815&view=rev Log: [NTOS]: Exit gently in MmCreateTeb if the call to MiCreatePebOrTeb failed. This is OK since the callers of MmCreateTeb check for its failure, and also perform cleanup & exit in accordance. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c 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 Jul 4 22:23:07 2016 @@ -757,7 +757,12 @@ // Allocate the TEB // Status = MiCreatePebOrTeb(Process, sizeof(TEB), (PULONG_PTR)&Teb); - ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + KeDetachProcess(); + return Status; + } // // Use SEH in case we can't load the TEB

1 0

[ekohl] 71814: [SERVICES] Fix yet another MSDN bug: ChangeServiceConfig2 ALWAYS requires SERVICE_CHANGE_CONFIG and SERVICE_START access rights and an enabled SE_SHUTDOWN_PRIVILEGE privilege when yo...
by ekohl＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: ekohl Date: Mon Jul 4 21:37:24 2016 New Revision: 71814 URL: http://svn.reactos.org/svn/reactos?rev=71814&view=rev Log: [SERVICES] Fix yet another MSDN bug: ChangeServiceConfig2 ALWAYS requires SERVICE_CHANGE_CONFIG and SERVICE_START access rights and an enabled SE_SHUTDOWN_PRIVILEGE privilege when you try to set the failure actions. Otherwise, you will just get a STATUS_ACCESS_DENIED. - Remove the access and privilege checks from ScmSetFailureActions and move them to RChangeServiceConfig2W. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Jul 4 21:37:24 2016 @@ -5018,18 +5018,13 @@ static DWORD -ScmSetFailureActions(PSERVICE_HANDLE hSvc, - PSERVICE lpService, - HKEY hServiceKey, +ScmSetFailureActions(HKEY hServiceKey, LPSERVICE_FAILURE_ACTIONSW lpFailureActions) { LPSERVICE_FAILURE_ACTIONSW lpReadBuffer = NULL; LPSERVICE_FAILURE_ACTIONSW lpWriteBuffer = NULL; - BOOL bIsActionRebootSet = FALSE; - DWORD dwDesiredAccess = SERVICE_CHANGE_CONFIG; DWORD dwRequiredSize = 0; DWORD dwType = 0; - DWORD i = 0; DWORD dwError; /* There is nothing to be done if we have no failure actions */ @@ -5037,48 +5032,7 @@ return ERROR_SUCCESS; /* - * 1- Check whether or not we can set - * failure actions for this service. - */ - - /* Failure actions can only be set for Win32 services, not for drivers */ - if (lpService->Status.dwServiceType & SERVICE_DRIVER) - return ERROR_CANNOT_DETECT_DRIVER_FAILURE; - - /* - * If the service controller handles the SC_ACTION_RESTART action, - * hService must have the SERVICE_START access right. - * - * If you specify SC_ACTION_REBOOT, the caller must have the - * SE_SHUTDOWN_NAME privilege. - */ - if (lpFailureActions->cActions > 0 && - lpFailureActions->lpsaActions != NULL) - { - for (i = 0; i < lpFailureActions->cActions; ++i) - { - if (lpFailureActions->lpsaActions[i].Type == SC_ACTION_RESTART) - dwDesiredAccess |= SERVICE_START; - else if (lpFailureActions->lpsaActions[i].Type == SC_ACTION_REBOOT) - bIsActionRebootSet = TRUE; - } - } - - /* Re-check the access rights */ - if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - dwDesiredAccess)) - { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); - return ERROR_ACCESS_DENIED; - } - - /* FIXME: Check if the caller has the SE_SHUTDOWN_NAME privilege */ - if (bIsActionRebootSet) - { - } - - /* - * 2- Retrieve the original value of FailureActions. + * 1- Retrieve the original value of FailureActions. */ /* Query value length */ @@ -5145,7 +5099,7 @@ lpReadBuffer->lpCommand = NULL; /* - * 3- Initialize the new value to set. + * 2- Initialize the new value to set. */ dwRequiredSize = sizeof(SERVICE_FAILURE_ACTIONSW); @@ -5292,6 +5246,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; HKEY hServiceKey = NULL; + ACCESS_MASK RequiredAccess = SERVICE_CHANGE_CONFIG; DPRINT("RChangeServiceConfig2W() called\n"); DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel); @@ -5302,22 +5257,39 @@ hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT("Invalid service handle!\n"); return ERROR_INVALID_HANDLE; } + if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) + RequiredAccess |= SERVICE_START; + + /* Check the access rights */ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, - SERVICE_CHANGE_CONFIG)) + RequiredAccess)) { DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } + if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) + { + /* FIXME: Check if the caller has the SE_SHUTDOWN_NAME privilege */ + + } + lpService = hSvc->ServiceEntry; if (lpService == NULL) { DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; + } + + /* Failure actions can only be set for Win32 services, not for drivers */ + if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) + { + if (lpService->Status.dwServiceType & SERVICE_DRIVER) + return ERROR_CANNOT_DETECT_DRIVER_FAILURE; } /* Lock the service database exclusively */ @@ -5372,9 +5344,7 @@ } else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { - dwError = ScmSetFailureActions(hSvc, - lpService, - hServiceKey, + dwError = ScmSetFailureActions(hServiceKey, (LPSERVICE_FAILURE_ACTIONSW)Info.psfa); }

1 0

[ekohl] 71813: [SC] - Fix buggy actions parser. - Use proper NUL character instead of zero.
by ekohl＠svn.reactos.org 04 Jul '16

04 Jul '16

Author: ekohl Date: Mon Jul 4 21:04:00 2016 New Revision: 71813 URL: http://svn.reactos.org/svn/reactos?rev=71813&view=rev Log: [SC] - Fix buggy actions parser. - Use proper NUL character instead of zero. Modified: trunk/reactos/base/applications/sc/misc.c Modified: trunk/reactos/base/applications/sc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/misc.… ============================================================================== --- trunk/reactos/base/applications/sc/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/misc.c [iso-8859-1] Mon Jul 4 21:04:00 2016 @@ -189,16 +189,16 @@ /* Replace all slashes by null characters */ p = pStringBuffer; - while (*p != 0 /*_T('\0')*/) + while (*p != _T('\0')) { if (*p == _T('/')) - *p = 0; //_T('\0'); + *p = _T('\0'); p++; } /* Count the arguments in the buffer */ p = pStringBuffer; - while (*p != 0 /*_T('\0')*/) + while (*p != _T('\0')) { nCount++; @@ -224,11 +224,11 @@ if (nCount % 2 == 0) { /* Action */ - if (_tcsicmp(p, _T("reboot"))) + if (!lstrcmpi(p, _T("reboot"))) pActions[nCount / 2].Type = SC_ACTION_REBOOT; - else if (_tcsicmp(p, _T("restart"))) + else if (!lstrcmpi(p, _T("restart"))) pActions[nCount / 2].Type = SC_ACTION_RESTART; - else if (_tcsicmp(p, _T("run"))) + else if (!lstrcmpi(p, _T("run"))) pActions[nCount / 2].Type = SC_ACTION_RUN_COMMAND; else break; @@ -262,7 +262,7 @@ OUT LPCTSTR *ppServiceName, OUT LPSERVICE_FAILURE_ACTIONS pFailureActions) { - INT /*i,*/ ArgIndex = 1; + INT ArgIndex = 1; LPCTSTR lpActions = NULL; LPCTSTR lpReset = NULL;

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