Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71682: [SHELL32]: Adjust the size of the static text in the logoff dialog, for German language. Patch by 'reactosfanboy'. CORE-11446 #resolve #comment Thanks!
by hbelusca＠svn.reactos.org 27 Jun '16

27 Jun '16

Author: hbelusca Date: Mon Jun 27 19:44:20 2016 New Revision: 71682 URL: http://svn.reactos.org/svn/reactos?rev=71682&view=rev Log: [SHELL32]: Adjust the size of the static text in the logoff dialog, for German language. Patch by 'reactosfanboy'. CORE-11446 #resolve #comment Thanks! Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Jun 27 19:44:20 2016 @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 - LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 146, 8 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 166, 8 DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 END

1 0

[apriyadarshi] 71681: Next: Interrupt Handler for completed FIS commands. Notes.txt
by apriyadarshi＠svn.reactos.org 27 Jun '16

27 Jun '16

Author: apriyadarshi Date: Mon Jun 27 12:58:04 2016 New Revision: 71681 URL: http://svn.reactos.org/svn/reactos?rev=71681&view=rev Log: Next: Interrupt Handler for completed FIS commands. Notes.txt Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] Mon Jun 27 12:58:04 2016 @@ -24,11 +24,12 @@ AhciInterruptHandler Flags - IMPLEMENTED + NOT_IMPLEMENTED TESTED Comment Fatal Error not supported Error Recovery not supported + Complete Request Routine AhciHwInterrupt Flags @@ -70,9 +71,9 @@ AhciATA_CFIS Flags - NOT_IMPLEMENTED + IMPLEMENTED Comment - Need to configure command table according to Srb function + Need to implement NCQ AhciATAPI_CFIS Flags @@ -95,9 +96,9 @@ AhciActivatePort Flags - NOT_IMPLEMENTED + IMPLEMENTED Comment - NONE + NCQ not supported AhciProcessIO Flags 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] Mon Jun 27 12:58:04 2016 @@ -77,6 +77,13 @@ StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FBU, receivedFISPhysical.HighPart); } + PortExtension->IdentifyDeviceDataPhysicalAddress = StorPortGetPhysicalAddress(adapterExtension, + NULL, + PortExtension->IdentifyDeviceData, + &mappedLength); + + NT_ASSERT(mappedLength == sizeof(IDENTIFY_DEVICE_DATA)); + // set device power state flag to D0 PortExtension->DevicePowerState = StorPowerDeviceD0; @@ -107,7 +114,7 @@ ) { PVOID portsExtension = NULL; - PCHAR nonCachedExtension; + PCHAR nonCachedExtension, tmp; ULONG status, index, NCS, AlignedNCS; ULONG portCount, portImplemented, nonCachedExtensionSize; @@ -130,7 +137,8 @@ AdapterExtension->PortCount = portCount; nonCachedExtensionSize = sizeof(AHCI_COMMAND_HEADER) * AlignedNCS + //should be 1K aligned - sizeof(AHCI_RECEIVED_FIS); + sizeof(AHCI_RECEIVED_FIS) + + sizeof(IDENTIFY_DEVICE_DATA); // align nonCachedExtensionSize to 1024 nonCachedExtensionSize = ROUND_UP(nonCachedExtensionSize, 1024); @@ -157,7 +165,11 @@ AdapterExtension->PortExtension[index].IsActive = TRUE; AdapterExtension->PortExtension[index].AdapterExtension = AdapterExtension; AdapterExtension->PortExtension[index].CommandList = nonCachedExtension; - AdapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)(nonCachedExtension + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); + + tmp = (PCHAR)(nonCachedExtension + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); + + AdapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)tmp; + AdapterExtension->PortExtension[index].IdentifyDeviceData = (PIDENTIFY_DEVICE_DATA)(tmp + sizeof(AHCI_RECEIVED_FIS)); nonCachedExtension += nonCachedExtensionSize; } } @@ -219,7 +231,7 @@ __in PAHCI_PORT_EXTENSION PortExtension ) { - ULONG IS; + ULONG is, ci, sact, outstanding; AHCI_INTERRUPT_STATUS PxIS; AHCI_INTERRUPT_STATUS PxISMasked; PAHCI_ADAPTER_EXTENSION AdapterExtension; @@ -283,8 +295,18 @@ // 10.7.1.1 // Clear port interrupt // It is set by the level of the virtual interrupt line being a set, and cleared by a write of â1â from the software. - IS = (1 << PortExtension->PortNumber); - StorPortWriteRegisterUlong(AdapterExtension, AdapterExtension->IS, IS); + is = (1 << PortExtension->PortNumber); + StorPortWriteRegisterUlong(AdapterExtension, AdapterExtension->IS, is); + + ci = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CI); + sact = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SACT); + + outstanding = ci | sact; // NOTE: Including both non-NCQ and NCQ based commands + if ((PortExtension->CommandIssuedSlots & (~outstanding)) != 0) + { + DebugPrint("\tCompleted Commands: %d\n", (PortExtension->CommandIssuedSlots & (~outstanding))); + PortExtension->CommandIssuedSlots &= outstanding; + } return; }// -- AhciInterruptHandler(); @@ -741,7 +763,7 @@ /** * @name AhciATA_CFIS - * @not_implemented + * @implemented * * create ATA CFIS from Srb * @@ -755,8 +777,33 @@ __in PAHCI_SRB_EXTENSION SrbExtension ) { + PAHCI_COMMAND_TABLE cmdTable; + DebugPrint("AhciATA_CFIS()\n"); + cmdTable = (PAHCI_COMMAND_TABLE)SrbExtension; + + NT_ASSERT(sizeof(cmdTable->CFIS) == 64); + + AhciZeroMemory(&cmdTable->CFIS, sizeof(cmdTable->CFIS)); + + cmdTable->CFIS[AHCI_ATA_CFIS_FisType] = 0x27; // FIS Type + cmdTable->CFIS[AHCI_ATA_CFIS_PMPort_C] = (1 << 7); // PM Port & C + cmdTable->CFIS[AHCI_ATA_CFIS_CommandReg] = SrbExtension->CommandReg; + + cmdTable->CFIS[AHCI_ATA_CFIS_FeaturesLow] = SrbExtension->FeaturesLow; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA0] = SrbExtension->LBA0; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA1] = SrbExtension->LBA1; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA2] = SrbExtension->LBA2; + cmdTable->CFIS[AHCI_ATA_CFIS_Device] = SrbExtension->Device; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA3] = SrbExtension->LBA3; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA4] = SrbExtension->LBA4; + cmdTable->CFIS[AHCI_ATA_CFIS_LBA5] = SrbExtension->LBA5; + cmdTable->CFIS[AHCI_ATA_CFIS_FeaturesHigh] = SrbExtension->FeaturesHigh; + cmdTable->CFIS[AHCI_ATA_CFIS_SectorCountLow] = SrbExtension->SectorCountLow; + cmdTable->CFIS[AHCI_ATA_CFIS_SectorCountHigh] = SrbExtension->SectorCountHigh; + + return; }// -- AhciATA_CFIS(); /** @@ -934,13 +981,13 @@ } // mark this slot - PortExtension->OccupiedSlots |= SlotIndex; + PortExtension->QueueSlots |= SlotIndex; return; }// -- AhciProcessSrb(); /** * @name AhciActivatePort - * @not_implemented + * @implemented * * Program Port and populate command list * @@ -952,7 +999,39 @@ __in PAHCI_PORT_EXTENSION PortExtension ) { + ULONG cmd, QueueSlots, slotToActivate, tmp; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + DebugPrint("AhciActivatePort()\n"); + + AdapterExtension = PortExtension->AdapterExtension; + QueueSlots = PortExtension->QueueSlots; + + if (QueueSlots == 0) + return; + + // section 3.3.14 + // Bits in this field shall only be set to â1â by software when PxCMD.ST is set to â1â + cmd = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CMD); + + if ((cmd&1) == 0) // PxCMD.ST == 0 + return; + + // get the lowest set bit + tmp = QueueSlots & (QueueSlots - 1); + + if (tmp == 0) + slotToActivate = QueueSlots; + else + slotToActivate = (QueueSlots & (~tmp)); + + // mark that bit off in QueueSlots + PortExtension->QueueSlots &= ~slotToActivate; + // mark this CommandIssuedSlots + PortExtension->CommandIssuedSlots |= slotToActivate; + + // tell the HBA to issue this Command Slot to the given port + StorPortWriteRegisterUlong(AdapterExtension, &PortExtension->Port->CI, slotToActivate); return; }// -- AhciActivatePort(); @@ -999,7 +1078,7 @@ // Acquire Lock StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); - occupiedSlots = PortExtension->OccupiedSlots; // Busy command slots for given port + occupiedSlots = (PortExtension->QueueSlots | PortExtension->CommandIssuedSlots); // Busy command slots for given port NCS = AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); commandSlotMask = (1 << NCS) - 1; // available slots mask @@ -1064,11 +1143,15 @@ { PVOID DataBuffer; ULONG DataBufferLength; + PAHCI_PORT_EXTENSION PortExtension; PAHCI_SRB_EXTENSION SrbExtension; DebugPrint("DeviceInquiryRequest()\n"); + NT_ASSERT(IsPortValid(AdapterExtension, Srb->PathId)); + SrbExtension = GetSrbExtension(Srb); + PortExtension = &AdapterExtension->PortExtension[Srb->PathId]; // 3.6.1 // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data @@ -1078,7 +1161,25 @@ NT_ASSERT(SrbExtension != NULL); SrbExtension->AtaFunction = ATA_FUNCTION_ATA_IDENTIFY; + SrbExtension->Flags |= ATA_FLAGS_DATA_IN; SrbExtension->CommandReg = IDE_COMMAND_NOT_VALID; + + SrbExtension->FeaturesLow = 0; + SrbExtension->LBA0 = 0; + SrbExtension->LBA1 = 0; + SrbExtension->LBA2 = 0; + SrbExtension->Device = 0; + SrbExtension->LBA3 = 0; + SrbExtension->LBA4 = 0; + SrbExtension->LBA5 = 0; + SrbExtension->FeaturesHigh = 0; + SrbExtension->SectorCountLow = 0; + SrbExtension->SectorCountHigh = 0; + + SrbExtension->Sgl.NumberOfElements = 1; + SrbExtension->Sgl.List[0].PhysicalAddress.LowPart = PortExtension->IdentifyDeviceDataPhysicalAddress.LowPart; + SrbExtension->Sgl.List[0].PhysicalAddress.HighPart = PortExtension->IdentifyDeviceDataPhysicalAddress.HighPart; + SrbExtension->Sgl.List[0].Length = sizeof(IDENTIFY_DEVICE_DATA); } else { @@ -1093,10 +1194,13 @@ } AhciZeroMemory(DataBuffer, DataBufferLength); + + // not supported + return SRB_STATUS_BAD_FUNCTION; } AhciProcessIO(AdapterExtension, Srb->PathId, Srb); - return SRB_STATUS_SUCCESS; + return SRB_STATUS_PENDING; }// -- DeviceInquiryRequest(); /** 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] Mon Jun 27 12:58:04 2016 @@ -22,6 +22,21 @@ #define AHCI_Global_HBA_CONTROL_MRSM (1 << 2) #define AHCI_Global_HBA_CONTROL_AE (1 << 31) #define AHCI_Global_HBA_CAP_S64A (1 << 31) + +#define AHCI_ATA_CFIS_FisType 0 +#define AHCI_ATA_CFIS_PMPort_C 1 +#define AHCI_ATA_CFIS_CommandReg 2 +#define AHCI_ATA_CFIS_FeaturesLow 3 +#define AHCI_ATA_CFIS_LBA0 4 +#define AHCI_ATA_CFIS_LBA1 5 +#define AHCI_ATA_CFIS_LBA2 6 +#define AHCI_ATA_CFIS_Device 7 +#define AHCI_ATA_CFIS_LBA3 8 +#define AHCI_ATA_CFIS_LBA4 9 +#define AHCI_ATA_CFIS_LBA5 10 +#define AHCI_ATA_CFIS_FeaturesHigh 11 +#define AHCI_ATA_CFIS_SectorCountLow 12 +#define AHCI_ATA_CFIS_SectorCountHigh 13 // ATA Functions #define ATA_FUNCTION_ATA_COMMAND 0x100 @@ -297,13 +312,16 @@ typedef struct _AHCI_PORT_EXTENSION { ULONG PortNumber; - ULONG OccupiedSlots; // slots to which we have already assigned task + ULONG QueueSlots; // slots to which we have already assigned task + ULONG CommandIssuedSlots; BOOLEAN IsActive; PAHCI_PORT Port; // AHCI Port Infomation AHCI_QUEUE SrbQueue; PAHCI_RECEIVED_FIS ReceivedFIS; PAHCI_COMMAND_HEADER CommandList; STOR_DEVICE_POWER_STATE DevicePowerState; // Device Power State + PIDENTIFY_DEVICE_DATA IdentifyDeviceData; + STOR_PHYSICAL_ADDRESS IdentifyDeviceDataPhysicalAddress; struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; // Port's Adapter Information } AHCI_PORT_EXTENSION, *PAHCI_PORT_EXTENSION; @@ -353,7 +371,21 @@ AHCI_COMMAND_TABLE CommandTable; ULONG AtaFunction; ULONG Flags; - ULONG CommandReg; + + UCHAR CommandReg; + UCHAR FeaturesLow; + UCHAR LBA0; + UCHAR LBA1; + UCHAR LBA2; + UCHAR Device; + UCHAR LBA3; + UCHAR LBA4; + UCHAR LBA5; + UCHAR FeaturesHigh; + + UCHAR SectorCountLow; + UCHAR SectorCountHigh; + ULONG SlotIndex; LOCAL_SCATTER_GATHER_LIST Sgl; } AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION; Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.rc [iso-8859-1] Mon Jun 27 12:58:04 2016 @@ -17,6 +17,6 @@ #define REACTOS_STR_FILE_VERSION VERSION_STR #define REACTOS_STR_INTERNAL_NAME "storahci.sys" #define REACTOS_STR_ORIGINAL_FILENAME "storahci.sys" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 2010 ReactOS Team" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 2016 ReactOS Team" #define REACTOS_STR_PRODUCT_NAME "AHCI Driver for ReactOS" #define REACTOS_STR_PRODUCT_VERSION VERSION_STR

1 0

[tthompson] 71680: [NTFS] Allow for an existing file to be opened with FILE_OVERWRITE, FILE_OVERWRITE_IF, or FILE_SUPERSEDE dispositions, and truncate that file. This allows for a file to be opened...
by tthompson＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: tthompson Date: Sun Jun 26 21:06:02 2016 New Revision: 71680 URL: http://svn.reactos.org/svn/reactos?rev=71680&view=rev Log: [NTFS] Allow for an existing file to be opened with FILE_OVERWRITE, FILE_OVERWRITE_IF, or FILE_SUPERSEDE dispositions, and truncate that file. This allows for a file to be opened and saved in Notepad.exe [provided that file is non-resident and its allocation size doesn't need to change]. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Jun 26 21:06:02 2016 @@ -476,14 +476,66 @@ return Status; } - /* HUGLY HACK: Can't overwrite or supersede a file yet... */ if (RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) { - DPRINT1("Cannot yet perform an overwrite or supersede request on NTFS volume\n"); - NtfsCloseFile(DeviceExt, FileObject); - return STATUS_ACCESS_DENIED; + PFILE_RECORD_HEADER fileRecord = NULL; + PNTFS_ATTR_CONTEXT dataContext = NULL; + ULONG DataAttributeOffset; + LARGE_INTEGER Zero; + Zero.QuadPart = 0; + + // TODO: check for appropriate access + + ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); + + fileRecord = ExAllocatePoolWithTag(NonPagedPool, + Fcb->Vcb->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (fileRecord) + { + + Status = ReadFileRecord(Fcb->Vcb, + Fcb->MFTIndex, + fileRecord); + if (!NT_SUCCESS(Status)) + goto DoneOverwriting; + + // find the data attribute and set it's length to 0 (TODO: Handle Alternate Data Streams) + Status = FindAttribute(Fcb->Vcb, fileRecord, AttributeData, L"", 0, &dataContext, &DataAttributeOffset); + if (!NT_SUCCESS(Status)) + goto DoneOverwriting; + + Status = SetAttributeDataLength(FileObject, Fcb, dataContext, DataAttributeOffset, fileRecord, &Zero); + } + else + { + Status = STATUS_NO_MEMORY; + } + + DoneOverwriting: + if (fileRecord) + ExFreePool(fileRecord); + if (dataContext) + ReleaseAttributeContext(dataContext); + + ExReleaseResourceLite(&(Fcb->MainResource)); + + if (!NT_SUCCESS(Status)) + { + NtfsCloseFile(DeviceExt, FileObject); + return Status; + } + + if (RequestedDisposition == FILE_SUPERSEDE) + { + Irp->IoStatus.Information = FILE_SUPERSEDED; + } + else + { + Irp->IoStatus.Information = FILE_OVERWRITTEN; + } } } else

1 0

[ekohl] 71679: [SERVICES] Create an individual security descriptor for each service. We cannot use a common default security descriptor because RtlSetSecurityObject will free the old security descr...
by ekohl＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: ekohl Date: Sun Jun 26 20:09:37 2016 New Revision: 71679 URL: http://svn.reactos.org/svn/reactos?rev=71679&view=rev Log: [SERVICES] Create an individual security descriptor for each service. We cannot use a common default security descriptor because RtlSetSecurityObject will free the old security descriptor when we try to set a new one. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/security.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Jun 26 20:09:37 2016 @@ -513,9 +513,8 @@ DWORD dwDisposition; DWORD dwError; - DPRINT1("ScmWriteSecurityDescriptor(%p %p)\n", hServiceKey, pSecurityDescriptor); - -DPRINT1("\n"); + DPRINT("ScmWriteSecurityDescriptor(%p %p)\n", hServiceKey, pSecurityDescriptor); + dwError = RegCreateKeyExW(hServiceKey, L"Security", 0, @@ -526,23 +525,16 @@ &hSecurityKey, &dwDisposition); if (dwError != ERROR_SUCCESS) - { -DPRINT1("\n"); - goto done; - } - -DPRINT1("\n"); + return dwError; + dwError = RegSetValueExW(hSecurityKey, L"Security", 0, REG_BINARY, (LPBYTE)pSecurityDescriptor, RtlLengthSecurityDescriptor(pSecurityDescriptor)); -DPRINT1("\n"); - -done: - if (hSecurityKey != NULL) - RegCloseKey(hSecurityKey); + + RegCloseKey(hSecurityKey); return dwError; } @@ -559,7 +551,7 @@ DWORD dwType; DWORD dwError; - DPRINT("ScmReadSecurityDescriptor()\n"); + DPRINT("ScmReadSecurityDescriptor(%p %p)\n", hServiceKey, ppSecurityDescriptor); *ppSecurityDescriptor = NULL; Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Jun 26 20:09:37 2016 @@ -555,8 +555,7 @@ ScmSetServiceGroup(lpService, NULL); /* Release the SecurityDescriptor */ - if ((lpService->pSecurityDescriptor != NULL) && - (lpService->pSecurityDescriptor != pDefaultServiceSD)) + if (lpService->pSecurityDescriptor != NULL) HeapFree(GetProcessHeap(), 0, lpService->pSecurityDescriptor); /* Remove the Service from the List */ @@ -706,7 +705,9 @@ if (lpService->pSecurityDescriptor == NULL) { DPRINT("No security descriptor found! Assign default security descriptor!\n"); - lpService->pSecurityDescriptor = pDefaultServiceSD; + dwError = ScmCreateDefaultServiceSD(&lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; dwError = ScmWriteSecurityDescriptor(hServiceKey, lpService->pSecurityDescriptor); 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] Sun Jun 26 20:09:37 2016 @@ -2255,7 +2255,9 @@ /* Assign the default security descriptor */ if (dwServiceType & SERVICE_WIN32) { - lpService->pSecurityDescriptor = pDefaultServiceSD; + dwError = ScmCreateDefaultServiceSD(&lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; } /* Write service data to the registry */ Modified: trunk/reactos/base/system/services/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/secur… ============================================================================== --- trunk/reactos/base/system/services/security.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/security.c [iso-8859-1] Sun Jun 26 20:09:37 2016 @@ -13,8 +13,6 @@ #define NDEBUG #include <debug.h> -PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; /* Self-relative SD */ - static PSID pNullSid = NULL; static PSID pLocalSystemSid = NULL; static PSID pAuthenticatedUserSid = NULL; @@ -102,11 +100,12 @@ } -static DWORD -ScmCreateDefaultServiceSD(VOID) +ScmCreateDefaultServiceSD( + PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pServiceSD = NULL; + PSECURITY_DESCRIPTOR pRelativeSD = NULL; PACL pDacl = NULL; PACL pSacl = NULL; ULONG ulLength; @@ -234,32 +233,32 @@ DPRINT("BufferLength %lu\n", dwBufferLength); - pDefaultServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwBufferLength); - if (pDefaultServiceSD == NULL) - { - dwError = ERROR_OUTOFMEMORY; - goto done; - } - DPRINT("pDefaultServiceSD %p\n", pDefaultServiceSD); + pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufferLength); + if (pRelativeSD == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + DPRINT("pRelativeSD %p\n", pRelativeSD); Status = RtlAbsoluteToSelfRelativeSD(pServiceSD, - pDefaultServiceSD, + pRelativeSD, &dwBufferLength); if (!NT_SUCCESS(Status)) { dwError = RtlNtStatusToDosError(Status); - } + goto done; + } + + *ppSecurityDescriptor = pRelativeSD; done: if (dwError != ERROR_SUCCESS) { - if (pDefaultServiceSD != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pDefaultServiceSD); - pDefaultServiceSD = NULL; - } + if (pRelativeSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); } if (pServiceSD != NULL) @@ -284,10 +283,6 @@ if (dwError != ERROR_SUCCESS) return dwError; - dwError = ScmCreateDefaultServiceSD(); - if (dwError != ERROR_SUCCESS) - return dwError; - return ERROR_SUCCESS; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Jun 26 20:09:37 2016 @@ -98,8 +98,6 @@ extern BOOL ScmInitialize; extern BOOL ScmShutdown; -extern PSECURITY_DESCRIPTOR pDefaultServiceSD; - /* FUNCTIONS ***************************************************************/ @@ -215,6 +213,10 @@ DWORD ScmInitializeSecurity(VOID); VOID ScmShutdownSecurity(VOID); +DWORD +ScmCreateDefaultServiceSD( + PSECURITY_DESCRIPTOR *ppSecurityDescriptor); + /* services.c */

1 0

[hbelusca] 71678: [EVENTVWR] - No need to pop up an error box if we cannot find an event message resource DLL for the current event log. - Flatten out GetEventMessageFileDLL a bit. - Fix a comment.
by hbelusca＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: hbelusca Date: Sun Jun 26 19:36:38 2016 New Revision: 71678 URL: http://svn.reactos.org/svn/reactos?rev=71678&view=rev Log: [EVENTVWR] - No need to pop up an error box if we cannot find an event message resource DLL for the current event log. - Flatten out GetEventMessageFileDLL a bit. - Fix a comment. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Jun 26 19:36:38 2016 @@ -226,40 +226,36 @@ szKeyName, 0, KEY_READ, - &hAppKey) == ERROR_SUCCESS) - { - if (RegOpenKeyExW(hAppKey, - SourceName, - 0, - KEY_READ, - &hSourceKey) == ERROR_SUCCESS) - { - dwSize = sizeof(szModuleName); - if (RegQueryValueExW(hSourceKey, - EntryName, - NULL, - NULL, - (LPBYTE)szModuleName, - &dwSize) == ERROR_SUCCESS) - { - /* Returns a string containing the requested substituted environment variable */ - ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); - - /* Successful */ - bReturn = TRUE; - } - } - } - else - { - ShowLastWin32Error(); - } - - if (hSourceKey != NULL) + &hAppKey) != ERROR_SUCCESS) + { + return FALSE; + } + + if (RegOpenKeyExW(hAppKey, + SourceName, + 0, + KEY_READ, + &hSourceKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szModuleName); + if (RegQueryValueExW(hSourceKey, + EntryName, + NULL, + NULL, + (LPBYTE)szModuleName, + &dwSize) == ERROR_SUCCESS) + { + /* Returns a string containing the requested substituted environment variable */ + ExpandEnvironmentStringsW(szModuleName, ExpandedName, MAX_PATH); + + /* Successful */ + bReturn = TRUE; + } + RegCloseKey(hSourceKey); - - if (hAppKey != NULL) - RegCloseKey(hAppKey); + } + + RegCloseKey(hAppKey); return bReturn; } @@ -677,14 +673,13 @@ /* Get the computer name */ lpszComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR)); - /* Compute the event type */ + /* Compute the event time */ EventTimeToSystemTime(pevlr->TimeWritten, &time); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate)); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); /* Get the username that generated the event */ GetEventUserName(pevlr, szUsername); - - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate)); - GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpszSourceName, pevlr, szCategory);

1 0

[tthompson] 71677: [NTFS] Remove unused parameter from SetAttributeDataLength.
by tthompson＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: tthompson Date: Sun Jun 26 17:03:31 2016 New Revision: 71677 URL: http://svn.reactos.org/svn/reactos?rev=71677&view=rev Log: [NTFS] Remove unused parameter from SetAttributeDataLength. Modified: 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/rw.c 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] Sun Jun 26 17:03:31 2016 @@ -177,7 +177,6 @@ PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER DataSize) { if (AttrContext->Record.IsNonResident) 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] Sun Jun 26 17:03:31 2016 @@ -772,7 +772,6 @@ PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, - PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER DataSize); ULONG Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Jun 26 17:03:31 2016 @@ -419,7 +419,7 @@ AllocationSize = ROUND_UP(DataSize.QuadPart, Fcb->Vcb->NtfsInfo.BytesPerCluster); // set the attribute data length - Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, DeviceExt, &DataSize); + Status = SetAttributeDataLength(FileObject, Fcb, DataContext, AttributeOffset, FileRecord, &DataSize); if (!NT_SUCCESS(Status)) {

1 0

[ekohl] 71676: [SERVICES] Use self-relative security descriptors only: - Convert the default service security descriptor to the self-relative format. - Remove security descriptor format conversions...
by ekohl＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: ekohl Date: Sun Jun 26 15:02:48 2016 New Revision: 71676 URL: http://svn.reactos.org/svn/reactos?rev=71676&view=rev Log: [SERVICES] Use self-relative security descriptors only: - Convert the default service security descriptor to the self-relative format. - Remove security descriptor format conversions from ScmReadSecurityDescriptor and ScmWriteSecurityDescriptor. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/security.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Jun 26 15:02:48 2016 @@ -14,6 +14,11 @@ #define NDEBUG #include <debug.h> + +ULONG +NTAPI +RtlLengthSecurityDescriptor( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); /* FUNCTIONS *****************************************************************/ @@ -504,45 +509,11 @@ _In_ HKEY hServiceKey, _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) { - PSECURITY_DESCRIPTOR pRelativeSD = NULL; HKEY hSecurityKey = NULL; - DWORD dwBufferLength = 0; DWORD dwDisposition; DWORD dwError; - NTSTATUS Status; DPRINT1("ScmWriteSecurityDescriptor(%p %p)\n", hServiceKey, pSecurityDescriptor); - - Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, - NULL, - &dwBufferLength); - if (Status != STATUS_BUFFER_TOO_SMALL) - { -DPRINT1("\n"); - return RtlNtStatusToDosError(Status); - } - - DPRINT1("BufferLength %lu\n", dwBufferLength); - - pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwBufferLength); - if (pRelativeSD == NULL) - { -DPRINT1("\n"); - return ERROR_OUTOFMEMORY; - } - -DPRINT1("\n"); - Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, - pRelativeSD, - &dwBufferLength); - if (!NT_SUCCESS(Status)) - { -DPRINT1("\n"); - dwError = RtlNtStatusToDosError(Status); - goto done; - } DPRINT1("\n"); dwError = RegCreateKeyExW(hServiceKey, @@ -565,17 +536,14 @@ L"Security", 0, REG_BINARY, - (LPBYTE)pRelativeSD, - dwBufferLength); + (LPBYTE)pSecurityDescriptor, + RtlLengthSecurityDescriptor(pSecurityDescriptor)); DPRINT1("\n"); done: if (hSecurityKey != NULL) RegCloseKey(hSecurityKey); - if (pRelativeSD != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); - return dwError; } @@ -586,13 +554,10 @@ _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pRelativeSD = NULL; - PSECURITY_DESCRIPTOR pResizedBuffer = NULL; HKEY hSecurityKey = NULL; DWORD dwBufferLength = 0; - DWORD dwAbsoluteSDSize = 0; DWORD dwType; DWORD dwError; - NTSTATUS Status; DPRINT("ScmReadSecurityDescriptor()\n"); @@ -650,36 +615,6 @@ goto done; } - Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, - &dwAbsoluteSDSize); - if (Status == STATUS_BUFFER_TOO_SMALL) - { - pResizedBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), - 0, - pRelativeSD, - dwAbsoluteSDSize); - if (pResizedBuffer == NULL) - { - dwError = ERROR_OUTOFMEMORY; - goto done; - } - - pRelativeSD = pResizedBuffer; - Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, - &dwAbsoluteSDSize); - if (!NT_SUCCESS(Status)) - { - dwError = RtlNtStatusToDosError(Status); - goto done; - } - } - else if (!NT_SUCCESS(Status)) - { - - dwError = RtlNtStatusToDosError(Status); - goto done; - } - *ppSecurityDescriptor = pRelativeSD; done: Modified: trunk/reactos/base/system/services/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/secur… ============================================================================== --- trunk/reactos/base/system/services/security.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/security.c [iso-8859-1] Sun Jun 26 15:02:48 2016 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; +PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; /* Self-relative SD */ static PSID pNullSid = NULL; static PSID pLocalSystemSid = NULL; @@ -110,6 +110,7 @@ PACL pDacl = NULL; PACL pSacl = NULL; ULONG ulLength; + DWORD dwBufferLength = 0; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; @@ -166,14 +167,14 @@ FALSE, TRUE); - + /* Create the absolute security descriptor */ pServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SECURITY_DESCRIPTOR)); if (pServiceSD == NULL) { dwError = ERROR_OUTOFMEMORY; goto done; } -DPRINT1("pServiceSD %p\n", pServiceSD); + DPRINT("pServiceSD %p\n", pServiceSD); Status = RtlCreateSecurityDescriptor(pServiceSD, SECURITY_DESCRIPTOR_REVISION); @@ -221,22 +222,54 @@ goto done; } - - pDefaultServiceSD = pServiceSD; -DPRINT1("pDefaultServiceSD %p\n", pDefaultServiceSD); + /* Convert the absolute SD to a self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(pServiceSD, + NULL, + &dwBufferLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + DPRINT("BufferLength %lu\n", dwBufferLength); + + pDefaultServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufferLength); + if (pDefaultServiceSD == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + DPRINT("pDefaultServiceSD %p\n", pDefaultServiceSD); + + Status = RtlAbsoluteToSelfRelativeSD(pServiceSD, + pDefaultServiceSD, + &dwBufferLength); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + } done: if (dwError != ERROR_SUCCESS) { - if (pDacl != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pDacl); - - if (pSacl != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pSacl); - - if (pServiceSD != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, pServiceSD); - } + if (pDefaultServiceSD != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pDefaultServiceSD); + pDefaultServiceSD = NULL; + } + } + + if (pServiceSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pServiceSD); + + if (pSacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pSacl); + + if (pDacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDacl); return dwError; }

1 0

[mjansen] 71675: [SCHANNEL] add missing function to the delayload header. Spotted by Peter Hater. CORE-11270 #resolve
by mjansen＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: mjansen Date: Sun Jun 26 12:52:46 2016 New Revision: 71675 URL: http://svn.reactos.org/svn/reactos?rev=71675&view=rev Log: [SCHANNEL] add missing function to the delayload header. Spotted by Peter Hater. CORE-11270 #resolve Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_mbedtls_lazyload.h [iso-8859-1] Sun Jun 26 12:52:46 2016 @@ -49,6 +49,7 @@ MAKE_FUNCPTR(mbedtls_ssl_write) MAKE_FUNCPTR(mbedtls_ssl_get_peer_cert) MAKE_FUNCPTR(mbedtls_ssl_config_init) +MAKE_FUNCPTR(mbedtls_ssl_config_free) MAKE_FUNCPTR(mbedtls_ssl_config_defaults) MAKE_FUNCPTR(mbedtls_ssl_conf_dbg) MAKE_FUNCPTR(mbedtls_ssl_setup) @@ -103,6 +104,7 @@ LOAD_FUNCPTR(mbedtls_ssl_write) LOAD_FUNCPTR(mbedtls_ssl_get_peer_cert) LOAD_FUNCPTR(mbedtls_ssl_config_init) + LOAD_FUNCPTR(mbedtls_ssl_config_free) LOAD_FUNCPTR(mbedtls_ssl_config_defaults) LOAD_FUNCPTR(mbedtls_ssl_conf_dbg) LOAD_FUNCPTR(mbedtls_ssl_setup) @@ -162,6 +164,7 @@ #define mbedtls_ssl_write pmbedtls_ssl_write #define mbedtls_ssl_get_peer_cert pmbedtls_ssl_get_peer_cert #define mbedtls_ssl_config_init pmbedtls_ssl_config_init +#define mbedtls_ssl_config_free pmbedtls_ssl_config_free #define mbedtls_ssl_config_defaults pmbedtls_ssl_config_defaults #define mbedtls_ssl_conf_dbg pmbedtls_ssl_conf_dbg #define mbedtls_ssl_setup pmbedtls_ssl_setup

1 0

[pschweitzer] 71674: [FASTFAT] Don't allow renaming a directory if there are opened files in it. The way we do it for now isn't fully optimal and could be really improved, but that's a first step i...
by pschweitzer＠svn.reactos.org 26 Jun '16

26 Jun '16

Author: pschweitzer Date: Sun Jun 26 10:23:35 2016 New Revision: 71674 URL: http://svn.reactos.org/svn/reactos?rev=71674&view=rev Log: [FASTFAT] Don't allow renaming a directory if there are opened files in it. The way we do it for now isn't fully optimal and could be really improved, but that's a first step in the right direction. This should help getting rid of FAT volumes corruption. This also fixes a few winetests it seems. CORE-11426 #comment Patch that fixes bug 3 committed in r71674 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Jun 26 10:23:35 2016 @@ -704,6 +704,27 @@ vfatSplitPathName(&NewName, &NewPath, &NewFile); DPRINT("New dir: %wZ, New file: %wZ\n", &NewPath, &NewFile); + /* FIXME: Do it in a more efficient way, like linking FCBs to their parent FCB so that we browse less FCBs + * Note: The FIXME is the way MS FastFAT seems to do it + */ + if (vfatFCBIsDirectory(FCB)) + { + PLIST_ENTRY Entry; + PVFATFCB VolFCB; + + for (Entry = DeviceExt->FcbListHead.Flink; Entry != &DeviceExt->FcbListHead; Entry = Entry->Flink) + { + VolFCB = CONTAINING_RECORD(Entry, VFATFCB, FcbListEntry); + if (VolFCB->parentFcb == FCB && VolFCB->OpenHandleCount != 0) + { + DPRINT1("At least one children file opened! %wZ (%u, %u)\n", &VolFCB->PathNameU, VolFCB->RefCount, VolFCB->OpenHandleCount); + Status = STATUS_ACCESS_DENIED; + ASSERT(OldReferences == FCB->parentFcb->RefCount); + goto Cleanup; + } + } + } + /* Are we working in place? */ if (FsRtlAreNamesEqual(&SourcePath, &NewPath, TRUE, NULL)) {

1 0

[tfaber] 71673: [NTOS:LPC] - Avoid dereferencing a null pointer in LpcpDeletePort. By Samuel Serapión. CORE-6850 #resolve
by tfaber＠svn.reactos.org 25 Jun '16

25 Jun '16

Author: tfaber Date: Sat Jun 25 23:27:45 2016 New Revision: 71673 URL: http://svn.reactos.org/svn/reactos?rev=71673&view=rev Log: [NTOS:LPC] - Avoid dereferencing a null pointer in LpcpDeletePort. By Samuel Serapión. CORE-6850 #resolve Modified: trunk/reactos/ntoskrnl/lpc/close.c Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Sat Jun 25 23:27:45 2016 @@ -432,20 +432,20 @@ /* Dereference the object unless it's the same port */ if (ConnectionPort != Port) ObDereferenceObject(ConnectionPort); + + /* Check if this is a connection port with a server process */ + if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && + (ConnectionPort->ServerProcess)) + { + /* Dereference the server process */ + ObDereferenceObject(ConnectionPort->ServerProcess); + ConnectionPort->ServerProcess = NULL; + } } else { /* Release the lock */ KeReleaseGuardedMutex(&LpcpLock); - } - - /* Check if this is a connection port with a server process */ - if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && - (ConnectionPort->ServerProcess)) - { - /* Dereference the server process */ - ObDereferenceObject(ConnectionPort->ServerProcess); - ConnectionPort->ServerProcess = NULL; } /* Free client security */

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