Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[tthompson] 75424: [NTFS] - Add some utility functions and improve some comments. Improve NtfsAddFilenameToDirectory(). +PrintAllVCNs() - Diagnostic function which prints VCN of every node in an in...

by tthompson＠svn.reactos.org

Author: tthompson Date: Thu Jul 27 18:22:24 2017 New Revision: 75424 URL: http://svn.reactos.org/svn/reactos?rev=75424&view=rev Log: [NTFS] - Add some utility functions and improve some comments. Improve NtfsAddFilenameToDirectory(). +PrintAllVCNs() - Diagnostic function which prints VCN of every node in an index allocation. +GetAllocationOffsetFromVCN() - Calculates location of an index buffer from the node's VCN. +GetInfoClassName() - Gets a string representation of an info class enumeration, to speed up development of unimplemented classes. -NtfsSetInformation() & NtfsQueryInformation() - Use GetInfoClassName to report unhandled information classes. -CompareTreeKeys() - Add a comment and clarify some comments. -NtfsAddFilenameToDirectory() - Don't try to update the size of Index Root on disk if the attribute length hasn't changed. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.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/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Thu Jul 27 18:22:24 2017 @@ -32,6 +32,47 @@ /* FUNCTIONS ****************************************************************/ +// TEMP FUNCTION for diagnostic purposes. +// Prints VCN of every node in an index allocation +VOID +PrintAllVCNs(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT IndexAllocationContext, + ULONG NodeSize) +{ + ULONGLONG CurrentOffset = 0; + PINDEX_BUFFER CurrentNode, Buffer; + ULONGLONG BufferSize = AttributeDataLength(&IndexAllocationContext->Record); + ULONGLONG i; + int Count = 0; + + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, TAG_NTFS); + + ULONG BytesRead = ReadAttribute(Vcb, IndexAllocationContext, 0, (PCHAR)Buffer, BufferSize); + + ASSERT(BytesRead = BufferSize); + + CurrentNode = Buffer; + + // loop through all the nodes + for (i = 0; i < BufferSize; i += NodeSize) + { + NTSTATUS Status = FixupUpdateSequenceArray(Vcb, &CurrentNode->Ntfs); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Fixing fixup failed!\n"); + continue; + } + + DPRINT1("Node #%d, VCN: %I64u\n", Count, CurrentNode->VCN); + + CurrentNode = (PINDEX_BUFFER)((ULONG_PTR)CurrentNode + NodeSize); + CurrentOffset += NodeSize; + Count++; + } + + ExFreePoolWithTag(Buffer, TAG_NTFS); +} + /** * @name CompareTreeKeys * @implemented @@ -62,6 +103,7 @@ UNICODE_STRING Key1Name, Key2Name; LONG Comparison; + // Key1 must not be the final key (AKA the dummy key) ASSERT(!(Key1->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)); // If Key2 is the "dummy key", key 1 will always come first @@ -89,7 +131,7 @@ // Compare the names of the same length Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); - // If the truncated files are the same length, the shorter one comes first + // If the truncated names are the same length, the shorter one comes first if (Comparison == 0) return -1; } @@ -102,7 +144,7 @@ // Compare the names of the same length Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); - // If the truncated files are the same length, the shorter one comes first + // If the truncated names are the same length, the shorter one comes first if (Comparison == 0) return 1; } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Thu Jul 27 18:22:24 2017 @@ -289,6 +289,128 @@ return Status; } +// Convert enum value to friendly name +const PCSTR +GetInfoClassName(FILE_INFORMATION_CLASS infoClass) +{ + const PCSTR fileInfoClassNames[] = { "???????", + "FileDirectoryInformation", + "FileFullDirectoryInformation", + "FileBothDirectoryInformation", + "FileBasicInformation", + "FileStandardInformation", + "FileInternalInformation", + "FileEaInformation", + "FileAccessInformation", + "FileNameInformation", + "FileRenameInformation", + "FileLinkInformation", + "FileNamesInformation", + "FileDispositionInformation", + "FilePositionInformation", + "FileFullEaInformation", + "FileModeInformation", + "FileAlignmentInformation", + "FileAllInformation", + "FileAllocationInformation", + "FileEndOfFileInformation", + "FileAlternateNameInformation", + "FileStreamInformation", + "FilePipeInformation", + "FilePipeLocalInformation", + "FilePipeRemoteInformation", + "FileMailslotQueryInformation", + "FileMailslotSetInformation", + "FileCompressionInformation", + "FileObjectIdInformation", + "FileCompletionInformation", + "FileMoveClusterInformation", + "FileQuotaInformation", + "FileReparsePointInformation", + "FileNetworkOpenInformation", + "FileAttributeTagInformation", + "FileTrackingInformation", + "FileIdBothDirectoryInformation", + "FileIdFullDirectoryInformation", + "FileValidDataLengthInformation", + "FileShortNameInformation", + "FileIoCompletionNotificationInformation", + "FileIoStatusBlockRangeInformation", + "FileIoPriorityHintInformation", + "FileSfioReserveInformation", + "FileSfioVolumeInformation", + "FileHardLinkInformation", + "FileProcessIdsUsingFileInformation", + "FileNormalizedNameInformation", + "FileNetworkPhysicalNameInformation", + "FileIdGlobalTxDirectoryInformation", + "FileIsRemoteDeviceInformation", + "FileAttributeCacheInformation", + "FileNumaNodeInformation", + "FileStandardLinkInformation", + "FileRemoteProtocolInformation", + "FileReplaceCompletionInformation", + "FileMaximumInformation", + "FileDirectoryInformation", + "FileFullDirectoryInformation", + "FileBothDirectoryInformation", + "FileBasicInformation", + "FileStandardInformation", + "FileInternalInformation", + "FileEaInformation", + "FileAccessInformation", + "FileNameInformation", + "FileRenameInformation", + "FileLinkInformation", + "FileNamesInformation", + "FileDispositionInformation", + "FilePositionInformation", + "FileFullEaInformation", + "FileModeInformation", + "FileAlignmentInformation", + "FileAllInformation", + "FileAllocationInformation", + "FileEndOfFileInformation", + "FileAlternateNameInformation", + "FileStreamInformation", + "FilePipeInformation", + "FilePipeLocalInformation", + "FilePipeRemoteInformation", + "FileMailslotQueryInformation", + "FileMailslotSetInformation", + "FileCompressionInformation", + "FileObjectIdInformation", + "FileCompletionInformation", + "FileMoveClusterInformation", + "FileQuotaInformation", + "FileReparsePointInformation", + "FileNetworkOpenInformation", + "FileAttributeTagInformation", + "FileTrackingInformation", + "FileIdBothDirectoryInformation", + "FileIdFullDirectoryInformation", + "FileValidDataLengthInformation", + "FileShortNameInformation", + "FileIoCompletionNotificationInformation", + "FileIoStatusBlockRangeInformation", + "FileIoPriorityHintInformation", + "FileSfioReserveInformation", + "FileSfioVolumeInformation", + "FileHardLinkInformation", + "FileProcessIdsUsingFileInformation", + "FileNormalizedNameInformation", + "FileNetworkPhysicalNameInformation", + "FileIdGlobalTxDirectoryInformation", + "FileIsRemoteDeviceInformation", + "FileAttributeCacheInformation", + "FileNumaNodeInformation", + "FileStandardLinkInformation", + "FileRemoteProtocolInformation", + "FileReplaceCompletionInformation", + "FileMaximumInformation" }; + return fileInfoClassNames[infoClass]; +} + /* * FUNCTION: Retrieve the specified file information */ @@ -376,12 +498,12 @@ case FileAlternateNameInformation: case FileAllInformation: - DPRINT1("Unimplemented information class %u\n", FileInformationClass); + DPRINT1("Unimplemented information class: %s\n", GetInfoClassName(FileInformationClass)); Status = STATUS_NOT_IMPLEMENTED; break; default: - DPRINT1("Unimplemented information class %u\n", FileInformationClass); + DPRINT1("Unimplemented information class: %s\n", GetInfoClassName(FileInformationClass)); Status = STATUS_INVALID_PARAMETER; } @@ -645,7 +767,7 @@ // TODO: all other information classes default: - DPRINT1("FIXME: Unimplemented information class %u\n", FileInformationClass); + DPRINT1("FIXME: Unimplemented information class: %s\n", GetInfoClassName(FileInformationClass)); Status = STATUS_NOT_IMPLEMENTED; } 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] Thu Jul 27 18:22:24 2017 @@ -2018,25 +2018,29 @@ // we must create an index allocation and index bitmap (TODO). Also TODO: support file records with // $ATTRIBUTE_LIST's. AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); - DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); - - // Find the attribute (or attribute-end marker) after the index root - NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); - if (NextAttribute->Type != AttributeEnd) - { - DPRINT1("FIXME: For now, only resizing index root at the end of a file record is supported!\n"); - ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); - ReleaseAttributeContext(IndexRootContext); - ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); - ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return STATUS_NOT_IMPLEMENTED; - } - - // Update the length of the attribute in the file record of the parent directory - InternalSetResidentAttributeLength(IndexRootContext, - ParentFileRecord, - IndexRootOffset, - AttributeLength); + + if (AttributeLength != IndexRootContext->Record.Resident.ValueLength) + { + DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); + + // Find the attribute (or attribute-end marker) after the index root + NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: For now, only resizing index root at the end of a file record is supported!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return STATUS_NOT_IMPLEMENTED; + } + + // Update the length of the attribute in the file record of the parent directory + InternalSetResidentAttributeLength(IndexRootContext, + ParentFileRecord, + IndexRootOffset, + AttributeLength); + } NT_ASSERT(ParentFileRecord->BytesInUse <= DeviceExt->NtfsInfo.BytesPerFileRecord); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jul 27 18:22:24 2017 @@ -207,6 +207,9 @@ #define INDEX_ROOT_SMALL 0x0 #define INDEX_ROOT_LARGE 0x1 + +#define INDEX_NODE_SMALL 0x0 +#define INDEX_NODE_LARGE 0x1 #define NTFS_INDEX_ENTRY_NODE 1 #define NTFS_INDEX_ENTRY_END 2 @@ -701,7 +704,20 @@ DestroyBTree(PB_TREE Tree); VOID +DestroyBTreeNode(PB_TREE_FILENAME_NODE Node); + +VOID DumpBTree(PB_TREE Tree); + +VOID +DumpBTreeNode(PB_TREE_FILENAME_NODE Node, + ULONG Number, + ULONG Depth); + +ULONGLONG +GetAllocationOffsetFromVCN(PDEVICE_EXTENSION DeviceExt, + ULONG IndexBufferSize, + ULONGLONG Vcn); NTSTATUS NtfsInsertKey(ULONGLONG FileReference,

7 years, 5 months

[tthompson] 75423: [NTFS] - After creating a new file, update creation disposition before calling NtfsCreateFile() recursively. This fixes creating a file via right-clicking in a folder.

by tthompson＠svn.reactos.org

Author: tthompson Date: Thu Jul 27 11:35:50 2017 New Revision: 75423 URL: http://svn.reactos.org/svn/reactos?rev=75423&view=rev Log: [NTFS] - After creating a new file, update creation disposition before calling NtfsCreateFile() recursively. This fixes creating a file via right-clicking in a folder. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Thu Jul 27 11:35:50 2017 @@ -580,8 +580,18 @@ return Status; } - // Now we should be able to open the file - return NtfsCreateFile(DeviceObject, IrpContext); + // Before we open the file we just created, we need to change the disposition (upper 8 bits of ULONG) + // from create to open, since we already created the file + Stack->Parameters.Create.Options = (ULONG)FILE_OPEN << 24 | RequestedOptions; + + // Now we should be able to open the file using NtfsCreateFile() + Status = NtfsCreateFile(DeviceObject, IrpContext); + if (NT_SUCCESS(Status)) + { + // We need to change Irp->IoStatus.Information to reflect creation + Irp->IoStatus.Information = FILE_CREATED; + } + return Status; } }

7 years, 5 months

[pschweitzer] 75422: [EXT2] Import commits by Kaho Ng <ngkaho1234@gmail.com> from upstream: - b7657e5 Ext3Fsd: Introduce VCB_RO_COMPAT_READ_ONLY flag for struct VCB - e7c1142 Ext3Fsd: EXT4_FEATURE_...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 27 10:22:57 2017 New Revision: 75422 URL: http://svn.reactos.org/svn/reactos?rev=75422&view=rev Log: [EXT2] Import commits by Kaho Ng <ngkaho1234(a)gmail.com> from upstream: - b7657e5 Ext3Fsd: Introduce VCB_RO_COMPAT_READ_ONLY flag for struct VCB - e7c1142 Ext3Fsd: EXT4_FEATURE_INCOMPAT_64BIT is not supported - 785943f Ext3Fsd: fix issue #6 Refuse mounting filesystems with incompatible flags. This avoids corrupting 64bits filesystems. Patch by Lubomir Rintel CORE-13589 Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs.h trunk/reactos/drivers/filesystems/ext2/src/memory.c trunk/reactos/media/doc/README.FSD Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h [iso-8859-1] Thu Jul 27 10:22:57 2017 @@ -789,6 +789,7 @@ #define VCB_DEVICE_REMOVED 0x00008000 #define VCB_JOURNAL_RECOVER 0x00080000 #define VCB_ARRIVAL_NOTIFIED 0x00800000 +#define VCB_RO_COMPAT_READ_ONLY 0x01000000 #define VCB_READ_ONLY 0x08000000 #define VCB_WRITE_PROTECTED 0x10000000 #define VCB_FLOPPY_DISK 0x20000000 @@ -800,6 +801,7 @@ #define IsMounted(Vcb) (IsFlagOn((Vcb)->Flags, VCB_MOUNTED)) #define IsDispending(Vcb) (IsFlagOn((Vcb)->Flags, VCB_DISMOUNT_PENDING)) #define IsVcbReadOnly(Vcb) (IsFlagOn((Vcb)->Flags, VCB_READ_ONLY) || \ + IsFlagOn((Vcb)->Flags, VCB_RO_COMPAT_READ_ONLY) || \ IsFlagOn((Vcb)->Flags, VCB_WRITE_PROTECTED)) Modified: trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/linux/ext3_fs.h [iso-8859-1] Thu Jul 27 10:22:57 2017 @@ -720,7 +720,6 @@ EXT4_FEATURE_INCOMPAT_RECOVER| \ EXT4_FEATURE_INCOMPAT_META_BG| \ EXT4_FEATURE_INCOMPAT_EXTENTS| \ - EXT4_FEATURE_INCOMPAT_64BIT| \ EXT4_FEATURE_INCOMPAT_FLEX_BG) #define EXT4_FEATURE_RO_COMPAT_SUPP ( \ EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \ Modified: trunk/reactos/drivers/filesystems/ext2/src/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/memory.c [iso-8859-1] Thu Jul 27 10:22:57 2017 @@ -2318,15 +2318,20 @@ _SEH2_LEAVE; } - /* checking in/compat features */ - if (IsFlagOn(sb->s_feature_compat, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { - Vcb->IsExt3fs = TRUE; - } - - /* don't mount any volumes with external journal devices */ - if (IsFlagOn(sb->s_feature_incompat, EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) { + /* Reject mounting volume if we encounter unsupported incompat features */ + if (FlagOn(sb->s_feature_incompat, ~EXT4_FEATURE_INCOMPAT_SUPP)) { Status = STATUS_UNRECOGNIZED_VOLUME; _SEH2_LEAVE; + } + + /* Mount the volume RO if we encounter unsupported ro_compat features */ + if (FlagOn(sb->s_feature_ro_compat, ~EXT4_FEATURE_RO_COMPAT_SUPP)) { + SetLongFlag(Vcb->Flags, VCB_RO_COMPAT_READ_ONLY); + } + + /* Recognize the filesystem as Ext3fs if it supports journalling */ + if (IsFlagOn(sb->s_feature_compat, EXT4_FEATURE_COMPAT_HAS_JOURNAL)) { + Vcb->IsExt3fs = TRUE; } /* check block size */ Modified: trunk/reactos/media/doc/README.FSD URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.FSD?rev=7… ============================================================================== --- trunk/reactos/media/doc/README.FSD [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.FSD [iso-8859-1] Thu Jul 27 10:22:57 2017 @@ -9,7 +9,7 @@ The following FSD are shared with: http://www.ext2fsd.com/ -reactos/drivers/filesystems/ext2 # Synced to 0.68 +reactos/drivers/filesystems/ext2 # Synced to 0.68, with b7657e5, e7c1142, 785943f The following FSD are shared with: http://www.acc.umu.se/~bosse/

7 years, 5 months

[pschweitzer] 75421: [KERNEL32_VISTA] Delay load NTDLL_vista, in order to save *380KB* at boot. CORE-13361

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 27 09:43:56 2017 New Revision: 75421 URL: http://svn.reactos.org/svn/reactos?rev=75421&view=rev Log: [KERNEL32_VISTA] Delay load NTDLL_vista, in order to save *380KB* at boot. CORE-13361 Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] Thu Jul 27 09:43:56 2017 @@ -15,6 +15,7 @@ add_library(kernel32_vista SHARED ${SOURCE}) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) -add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) +add_importlibs(kernel32_vista kernel32 ntdll) +add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all)

7 years, 5 months

[pschweitzer] 75420: [RDBSS] - Misc fixes with DPRINTS [RXCE] - In RxFinalizeSrvOpen, always dereference the FCB, it's always referenced on SRV_OPEN creation - Misc fixes with DPRINTS With that rev...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 27 09:37:10 2017 New Revision: 75420 URL: http://svn.reactos.org/svn/reactos?rev=75420&view=rev Log: [RDBSS] - Misc fixes with DPRINTS [RXCE] - In RxFinalizeSrvOpen, always dereference the FCB, it's always referenced on SRV_OPEN creation - Misc fixes with DPRINTS With that revision and r75419, I'm now able to mount a NFS share, browse it, read a file from it, and unmount it. We're OK regarding references counting! CORE-8204 CORE-11327 CORE-13581 Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Thu Jul 27 09:37:10 2017 @@ -5664,6 +5664,11 @@ /* If FCB was not found or is not covering full path, prepare for more work */ if (Fcb == NULL || Fcb->FcbTableEntry.Path.Length != NetRootName->Length) { + if (Fcb != NULL) + { + DPRINT1("FCB was found and it's not covering the whole path: %wZ - %wZ\n", &Fcb->FcbTableEntry.Path, NetRootName); + } + if (!AcquiredExclusive) { RxReleaseFcbTableLock(&NetRoot->FcbTable); @@ -6354,7 +6359,7 @@ RxContext->LastExecutionThread = PsGetCurrentThread(); SetFlag(RxContext->Flags, (RX_CONTEXT_FLAG_IN_FSP | RX_CONTEXT_FLAG_WAIT)); - DPRINT("Dispatch: MN: %d, Ctxt: %p, IRP: %p, THRD: %lx #%lx", RxContext->MinorFunction, + DPRINT("Dispatch: MN: %d, Ctxt: %p, IRP: %p, THRD: %lx #%lx\n", RxContext->MinorFunction, RxContext, RxContext->CurrentIrp, RxContext->LastExecutionThread, RxContext->SerialNumber); Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Thu Jul 27 09:37:10 2017 @@ -412,6 +412,8 @@ FsRtlSetupAdvancedHeader(Fcb, &NonPagedFcb->AdvancedFcbHeaderMutex); } + DPRINT("Allocated %p\n", Buffer); + return Buffer; } @@ -3158,17 +3160,18 @@ RemoveEntryList(&ThisSrvOpen->SrvOpenQLinks); } - /* If enclosed allocation, mark the memory zone free and dereference FCB */ + /* If enclosed allocation, mark the memory zone free */ if (BooleanFlagOn(ThisSrvOpen->Flags, SRVOPEN_FLAG_ENCLOSED_ALLOCATED)) { ClearFlag(Fcb->FcbState, FCB_STATE_SRVOPEN_USED); - RxDereferenceNetFcb(Fcb); } /* Otherwise, free the memory */ else { RxFreeFcbObject(ThisSrvOpen); } + + RxDereferenceNetFcb(Fcb); return TRUE; } @@ -4088,6 +4091,8 @@ PVOID Object) { PAGED_CODE(); + + DPRINT("Freeing %p\n", Object); /* If that's a FOBX/SRV_OPEN, nothing to do, just free it */ if (NodeType(Object) == RDBSS_NTC_FOBX || NodeType(Object) == RDBSS_NTC_SRVOPEN)

7 years, 5 months

[pschweitzer] 75419: [SHELL32] Revert r75348. Because of r75349, this revision was made useless, and even worse, it was leaking a handle to the directory where the FSD doesn't support notifications...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 27 09:33:11 2017 New Revision: 75419 URL: http://svn.reactos.org/svn/reactos?rev=75419&view=rev Log: [SHELL32] Revert r75348. Because of r75349, this revision was made useless, and even worse, it was leaking a handle to the directory where the FSD doesn't support notifications. Also made some debug traces more useful Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Thu Jul 27 09:33:11 2017 @@ -173,7 +173,7 @@ TRACE("Not freeing, still %d queued events\n", queued); return; } - TRACE("Freeing for real!\n"); + TRACE("Freeing for real! %p (%d) \n", item, item->cidl); #endif /* remove item from list */ @@ -693,7 +693,7 @@ static void CALLBACK _RequestTermination(ULONG_PTR arg) { LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) arg; - TRACE("_RequestTermination %p \n", item->hDirectory); + TRACE("_RequestTermination %p %p \n", item, item->hDirectory); if (!item->hDirectory || item->hDirectory == INVALID_HANDLE_VALUE) return; CancelIo(item->hDirectory); @@ -724,18 +724,6 @@ #endif #ifdef __REACTOS__ - /* This is to avoid double-free and potential use after free - * In case it failed, _BeginRead() already deferenced item - * But if failure comes the FSD, the APC routine (us) will - * be called as well, which will cause a double-free on quit. - * Avoid this by deferencing only once in case of failure and thus, - * incrementing reference count here - */ - if (dwErrorCode != ERROR_SUCCESS) - { - InterlockedIncrement(&item->pParent->wQueuedCount); - } - /* If the FSD doesn't support directory change notifications, there's no * no need to retry and requeue notification */ @@ -807,7 +795,9 @@ #ifdef __REACTOS__ { #endif - ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p) Code: %u \n", + ERR("ReadDirectoryChangesW failed. (%p, %p, %p, %p, %p, %p) Code: %u \n", + item, + item->pParent, item->hDirectory, item->buffer, &item->overlapped,

7 years, 5 months

[bfreisen] 75418: [MSPAINT] - Enable drag cancellation -- patch by Katayama Hirofumi MZ CORE-13395 #resolve

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Thu Jul 27 09:29:42 2017 New Revision: 75418 URL: http://svn.reactos.org/svn/reactos?rev=75418&view=rev Log: [MSPAINT] - Enable drag cancellation -- patch by Katayama Hirofumi MZ CORE-13395 #resolve Modified: trunk/reactos/base/applications/mspaint/imgarea.cpp trunk/reactos/base/applications/mspaint/imgarea.h trunk/reactos/base/applications/mspaint/selection.cpp trunk/reactos/base/applications/mspaint/selection.h trunk/reactos/base/applications/mspaint/sizebox.cpp trunk/reactos/base/applications/mspaint/sizebox.h trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/imgarea.cpp [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -5,6 +5,7 @@ * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ /* INCLUDES *********************************************************/ @@ -191,8 +192,6 @@ { if (drawing) { - ReleaseCapture(); - drawing = FALSE; endPaintingL(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); @@ -205,6 +204,71 @@ } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } + drawing = FALSE; + ReleaseCapture(); + return 0; +} + +void CImgAreaWindow::cancelDrawing() +{ + POINT pt; + switch (toolsModel.GetActiveTool()) + { + case TOOL_FREESEL: case TOOL_RECTSEL: + case TOOL_TEXT: case TOOL_ZOOM: case TOOL_SHAPE: + imageModel.ResetToPrevious(); + selectionModel.ResetPtStack(); + pointSP = 0; + Invalidate(FALSE); + break; + default: + GetCursorPos(&pt); + ScreenToClient(&pt); + // FIXME: dirty hack + if (GetKeyState(VK_LBUTTON) < 0) + { + endPaintingL(imageModel.GetDC(), pt.x * 1000 / toolsModel.GetZoom(), pt.y * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + paletteModel.GetBgColor()); + } + else if (GetKeyState(VK_RBUTTON) < 0) + { + endPaintingR(imageModel.GetDC(), pt.x * 1000 / toolsModel.GetZoom(), pt.y * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + paletteModel.GetBgColor()); + } + imageModel.Undo(); + pointSP = 0; + selectionModel.ResetPtStack(); + } +} + +LRESULT CImgAreaWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (drawing) + { + cancelDrawing(); + drawing = FALSE; + } + return 0; +} + +LRESULT CImgAreaWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == VK_ESCAPE) + { + if (GetCapture() == m_hWnd) + { + ReleaseCapture(); + } + else + { + switch (toolsModel.GetActiveTool()) + { + case TOOL_SHAPE: case TOOL_BEZIER: + cancelDrawing(); + break; + } + } + } return 0; } @@ -212,8 +276,6 @@ { if (drawing) { - ReleaseCapture(); - drawing = FALSE; endPaintingR(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); @@ -226,6 +288,8 @@ } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } + ReleaseCapture(); + drawing = FALSE; return 0; } Modified: trunk/reactos/base/applications/mspaint/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/imgarea.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/imgarea.h [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -5,6 +5,7 @@ * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ class CImgAreaWindow : public CWindowImpl<CMainWindow> @@ -24,6 +25,8 @@ MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseLeave) MESSAGE_HANDLER(WM_IMAGEMODELDIMENSIONSCHANGED, OnImageModelDimensionsChanged) MESSAGE_HANDLER(WM_IMAGEMODELIMAGECHANGED, OnImageModelImageChanged) + MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) + MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) END_MSG_MAP() BOOL drawing; @@ -40,6 +43,9 @@ LRESULT OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnImageModelImageChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); + void cancelDrawing(); }; Modified: trunk/reactos/base/applications/mspaint/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.cpp [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/selection.cpp * PURPOSE: Window procedure of the selection window * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ /* INCLUDES *********************************************************/ @@ -230,6 +231,39 @@ return 0; } +LRESULT CSelectionWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (m_bMoving) + { + m_bMoving = FALSE; + if (m_iAction == ACTION_MOVE) + { + // FIXME: dirty hack + placeSelWin(); + imageModel.Undo(); + imageModel.Undo(); + } + else + { + m_iAction = ACTION_MOVE; + } + ShowWindow(SW_HIDE); + } + return 0; +} + +LRESULT CSelectionWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == VK_ESCAPE) + { + if (GetCapture() == m_hWnd) + { + ReleaseCapture(); + } + } + return 0; +} + LRESULT CSelectionWindow::OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (toolsModel.GetActiveTool() == TOOL_TEXT) Modified: trunk/reactos/base/applications/mspaint/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/selection.h * PURPOSE: Window procedure of the selection window * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ class CSelectionWindow : public CWindowImpl<CSelectionWindow> @@ -23,6 +24,8 @@ MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_SELECTIONMODELREFRESHNEEDED, OnSelectionModelRefreshNeeded) + MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) + MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) END_MSG_MAP() LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -36,6 +39,8 @@ LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); private: static const LPCTSTR m_lpszCursorLUT[9]; Modified: trunk/reactos/base/applications/mspaint/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/sizebox.cpp * PURPOSE: Window procedure of the size boxes * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ /* INCLUDES *********************************************************/ @@ -98,13 +99,25 @@ imageModel.Crop(imgXRes + xRel, imgYRes + yRel, 0, 0); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) _T("")); } + resizing = FALSE; ReleaseCapture(); + return 0; +} + +LRESULT CSizeboxWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ resizing = FALSE; return 0; } -LRESULT CSizeboxWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CSizeboxWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - resizing = FALSE; + if (wParam == VK_ESCAPE) + { + if (GetCapture() == m_hWnd) + { + ReleaseCapture(); + } + } return 0; } Modified: trunk/reactos/base/applications/mspaint/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/sizebox.h * PURPOSE: Window procedure of the size boxes * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ class CSizeboxWindow : public CWindowImpl<CSizeboxWindow> @@ -16,12 +17,14 @@ MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) + MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) + MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) END_MSG_MAP() LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Thu Jul 27 09:29:42 2017 @@ -5,6 +5,7 @@ * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ /* INCLUDES *********************************************************/ @@ -333,18 +334,33 @@ { if (wParam == VK_ESCAPE) { - if (!imageArea.drawing) - { - /* Deselect */ - if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) - { - startPaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - whilePaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - endPaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - selectionWindow.ShowWindow(SW_HIDE); - } - } - /* FIXME: also cancel current drawing underway */ + HWND hwndCapture = GetCapture(); + if (hwndCapture) + { + if (selectionWindow.m_hWnd == hwndCapture || + imageArea.m_hWnd == hwndCapture || + fullscreenWindow.m_hWnd == hwndCapture || + sizeboxLeftTop.m_hWnd == hwndCapture || + sizeboxCenterTop.m_hWnd == hwndCapture || + sizeboxRightTop.m_hWnd == hwndCapture || + sizeboxLeftCenter.m_hWnd == hwndCapture || + sizeboxRightCenter.m_hWnd == hwndCapture || + sizeboxLeftBottom.m_hWnd == hwndCapture || + sizeboxCenterBottom.m_hWnd == hwndCapture || + sizeboxRightBottom.m_hWnd == hwndCapture) + { + SendMessage(hwndCapture, nMsg, wParam, lParam); + } + } + else + { + switch (toolsModel.GetActiveTool()) + { + case TOOL_SHAPE: case TOOL_BEZIER: + imageArea.SendMessage(nMsg, wParam, lParam); + break; + } + } } return 0; }

7 years, 5 months

[ashaposhnikov] 75417: [RAPPS] - Added DownloadManager class (static for now) - Multiple selection launches multiple download dialogs (Checkbox selection has a priority over Selection when clicking...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Jul 27 09:02:42 2017 New Revision: 75417 URL: http://svn.reactos.org/svn/reactos?rev=75417&view=rev Log: [RAPPS] - Added DownloadManager class (static for now) - Multiple selection launches multiple download dialogs (Checkbox selection has a priority over Selection when clicking Install) *A preperation for lauching a single dialog with a list of apps* - Show currently installing app in the dialog window Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -251,7 +251,7 @@ if (!DeleteCurrentAppsDB()) return FALSE; - DownloadApplicationsDB(APPLICATION_DATABASE_URL); + DownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); if (m_szPath.IsEmpty()) return FALSE; @@ -280,7 +280,7 @@ if (hFind == INVALID_HANDLE_VALUE) { if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES) - DownloadApplicationsDB(APPLICATION_DATABASE_URL); + DownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); ExtractFilesFromCab(m_szCabPath, m_szAppsPath); hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -458,7 +458,7 @@ BOOL GetCheckState(INT item) { - return (BOOL) GetItemState(item, LVIS_STATEIMAGEMASK); + return (BOOL) (GetItemState(item, LVIS_STATEIMAGEMASK) >> 12) - 1; } VOID SetCheckState(INT item, BOOL fCheck) @@ -472,14 +472,15 @@ SetCheckState(-1, bHasAllChecked); } - ATL::CAtlList<PAPPLICATION_INFO> GetCheckedItems() - { - ATL::CAtlList<PAPPLICATION_INFO> list; - for (INT i = 0; i != -1; i = GetNextItem(i, LVNI_ALL)) + ATL::CSimpleArray<PAPPLICATION_INFO> GetCheckedItems() + { + ATL::CSimpleArray<PAPPLICATION_INFO> list; + for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) { if (GetCheckState(i) != FALSE) { - list.AddTail((PAPPLICATION_INFO) GetItemData(i)); + PAPPLICATION_INFO pAppInfo = (PAPPLICATION_INFO) GetItemData(i); + list.Add(pAppInfo); } } return list; @@ -1255,11 +1256,16 @@ break; case ID_INSTALL: - if (DownloadApplication(-1)) - /* TODO: Implement install dialog - * if (InstallApplication(-1)) - */ + if (nSelectedApps) + { + DownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); UpdateApplicationsList(-1); + } + else if(DownloadManager::DownloadApplication((PAPPLICATION_INFO) m_ListView->GetSelectionMark())) + { + UpdateApplicationsList(-1); + } + break; case ID_UNINSTALL: @@ -1403,11 +1409,10 @@ { if (m_StatusBar) { - ATL::CStringW szBuffer1, szBuffer2; - - szBuffer2.LoadStringW(hInst, IDS_APPS_COUNT); - szBuffer1.Format(szBuffer2, m_ListView->GetItemCount(), nSelectedApps); - m_StatusBar->SetText(szBuffer1); + ATL::CStringW szBuffer; + + szBuffer.Format(IDS_APPS_COUNT, m_ListView->GetItemCount(), nSelectedApps); + m_StatusBar->SetText(szBuffer); } } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -92,7 +92,7 @@ IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE -CAPTION "Downloading..." +CAPTION "Downloading %ls..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 @@ -108,16 +108,6 @@ LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 PUSHBUTTON "Close", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 -END - -IDD_DOWNLOAD_DIALOG_MULTI DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE -CAPTION "Downloading (multiple)..." -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER - PUSHBUTTON "Cancel", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END STRINGTABLE Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -92,7 +92,7 @@ IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE -CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." +CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ° %ls..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -100,7 +100,7 @@ IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE -CAPTION "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ..." +CAPTION "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ %ls..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -38,8 +38,6 @@ #include <wininet.h> #include <shellutils.h> #include <windowsx.h> - -static PAPPLICATION_INFO AppInfo; class CDownloadDialog : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -250,9 +248,151 @@ MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); } -static -DWORD WINAPI -ThreadFunc(LPVOID Context) +// DownloadManager + +PAPPLICATION_INFO DownloadManager::AppInfo = NULL; + +INT_PTR CALLBACK DownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HANDLE Thread; + DWORD ThreadId; + HWND Item; + + switch (uMsg) + { + case WM_INITDIALOG: + { + HICON hIconSm, hIconBg; + WCHAR szCaption[MAX_PATH]; + ATL::CStringW szNewCaption; + + hIconBg = (HICON) GetClassLongW(hMainWnd, GCLP_HICON); + hIconSm = (HICON) GetClassLongW(hMainWnd, GCLP_HICONSM); + + if (hIconBg && hIconSm) + { + SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); + SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); + } + + // Change caption to show the currently downloaded app + GetWindowTextW(Dlg, szCaption, MAX_PATH); + szNewCaption.Format(szCaption, AppInfo->szName.GetString()); + SetWindowTextW(Dlg, szNewCaption.GetString()); + + SetWindowLongW(Dlg, GWLP_USERDATA, 0); + Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); + if (Item) + { + // initialize the default values for our nifty progress bar + // and subclass it so that it learns to print a status text + SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + SendMessageW(Item, PBM_SETPOS, 0, 0); + + SetWindowSubclass(Item, DownloadProgressProc, 0, 0); + } + + // add a neat placeholder until the download URL is retrieved + SetDlgItemTextW(Dlg, IDC_DOWNLOAD_STATUS, L"\x2022 \x2022 \x2022"); + + Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); + if (!Thread) + return FALSE; + CloseHandle(Thread); + return TRUE; + } + case WM_COMMAND: + if (wParam == IDCANCEL) + { + SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); + PostMessageW(Dlg, WM_CLOSE, 0, 0); + } + return FALSE; + + case WM_CLOSE: + DestroyWindow(Dlg); + return TRUE; + + default: + return FALSE; + } +} + +LRESULT CALLBACK DownloadManager::DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +{ + static ATL::CStringW szProgressText; + + switch (uMsg) + { + case WM_SETTEXT: + { + if (lParam) + { + szProgressText = (PCWSTR) lParam; + } + return TRUE; + } + + case WM_ERASEBKGND: + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hDC = BeginPaint(hWnd, &ps), hdcMem; + HBITMAP hbmMem; + HANDLE hOld; + RECT myRect; + UINT win_width, win_height; + + GetClientRect(hWnd, &myRect); + + /* grab the progress bar rect size */ + win_width = myRect.right - myRect.left; + win_height = myRect.bottom - myRect.top; + + /* create an off-screen DC for double-buffering */ + hdcMem = CreateCompatibleDC(hDC); + hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); + + hOld = SelectObject(hdcMem, hbmMem); + + /* call the original draw code and redirect it to our memory buffer */ + DefSubclassProc(hWnd, uMsg, (WPARAM) hdcMem, lParam); + + /* draw our nifty progress text over it */ + SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText(hdcMem, szProgressText.GetString(), szProgressText.GetLength(), + &myRect, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, + GetSysColor(COLOR_CAPTIONTEXT), + GetSysColor(COLOR_3DSHADOW), + 1, 1); + + /* transfer the off-screen DC to the screen */ + BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); + + /* free the off-screen DC */ + SelectObject(hdcMem, hOld); + DeleteObject(hbmMem); + DeleteDC(hdcMem); + + EndPaint(hWnd, &ps); + return 0; + } + + /* Raymond Chen says that we should safely unsubclass all the things! + (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ + case WM_NCDESTROY: + { + szProgressText.Empty(); + RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); + } + /* Fall-through */ + default: + return DefSubclassProc(hWnd, uMsg, wParam, lParam); + } +} + +DWORD WINAPI DownloadManager::ThreadFunc(LPVOID Context) { CComPtr<IBindStatusCallback> dl; ATL::CStringW Path; @@ -272,9 +412,15 @@ URL_COMPONENTS urlComponents; size_t urlLength, filenameLength; + if (!AppInfo) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); + goto end; + } + /* build the path for the download */ - p = wcsrchr(AppInfo->szUrlDownload, L'/'); - q = wcsrchr(AppInfo->szUrlDownload, L'?'); + p = wcsrchr(AppInfo->szUrlDownload.GetString(), L'/'); + q = wcsrchr(AppInfo->szUrlDownload.GetString(), L'?'); /* do we have a final slash separator? */ if (!p) @@ -284,7 +430,7 @@ filenameLength = wcslen(p) * sizeof(WCHAR); /* do we have query arguments in the target URL after the filename? account for them - (e.g. https://example.org/myfile.exe?no_adware_plz) */ + (e.g. https://example.org/myfile.exe?no_adware_plz) */ if (q && q > p && (q - p) > 0) filenameLength -= wcslen(q - 1) * sizeof(WCHAR); @@ -424,7 +570,7 @@ goto end; /* if this thing isn't a RAPPS update and it has a SHA-1 checksum - verify its integrity by using the native advapi32.A_SHA1 functions */ + verify its integrity by using the native advapi32.A_SHA1 functions */ if (!bCab && AppInfo->szSHA1[0] != 0) { ATL::CStringW szMsgText; @@ -472,174 +618,49 @@ return 0; } - -LRESULT CALLBACK -DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) -{ - static ATL::CStringW szProgressText; - - switch (uMsg) - { - case WM_SETTEXT: - { - if (lParam) - { - szProgressText = (PCWSTR) lParam; - } - return TRUE; - } - - case WM_ERASEBKGND: - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hDC = BeginPaint(hWnd, &ps), hdcMem; - HBITMAP hbmMem; - HANDLE hOld; - RECT myRect; - UINT win_width, win_height; - - GetClientRect(hWnd, &myRect); - - /* grab the progress bar rect size */ - win_width = myRect.right - myRect.left; - win_height = myRect.bottom - myRect.top; - - /* create an off-screen DC for double-buffering */ - hdcMem = CreateCompatibleDC(hDC); - hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); - - hOld = SelectObject(hdcMem, hbmMem); - - /* call the original draw code and redirect it to our memory buffer */ - DefSubclassProc(hWnd, uMsg, (WPARAM) hdcMem, lParam); - - /* draw our nifty progress text over it */ - SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); - DrawShadowText(hdcMem, szProgressText.GetString(), szProgressText.GetLength(), - &myRect, - DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, - GetSysColor(COLOR_CAPTIONTEXT), - GetSysColor(COLOR_3DSHADOW), - 1, 1); - - /* transfer the off-screen DC to the screen */ - BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); - - /* free the off-screen DC */ - SelectObject(hdcMem, hOld); - DeleteObject(hbmMem); - DeleteDC(hdcMem); - - EndPaint(hWnd, &ps); - return 0; - } - - /* Raymond Chen says that we should safely unsubclass all the things! - (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ - case WM_NCDESTROY: - { - szProgressText.Empty(); - RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); - } - /* Fall-through */ - default: - return DefSubclassProc(hWnd, uMsg, wParam, lParam); - } -} - -static -INT_PTR CALLBACK -DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - HANDLE Thread; - DWORD ThreadId; - HWND Item; - - switch (uMsg) - { - case WM_INITDIALOG: - { - HICON hIconSm = NULL, hIconBg = NULL; - - hIconBg = (HICON) GetClassLongPtr(hMainWnd, GCLP_HICON); - hIconSm = (HICON) GetClassLongPtr(hMainWnd, GCLP_HICONSM); - - if (hIconBg && hIconSm) - { - SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); - SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); - } - - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); - Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); - if (Item) - { - /* initialize the default values for our nifty progress bar - and subclass it so that it learns to print a status text */ - SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); - SendMessageW(Item, PBM_SETPOS, 0, 0); - - SetWindowSubclass(Item, DownloadProgressProc, 0, 0); - } - - /* add a neat placeholder until the download URL is retrieved */ - Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS); - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L"\x2022 \x2022 \x2022"); - - Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - if (!Thread) - return FALSE; - CloseHandle(Thread); - return TRUE; - } - case WM_COMMAND: - if (wParam == IDCANCEL) - { - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); - PostMessageW(Dlg, WM_CLOSE, 0, 0); - } +//TODO: Maybe launch this (similar function) in a seperate thread, so the list could be updated +BOOL DownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList) +{ + BOOL bResult = TRUE; + + for (INT i = 0; i < AppsList.GetSize(); ++i) + { + bResult = DownloadApplication(AppsList[i]) && bResult; + } + return bResult; +} + +BOOL DownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo) +{ + if (!pAppInfo) + { return FALSE; - - case WM_CLOSE: - DestroyWindow(Dlg); - return TRUE; - - default: - return FALSE; - } -} - -BOOL -DownloadApplication(INT Index) -{ - if (!IS_AVAILABLE_ENUM(SelectedEnumType)) - return FALSE; - - AppInfo = (PAPPLICATION_INFO) ListViewGetlParam(Index); - if (!AppInfo) - return FALSE; + } + + // Create a dialog and issue a download process + AppInfo = pAppInfo; + LaunchDownloadDialog(); WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, AppInfo->szName.GetString()); - CreateDialogW(hInst, - MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), - hMainWnd, - DownloadDlgProc); - return TRUE; } -VOID -DownloadApplicationsDB(LPCWSTR lpUrl) +VOID DownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl) { APPLICATION_INFO IntInfo; IntInfo.szUrlDownload = lpUrl; AppInfo = &IntInfo; + LaunchDownloadDialog(); +} + +//TODO: Reuse the dialog +VOID DownloadManager::LaunchDownloadDialog() +{ CreateDialogW(hInst, - MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), - hMainWnd, - DownloadDlgProc); -} + MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), + hMainWnd, + DownloadDlgProc); +} Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Thu Jul 27 09:02:42 2017 @@ -226,7 +226,7 @@ }; /* installdlg.cpp */ -BOOL InstallApplication(INT Index); +//BOOL InstallApplication(INT Index); /* installed.cpp */ typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, ATL::CStringW &lpName, PINSTALLED_INFO Info); @@ -249,8 +249,26 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); /* loaddlg.cpp */ -BOOL DownloadApplication(INT Index); -VOID DownloadApplicationsDB(LPCWSTR lpUrl); + +class DownloadManager +{ + static PAPPLICATION_INFO AppInfo; +public: + + static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + UINT_PTR uIdSubclass, + DWORD_PTR dwRefData); + + static DWORD WINAPI ThreadFunc(LPVOID Context); + static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList); + static BOOL DownloadApplication(PAPPLICATION_INFO pAppInfo); + static VOID DownloadApplicationsDB(LPCWSTR lpUrl); + static VOID LaunchDownloadDialog(); +}; /* misc.cpp */ INT GetSystemColorDepth(VOID);

7 years, 5 months

[rgampa] 75416: [USBXHCI] -roothub get port status function update CORE-13344

by rgampa＠svn.reactos.org

Author: rgampa Date: Thu Jul 27 07:21:14 2017 New Revision: 75416 URL: http://svn.reactos.org/svn/reactos?rev=75416&view=rev Log: [USBXHCI] -roothub get port status function update CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] Thu Jul 27 07:21:14 2017 @@ -199,30 +199,30 @@ typedef volatile union _XHCI_PORT_STATUS_CONTROL { struct { - ULONG CCS : 1; - ULONG PED : 1; - ULONG RsvdZ1 : 1; - ULONG OCA : 1; - ULONG PR : 1; - ULONG PLS : 4; - ULONG PP : 1; - ULONG PortSpeed : 4; - ULONG PIC : 2; - ULONG LWS : 1; - ULONG CSC : 1; - ULONG PEC : 1; - ULONG WRC : 1; - ULONG OCC : 1; - ULONG PRC : 1; - ULONG PLC : 1; - ULONG CEC : 1; - ULONG CAS : 1; - ULONG WCE : 1; - ULONG WDE : 1; - ULONG WOE : 1; - ULONG RsvdZ2 : 2; - ULONG DR : 1; - ULONG WPR : 1; + ULONG CurrentConnectStatus : 1; + ULONG PortEnableDisable : 1; + ULONG RsvdZ1 : 1; + ULONG OverCurrentActive : 1; + ULONG PortReset : 1; + ULONG PortLinkState : 4; + ULONG PortPower : 1; + ULONG PortSpeed : 4; + ULONG PortIndicatorControl : 2; + ULONG LinkWriteStrobe : 1; + ULONG ConnectStatusChange : 1; + ULONG PortEnableDisableChange : 1; + ULONG WarmResetChange : 1; + ULONG OverCurrentChange : 1; + ULONG PortResetChange : 1; + ULONG PortLinkStateChange : 1; + ULONG ConfigErrorChange : 1; + ULONG ColdAttachStatus : 1; + ULONG WakeONConnectEnable : 1; + ULONG WakeONDisconnectEnable : 1; + ULONG WakeONOverCurrentEnable : 1; + ULONG RsvdZ2 : 2; + ULONG DeviceRemovable : 1; + ULONG WarmPortReset : 1; }; ULONG AsULONG; } XHCI_PORT_STATUS_CONTROL; Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Thu Jul 27 07:21:14 2017 @@ -54,14 +54,92 @@ { DPRINT1("XHCI_RH_GetPortStatus: function initiated\n"); PXHCI_EXTENSION XhciExtension; - PULONG PortStatusReg; + PULONG PortStatusRegPointer; XHCI_PORT_STATUS_CONTROL PortStatusRegister; - //USB_30_PORT_STATUS x; + USBHUB_PORT_STATUS portstatus; + XhciExtension = (PXHCI_EXTENSION)xhciExtension; - PortStatusReg = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); - PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusReg) ; - PortStatusRegister.AsULONG = 0; - *PortStatus = PortStatusRegister.AsULONG; + PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + /* + ULONG ConnectStatus : 1; // Current Connect Status + ULONG EnableStatus : 1; // Port Enabled/Disabled + ULONG SuspendStatus : 1; + ULONG OverCurrent : 1; + ULONG ResetStatus : 1; + ULONG Reserved1 : 3; + ULONG PowerStatus : 1; + ULONG LsDeviceAttached : 1; // Low-Speed Device Attached + ULONG HsDeviceAttached : 1; // High-speed Device Attached + ULONG TestMode : 1; // Port Test Mode + ULONG IndicatorControl : 1; // Port Indicator Control + ULONG Reserved2 : 3; + ULONG ConnectStatusChange : 1; + ULONG EnableStatusChange : 1; + ULONG SuspendStatusChange : 1; + ULONG OverCurrentChange : 1; + ULONG ResetStatusChange : 1; + ULONG Reserved3 : 3; + ULONG PowerStatusChange : 1; + ULONG LsDeviceAttachedChange : 1; + ULONG HsDeviceAttachedChange : 1; + ULONG TestModeChange : 1; + ULONG IndicatorControlChange : 1; + ULONG Reserved4 : 3; + */ + /* + ULONG CurrentConnectStatus : 1; + ULONG PortEnableDisable : 1; + ULONG RsvdZ1 : 1; + ULONG OverCurrentActive : 1; + ULONG PortReset : 1; + ULONG PortLinkState : 4; + ULONG PortPower : 1; + ULONG PortSpeed : 4; + ULONG PortIndicatorControl : 2; + ULONG LinkWriteStrobe : 1; + ULONG ConnectStatusChange : 1; + ULONG PortEnableDisableChange : 1; + ULONG WarmResetChange : 1; + ULONG OverCurrentChange : 1; + ULONG PortResetChange : 1; + ULONG PortLinkStateChange : 1; + ULONG ConfigErrorChange : 1; + ULONG ColdAttachStatus : 1; + ULONG WakeONConnectEnable : 1; + ULONG WakeONDisconnectEnable : 1; + ULONG WakeONOverCurrentEnable : 1; + ULONG RsvdZ2 : 2; + ULONG DeviceRemovable : 1; + ULONG WarmPortReset : 1; + */ + portstatus.AsULONG = 0; + portstatus.UsbPortStatus.ConnectStatus = PortStatusRegister.CurrentConnectStatus; + portstatus.UsbPortStatus.EnableStatus = PortStatusRegister.PortEnableDisable; + portstatus.UsbPortStatus.SuspendStatus = 0;//PortStatusRegister.PortEnableDisable; + portstatus.UsbPortStatus.OverCurrent = PortStatusRegister.OverCurrentActive; + portstatus.UsbPortStatus.ResetStatus = PortStatusRegister.PortReset; + portstatus.UsbPortStatus.PowerStatus = PortStatusRegister.PortPower; + portstatus.UsbPortStatus.LsDeviceAttached = 0;//PortStatusRegister.PortEnableDisable; + // if (PortStatusRegister.PortSpeed) { + portstatus.UsbPortStatus.HsDeviceAttached = PortStatusRegister.CurrentConnectStatus; + // } + portstatus.UsbPortStatus.TestMode = 0;//PortStatusRegister.PortPower; + portstatus.UsbPortStatus.IndicatorControl = 0;//PortStatusRegister.PortIndicatorControl; + + portstatus.UsbPortStatusChange.ConnectStatusChange = PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.EnableStatusChange = PortStatusRegister.PortEnableDisableChange; + portstatus.UsbPortStatusChange.SuspendStatusChange = 0;//PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.OverCurrentChange = PortStatusRegister.OverCurrentChange; + portstatus.UsbPortStatusChange.ResetStatusChange = PortStatusRegister.PortResetChange; + portstatus.UsbPortStatusChange.PowerStatusChange = 0;//PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.LsDeviceAttachedChange = 0;//PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.HsDeviceAttachedChange = PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.TestModeChange = 0;//PortStatusRegister.ConnectStatusChange; + portstatus.UsbPortStatusChange.IndicatorControlChange =0;// PortStatusRegister.ConnectStatusChange; + + *PortStatus = portstatus.AsULONG; return MP_STATUS_SUCCESS; } @@ -225,7 +303,7 @@ usbCommand.InterrupterEnable = 0; WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); - DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n"); + //DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n"); } VOID @@ -244,6 +322,6 @@ usbCommand.InterrupterEnable = 1; WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); - DPRINT1("XHCI_RH_EnableIrq: Enable Interupts\n"); - -} + //DPRINT1("XHCI_RH_EnableIrq: Enable Interupts\n"); + +} Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Thu Jul 27 07:21:14 2017 @@ -148,7 +148,7 @@ DPRINT("XHCI_ControllerWorkTest: pointer erstba - %p %p\n", XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA+1 , XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA); - DbgBreakPoint(); + //DbgBreakPoint(); return MP_STATUS_SUCCESS; } MPSTATUS

7 years, 5 months

[pschweitzer] 75415: [NFS] Huge "hack" for ReactOS. In case we're asked to unmount a NFS share, and there are still active FCBs, browse the prefix table for active NET_ROOT, and then, dump their as...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jul 26 20:00:30 2017 New Revision: 75415 URL: http://svn.reactos.org/svn/reactos?rev=75415&view=rev Log: [NFS] Huge "hack" for ReactOS. In case we're asked to unmount a NFS share, and there are still active FCBs, browse the prefix table for active NET_ROOT, and then, dump their associated FCBs (prefix + refcount). It seems we only leak the root FCB. CORE-8204 CORE-11327 CORE-13581 Modified: trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c Modified: trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf… ============================================================================== --- trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c [iso-8859-1] Wed Jul 26 20:00:30 2017 @@ -2375,6 +2375,92 @@ if (RxContext->RxDeviceObject->NumberOfActiveFcbs > 0) { DbgP("device has open handles %d\n", RxContext->RxDeviceObject->NumberOfActiveFcbs); +#ifdef __REACTOS__ + if (RxContext->RxDeviceObject->pRxNetNameTable != NULL) + { +#define DUMP_FCB_TABLE_FROM_NETROOT(N) \ +{ \ + USHORT Bucket2; \ + BOOLEAN Release2 = FALSE; \ + if (!RxIsFcbTableLockAcquired(&(N)->FcbTable)) \ + { \ + RxAcquireFcbTableLockExclusive(&(N)->FcbTable, TRUE); \ + Release2 = TRUE; \ + } \ + for (Bucket2 = 0; Bucket2 < (N)->FcbTable.NumberOfBuckets; ++Bucket2) \ + { \ + PLIST_ENTRY Entry2; \ + for (Entry2 = (N)->FcbTable.HashBuckets[Bucket2].Flink; \ + Entry2 != &(N)->FcbTable.HashBuckets[Bucket2]; \ + Entry2 = Entry2->Flink) \ + { \ + PFCB Fcb; \ + Fcb = CONTAINING_RECORD(Entry2, FCB, FcbTableEntry.HashLinks); \ + DbgP("Fcb: %p still has %d references\n", Fcb, Fcb->NodeReferenceCount); \ + DbgP("It is for: %wZ\n", &Fcb->FcbTableEntry.Path); \ + } \ + } \ + if (Release2) \ + { \ + RxReleaseFcbTableLock(&(N)->FcbTable); \ + } \ +} + USHORT Bucket; + BOOLEAN Release = FALSE; + + if (!RxIsPrefixTableLockAcquired(RxContext->RxDeviceObject->pRxNetNameTable)) + { + RxAcquirePrefixTableLockExclusive(RxContext->RxDeviceObject->pRxNetNameTable, TRUE); + Release = TRUE; + } + + for (Bucket = 0; Bucket < RxContext->RxDeviceObject->pRxNetNameTable->TableSize; ++Bucket) + { + PLIST_ENTRY Entry; + + for (Entry = RxContext->RxDeviceObject->pRxNetNameTable->HashBuckets[Bucket].Flink; + Entry != &RxContext->RxDeviceObject->pRxNetNameTable->HashBuckets[Bucket]; + Entry = Entry->Flink) + { + PVOID Container; + + Container = CONTAINING_RECORD(Entry, RX_PREFIX_ENTRY, HashLinks)->ContainingRecord; + switch (NodeType(Container) & ~RX_SCAVENGER_MASK) + { + case RDBSS_NTC_NETROOT: + { + PNET_ROOT NetRoot; + + NetRoot = Container; + DUMP_FCB_TABLE_FROM_NETROOT(NetRoot); + break; + } + + case RDBSS_NTC_V_NETROOT: + { + PV_NET_ROOT VNetRoot; + + VNetRoot = Container; + if (VNetRoot->NetRoot != NULL) + { + PNET_ROOT NetRoot; + + NetRoot = VNetRoot->NetRoot; + DUMP_FCB_TABLE_FROM_NETROOT(NetRoot); + } + break; + } + } + } + } + + if (Release) + { + RxReleasePrefixTableLock(RxContext->RxDeviceObject->pRxNetNameTable); + } +#undef DUMP_FCB_TABLE_FROM_NETROOT + } +#endif status = STATUS_REDIRECTOR_HAS_OPEN_HANDLES; break; }

7 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2017