Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[tfaber] 66923: [CDFS] - Simplify string handling, add a few asserts

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 18:09:51 2015 New Revision: 66923 URL: http://svn.reactos.org/svn/reactos?rev=66923&view=rev Log: [CDFS] - Simplify string handling, add a few asserts Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Fri Mar 27 18:09:51 2015 @@ -564,16 +564,16 @@ DPRINT ("Offset %lu\n", Offset); RtlInitUnicodeString(&LongName, Name); - ShortName.Length = 0; - ShortName.MaximumLength = 26; - ShortName.Buffer = ShortNameBuffer; - memset(ShortNameBuffer, 0, 26); + RtlInitEmptyUnicodeString(&ShortName, ShortNameBuffer, sizeof(ShortNameBuffer)); + RtlZeroMemory(ShortNameBuffer, sizeof(ShortNameBuffer)); OffsetOfEntry.QuadPart = StreamOffset.QuadPart + Offset; CdfsShortNameCacheGet(DirectoryFcb, &OffsetOfEntry, &LongName, &ShortName); DPRINT("ShortName '%wZ'\n", &ShortName); + ASSERT(LongName.Length >= sizeof(WCHAR)); + ASSERT(ShortName.Length >= sizeof(WCHAR)); if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Fri Mar 27 18:09:51 2015 @@ -108,6 +108,7 @@ return FALSE; } + ASSERT(FileName.Length >= sizeof(WCHAR)); for (i = 0; i < FileName.Length / sizeof(WCHAR) ; i++) { /* Don't allow spaces in FileName */ @@ -122,11 +123,10 @@ } /* Finally, convert the string to call the FsRtl function */ - DbcsName.MaximumLength = 12; - DbcsName.Buffer = DbcsNameBuffer; + RtlInitEmptyAnsiString(&DbcsName, DbcsNameBuffer, sizeof(DbcsNameBuffer)); if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName, &FileName, - FALSE ))) + FALSE))) { return FALSE; @@ -159,10 +159,7 @@ if (ShortNameEntry->StreamOffset.QuadPart == StreamOffset->QuadPart) { /* Cache hit */ - RtlCopyMemory - (ShortName->Buffer, ShortNameEntry->Name.Buffer, - ShortNameEntry->Name.Length); - ShortName->Length = ShortNameEntry->Name.Length; + RtlCopyUnicodeString(ShortName, &ShortNameEntry->Name); ExReleaseResourceLite(&DirectoryFcb->NameListResource); DPRINT("Yield short name %wZ from cache\n", ShortName); return; @@ -218,13 +215,10 @@ } ShortNameEntry->StreamOffset = *StreamOffset; - ShortNameEntry->Name.Buffer = ShortNameEntry->NameBuffer; - ShortNameEntry->Name.Length = ShortName->Length; - ShortNameEntry->Name.MaximumLength = sizeof(ShortNameEntry->NameBuffer); - RtlCopyMemory - (ShortNameEntry->NameBuffer, - ShortName->Buffer, - ShortName->Length); + RtlInitEmptyUnicodeString(&ShortNameEntry->Name, + ShortNameEntry->NameBuffer, + sizeof(ShortNameEntry->NameBuffer)); + RtlCopyUnicodeString(&ShortNameEntry->Name, ShortName); InsertTailList(&DirectoryFcb->ShortNameList, &ShortNameEntry->Entry); ExReleaseResourceLite(&DirectoryFcb->NameListResource);

9 years, 9 months

[tfaber] 66922: [CDFS][MSFS][PCI] - Use sensible pool tags

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 18:03:39 2015 New Revision: 66922 URL: http://svn.reactos.org/svn/reactos?rev=66922&view=rev Log: [CDFS][MSFS][PCI] - Use sensible pool tags Modified: trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/misc.c trunk/reactos/drivers/filesystems/cdfs/rw.c trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -154,7 +154,7 @@ Status = FdoLocateChildDevice(&Device, DeviceExtension, SlotNumber, &PciConfig); if (!NT_SUCCESS(Status)) { - Device = (PPCI_DEVICE)ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_DEVICE),TAG_PCI); + Device = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_DEVICE), TAG_PCI); if (!Device) { /* FIXME: Cleanup resources for already discovered devices */ @@ -232,11 +232,12 @@ { /* FIXME: Another bus driver has already created a DEVICE_RELATIONS structure so we must merge this structure with our own */ + DPRINT1("FIXME: leaking old bus relations\n"); } Size = sizeof(DEVICE_RELATIONS) + sizeof(Relations->Objects) * (DeviceExtension->DeviceListCount - 1); - Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); + Relations = ExAllocatePoolWithTag(PagedPool, Size, TAG_PCI); if (!Relations) return STATUS_INSUFFICIENT_RESOURCES; @@ -369,7 +370,7 @@ RtlFreeUnicodeString(&PdoDeviceExtension->DeviceLocation); } - ExFreePool(Relations); + ExFreePoolWithTag(Relations, TAG_PCI); return ErrorStatus; } Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -150,7 +150,7 @@ DPRINT("Called\n"); DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - BusInformation = ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + BusInformation = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), TAG_PCI); Irp->IoStatus.Information = (ULONG_PTR)BusInformation; if (BusInformation != NULL) { @@ -1475,7 +1475,7 @@ return Irp->IoStatus.Status; /* We can do this because we only return 1 PDO for TargetDeviceRelation */ - DeviceRelations = ExAllocatePool(PagedPool, sizeof(*DeviceRelations)); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(*DeviceRelations), TAG_PCI); if (!DeviceRelations) return STATUS_INSUFFICIENT_RESOURCES; @@ -1621,7 +1621,7 @@ KeReleaseSpinLock(&FdoDeviceExtension->DeviceListLock, OldIrql); /* Free the device */ - ExFreePool(DeviceExtension->PciDevice); + ExFreePoolWithTag(DeviceExtension->PciDevice, TAG_PCI); /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -231,8 +231,12 @@ ULONG LastOffset; } CCB, *PCCB; -#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' +#define CDFS_TAG 'sfdC' +#define CDFS_CCB_TAG 'ccdC' +#define CDFS_NONPAGED_FCB_TAG 'nfdC' +#define CDFS_SHORT_NAME_TAG 'sgdC' +#define CDFS_SEARCH_PATTERN_TAG 'eedC' +#define CDFS_FILENAME_TAG 'nFdC' typedef struct { Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -67,9 +67,9 @@ if (Ccb->DirectorySearchPattern.Buffer) { - ExFreePoolWithTag(Ccb->DirectorySearchPattern.Buffer, TAG_CCB); + ExFreePoolWithTag(Ccb->DirectorySearchPattern.Buffer, CDFS_SEARCH_PATTERN_TAG); } - ExFreePoolWithTag(Ccb, TAG_CCB); + ExFreePoolWithTag(Ccb, CDFS_CCB_TAG); return(STATUS_SUCCESS); } Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -62,8 +62,7 @@ sizeof(WCHAR); AbsoluteFileName->Length = 0; AbsoluteFileName->MaximumLength = Length; - AbsoluteFileName->Buffer = ExAllocatePool(NonPagedPool, - Length); + AbsoluteFileName->Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, CDFS_FILENAME_TAG); if (AbsoluteFileName->Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -180,7 +179,7 @@ FileObject); if ((FileName == &AbsFileName) && AbsFileName.Buffer) - ExFreePool(AbsFileName.Buffer); + ExFreePoolWithTag(AbsFileName.Buffer, CDFS_FILENAME_TAG); return Status; } Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -610,7 +610,7 @@ { First = TRUE; Ccb->DirectorySearchPattern.Buffer = - ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_CCB); + ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), CDFS_SEARCH_PATTERN_TAG); if (Ccb->DirectorySearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -623,7 +623,7 @@ else if (Ccb->DirectorySearchPattern.Buffer == NULL) { First = TRUE; - Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_CCB); + Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), CDFS_SEARCH_PATTERN_TAG); if (Ccb->DirectorySearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -69,7 +69,9 @@ { PFCB Fcb; - Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(FCB), TAG_FCB); + Fcb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FCB), + CDFS_NONPAGED_FCB_TAG); if(!Fcb) return NULL; RtlZeroMemory(Fcb, sizeof(FCB)); @@ -112,11 +114,11 @@ { Entry = Fcb->ShortNameList.Flink; RemoveEntryList(Entry); - ExFreePoolWithTag(Entry, TAG_FCB); + ExFreePoolWithTag(Entry, CDFS_SHORT_NAME_TAG); } ExDeleteResourceLite(&Fcb->NameListResource); - ExFreePoolWithTag(Fcb, TAG_FCB); + ExFreePoolWithTag(Fcb, CDFS_NONPAGED_FCB_TAG); } @@ -237,7 +239,7 @@ FileObject = IoCreateStreamFileObject(NULL, Vcb->StorageDevice); - newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); + newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); if (newCCB == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -266,7 +268,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { FileObject->FsContext2 = NULL; - ExFreePoolWithTag(newCCB, TAG_CCB); + ExFreePoolWithTag(newCCB, CDFS_CCB_TAG); ObDereferenceObject(FileObject); Fcb->FileObject = NULL; return _SEH2_GetExceptionCode(); @@ -438,7 +440,7 @@ { PCCB newCCB; - newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); + newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); if (newCCB == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -467,7 +469,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { FileObject->FsContext2 = NULL; - ExFreePoolWithTag(newCCB, TAG_CCB); + ExFreePoolWithTag(newCCB, CDFS_CCB_TAG); return _SEH2_GetExceptionCode(); } _SEH2_END; Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -204,8 +204,7 @@ DPRINT("CdfsGetVolumeData\n"); - Buffer = ExAllocatePool(NonPagedPool, - CDFS_BASIC_SECTOR); + Buffer = ExAllocatePoolWithTag(NonPagedPool, CDFS_BASIC_SECTOR, CDFS_TAG); if (Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -219,7 +218,7 @@ TRUE); if (!NT_SUCCESS(Status)) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, CDFS_TAG); return Status; } @@ -253,7 +252,7 @@ TRUE); if (!NT_SUCCESS(Status)) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, CDFS_TAG); return Status; } @@ -264,7 +263,7 @@ if (Buffer[0] != 1 || Buffer[1] != 'C' || Buffer[2] != 'D' || Buffer[3] != '0' || Buffer[4] != '0' || Buffer[5] != '1') { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, CDFS_TAG); return STATUS_UNRECOGNIZED_VOLUME; } } @@ -299,7 +298,7 @@ } } - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, CDFS_TAG); return(STATUS_SUCCESS); } @@ -383,9 +382,7 @@ goto ByeBye; } - Ccb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(CCB), - TAG_CCB); + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), CDFS_CCB_TAG); if (Ccb == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -446,7 +443,7 @@ if (DeviceExt && DeviceExt->StreamFileObject) ObDereferenceObject(DeviceExt->StreamFileObject); if (Fcb) - ExFreePool(Fcb); + ExFreePoolWithTag(Fcb, CDFS_NONPAGED_FCB_TAG); if (NewDeviceObject) IoDeleteDevice(NewDeviceObject); } Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -205,7 +205,9 @@ } /* We've scanned over all entries and now have a unique one. Cache it. */ - ShortNameEntry = ExAllocatePoolWithTag(PagedPool, sizeof(CDFS_SHORT_NAME), TAG_FCB); + ShortNameEntry = ExAllocatePoolWithTag(PagedPool, + sizeof(CDFS_SHORT_NAME), + CDFS_SHORT_NAME_TAG); if (!ShortNameEntry) { /* We couldn't cache it, but we can return it. We run the risk of Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -134,7 +134,9 @@ BOOLEAN bFreeBuffer = FALSE; if ((ReadOffset % BLOCKSIZE) != 0 || (ToRead % BLOCKSIZE) != 0) { - PageBuf = ExAllocatePool(NonPagedPool, nBlocks * BLOCKSIZE); + PageBuf = ExAllocatePoolWithTag(NonPagedPool, + nBlocks * BLOCKSIZE, + CDFS_TAG); if (!PageBuf) { return STATUS_NO_MEMORY; @@ -165,7 +167,7 @@ } if(bFreeBuffer) - ExFreePool(PageBuf); + ExFreePoolWithTag(PageBuf, CDFS_TAG); } return Status; Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -39,7 +39,7 @@ DPRINT("Mailslot name: %wZ\n", &FileObject->FileName); - Ccb = ExAllocatePool(NonPagedPool, sizeof(MSFS_CCB)); + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(MSFS_CCB), 'cFsM'); if (Ccb == NULL) { Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -65,7 +65,7 @@ if (current_entry == &DeviceExtension->FcbListHead) { - ExFreePool(Ccb); + ExFreePoolWithTag(Ccb, 'cFsM'); KeUnlockMutex(&DeviceExtension->FcbListLock); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -125,7 +125,7 @@ DPRINT("Mailslot name: %wZ\n", &FileObject->FileName); - Fcb = ExAllocatePool(NonPagedPool, sizeof(MSFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(MSFS_FCB), 'fFsM'); if (Fcb == NULL) { Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -138,10 +138,12 @@ Fcb->Name.Length = FileObject->FileName.Length; Fcb->Name.MaximumLength = Fcb->Name.Length + sizeof(UNICODE_NULL); - Fcb->Name.Buffer = ExAllocatePool(NonPagedPool, Fcb->Name.MaximumLength); + Fcb->Name.Buffer = ExAllocatePoolWithTag(NonPagedPool, + Fcb->Name.MaximumLength, + 'NFsM'); if (Fcb->Name.Buffer == NULL) { - ExFreePool(Fcb); + ExFreePoolWithTag(Fcb, 'fFsM'); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; @@ -153,11 +155,11 @@ RtlCopyUnicodeString(&Fcb->Name, &FileObject->FileName); - Ccb = ExAllocatePool(NonPagedPool, sizeof(MSFS_CCB)); + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(MSFS_CCB), 'cFsM'); if (Ccb == NULL) { - ExFreePool(Fcb->Name.Buffer); - ExFreePool(Fcb); + ExFreePoolWithTag(Fcb->Name.Buffer, 'NFsM'); + ExFreePoolWithTag(Fcb, 'fFsM'); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; @@ -197,9 +199,9 @@ if (current_entry != &DeviceExtension->FcbListHead) { - ExFreePool(Fcb->Name.Buffer); - ExFreePool(Fcb); - ExFreePool(Ccb); + ExFreePoolWithTag(Fcb->Name.Buffer, 'NFsM'); + ExFreePoolWithTag(Fcb, 'fFsM'); + ExFreePoolWithTag(Ccb, 'cFsM'); KeUnlockMutex(&DeviceExtension->FcbListLock); @@ -288,7 +290,7 @@ MSFS_MESSAGE, MessageListEntry); RemoveEntryList(Fcb->MessageListHead.Flink); - ExFreePool(Message); + ExFreePoolWithTag(Message, 'rFsM'); } Fcb->MessageCount = 0; @@ -300,15 +302,15 @@ KeAcquireSpinLock(&Fcb->CcbListLock, &oldIrql); RemoveEntryList(&Ccb->CcbListEntry); KeReleaseSpinLock(&Fcb->CcbListLock, oldIrql); - ExFreePool(Ccb); + ExFreePoolWithTag(Ccb, 'cFsM'); FileObject->FsContext2 = NULL; if (Fcb->ReferenceCount == 0) { DPRINT("ReferenceCount == 0: Deleting mailslot data\n"); RemoveEntryList(&Fcb->FcbListEntry); - ExFreePool(Fcb->Name.Buffer); - ExFreePool(Fcb); + ExFreePoolWithTag(Fcb->Name.Buffer, 'NFsM'); + ExFreePoolWithTag(Fcb, 'fFsM'); } KeUnlockMutex(&DeviceExtension->FcbListLock); Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Fri Mar 27 18:03:39 2015 @@ -77,7 +77,7 @@ RemoveHeadList(&Fcb->MessageListHead); KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); - ExFreePool(Message); + ExFreePoolWithTag(Message, 'rFsM'); Fcb->MessageCount--; if (Fcb->MessageCount == 0) { @@ -142,8 +142,9 @@ DPRINT("Length: %lu Message: %s\n", Length, (PUCHAR)Buffer); /* Allocate new message */ - Message = ExAllocatePool(NonPagedPool, - sizeof(MSFS_MESSAGE) + Length); + Message = ExAllocatePoolWithTag(NonPagedPool, + sizeof(MSFS_MESSAGE) + Length, + 'rFsM'); if (Message == NULL) { Irp->IoStatus.Status = STATUS_NO_MEMORY;

9 years, 9 months

[janderwald] 66921: [INF] - properly install kmixer - disable audio category filter until audio stack is ready

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Mar 27 17:30:05 2015 New Revision: 66921 URL: http://svn.reactos.org/svn/reactos?rev=66921&view=rev Log: [INF] - properly install kmixer - disable audio category filter until audio stack is ready Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c trunk/reactos/media/inf/wdmaudio.inf Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Fri Mar 27 17:30:05 2015 @@ -20,6 +20,7 @@ PIRP Irp) { UNIMPLEMENTED + DbgBreakPoint(); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Fri Mar 27 17:30:05 2015 @@ -52,7 +52,7 @@ [DeviceRegistration] ; Kmixer swenum install HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" -HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" +;HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" ; Sysaudio swenum install HKLM,%RunOnce%,"WDM_SYSAUDIO",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_SYSAUDIO.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_SYSAUDIO%,%17%\WDMAUDIO.inf,WDM_SYSAUDIO.Interface.Install" @@ -189,7 +189,8 @@ PKEY_AudioEngine_OEMFormat = "{E4870E26-3CC5-4CD2-BA46-CA0A9A70ED04},3" WDM_WDMAUD.DeviceId = "{CD171DE3-69E5-11D2-B56D-0000F8754380}" KSCATEGORY_WDMAUD = "{3E227E76-690D-11D2-8161-0000F8775BF1}" - +WDM_KMIXER.DeviceId = "{B7EAFDC0-A680-11D0-96D8-00AA0051E51D}" +KSCATEGORY_MIXER = "{AD809C00-7B88-11D0-A5D6-28DB04C10000}" ;Localizable WDM_KMIXER.DeviceDesc = "ReactOS Wave Audio Mixer"

9 years, 9 months

[tfaber] 66920: [ACPI] - Use more sensible pool tags [NULL] - Use pool tagging

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 17:20:03 2015 New Revision: 66920 URL: http://svn.reactos.org/svn/reactos?rev=66920&view=rev Log: [ACPI] - Use more sensible pool tags [NULL] - Use pool tagging Modified: trunk/reactos/drivers/base/null/null.c trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/eval.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/osl.c trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/base/null/null.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/null/null.c?r… ============================================================================== --- trunk/reactos/drivers/base/null/null.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/null/null.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ntddk.h> +#include <wdm.h> /* FUNCTIONS *****************************************************************/ @@ -183,7 +183,9 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NullDispatch; /* Allocate the fast I/O dispatch table */ - FastIoDispatch = ExAllocatePool(NonPagedPool, sizeof(FAST_IO_DISPATCH)); + FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_IO_DISPATCH), + 'llun'); if (!FastIoDispatch) { /* Failed, cleanup */ Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -118,7 +118,7 @@ index++; temp[++index] = UNICODE_NULL; - pdoData->HardwareIDs = ExAllocatePoolWithTag(NonPagedPool, index*sizeof(WCHAR), 'IPCA'); + pdoData->HardwareIDs = ExAllocatePoolWithTag(NonPagedPool, index*sizeof(WCHAR), 'DpcA'); if (!pdoData->HardwareIDs) { Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -465,7 +465,7 @@ ULONG_PTR TypeData = (ULONG_PTR)SystemArgument2; KIRQL OldIrql; - event = ExAllocatePoolWithTag(NonPagedPool,sizeof(struct acpi_bus_event), 'IPCA'); + event = ExAllocatePoolWithTag(NonPagedPool,sizeof(struct acpi_bus_event), 'epcA'); if (!event) return; @@ -549,7 +549,7 @@ memcpy(event, entry, sizeof(struct acpi_bus_event)); - ExFreePoolWithTag(entry, 'IPCA'); + ExFreePoolWithTag(entry, 'epcA'); return_VALUE(0); } @@ -1147,7 +1147,7 @@ if (!child) return_VALUE(AE_BAD_PARAMETER); - device = ExAllocatePoolWithTag(NonPagedPool,sizeof(struct acpi_device), 'IPCA'); + device = ExAllocatePoolWithTag(NonPagedPool,sizeof(struct acpi_device), 'DpcA'); if (!device) { DPRINT1("Memory allocation error\n"); return_VALUE(-12); @@ -1263,7 +1263,7 @@ uid = info->UniqueId.String; if (info->Valid & ACPI_VALID_CID) { cid_list = &info->CompatibleIdList; - device->pnp.cid_list = ExAllocatePoolWithTag(NonPagedPool,cid_list->ListSize, 'IPCA'); + device->pnp.cid_list = ExAllocatePoolWithTag(NonPagedPool,cid_list->ListSize, 'DpcA'); if (device->pnp.cid_list) memcpy(device->pnp.cid_list, cid_list, cid_list->ListSize); else @@ -1326,7 +1326,7 @@ } if (hid) { - device->pnp.hardware_id = ExAllocatePoolWithTag(NonPagedPool, strlen(hid) + 1, 'IPCA'); + device->pnp.hardware_id = ExAllocatePoolWithTag(NonPagedPool, strlen(hid) + 1, 'DpcA'); if (device->pnp.hardware_id) { snprintf(device->pnp.hardware_id, strlen(hid) + 1, "%s", hid); device->flags.hardware_id = 1; @@ -1435,12 +1435,12 @@ end: if (result) { if (device->pnp.cid_list) { - ExFreePoolWithTag(device->pnp.cid_list, 'IPCA'); + ExFreePoolWithTag(device->pnp.cid_list, 'DpcA'); } if (device->pnp.hardware_id) { - ExFreePoolWithTag(device->pnp.hardware_id, 'IPCA'); + ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA'); } - ExFreePoolWithTag(device, 'IPCA'); + ExFreePoolWithTag(device, 'DpcA'); return_VALUE(result); } *child = device; @@ -1461,13 +1461,13 @@ acpi_device_unregister(device); if (device->pnp.cid_list) - ExFreePoolWithTag(device->pnp.cid_list, 'IPCA'); + ExFreePoolWithTag(device->pnp.cid_list, 'DpcA'); if (device->pnp.hardware_id) - ExFreePoolWithTag(device->pnp.hardware_id, 'IPCA'); + ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA'); if (device) - ExFreePoolWithTag(device, 'IPCA'); + ExFreePoolWithTag(device, 'DpcA'); return_VALUE(0); } Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -472,7 +472,7 @@ NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); - buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); + buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); if (!buffer) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -511,7 +511,7 @@ NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); - buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof (WCHAR), 'IPCA'); + buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); if (!buffer) { status = STATUS_INSUFFICIENT_RESOURCES; break; @@ -577,7 +577,7 @@ NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); - buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); + buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); if (!buffer) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -648,7 +648,7 @@ NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); - buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); + buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); if (!buffer) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -757,7 +757,7 @@ else Temp = L"Other ACPI device"; - Buffer = ExAllocatePoolWithTag (PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IPCA'); + Buffer = ExAllocatePoolWithTag(PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IpcA'); if (!Buffer) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -833,7 +833,7 @@ DPRINT("Found PCI root hub: %d\n", BusNumber); ResourceListSize = sizeof(CM_RESOURCE_LIST); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'IPCA'); + ResourceList = ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'RpcA'); if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; @@ -863,7 +863,7 @@ return Irp->IoStatus.Status; } - Buffer.Pointer = ExAllocatePoolWithTag(PagedPool, Buffer.Length, 'IPCA'); + Buffer.Pointer = ExAllocatePoolWithTag(PagedPool, Buffer.Length, 'BpcA'); if (!Buffer.Pointer) return STATUS_INSUFFICIENT_RESOURCES; @@ -932,11 +932,11 @@ /* Allocate memory */ ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'IPCA'); + ResourceList = ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'RpcA'); if (!ResourceList) { - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + ExFreePoolWithTag(Buffer.Pointer, 'BpcA'); return STATUS_INSUFFICIENT_RESOURCES; } ResourceList->Count = 1; @@ -1282,7 +1282,7 @@ resource = ACPI_NEXT_RESOURCE(resource); } - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + ExFreePoolWithTag(Buffer.Pointer, 'BpcA'); Irp->IoStatus.Information = (ULONG_PTR)ResourceList; return STATUS_SUCCESS; } @@ -1335,7 +1335,7 @@ break; } - Buffer.Pointer = ExAllocatePoolWithTag(PagedPool, Buffer.Length, 'IPCA'); + Buffer.Pointer = ExAllocatePoolWithTag(PagedPool, Buffer.Length, 'BpcA'); if (!Buffer.Pointer) return STATUS_INSUFFICIENT_RESOURCES; @@ -1405,11 +1405,11 @@ } RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); - RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePoolWithTag(PagedPool, RequirementsListSize, 'IPCA'); + RequirementsList = ExAllocatePoolWithTag(PagedPool, RequirementsListSize, 'RpcA'); if (!RequirementsList) { - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + ExFreePoolWithTag(Buffer.Pointer, 'BpcA'); return STATUS_INSUFFICIENT_RESOURCES; } RequirementsList->ListSize = RequirementsListSize; @@ -1781,7 +1781,7 @@ } resource = ACPI_NEXT_RESOURCE(resource); } - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + ExFreePoolWithTag(Buffer.Pointer, 'BpcA'); Irp->IoStatus.Information = (ULONG_PTR)RequirementsList; @@ -1846,10 +1846,9 @@ ASSERTMSG("Someone above is handling TargetDeviceRelation", !deviceRelations); } - deviceRelations = (PDEVICE_RELATIONS) - ExAllocatePoolWithTag (PagedPool, - sizeof(DEVICE_RELATIONS), - 'IPCA'); + deviceRelations = ExAllocatePoolWithTag(PagedPool, + sizeof(DEVICE_RELATIONS), + 'IpcA'); if (!deviceRelations) { status = STATUS_INSUFFICIENT_RESOURCES; break; @@ -1908,8 +1907,9 @@ PAGED_CODE (); - busInfo = ExAllocatePoolWithTag (PagedPool, sizeof(PNP_BUS_INFORMATION), - 'IPCA'); + busInfo = ExAllocatePoolWithTag(PagedPool, + sizeof(PNP_BUS_INFORMATION), + 'IpcA'); if (busInfo == NULL) { return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -40,7 +40,7 @@ ParamList.Count = 1; - ParamList.Pointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_OBJECT), 'IPCA'); + ParamList.Pointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_OBJECT), 'OpcA'); if (!ParamList.Pointer) return STATUS_INSUFFICIENT_RESOURCES; ParamList.Pointer[0].Type = ACPI_TYPE_INTEGER; @@ -55,7 +55,7 @@ ParamList.Count = 1; - ParamList.Pointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_OBJECT), 'IPCA'); + ParamList.Pointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_OBJECT), 'OpcA'); if (!ParamList.Pointer) return STATUS_INSUFFICIENT_RESOURCES; ParamList.Pointer[0].String.Pointer = (CHAR*)SimpleStr->String; @@ -73,7 +73,7 @@ &RetBuff); if (ParamList.Count != 0) - ExFreePoolWithTag(ParamList.Pointer, 'IPCA'); + ExFreePoolWithTag(ParamList.Pointer, 'OpcA'); if (ACPI_SUCCESS(Status)) { @@ -114,7 +114,7 @@ ExtraParamLength = 0; OutputBuf = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + - ExtraParamLength, 'IPCA'); + ExtraParamLength, 'BpcA'); if (!OutputBuf) return STATUS_INSUFFICIENT_RESOURCES; OutputBuf->Signature = ACPI_EVAL_OUTPUT_BUFFER_SIGNATURE; @@ -150,12 +150,12 @@ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, OutputBuf, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + ExtraParamLength); Irp->IoStatus.Information = sizeof(ACPI_EVAL_OUTPUT_BUFFER) + ExtraParamLength; - ExFreePoolWithTag(OutputBuf, 'IPCA'); + ExFreePoolWithTag(OutputBuf, 'BpcA'); return STATUS_SUCCESS; } else { - ExFreePoolWithTag(OutputBuf, 'IPCA'); + ExFreePoolWithTag(OutputBuf, 'BpcA'); return STATUS_BUFFER_TOO_SMALL; } } Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -123,8 +123,7 @@ goto End; } - deviceName = ExAllocatePoolWithTag (NonPagedPool, - nameLength, 'IPCA'); + deviceName = ExAllocatePoolWithTag(NonPagedPool, nameLength, 'MpcA'); if (NULL == deviceName) { DPRINT1("AddDevice: no memory to alloc for deviceName(0x%x)\n", nameLength); @@ -160,7 +159,7 @@ End: if (deviceName){ - ExFreePoolWithTag(deviceName, 'IPCA'); + ExFreePoolWithTag(deviceName, 'MpcA'); } if (!NT_SUCCESS(status) && deviceObject){ if (deviceData && deviceData->NextLowerDriver){ @@ -376,7 +375,7 @@ BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); /* Allocate memory for the value */ - ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferLength, 'IPCA'); + ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferLength, 'MpcA'); if (ValueInfo == NULL) return STATUS_NO_MEMORY; } @@ -436,7 +435,7 @@ /* Free the memory and return status */ if (ValueInfo != NULL) { - ExFreePoolWithTag(ValueInfo, 'IPCA'); + ExFreePoolWithTag(ValueInfo, 'MpcA'); } return Status; @@ -487,7 +486,7 @@ /* Allocate a buffer large enough to be zero terminated */ Length += sizeof(UNICODE_NULL); - ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IpcA'); if (ProcessorIdentifier == NULL) { DPRINT1("Failed to allocate 0x%lx bytes\n", Length); @@ -522,7 +521,7 @@ /* Allocate a buffer large enough to be zero terminated */ Length += sizeof(UNICODE_NULL); - ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IpcA'); if (ProcessorNameString == NULL) { DPRINT1("Failed to allocate 0x%lx bytes\n", Length); @@ -557,7 +556,7 @@ /* Allocate a buffer large enough to be zero terminated */ Length += sizeof(UNICODE_NULL); - ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); + ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IpcA'); if (ProcessorVendorIdentifier == NULL) { DPRINT1("Failed to allocate 0x%lx bytes\n", Length); @@ -617,7 +616,7 @@ 1) * sizeof(WCHAR); /* Allocate a buffer to the data */ - HardwareIdsBuffer = ExAllocatePoolWithTag(PagedPool, HardwareIdsLength, 'IPCA'); + HardwareIdsBuffer = ExAllocatePoolWithTag(PagedPool, HardwareIdsLength, 'IpcA'); if (HardwareIdsBuffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -656,15 +655,15 @@ ZwClose(ProcessorHandle); if (ProcessorIdentifier != NULL) - ExFreePoolWithTag(ProcessorIdentifier, 'IPCA'); + ExFreePoolWithTag(ProcessorIdentifier, 'IpcA'); if (ProcessorVendorIdentifier != NULL) - ExFreePoolWithTag(ProcessorVendorIdentifier, 'IPCA'); + ExFreePoolWithTag(ProcessorVendorIdentifier, 'IpcA'); if (!NT_SUCCESS(Status)) { if (HardwareIdsBuffer != NULL) - ExFreePoolWithTag(HardwareIdsBuffer, 'IPCA'); + ExFreePoolWithTag(HardwareIdsBuffer, 'IpcA'); } return Status; Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -162,7 +162,7 @@ AcpiOsAllocate (ACPI_SIZE size) { DPRINT("AcpiOsAllocate size %d\n",size); - return ExAllocatePoolWithTag(NonPagedPool, size, 'IPCA'); + return ExAllocatePoolWithTag(NonPagedPool, size, 'ipcA'); } void @@ -170,7 +170,7 @@ { if (!ptr) DPRINT1("Attempt to free null pointer!!!\n"); - ExFreePoolWithTag(ptr, 'IPCA'); + ExFreePoolWithTag(ptr, 'ipcA'); } BOOLEAN @@ -281,7 +281,7 @@ return AE_BAD_PARAMETER; } - Mutex = ExAllocatePool(NonPagedPool, sizeof(FAST_MUTEX)); + Mutex = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), 'LpcA'); if (!Mutex) return AE_NO_MEMORY; ExInitializeFastMutex(Mutex); @@ -301,7 +301,7 @@ return; } - ExFreePool(Handle); + ExFreePoolWithTag(Handle, 'LpcA'); } ACPI_STATUS @@ -364,7 +364,7 @@ return AE_BAD_PARAMETER; } - Sem = ExAllocatePool(NonPagedPool, sizeof(ACPI_SEM)); + Sem = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_SEM), 'LpcA'); if (!Sem) return AE_NO_MEMORY; Sem->CurrentUnits = InitialUnits; @@ -386,7 +386,7 @@ return AE_BAD_PARAMETER; } - ExFreePool(Handle); + ExFreePoolWithTag(Handle, 'LpcA'); return AE_OK; } @@ -473,7 +473,7 @@ return AE_BAD_PARAMETER; } - SpinLock = ExAllocatePool(NonPagedPool, sizeof(KSPIN_LOCK)); + SpinLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(KSPIN_LOCK), 'LpcA'); if (!SpinLock) return AE_NO_MEMORY; KeInitializeSpinLock(SpinLock); @@ -493,7 +493,7 @@ return; } - ExFreePool(Handle); + ExFreePoolWithTag(Handle, 'LpcA'); } ACPI_CPU_FLAGS Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Fri Mar 27 17:20:03 2015 @@ -188,8 +188,7 @@ length = sizeof(DEVICE_RELATIONS) + (((numPdosPresent + prevcount) - 1) * sizeof (PDEVICE_OBJECT)); - relations = (PDEVICE_RELATIONS) ExAllocatePoolWithTag (PagedPool, - length, 'IPCA'); + relations = ExAllocatePoolWithTag(PagedPool, length, 'IpcA'); if (NULL == relations) { // @@ -237,7 +236,7 @@ // one. // if (oldRelations) { - ExFreePool (oldRelations); + ExFreePoolWithTag(oldRelations, 0); } Irp->IoStatus.Information = (ULONG_PTR) relations; @@ -399,7 +398,7 @@ // if (PdoData->HardwareIDs) { - ExFreePoolWithTag (PdoData->HardwareIDs, 'IPCA'); + ExFreePoolWithTag(PdoData->HardwareIDs, 'DpcA'); PdoData->HardwareIDs = NULL; }

9 years, 9 months

[tfaber] 66919: [VMWINST] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 15:44:32 2015 New Revision: 66919 URL: http://svn.reactos.org/svn/reactos?rev=66919&view=rev Log: [VMWINST] - Fix build Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Fri Mar 27 15:44:32 2015 @@ -37,10 +37,6 @@ #include <debug.h> #include "vmwinst.h" - -extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, - PCWSTR CmdLineBuffer, INT nCmdShow); - HINSTANCE hAppInstance; BOOL StartVMwConfigWizard, DriverFilesFound, ActivateVBE = FALSE, UninstallDriver = FALSE;

9 years, 9 months

[cwittich] 66918: [INF] add a dummy inf file for wmiacpi driver

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Mar 27 15:43:19 2015 New Revision: 66918 URL: http://svn.reactos.org/svn/reactos?rev=66918&view=rev Log: [INF] add a dummy inf file for wmiacpi driver Added: trunk/reactos/media/inf/wmiacpi.inf (with props) Modified: trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Fri Mar 27 15:43:19 2015 @@ -36,6 +36,7 @@ usbport.inf usbstor.inf wdmaudio.inf + wmiacpi.inf xboxdisp.inf) list(APPEND UTF8_INF_FILES Added: trunk/reactos/media/inf/wmiacpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wmiacpi.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/wmiacpi.inf (added) +++ trunk/reactos/media/inf/wmiacpi.inf [iso-8859-1] Fri Mar 27 15:43:19 2015 @@ -0,0 +1,45 @@ +ï»¿; ACPI.INF + +; Installation file for WMIACPI driver + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = System +ClassGUID = {4D36E97D-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 03/26/2015,1.00.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%*PNP0C14.DeviceDesc% = NO_DRV,,*PNP0C14 + +;------------------- WE DO NOT HAVE WMIACPI.SYS YET--------------------- + +[NO_DRV] + +[NO_DRV.Services] +AddService = , 0x00000002 + +[NO_DRV.HW] + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +GenericMfg = "(Generic system devices)" +*PNP0C14.DeviceDesc = "WMI for ACPI" + +[Strings.0405] +GenericMfg = "(GenerickÃ¡ systÃ©movÃ¡ zaÅÃzenÃ)" + +[Strings.0407] +GenericMfg = "(Generische SystemgerÃ¤te)" +*PNP0C14.DeviceDesc = "WMI fÃ¼r ACPI" Propchange: trunk/reactos/media/inf/wmiacpi.inf ------------------------------------------------------------------------------ svn:eol-style = CRLF

9 years, 9 months

[tfaber] 66917: [PSDK] - Add InstallHinfSection definitions

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 15:30:22 2015 New Revision: 66917 URL: http://svn.reactos.org/svn/reactos?rev=66917&view=rev Log: [PSDK] - Add InstallHinfSection definitions Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Fri Mar 27 15:30:22 2015 @@ -1169,6 +1169,8 @@ WINSETUPAPI BOOL WINAPI DoesUserHavePrivilege(PCWSTR); WINSETUPAPI BOOL WINAPI FileExists(PCWSTR, PWIN32_FIND_DATAW); WINSETUPAPI DWORD WINAPI GetSetFileTimestamp(PCWSTR, PFILETIME, PFILETIME, PFILETIME, BOOLEAN); +WINSETUPAPI VOID WINAPI InstallHinfSectionA(_In_ HWND, _In_ HINSTANCE, _In_ PCSTR, _In_ INT); +WINSETUPAPI VOID WINAPI InstallHinfSectionW(_In_ HWND, _In_ HINSTANCE, _In_ PCWSTR, _In_ INT); WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID); WINSETUPAPI VOID WINAPI MyFree(PVOID); WINSETUPAPI PVOID WINAPI MyMalloc(DWORD); @@ -2426,6 +2428,7 @@ #ifdef UNICODE #define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_W +#define InstallHinfSection InstallHinfSectionW #define SetupAddInstallSectionToDiskSpaceList SetupAddInstallSectionToDiskSpaceListW #define SetupAddSectionToDiskSpaceList SetupAddSectionToDiskSpaceListW #define SetupAddToDiskSpaceList SetupAddToDiskSpaceListW @@ -2548,6 +2551,7 @@ #define SetupUninstallOEMInf SetupUninstallOEMInfW #else #define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_A +#define InstallHinfSection InstallHinfSectionA #define SetupAddInstallSectionToDiskSpaceList SetupAddInstallSectionToDiskSpaceListA #define SetupAddSectionToDiskSpaceList SetupAddSectionToDiskSpaceListA #define SetupAddToDiskSpaceList SetupAddToDiskSpaceListA

9 years, 9 months

[tfaber] 66916: [PSDK] - Add NotifyServiceStatusChange definitions

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 14:29:43 2015 New Revision: 66916 URL: http://svn.reactos.org/svn/reactos?rev=66916&view=rev Log: [PSDK] - Add NotifyServiceStatusChange definitions Modified: trunk/reactos/include/psdk/winsvc.h Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Fri Mar 27 14:29:43 2015 @@ -72,6 +72,21 @@ #define SERVICE_CONFIG_TRIGGER_INFO 8 #define SERVICE_CONFIG_PREFERRED_NODE 9 #define SERVICE_CONFIG_RUNLEVEL_INFO 10 + +#define SERVICE_NOTIFY_STATUS_CHANGE_1 1 +#define SERVICE_NOTIFY_STATUS_CHANGE_2 2 +#define SERVICE_NOTIFY_STATUS_CHANGE SERVICE_NOTIFY_STATUS_CHANGE_2 + +#define SERVICE_NOTIFY_STOPPED 1 +#define SERVICE_NOTIFY_START_PENDING 2 +#define SERVICE_NOTIFY_STOP_PENDING 4 +#define SERVICE_NOTIFY_RUNNING 8 +#define SERVICE_NOTIFY_CONTINUE_PENDING 16 +#define SERVICE_NOTIFY_PAUSE_PENDING 32 +#define SERVICE_NOTIFY_PAUSED 64 +#define SERVICE_NOTIFY_CREATED 128 +#define SERVICE_NOTIFY_DELETED 256 +#define SERVICE_NOTIFY_DELETE_PENDING 512 #ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_ #define _SERVICE_PRESHUTDOWN_INFO_DEFINED_ @@ -213,6 +228,35 @@ LPWSTR pmszRequiredPrivileges; } SERVICE_REQUIRED_PRIVILEGES_INFOW, *LPSERVICE_REQUIRED_PRIVILEGES_INFOW; +typedef VOID (CALLBACK *PFN_SC_NOTIFY_CALLBACK)(_In_ PVOID); +typedef struct _SERVICE_NOTIFY_1 { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + PVOID pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; +} SERVICE_NOTIFY_1, *PSERVICE_NOTIFY_1; +typedef struct _SERVICE_NOTIFY_2A { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + PVOID pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + LPSTR pszServiceNames; +} SERVICE_NOTIFY_2A, *PSERVICE_NOTIFY_2A; +typedef struct _SERVICE_NOTIFY_2W { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + PVOID pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + LPWSTR pszServiceNames; +} SERVICE_NOTIFY_2W, *PSERVICE_NOTIFY_2W; +typedef SERVICE_NOTIFY_2A SERVICE_NOTIFYA, *PSERVICE_NOTIFYA; +typedef SERVICE_NOTIFY_2W SERVICE_NOTIFYW, *PSERVICE_NOTIFYW; + BOOL WINAPI ChangeServiceConfigA(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Out_opt_ LPDWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); BOOL WINAPI ChangeServiceConfigW(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Out_opt_ LPDWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); BOOL WINAPI ChangeServiceConfig2A(_In_ SC_HANDLE, _In_ DWORD, _In_opt_ LPVOID); @@ -343,6 +387,11 @@ _Must_inspect_result_ SC_HANDLE WINAPI OpenSCManagerW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD); _Must_inspect_result_ SC_HANDLE WINAPI OpenServiceA(_In_ SC_HANDLE, _In_ LPCSTR, _In_ DWORD); _Must_inspect_result_ SC_HANDLE WINAPI OpenServiceW(_In_ SC_HANDLE, _In_ LPCWSTR, _In_ DWORD); + +#if (NTDDI_VERSION >= NTDDI_VISTA) +DWORD WINAPI NotifyServiceStatusChangeA(_In_ SC_HANDLE, _In_ DWORD, _In_ PSERVICE_NOTIFYA); +DWORD WINAPI NotifyServiceStatusChangeW(_In_ SC_HANDLE, _In_ DWORD, _In_ PSERVICE_NOTIFYW); +#endif _Must_inspect_result_ BOOL @@ -467,6 +516,10 @@ typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS; typedef SERVICE_REQUIRED_PRIVILEGES_INFOW SERVICE_REQUIRED_PRIVILEGES_INFO; typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOW LPSERVICE_REQUIRED_PRIVILEGES_INFO; +typedef SERVICE_NOTIFY_2W SERVICE_NOTIFY_2; +typedef PSERVICE_NOTIFY_2W PSERVICE_NOTIFY_2; +typedef SERVICE_NOTIFYW SERVICE_NOTIFY; +typedef PSERVICE_NOTIFYW PSERVICE_NOTIFY; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW @@ -478,6 +531,9 @@ #define EnumServicesStatusEx EnumServicesStatusExW #define GetServiceDisplayName GetServiceDisplayNameW #define GetServiceKeyName GetServiceKeyNameW +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NotifyServiceStatusChange NotifyServiceStatusChangeW +#endif #define OpenSCManager OpenSCManagerW #define OpenService OpenServiceW #define QueryServiceConfig QueryServiceConfigW @@ -501,6 +557,10 @@ typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS; typedef SERVICE_REQUIRED_PRIVILEGES_INFOA SERVICE_REQUIRED_PRIVILEGES_INFO; typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOA LPSERVICE_REQUIRED_PRIVILEGES_INFO; +typedef SERVICE_NOTIFY_2A SERVICE_NOTIFY_2; +typedef PSERVICE_NOTIFY_2A PSERVICE_NOTIFY_2; +typedef SERVICE_NOTIFYA SERVICE_NOTIFY; +typedef PSERVICE_NOTIFYA PSERVICE_NOTIFY; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA @@ -514,6 +574,9 @@ #define GetServiceKeyName GetServiceKeyNameA #define OpenSCManager OpenSCManagerA #define OpenService OpenServiceA +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NotifyServiceStatusChange NotifyServiceStatusChangeA +#endif #define QueryServiceConfig QueryServiceConfigA #define QueryServiceConfig2 QueryServiceConfig2A #define QueryServiceLockStatus QueryServiceLockStatusA

9 years, 9 months

[tfaber] 66915: [KERNEL32] - Addendum to r66912 and Romanian translation update by Ștefan Fulea CORE-9429 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 13:29:59 2015 New Revision: 66915 URL: http://svn.reactos.org/svn/reactos?rev=66915&view=rev Log: [KERNEL32] - Addendum to r66912 and Romanian translation update by Ștefan Fulea CORE-9429 #resolve Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -319,8 +319,8 @@ 203+NLSRC_OFFSET "Rusia" 204+NLSRC_OFFSET "Rwanda" 205+NLSRC_OFFSET "SauditÄ, Arabia" - 206+NLSRC_OFFSET "St. Pierre Èi Miquelon" - 207+NLSRC_OFFSET "St. Cristofor Èi Nevis" + 206+NLSRC_OFFSET "Sf. Pierre Èi Miquelon" + 207+NLSRC_OFFSET "Sf. Cristofor Èi Nevis" 208+NLSRC_OFFSET "Seychelles" 209+NLSRC_OFFSET "Sud, Africa de" 210+NLSRC_OFFSET "Senegal" @@ -330,7 +330,7 @@ 215+NLSRC_OFFSET "Singapore" 216+NLSRC_OFFSET "Somalia" 217+NLSRC_OFFSET "Spania" - 218+NLSRC_OFFSET "St. Lucia" + 218+NLSRC_OFFSET "Sf. Lucia" 219+NLSRC_OFFSET "Sudan" 220+NLSRC_OFFSET "Svalbard" 221+NLSRC_OFFSET "Suedia" @@ -356,7 +356,7 @@ 245+NLSRC_OFFSET "Burkina Faso" 246+NLSRC_OFFSET "Uruguay" 247+NLSRC_OFFSET "Uzbekistan" - 248+NLSRC_OFFSET "St. VicenÈiu Èi Grenadine" + 248+NLSRC_OFFSET "Sf. VicenÈiu Èi Grenadine" 249+NLSRC_OFFSET "Venezuela" 251+NLSRC_OFFSET "Vietnam" 252+NLSRC_OFFSET "Virgine, Insulele" @@ -415,7 +415,7 @@ 340+NLSRC_OFFSET "Rota, Insula" 341+NLSRC_OFFSET "Saipan" 342+NLSRC_OFFSET "Georgia de Sud Èi Insulele Sandwich de Sud" - 343+NLSRC_OFFSET "St. Elena, Insula" + 343+NLSRC_OFFSET "Sf. Elena, Insula" 346+NLSRC_OFFSET "Tinian, Insula" 347+NLSRC_OFFSET "Tokelau, Atolii" 348+NLSRC_OFFSET "Tristan da Cunha" @@ -427,4 +427,8 @@ 21242+NLSRC_OFFSET "Midway, Atolul" 30967+NLSRC_OFFSET "Sint Maarten (partea ÈÄrilor de Jos)" 31706+NLSRC_OFFSET "Saint Martin (partea FrancezÄ)" + (7299303+NLSRC_OFFSET)&0xffff "Timor-Leste, Republica DemocratÄ" + (10028789+NLSRC_OFFSET)&0xffff "Ãland, Insulele" + (161832015+NLSRC_OFFSET)&0xffff "Sf. Bartolomeu" + (161832256+NLSRC_OFFSET)&0xffff "Minore ÃndepÄrtate ale SUA, Insulele" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -426,4 +426,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc [iso-8859-1] Fri Mar 27 13:29:59 2015 @@ -425,4 +425,8 @@ 21242+NLSRC_OFFSET "Midway Islands" 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" 31706+NLSRC_OFFSET "Saint Martin (French part)" + (7299303+NLSRC_OFFSET)&0xffff "Democratic Republic of Timor-Leste" + (10028789+NLSRC_OFFSET)&0xffff "Ãland Islands" + (161832015+NLSRC_OFFSET)&0xffff "Saint-BarthÃ©lemy" + (161832256+NLSRC_OFFSET)&0xffff "U.S. Minor Outlying Islands" END

9 years, 9 months

[tfaber] 66914: [SYSSETUP] - Move the hotkey loop to its own thread to make it work when modal dialogs are open, and also during device installation CORE-9428

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 27 11:44:59 2015 New Revision: 66914 URL: http://svn.reactos.org/svn/reactos?rev=66914&view=rev Log: [SYSSETUP] - Move the hotkey loop to its own thread to make it work when modal dialogs are open, and also during device installation CORE-9428 Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Fri Mar 27 11:44:59 2015 @@ -763,7 +763,7 @@ if (!CommonInstall()) goto error; - + /* Register components */ _SEH2_TRY { @@ -782,7 +782,7 @@ DPRINT1("Catching exception\n"); } _SEH2_END; - + SetupCloseInfFile(hSysSetupInf); /* Run the shell */ @@ -911,6 +911,53 @@ return ret; } +static DWORD CALLBACK +HotkeyThread(LPVOID Parameter) +{ + ATOM hotkey; + MSG msg; + + DPRINT("HotkeyThread start\n"); + + hotkey = GlobalAddAtomW(L"Setup Shift+F10 Hotkey"); + + if (!RegisterHotKey(NULL, hotkey, MOD_SHIFT, VK_F10)) + DPRINT1("RegisterHotKey failed with %lu\n", GetLastError()); + + while (GetMessage(&msg, NULL, 0, 0)) + { + if (msg.hwnd == NULL && msg.message == WM_HOTKEY && msg.wParam == hotkey) + { + STARTUPINFOW si = { sizeof(si) }; + PROCESS_INFORMATION pi; + + if (CreateProcessW(L"cmd.exe", + NULL, + NULL, + NULL, + FALSE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &si, + &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + else + { + DPRINT1("Failed to launch command prompt: %lu\n", GetLastError()); + } + } + } + + UnregisterHotKey(NULL, hotkey); + GlobalDeleteAtom(hotkey); + + DPRINT("HotkeyThread terminate\n"); + return 0; +} DWORD WINAPI InstallReactOS(HINSTANCE hInstance) @@ -920,6 +967,7 @@ TOKEN_PRIVILEGES privs; HKEY hKey; HINF hShortcutsInf; + HANDLE hHotkeyThread; BOOL ret; InitializeSetupActionLog(FALSE); @@ -964,6 +1012,8 @@ CreateDirectory(szBuffer, NULL); } + hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL); + /* Hack: Install TCP/IP protocol driver */ ret = InstallInfSection(NULL, L"nettcpip.inf", @@ -973,7 +1023,7 @@ { DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); } - else + else { /* Start the TCP/IP protocol driver */ SetupStartService(L"Tcpip", FALSE); @@ -993,7 +1043,7 @@ NULL, INF_STYLE_WIN4, NULL); - if (hShortcutsInf == INVALID_HANDLE_VALUE) + if (hShortcutsInf == INVALID_HANDLE_VALUE) { FatalError("Failed to open shortcuts.inf"); return 0; @@ -1045,6 +1095,12 @@ SetupCloseInfFile(hSysSetupInf); SetSetupType(0); + if (hHotkeyThread) + { + PostThreadMessage(GetThreadId(hHotkeyThread), WM_QUIT, 0, 0); + CloseHandle(hHotkeyThread); + } + LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); TerminateSetupActionLog(); Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Mar 27 11:44:59 2015 @@ -2317,7 +2317,6 @@ UINT nPages = 0; HWND hWnd; MSG msg; - ATOM hotkey; /* Clear setup data */ ZeroMemory(&SetupData, sizeof(SETUPDATA)); @@ -2409,43 +2408,14 @@ hWnd = (HWND)PropertySheet(&psh); ShowWindow(hWnd, SW_SHOW); - hotkey = GlobalAddAtomW(L"Setup Shift+F10 Hotkey"); - if (!RegisterHotKey(NULL, hotkey, MOD_SHIFT, VK_F10)) - DPRINT1("RegisterHotKey failed with %lu\n", GetLastError()); while (GetMessage(&msg, NULL, 0, 0)) { - if (msg.hwnd == NULL && msg.message == WM_HOTKEY && msg.wParam == hotkey) - { - STARTUPINFOW si = { sizeof(si) }; - PROCESS_INFORMATION pi; - - if (CreateProcessW(L"cmd.exe", - NULL, - NULL, - NULL, - FALSE, - CREATE_NEW_CONSOLE, - NULL, - NULL, - &si, - &pi)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - else - { - DPRINT1("Failed to launch command prompt: %lu\n", GetLastError()); - } - } - else if (!IsDialogMessage(hWnd, &msg)) + if (!IsDialogMessage(hWnd, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); } } - UnregisterHotKey(NULL, hotkey); - GlobalDeleteAtom(hotkey); DeleteObject(SetupData.hTitleFont); }

9 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015