Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 74323: [SPOOLSS] Add ASSERTs, improve documentation and the variety of tests for AlignRpcPtr/UndoAlignRpcPtr. Based on comments by Serge Gautherie.
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 10:36:16 2017 New Revision: 74323 URL: http://svn.reactos.org/svn/reactos?rev=74323&view=rev Log: [SPOOLSS] Add ASSERTs, improve documentation and the variety of tests for AlignRpcPtr/UndoAlignRpcPtr. Based on comments by Serge Gautherie. Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c trunk/rostests/apitests/spoolss/AlignRpcPtr.c Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] Sun Apr 16 10:36:16 2017 @@ -28,6 +28,8 @@ PVOID WINAPI AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer) { + ASSERT(pcbBuffer); + // Align down the buffer size in pcbBuffer to a 4-byte boundary. *pcbBuffer -= *pcbBuffer % sizeof(DWORD); @@ -209,7 +211,7 @@ * The original unaligned buffer, which you input as pBuffer to AlignRpcPtr. * The data from pSourceBuffer is copied into this buffer before pSourceBuffer is freed. * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. - * This parameter may be NULL if pSourceBuffer is NULL. + * This parameter may be NULL if pSourceBuffer is NULL or cbBuffer is 0. * * @param pSourceBuffer * The aligned buffer, which is returned by AlignRpcPtr. @@ -233,6 +235,9 @@ PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded) { + // pDestinationBuffer is accessed unless pSourceBuffer equals pDestinationBuffer or cbBuffer is 0. + ASSERT(pDestinationBuffer || pSourceBuffer == pDestinationBuffer || cbBuffer == 0); + // If pSourceBuffer is given, and source and destination pointers don't match, // we assume that pSourceBuffer is the buffer allocated by AlignRpcPtr. if (pSourceBuffer && pSourceBuffer != pDestinationBuffer) Modified: trunk/rostests/apitests/spoolss/AlignRpcPtr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/AlignRpc… ============================================================================== --- trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] Sun Apr 16 10:36:16 2017 @@ -54,13 +54,18 @@ ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + // Prove that AlignRpcPtr also works with a NULL buffer. The size should be aligned down. + cbBuffer = 6; + ok(!AlignRpcPtr(NULL, &cbBuffer), "AlignRpcPtr returns something\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + // We can also test all parameters of UndoAlignRpcPtr here. // Because pOutputBuffer != pInputBuffer, it copies the given 4 bytes from (aligned) pOutputBuffer to (unaligned) pInputBuffer // while aligning up the given 7 bytes in our passed &cbBuffer. // &cbBuffer is also returned. strcpy(pOutputBuffer, "abc"); strcpy(pInputBuffer, "XXXXXXXXX"); - cbBuffer = 7; + cbBuffer = 5; pcbBuffer = UndoAlignRpcPtr(pInputBuffer, pOutputBuffer, 4, &cbBuffer); ok(strcmp(pInputBuffer, "abc") == 0, "pInputBuffer is %s\n", pInputBuffer); ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); @@ -68,14 +73,14 @@ // Prove that UndoAlignRpcPtr works without any parameters and doesn't try to copy data from NULL pointers. ok(!UndoAlignRpcPtr(NULL, NULL, 0, NULL), "UndoAlignRpcPtr returns something\n"); - ok(!UndoAlignRpcPtr(NULL, NULL, 4, NULL), "UndoAlignRpcPtr returns something\n"); + ok(!UndoAlignRpcPtr(NULL, NULL, 6, NULL), "UndoAlignRpcPtr returns something\n"); // Prove that UndoAlignRpcPtr doesn't access source and destination memory at all when they are equal. // If it did, it should crash here, because I'm giving invalid memory addresses. ok(!UndoAlignRpcPtr((PVOID)1, (PVOID)1, 4, NULL), "UndoAlignRpcPtr returns something\n"); - // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up everything up to a DWORD. - cbBuffer = 0xFFFFFFFF; + // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up to a DWORD. + cbBuffer = 0xFFFFFFFD; pcbBuffer = UndoAlignRpcPtr(NULL, NULL, 0, &cbBuffer); ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); ok(cbBuffer == 0, "cbBuffer is %lu\n", cbBuffer);

1 0

[tfaber] 74322: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::RefCount to OpenCount. One step closer to the real SHARED_CACHE_MAP. CORE-8065
by tfaber＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: tfaber Date: Sun Apr 16 08:50:20 2017 New Revision: 74322 URL: http://svn.reactos.org/svn/reactos?rev=74322&view=rev Log: [NTOS:CC] - Rename ROS_SHARED_CACHE_MAP::RefCount to OpenCount. One step closer to the real SHARED_CACHE_MAP. CORE-8065 Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=743… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Apr 16 08:50:20 2017 @@ -982,14 +982,14 @@ ASSERT(SharedCacheMap); - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; KeReleaseGuardedMutex(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); KeAcquireGuardedMutex(&ViewLock); - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { FileObject->SectionObjectPointer->SharedCacheMap = NULL; @@ -1040,8 +1040,8 @@ KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - ASSERT(SharedCacheMap->RefCount != 0); - SharedCacheMap->RefCount++; + ASSERT(SharedCacheMap->OpenCount != 0); + SharedCacheMap->OpenCount++; KeReleaseGuardedMutex(&ViewLock); } @@ -1054,7 +1054,7 @@ DPRINT("CcRosRemoveIfClosed()\n"); KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = SectionObjectPointer->SharedCacheMap; - if (SharedCacheMap && SharedCacheMap->RefCount == 0) + if (SharedCacheMap && SharedCacheMap->OpenCount == 0) { CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap); } @@ -1071,10 +1071,10 @@ KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - if (SharedCacheMap->RefCount > 0) - { - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + if (SharedCacheMap->OpenCount > 0) + { + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { MmFreeSectionSegments(SharedCacheMap->FileObject); CcRosDeleteFileCache(FileObject, SharedCacheMap); @@ -1102,10 +1102,10 @@ if (FileObject->PrivateCacheMap != NULL) { FileObject->PrivateCacheMap = NULL; - if (SharedCacheMap->RefCount > 0) + if (SharedCacheMap->OpenCount > 0) { - SharedCacheMap->RefCount--; - if (SharedCacheMap->RefCount == 0) + SharedCacheMap->OpenCount--; + if (SharedCacheMap->OpenCount == 0) { MmFreeSectionSegments(SharedCacheMap->FileObject); CcRosDeleteFileCache(FileObject, SharedCacheMap); @@ -1138,7 +1138,7 @@ if (FileObject->PrivateCacheMap == NULL) { FileObject->PrivateCacheMap = SharedCacheMap; - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; } Status = STATUS_SUCCESS; } @@ -1193,7 +1193,7 @@ if (FileObject->PrivateCacheMap == NULL) { FileObject->PrivateCacheMap = SharedCacheMap; - SharedCacheMap->RefCount++; + SharedCacheMap->OpenCount++; } KeReleaseGuardedMutex(&ViewLock); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Apr 16 08:50:20 2017 @@ -153,7 +153,7 @@ PCACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyWriteContext; KSPIN_LOCK CacheMapLock; - ULONG RefCount; + ULONG OpenCount; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif

1 0

[tthompson] 74321: [NTFS] Add support for creating new MFT entries: +AddStandardInformation(), +AddData(), +AddFileName() - Add attributes to a file record +NtfsCreateFileRecord() - Creates a new f...
by tthompson＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: tthompson Date: Sun Apr 16 00:17:07 2017 New Revision: 74321 URL: http://svn.reactos.org/svn/reactos?rev=74321&view=rev Log: [NTFS] Add support for creating new MFT entries: +AddStandardInformation(), +AddData(), +AddFileName() - Add attributes to a file record +NtfsCreateFileRecord() - Creates a new file record and saves it to the MFT. +AddNewMftEntry() - Adds a file record to the MFT. NtfsCreateFile() - Modified to create a file record on a file-creation request (file creation is still unsupported; the created file needs to be added to the parent's directory index). +SetFileRecordEnd() - Establishes a new file record size UpdateFileRecord() - Improved documentation InternalSetResidentAttributeLength() - Updated to use SetFileRecordEnd(). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -36,6 +36,185 @@ /* FUNCTIONS ****************************************************************/ /** +* @name AddData +* @implemented +* +* Adds a $DATA attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $DATA. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $DATA attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddData(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + ULONG FileRecordEnd = AttributeAddress->Length; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $DATA attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeData; + AttributeAddress->Length = ResidentHeaderLength; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Resident.ValueLength = 0; + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + + // for unnamed $DATA attributes, NameOffset equals header length + AttributeAddress->NameOffset = ResidentHeaderLength; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return STATUS_SUCCESS; +} + +/** +* @name AddFileName +* @implemented +* +* Adds a $FILE_NAME attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $FILE_NAME. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $FILE_NAME attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION. +* +* @param FileObject +* Pointer to the FILE_OBJECT which represents the new name. +* This parameter is used to determine the filename and parent directory. +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddFileName(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress, + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + PFILENAME_ATTRIBUTE FileNameAttribute; + LARGE_INTEGER SystemTime; + ULONG FileRecordEnd = AttributeAddress->Length; + ULONGLONG CurrentMFTIndex = NTFS_FILE_ROOT; + UNICODE_STRING Current, Remaining; + NTSTATUS Status = STATUS_SUCCESS; + ULONG FirstEntry = 0; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $FILE_NAME attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeFileName; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + FileNameAttribute = (PFILENAME_ATTRIBUTE)((LONG_PTR)AttributeAddress + ResidentHeaderLength); + + // set timestamps + KeQuerySystemTime(&SystemTime); + FileNameAttribute->CreationTime = SystemTime.QuadPart; + FileNameAttribute->ChangeTime = SystemTime.QuadPart; + FileNameAttribute->LastWriteTime = SystemTime.QuadPart; + FileNameAttribute->LastAccessTime = SystemTime.QuadPart; + + FileNameAttribute->FileAttributes = NTFS_FILE_TYPE_ARCHIVE; + + // we need to extract the filename from the path + DPRINT1("Pathname: %wZ\n", &FileObject->FileName); + + FsRtlDissectName(FileObject->FileName, &Current, &Remaining); + + while (Current.Length != 0) + { + DPRINT1("Current: %wZ\n", &Current); + + Status = NtfsFindMftRecord(DeviceExt, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); + if (!NT_SUCCESS(Status)) + { + break; + } + + if (Remaining.Length == 0) + break; + + FsRtlDissectName(Current, &Current, &Remaining); + } + + DPRINT1("MFT Index of parent: %I64u\n", CurrentMFTIndex); + + // set reference to parent directory + FileNameAttribute->DirectoryFileReferenceNumber = CurrentMFTIndex; + + // The highest 2 bytes should be the sequence number, unless the parent happens to be root + if (CurrentMFTIndex == NTFS_FILE_ROOT) + FileNameAttribute->DirectoryFileReferenceNumber |= (ULONGLONG)NTFS_FILE_ROOT << 48; + else + FileNameAttribute->DirectoryFileReferenceNumber |= (ULONGLONG)FileRecord->SequenceNumber << 48; + + DPRINT1("FileNameAttribute->DirectoryFileReferenceNumber: 0x%I64x\n", FileNameAttribute->DirectoryFileReferenceNumber); + + FileNameAttribute->NameLength = Current.Length / 2; + // TODO: Get proper nametype, add DOS links as needed + FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; + RtlCopyMemory(FileNameAttribute->Name, Current.Buffer, Current.Length); + FileRecord->LinkCount++; + + AttributeAddress->Length = ResidentHeaderLength + + FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + + AttributeAddress->Resident.ValueLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + Current.Length; + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + AttributeAddress->Resident.Flags = 1; // indexed + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return Status; +} + +/** * @name AddRun * @implemented * @@ -190,6 +369,69 @@ NtfsDumpDataRuns((PUCHAR)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), 0); return Status; +} + +/** +* @name AddStandardInformation +* @implemented +* +* Adds a $STANDARD_INFORMATION attribute to a given FileRecord. +* +* @param FileRecord +* Pointer to a complete file record to add the attribute to. Caller is responsible for +* ensuring FileRecord is large enough to contain $STANDARD_INFORMATION. +* +* @param AttributeAddress +* Pointer to the region of memory that will receive the $STANDARD_INFORMATION attribute. +* This address must reside within FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @return +* STATUS_SUCCESS on success. STATUS_NOT_IMPLEMENTED if target address isn't at the end +* of the given file record. +* +* @remarks +* Only adding the attribute to the end of the file record is supported; AttributeAddress must +* be of type AttributeEnd. +* As it's implemented, this function is only intended to assist in creating new file records. It +* could be made more general-purpose by considering file records with an $ATTRIBUTE_LIST. +* It's the caller's responsibility to ensure the given file record has enough memory allocated +* for the attribute. +*/ +NTSTATUS +AddStandardInformation(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress) +{ + ULONG ResidentHeaderLength = FIELD_OFFSET(NTFS_ATTR_RECORD, Resident.Reserved) + sizeof(UCHAR); + PSTANDARD_INFORMATION StandardInfo = (PSTANDARD_INFORMATION)((LONG_PTR)AttributeAddress + ResidentHeaderLength); + LARGE_INTEGER SystemTime; + ULONG FileRecordEnd = AttributeAddress->Length; + + if (AttributeAddress->Type != AttributeEnd) + { + DPRINT1("FIXME: Can only add $STANDARD_INFORMATION attribute to the end of a file record.\n"); + return STATUS_NOT_IMPLEMENTED; + } + + AttributeAddress->Type = AttributeStandardInformation; + AttributeAddress->Length = sizeof(STANDARD_INFORMATION) + ResidentHeaderLength; + AttributeAddress->Length = ALIGN_UP_BY(AttributeAddress->Length, 8); + AttributeAddress->Resident.ValueLength = sizeof(STANDARD_INFORMATION); + AttributeAddress->Resident.ValueOffset = ResidentHeaderLength; + AttributeAddress->Instance = FileRecord->NextAttributeNumber++; + + // set dates and times + KeQuerySystemTime(&SystemTime); + StandardInfo->CreationTime = SystemTime.QuadPart; + StandardInfo->ChangeTime = SystemTime.QuadPart; + StandardInfo->LastWriteTime = SystemTime.QuadPart; + StandardInfo->LastAccessTime = SystemTime.QuadPart; + StandardInfo->FileAttribute = NTFS_FILE_TYPE_ARCHIVE; + + // move the attribute-end and file-record-end markers to the end of the file record + AttributeAddress = (PNTFS_ATTR_RECORD)((ULONG_PTR)AttributeAddress + AttributeAddress->Length); + SetFileRecordEnd(FileRecord, AttributeAddress, FileRecordEnd); + + return STATUS_SUCCESS; } /** Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -545,8 +545,15 @@ RequestedDisposition == FILE_OPEN_IF || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) - { - DPRINT1("Denying file creation request on NTFS volume\n"); + { + // Create the file record on disk + Status = NtfsCreateFileRecord(DeviceExt, FileObject); + + // Update the parent directory index + // Still TODO + + // Call NtfsOpenFile() + return STATUS_CANNOT_MAKE; } } @@ -599,4 +606,89 @@ return Status; } +/** +* @name NtfsCreateFileRecord() +* @implemented +* +* Creates a file record and saves it to the MFT. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION +* +* @param FileObject +* Pointer to a FILE_OBJECT describing the file to be created +* +* @return +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if unable to allocate memory for the file record. +*/ +NTSTATUS +NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject) +{ + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_RECORD NextAttribute; + + // allocate memory for file record + FileRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (!FileRecord) + { + DPRINT1("ERROR: Unable to allocate memory for file record!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(FileRecord, DeviceExt->NtfsInfo.BytesPerFileRecord); + + FileRecord->Ntfs.Type = NRH_FILE_TYPE; + + // calculate USA offset and count + FileRecord->Ntfs.UsaOffset = FIELD_OFFSET(FILE_RECORD_HEADER, MFTRecordNumber) + sizeof(ULONG); + + // size of USA (in ULONG's) will be 1 (for USA number) + 1 for every sector the file record uses + FileRecord->BytesAllocated = DeviceExt->NtfsInfo.BytesPerFileRecord; + FileRecord->Ntfs.UsaCount = (FileRecord->BytesAllocated / DeviceExt->NtfsInfo.BytesPerSector) + 1; + + // setup other file record fields + FileRecord->SequenceNumber = 1; + FileRecord->AttributeOffset = FileRecord->Ntfs.UsaOffset + (2 * FileRecord->Ntfs.UsaCount); + FileRecord->AttributeOffset = ALIGN_UP_BY(FileRecord->AttributeOffset, 8); + FileRecord->Flags = FRH_IN_USE; + FileRecord->BytesInUse = FileRecord->AttributeOffset + sizeof(ULONG) * 2; + + // find where the first attribute will be added + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + + // mark the (temporary) end of the file-record + NextAttribute->Type = AttributeEnd; + NextAttribute->Length = FILE_RECORD_END; + + // add first attribute, $STANDARD_INFORMATION + AddStandardInformation(FileRecord, NextAttribute); + + // advance NextAttribute pointer to the next attribute + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); + + // Add the $FILE_NAME attribute + AddFileName(FileRecord, NextAttribute, DeviceExt, FileObject); + + // advance NextAttribute pointer to the next attribute + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)NextAttribute + (ULONG_PTR)NextAttribute->Length); + + // add the $DATA attribute + AddData(FileRecord, NextAttribute); + + // dump file record in memory (for debugging) + NtfsDumpFileRecord(DeviceExt, FileRecord); + + // Now that we've built the file record in memory, we need to store it in the MFT. + Status = AddNewMftEntry(FileRecord, DeviceExt); + + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; +} + /* EOF */ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -172,7 +172,7 @@ return AttrRecord->Resident.ValueLength; } -void +VOID InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, PFILE_RECORD_HEADER FileRecord, ULONG AttrOffset, @@ -201,14 +201,9 @@ Destination->Length += Padding; } - // advance Destination to the final "attribute" and write the end type + // advance Destination to the final "attribute" and set the file record end Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)Destination + Destination->Length); - Destination->Type = AttributeEnd; - - // write the final marker (which shares the same offset and type as the Length field) - Destination->Length = FILE_RECORD_END; - - FileRecord->BytesInUse = NextAttributeOffset + (sizeof(ULONG) * 2); + SetFileRecordEnd(FileRecord, Destination, FILE_RECORD_END); } /** @@ -359,6 +354,41 @@ return STATUS_SUCCESS; } +/** +* @name SetFileRecordEnd +* @implemented +* +* This small function sets a new endpoint for the file record. It set's the final +* AttrEnd->Type to AttributeEnd and recalculates the bytes used by the file record. +* +* @param FileRecord +* Pointer to the file record whose endpoint (length) will be set. +* +* @param AttrEnd +* Pointer to section of memory that will receive the AttributeEnd marker. This must point +* to memory allocated for the FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). +* +* @param EndMarker +* This value will be written after AttributeEnd but isn't critical at all. When Windows resizes +* a file record, it preserves the final ULONG that previously ended the record, even though this +* value is (to my knowledge) never used. We emulate this behavior. +* +*/ +VOID +SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttrEnd, + ULONG EndMarker) +{ + // mark the end of attributes + AttrEnd->Type = AttributeEnd; + + // Restore the "file-record-end marker." The value is never checked but this behavior is consistent with Win2k3. + AttrEnd->Length = EndMarker; + + // recalculate bytes in use + FileRecord->BytesInUse = (ULONG_PTR)AttrEnd - (ULONG_PTR)FileRecord + sizeof(ULONG) * 2; +} + ULONG ReadAttribute(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT Context, @@ -711,7 +741,9 @@ { // We reached the last assigned cluster // TODO: assign new clusters to the end of the file. - // (Presently, this code will never be reached, the write should have already failed by now) + // (Presently, this code will rarely be reached, the write will usually have already failed by now) + // [We can reach here by creating a new file record when the MFT isn't large enough] + DPRINT1("FIXME: Master File Table needs to be enlarged.\n"); return STATUS_END_OF_FILE; } @@ -1070,25 +1102,39 @@ } /** -* UpdateFileRecord +* @name UpdateFileRecord * @implemented +* * Writes a file record to the master file table, at a given index. +* +* @param Vcb +* Pointer to the DEVICE_EXTENSION of the target drive being written to. +* +* @param MftIndex +* Target index in the master file table to store the file record. +* +* @param FileRecord +* Pointer to the complete file record which will be written to the master file table. +* +* @return +* STATUS_SUCCESSFUL on success. An error passed from WriteAttribute() otherwise. +* */ NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, - ULONGLONG index, - PFILE_RECORD_HEADER file) + ULONGLONG MftIndex, + PFILE_RECORD_HEADER FileRecord) { ULONG BytesWritten; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("UpdateFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + DPRINT("UpdateFileRecord(%p, 0x%I64x, %p)\n", Vcb, MftIndex, FileRecord); // Add the fixup array to prepare the data for writing to disk - AddFixupArray(Vcb, &file->Ntfs); + AddFixupArray(Vcb, &FileRecord->Ntfs); // write the file record to the master file table - Status = WriteAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); + Status = WriteAttribute(Vcb, Vcb->MFTContext, MftIndex * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)FileRecord, Vcb->NtfsInfo.BytesPerFileRecord, &BytesWritten); if (!NT_SUCCESS(Status)) { @@ -1096,7 +1142,7 @@ } // remove the fixup array (so the file record pointer can still be used) - FixupUpdateSequenceArray(Vcb, &file->Ntfs); + FixupUpdateSequenceArray(Vcb, &FileRecord->Ntfs); return Status; } @@ -1131,6 +1177,117 @@ } return STATUS_SUCCESS; +} + +/** +* @name AddNewMftEntry +* @implemented +* +* Adds a file record to the master file table of a given device. +* +* @param FileRecord +* Pointer to a complete file record which will be saved to disk. +* +* @param DeviceExt +* Pointer to the DEVICE_EXTENSION of the target drive. +* +* @return +* STATUS_SUCCESS on success. +* STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able +* to read the attribute. +* STATUS_INSUFFICIENT_RESOURCES if we can't allocate enough memory for a copy of $Bitmap. +* STATUS_NOT_IMPLEMENTED if we need to increase the size of the MFT. +* +*/ +NTSTATUS +AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONGLONG MftIndex; + RTL_BITMAP Bitmap; + ULONGLONG BitmapDataSize; + ULONGLONG AttrBytesRead; + PVOID BitmapData; + ULONG LengthWritten; + + // First, we have to read the mft's $Bitmap attribute + PNTFS_ATTR_CONTEXT BitmapContext; + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeBitmap, L"", 0, &BitmapContext, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find $Bitmap attribute of master file table!\n"); + return Status; + } + + // allocate a buffer for the $Bitmap attribute + BitmapDataSize = AttributeDataLength(&BitmapContext->Record); + BitmapData = ExAllocatePoolWithTag(NonPagedPool, BitmapDataSize, TAG_NTFS); + if (!BitmapData) + { + ReleaseAttributeContext(BitmapContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read $Bitmap attribute + AttrBytesRead = ReadAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize); + + if (AttrBytesRead == 0) + { + DPRINT1("ERROR: Unable to read $Bitmap attribute of master file table!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + // convert buffer into bitmap + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, BitmapDataSize * 8); + + // set next available bit, preferrably after 23rd bit + MftIndex = RtlFindClearBitsAndSet(&Bitmap, 1, 24); + if ((LONG)MftIndex == -1) + { + DPRINT1("ERROR: Couldn't find free space in MFT for file record!\n"); + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + + // TODO: increase mft size + return STATUS_NOT_IMPLEMENTED; + } + + DPRINT1("Creating file record at MFT index: %I64u\n", MftIndex); + + // update file record with index + FileRecord->MFTRecordNumber = MftIndex; + + // [BitmapData should have been updated via RtlFindClearBitsAndSet()] + + // write the bitmap back to the MFT's $Bitmap attribute + Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR encountered when writing $Bitmap attribute!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + // update the file record (write it to disk) + Status = UpdateFileRecord(DeviceExt, MftIndex, FileRecord); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write file record!\n"); + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + + return Status; } NTSTATUS Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Apr 16 00:17:07 2017 @@ -517,12 +517,26 @@ //NtfsDumpAttribute(PATTRIBUTE Attribute); NTSTATUS +AddData(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress); + +NTSTATUS AddRun(PNTFS_VCB Vcb, PNTFS_ATTR_CONTEXT AttrContext, ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, ULONGLONG NextAssignedCluster, ULONG RunLength); + +NTSTATUS +AddFileName(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress, + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); + +NTSTATUS +AddStandardInformation(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttributeAddress); NTSTATUS ConvertDataRunsToLargeMCB(PUCHAR DataRun, @@ -647,6 +661,9 @@ NTSTATUS NtfsCreate(PNTFS_IRP_CONTEXT IrpContext); +NTSTATUS +NtfsCreateFileRecord(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); /* devctl.c */ @@ -786,6 +803,10 @@ /* mft.c */ +NTSTATUS +AddNewMftEntry(PFILE_RECORD_HEADER FileRecord, + PDEVICE_EXTENSION DeviceExt); + PNTFS_ATTR_CONTEXT PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord); @@ -817,6 +838,11 @@ ULONG AttrOffset, PFILE_RECORD_HEADER FileRecord, PLARGE_INTEGER DataSize); + +VOID +SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_RECORD AttrEnd, + ULONG EndMarker); ULONGLONG AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord); @@ -855,8 +881,8 @@ NTSTATUS UpdateFileRecord(PDEVICE_EXTENSION Vcb, - ULONGLONG index, - PFILE_RECORD_HEADER file); + ULONGLONG MftIndex, + PFILE_RECORD_HEADER FileRecord); NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, @@ -919,6 +945,14 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +NTSTATUS +NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG MFTIndex, + PUNICODE_STRING FileName, + PULONG FirstEntry, + BOOLEAN DirSearch, + ULONGLONG *OutMFTIndex); + /* misc.c */ BOOLEAN

1 0

[mjansen] 74320: Fix copypasta error, spotted by Thomas.
by mjansen＠svn.reactos.org 15 Apr '17

15 Apr '17

Author: mjansen Date: Sat Apr 15 22:18:29 2017 New Revision: 74320 URL: http://svn.reactos.org/svn/reactos?rev=74320&view=rev Log: Fix copypasta error, spotted by Thomas. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Apr 15 22:18:29 2017 @@ -75,7 +75,7 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FontListLock) #define ASSERT_GLOBALFONTS_LOCK_HELD() \ - ASSERT(FreeTypeLock->Owner == KeGetCurrentThread()) + ASSERT(FontListLock->Owner == KeGetCurrentThread()) #define IntLockFreeType \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FreeTypeLock)

1 0

[tfaber] 74319: [UNIATA] - Update to version 0.46e3 (and fix up the version numbers) - Un-"fix" insignificant typo corrections that only serve to make syncing harder CORE-13032 #resolve CORE-11894 ...
by tfaber＠svn.reactos.org 15 Apr '17

15 Apr '17

Author: tfaber Date: Sat Apr 15 20:24:43 2017 New Revision: 74319 URL: http://svn.reactos.org/svn/reactos?rev=74319&view=rev Log: [UNIATA] - Update to version 0.46e3 (and fix up the version numbers) - Un-"fix" insignificant typo corrections that only serve to make syncing harder CORE-13032 #resolve CORE-11894 CORE-11277 CORE-12909 Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1,5 +1,5 @@ -// Build Version 0.46d8 +// Build Version 0.46e3 UCHAR const AtaCommands48[256] = { Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -712,7 +712,7 @@ USHORT UDMASupport : 7; // 62 ATAPI USHORT MultiWordDMASupport : 3; USHORT DMASupport : 1; - USHORT Reserved62_11_14 : 4; + USHORT Reseved62_11_14 : 4; USHORT DMADirRequired : 1; } AtapiDMA; }; Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1896,8 +1896,9 @@ #define VM_VMWARE 0x03 #define VM_QEMU 0x04 #define VM_BOCHS 0x05 - -#define VM_MAX_KNOWN VM_BOCHS +#define VM_PCEM 0x06 + +#define VM_MAX_KNOWN VM_PCEM extern BOOLEAN WinVer_WDM_Model; Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1762,7 +1762,7 @@ // ATI/SII chipsets with memory-mapped IO hangs when // I call ReadBuffer(), probably due to PCI burst/prefetch enabled // Unfortunately, I don't know yet how to workaround it except - // specifying manual delay in the way you see below. + // spacifying manual delay in the way you see below. ReadBuffer(chan, (PUSHORT)&deviceExtension->FullIdentifyData, 256, PIO0_TIMING); // Work around for some IDE and one model Atapi that will present more than @@ -1917,6 +1917,8 @@ // Check for HDDs > 8Gb if ((deviceExtension->FullIdentifyData.NumberOfCylinders == 0x3fff) && /* (deviceExtension->FullIdentifyData.TranslationFieldsValid) &&*/ + deviceExtension->FullIdentifyData.NumberOfHeads && + deviceExtension->FullIdentifyData.SectorsPerTrack && (NumOfSectors < deviceExtension->FullIdentifyData.UserAddressableSectors)) { KdPrint2((PRINT_PREFIX "NumberOfCylinders == 0x3fff\n")); cylinders = @@ -1960,6 +1962,8 @@ if(LunExt->DeviceFlags & DFLAGS_LBA_ENABLED) { if(deviceExtension->FullIdentifyData.FeaturesSupport.Address48 && deviceExtension->FullIdentifyData.FeaturesEnabled.Address48 && + deviceExtension->FullIdentifyData.NumberOfHeads && + deviceExtension->FullIdentifyData.SectorsPerTrack && (deviceExtension->FullIdentifyData.UserAddressableSectors48 > NumOfSectors) ) { KdPrint2((PRINT_PREFIX "LBA48\n")); @@ -2093,8 +2097,21 @@ // fill IdentifyData with bogus geometry KdPrint2((PRINT_PREFIX "requested LunExt->GeomType=%x\n", LunExt->opt_GeomType)); - tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.CurrentSectorsPerTrack * - deviceExtension->FullIdentifyData.NumberOfCurrentHeads); + if(deviceExtension->FullIdentifyData.CurrentSectorsPerTrack && + deviceExtension->FullIdentifyData.NumberOfCurrentHeads) { + tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.CurrentSectorsPerTrack * + deviceExtension->FullIdentifyData.NumberOfCurrentHeads); + } else + if(deviceExtension->FullIdentifyData.SectorsPerTrack && + deviceExtension->FullIdentifyData.NumberOfHeads) { + KdPrint2((PRINT_PREFIX "Current C/H = %#I64x/%#I64x\n", + deviceExtension->FullIdentifyData.CurrentSectorsPerTrack, + deviceExtension->FullIdentifyData.NumberOfCurrentHeads)); + tmp_cylinders = NumOfSectors / (deviceExtension->FullIdentifyData.SectorsPerTrack * + deviceExtension->FullIdentifyData.NumberOfHeads); + } else { + tmp_cylinders = 0; + } KdPrint2((PRINT_PREFIX "tmp_cylinders = %#I64x\n", tmp_cylinders)); if((tmp_cylinders < 0xffff) || (LunExt->opt_GeomType == GEOM_ORIG)) { // ok, we can keep original values @@ -2114,6 +2131,11 @@ LunExt->opt_GeomType = GEOM_UNIATA; } } + } + + if(!deviceExtension->FullIdentifyData.SectorsPerTrack || + !deviceExtension->FullIdentifyData.NumberOfHeads) { + KdPrint2((PRINT_PREFIX "Zero S/H -> Force Use GEOM_STD\n")); } if(LunExt->opt_GeomType == GEOM_STD) { @@ -5845,6 +5867,10 @@ statusByte = WaitOnBusy(chan); + if(wordCount&1 && atapiDev && (g_opt_VirtualMachine == VM_BOCHS)) { + KdPrint2((PRINT_PREFIX + "IdeIntr: unaligned ATAPI %#x Words\n", wordCount)); + } else if(LunExt->DeviceFlags & DFLAGS_DWORDIO_ENABLED) { KdPrint2((PRINT_PREFIX "IdeIntr: pre-Read %#x Dwords\n", wordCount/2)); Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -107,6 +107,8 @@ PHYSICAL_ADDRESS ph_addr; ULONG addr; + *(volatile char*)data; // Touch memory, this will prevent condition of not-ready page table for valid addresses + // See ROS-11894 bug ph_addr = MmGetPhysicalAddress(data); KdPrint3((PRINT_PREFIX "AtapiVirtToPhysAddr_: %x -> %8.8x:%8.8x\n", data, ph_addr.HighPart, ph_addr.LowPart)); if(!ph_addru && ph_addr.HighPart) { Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sat Apr 15 20:24:43 2017 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46d8" -#define UNIATA_VER_DOT 0.46.4.8 +#define UNIATA_VER_STR "46e3" +#define UNIATA_VER_DOT 0.46.5.3 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 46 -#define UNIATA_VER_SUB_MJ 4 -#define UNIATA_VER_SUB_MN 8 -#define UNIATA_VER_DOT_COMMA 0,46,4,8 -#define UNIATA_VER_DOT_STR "0.46.4.8" -#define UNIATA_VER_YEAR 2016 -#define UNIATA_VER_YEAR_STR "2016" +#define UNIATA_VER_SUB_MJ 5 +#define UNIATA_VER_SUB_MN 3 +#define UNIATA_VER_DOT_COMMA 0,46,5,3 +#define UNIATA_VER_DOT_STR "0.46.5.3" +#define UNIATA_VER_YEAR 2017 +#define UNIATA_VER_YEAR_STR "2017"

1 0

[tfaber] 74318: [RTL] - In Wait_thread_proc, prioritize the cancel event over the wait object. This avoids executing the callback again after RtlDeregisterWait has been called. Fixes ThemeStartCall...
by tfaber＠svn.reactos.org 15 Apr '17

15 Apr '17

Author: tfaber Date: Sat Apr 15 17:39:49 2017 New Revision: 74318 URL: http://svn.reactos.org/svn/reactos?rev=74318&view=rev Log: [RTL] - In Wait_thread_proc, prioritize the cancel event over the wait object. This avoids executing the callback again after RtlDeregisterWait has been called. Fixes ThemeStartCallback being called twice, causing a double free. CORE-13074 #resolve Modified: trunk/reactos/sdk/lib/rtl/wait.c Modified: trunk/reactos/sdk/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/wait.c?rev=743… ============================================================================== --- trunk/reactos/sdk/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/wait.c [iso-8859-1] Sat Apr 15 17:39:49 2017 @@ -45,7 +45,7 @@ PRTLP_WAIT Wait = (PRTLP_WAIT) Arg; NTSTATUS Status; BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) != 0; - HANDLE handles[2] = { Wait->Object, Wait->CancelEvent }; + HANDLE handles[2] = { Wait->CancelEvent, Wait->Object }; LARGE_INTEGER timeout; HANDLE completion_event; @@ -59,11 +59,11 @@ alertable, get_nt_timeout( &timeout, Wait->Milliseconds ) ); - if (Status == STATUS_WAIT_0 || Status == STATUS_TIMEOUT) + if (Status == STATUS_WAIT_1 || Status == STATUS_TIMEOUT) { BOOLEAN TimerOrWaitFired; - if (Status == STATUS_WAIT_0) + if (Status == STATUS_WAIT_1) { // TRACE( "object %p signaled, calling callback %p with context %p\n", // Wait->Object, Wait->Callback,

1 0

[ekohl] 74317: [SCHEDSVC] Insert a job into the start list when it is loaded or added. Remove it from the start list when it gets deleted. The start list is sorted by start time.
by ekohl＠svn.reactos.org 15 Apr '17

15 Apr '17

Author: ekohl Date: Sat Apr 15 10:33:29 2017 New Revision: 74317 URL: http://svn.reactos.org/svn/reactos?rev=74317&view=rev Log: [SCHEDSVC] Insert a job into the start list when it is loaded or added. Remove it from the start list when it gets deleted. The start list is sorted by start time. Modified: trunk/reactos/base/services/schedsvc/job.c trunk/reactos/base/services/schedsvc/precomp.h trunk/reactos/base/services/schedsvc/rpcserver.c Modified: trunk/reactos/base/services/schedsvc/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/job… ============================================================================== --- trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -276,18 +276,24 @@ pJob->JobId = dwNextJobId++; dwJobCount++; + // Cancel the start timer + /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); + /* Calculate the next start time */ + CalculateNextStartTime(pJob); + + /* Insert the job into the start list */ + InsertJobIntoStartList(&StartListHead, pJob); +#if 0 + DumpStartList(&StartListHead); +#endif + + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); - - /* Calculate the next start time */ - CalculateNextStartTime(pJob); - - // Insert job into the start list - - // Update the start timer pJob = NULL; } @@ -330,7 +336,10 @@ CalculateNextStartTime(PJOB pJob) { SYSTEMTIME StartTime; + FILETIME FileTime; DWORD_PTR Now; + + TRACE("CalculateNextStartTime(%p)\n", pJob); GetLocalTime(&StartTime); @@ -365,8 +374,82 @@ } } - ERR("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, - StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); - - SystemTimeToFileTime(&StartTime, &pJob->StartTime); -} + TRACE("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, + StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); + + SystemTimeToFileTime(&StartTime, &FileTime); + pJob->StartTime.u.LowPart = FileTime.dwLowDateTime; + pJob->StartTime.u.HighPart = FileTime.dwHighDateTime; +} + + +VOID +InsertJobIntoStartList( + _In_ PLIST_ENTRY StartListHead, + _In_ PJOB pJob) +{ + PLIST_ENTRY CurrentEntry, PreviousEntry; + PJOB CurrentJob; + + if (IsListEmpty(StartListHead)) + { + InsertHeadList(StartListHead, &pJob->StartEntry); + return; + } + + CurrentEntry = StartListHead->Flink; + while (CurrentEntry != StartListHead) + { + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); + + if ((CurrentEntry == StartListHead->Flink) && + (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart)) + { + /* Insert before the first entry */ + InsertHeadList(StartListHead, &pJob->StartEntry); + return; + } + + if (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart) + { + /* Insert between the previous and the current entry */ + PreviousEntry = CurrentEntry->Blink; + pJob->StartEntry.Blink = PreviousEntry; + pJob->StartEntry.Flink = CurrentEntry; + PreviousEntry->Flink = &pJob->StartEntry; + CurrentEntry->Blink = &pJob->StartEntry; + return; + } + + if ((CurrentEntry->Flink == StartListHead) && + (pJob->StartTime.QuadPart >= CurrentJob->StartTime.QuadPart)) + { + /* Insert after the last entry */ + InsertTailList(StartListHead, &pJob->StartEntry); + return; + } + + CurrentEntry = CurrentEntry->Flink; + } +} + + +VOID +DumpStartList( + _In_ PLIST_ENTRY StartListHead) +{ + PLIST_ENTRY CurrentEntry; + PJOB CurrentJob; + + CurrentEntry = StartListHead->Flink; + while (CurrentEntry != StartListHead) + { + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); + + TRACE("%3lu: %016I64x\n", CurrentJob->JobId, CurrentJob->StartTime.QuadPart); + + CurrentEntry = CurrentEntry->Flink; + } +} + +/* EOF */ Modified: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -4,6 +4,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <windef.h> @@ -28,7 +29,7 @@ LIST_ENTRY JobEntry; LIST_ENTRY StartEntry; - FILETIME StartTime; + ULARGE_INTEGER StartTime; WCHAR Name[9]; DWORD JobId; @@ -39,7 +40,6 @@ WCHAR Command[1]; } JOB, *PJOB; -#define DWORD_MAX 0xffffffffUL extern DWORD dwNextJobId; extern DWORD dwJobCount; @@ -66,7 +66,17 @@ VOID CalculateNextStartTime( - PJOB pJob); + _In_ PJOB pJob); + +VOID +InsertJobIntoStartList( + _In_ PLIST_ENTRY StartListHead, + _In_ PJOB pJob); + +VOID +DumpStartList( + _In_ PLIST_ENTRY StartListHead); + /* rpcserver.c */ Modified: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Sat Apr 15 10:33:29 2017 @@ -112,21 +112,27 @@ pJob->JobId = dwNextJobId++; dwJobCount++; + // Cancel the start timer + /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); + /* Save the job in the registry */ + SaveJob(pJob); + + /* Calculate the next start time */ + CalculateNextStartTime(pJob); + + /* Insert the job into the start list */ + InsertJobIntoStartList(&StartListHead, pJob); +#if 0 + DumpStartList(&StartListHead); +#endif + + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); - - /* Save the job in the registry */ - SaveJob(pJob); - - /* Calculate the next start time */ - CalculateNextStartTime(pJob); - - // Insert job into the start list - - // Update the start timer /* Return the new job ID */ *pJobId = pJob->JobId; @@ -156,6 +162,8 @@ /* Acquire the job list lock exclusively */ RtlAcquireResourceExclusive(&JobListLock, TRUE); + // Cancel the start timer + JobEntry = JobListHead.Flink; while (JobEntry != &JobListHead) { @@ -163,9 +171,11 @@ if ((CurrentJob->JobId >= MinJobId) && (CurrentJob->JobId <= MaxJobId)) { - // Remove job from the start list - - // Update the start timer + /* Remove the job from the start list */ + RemoveEntryList(&CurrentJob->StartEntry); +#if 0 + DumpStartList(&StartListHead); +#endif /* Remove the job from the registry */ DeleteJob(CurrentJob); @@ -183,6 +193,8 @@ JobEntry = JobEntry->Flink; } + // Update the start timer + /* Release the job list lock */ RtlReleaseResource(&JobListLock); @@ -245,7 +257,7 @@ (wcslen(CurrentJob->Command) + 1) * sizeof(WCHAR); TRACE("dwEntrySize: %lu\n", dwEntrySize); - if ((PreferedMaximumLength != DWORD_MAX) && + if ((PreferedMaximumLength != ULONG_MAX) && (dwRequiredSize + dwEntrySize > PreferedMaximumLength)) break; @@ -259,7 +271,7 @@ TRACE("dwEntriesToRead: %lu\n", dwEntriesToRead); TRACE("dwRequiredSize: %lu\n", dwRequiredSize); - if (PreferedMaximumLength != DWORD_MAX) + if (PreferedMaximumLength != ULONG_MAX) dwRequiredSize = PreferedMaximumLength; TRACE("Allocating dwRequiredSize: %lu\n", dwRequiredSize);

1 0

[mjansen] 74316: [WIN32SS] Addendum to r74312 and r74309, fix some bad memory leaks. CORE-10876 Thanks Giannis and Thomas :)
by mjansen＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: mjansen Date: Fri Apr 14 21:22:18 2017 New Revision: 74316 URL: http://svn.reactos.org/svn/reactos?rev=74316&view=rev Log: [WIN32SS] Addendum to r74312 and r74309, fix some bad memory leaks. CORE-10876 Thanks Giannis and Thomas :) Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Apr 14 21:22:18 2017 @@ -2052,7 +2052,7 @@ NTSTATUS Status = STATUS_NOT_FOUND; ANSI_STRING AnsiName; - RtlInitUnicodeString(pNameW, NULL); + RtlFreeUnicodeString(pNameW); Count = FT_Get_Sfnt_Name_Count(Face); for (i = 0; i < Count; ++i) @@ -2202,6 +2202,7 @@ else { UNICODE_STRING NameW; + RtlInitUnicodeString(&NameW, NULL); status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY, gusLanguageID); if (NT_SUCCESS(status)) @@ -2640,6 +2641,7 @@ { DPRINT1("Conversion failed\n"); ExFreePoolWithTag(NewEntry, TAG_FONT); + FT_Bitmap_Done(GlyphSlot->library, &AlignedBitmap); FT_Done_Glyph((FT_Glyph)BitmapGlyph); return NULL; }

1 0

[ekohl] 74315: [SCHEDSVC] Calculate the next start time of a job and store it in the job object. DaysOfMonth and DaysOfWeek are not taken into account yet.
by ekohl＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: ekohl Date: Fri Apr 14 21:16:37 2017 New Revision: 74315 URL: http://svn.reactos.org/svn/reactos?rev=74315&view=rev Log: [SCHEDSVC] Calculate the next start time of a job and store it in the job object. DaysOfMonth and DaysOfWeek are not taken into account yet. Modified: trunk/reactos/base/services/schedsvc/job.c trunk/reactos/base/services/schedsvc/precomp.h trunk/reactos/base/services/schedsvc/rpcserver.c Modified: trunk/reactos/base/services/schedsvc/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/job… ============================================================================== --- trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/job.c [iso-8859-1] Fri Apr 14 21:16:37 2017 @@ -282,7 +282,8 @@ /* Release the job list lock */ RtlReleaseResource(&JobListLock); - // Calculate start time + /* Calculate the next start time */ + CalculateNextStartTime(pJob); // Insert job into the start list @@ -310,38 +311,62 @@ } -#if 0 +static +WORD +DaysOfMonth( + WORD wMonth, + WORD wYear) +{ + WORD wDaysArray[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + + if (wMonth == 2 && wYear % 4 == 0 && wYear % 400 != 0) + return 29; + + return wDaysArray[wMonth]; +} + + VOID CalculateNextStartTime(PJOB pJob) { - SYSTEMTIME Time; - DWORD_PTR JobTime; - WORD wDay; - BOOL bToday = FALSE; - - GetLocalTime(&Time); - - Now = (DWORD_PTR)Time.wHour * 3600000 + - (DWORD_PTR)Time.wMinute * 60000; - if (pJob->JobTime > Now) - bToday = TRUE; - - if (pJob->DaysOfMonth != 0) + SYSTEMTIME StartTime; + DWORD_PTR Now; + + GetLocalTime(&StartTime); + + Now = (DWORD_PTR)StartTime.wHour * 3600000 + + (DWORD_PTR)StartTime.wMinute * 60000; + + StartTime.wMilliseconds = 0; + StartTime.wSecond = 0; + StartTime.wHour = (WORD)(pJob->JobTime / 3600000); + StartTime.wMinute = (WORD)((pJob->JobTime % 3600000) / 60000); + + /* Start the job tomorrow */ + if (Now > pJob->JobTime) { - wDay = 0; - for (i = Time.wDay - 1; i < 32; i++) - { - if (pJob->DaysOfMonth && (1 << i)) + if (StartTime.wDay + 1 > DaysOfMonth(StartTime.wMonth, StartTime.wYear)) + { + if (StartTime.wMonth == 12) { - wDay = i; - break; + StartTime.wDay = 1; + StartTime.wMonth = 1; + StartTime.wYear++; } - } - ERR("Next day this month: %hu\n", wDay); + else + { + StartTime.wDay = 1; + StartTime.wMonth++; + } + } + else + { + StartTime.wDay++; + } } - else if (pJob->DaysOfWeek != 0) - { - - } -} -#endif + + ERR("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, + StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); + + SystemTimeToFileTime(&StartTime, &pJob->StartTime); +} Modified: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Fri Apr 14 21:16:37 2017 @@ -28,7 +28,7 @@ LIST_ENTRY JobEntry; LIST_ENTRY StartEntry; - LARGE_INTEGER StartTime; + FILETIME StartTime; WCHAR Name[9]; DWORD JobId; @@ -64,6 +64,9 @@ LONG LoadJobs(VOID); +VOID +CalculateNextStartTime( + PJOB pJob); /* rpcserver.c */ Modified: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Fri Apr 14 21:16:37 2017 @@ -121,11 +121,12 @@ /* Save the job in the registry */ SaveJob(pJob); - // Calculate start time - - // Insert job into start list - - // Update start timer + /* Calculate the next start time */ + CalculateNextStartTime(pJob); + + // Insert job into the start list + + // Update the start timer /* Return the new job ID */ *pJobId = pJob->JobId; @@ -162,9 +163,9 @@ if ((CurrentJob->JobId >= MinJobId) && (CurrentJob->JobId <= MaxJobId)) { - // Remove job from start list - - // Update start timer + // Remove job from the start list + + // Update the start timer /* Remove the job from the registry */ DeleteJob(CurrentJob);

1 0

[gadamopoulos] 74314: [SHELLUTILS.H] - Remove the ShellObjectCreator templates that allowed the caller to pass an arbitrary interface pointer. Leaving only the templates that take an void ** ppv pa...
by gadamopoulos＠svn.reactos.org 14 Apr '17

14 Apr '17

Author: gadamopoulos Date: Fri Apr 14 20:03:46 2017 New Revision: 74314 URL: http://svn.reactos.org/svn/reactos?rev=74314&view=rev Log: [SHELLUTILS.H] - Remove the ShellObjectCreator templates that allowed the caller to pass an arbitrary interface pointer. Leaving only the templates that take an void ** ppv parameter means that the callers are forced to use IID_PPV_ARG. This makes it less likely to have a pointer to an wrong interface. - Fix the callers to always use IID_PPV_ARG. - Rewrite the ShellObjectCreator templates to create the objects using the ATL CreateInstance thus allowing internal ATL methods to be called. [BROWSEUI] -Let CBandSite_CreateInstance take an additional parameter for the outer object since CBandSite is aggregatable. Create the object using the ATL creator class. Modified: trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/base/shell/rshell/rshell.spec trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp trunk/reactos/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/sdk/include/reactos/shellutils.h Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -61,8 +61,6 @@ HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CBandSite_CreateInstance(REFIID riid, void **ppv); -HRESULT WINAPI CBandSiteMenu_CreateInstance(REFIID riid, void **ppv); } DWORD WINAPI WinList_Init(void) Modified: trunk/reactos/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/rshell.s… ============================================================================== --- trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -7,7 +7,7 @@ @ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr); @ stdcall CMergedFolder_Constructor(ptr ptr); -@ stdcall CBandSite_CreateInstance(ptr ptr) +@ stdcall CBandSite_CreateInstance(ptr ptr ptr) @ stdcall CBandSiteMenu_CreateInstance(ptr ptr) @ stdcall ShellDDEInit(long); @ stdcall SHCreateDesktop(ptr); Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -831,7 +831,7 @@ } extern "C" -HRESULT WINAPI CBandSite_CreateInstance(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBandSite>(riid, ppv); -} +HRESULT WINAPI CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv) +{ + return CBandSite::_CreatorClass::CreateInstance(pUnkOuter, riid, ppv); +} Modified: trunk/reactos/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -327,8 +327,8 @@ { HRESULT hr; - hr = ShellObjectCreatorInit<CSHEnumClassesOfCategories, ULONG, CATID*, ULONG, CATID*, IEnumGUID>( - cImplemented, pImplemented, cRequired, pRequired, IID_IEnumGUID, out); + hr = ShellObjectCreatorInit<CSHEnumClassesOfCategories>( + cImplemented, pImplemented, cRequired, pRequired, IID_PPV_ARG(IEnumGUID, out)); if (FAILED_UNEXPECTEDLY(hr)) return hr; return S_OK; Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -3156,7 +3156,7 @@ */ HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView) { - return ShellObjectCreatorInit<CDefView>(pFolder, IID_IShellView, newView); + return ShellObjectCreatorInit<CDefView>(pFolder, IID_PPV_ARG(IShellView, newView)); } HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut) Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -281,5 +281,5 @@ */ HRESULT IEnumIDList_Constructor(IEnumIDList **enumerator) { - return ShellObjectCreator<CEnumIDListBase>(IID_IEnumIDList, enumerator); -} + return ShellObjectCreator<CEnumIDListBase>(IID_PPV_ARG(IEnumIDList, enumerator)); +} Modified: trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CIDLData… ============================================================================== --- trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -129,7 +129,7 @@ HRESULT IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **ppFormat) { - return ShellObjectCreatorInit<IEnumFORMATETCImpl>(cfmt, afmt, IID_IEnumFORMATETC, ppFormat); + return ShellObjectCreatorInit<IEnumFORMATETCImpl>(cfmt, afmt, IID_PPV_ARG(IEnumFORMATETC, ppFormat)); } @@ -410,7 +410,7 @@ */ HRESULT IDataObject_Constructor(HWND hwndOwner, PCIDLIST_ABSOLUTE pMyPidl, PCUIDLIST_RELATIVE_ARRAY apidl, UINT cidl, IDataObject **dataObject) { - return ShellObjectCreatorInit<CIDLDataObj>(hwndOwner, pMyPidl, apidl, cidl, IID_IDataObject, dataObject); + return ShellObjectCreatorInit<CIDLDataObj>(hwndOwner, pMyPidl, apidl, cidl, IID_PPV_ARG(IDataObject, dataObject)); } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -311,7 +311,7 @@ */ HRESULT WINAPI CControlPanelFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CControlPanelEnum>(dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CControlPanelEnum>(dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -96,7 +96,6 @@ CCPLItemMenu(); ~CCPLItemMenu(); HRESULT WINAPI Initialize(UINT cidl, PCUITEMID_CHILD_ARRAY apidl); - HRESULT WINAPI FinalConstruct(); // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -441,7 +441,7 @@ */ HRESULT WINAPI CDesktopFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CDesktopFolderEnum>(this, hwndOwner, dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CDesktopFolderEnum>(this, hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -377,7 +377,7 @@ */ HRESULT WINAPI CDrivesFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CDrivesFolderEnum>(hwndOwner, dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CDrivesFolderEnum>(hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -253,7 +253,7 @@ DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CFileSysEnum>(sPathTarget, dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CFileSysEnum>(sPathTarget, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -274,7 +274,7 @@ */ HRESULT WINAPI CNetFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CNetFolderEnum>(hwndOwner, dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CNetFolderEnum>(hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -226,7 +226,7 @@ */ HRESULT WINAPI CPrinterFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { - return ShellObjectCreatorInit<CPrintersEnum>(hwndOwner, dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CPrintersEnum>(hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -488,7 +488,7 @@ HRESULT WINAPI CRecycleBin::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CRecycleBinEnum>(dwFlags, IID_IEnumIDList, ppEnumIDList); + return ShellObjectCreatorInit<CRecycleBinEnum>(dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } HRESULT WINAPI CRecycleBin::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, void **ppv) Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -158,7 +158,7 @@ HRESULT IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const IID *riidInst, IClassFactory **theFactory) { - return ShellObjectCreatorInit<IDefClFImpl>(lpfnCI, pcRefDll, riidInst, IID_IClassFactory, theFactory); + return ShellObjectCreatorInit<IDefClFImpl>(lpfnCI, pcRefDll, riidInst, IID_PPV_ARG(IClassFactory, theFactory)); } /****************************************************************************** Modified: trunk/reactos/sdk/include/reactos/shellutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/shellu… ============================================================================== --- trunk/reactos/sdk/include/reactos/shellutils.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/shellutils.h [iso-8859-1] Fri Apr 14 20:03:46 2017 @@ -213,273 +213,133 @@ return S_OK; } -template<class T, class R> -HRESULT inline ShellObjectCreator(REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; -ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) - return hResult; - return S_OK; -} - -template<class T, class R> -HRESULT inline ShellObjectCreatorInit(REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; +template<class T> +HRESULT inline ShellObjectCreator(REFIID riid, void ** ppv) +{ + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; } template<class T> HRESULT inline ShellObjectCreatorInit(REFIID riid, void ** ppv) { - CComPtr<T> obj; - CComPtr<IUnknown> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->Initialize(); + + if (SUCCEEDED(hResult)) + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; } template<class T, class T1> HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, void ** ppv) { - CComPtr<T> obj; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, ppv); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1); - if (FAILED(hResult)) - return hResult; - - return S_OK; + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->Initialize(initArg1); + + if (SUCCEEDED(hResult)) + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; } template<class T, class T1, class T2> HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, REFIID riid, void ** ppv) { - CComPtr<T> obj; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, ppv); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2); - if (FAILED(hResult)) - return hResult; - - return S_OK; + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->Initialize(initArg1, initArg2); + + if (SUCCEEDED(hResult)) + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; } template<class T, class T1, class T2, class T3> HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, REFIID riid, void ** ppv) { - CComPtr<T> obj; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, ppv); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2, initArg3); - if (FAILED(hResult)) - return hResult; - - return S_OK; -} - -template<class T, class T1, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; -} - -template<class T, class T1, class T2, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; -} - -template<class T, class T1, class T2, class T3, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2, initArg3); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; -} - -template<class T, class T1, class T2, class T3, class T4, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2, initArg3, initArg4); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; -} - -template<class T, class T1, class T2, class T3, class T4, class T5, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, T5 initArg5, REFIID riid, R ** ppv) -{ - CComPtr<T> obj; - CComPtr<R> result; - HRESULT hResult; - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(obj = new _CComObject<T>); - if (obj.p == NULL) - return E_OUTOFMEMORY; - hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); - if (FAILED(hResult)) - return hResult; - - hResult = obj->Initialize(initArg1, initArg2, initArg3, initArg4, initArg5); - if (FAILED(hResult)) - return hResult; - - *ppv = result.Detach(); - - return S_OK; + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->Initialize(initArg1, initArg2, initArg3); + + if (SUCCEEDED(hResult)) + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; +} + +template<class T, class T1, class T2, class T3, class T4> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, REFIID riid, void ** ppv) +{ + _CComObject<T> *pobj; + HRESULT hResult; + + hResult = _CComObject<T>::CreateInstance(&pobj); + if (FAILED(hResult)) + return hResult; + + pobj->AddRef(); /* CreateInstance returns object with 0 ref count */ + + hResult = pobj->Initialize(initArg1, initArg2, initArg3, initArg4); + + if (SUCCEEDED(hResult)) + hResult = pobj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + + pobj->Release(); /* In case of failure the object will be released */ + + return hResult; } HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue)

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