Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 64313: [NTFS] - Import structures and defines from FreeLdr NTFS driver header - Import lot of code from FreeLdr NTFS driver to handle MFT & attributes - Remove code that has been over...
by pschweitzer＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: pschweitzer Date: Fri Sep 26 13:57:29 2014 New Revision: 64313 URL: http://svn.reactos.org/svn/reactos?rev=64313&view=rev Log: [NTFS] - Import structures and defines from FreeLdr NTFS driver header - Import lot of code from FreeLdr NTFS driver to handle MFT & attributes - Remove code that has been overtaken by FreeLdr code - Adapt & port code from FreeLdr (allocation, status, data structures) - Adapt old code to the new functions defined from FreeLdr code - Open the MFT during volume mount and keep in VCB for further use - Implement a function to lookup a file in the MFT given its full path Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Fri Sep 26 13:57:29 2014 @@ -33,127 +33,106 @@ /* FUNCTIONS ****************************************************************/ -static -ULONG -RunLength(PUCHAR run) -{ - return(*run & 0x0f) + ((*run >> 4) & 0x0f) + 1; -} - - -static -LONGLONG -RunLCN(PUCHAR run) -{ - UCHAR n1 = *run & 0x0f; - UCHAR n2 = (*run >> 4) & 0x0f; - LONGLONG lcn = (n2 == 0) ? 0 : (CHAR)(run[n1 + n2]); - LONG i = 0; - - for (i = n1 +n2 - 1; i > n1; i--) - lcn = (lcn << 8) + run[i]; - return lcn; -} - - -static -ULONGLONG -RunCount(PUCHAR run) -{ - UCHAR n = *run & 0xf; - ULONGLONG count = 0; - ULONG i = 0; - - for (i = n; i > 0; i--) - count = (count << 8) + run[i]; - return count; -} - +PUCHAR +DecodeRun(PUCHAR DataRun, + LONGLONG *DataRunOffset, + ULONGLONG *DataRunLength) +{ + UCHAR DataRunOffsetSize; + UCHAR DataRunLengthSize; + CHAR i; + + DataRunOffsetSize = (*DataRun >> 4) & 0xF; + DataRunLengthSize = *DataRun & 0xF; + *DataRunOffset = 0; + *DataRunLength = 0; + DataRun++; + for (i = 0; i < DataRunLengthSize; i++) + { + *DataRunLength += ((ULONG64)*DataRun) << (i * 8); + DataRun++; + } + + /* NTFS 3+ sparse files */ + if (DataRunOffsetSize == 0) + { + *DataRunOffset = -1; + } + else + { + for (i = 0; i < DataRunOffsetSize - 1; i++) + { + *DataRunOffset += ((ULONG64)*DataRun) << (i * 8); + DataRun++; + } + /* The last byte contains sign so we must process it different way. */ + *DataRunOffset = ((LONG64)(CHAR)(*(DataRun++)) << (i * 8)) + *DataRunOffset; + } + + DPRINT("DataRunOffsetSize: %x\n", DataRunOffsetSize); + DPRINT("DataRunLengthSize: %x\n", DataRunLengthSize); + DPRINT("DataRunOffset: %x\n", *DataRunOffset); + DPRINT("DataRunLength: %x\n", *DataRunLength); + + return DataRun; +} BOOLEAN -FindRun(PNONRESIDENT_ATTRIBUTE NresAttr, +FindRun(PNTFS_ATTR_RECORD NresAttr, ULONGLONG vcn, PULONGLONG lcn, PULONGLONG count) { - PUCHAR run; - ULONGLONG base = NresAttr->StartVcn; - - if (vcn < NresAttr->StartVcn || vcn > NresAttr->LastVcn) + if (vcn < NresAttr->NonResident.LowestVCN || vcn > NresAttr->NonResident.HighestVCN) return FALSE; - *lcn = 0; - - for (run = (PUCHAR)((ULONG_PTR)NresAttr + NresAttr->RunArrayOffset); - *run != 0; run += RunLength(run)) - { - *lcn += RunLCN(run); - *count = RunCount(run); - - if (base <= vcn && vcn < base + *count) - { - *lcn = (RunLCN(run) == 0) ? 0 : *lcn + vcn - base; - *count -= (ULONG)(vcn - base); - - return TRUE; - } - else - { - base += *count; - } - } - - return FALSE; -} - - -static -VOID -NtfsDumpFileNameAttribute(PATTRIBUTE Attribute) -{ - PRESIDENT_ATTRIBUTE ResAttr; + DecodeRun((PUCHAR)((ULONG_PTR)NresAttr + NresAttr->NonResident.MappingPairsOffset), (PLONGLONG)lcn, count); + + return TRUE; +} + + +static +VOID +NtfsDumpFileNameAttribute(PNTFS_ATTR_RECORD Attribute) +{ PFILENAME_ATTRIBUTE FileNameAttr; DbgPrint(" $FILE_NAME "); - ResAttr = (PRESIDENT_ATTRIBUTE)Attribute; -// DbgPrint(" Length %lu Offset %hu ", ResAttr->ValueLength, ResAttr->ValueOffset); - - FileNameAttr = (PFILENAME_ATTRIBUTE)((ULONG_PTR)ResAttr + ResAttr->ValueOffset); +// DbgPrint(" Length %lu Offset %hu ", Attribute->Resident.ValueLength, Attribute->Resident.ValueOffset); + + FileNameAttr = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); DbgPrint(" '%.*S' ", FileNameAttr->NameLength, FileNameAttr->Name); } static VOID -NtfsDumpVolumeNameAttribute(PATTRIBUTE Attribute) -{ - PRESIDENT_ATTRIBUTE ResAttr; +NtfsDumpVolumeNameAttribute(PNTFS_ATTR_RECORD Attribute) +{ PWCHAR VolumeName; DbgPrint(" $VOLUME_NAME "); - ResAttr = (PRESIDENT_ATTRIBUTE)Attribute; -// DbgPrint(" Length %lu Offset %hu ", ResAttr->ValueLength, ResAttr->ValueOffset); - - VolumeName = (PWCHAR)((ULONG_PTR)ResAttr + ResAttr->ValueOffset); - DbgPrint(" '%.*S' ", ResAttr->ValueLength / sizeof(WCHAR), VolumeName); -} - - -static -VOID -NtfsDumpVolumeInformationAttribute(PATTRIBUTE Attribute) -{ - PRESIDENT_ATTRIBUTE ResAttr; +// DbgPrint(" Length %lu Offset %hu ", Attribute->Resident.ValueLength, Attribute->Resident.ValueOffset); + + VolumeName = (PWCHAR)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + DbgPrint(" '%.*S' ", Attribute->Resident.ValueLength / sizeof(WCHAR), VolumeName); +} + + +static +VOID +NtfsDumpVolumeInformationAttribute(PNTFS_ATTR_RECORD Attribute) +{ PVOLINFO_ATTRIBUTE VolInfoAttr; DbgPrint(" $VOLUME_INFORMATION "); - ResAttr = (PRESIDENT_ATTRIBUTE)Attribute; -// DbgPrint(" Length %lu Offset %hu ", ResAttr->ValueLength, ResAttr->ValueOffset); - - VolInfoAttr = (PVOLINFO_ATTRIBUTE)((ULONG_PTR)ResAttr + ResAttr->ValueOffset); +// DbgPrint(" Length %lu Offset %hu ", Attribute->Resident.ValueLength, Attribute->Resident.ValueOffset); + + VolInfoAttr = (PVOLINFO_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); DbgPrint(" NTFS Version %u.%u Flags 0x%04hx ", VolInfoAttr->MajorVersion, VolInfoAttr->MinorVersion, @@ -163,13 +142,11 @@ static VOID -NtfsDumpIndexRootAttribute(PATTRIBUTE Attribute) -{ - PRESIDENT_ATTRIBUTE ResAttr; +NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) +{ PINDEX_ROOT_ATTRIBUTE IndexRootAttr; - ResAttr = (PRESIDENT_ATTRIBUTE)Attribute; - IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)ResAttr + ResAttr->ValueOffset); + IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); if (IndexRootAttr->AttributeType == AttributeFileName) ASSERT(IndexRootAttr->CollationRule == COLLATION_FILE_NAME); @@ -190,15 +167,14 @@ static VOID -NtfsDumpAttribute (PATTRIBUTE Attribute) -{ - PNONRESIDENT_ATTRIBUTE NresAttr; +NtfsDumpAttribute(PNTFS_ATTR_RECORD Attribute) +{ UNICODE_STRING Name; ULONGLONG lcn = 0; ULONGLONG runcount = 0; - switch (Attribute->AttributeType) + switch (Attribute->Type) { case AttributeFileName: NtfsDumpFileNameAttribute(Attribute); @@ -267,7 +243,7 @@ default: DbgPrint(" Attribute %lx ", - Attribute->AttributeType); + Attribute->Type); break; } @@ -281,16 +257,14 @@ } DbgPrint("(%s)\n", - Attribute->Nonresident ? "non-resident" : "resident"); - - if (Attribute->Nonresident) - { - NresAttr = (PNONRESIDENT_ATTRIBUTE)Attribute; - - FindRun(NresAttr,0,&lcn, &runcount); + Attribute->IsNonResident ? "non-resident" : "resident"); + + if (Attribute->IsNonResident) + { + FindRun(Attribute,0,&lcn, &runcount); DbgPrint(" AllocatedSize %I64u DataSize %I64u\n", - NresAttr->AllocatedSize, NresAttr->DataSize); + Attribute->NonResident.AllocatedSize, Attribute->NonResident.DataSize); DbgPrint(" logical clusters: %I64u - %I64u\n", lcn, lcn + runcount - 1); } @@ -300,15 +274,15 @@ VOID NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord) { - PATTRIBUTE Attribute; - - Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->AttributeType != (ATTRIBUTE_TYPE)-1) + PNTFS_ATTR_RECORD Attribute; + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != (ATTRIBUTE_TYPE)-1) { NtfsDumpAttribute(Attribute); - Attribute = (PATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Length); + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } } Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri Sep 26 13:57:29 2014 @@ -34,6 +34,8 @@ #define NDEBUG #include <debug.h> +UNICODE_STRING EmptyName = RTL_CONSTANT_STRING(L""); + /* FUNCTIONS ****************************************************************/ /* @@ -173,14 +175,14 @@ PDEVICE_EXTENSION DeviceExt) { DISK_GEOMETRY DiskGeometry; - PFILE_RECORD_HEADER MftRecord; PFILE_RECORD_HEADER VolumeRecord; PVOLINFO_ATTRIBUTE VolumeInfo; PBOOT_SECTOR BootSector; - PATTRIBUTE Attribute; ULONG Size; PNTFS_INFO NtfsInfo = &DeviceExt->NtfsInfo; NTSTATUS Status; + PNTFS_ATTR_CONTEXT AttrCtxt; + PNTFS_ATTR_RECORD Attribute; PNTFS_FCB VolumeFcb; PWSTR VolumeNameU; @@ -251,10 +253,10 @@ ExFreePool(BootSector); - MftRecord = ExAllocatePoolWithTag(NonPagedPool, - NtfsInfo->BytesPerFileRecord, - TAG_NTFS); - if (MftRecord == NULL) + DeviceExt->MasterFileTable = ExAllocatePoolWithTag(NonPagedPool, + NtfsInfo->BytesPerFileRecord, + TAG_NTFS); + if (DeviceExt->MasterFileTable == NULL) { return STATUS_INSUFFICIENT_RESOURCES; } @@ -263,11 +265,20 @@ NtfsInfo->MftStart.u.LowPart * NtfsInfo->SectorsPerCluster, NtfsInfo->BytesPerFileRecord / NtfsInfo->BytesPerSector, NtfsInfo->BytesPerSector, - (PVOID)MftRecord, + (PVOID)DeviceExt->MasterFileTable, TRUE); if (!NT_SUCCESS(Status)) { - ExFreePool(MftRecord); + DPRINT1("Failed reading MFT.\n"); + ExFreePool(DeviceExt->MasterFileTable); + return Status; + } + + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, &EmptyName, &DeviceExt->MFTContext); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't find data attribute for Master File Table.\n"); + ExFreePool(DeviceExt->MasterFileTable); return Status; } @@ -276,40 +287,41 @@ TAG_NTFS); if (VolumeRecord == NULL) { - ExFreePool(MftRecord); + DPRINT1("Allocation failed for volume record\n"); + ExFreePool(DeviceExt->MasterFileTable); return STATUS_INSUFFICIENT_RESOURCES; } /* Read Volume File (MFT index 3) */ DeviceExt->StorageDevice = DeviceObject; Status = ReadFileRecord(DeviceExt, - 3, - VolumeRecord, - MftRecord); - if (!NT_SUCCESS(Status)) - { + NTFS_FILE_VOLUME, + VolumeRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed reading volume file\n"); ExFreePool(VolumeRecord); - ExFreePool(MftRecord); + ExFreePool(DeviceExt->MasterFileTable); return Status; } /* Enumerate attributes */ - NtfsDumpFileAttributes (MftRecord); + NtfsDumpFileAttributes(DeviceExt->MasterFileTable); /* Enumerate attributes */ - NtfsDumpFileAttributes (VolumeRecord); + NtfsDumpFileAttributes(VolumeRecord); /* Get volume name */ - Attribute = FindAttribute (VolumeRecord, AttributeVolumeName, NULL); - DPRINT("Attribute %p\n", Attribute); - - if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { - DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, &EmptyName, &AttrCtxt); + + if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) + { + Attribute = &AttrCtxt->Record; + DPRINT("Data length %lu\n", AttributeDataLength(Attribute)); NtfsInfo->VolumeLabelLength = - min (((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); + min (Attribute->Resident.ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); RtlCopyMemory(NtfsInfo->VolumeLabel, - (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset), + (PVOID)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset), NtfsInfo->VolumeLabelLength); VolumeNameU = NtfsInfo->VolumeLabel; } @@ -322,8 +334,9 @@ VolumeFcb = NtfsCreateFCB(VolumeNameU, DeviceExt); if (VolumeFcb == NULL) { + DPRINT1("Failed allocating volume FCB\n"); ExFreePool(VolumeRecord); - ExFreePool(MftRecord); + ExFreePool(DeviceExt->MasterFileTable); return STATUS_INSUFFICIENT_RESOURCES; } @@ -334,20 +347,19 @@ DeviceExt->VolumeFcb = VolumeFcb; /* Get volume information */ - Attribute = FindAttribute (VolumeRecord, AttributeVolumeInformation, NULL); - DPRINT("Attribute %p\n", Attribute); - - if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, &EmptyName, &AttrCtxt); + + if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) + { + Attribute = &AttrCtxt->Record; DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); - VolumeInfo = (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset); + VolumeInfo = (PVOID)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; NtfsInfo->Flags = VolumeInfo->Flags; } - ExFreePool(MftRecord); ExFreePool(VolumeRecord); return Status; Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Sep 26 13:57:29 2014 @@ -31,277 +31,413 @@ #define NDEBUG #include <debug.h> +UNICODE_STRING IndexOfFileNames = RTL_CONSTANT_STRING(L"$I30"); + /* FUNCTIONS ****************************************************************/ +PNTFS_ATTR_CONTEXT +PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord) +{ + PNTFS_ATTR_CONTEXT Context; + + Context = ExAllocatePoolWithTag(NonPagedPool, + FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length, + TAG_NTFS); + RtlCopyMemory(&Context->Record, AttrRecord, AttrRecord->Length); + if (AttrRecord->IsNonResident) + { + LONGLONG DataRunOffset; + ULONGLONG DataRunLength; + + Context->CacheRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; + Context->CacheRunOffset = 0; + Context->CacheRun = DecodeRun(Context->CacheRun, &DataRunOffset, &DataRunLength); + Context->CacheRunLength = DataRunLength; + if (DataRunOffset != -1) + { + /* Normal run. */ + Context->CacheRunStartLCN = + Context->CacheRunLastLCN = DataRunOffset; + } + else + { + /* Sparse run. */ + Context->CacheRunStartLCN = -1; + Context->CacheRunLastLCN = 0; + } + Context->CacheRunCurrentOffset = 0; + } + + return Context; +} + + +VOID +ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) +{ + ExFreePoolWithTag(Context, TAG_NTFS); +} + + +PNTFS_ATTR_CONTEXT +FindAttributeHelper(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_RECORD AttrRecord, + PNTFS_ATTR_RECORD AttrRecordEnd, + ULONG Type, + const WCHAR *Name, + ULONG NameLength) +{ + DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %s, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + + while (AttrRecord < AttrRecordEnd) + { + DPRINT("AttrRecord->Type = 0x%x\n", AttrRecord->Type); + + if (AttrRecord->Type == AttributeEnd) + break; + + if (AttrRecord->Type == AttributeAttributeList) + { + PNTFS_ATTR_CONTEXT Context; + PNTFS_ATTR_CONTEXT ListContext; + PVOID ListBuffer; + ULONGLONG ListSize; + PNTFS_ATTR_RECORD ListAttrRecord; + PNTFS_ATTR_RECORD ListAttrRecordEnd; + + // Do not handle non-resident yet + ASSERT(!(AttrRecord->IsNonResident & 1)); + + ListContext = PrepareAttributeContext(AttrRecord); + + ListSize = AttributeDataLength(&ListContext->Record); + if(ListSize <= 0xFFFFFFFF) + ListBuffer = ExAllocatePoolWithTag(NonPagedPool, (ULONG)ListSize, TAG_NTFS); + else + ListBuffer = NULL; + + if(!ListBuffer) + { + DPRINT("Failed to allocate memory: %x\n", (ULONG)ListSize); + continue; + } + + ListAttrRecord = (PNTFS_ATTR_RECORD)ListBuffer; + ListAttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize); + + if (ReadAttribute(Vcb, ListContext, 0, ListBuffer, (ULONG)ListSize) == ListSize) + { + Context = FindAttributeHelper(Vcb, ListAttrRecord, ListAttrRecordEnd, + Type, Name, NameLength); + + ReleaseAttributeContext(ListContext); + ExFreePoolWithTag(ListBuffer, TAG_NTFS); + + if (Context != NULL) + { + DPRINT("Found context = %p\n", Context); + return Context; + } + } + } + + if (AttrRecord->Type == Type) + { + DPRINT("%d, %d\n", AttrRecord->NameLength, NameLength); + if (AttrRecord->NameLength == NameLength) + { + PWCHAR AttrName; + + AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); + DPRINT("%s, %s\n", AttrName, Name); + if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + { + /* Found it, fill up the context and return. */ + DPRINT("Found context\n"); + return PrepareAttributeContext(AttrRecord); + } + } + } + + if (AttrRecord->Length == 0) + { + DPRINT("Null length attribute record\n"); + return NULL; + } + AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)AttrRecord + AttrRecord->Length); + } + + DPRINT("Ended\n"); + return NULL; +} + + NTSTATUS -NtfsOpenMft(PDEVICE_EXTENSION Vcb) -{ -// PVOID Bitmap; - PFILE_RECORD_HEADER MftRecord; - PFILE_RECORD_HEADER FileRecord; -// PATTRIBUTE Attribute; -// PATTRIBUTE AttrData; -// PRESIDENT_ATTRIBUTE ResAttr; - +FindAttribute(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER MftRecord, + ULONG Type, + PUNICODE_STRING Name, + PNTFS_ATTR_CONTEXT * AttrCtx) +{ + PNTFS_ATTR_RECORD AttrRecord; + PNTFS_ATTR_RECORD AttrRecordEnd; + + DPRINT("NtfsFindAttribute(%p, %p, %u, %s)\n", Vcb, MftRecord, Type, Name); + + AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); + AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); + + *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name->Buffer, Name->Length); + if (*AttrCtx == NULL) + { + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + return STATUS_SUCCESS; +} + + +ULONG +AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord) +{ + if (AttrRecord->IsNonResident) + return AttrRecord->NonResident.AllocatedSize; + else + return AttrRecord->Resident.ValueLength; +} + + +ULONGLONG +AttributeDataLength(PNTFS_ATTR_RECORD AttrRecord) +{ + if (AttrRecord->IsNonResident) + return AttrRecord->NonResident.DataSize; + else + return AttrRecord->Resident.ValueLength; +} + + +ULONG +ReadAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT Context, + ULONGLONG Offset, + PCHAR Buffer, + ULONG Length) +{ + ULONGLONG LastLCN; + PUCHAR DataRun; + LONGLONG DataRunOffset; + ULONGLONG DataRunLength; + LONGLONG DataRunStartLCN; + ULONGLONG CurrentOffset; + ULONG ReadLength; + ULONG AlreadyRead; NTSTATUS Status; - ULONG BytesPerFileRecord; - ULONG n; - ULONG i; - - DPRINT1("NtfsOpenMft() called\n"); - - BytesPerFileRecord = Vcb->NtfsInfo.BytesPerFileRecord; - - MftRecord = ExAllocatePoolWithTag(NonPagedPool, - BytesPerFileRecord, - TAG_NTFS); - if (MftRecord == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = NtfsReadSectors(Vcb->StorageDevice, - Vcb->NtfsInfo.MftStart.u.LowPart * Vcb->NtfsInfo.SectorsPerCluster, - BytesPerFileRecord / Vcb->NtfsInfo.BytesPerSector, - Vcb->NtfsInfo.BytesPerSector, - (PVOID)MftRecord, - FALSE); - if (!NT_SUCCESS(Status)) - { - ExFreePool(MftRecord); - return Status; - } - - FixupUpdateSequenceArray(MftRecord); - -// Attribute = FindAttribute(MftRecord, AttributeBitmap, 0); - - /* Get number of file records*/ - n = AttributeDataLength(FindAttribute(MftRecord, AttributeData, 0)) / BytesPerFileRecord; - - FileRecord = ExAllocatePoolWithTag(NonPagedPool, - BytesPerFileRecord, - TAG_NTFS); - if (FileRecord == NULL) - { - ExFreePool(MftRecord); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Enumerate MFT Records */ - DPRINT("Enumerate MFT records\n"); - for (i = 0; i < n; i++) - { - ReadFileRecord(Vcb, - i, - FileRecord, - MftRecord); - - if (FileRecord->Ntfs.Type == NRH_FILE_TYPE && - (FileRecord->Flags & FRH_IN_USE)) - { - DPRINT("\nFile %lu\n\n", i); - - /* Enumerate attributtes */ - NtfsDumpFileAttributes (FileRecord); - DbgPrint("\n\n"); - } - } - - ExFreePool(FileRecord); - ExFreePool(MftRecord); - - return Status; -} - - -PATTRIBUTE -FindAttribute(PFILE_RECORD_HEADER FileRecord, - ATTRIBUTE_TYPE Type, - PWSTR name) -{ - PATTRIBUTE Attribute; - - UNREFERENCED_PARAMETER(name); - - Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->AttributeType != (ATTRIBUTE_TYPE)-1) - { - if (Attribute->AttributeType == Type) - { - return Attribute; - } - - Attribute = (PATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Length); - } - - return NULL; -} - - -ULONG -AttributeAllocatedLength(PATTRIBUTE Attribute) -{ - if (Attribute->Nonresident) - { - return ((PNONRESIDENT_ATTRIBUTE)Attribute)->AllocatedSize; - } - - return ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength; -} - - -ULONG -AttributeDataLength(PATTRIBUTE Attribute) -{ - if (Attribute->Nonresident) - { - return ((PNONRESIDENT_ATTRIBUTE)Attribute)->DataSize; - } - - return ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength; -} - - -VOID -ReadAttribute(PATTRIBUTE attr, - PVOID buffer, - PDEVICE_EXTENSION Vcb, - PDEVICE_OBJECT DeviceObject) -{ - PNONRESIDENT_ATTRIBUTE NresAttr = (PNONRESIDENT_ATTRIBUTE)attr; - - UNREFERENCED_PARAMETER(DeviceObject); - - if (attr->Nonresident == FALSE) - { - memcpy(buffer, - (PVOID)((ULONG_PTR)attr + ((PRESIDENT_ATTRIBUTE)attr)->ValueOffset), - ((PRESIDENT_ATTRIBUTE)attr)->ValueLength); - } - - ReadExternalAttribute(Vcb, - NresAttr, - 0, - (ULONG)(NresAttr->LastVcn) + 1, - buffer); + + if (!Context->Record.IsNonResident) + { + if (Offset > Context->Record.Resident.ValueLength) + return 0; + if (Offset + Length > Context->Record.Resident.ValueLength) + Length = (ULONG)(Context->Record.Resident.ValueLength - Offset); + RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); + return Length; + } + + /* + * Non-resident attribute + */ + + /* + * I. Find the corresponding start data run. + */ + + AlreadyRead = 0; + + // FIXME: Cache seems to be non-working. Disable it for now + //if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) + if (0) + { + DataRun = Context->CacheRun; + LastLCN = Context->CacheRunLastLCN; + DataRunStartLCN = Context->CacheRunStartLCN; + DataRunLength = Context->CacheRunLength; + CurrentOffset = Context->CacheRunCurrentOffset; + } + else + { + LastLCN = 0; + DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; + CurrentOffset = 0; + + while (1) + { + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + /* Normal data run. */ + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + /* Sparse data run. */ + DataRunStartLCN = -1; + } + + if (Offset >= CurrentOffset && + Offset < CurrentOffset + (DataRunLength * Vcb->NtfsInfo.BytesPerCluster)) + { + break; + } + + if (*DataRun == 0) + { + return AlreadyRead; + } + + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + } + } + + /* + * II. Go through the run list and read the data + */ + + ReadLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster - (Offset - CurrentOffset), Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + Status = NtfsReadDisk(Vcb->StorageDevice, + DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster + Offset - CurrentOffset, + ReadLength, + (PVOID)Buffer, + FALSE); + if (NT_SUCCESS(Status)) + { + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + if (ReadLength == DataRunLength * Vcb->NtfsInfo.BytesPerCluster - (Offset - CurrentOffset)) + { + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunLength != (ULONGLONG)-1) + { + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + DataRunStartLCN = -1; + + if (*DataRun == 0) + return AlreadyRead; + } + + while (Length > 0) + { + ReadLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster, Length); + if (DataRunStartLCN == -1) + RtlZeroMemory(Buffer, ReadLength); + else + { + Status = NtfsReadDisk(Vcb->StorageDevice, + DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster, + ReadLength, + (PVOID)Buffer, + FALSE); + if (!NT_SUCCESS(Status)) + break; + } + + Length -= ReadLength; + Buffer += ReadLength; + AlreadyRead += ReadLength; + + /* We finished this request, but there still data in this data run. */ + if (Length == 0 && ReadLength != DataRunLength * Vcb->NtfsInfo.BytesPerCluster) + break; + + /* + * Go to next run in the list. + */ + + if (*DataRun == 0) + break; + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + /* Normal data run. */ + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + /* Sparse data run. */ + DataRunStartLCN = -1; + } + } /* while */ + + } /* if Disk */ + + Context->CacheRun = DataRun; + Context->CacheRunOffset = Offset + AlreadyRead; + Context->CacheRunStartLCN = DataRunStartLCN; + Context->CacheRunLength = DataRunLength; + Context->CacheRunLastLCN = LastLCN; + Context->CacheRunCurrentOffset = CurrentOffset; + + return AlreadyRead; } NTSTATUS ReadFileRecord(PDEVICE_EXTENSION Vcb, - ULONG index, - PFILE_RECORD_HEADER file, - PFILE_RECORD_HEADER Mft) -{ - PVOID p; - ULONG BytesPerFileRecord = Vcb->NtfsInfo.BytesPerFileRecord; - ULONG clusters = max(BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster, 1); - ULONGLONG vcn = index * BytesPerFileRecord / Vcb->NtfsInfo.BytesPerCluster; - LONG m = (Vcb->NtfsInfo.BytesPerCluster / BytesPerFileRecord) - 1; - ULONG n = m > 0 ? (index & m) : 0; - - p = ExAllocatePoolWithTag(NonPagedPool, - clusters * Vcb->NtfsInfo.BytesPerCluster, - TAG_NTFS); - - ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); - - memcpy(file, - (PVOID)((ULONG_PTR)p + n * BytesPerFileRecord), - BytesPerFileRecord); - - ExFreePool(p); - - FixupUpdateSequenceArray(file); + ULONGLONG index, + PFILE_RECORD_HEADER file) +{ + ULONGLONG BytesRead; + + BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); + if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) + { + DPRINT1("ReadFileRecord failed: %u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); + return STATUS_PARTIAL_COPY; + } + + /* Apply update sequence array fixups. */ + return FixupUpdateSequenceArray(Vcb, &file->Ntfs); +} + + +NTSTATUS +FixupUpdateSequenceArray(PDEVICE_EXTENSION Vcb, + PNTFS_RECORD_HEADER Record) +{ + USHORT *USA; + USHORT USANumber; + USHORT USACount; + USHORT *Block; + + USA = (USHORT*)((PCHAR)Record + Record->UsaOffset); + USANumber = *(USA++); + USACount = Record->UsaCount - 1; /* Exclude the USA Number. */ + Block = (USHORT*)((PCHAR)Record + Vcb->NtfsInfo.BytesPerSector - 2); + + while (USACount) + { + if (*Block != USANumber) + { + DPRINT1("Mismatch with USA: %u read, %u expected\n" , *Block, USANumber); + return STATUS_UNSUCCESSFUL; + } + *Block = *(USA++); + Block = (USHORT*)((PCHAR)Block + Vcb->NtfsInfo.BytesPerSector); + USACount--; + } return STATUS_SUCCESS; -} - - -VOID -ReadExternalAttribute(PDEVICE_EXTENSION Vcb, - PNONRESIDENT_ATTRIBUTE NresAttr, - ULONGLONG vcn, - ULONG count, - PVOID buffer) -{ - ULONGLONG lcn; - ULONGLONG runcount; - ULONG readcount; - ULONG left; - ULONG n; - - PUCHAR bytes = (PUCHAR)buffer; - - for (left = count; left > 0; left -= readcount) - { - FindRun(NresAttr, vcn, &lcn, &runcount); - -// readcount = (ULONG)(__min(runcount, left)); - readcount = (ULONG)min(runcount, left); - - - n = readcount * Vcb->NtfsInfo.BytesPerCluster; - - if (lcn == 0) - memset(bytes, 0, n); - else - ReadLCN(Vcb, lcn, readcount, bytes); - - vcn += readcount; - bytes += n; - } -} - - -VOID -ReadVCN(PDEVICE_EXTENSION Vcb, - PFILE_RECORD_HEADER file, - ATTRIBUTE_TYPE type, - ULONGLONG vcn, - ULONG count, - PVOID buffer) -{ - PNONRESIDENT_ATTRIBUTE NresAttr; - PATTRIBUTE attr; - - attr = FindAttribute(file, type, 0); - - NresAttr = (PNONRESIDENT_ATTRIBUTE) attr; - - if (NresAttr == 0 || (vcn < NresAttr->StartVcn ||vcn > NresAttr->LastVcn)) - { -// PATTRIBUTE attrList = FindAttribute(file,AttributeAttributeList,0); - DbgPrint("Exeption \n"); -// KeDebugCheck(0); - } - - ReadExternalAttribute(Vcb, NresAttr, vcn, count, buffer); -} - - -#if 0 -BOOL bitset(PUCHAR bitmap, ULONG i) -{ - return (bitmap[i>>3] & (1 << (i & 7))) !=0; -} -#endif - - -VOID -FixupUpdateSequenceArray(PFILE_RECORD_HEADER file) -{ - PUSHORT usa = (PUSHORT)((ULONG_PTR)file + file->Ntfs.UsaOffset); - PUSHORT sector = (PUSHORT)file; - ULONG i; - - for (i = 1; i < file->Ntfs.UsaCount; i++) - { - sector[255] = usa[i]; - sector += 256; - } } @@ -323,4 +459,240 @@ FALSE); } + +BOOLEAN +CompareFileName(PUNICODE_STRING FileName, + PINDEX_ENTRY_ATTRIBUTE IndexEntry) +{ + UNICODE_STRING EntryName; + + EntryName.Buffer = IndexEntry->FileName.Name; + EntryName.Length = + EntryName.MaximumLength = IndexEntry->FileName.NameLength; + + return (RtlCompareUnicodeString(FileName, &EntryName, !!(IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); +} + + +NTSTATUS +NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING FileName, ULONGLONG *OutMFTIndex) +{ + PFILE_RECORD_HEADER MftRecord; + //ULONG Magic; + PNTFS_ATTR_CONTEXT IndexRootCtx; + PNTFS_ATTR_CONTEXT IndexBitmapCtx; + PNTFS_ATTR_CONTEXT IndexAllocationCtx; + PINDEX_ROOT_ATTRIBUTE IndexRoot; + ULONGLONG BitmapDataSize; + ULONGLONG IndexAllocationSize; + PCHAR BitmapData; + PCHAR IndexRecord; + PINDEX_ENTRY_ATTRIBUTE IndexEntry, IndexEntryEnd; + ULONG RecordOffset; + ULONG IndexBlockSize; + NTSTATUS Status; + + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + Vcb->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (ReadFileRecord(Vcb, MFTIndex, MftRecord)) + { + //Magic = MftRecord->Magic; + + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, &IndexOfFileNames, &IndexRootCtx); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + IndexRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); + if (IndexRecord == NULL) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); + IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); + /* Index root is always resident. */ + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexRootCtx->Record.Resident.ValueLength); + ReleaseAttributeContext(IndexRootCtx); + + DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); + + while (IndexEntry < IndexEntryEnd && + !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) + { + if (CompareFileName(FileName, IndexEntry)) + { + *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_SUCCESS; + } + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + } + + if (IndexRoot->Header.Flags & INDEX_ROOT_LARGE) + { + DPRINT("Large Index!\n"); + + IndexBlockSize = IndexRoot->SizeOfEntry; + + Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, &IndexOfFileNames, &IndexBitmapCtx); + if (!NT_SUCCESS(Status)) + { + DPRINT("Corrupted filesystem!\n"); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + BitmapDataSize = AttributeDataLength(&IndexBitmapCtx->Record); + DPRINT("BitmapDataSize: %x\n", (ULONG)BitmapDataSize); + if(BitmapDataSize <= 0xFFFFFFFF) + BitmapData = ExAllocatePoolWithTag(NonPagedPool, (ULONG)BitmapDataSize, TAG_NTFS); + else + BitmapData = NULL; + + if (BitmapData == NULL) + { + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + ReadAttribute(Vcb, IndexBitmapCtx, 0, BitmapData, (ULONG)BitmapDataSize); + ReleaseAttributeContext(IndexBitmapCtx); + + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, &IndexOfFileNames, &IndexAllocationCtx); + if (!NT_SUCCESS(Status)) + { + DPRINT("Corrupted filesystem!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + IndexAllocationSize = AttributeDataLength(&IndexAllocationCtx->Record); + + RecordOffset = 0; + + for (;;) + { + DPRINT("RecordOffset: %x IndexAllocationSize: %x\n", RecordOffset, IndexAllocationSize); + for (; RecordOffset < IndexAllocationSize;) + { + UCHAR Bit = 1 << ((RecordOffset / IndexBlockSize) & 7); + ULONG Byte = (RecordOffset / IndexBlockSize) >> 3; + if ((BitmapData[Byte] & Bit)) + break; + RecordOffset += IndexBlockSize; + } + + if (RecordOffset >= IndexAllocationSize) + { + break; + } + + ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); + + if (!FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs)) + { + break; + } + + /* FIXME */ + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + 0x18 + *(USHORT *)(IndexRecord + 0x18)); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexBlockSize); + + while (IndexEntry < IndexEntryEnd && + !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) + { + if (CompareFileName(FileName, IndexEntry)) + { + DPRINT("File found\n"); + *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + ExFreePoolWithTag(MftRecord, TAG_NTFS); + ReleaseAttributeContext(IndexAllocationCtx); + return STATUS_SUCCESS; + } + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + } + + RecordOffset += IndexBlockSize; + } + + ReleaseAttributeContext(IndexAllocationCtx); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + } + + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + } + else + { + DPRINT("Can't read MFT record\n"); + } + ExFreePoolWithTag(MftRecord, TAG_NTFS); + + return STATUS_OBJECT_PATH_NOT_FOUND; +} + +NTSTATUS +NtfsLookupFile(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING PathName, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext) +{ + ULONGLONG CurrentMFTIndex; + UNICODE_STRING Current, Remaining; + NTSTATUS Status; + + DPRINT1("NtfsLookupFile(%p, %wZ, %p)\n", Vcb, PathName, FileRecord); + + CurrentMFTIndex = NTFS_FILE_ROOT; + FsRtlDissectName(*PathName, &Current, &Remaining); + + while (Current.Length != 0) + { + DPRINT1("Lookup: %wZ\n", &Current); + + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + FsRtlDissectName(*PathName, &Current, &Remaining); + } + + *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (*FileRecord == NULL) + { + DPRINT("NtfsLookupFile: Can't allocate MFT record\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsLookupFile: Can't read MFT record\n"); + return Status; + } + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, PathName, DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsLookupFile: Can't find data attribute\n"); + return Status; + } + + return STATUS_SUCCESS; +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Fri Sep 26 13:57:29 2014 @@ -86,7 +86,6 @@ ULONG Size; } NTFSIDENTIFIER, *PNTFSIDENTIFIER; - typedef struct { NTFSIDENTIFIER Identifier; @@ -101,6 +100,8 @@ PDEVICE_OBJECT StorageDevice; PFILE_OBJECT StreamFileObject; + struct _NTFS_ATTR_CONTEXT* MFTContext; + struct _FILE_RECORD_HEADER* MasterFileTable; struct _FCB *VolumeFcb; NTFS_INFO NtfsInfo; @@ -186,8 +187,22 @@ AttributeEAInformation = 0xD0, AttributeEA = 0xE0, AttributePropertySet = 0xF0, - AttributeLoggedUtilityStream = 0x100 + AttributeLoggedUtilityStream = 0x100, + AttributeEnd = 0xFFFFFFFF } ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; + +#define NTFS_FILE_MFT 0 +#define NTFS_FILE_MFTMIRR 1 +#define NTFS_FILE_LOGFILE 2 +#define NTFS_FILE_VOLUME 3 +#define NTFS_FILE_ATTRDEF 4 +#define NTFS_FILE_ROOT 5 +#define NTFS_FILE_BITMAP 6 +#define NTFS_FILE_BOOT 7 +#define NTFS_FILE_BADCLUS 8 +#define NTFS_FILE_QUOTA 9 +#define NTFS_FILE_UPCASE 10 +#define NTFS_FILE_EXTEND 11 #define COLLATION_BINARY 0x00 #define COLLATION_FILE_NAME 0x01 @@ -200,6 +215,14 @@ #define INDEX_ROOT_SMALL 0x0 #define INDEX_ROOT_LARGE 0x1 +#define NTFS_INDEX_ENTRY_NODE 1 +#define NTFS_INDEX_ENTRY_END 2 + +#define NTFS_FILE_NAME_POSIX 0 +#define NTFS_FILE_NAME_WIN32 1 +#define NTFS_FILE_NAME_DOS 2 +#define NTFS_FILE_NAME_WIN32_AND_DOS 3 + typedef struct { ULONG Type; /* Magic number 'FILE' */ @@ -212,7 +235,7 @@ #define NRH_FILE_TYPE 0x454C4946 /* 'FILE' */ -typedef struct +typedef struct _FILE_RECORD_HEADER { NTFS_RECORD_HEADER Ntfs; USHORT SequenceNumber; /* Sequence number */ @@ -236,39 +259,38 @@ typedef struct { - ATTRIBUTE_TYPE AttributeType; - ULONG Length; - BOOLEAN Nonresident; - UCHAR NameLength; - USHORT NameOffset; - USHORT Flags; - USHORT AttributeNumber; -} ATTRIBUTE, *PATTRIBUTE; - -typedef struct -{ - ATTRIBUTE Attribute; - ULONG ValueLength; - USHORT ValueOffset; - UCHAR Flags; -// UCHAR Padding0; -} RESIDENT_ATTRIBUTE, *PRESIDENT_ATTRIBUTE; - -typedef struct -{ - ATTRIBUTE Attribute; - ULONGLONG StartVcn; // LowVcn - ULONGLONG LastVcn; // HighVcn - USHORT RunArrayOffset; - USHORT CompressionUnit; - ULONG Padding0; - UCHAR IndexedFlag; - ULONGLONG AllocatedSize; - ULONGLONG DataSize; - ULONGLONG InitializedSize; - ULONGLONG CompressedSize; -} NONRESIDENT_ATTRIBUTE, *PNONRESIDENT_ATTRIBUTE; - + ULONG Type; + ULONG Length; + UCHAR IsNonResident; + UCHAR NameLength; + USHORT NameOffset; + USHORT Flags; + USHORT Instance; + union + { + // Resident attributes + struct + { + ULONG ValueLength; + USHORT ValueOffset; + UCHAR Flags; + UCHAR Reserved; + } Resident; + // Non-resident attributes + struct + { + ULONGLONG LowestVCN; + ULONGLONG HighestVCN; + USHORT MappingPairsOffset; + USHORT CompressionUnit; + UCHAR Reserved[4]; + LONGLONG AllocatedSize; + LONGLONG DataSize; + LONGLONG InitializedSize; + LONGLONG CompressedSize; + } NonResident; + }; +} NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; typedef struct { @@ -337,6 +359,28 @@ typedef struct { + union + { + struct + { + ULONGLONG IndexedFile; + } Directory; + struct + { + USHORT DataOffset; + USHORT DataLength; + ULONG Reserved; + } ViewIndex; + } Data; + USHORT Length; + USHORT KeyLength; + USHORT Flags; + USHORT Reserved; + FILENAME_ATTRIBUTE FileName; +} INDEX_ENTRY_ATTRIBUTE, *PINDEX_ENTRY_ATTRIBUTE; + +typedef struct +{ ULONGLONG Unknown1; UCHAR MajorVersion; UCHAR MinorVersion; @@ -357,6 +401,16 @@ NTSTATUS SavedExceptionCode; } NTFS_IRP_CONTEXT, *PNTFS_IRP_CONTEXT; +typedef struct _NTFS_ATTR_CONTEXT +{ + PUCHAR CacheRun; + ULONGLONG CacheRunOffset; + LONGLONG CacheRunStartLCN; + ULONGLONG CacheRunLength; + LONGLONG CacheRunLastLCN; + ULONGLONG CacheRunCurrentOffset; + NTFS_ATTR_RECORD Record; +} NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; extern PNTFS_GLOBAL_DATA NtfsGlobalData; @@ -369,15 +423,10 @@ //VOID //NtfsDumpAttribute(PATTRIBUTE Attribute); -//LONGLONG RunLCN(PUCHAR run); - -//ULONG RunLength(PUCHAR run); - -BOOLEAN -FindRun(PNONRESIDENT_ATTRIBUTE NresAttr, - ULONGLONG vcn, - PULONGLONG lcn, - PULONGLONG count); +PUCHAR +DecodeRun(PUCHAR DataRun, + LONGLONG *DataRunOffset, + ULONGLONG *DataRunLength); VOID NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); @@ -529,35 +578,30 @@ /* mft.c */ -NTSTATUS -NtfsOpenMft(PDEVICE_EXTENSION Vcb); - - -VOID -ReadAttribute(PATTRIBUTE attr, - PVOID buffer, - PDEVICE_EXTENSION Vcb, - PDEVICE_OBJECT DeviceObject); - ULONG -AttributeDataLength(PATTRIBUTE attr); +ReadAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT Context, + ULONGLONG Offset, + PCHAR Buffer, + ULONG Length); + +ULONGLONG +AttributeDataLength(PNTFS_ATTR_RECORD AttrRecord); ULONG -AttributeAllocatedLength(PATTRIBUTE Attribute); +AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord); NTSTATUS ReadFileRecord(PDEVICE_EXTENSION Vcb, - ULONG index, - PFILE_RECORD_HEADER file, - PFILE_RECORD_HEADER Mft); - -PATTRIBUTE -FindAttribute(PFILE_RECORD_HEADER file, - ATTRIBUTE_TYPE type, - PWSTR name); - -ULONG -AttributeLengthAllocated(PATTRIBUTE attr); + ULONGLONG index, + PFILE_RECORD_HEADER file); + +NTSTATUS +FindAttribute(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER MftRecord, + ULONG Type, + PUNICODE_STRING Name, + PNTFS_ATTR_CONTEXT * AttrCtx); VOID ReadVCN(PDEVICE_EXTENSION Vcb, @@ -567,15 +611,9 @@ ULONG count, PVOID buffer); -VOID -FixupUpdateSequenceArray(PFILE_RECORD_HEADER file); - -VOID -ReadExternalAttribute(PDEVICE_EXTENSION Vcb, - PNONRESIDENT_ATTRIBUTE NresAttr, - ULONGLONG vcn, - ULONG count, - PVOID buffer); +NTSTATUS +FixupUpdateSequenceArray(PDEVICE_EXTENSION Vcb, + PNTFS_RECORD_HEADER Record); NTSTATUS ReadLCN(PDEVICE_EXTENSION Vcb, @@ -588,6 +626,11 @@ PDEVICE_EXTENSION Vcb, PDEVICE_OBJECT DeviceObject); +NTSTATUS +NtfsLookupFile(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING PathName, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext); /* misc.c */

1 0

[jgardou] 64312: [SPEC2DEF] - Actually commit what was advertised in r64281
by jgardou＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: jgardou Date: Fri Sep 26 12:43:27 2014 New Revision: 64312 URL: http://svn.reactos.org/svn/reactos?rev=64312&view=rev Log: [SPEC2DEF] - Actually commit what was advertised in r64281 Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 26 12:43:27 2014 @@ -282,7 +282,7 @@ { fprintf(file, "\tint retval;\n"); } - fprintf(file, "\tif(TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", + fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", pszDllName, pexp->strName.len, pexp->strName.buf); } @@ -350,13 +350,13 @@ { if (pexp->uFlags & FL_RET64) { - fprintf(file, "\tif(TRACE_ON(relay))\n\t\t(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", + fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", pszDllName, pexp->strName.len, pexp->strName.buf); } else { - fprintf(file, "\tTRACE_(relay)(\"%.*s: retval = 0x%%lx\\n\", retval);\n", - pexp->strName.len, pexp->strName.buf); + fprintf(file, "\tif (TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s: retval = 0x%%lx\\n\", retval);\n", + pszDllName, pexp->strName.len, pexp->strName.buf); } fprintf(file, "\treturn retval;\n}\n\n"); }

1 0

[jgardou] 64311: [WIN32K] - Simplify IntRemoveWindowProp - Complain loudly if a NULL list entry sneaks into a window property list. CORE-8562
by jgardou＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: jgardou Date: Fri Sep 26 12:43:12 2014 New Revision: 64311 URL: http://svn.reactos.org/svn/reactos?rev=64311&view=rev Log: [WIN32K] - Simplify IntRemoveWindowProp - Complain loudly if a NULL list entry sneaks into a window property list. CORE-8562 Modified: trunk/reactos/tools/spec2def/spec2def.c trunk/reactos/win32ss/user/ntuser/prop.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 26 12:43:12 2014 @@ -38,6 +38,7 @@ typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbMSComp = 0; int gbImportLib = 0; +int gbTracing = 0; int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; @@ -52,6 +53,9 @@ FL_STUB = 2, FL_NONAME = 4, FL_ORDINAL = 8, + FL_NORELAY = 16, + FL_RET64 = 32, + FL_REGISTER = 64, }; enum @@ -161,52 +165,126 @@ OutputHeader_stub(FILE *file) { fprintf(file, "/* This file is autogenerated, do not edit. */\n\n" - "#include <stubs.h>\n\n"); + "#include <stubs.h>\n"); + + if (gbTracing) + { + fprintf(file, "#include <wine/debug.h>\n"); + fprintf(file, "#include <inttypes.h>\n"); + fprintf(file, "WINE_DECLARE_DEBUG_CHANNEL(relay);\n"); + } + + fprintf(file, "\n"); } int OutputLine_stub(FILE *file, EXPORT *pexp) { int i; + int bRelay = 0; + int bInPrototype; if (pexp->nCallingConvention != CC_STUB && - (pexp->uFlags & FL_STUB) == 0) return 0; - - fprintf(file, "int "); - if ((giArch == ARCH_X86) && - pexp->nCallingConvention == CC_STDCALL) - { - fprintf(file, "__stdcall "); - } - - /* Check for C++ */ - if (pexp->strName.buf[0] == '?') - { - fprintf(file, "stub_function%d(", pexp->nNumber); + (pexp->uFlags & FL_STUB) == 0) + { + /* Only relay trace stdcall C functions */ + if (!gbTracing || (pexp->nCallingConvention != CC_STDCALL) + || (pexp->uFlags & FL_NORELAY) + || (pexp->strName.buf[0] == '?')) + { + return 0; + } + bRelay = 1; + } + + /* Declare the "real" function */ + if (bRelay) + { + fprintf(file, "extern "); + bInPrototype = 1; + } + + do + { + if (pexp->uFlags & FL_REGISTER) + { + /* FIXME: Not sure this is right */ + fprintf(file, "void "); + } + else if (pexp->uFlags & FL_RET64) + { + fprintf(file, "__int64 "); + } + else + { + fprintf(file, "int "); + } + + if ((giArch == ARCH_X86) && + pexp->nCallingConvention == CC_STDCALL) + { + fprintf(file, "__stdcall "); + } + + /* Check for C++ */ + if (pexp->strName.buf[0] == '?') + { + fprintf(file, "stub_function%d(", pexp->nNumber); + } + else + { + if (!bRelay || bInPrototype) + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); + else + fprintf(file, "$relaytrace$%.*s(", pexp->strName.len, pexp->strName.buf); + } + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "long"); break; + case ARG_PTR: fprintf(file, "void*"); break; + case ARG_STR: fprintf(file, "char*"); break; + case ARG_WSTR: fprintf(file, "wchar_t*"); break; + case ARG_DBL: fprintf(file, "double"); break; + case ARG_INT64 : fprintf(file, "__int64"); break; + case ARG_INT128 : fprintf(file, "__int128"); break; + case ARG_FLOAT: fprintf(file, "float"); break; + } + fprintf(file, " a%d", i); + } + + if (bInPrototype) + { + fprintf(file, ");\n\n"); + } + } while (bInPrototype--); + + if (!bRelay) + { + fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(", + pexp->strName.len, pexp->strName.buf); } else { - fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); - } - - for (i = 0; i < pexp->nArgCount; i++) - { - if (i != 0) fprintf(file, ", "); - switch (pexp->anArgs[i]) - { - case ARG_LONG: fprintf(file, "long"); break; - case ARG_PTR: fprintf(file, "void*"); break; - case ARG_STR: fprintf(file, "char*"); break; - case ARG_WSTR: fprintf(file, "wchar_t*"); break; - case ARG_DBL: - case ARG_INT64 : fprintf(file, "__int64"); break; - case ARG_INT128 : fprintf(file, "__int128"); break; - case ARG_FLOAT: fprintf(file, "float"); break; - } - fprintf(file, " a%d", i); - } - fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(", - pexp->strName.len, pexp->strName.buf); + fprintf(file, ")\n{\n"); + if (pexp->uFlags & FL_REGISTER) + { + /* No return value */ + } + else if (pexp->uFlags & FL_RET64) + { + fprintf(file, "\t__int64 retval;\n"); + } + else + { + fprintf(file, "\tint retval;\n"); + } + fprintf(file, "\tif(TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", + pszDllName, pexp->strName.len, pexp->strName.buf); + } for (i = 0; i < pexp->nArgCount; i++) { @@ -246,8 +324,42 @@ { fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); } - - fprintf(file, "\treturn 0;\n}\n\n"); + else if (bRelay) + { + if (pexp->uFlags & FL_REGISTER) + { + fprintf(file,"\t"); + } + else + { + fprintf(file, "\tretval = "); + } + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + fprintf(file, "a%d", i); + } + fprintf(file, ");\n"); + } + + if (!bRelay) + fprintf(file, "\treturn 0;\n}\n\n"); + else if ((pexp->uFlags & FL_REGISTER) == 0) + { + if (pexp->uFlags & FL_RET64) + { + fprintf(file, "\tif(TRACE_ON(relay))\n\t\t(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", + pszDllName, pexp->strName.len, pexp->strName.buf); + } + else + { + fprintf(file, "\tTRACE_(relay)(\"%.*s: retval = 0x%%lx\\n\", retval);\n", + pexp->strName.len, pexp->strName.buf); + } + fprintf(file, "\treturn retval;\n}\n\n"); + } return 1; } @@ -458,11 +570,18 @@ /* C++ stubs are forwarded to C stubs */ fprintf(fileDest, "=stub_function%d", pexp->nNumber); } + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) && + (pexp->strName.buf[0] != '?')) + { + /* Redirect it to the relay-tracing trampoline */ + fprintf(fileDest, "=$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf); + } } void OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp) { + int bTracing = 0; /* Print the function name, with decoration for export libs */ PrintName(fileDest, pexp, &pexp->strName, gbImportLib); DbgPrint("Generating def line for '%.*s'\n", pexp->strName.len, pexp->strName.buf); @@ -482,6 +601,19 @@ { /* C++ stubs are forwarded to C stubs */ fprintf(fileDest, "=stub_function%d", pexp->nNumber); + } + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) && + (pexp->strName.buf[0] != '?')) + { + /* Redirect it to the relay-tracing trampoline */ + char buf[256]; + STRING strTarget; + fprintf(fileDest, "="); + sprintf(buf, "$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf); + strTarget.buf = buf; + strTarget.len = pexp->strName.len + 12; + PrintName(fileDest, pexp, &strTarget, 1); + bTracing = 1; } /* Special handling for stdcall and fastcall */ @@ -500,7 +632,7 @@ fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf); } } - else if (!pexp->strTarget.buf) + else if ((!pexp->strTarget.buf) && !(bTracing)) { /* Write a forwarder to the actual decorated symbol */ fprintf(fileDest, "="); @@ -694,11 +826,17 @@ { exp.uFlags |= FL_STUB; } - else if (CompareToken(pc, "-norelay") || - CompareToken(pc, "-register") || - CompareToken(pc, "-ret64")) - { - /* silently ignore these */ + else if (CompareToken(pc, "-norelay")) + { + exp.uFlags |= FL_NORELAY; + } + else if (CompareToken(pc, "-ret64")) + { + exp.uFlags |= FL_RET64; + } + else if (CompareToken(pc, "-register")) + { + exp.uFlags |= FL_REGISTER; } else { @@ -862,6 +1000,9 @@ fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine); return -17; } + + /* Don't relay-trace forwarded functions */ + exp.uFlags |= FL_NORELAY; } else { @@ -886,16 +1027,17 @@ void usage(void) { - printf("syntax: spec2pdef [<options> ...] <spec file>\n" + printf("syntax: spec2def [<options> ...] <spec file>\n" "Possible options:\n" - " -h --help prints this screen\n" - " -l=<file> generates an asm lib stub\n" - " -d=<file> generates a def file\n" - " -s=<file> generates a stub file\n" - " --ms msvc compatibility\n" - " -n=<name> name of the dll\n" - " --implib generate a def file for an import library\n" - " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); + " -h --help prints this screen\n" + " -l=<file> generates an asm lib stub\n" + " -d=<file> generates a def file\n" + " -s=<file> generates a stub file\n" + " --ms msvc compatibility\n" + " -n=<name> name of the dll\n" + " --implib generate a def file for an import library\n" + " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n" + " --with-tracing generates wine-like \"+relay\" trace trampolines. (necessitates -s)\n"); } int main(int argc, char *argv[]) @@ -945,6 +1087,15 @@ { gbMSComp = 1; } + else if ((strcasecmp(argv[i], "--with-tracing") == 0)) + { + if (!pszStubFileName) + { + fprintf(stderr, "Error: cannot use --with-tracing without -s option.\n"); + return -1; + } + gbTracing = 1; + } else if (argv[i][1] == 'a' && argv[i][2] == '=') { pszArchString = argv[i] + 3; Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Fri Sep 26 12:43:12 2014 @@ -19,9 +19,18 @@ int i; ListEntry = Window->PropListHead.Flink; + for (i = 0; i < Window->PropListItems; i++ ) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + + if (ListEntry == NULL) + { + ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %d. Atom %d.\n", + Window, Window->PropListItems, Atom); + return NULL; + } + if (Property->Atom == Atom) { return(Property); @@ -84,16 +93,14 @@ { PLIST_ENTRY ListEntry; PPROPERTY Property; - int i, Count = Window->PropListItems; - - ListEntry = Window->PropListHead.Flink; - for (i = 0; i < Count; i++ ) - { - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - ListEntry = ListEntry->Flink; - RemoveEntryList(&Property->PropListEntry); - UserHeapFree(Property); - Window->PropListItems--; + + while (!IsListEmpty(&Window->PropListHead)) + { + ListEntry = Window->PropListHead.Flink; + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + RemoveEntryList(&Property->PropListEntry); + UserHeapFree(Property); + Window->PropListItems--; } return; }

1 0

[akhaldi] 64310: [ATL][ATL80][ATL100] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 11:39:07 2014 New Revision: 64310 URL: http://svn.reactos.org/svn/reactos?rev=64310&view=rev Log: [ATL][ATL80][ATL100] * Sync with Wine 1.7.27. CORE-8540 Added: trunk/reactos/dll/win32/atl/atl_lib.idl (with props) trunk/reactos/dll/win32/atl/atl_lib_r.rgs (with props) trunk/reactos/dll/win32/atl/atl_lib_t.rgs (with props) trunk/reactos/include/reactos/wine/atlcom.h (with props) Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/atl/atl.c trunk/reactos/dll/win32/atl/atl30.c trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/rsrc.rc trunk/reactos/dll/win32/atl100/atl100.spec trunk/reactos/dll/win32/atl80/atl80.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -16,7 +16,17 @@ ${CMAKE_CURRENT_BINARY_DIR}/atl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/atl.def) +list(APPEND atl_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/atl.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/atl_lib_r.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/atl_lib_t.rgs + ${CMAKE_CURRENT_BINARY_DIR}/atl_lib.tlb) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${atl_rc_deps}") + add_library(atl SHARED ${SOURCE} rsrc.rc) +add_typelib(atl_lib.idl) +add_dependencies(atl stdole2) set_module_type(atl win32dll) target_link_libraries(atl uuid wine) add_importlibs(atl oleaut32 ole32 user32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/atl/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=64… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -19,6 +19,7 @@ #include <precomp.h> +#include <wine/atlcom.h> #include <wingdi.h> #define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) @@ -244,18 +245,6 @@ return rc; } -/* FIXME: should be in a header file */ -typedef struct ATL_PROPMAP_ENTRY -{ - LPCOLESTR szDesc; - DISPID dispid; - const CLSID* pclsidPropPage; - const IID* piidDispatch; - DWORD dwOffsetData; - DWORD dwSizeData; - VARTYPE vt; -} ATL_PROPMAP_ENTRY; - /*********************************************************************** * AtlIPersistStreamInit_Load [atl100.@] */ Modified: trunk/reactos/dll/win32/atl/atl30.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl30.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/atl/atl30.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl30.c [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -508,6 +508,7 @@ static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; +#ifdef __REACTOS__ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) @@ -554,7 +555,7 @@ StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); } - +#endif /************************************************************** * DllGetClassObject (ATL.2) Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -123,55 +123,88 @@ * Atl container component implementation */ - -static ULONG IOCS_AddRef(IOCS *This) -{ +/****** IOleClientSite *****/ +static inline IOCS *impl_from_IOleClientSite(IOleClientSite *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleClientSite_iface); +} + +static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ +{ + if ( This->hWnd ) + { + SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); + SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); + This->hWnd = NULL; + } + if ( This->control ) + { + IOleObject *control = This->control; + + This->control = NULL; + IOleObject_Close( control, OLECLOSE_NOSAVE ); + IOleObject_SetClientSite( control, NULL ); + IOleObject_Release( control ); + } + return S_OK; +} + +static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) +{ + IOCS *This = impl_from_IOleClientSite(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IOleClientSite, riid)) + { + *ppv = iface; + } + else if (IsEqualIID(&IID_IOleContainer, riid)) + { + *ppv = &This->IOleContainer_iface; + } + else if (IsEqualIID(&IID_IOleInPlaceSite, riid) || + IsEqualIID(&IID_IOleInPlaceSiteEx, riid) || + IsEqualIID(&IID_IOleInPlaceSiteWindowless, riid)) + { + *ppv = &This->IOleInPlaceSiteWindowless_iface; + } + else if (IsEqualIID(&IID_IOleInPlaceFrame, riid)) + { + *ppv = &This->IOleInPlaceFrame_iface; + } + else if (IsEqualIID(&IID_IOleControlSite, riid)) + { + *ppv = &This->IOleControlSite_iface; + } + + if (*ppv) + { + IOleClientSite_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI OleClientSite_AddRef(IOleClientSite *iface) +{ + IOCS *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedIncrement(&This->ref); - - TRACE( "(%p) : AddRef from %d\n", This, ref - 1 ); - + TRACE("(%p)->(%d)\n", This, ref); return ref; } -static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) -{ - *ppv = NULL; - - if ( IsEqualIID( &IID_IUnknown, riid ) - || IsEqualIID( &IID_IOleClientSite, riid ) ) - { - *ppv = &This->IOleClientSite_iface; - } else if ( IsEqualIID( &IID_IOleContainer, riid ) ) - { - *ppv = &This->IOleContainer_iface; - } else if ( IsEqualIID( &IID_IOleInPlaceSite, riid ) || IsEqualIID( &IID_IOleInPlaceSiteEx, riid ) || IsEqualIID( &IID_IOleInPlaceSiteWindowless, riid ) ) - { - *ppv = &This->IOleInPlaceSiteWindowless_iface; - } else if ( IsEqualIID( &IID_IOleInPlaceFrame, riid ) ) - { - *ppv = &This->IOleInPlaceFrame_iface; - } else if ( IsEqualIID( &IID_IOleControlSite, riid ) ) - { - *ppv = &This->IOleControlSite_iface; - } - - if (*ppv) - { - IOCS_AddRef( This ); - return S_OK; - } - - WARN("unsupported interface %s\n", debugstr_guid( riid ) ); - *ppv = NULL; - return E_NOINTERFACE; -} - -static HRESULT IOCS_Detach( IOCS *This ); -static ULONG IOCS_Release(IOCS *This) -{ +static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) +{ + IOCS *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) : ReleaseRef to %d\n", This, ref ); + TRACE("(%p)->(%d)\n", This, ref); if (!ref) { @@ -182,30 +215,6 @@ return ref; } -/****** IOleClientSite *****/ -static inline IOCS *impl_from_IOleClientSite(IOleClientSite *iface) -{ - return CONTAINING_RECORD(iface, IOCS, IOleClientSite_iface); -} - -static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) -{ - IOCS *This = impl_from_IOleClientSite(iface); - return IOCS_QueryInterface(This, riid, ppv); -} - -static ULONG WINAPI OleClientSite_AddRef(IOleClientSite *iface) -{ - IOCS *This = impl_from_IOleClientSite(iface); - return IOCS_AddRef(This); -} - -static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) -{ - IOCS *This = impl_from_IOleClientSite(iface); - return IOCS_Release(This); -} - static HRESULT WINAPI OleClientSite_SaveObject(IOleClientSite *iface) { IOCS *This = impl_from_IOleClientSite(iface); @@ -221,11 +230,11 @@ return E_NOTIMPL; } -static HRESULT WINAPI OleClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) +static HRESULT WINAPI OleClientSite_GetContainer(IOleClientSite *iface, IOleContainer **container) { IOCS *This = impl_from_IOleClientSite(iface); - TRACE( "(%p, %p)\n", This, ppContainer ); - return OleClientSite_QueryInterface( iface, &IID_IOleContainer, (void**)ppContainer ); + TRACE("(%p, %p)\n", This, container); + return IOleClientSite_QueryInterface(iface, &IID_IOleContainer, (void**)container); } static HRESULT WINAPI OleClientSite_ShowObject(IOleClientSite *iface) @@ -259,19 +268,19 @@ static HRESULT WINAPI OleContainer_QueryInterface( IOleContainer* iface, REFIID riid, void** ppv) { IOCS *This = impl_from_IOleContainer(iface); - return IOCS_QueryInterface( This, riid, ppv ); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } static ULONG WINAPI OleContainer_AddRef(IOleContainer* iface) { IOCS *This = impl_from_IOleContainer(iface); - return IOCS_AddRef(This); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG WINAPI OleContainer_Release(IOleContainer* iface) { IOCS *This = impl_from_IOleContainer(iface); - return IOCS_Release(This); + return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer* iface, IBindCtx* pbc, @@ -306,19 +315,19 @@ static HRESULT WINAPI OleInPlaceSiteWindowless_QueryInterface(IOleInPlaceSiteWindowless *iface, REFIID riid, void **ppv) { IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); - return IOCS_QueryInterface(This, riid, ppv); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } static ULONG WINAPI OleInPlaceSiteWindowless_AddRef(IOleInPlaceSiteWindowless *iface) { IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); - return IOCS_AddRef(This); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG WINAPI OleInPlaceSiteWindowless_Release(IOleInPlaceSiteWindowless *iface) { IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); - return IOCS_Release(This); + return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT WINAPI OleInPlaceSiteWindowless_GetWindow(IOleInPlaceSiteWindowless* iface, HWND* phwnd) @@ -363,21 +372,22 @@ return S_OK; } static HRESULT WINAPI OleInPlaceSiteWindowless_GetWindowContext(IOleInPlaceSiteWindowless *iface, - IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, + IOleInPlaceFrame **frame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); - TRACE("(%p,%p,%p,%p,%p,%p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); + TRACE("(%p,%p,%p,%p,%p,%p)\n", This, frame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); if ( lprcClipRect ) *lprcClipRect = This->size; if ( lprcPosRect ) *lprcPosRect = This->size; - if ( ppFrame ) - { - IOCS_QueryInterface( This, &IID_IOleInPlaceFrame, (void**) ppFrame ); + if ( frame ) + { + *frame = &This->IOleInPlaceFrame_iface; + IOleInPlaceFrame_AddRef(*frame); } if ( ppDoc ) @@ -536,19 +546,19 @@ static HRESULT WINAPI OleInPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { IOCS *This = impl_from_IOleInPlaceFrame(iface); - return IOCS_QueryInterface(This, riid, ppv); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } static ULONG WINAPI OleInPlaceFrame_AddRef(IOleInPlaceFrame *iface) { IOCS *This = impl_from_IOleInPlaceFrame(iface); - return IOCS_AddRef(This); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG WINAPI OleInPlaceFrame_Release(IOleInPlaceFrame *iface) { IOCS *This = impl_from_IOleInPlaceFrame(iface); - return IOCS_Release(This); + return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT WINAPI OleInPlaceFrame_GetWindow(IOleInPlaceFrame *iface, HWND *phWnd) @@ -659,19 +669,19 @@ static HRESULT WINAPI OleControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) { IOCS *This = impl_from_IOleControlSite(iface); - return IOCS_QueryInterface(This, riid, ppv); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } static ULONG WINAPI OleControlSite_AddRef(IOleControlSite *iface) { IOCS *This = impl_from_IOleControlSite(iface); - return IOCS_AddRef(This); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); } static ULONG WINAPI OleControlSite_Release(IOleControlSite *iface) { IOCS *This = impl_from_IOleControlSite(iface); - return IOCS_Release(This); + return IOleClientSite_Release(&This->IOleClientSite_iface); } static HRESULT WINAPI OleControlSite_OnControlInfoChanged( IOleControlSite* This) @@ -794,26 +804,6 @@ OleControlSite_ShowPropertyFrame }; -static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ -{ - if ( This->hWnd ) - { - SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); - This->hWnd = NULL; - } - if ( This->control ) - { - IOleObject *control = This->control; - - This->control = NULL; - IOleObject_Close( control, OLECLOSE_NOSAVE ); - IOleObject_SetClientSite( control, NULL ); - IOleObject_Release( control ); - } - return S_OK; -} - static void IOCS_OnSize( IOCS* This, LPCRECT rect ) { SIZEL inPix, inHi; @@ -933,12 +923,15 @@ /********************************************************************** * Create new instance of Atl host component and attach it to window * */ -static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IOCS **ppSite ) +static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **container ) { HRESULT hr; IOCS *This; - *ppSite = NULL; + if (!container) + return S_OK; + + *container = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(IOCS)); if (!This) @@ -959,9 +952,12 @@ if ( SUCCEEDED( hr ) ) hr = IOCS_Init( This ); if ( SUCCEEDED( hr ) ) - *ppSite = This; + *container = (IUnknown*)&This->IOleClientSite_iface; else - IOCS_Release( This ); + { + IOCS_Detach( This ); + HeapFree(GetProcessHeap(), 0, This); + } return hr; } @@ -1086,26 +1082,17 @@ /*********************************************************************** * AtlAxAttachControl [atl100.@] */ -HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUnkContainer) -{ - IOCS *pUnkContainer; +HRESULT WINAPI AtlAxAttachControl(IUnknown *control, HWND hWnd, IUnknown **container) +{ HRESULT hr; - TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer ); - - if (!pControl) + TRACE("(%p %p %p)\n", control, hWnd, container); + + if (!control) return E_INVALIDARG; - hr = IOCS_Create( hWnd, pControl, &pUnkContainer ); - if ( SUCCEEDED( hr ) && ppUnkContainer) - { - *ppUnkContainer = (IUnknown*) pUnkContainer; - } - - if(!hWnd) - return S_FALSE; - - return hr; + hr = IOCS_Create( hWnd, control, container ); + return hWnd ? hr : S_FALSE; } /********************************************************************** @@ -1318,13 +1305,13 @@ * AtlAxGetHost [atl100.@] * */ -HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **pUnk) +HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host) { IOCS *This; - TRACE( "(%p, %p)\n", hWnd, pUnk ); - - *pUnk = NULL; + TRACE("(%p, %p)\n", hWnd, host); + + *host = NULL; This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); if ( !This ) @@ -1333,7 +1320,7 @@ return E_FAIL; } - return IOCS_QueryInterface( This, &IID_IUnknown, (void**) pUnk ); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, &IID_IUnknown, (void**)host); } /*********************************************************************** @@ -1379,3 +1366,29 @@ FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); return 0; } + +#if _ATL_VER >= _ATL_VER_80 + +/*********************************************************************** + * AtlAxCreateControlLic [atl100.59] + * + */ +HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) +{ + FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); + return E_NOTIMPL; +} + +/*********************************************************************** + * AtlAxCreateControlLicEx [atl100.60] + * + */ +HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +{ + FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, + debugstr_guid(iidSink), punkSink, debugstr_w(lic)); + return E_NOTIMPL; +} + +#endif Added: trunk/reactos/dll/win32/atl/atl_lib.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_lib.idl?… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_lib.idl (added) +++ trunk/reactos/dll/win32/atl/atl_lib.idl [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -0,0 +1,36 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib +#pragma makedep register + +import "atliface.idl"; + +[ + uuid(44ec0535-400f-11d0-9dcd-00a0c90391d3), + version(1.0), + helpstring("ATL 2.0 Type Library") +] +library ATLLib +{ + importlib("stdole2.tlb"); + + interface IDocHostUIHandlerDispatch; + interface IAxWinAmbientDispatch; + interface IAxWinAmbientDispatchEx; +} Propchange: trunk/reactos/dll/win32/atl/atl_lib.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/atl/atl_lib_r.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_lib_r.rg… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_lib_r.rgs (added) +++ trunk/reactos/dll/win32/atl/atl_lib_r.rgs [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -0,0 +1,9 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/atl/atl_lib_r.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/atl/atl_lib_t.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_lib_t.rg… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_lib_t.rgs (added) +++ trunk/reactos/dll/win32/atl/atl_lib_t.rgs [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -0,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{44EC0535-400F-11D0-9DCD-00A0C90391D3}' + { + '1.0' = s 'ATL 2.0 Type Library' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/atl/atl_lib_t.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/atl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/atl/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/rsrc.rc [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -1 +1,4 @@ 101 REGISTRY "atl.rgs" +1 TYPELIB atl_lib.tlb +1 WINE_REGISTRY "atl_lib_r.rgs" +2 WINE_REGISTRY "atl_lib_t.rgs" Modified: trunk/reactos/dll/win32/atl100/atl100.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl100.sp… ============================================================================== --- trunk/reactos/dll/win32/atl100/atl100.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl100/atl100.spec [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA Modified: trunk/reactos/dll/win32/atl80/atl80.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.spec… ============================================================================== --- trunk/reactos/dll/win32/atl80/atl80.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl80/atl80.spec [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -43,8 +43,8 @@ 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA Added: trunk/reactos/include/reactos/wine/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/atlco… ============================================================================== --- trunk/reactos/include/reactos/wine/atlcom.h (added) +++ trunk/reactos/include/reactos/wine/atlcom.h [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -0,0 +1,50 @@ +/* + * Copyright 2014 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ATLCOM_H__ +#define __WINE_ATLCOM_H__ + +#ifndef __WINE_ATLBASE_H__ +# error You must include atlbase.h to use this header +#endif + +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; +#if _ATL_VER < _ATL_VER_100 + DISPID dispid; + const CLSID *pclsidPropPage; + const IID *piidDispatch; +#else + const CLSID *pclsidPropPage; + const IID *piidDispatch; + void *rgclsidAllowed; + DWORD cclsidAllowed; + DISPID dispid; +#endif + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load(IStream*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistStreamInit_Save(IStream*, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Load(IPropertyBag*, IErrorLog*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Save(IPropertyBag*, BOOL, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); + +#endif /* __WINE_ATLCOM_H__ */ Propchange: trunk/reactos/include/reactos/wine/atlcom.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 26 11:39:07 2014 @@ -51,9 +51,9 @@ reactos/dll/win32/activeds # Synced to Wine-1.7.17 reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 reactos/dll/win32/advpack # Synced to Wine-1.7.27 -reactos/dll/win32/atl # Synced to Wine-1.7.17 -reactos/dll/win32/atl100 # Synced to Wine-1.7.17 -reactos/dll/win32/atl80 # Synced to Wine-1.7.17 +reactos/dll/win32/atl # Synced to Wine-1.7.27 +reactos/dll/win32/atl80 # Synced to Wine-1.7.27 +reactos/dll/win32/atl100 # Synced to Wine-1.7.27 reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 reactos/dll/win32/browseui # Out of sync

1 0

[akhaldi] 64309: [PSDK] * Update atliface.idl. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 11:28:49 2014 New Revision: 64309 URL: http://svn.reactos.org/svn/reactos?rev=64309&view=rev Log: [PSDK] * Update atliface.idl. CORE-8540 Modified: trunk/reactos/include/psdk/atliface.idl Modified: trunk/reactos/include/psdk/atliface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/atliface.idl?… ============================================================================== --- trunk/reactos/include/psdk/atliface.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/atliface.idl [iso-8859-1] Fri Sep 26 11:28:49 2014 @@ -76,12 +76,146 @@ [in] LPCOLESTR szType); } +[ + object, + uuid(425b5af0-65f1-11d1-9611-0000f81e0d0d) +] +interface IDocHostUIHandlerDispatch : IDispatch +{ + HRESULT ShowContextMenu([in] DWORD id, + [in] LONG x, + [in] LONG y, + [in] IUnknown *unkreserved, + [in] IDispatch *dispreserved, + [out, retval] HRESULT *retval); + HRESULT GetHostInfo([in, out] DWORD *flags, + [in, out] DWORD *doubleclick); + HRESULT ShowUI([in] DWORD id, + [in] IUnknown *activeobject, + [in] IUnknown *cmdtarget, + [in] IUnknown *frame, + [in] IUnknown *doc, + [out, retval] HRESULT *retval); + HRESULT HideUI(); + HRESULT UpdateUI(); + HRESULT EnableModeless([in] VARIANT_BOOL enable); + HRESULT OnDocWindowActivate([in] VARIANT_BOOL activate); + HRESULT OnFrameWindowActivate([in] VARIANT_BOOL activate); + HRESULT ResizeBorder([in] LONG left, + [in] LONG top, + [in] LONG right, + [in] LONG bottom, + [in] IUnknown *window, + [in] VARIANT_BOOL framewindow); + HRESULT TranslateAccelerator([in] HWND hwnd, + [in] UINT msg, + [in] WPARAM wparam, + [in] LPARAM lparam, + [in] BSTR guid_cmd_group, + [out, retval] HRESULT *retval); + HRESULT GetOptionKeyPath([out] BSTR *key, + [in] DWORD reserved); + HRESULT GetDropTarget([in] IUnknown *droptarget, + [out] IUnknown **ret_droptarget); + HRESULT GetExternal([out] IDispatch **disp); + HRESULT TranslateUrl([in] DWORD reserved, + [in] BSTR url, + [out] BSTR *translated_url); + HRESULT FilterDataObject([in] IUnknown *dataobject, + [out] IUnknown **dataobject_ret); +} + +[ + dual, + object, + oleautomation, + uuid(b6ea2051-048a-11d1-82b9-00c04fb9942e) +] +interface IAxWinAmbientDispatch : IDispatch +{ + [propput] + HRESULT AllowWindowlessActivation([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowWindowlessActivation([out, retval] VARIANT_BOOL *allowed); + [propput, id(-701)] + HRESULT BackColor([in] OLE_COLOR color); + [propget, id(-701)] + HRESULT BackColor([out, retval] OLE_COLOR *color); + [propput, id(-704)] + HRESULT ForeColor([in] OLE_COLOR color); + [propget, id(-704)] + HRESULT ForeColor([out, retval] OLE_COLOR *color); + [propput, id(-705)] + HRESULT LocaleID([in] LCID lcid); + [propget, id(-705)] + HRESULT LocaleID([out, retval] LCID *lcid); + [propput, id(-709)] + HRESULT UserMode([in] VARIANT_BOOL mode); + [propget, id(-709)] + HRESULT UserMode([out, retval] VARIANT_BOOL *mode); + [propput, id(-713)] + HRESULT DisplayAsDefault([in] VARIANT_BOOL display); + [propget, id(-713)] + HRESULT DisplayAsDefault([out, retval] VARIANT_BOOL *display); + [propput, id(-703)] + HRESULT Font([in] IFontDisp *font); + [propget, id(-703)] + HRESULT Font([out, retval] IFontDisp **font); + [propput, id(-706)] + HRESULT MessageReflect([in] VARIANT_BOOL reflect); + [propget, id(-706)] + HRESULT MessageReflect([out, retval] VARIANT_BOOL *reflect); + [propget, id(-711)] + HRESULT ShowGrabHandles([out, retval] VARIANT_BOOL *show); + [propget, id(-712)] + HRESULT ShowHatching([out, retval] VARIANT_BOOL *show); + [propput] + HRESULT DocHostFlags([in] DWORD flags); + [propget] + HRESULT DocHostFlags([out, retval] DWORD *flags); + [propput] + HRESULT DocHostDoubleClickFlags([in] DWORD flags); + [propget] + HRESULT DocHostDoubleClickFlags([out, retval] DWORD *flags); + [propput] + HRESULT AllowContextMenu([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowContextMenu([out, retval] VARIANT_BOOL *allow); + [propput] + HRESULT AllowShowUI([in] VARIANT_BOOL allow); + [propget] + HRESULT AllowShowUI([out, retval] VARIANT_BOOL *allow); + [propput] + HRESULT OptionKeyPath([in] BSTR path); + [propget] + HRESULT OptionKeyPath([out, retval] BSTR *path); +} + +[ + dual, + object, + oleautomation, + uuid(b2d0778b-ac99-4c58-a5c8-e7724e5316b5) +] +interface IAxWinAmbientDispatchEx : IAxWinAmbientDispatch +{ + [id(100)] + HRESULT SetAmbientDispatch([in] IDispatch *disp); +} + cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);") cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") +cpp_quote("HRESULT WINAPI AtlAxCreateControlLic(LPCOLESTR,HWND,IStream*,IUnknown**,BSTR);") +cpp_quote("HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*,BSTR);") cpp_quote("BOOL WINAPI AtlAxWinInit(void);") +cpp_quote("HRESULT WINAPI AtlAxGetControl(HWND,IUnknown**);") +cpp_quote("HRESULT WINAPI AtlAxGetHost(HWND,IUnknown**);") cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog)") +cpp_quote("INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("#define AtlAxDialogBox WINELIB_NAME_AW(AtlAxDialogBox)")

1 0

[akhaldi] 64308: [ADVPACK] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 10:23:40 2014 New Revision: 64308 URL: http://svn.reactos.org/svn/reactos?rev=64308&view=rev Log: [ADVPACK] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Fri Sep 26 10:23:40 2014 @@ -194,19 +194,6 @@ } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges. Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 26 10:23:40 2014 @@ -50,7 +50,7 @@ reactos/dll/win32/activeds # Synced to Wine-1.7.17 reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 -reactos/dll/win32/advpack # Synced to Wine-1.7.17 +reactos/dll/win32/advpack # Synced to Wine-1.7.27 reactos/dll/win32/atl # Synced to Wine-1.7.17 reactos/dll/win32/atl100 # Synced to Wine-1.7.17 reactos/dll/win32/atl80 # Synced to Wine-1.7.17

1 0

[akhaldi] 64307: [README.WINE] * Mark the rest of DX related dlls as synced with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:53:24 2014 New Revision: 64307 URL: http://svn.reactos.org/svn/reactos?rev=64307&view=rev Log: [README.WINE] * Mark the rest of DX related dlls as synced with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 26 09:53:24 2014 @@ -38,12 +38,12 @@ reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dplay # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dplay # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.27 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 -reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 +reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.27 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27 -reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17 +reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.27 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.27 reactos/dll/directx/wine/quartz # Synced to Wine-1.7.27 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.27

1 0

[akhaldi] 64306: [QUARTZ_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:51:20 2014 New Revision: 64306 URL: http://svn.reactos.org/svn/reactos?rev=64306&view=rev Log: [QUARTZ_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/referenceclock.c Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Fri Sep 26 09:51:20 2014 @@ -1847,17 +1847,17 @@ get_connected_filter_name(ptestfilter, ConnectedFilterName1); ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); - } - - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter3); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, - &CLSID_TestFilter4); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter2); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter3); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, + &CLSID_TestFilter4); + ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out: @@ -1877,7 +1877,6 @@ START_TEST(filtergraph) { HRESULT hr; - CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); @@ -1885,6 +1884,7 @@ skip("Creating filtergraph returned %08x, skipping tests\n", hr); return; } + IGraphBuilder_Release(pgraph); test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Fri Sep 26 09:51:20 2014 @@ -62,7 +62,7 @@ { CHAR val1[512], val2[512]; - WideCharToMultiByte(CP_ACP, 0, V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&var), -1, val1, sizeof(val1), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); if (!lstrcmpA(val1, val2)) found = TRUE; } @@ -87,7 +87,7 @@ CLSID clsidFilter1; CLSID clsidFilter2; IEnumMoniker *pEnum = NULL; - BOOL found; + BOOL found, registered = TRUE; ZeroMemory(&rgf2, sizeof(rgf2)); @@ -121,7 +121,10 @@ hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); if (hr == E_ACCESSDENIED) + { + registered = FALSE; skip("Not authorized to register filters\n"); + } else { ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); @@ -192,13 +195,16 @@ ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); } - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter1); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + if (registered) + { + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter1); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter2); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out: Modified: trunk/rostests/winetests/quartz/referenceclock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/referenc… ============================================================================== --- trunk/rostests/winetests/quartz/referenceclock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/referenceclock.c [iso-8859-1] Fri Sep 26 09:51:20 2014 @@ -28,19 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - IUnknown *pF; + void *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); } /* The following method expects a reference clock that will keep ticking for

1 0

[akhaldi] 64305: [QUARTZ] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: akhaldi Date: Fri Sep 26 09:51:00 2014 New Revision: 64305 URL: http://svn.reactos.org/svn/reactos?rev=64305&view=rev Log: [QUARTZ] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/dsoundrender.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/dll/directx/wine/quartz/videorenderer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -134,6 +134,7 @@ PullPin *pin = This->Parser.pInputPin; IMediaSample *sample = NULL; HRESULT hr; + ULONG ref; TRACE("(%p, %u)->()\n", This, streamnumber); @@ -247,7 +248,10 @@ hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) - assert(IMediaSample_Release(sample) == 0); + { + ref = IMediaSample_Release(sample); + assert(ref == 0); + } } else { @@ -261,7 +265,8 @@ if (sample) { ERR("There should be no sample!\n"); - assert(IMediaSample_Release(sample) == 0); + ref = IMediaSample_Release(sample); + assert(ref == 0); } } TRACE("--> %08x\n", hr); @@ -493,8 +498,8 @@ static HRESULT AVISplitter_done_process(LPVOID iface) { AVISplitterImpl *This = iface; - DWORD x; + ULONG ref; for (x = 0; x < This->Parser.cStreams; ++x) { @@ -508,7 +513,10 @@ stream->thread = NULL; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); @@ -1202,6 +1210,7 @@ { AVISplitterImpl *This = iface; DWORD x; + ULONG ref; TRACE("(%p)->()\n", This); @@ -1210,7 +1219,10 @@ StreamData *stream = This->streams + x; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -225,7 +225,7 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) { - while (1) + while (This->renderer.filter.state == State_Running) { DWORD pos1, pos2; DSoundRender_UpdatePositions(This, &pos1, &pos2); @@ -236,8 +236,8 @@ LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); WaitForSingleObject(This->blocked, 10); + EnterCriticalSection(&This->renderer.csRenderLock); EnterCriticalSection(&This->renderer.filter.csFilter); - EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; } Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -834,7 +834,7 @@ CloseHandle(This->hFile); This->csList.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csList); - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); return 0; } return refCount; Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -801,7 +801,7 @@ hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s\n", debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s\n", debugstr_w(V_BSTR(pvar))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -1050,7 +1050,7 @@ } } - hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); + hr = IFilterGraph2_AddFilter(iface, pfilter, V_BSTR(&var)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -1384,7 +1384,7 @@ goto error; } - hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); + hr = IFilterGraph2_AddFilter(iface, pfilter, V_BSTR(&var)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -1424,10 +1424,10 @@ IPin_Release(ppinfilter); if (FAILED(hr)) { - WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_UNION(&var, bstrVal)), hr); + WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_BSTR(&var)), hr); goto error; } - TRACE("Connected, recursing %s\n", debugstr_w(V_UNION(&var, bstrVal))); + TRACE("Connected, recursing %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -348,7 +348,7 @@ BSTR value; V_VT(&var) = VT_BSTR; - V_UNION(&var, bstrVal) = value = SysAllocString(szName); + V_BSTR(&var) = value = SysAllocString(szName); ret = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); SysFreeString(value); @@ -367,7 +367,7 @@ if (SUCCEEDED(hr)) { V_VT(&var) = VT_BSTR; - V_UNION(&var, bstrVal) = wszClsid; + V_BSTR(&var) = wszClsid; hr = IPropertyBag_Write(pPropBag, wszClsidName, &var); } CoTaskMemFree(wszClsid); @@ -779,7 +779,7 @@ } V_VT(&var) = VT_ARRAY | VT_UI1; - V_UNION(&var, parray) = psa; + V_ARRAY(&var) = psa; if (SUCCEEDED(hr)) hr = IPropertyBag_Write(pPropBag, wszFilterDataName, &var); @@ -928,7 +928,7 @@ if (SUCCEEDED(hrSub)) hrSub = IPropertyBag_Read(pPropBagCat, wszMeritName, &var, NULL); - if (SUCCEEDED(hrSub) && (V_UNION(&var, ulVal) >= dwMerit)) + if (SUCCEEDED(hrSub) && (V_UI4(&var) >= dwMerit)) { CLSID clsidCat; IEnumMoniker * pEnum; @@ -941,14 +941,14 @@ VARIANT temp; V_VT(&temp) = VT_EMPTY; IPropertyBag_Read(pPropBagCat, wszFriendlyName, &temp, NULL); - TRACE("Considering category %s\n", debugstr_w(V_UNION(&temp, bstrVal))); + TRACE("Considering category %s\n", debugstr_w(V_BSTR(&temp))); VariantClear(&temp); } hrSub = IPropertyBag_Read(pPropBagCat, wszClsidName, &var, NULL); if (SUCCEEDED(hrSub)) - hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsidCat); + hrSub = CLSIDFromString(V_BSTR(&var), &clsidCat); if (SUCCEEDED(hrSub)) hrSub = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); @@ -975,7 +975,7 @@ VARIANT temp; V_VT(&temp) = VT_EMPTY; IPropertyBag_Read(pPropBag, wszFriendlyName, &temp, NULL); - TRACE("Considering filter %s\n", debugstr_w(V_UNION(&temp, bstrVal))); + TRACE("Considering filter %s\n", debugstr_w(V_BSTR(&temp))); VariantClear(&temp); } @@ -985,13 +985,13 @@ } if (SUCCEEDED(hrSub)) - hrSub = SafeArrayAccessData(V_UNION(&var, parray), (LPVOID*)&pData); + hrSub = SafeArrayAccessData(V_ARRAY(&var), (LPVOID*)&pData); if (SUCCEEDED(hrSub)) hrSub = FM2_ReadFilterData(pData, &rf2); if (pData) - SafeArrayUnaccessData(V_UNION(&var, parray)); + SafeArrayUnaccessData(V_ARRAY(&var)); VariantClear(&var); @@ -1165,7 +1165,7 @@ if (FAILED(hr)) return hr; - + while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK) { IMoniker_Release(IMon); @@ -1185,7 +1185,7 @@ return E_OUTOFMEMORY; } ZeroMemory(regfilters, nb_mon * sizeof(REGFILTER)); /* will prevent bad free of Name in case of error. */ - + IEnumMoniker_Reset(ppEnumMoniker); while(IEnumMoniker_Next(ppEnumMoniker, 1, &IMon, &nb) == S_OK) { @@ -1203,7 +1203,7 @@ hrSub = IPropertyBag_Read(pPropBagCat, wszClsidName, &var, NULL); if (SUCCEEDED(hrSub)) - hrSub = CLSIDFromString(V_UNION(&var, bstrVal), &clsid); + hrSub = CLSIDFromString(V_BSTR(&var), &clsid); VariantClear(&var); @@ -1212,14 +1212,14 @@ if (SUCCEEDED(hrSub)) { - len = (strlenW(V_UNION(&var, bstrVal))+1) * sizeof(WCHAR); + len = (strlenW(V_BSTR(&var))+1) * sizeof(WCHAR); if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2))) hr = E_OUTOFMEMORY; } if (SUCCEEDED(hrSub) && regfilters[idx].Name) { - memcpy(regfilters[idx].Name, V_UNION(&var, bstrVal), len); + memcpy(regfilters[idx].Name, V_BSTR(&var), len); regfilters[idx].Clsid = clsid; idx++; } @@ -1239,7 +1239,7 @@ CoTaskMemFree(regfilters[idx].Name); CoTaskMemFree(regfilters); IEnumMoniker_Release(ppEnumMoniker); - + return hr; } @@ -1260,7 +1260,7 @@ { strcpyW(wszKeyName, wszFilterSlash); strcatW(wszKeyName, wszClsid); - + lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); hr = HRESULT_FROM_WIN32(lRet); } @@ -1276,7 +1276,7 @@ { strcpyW(wszKeyName, wszClsidSlash); strcatW(wszKeyName, wszClsid); - + lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); hr = HRESULT_FROM_WIN32(lRet); } @@ -1287,7 +1287,7 @@ hr = HRESULT_FROM_WIN32(lRet); RegCloseKey(hKey); } - + CoTaskMemFree(wszClsid); return hr; @@ -1347,7 +1347,7 @@ strcpyW(wszPinsKeyName, wszPins); strcatW(wszPinsKeyName, wszSlash); strcatW(wszPinsKeyName, szName); - + lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinsKeyName); Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -156,6 +156,7 @@ { IPin *connected = NULL; ULONG pinref; + HRESULT hr; assert(!This->filter.refCount); PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -164,9 +165,11 @@ IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect(&This->pInputPin->pin.IPin_iface) == S_OK); + hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); + assert(hr == S_OK); } pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); if (pinref) Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -592,7 +592,7 @@ if (list->pins[i].mediatypes[j].subtype) memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].subtype, sizeof(CLSID)); else { - /* Subtype are often a combination of major type + fourcc/tag */ + /* Subtypes are often a combination of major type + fourcc/tag */ memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].majortype, sizeof(CLSID)); *(DWORD*)(lpClsid + j*2 + 1) = list->pins[i].mediatypes[j].fourcc; } Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -352,11 +352,11 @@ if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); LeaveCriticalSection(iface->pInputPin->pin.pCritSec); + LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); - LeaveCriticalSection(&iface->filter.csFilter); WaitForSingleObject(This->hEvent, INFINITE); + EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); - EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 26 09:51:00 2014 @@ -45,7 +45,7 @@ reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.27 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.17 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.27 -reactos/dll/directx/wine/quartz # Synced to Wine-1.7.17 +reactos/dll/directx/wine/quartz # Synced to Wine-1.7.27 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.27 reactos/dll/win32/activeds # Synced to Wine-1.7.17

1 0

[ekohl] 64304: [UMPNPMGR] Use the stdcall calling convention for the PNP_* functions and export the missing functions.
by ekohl＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: ekohl Date: Fri Sep 26 09:47:02 2014 New Revision: 64304 URL: http://svn.reactos.org/svn/reactos?rev=64304&view=rev Log: [UMPNPMGR] Use the stdcall calling convention for the PNP_* functions and export the missing functions. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.spec trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Sep 26 09:47:02 2014 @@ -179,7 +179,9 @@ /* Function 0 */ -DWORD PNP_Disconnect( +DWORD +WINAPI +PNP_Disconnect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -188,7 +190,9 @@ /* Function 1 */ -DWORD PNP_Connect( +DWORD +WINAPI +PNP_Connect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -197,7 +201,9 @@ /* Function 2 */ -DWORD PNP_GetVersion( +DWORD +WINAPI +PNP_GetVersion( handle_t hBinding, WORD *pVersion) { @@ -209,7 +215,9 @@ /* Function 3 */ -DWORD PNP_GetGlobalState( +DWORD +WINAPI +PNP_GetGlobalState( handle_t hBinding, DWORD *pulState, DWORD ulFlags) @@ -223,7 +231,9 @@ /* Function 4 */ -DWORD PNP_InitDetection( +DWORD +WINAPI +PNP_InitDetection( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -234,7 +244,9 @@ /* Function 5 */ -DWORD PNP_ReportLogOn( +DWORD +WINAPI +PNP_ReportLogOn( handle_t hBinding, BOOL Admin, DWORD ProcessId) @@ -283,7 +295,9 @@ /* Function 6 */ -DWORD PNP_ValidateDeviceInstance( +DWORD +WINAPI +PNP_ValidateDeviceInstance( handle_t hBinding, LPWSTR pDeviceID, DWORD ulFlags) @@ -321,7 +335,9 @@ /* Function 7 */ -DWORD PNP_GetRootDeviceInstance( +DWORD +WINAPI +PNP_GetRootDeviceInstance( handle_t hBinding, LPWSTR pDeviceID, PNP_RPC_STRING_LEN ulLength) @@ -354,7 +370,9 @@ /* Function 8 */ -DWORD PNP_GetRelatedDeviceInstance( +DWORD +WINAPI +PNP_GetRelatedDeviceInstance( handle_t hBinding, DWORD ulRelationship, LPWSTR pDeviceID, @@ -400,7 +418,9 @@ /* Function 9 */ -DWORD PNP_EnumerateSubKeys( +DWORD +WINAPI +PNP_EnumerateSubKeys( handle_t hBinding, DWORD ulBranch, DWORD ulIndex, @@ -457,7 +477,9 @@ /* Function 10 */ -DWORD PNP_GetDeviceList( +DWORD +WINAPI +PNP_GetDeviceList( handle_t hBinding, LPWSTR pszFilter, LPWSTR Buffer, @@ -470,7 +492,9 @@ /* Function 11 */ -DWORD PNP_GetDeviceListSize( +DWORD +WINAPI +PNP_GetDeviceListSize( handle_t hBinding, LPWSTR pszFilter, PNP_RPC_BUFFER_SIZE *pulLen, @@ -482,7 +506,9 @@ /* Function 12 */ -DWORD PNP_GetDepth( +DWORD +WINAPI +PNP_GetDepth( handle_t hBinding, LPWSTR pszDeviceID, DWORD *pulDepth, @@ -519,7 +545,9 @@ /* Function 13 */ -DWORD PNP_GetDeviceRegProp( +DWORD +WINAPI +PNP_GetDeviceRegProp( handle_t hBinding, LPWSTR pDeviceID, DWORD ulProperty, @@ -838,7 +866,9 @@ /* Function 14 */ -DWORD PNP_SetDeviceRegProp( +DWORD +WINAPI +PNP_SetDeviceRegProp( handle_t hBinding, LPWSTR pDeviceId, DWORD ulProperty, @@ -978,7 +1008,9 @@ /* Function 15 */ -DWORD PNP_GetClassInstance( +DWORD +WINAPI +PNP_GetClassInstance( handle_t hBinding, LPWSTR pDeviceId, LPWSTR pszClassInstance, @@ -990,7 +1022,9 @@ /* Function 16 */ -DWORD PNP_CreateKey( +DWORD +WINAPI +PNP_CreateKey( handle_t hBinding, LPWSTR pszSubKey, DWORD samDesired, @@ -1018,7 +1052,9 @@ /* Function 17 */ -DWORD PNP_DeleteRegistryKey( +DWORD +WINAPI +PNP_DeleteRegistryKey( handle_t hBinding, LPWSTR pszDeviceID, LPWSTR pszParentKey, @@ -1031,7 +1067,9 @@ /* Function 18 */ -DWORD PNP_GetClassCount( +DWORD +WINAPI +PNP_GetClassCount( handle_t hBinding, DWORD *pulClassCount, DWORD ulFlags) @@ -1071,7 +1109,9 @@ /* Function 19 */ -DWORD PNP_GetClassName( +DWORD +WINAPI +PNP_GetClassName( handle_t hBinding, LPWSTR pszClassGuid, LPWSTR Buffer, @@ -1125,7 +1165,9 @@ /* Function 20 */ -DWORD PNP_DeleteClassKey( +DWORD +WINAPI +PNP_DeleteClassKey( handle_t hBinding, LPWSTR pszClassGuid, DWORD ulFlags) @@ -1154,7 +1196,9 @@ /* Function 21 */ -DWORD PNP_GetInterfaceDeviceAlias( +DWORD +WINAPI +PNP_GetInterfaceDeviceAlias( handle_t hBinding, LPWSTR pszInterfaceDevice, GUID *AliasInterfaceGuid, @@ -1169,7 +1213,9 @@ /* Function 22 */ -DWORD PNP_GetInterfaceDeviceList( +DWORD +WINAPI +PNP_GetInterfaceDeviceList( handle_t hBinding, GUID *InterfaceGuid, LPWSTR pszDeviceID, @@ -1183,7 +1229,9 @@ /* Function 23 */ -DWORD PNP_GetInterfaceDeviceListSize( +DWORD +WINAPI +PNP_GetInterfaceDeviceListSize( handle_t hBinding, PNP_RPC_BUFFER_SIZE *pulLen, GUID *InterfaceGuid, @@ -1196,7 +1244,9 @@ /* Function 24 */ -DWORD PNP_RegisterDeviceClassAssociation( +DWORD +WINAPI +PNP_RegisterDeviceClassAssociation( handle_t hBinding, LPWSTR pszDeviceID, GUID *InterfaceGuid, @@ -1212,7 +1262,9 @@ /* Function 25 */ -DWORD PNP_UnregisterDeviceClassAssociation( +DWORD +WINAPI +PNP_UnregisterDeviceClassAssociation( handle_t hBinding, LPWSTR pszInterfaceDevice, DWORD ulFlags) @@ -1223,7 +1275,9 @@ /* Function 26 */ -DWORD PNP_GetClassRegProp( +DWORD +WINAPI +PNP_GetClassRegProp( handle_t hBinding, LPWSTR pszClassGuid, DWORD ulProperty, @@ -1345,7 +1399,9 @@ /* Function 27 */ -DWORD PNP_SetClassRegProp( +DWORD +WINAPI +PNP_SetClassRegProp( handle_t hBinding, LPWSTR pszClassGuid, DWORD ulProperty, @@ -1596,7 +1652,9 @@ /* Function 28 */ -DWORD PNP_CreateDevInst( +DWORD +WINAPI +PNP_CreateDevInst( handle_t hBinding, LPWSTR pszDeviceID, LPWSTR pszParentDeviceID, @@ -1708,7 +1766,9 @@ /* Function 29 */ -DWORD PNP_DeviceInstanceAction( +DWORD +WINAPI +PNP_DeviceInstanceAction( handle_t hBinding, DWORD ulAction, DWORD ulFlags, @@ -1757,7 +1817,9 @@ /* Function 30 */ -DWORD PNP_GetDeviceStatus( +DWORD +WINAPI +PNP_GetDeviceStatus( handle_t hBinding, LPWSTR pDeviceID, DWORD *pulStatus, @@ -1797,7 +1859,9 @@ /* Function 31 */ -DWORD PNP_SetDeviceProblem( +DWORD +WINAPI +PNP_SetDeviceProblem( handle_t hBinding, LPWSTR pDeviceID, DWORD ulProblem, @@ -1809,7 +1873,9 @@ /* Function 32 */ -DWORD PNP_DisableDevInst( +DWORD +WINAPI +PNP_DisableDevInst( handle_t hBinding, LPWSTR pDeviceID, PPNP_VETO_TYPE pVetoType, @@ -1822,7 +1888,9 @@ } /* Function 33 */ -DWORD PNP_UninstallDevInst( +DWORD +WINAPI +PNP_UninstallDevInst( handle_t hBinding, LPWSTR pDeviceID, DWORD ulFlags) @@ -1875,7 +1943,9 @@ /* Function 34 */ -DWORD PNP_AddID( +DWORD +WINAPI +PNP_AddID( handle_t hBinding, LPWSTR pszDeviceID, LPWSTR pszID, @@ -1982,7 +2052,9 @@ /* Function 35 */ -DWORD PNP_RegisterDriver( +DWORD +WINAPI +PNP_RegisterDriver( handle_t hBinding, LPWSTR pszDeviceID, DWORD ulFlags) @@ -1993,7 +2065,9 @@ /* Function 36 */ -DWORD PNP_QueryRemove( +DWORD +WINAPI +PNP_QueryRemove( handle_t hBinding, LPWSTR pszDeviceID, PPNP_VETO_TYPE pVetoType, @@ -2007,7 +2081,9 @@ /* Function 37 */ -DWORD PNP_RequestDeviceEject( +DWORD +WINAPI +PNP_RequestDeviceEject( handle_t hBinding, LPWSTR pszDeviceID, PPNP_VETO_TYPE pVetoType, @@ -2019,10 +2095,13 @@ return CR_CALL_NOT_IMPLEMENTED; } + /* Function 38 */ CONFIGRET -PNP_IsDockStationPresent(handle_t hBinding, - BOOL *Present) +WINAPI +PNP_IsDockStationPresent( + handle_t hBinding, + BOOL *Present) { HKEY hKey; DWORD dwType; @@ -2073,7 +2152,9 @@ /* Function 39 */ -DWORD PNP_RequestEjectPC( +DWORD +WINAPI +PNP_RequestEjectPC( handle_t hBinding) { UNIMPLEMENTED; @@ -2082,7 +2163,9 @@ /* Function 40 */ -DWORD PNP_HwProfFlags( +DWORD +WINAPI +PNP_HwProfFlags( handle_t hBinding, DWORD ulAction, LPWSTR pDeviceID, @@ -2161,7 +2244,9 @@ /* Function 41 */ -DWORD PNP_GetHwProfInfo( +DWORD +WINAPI +PNP_GetHwProfInfo( handle_t hBinding, DWORD ulIndex, HWPROFILEINFO *pHWProfileInfo, @@ -2294,7 +2379,9 @@ /* Function 42 */ -DWORD PNP_AddEmptyLogConf( +DWORD +WINAPI +PNP_AddEmptyLogConf( handle_t hBinding, LPWSTR pDeviceID, DWORD ulPriority, @@ -2307,7 +2394,9 @@ /* Function 43 */ -DWORD PNP_FreeLogConf( +DWORD +WINAPI +PNP_FreeLogConf( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfType, @@ -2320,7 +2409,9 @@ /* Function 44 */ -DWORD PNP_GetFirstLogConf( +DWORD +WINAPI +PNP_GetFirstLogConf( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfType, @@ -2333,7 +2424,9 @@ /* Function 45 */ -DWORD PNP_GetNextLogConf( +DWORD +WINAPI +PNP_GetNextLogConf( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfType, @@ -2347,7 +2440,9 @@ /* Function 46 */ -DWORD PNP_GetLogConfPriority( +DWORD +WINAPI +PNP_GetLogConfPriority( handle_t hBinding, LPWSTR pDeviceID, DWORD ulType, @@ -2361,7 +2456,9 @@ /* Function 47 */ -DWORD PNP_AddResDes( +DWORD +WINAPI +PNP_AddResDes( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2378,7 +2475,9 @@ /* Function 48 */ -DWORD PNP_FreeResDes( +DWORD +WINAPI +PNP_FreeResDes( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2395,7 +2494,9 @@ /* Function 49 */ -DWORD PNP_GetNextResDes( +DWORD +WINAPI +PNP_GetNextResDes( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2412,7 +2513,9 @@ /* Function 50 */ -DWORD PNP_GetResDesData( +DWORD +WINAPI +PNP_GetResDesData( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2429,7 +2532,9 @@ /* Function 51 */ -DWORD PNP_GetResDesDataSize( +DWORD +WINAPI +PNP_GetResDesDataSize( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2445,7 +2550,9 @@ /* Function 52 */ -DWORD PNP_ModifyResDes( +DWORD +WINAPI +PNP_ModifyResDes( handle_t hBinding, LPWSTR pDeviceID, DWORD ulLogConfTag, @@ -2463,7 +2570,9 @@ /* Function 53 */ -DWORD PNP_DetectResourceConflict( +DWORD +WINAPI +PNP_DetectResourceConflict( handle_t hBinding, LPWSTR pDeviceID, RESOURCEID ResourceID, @@ -2478,7 +2587,9 @@ /* Function 54 */ -DWORD PNP_QueryResConfList( +DWORD +WINAPI +PNP_QueryResConfList( handle_t hBinding, LPWSTR pDeviceID, RESOURCEID ResourceID, @@ -2494,7 +2605,9 @@ /* Function 55 */ -DWORD PNP_SetHwProf( +DWORD +WINAPI +PNP_SetHwProf( handle_t hBinding, DWORD ulHardwareProfile, DWORD ulFlags) @@ -2505,7 +2618,9 @@ /* Function 56 */ -DWORD PNP_QueryArbitratorFreeData( +DWORD +WINAPI +PNP_QueryArbitratorFreeData( handle_t hBinding, BYTE *pData, DWORD DataLen, @@ -2519,7 +2634,9 @@ /* Function 57 */ -DWORD PNP_QueryArbitratorFreeSize( +DWORD +WINAPI +PNP_QueryArbitratorFreeSize( handle_t hBinding, DWORD *pulSize, LPWSTR pDeviceID, @@ -2533,6 +2650,7 @@ /* Function 58 */ CONFIGRET +WINAPI PNP_RunDetection( handle_t hBinding, DWORD ulFlags) @@ -2542,7 +2660,9 @@ /* Function 59 */ -DWORD PNP_RegisterNotification( +DWORD +WINAPI +PNP_RegisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -2551,7 +2671,9 @@ /* Function 60 */ -DWORD PNP_UnregisterNotification( +DWORD +WINAPI +PNP_UnregisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -2560,7 +2682,9 @@ /* Function 61 */ -DWORD PNP_GetCustomDevProp( +DWORD +WINAPI +PNP_GetCustomDevProp( handle_t hBinding, LPWSTR pDeviceID, LPWSTR CustomPropName, @@ -2654,19 +2778,21 @@ /* Function 62 */ -DWORD PNP_GetVersionInternal( +DWORD +WINAPI +PNP_GetVersionInternal( handle_t hBinding, WORD *pwVersion) { *pwVersion = 0x501; return CR_SUCCESS; - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; } /* Function 63 */ -DWORD PNP_GetBlockedDriverInfo( +DWORD +WINAPI +PNP_GetBlockedDriverInfo( handle_t hBinding, BYTE *Buffer, PNP_RPC_BUFFER_SIZE *pulTransferLen, @@ -2679,7 +2805,9 @@ /* Function 64 */ -DWORD PNP_GetServerSideDeviceInstallFlags( +DWORD +WINAPI +PNP_GetServerSideDeviceInstallFlags( handle_t hBinding, DWORD *pulSSDIFlags, DWORD ulFlags) @@ -2690,7 +2818,9 @@ /* Function 65 */ -DWORD PNP_GetObjectPropKeys( +DWORD +WINAPI +PNP_GetObjectPropKeys( handle_t hBinding, LPWSTR ObjectName, DWORD ObjectType, @@ -2706,7 +2836,9 @@ /* Function 66 */ -DWORD PNP_GetObjectProp( +DWORD +WINAPI +PNP_GetObjectProp( handle_t hBinding, LPWSTR ObjectName, DWORD ObjectType, @@ -2724,7 +2856,9 @@ /* Function 67 */ -DWORD PNP_SetObjectProp( +DWORD +WINAPI +PNP_SetObjectProp( handle_t hBinding, LPWSTR ObjectName, DWORD ObjectType, @@ -2741,7 +2875,9 @@ /* Function 68 */ -DWORD PNP_InstallDevInst( +DWORD +WINAPI +PNP_InstallDevInst( handle_t hBinding) { UNIMPLEMENTED; @@ -2750,7 +2886,9 @@ /* Function 69 */ -DWORD PNP_ApplyPowerSettings( +DWORD +WINAPI +PNP_ApplyPowerSettings( handle_t hBinding) { UNIMPLEMENTED; @@ -2759,7 +2897,9 @@ /* Function 70 */ -DWORD PNP_DriverStoreAddDriverPackage( +DWORD +WINAPI +PNP_DriverStoreAddDriverPackage( handle_t hBinding) { UNIMPLEMENTED; @@ -2768,7 +2908,9 @@ /* Function 71 */ -DWORD PNP_DriverStoreDeleteDriverPackage( +DWORD +WINAPI +PNP_DriverStoreDeleteDriverPackage( handle_t hBinding) { UNIMPLEMENTED; @@ -2777,7 +2919,9 @@ /* Function 72 */ -DWORD PNP_RegisterServiceNotification( +DWORD +WINAPI +PNP_RegisterServiceNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -2786,7 +2930,9 @@ /* Function 73 */ -DWORD PNP_SetActiveService( +DWORD +WINAPI +PNP_SetActiveService( handle_t hBinding, LPWSTR pszFilter, DWORD ulFlags) @@ -2797,7 +2943,9 @@ /* Function 74 */ -DWORD PNP_DeleteServiceDevices( +DWORD +WINAPI +PNP_DeleteServiceDevices( handle_t hBinding) { UNIMPLEMENTED; Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.spec [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.spec [iso-8859-1] Fri Sep 26 09:47:02 2014 @@ -1,13 +1,10 @@ @ stub DeleteServicePlugPlayRegKeys -;;; FIXME: Windows UMPNPMGR exports those APIs. -;;; Fix their calling convention before enabling these exports!! - -;@ stdcall PNP_GetDeviceList(long ptr ptr ptr long) -;@ stdcall PNP_GetDeviceListSize(long ptr ptr long) -;@ stdcall PNP_GetDeviceRegProp(long ptr long ptr ptr ptr ptr long) -;@ stdcall PNP_HwProfFlags(long long ptr long ptr ptr ptr long long) -;@ stdcall PNP_SetActiveService(long ptr long) +@ stdcall PNP_GetDeviceList(long ptr ptr ptr long) +@ stdcall PNP_GetDeviceListSize(long ptr ptr long) +@ stdcall PNP_GetDeviceRegProp(long ptr long ptr ptr ptr ptr long) +@ stdcall PNP_HwProfFlags(long long ptr long ptr ptr ptr long long) +@ stdcall PNP_SetActiveService(long ptr long) @ stub RegisterScmCallback @ stub RegisterServiceNotification Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Fri Sep 26 09:47:02 2014 @@ -261,42 +261,58 @@ interface pnp { /* Function 0 */ - DWORD PNP_Disconnect( + DWORD + __stdcall + PNP_Disconnect( [in] handle_t hBinding); /* FIXME */ /* Function 1 */ - DWORD PNP_Connect( + DWORD + __stdcall + PNP_Connect( [in] handle_t hBinding); /* FIXME */ /* Function 2 */ - DWORD PNP_GetVersion( + DWORD + __stdcall + PNP_GetVersion( [in] handle_t hBinding, [out] WORD *pVersion); /* Function 3 */ - DWORD PNP_GetGlobalState( + DWORD + __stdcall + PNP_GetGlobalState( [in] handle_t hBinding, [out] DWORD *pulState, [in] DWORD ulFlags); /* Function 4 */ - DWORD PNP_InitDetection( + DWORD + __stdcall + PNP_InitDetection( [in] handle_t hBinding); /* Function 5 */ - DWORD PNP_ReportLogOn( + DWORD + __stdcall + PNP_ReportLogOn( [in] handle_t hBinding, [in] BOOL Admin, [in] DWORD ProcessId); /* Function 6 */ - DWORD PNP_ValidateDeviceInstance( + DWORD + __stdcall + PNP_ValidateDeviceInstance( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulFlags); /* Function 7 */ - DWORD PNP_GetRootDeviceInstance( + DWORD + __stdcall + PNP_GetRootDeviceInstance( [in] handle_t hBinding, [out, string, size_is(ulLength)] LPWSTR pDeviceID, [in] PNP_RPC_STRING_LEN ulLength); @@ -305,7 +321,9 @@ cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE 0x1") cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE 0x2") cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3") - DWORD PNP_GetRelatedDeviceInstance( + DWORD + __stdcall + PNP_GetRelatedDeviceInstance( [in] handle_t hBinding, [in] DWORD ulRelationship, [in, string, ref] LPWSTR pDeviceID, @@ -316,7 +334,9 @@ /* Function 9 */ cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1") cpp_quote("#define PNP_CLASS_SUBKEYS 0x2") - DWORD PNP_EnumerateSubKeys( + DWORD + __stdcall + PNP_EnumerateSubKeys( [in] handle_t hBinding, [in] DWORD ulBranch, [in] DWORD ulIndex, @@ -326,7 +346,9 @@ [in] DWORD ulFlags); /* Function 10 */ - DWORD PNP_GetDeviceList( + DWORD + __stdcall + PNP_GetDeviceList( [in] handle_t hBinding, [in, string, unique] LPWSTR pszFilter, [out, size_is(*pulLength), length_is(*pulLength)] LPWSTR Buffer, @@ -334,21 +356,27 @@ [in] DWORD ulFlags); /* Function 11 */ - DWORD PNP_GetDeviceListSize( + DWORD + __stdcall + PNP_GetDeviceListSize( [in] handle_t hBinding, [in, string, unique] LPWSTR pszFilter, [out] PNP_RPC_BUFFER_SIZE *pulLen, [in] DWORD ulFlags); /* Function 12 */ - DWORD PNP_GetDepth( + DWORD + __stdcall + PNP_GetDepth( [in] handle_t hBinding, [in, string, ref] LPWSTR pszDeviceID, [out] DWORD *pulDepth, [in] DWORD ulFlags); /* Function 13 */ - DWORD PNP_GetDeviceRegProp( + DWORD + __stdcall + PNP_GetDeviceRegProp( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulProperty, @@ -359,7 +387,9 @@ [in] DWORD ulFlags); /* Function 14 */ - DWORD PNP_SetDeviceRegProp( + DWORD + __stdcall + PNP_SetDeviceRegProp( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceId, [in] DWORD ulProperty, @@ -369,21 +399,27 @@ [in] DWORD ulFlags); /* Function 15 */ - DWORD PNP_GetClassInstance( + DWORD + __stdcall + PNP_GetClassInstance( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceId, [out, string, size_is(ulLength)] LPWSTR pszClassInstance, [in] PNP_RPC_STRING_LEN ulLength); /* Function 16 */ - DWORD PNP_CreateKey( + DWORD + __stdcall + PNP_CreateKey( [in] handle_t hBinding, [in, string, ref] LPWSTR pszSubKey, [in] DWORD samDesired, [in] DWORD ulFlags); /* Function 17 */ - DWORD PNP_DeleteRegistryKey( + DWORD + __stdcall + PNP_DeleteRegistryKey( [in] handle_t hBinding, [in, string, ref] LPWSTR pszDeviceID, [in, string, ref] LPWSTR pszParentKey, @@ -391,13 +427,17 @@ [in] DWORD ulFlags); /* Function 18 */ - DWORD PNP_GetClassCount( + DWORD + __stdcall + PNP_GetClassCount( [in] handle_t hBinding, [out] DWORD *pulClassCount, [in] DWORD ulFlags); /* Function 19 */ - DWORD PNP_GetClassName( + DWORD + __stdcall + PNP_GetClassName( [in] handle_t hBinding, [in, string, ref] LPWSTR pszClassGuid, [out, string, size_is(*pulLength)] LPWSTR Buffer, @@ -405,13 +445,17 @@ [in] DWORD ulFlags); /* Function 20 */ - DWORD PNP_DeleteClassKey( + DWORD + __stdcall + PNP_DeleteClassKey( [in] handle_t hBinding, [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulFlags); /* Function 21 */ - DWORD PNP_GetInterfaceDeviceAlias( + DWORD + __stdcall + PNP_GetInterfaceDeviceAlias( [in] handle_t hBinding, [in, string, ref] LPWSTR pszInterfaceDevice, [in] GUID *AliasInterfaceGuid, @@ -421,7 +465,9 @@ [in] DWORD ulFlags); /* Function 22 */ - DWORD PNP_GetInterfaceDeviceList( + DWORD + __stdcall + PNP_GetInterfaceDeviceList( [in] handle_t hBinding, [in] GUID *InterfaceGuid, [in, string, unique] LPWSTR pszDeviceID, @@ -430,7 +476,9 @@ [in] DWORD ulFlags); /* Function 23 */ - DWORD PNP_GetInterfaceDeviceListSize( + DWORD + __stdcall + PNP_GetInterfaceDeviceListSize( [in] handle_t hBinding, [out] PNP_RPC_BUFFER_SIZE *pulLen, [in] GUID *InterfaceGuid, @@ -438,7 +486,9 @@ [in] DWORD ulFlags); /* Function 24 */ - DWORD PNP_RegisterDeviceClassAssociation( + DWORD + __stdcall + PNP_RegisterDeviceClassAssociation( [in] handle_t hBinding, [in, string, unique] LPWSTR pszDeviceID, [in] GUID *InterfaceGuid, @@ -449,13 +499,17 @@ [in] DWORD ulFlags); /* Function 25 */ - DWORD PNP_UnregisterDeviceClassAssociation( + DWORD + __stdcall + PNP_UnregisterDeviceClassAssociation( [in] handle_t hBinding, [in, string, unique] LPWSTR pszInterfaceDevice, [in] DWORD ulFlags); /* Function 26 */ - DWORD PNP_GetClassRegProp( + DWORD + __stdcall + PNP_GetClassRegProp( [in] handle_t hBinding, [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulProperty, @@ -466,7 +520,9 @@ [in] DWORD ulFlags); /* Function 27 */ - DWORD PNP_SetClassRegProp( + DWORD + __stdcall + PNP_SetClassRegProp( [in] handle_t hBinding, [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulProperty, @@ -476,7 +532,9 @@ [in] DWORD ulFlags); /* Function 28 */ - DWORD PNP_CreateDevInst( + DWORD + __stdcall + PNP_CreateDevInst( [in] handle_t hBinding, [in, out, string, size_is(ulLength)] LPWSTR pszDeviceID, [in, string, ref] LPWSTR pszParentDeviceID, @@ -489,7 +547,9 @@ cpp_quote("#define PNP_DEVINST_ENABLE 0x4") cpp_quote("#define PNP_DEVINST_DISABLE 0x5") cpp_quote("#define PNP_DEVINST_REENUMERATE 0x7") - DWORD PNP_DeviceInstanceAction( + DWORD + __stdcall + PNP_DeviceInstanceAction( [in] handle_t hBinding, [in] DWORD ulAction, [in] DWORD ulFlags, @@ -497,7 +557,9 @@ [in, string, unique] LPWSTR pszDeviceInstance2); /* Function 30 */ - DWORD PNP_GetDeviceStatus( + DWORD + __stdcall + PNP_GetDeviceStatus( [in] handle_t hBinding, [in, string, unique] LPWSTR pDeviceID, [out] DWORD *pulStatus, @@ -505,14 +567,18 @@ [in] DWORD ulFlags); /* Function 31 */ - DWORD PNP_SetDeviceProblem( + DWORD + __stdcall + PNP_SetDeviceProblem( [in] handle_t hBinding, [in, string, unique] LPWSTR pDeviceID, [in] DWORD ulProblem, [in] DWORD ulFlags); /* Function 32 */ - DWORD PNP_DisableDevInst( + DWORD + __stdcall + PNP_DisableDevInst( [in] handle_t hBinding, [in, string, unique] LPWSTR pDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, @@ -521,26 +587,34 @@ [in] DWORD ulFlags); /* Function 33 */ - DWORD PNP_UninstallDevInst( + DWORD + __stdcall + PNP_UninstallDevInst( [in] handle_t hBinding, [in, string, unique] LPWSTR pDeviceID, [in] DWORD ulFlags); /* Function 34 */ - DWORD PNP_AddID( + DWORD + __stdcall + PNP_AddID( [in] handle_t hBinding, [in, string, unique] LPWSTR pszDeviceID, [in, string, ref] LPWSTR pszID, [in] DWORD ulFlags); /* Function 35 */ - DWORD PNP_RegisterDriver( + DWORD + __stdcall + PNP_RegisterDriver( [in] handle_t hBinding, [in, string, ref] LPWSTR pszDeviceID, [in] DWORD ulFlags); /* Function 36 */ - DWORD PNP_QueryRemove( + DWORD + __stdcall + PNP_QueryRemove( [in] handle_t hBinding, [in, string, ref] LPWSTR pszDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, @@ -549,7 +623,9 @@ [in] DWORD ulFlags); /* Function 37 */ - DWORD PNP_RequestDeviceEject( + DWORD + __stdcall + PNP_RequestDeviceEject( [in] handle_t hBinding, [in, string, ref] LPWSTR pszDeviceID, [in, out, unique] PPNP_VETO_TYPE pVetoType, @@ -558,18 +634,24 @@ [in] DWORD ulFlags); /* Function 38 */ - DWORD PNP_IsDockStationPresent( + DWORD + __stdcall + PNP_IsDockStationPresent( [in] handle_t hBinding, [in, out, unique] BOOL *Present); /* Function 39 */ - DWORD PNP_RequestEjectPC( + DWORD + __stdcall + PNP_RequestEjectPC( [in] handle_t hBinding); /* Function 40 */ cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1") cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2") - DWORD PNP_HwProfFlags( + DWORD + __stdcall + PNP_HwProfFlags( [in] handle_t hBinding, [in] DWORD ulAction, [in, string, ref] LPWSTR pDeviceID, @@ -581,7 +663,9 @@ [in] DWORD ulFlags); /* Function 41 */ - DWORD PNP_GetHwProfInfo( + DWORD + __stdcall + PNP_GetHwProfInfo( [in] handle_t hBinding, [in] DWORD ulIndex, [in, out, ref] HWPROFILEINFO *pHWProfileInfo, @@ -590,7 +674,9 @@ [in] DWORD ulFlags); /* Function 42 */ - DWORD PNP_AddEmptyLogConf( + DWORD + __stdcall + PNP_AddEmptyLogConf( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulPriority, @@ -598,7 +684,9 @@ [in] DWORD ulFlags); /* Function 43 */ - DWORD PNP_FreeLogConf( + DWORD + __stdcall + PNP_FreeLogConf( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, @@ -606,7 +694,9 @@ [in] DWORD ulFlags); /* Function 44 */ - DWORD PNP_GetFirstLogConf( + DWORD + __stdcall + PNP_GetFirstLogConf( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, @@ -614,7 +704,9 @@ [in] DWORD ulFlags); /* Function 45 */ - DWORD PNP_GetNextLogConf( + DWORD + __stdcall + PNP_GetNextLogConf( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfType, @@ -623,7 +715,9 @@ [in] DWORD ulFlags); /* Function 46 */ - DWORD PNP_GetLogConfPriority( + DWORD + __stdcall + PNP_GetLogConfPriority( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulType, @@ -632,7 +726,9 @@ [in] DWORD ulFlags); /* Function 47 */ - DWORD PNP_AddResDes( + DWORD + __stdcall + PNP_AddResDes( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -644,7 +740,9 @@ [in] DWORD ulFlags); /* Function 48 */ - DWORD PNP_FreeResDes( + DWORD + __stdcall + PNP_FreeResDes( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -656,7 +754,9 @@ [in] DWORD ulFlags); /* Function 49 */ - DWORD PNP_GetNextResDes( + DWORD + __stdcall + PNP_GetNextResDes( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -668,7 +768,9 @@ [in] DWORD ulFlags); /* Function 50 */ - DWORD PNP_GetResDesData( + DWORD + __stdcall + PNP_GetResDesData( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -680,7 +782,9 @@ [in] DWORD ulFlags); /* Function 51 */ - DWORD PNP_GetResDesDataSize( + DWORD + __stdcall + PNP_GetResDesDataSize( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -691,7 +795,9 @@ [in] DWORD ulFlags); /* Function 52 */ - DWORD PNP_ModifyResDes( + DWORD + __stdcall + PNP_ModifyResDes( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] DWORD ulLogConfTag, @@ -704,7 +810,9 @@ [in] DWORD ulFlags); /* Function 53 */ - DWORD PNP_DetectResourceConflict( + DWORD + __stdcall + PNP_DetectResourceConflict( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] RESOURCEID ResourceID, @@ -714,7 +822,9 @@ [in] DWORD ulFlags); /* Function 54 */ - DWORD PNP_QueryResConfList( + DWORD + __stdcall + PNP_QueryResConfList( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in] RESOURCEID ResourceID, @@ -725,13 +835,17 @@ [in] DWORD ulFlags); /* Function 55 */ - DWORD PNP_SetHwProf( + DWORD + __stdcall + PNP_SetHwProf( [in] handle_t hBinding, [in] DWORD ulHardwareProfile, [in] DWORD ulFlags); /* Function 56 */ - DWORD PNP_QueryArbitratorFreeData( + DWORD + __stdcall + PNP_QueryArbitratorFreeData( [in] handle_t hBinding, [out,size_is(DataLen)] BYTE *pData, [in] DWORD DataLen, @@ -740,7 +854,9 @@ [in] DWORD ulFlags); /* Function 57 */ - DWORD PNP_QueryArbitratorFreeSize( + DWORD + __stdcall + PNP_QueryArbitratorFreeSize( [in] handle_t hBinding, [out] DWORD *pulSize, [in, string, ref] LPWSTR pDeviceID, @@ -748,22 +864,30 @@ [in] DWORD ulFlags); /* Function 58 */ - DWORD PNP_RunDetection( + DWORD + __stdcall + PNP_RunDetection( [in] handle_t hBinding, [in] DWORD ulFlags); /* Function 59 */ - DWORD PNP_RegisterNotification( + DWORD + __stdcall + PNP_RegisterNotification( [in] handle_t hBinding); /* Function 60 */ - DWORD PNP_UnregisterNotification( + DWORD + __stdcall + PNP_UnregisterNotification( [in] handle_t hBinding); cpp_quote("#if _WIN32_WINNT >= 0x0501") /* Function 61 */ - DWORD PNP_GetCustomDevProp( + DWORD + __stdcall + PNP_GetCustomDevProp( [in] handle_t hBinding, [in, string, ref] LPWSTR pDeviceID, [in, string, ref] LPWSTR CustomPropName, @@ -774,12 +898,16 @@ [in] DWORD ulFlags); /* Function 62 */ - DWORD PNP_GetVersionInternal( + DWORD + __stdcall + PNP_GetVersionInternal( [in] handle_t hBinding, [in, out] WORD *pwVersion); /* Function 63 */ - DWORD PNP_GetBlockedDriverInfo( + DWORD + __stdcall + PNP_GetBlockedDriverInfo( [in] handle_t hBinding, [out, size_is(*pulLength), length_is(*pulTransferLen)] BYTE *Buffer, [out] PNP_RPC_BUFFER_SIZE *pulTransferLen, @@ -787,7 +915,9 @@ [in] DWORD ulFlags); /* Function 64 */ - DWORD PNP_GetServerSideDeviceInstallFlags( + DWORD + __stdcall + PNP_GetServerSideDeviceInstallFlags( [in] handle_t hBinding, [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags);

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