Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/04: [BTRFS] Upgrade to BtrFS 1.0.1 CID 1419459, 1419378
by Pierre Schweitzer 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4672b2ba5e111fe9730cd… commit 4672b2ba5e111fe9730cdbf4e51fb28c1ce7d473 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 16 20:05:33 2017 +0200 [BTRFS] Upgrade to BtrFS 1.0.1 CID 1419459, 1419378 CORE-13896 --- drivers/filesystems/btrfs/balance.c | 4 +- drivers/filesystems/btrfs/btrfs.c | 66 +++++++--- drivers/filesystems/btrfs/btrfs.rc | 8 +- drivers/filesystems/btrfs/btrfs_drv.h | 54 ++++++++- drivers/filesystems/btrfs/create.c | 208 ++++++++++++++++++++++---------- drivers/filesystems/btrfs/dirctrl.c | 11 +- drivers/filesystems/btrfs/fileinfo.c | 22 ++-- drivers/filesystems/btrfs/flushthread.c | 9 +- drivers/filesystems/btrfs/fsctl.c | 37 +++--- drivers/filesystems/btrfs/pnp.c | 8 +- drivers/filesystems/btrfs/read.c | 21 ++-- drivers/filesystems/btrfs/reparse.c | 16 ++- drivers/filesystems/btrfs/search.c | 3 +- drivers/filesystems/btrfs/volume.c | 2 +- drivers/filesystems/btrfs/write.c | 12 +- 15 files changed, 329 insertions(+), 152 deletions(-) diff --git a/drivers/filesystems/btrfs/balance.c b/drivers/filesystems/btrfs/balance.c index cf9717480d..980089618a 100644 --- a/drivers/filesystems/btrfs/balance.c +++ b/drivers/filesystems/btrfs/balance.c @@ -2112,7 +2112,7 @@ end: // update open FCBs // FIXME - speed this up(?) - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); le = Vcb->all_fcbs.Flink; while (le != &Vcb->all_fcbs) { @@ -2153,7 +2153,7 @@ end: le = le->Flink; } - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } else do_rollback(Vcb, &rollback); diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 0e3e917531..236184eafa 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -1352,7 +1352,7 @@ void send_notification_fcb(_In_ file_ref* fileref, _In_ ULONG filter_match, _In_ return; } - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); le = fcb->hardlinks.Flink; while (le != &fcb->hardlinks) { @@ -1419,7 +1419,7 @@ void send_notification_fcb(_In_ file_ref* fileref, _In_ ULONG filter_match, _In_ le = le->Flink; } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); } void mark_fcb_dirty(_In_ fcb* fcb) { @@ -1698,14 +1698,14 @@ static NTSTATUS close_file(_In_ PFILE_OBJECT FileObject, _In_ PIRP Irp) { Vcb = fcb->Vcb; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (fileref) free_fileref(fcb->Vcb, fileref); else free_fcb(Vcb, fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); return STATUS_SUCCESS; } @@ -1804,10 +1804,10 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { KeSetTimer(&Vcb->flush_thread_timer, time, NULL); // trigger the timer early KeWaitForSingleObject(&Vcb->flush_thread_finished, Executive, KernelMode, FALSE, NULL); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, Vcb->volume_fcb); free_fcb(Vcb, Vcb->dummy_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (Vcb->root_file) ObDereferenceObject(Vcb->root_file); @@ -1817,9 +1817,9 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { chunk* c = CONTAINING_RECORD(le, chunk, list_entry); if (c->cache) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, c->cache); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); c->cache = NULL; } @@ -1855,9 +1855,9 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { ExFreePool(c->devices); if (c->cache) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, c->cache); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } ExDeleteResourceLite(&c->range_locks_lock); @@ -1915,7 +1915,7 @@ void uninit(_In_ device_extension* Vcb, _In_ BOOL flush) { ZwClose(Vcb->flush_thread_handle); } -NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback) { +NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_opt_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback) { LARGE_INTEGER newlength, time; BTRFS_TIME now; NTSTATUS Status; @@ -1995,6 +1995,18 @@ NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _I } fileref->fcb->deleted = TRUE; + + le = fileref->children.Flink; + while (le != &fileref->children) { + file_ref* fr2 = CONTAINING_RECORD(le, file_ref, list_entry); + + if (fr2->fcb->ads) { + fr2->fcb->deleted = TRUE; + mark_fcb_dirty(fr2->fcb); + } + + le = le->Flink; + } } if (fileref->dc) { @@ -2024,11 +2036,25 @@ NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _I mark_fcb_dirty(fileref->fcb); // so ROOT_ITEM gets updated } else { + LIST_ENTRY* le; + // FIXME - we need a lock here RemoveEntryList(&fileref->fcb->subvol->list_entry); InsertTailList(&fileref->fcb->Vcb->drop_roots, &fileref->fcb->subvol->list_entry); + + le = fileref->children.Flink; + while (le != &fileref->children) { + file_ref* fr2 = CONTAINING_RECORD(le, file_ref, list_entry); + + if (fr2->fcb->ads) { + fr2->fcb->deleted = TRUE; + mark_fcb_dirty(fr2->fcb); + } + + le = le->Flink; + } } } } else { @@ -2209,18 +2235,18 @@ static NTSTATUS drv_cleanup(_In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { locked = FALSE; // fcb_lock needs to be acquired before fcb->Header.Resource - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); Status = delete_fileref(fileref, FileObject, Irp, &rollback); if (!NT_SUCCESS(Status)) { ERR("delete_fileref returned %08x\n", Status); do_rollback(fcb->Vcb, &rollback); - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); ExReleaseResourceLite(&fcb->Vcb->tree_lock); goto exit; } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); locked = FALSE; @@ -4522,19 +4548,19 @@ exit2: if (Vcb->root_file) ObDereferenceObject(Vcb->root_file); else if (Vcb->root_fileref) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, Vcb->root_fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } else if (root_fcb) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, root_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } if (Vcb->volume_fcb) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, Vcb->volume_fcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } ExDeleteResourceLite(&Vcb->tree_lock); diff --git a/drivers/filesystems/btrfs/btrfs.rc b/drivers/filesystems/btrfs/btrfs.rc index f18e6ef56a..d79da1aa15 100644 --- a/drivers/filesystems/btrfs/btrfs.rc +++ b/drivers/filesystems/btrfs/btrfs.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "FileDescription", "WinBtrfs" - VALUE "FileVersion", "1.0" + VALUE "FileVersion", "1.0.1" VALUE "InternalName", "btrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-17" VALUE "OriginalFilename", "btrfs.sys" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0" + VALUE "ProductVersion", "1.0.1" END END BLOCK "VarFileInfo" diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index b658726f9a..1cb50cbfa4 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -170,6 +170,9 @@ typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER { #define _Create_lock_level_(a) #define _Lock_level_order_(a,b) #define _Has_lock_level_(a) +#define _Requires_lock_not_held_(a) +#define _Acquires_exclusive_lock_(a) +#define _Acquires_shared_lock_(a) #endif #endif @@ -634,6 +637,9 @@ typedef struct { UINT64 create_total_time; UINT64 open_fcb_calls; UINT64 open_fcb_time; + UINT64 open_fileref_child_calls; + UINT64 open_fileref_child_time; + UINT64 fcb_lock_time; } debug_stats; #endif @@ -890,6 +896,52 @@ typedef struct { LIST_ENTRY list_entry; } name_bit; +_Requires_lock_not_held_(Vcb->fcb_lock) +_Acquires_shared_lock_(Vcb->fcb_lock) +static __inline void acquire_fcb_lock_shared(device_extension* Vcb) { +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; + + if (ExAcquireResourceSharedLite(&Vcb->fcb_lock, FALSE)) + return; + + time1 = KeQueryPerformanceCounter(NULL); +#endif + + ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.fcb_lock_time += time2.QuadPart - time1.QuadPart; +#endif +} + +_Requires_lock_not_held_(Vcb->fcb_lock) +_Acquires_exclusive_lock_(Vcb->fcb_lock) +static __inline void acquire_fcb_lock_exclusive(device_extension* Vcb) { +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; + + if (ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, FALSE)) + return; + + time1 = KeQueryPerformanceCounter(NULL); +#endif + + ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.fcb_lock_time += time2.QuadPart - time1.QuadPart; +#endif +} + +_Requires_lock_held_(Vcb->fcb_lock) +_Releases_lock_(Vcb->fcb_lock) +static __inline void release_fcb_lock(device_extension* Vcb) { + ExReleaseResourceLite(&Vcb->fcb_lock); +} + static __inline void* map_user_buffer(PIRP Irp, ULONG priority) { if (!Irp->MdlAddress) { return Irp->UserBuffer; @@ -1043,7 +1095,7 @@ WCHAR* file_desc(_In_ PFILE_OBJECT FileObject); WCHAR* file_desc_fileref(_In_ file_ref* fileref); void mark_fcb_dirty(_In_ fcb* fcb); void mark_fileref_dirty(_In_ file_ref* fileref); -NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback); +NTSTATUS delete_fileref(_In_ file_ref* fileref, _In_opt_ PFILE_OBJECT FileObject, _In_opt_ PIRP Irp, _In_ LIST_ENTRY* rollback); void chunk_lock_range(_In_ device_extension* Vcb, _In_ chunk* c, _In_ UINT64 start, _In_ UINT64 length); void chunk_unlock_range(_In_ device_extension* Vcb, _In_ chunk* c, _In_ UINT64 start, _In_ UINT64 length); void init_device(_In_ device_extension* Vcb, _Inout_ device* dev, _In_ BOOL get_nums); diff --git a/drivers/filesystems/btrfs/create.c b/drivers/filesystems/btrfs/create.c index 0ea66bb8db..15728de757 100644 --- a/drivers/filesystems/btrfs/create.c +++ b/drivers/filesystems/btrfs/create.c @@ -1418,6 +1418,13 @@ NTSTATUS open_fileref(_Requires_lock_held_(_Curr_->tree_lock) _Requires_exclusiv return STATUS_OBJECT_PATH_NOT_FOUND; } + // if path starts with two backslashes, ignore one of them + if (fnus2.Length >= 2 * sizeof(WCHAR) && fnus2.Buffer[1] == '\\') { + fnus2.Buffer++; + fnus2.Length -= sizeof(WCHAR); + fnus2.MaximumLength -= sizeof(WCHAR); + } + if (fnus2.Length == sizeof(WCHAR)) { if (Vcb->root_fileref->open_count == 0 && !(Vcb->Vpb->Flags & VPB_MOUNTED)) // don't allow root to be opened on unmounted FS return STATUS_DEVICE_NOT_READY; @@ -1487,8 +1494,19 @@ NTSTATUS open_fileref(_Requires_lock_held_(_Curr_->tree_lock) _Requires_exclusiv name_bit* nb = CONTAINING_RECORD(le, name_bit, list_entry); BOOL lastpart = le->Flink == &parts || (has_stream && le->Flink->Flink == &parts); BOOL streampart = has_stream && le->Flink == &parts; +#ifdef DEBUG_STATS + LARGE_INTEGER time1, time2; +#endif +#ifdef DEBUG_STATS + time1 = KeQueryPerformanceCounter(NULL); +#endif Status = open_fileref_child(Vcb, sf, &nb->us, case_sensitive, lastpart, streampart, pooltype, &sf2, Irp); +#ifdef DEBUG_STATS + time2 = KeQueryPerformanceCounter(NULL); + Vcb->stats.open_fileref_child_calls++; + Vcb->stats.open_fileref_child_time += time2.QuadPart - time1.QuadPart; +#endif if (!NT_SUCCESS(Status)) { if (Status == STATUS_OBJECT_PATH_NOT_FOUND || Status == STATUS_OBJECT_NAME_NOT_FOUND) TRACE("open_fileref_child returned %08x\n", Status); @@ -1655,6 +1673,9 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr if (parfileref->fcb == Vcb->dummy_fcb) return STATUS_ACCESS_DENIED; + if (options & FILE_DIRECTORY_FILE && IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_TEMPORARY) + return STATUS_INVALID_PARAMETER; + Status = RtlUnicodeToUTF8N(NULL, 0, &utf8len, fpus->Buffer, fpus->Length); if (!NT_SUCCESS(Status)) { ERR("RtlUnicodeToUTF8N returned %08x\n", Status); @@ -1701,9 +1722,7 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr TRACE("requested attributes = %x\n", IrpSp->Parameters.Create.FileAttributes); - IrpSp->Parameters.Create.FileAttributes |= FILE_ATTRIBUTE_ARCHIVE; - - defda = FILE_ATTRIBUTE_ARCHIVE; + defda = 0; if (utf8[0] == '.') defda |= FILE_ATTRIBUTE_HIDDEN; @@ -1714,6 +1733,11 @@ static NTSTATUS file_create2(_In_ PIRP Irp, _Requires_exclusive_lock_held_(_Curr } else IrpSp->Parameters.Create.FileAttributes &= ~FILE_ATTRIBUTE_DIRECTORY; + if (!(IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + IrpSp->Parameters.Create.FileAttributes |= FILE_ATTRIBUTE_ARCHIVE; + defda |= FILE_ATTRIBUTE_ARCHIVE; + } + TRACE("defda = %x\n", defda); if (IrpSp->Parameters.Create.FileAttributes == FILE_ATTRIBUTE_NORMAL) @@ -2235,7 +2259,7 @@ static NTSTATUS create_stream(_Requires_lock_held_(_Curr_->tree_lock) _Requires_ *pfileref = fileref; - send_notification_fileref(parfileref, options & FILE_DIRECTORY_FILE ? FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME, FILE_ACTION_ADDED, &fileref->dc->name); + send_notification_fileref(parfileref, FILE_NOTIFY_CHANGE_STREAM_NAME, FILE_ACTION_ADDED_STREAM, &fileref->dc->name); return STATUS_SUCCESS; } @@ -2279,6 +2303,9 @@ static NTSTATUS file_create(PIRP Irp, _Requires_lock_held_(_Curr_->tree_lock) _R if (Vcb->readonly) return STATUS_MEDIA_WRITE_PROTECTED; + if (options & FILE_DELETE_ON_CLOSE && IrpSp->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) + return STATUS_CANNOT_DELETE; + dsus.Buffer = datasuf; dsus.Length = dsus.MaximumLength = (USHORT)wcslen(datasuf) * sizeof(WCHAR); fpus.Buffer = NULL; @@ -2836,7 +2863,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur goto exit; } - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (options & FILE_OPEN_BY_FILE_ID) { if (fn.Length == sizeof(UINT64) && related && RequestedDisposition == FILE_OPEN) { @@ -2857,13 +2884,13 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur } else { WARN("FILE_OPEN_BY_FILE_ID only supported for inodes\n"); Status = STATUS_NOT_IMPLEMENTED; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else { if (related && fn.Length != 0 && fn.Buffer[0] == '\\') { - Status = STATUS_OBJECT_NAME_INVALID; - ExReleaseResourceLite(&Vcb->fcb_lock); + Status = STATUS_INVALID_PARAMETER; + release_fcb_lock(Vcb); goto exit; } @@ -2922,7 +2949,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Irp->Tail.Overlay.AuxiliaryBuffer = (void*)data; free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2937,23 +2964,23 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Status = STATUS_OBJECT_NAME_COLLISION; free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { if (RequestedDisposition == FILE_OPEN || RequestedDisposition == FILE_OVERWRITE) { TRACE("file doesn't exist, returning STATUS_OBJECT_NAME_NOT_FOUND\n"); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } else if (Status == STATUS_OBJECT_PATH_NOT_FOUND) { TRACE("open_fileref returned %08x\n", Status); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } else { ERR("open_fileref returned %08x\n", Status); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2961,7 +2988,7 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur file_ref* sf; BOOL readonly; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (RequestedDisposition == FILE_SUPERSEDE || RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF) { LARGE_INTEGER zero; @@ -2972,9 +2999,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (fileref->fcb->type == BTRFS_TYPE_DIRECTORY || is_subvol_readonly(fileref->fcb->subvol, Irp)) { Status = STATUS_ACCESS_DENIED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2982,9 +3009,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (Vcb->readonly) { Status = STATUS_MEDIA_WRITE_PROTECTED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -2993,9 +3020,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (!MmCanFileBeTruncated(&fileref->fcb->nonpaged->segment_object, &zero)) { Status = STATUS_USER_MAPPED_FILE; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3012,9 +3039,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur SeUnlockSubjectContext(&IrpSp->Parameters.Create.SecurityContext->AccessState->SubjectSecurityContext); TRACE("SeAccessCheck failed, returning %08x\n", Status); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3031,9 +3058,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur TRACE("could not open as deletion pending\n"); Status = STATUS_DELETE_PENDING; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3043,6 +3070,16 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur readonly = (!fileref->fcb->ads && fileref->fcb->atts & FILE_ATTRIBUTE_READONLY) || (fileref->fcb->ads && fileref->parent->fcb->atts & FILE_ATTRIBUTE_READONLY) || is_subvol_readonly(fileref->fcb->subvol, Irp) || fileref->fcb == Vcb->dummy_fcb || Vcb->readonly; + if (options & FILE_DELETE_ON_CLOSE && (fileref == Vcb->root_fileref || readonly)) { + Status = STATUS_CANNOT_DELETE; + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + goto exit; + } + if (readonly) { ACCESS_MASK allowed; @@ -3070,25 +3107,14 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur } else if (granted_access & ~allowed) { Status = Vcb->readonly ? STATUS_MEDIA_WRITE_PROTECTED : STATUS_ACCESS_DENIED; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } - if (options & FILE_DELETE_ON_CLOSE && (fileref == Vcb->root_fileref || Vcb->readonly || - is_subvol_readonly(fileref->fcb->subvol, Irp) || readonly)) { - Status = STATUS_CANNOT_DELETE; - - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); - free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); - - goto exit; - } - if ((fileref->fcb->type == BTRFS_TYPE_SYMLINK || fileref->fcb->atts & FILE_ATTRIBUTE_REPARSE_POINT) && !(options & FILE_OPEN_REPARSE_POINT)) { REPARSE_DATA_BUFFER* data; @@ -3112,9 +3138,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur Irp->Tail.Overlay.AuxiliaryBuffer = (void*)data; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3124,9 +3150,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur if (options & FILE_NON_DIRECTORY_FILE && !(fileref->fcb->atts & FILE_ATTRIBUTE_REPARSE_POINT)) { Status = STATUS_FILE_IS_A_DIRECTORY; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3134,9 +3160,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur TRACE("returning STATUS_NOT_A_DIRECTORY (type = %u, %S)\n", fileref->fcb->type, file_desc_fileref(fileref)); Status = STATUS_NOT_A_DIRECTORY; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3150,9 +3176,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur else WARN("IoCheckShareAccess failed, returning %08x\n", Status); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3167,9 +3193,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3186,13 +3212,24 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } + if (!fileref->fcb->ads && (IrpSp->Parameters.Create.FileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != ((fileref->fcb->atts & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)))) { + IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + Status = STATUS_ACCESS_DENIED; + goto exit; + } + if (fileref->fcb->ads) { Status = stream_set_end_of_file_information(Vcb, 0, fileref->fcb, fileref, FALSE); if (!NT_SUCCESS(Status)) { @@ -3200,9 +3237,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3213,9 +3250,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3229,15 +3266,17 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } } if (!fileref->fcb->ads) { + LIST_ENTRY* le; + if (Irp->AssociatedIrp.SystemBuffer && IrpSp->Parameters.Create.EaLength > 0) { ULONG offset; FILE_FULL_EA_INFORMATION* eainfo; @@ -3248,9 +3287,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3285,9 +3324,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3304,6 +3343,41 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur fileref->fcb->ealen = 0; } } + + // remove streams and send notifications + le = fileref->fcb->dir_children_index.Flink; + while (le != &fileref->fcb->dir_children_index) { + dir_child* dc = CONTAINING_RECORD(le, dir_child, list_entry_index); + LIST_ENTRY* le2 = le->Flink; + + if (dc->index == 0) { + if (!dc->fileref) { + file_ref* fr2; + + Status = open_fileref_child(Vcb, fileref, &dc->name, TRUE, TRUE, TRUE, PagedPool, &fr2, NULL); + if (!NT_SUCCESS(Status)) + WARN("open_fileref_child returned %08x\n", Status); + } + + if (dc->fileref) { + send_notification_fcb(fileref, FILE_NOTIFY_CHANGE_STREAM_NAME, FILE_ACTION_REMOVED_STREAM, &dc->name); + + Status = delete_fileref(dc->fileref, NULL, NULL, rollback); + if (!NT_SUCCESS(Status)) { + ERR("delete_fileref returned %08x\n", Status); + + acquire_fcb_lock_exclusive(Vcb); + free_fileref(Vcb, fileref); + release_fcb_lock(Vcb); + + goto exit; + } + } + } else + break; + + le = le2; + } } KeQuerySystemTime(&time); @@ -3355,9 +3429,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3379,9 +3453,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur IoRemoveShareAccess(FileObject, &fileref->fcb->share_access); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fileref); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto exit; } @@ -3467,8 +3541,8 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur #ifdef DEBUG_STATS open_type = 2; #endif - Status = file_create(Irp, DeviceObject->DeviceExtension, FileObject, related, loaded_related, &fn, RequestedDisposition, options, rollback); - ExReleaseResourceLite(&Vcb->fcb_lock); + Status = file_create(Irp, Vcb, FileObject, related, loaded_related, &fn, RequestedDisposition, options, rollback); + release_fcb_lock(Vcb); Irp->IoStatus.Information = NT_SUCCESS(Status) ? FILE_CREATED : 0; } @@ -3478,9 +3552,9 @@ static NTSTATUS open_file(PDEVICE_OBJECT DeviceObject, _Requires_lock_held_(_Cur exit: if (loaded_related) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, related); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } if (Status == STATUS_SUCCESS) { diff --git a/drivers/filesystems/btrfs/dirctrl.c b/drivers/filesystems/btrfs/dirctrl.c index 5c78146153..0ae95d636c 100644 --- a/drivers/filesystems/btrfs/dirctrl.c +++ b/drivers/filesystems/btrfs/dirctrl.c @@ -628,7 +628,7 @@ static NTSTATUS query_directory(PIRP Irp) { return STATUS_NO_MORE_FILES; ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); TRACE("%S\n", file_desc(IrpSp->FileObject)); @@ -658,8 +658,6 @@ static NTSTATUS query_directory(PIRP Irp) { TRACE(" unknown flags: %u\n", flags); } - initial = !ccb->query_string.Buffer; - if (IrpSp->Flags & SL_RESTART_SCAN) { ccb->query_dir_offset = 0; @@ -667,8 +665,13 @@ static NTSTATUS query_directory(PIRP Irp) { RtlFreeUnicodeString(&ccb->query_string); ccb->query_string.Buffer = NULL; } + + ccb->has_wildcard = FALSE; + ccb->specific_file = FALSE; } + initial = !ccb->query_string.Buffer; + if (IrpSp->Parameters.QueryDirectory.FileName && IrpSp->Parameters.QueryDirectory.FileName->Length > 1) { TRACE("QD filename: %.*S\n", IrpSp->Parameters.QueryDirectory.FileName->Length / sizeof(WCHAR), IrpSp->Parameters.QueryDirectory.FileName->Buffer); @@ -906,7 +909,7 @@ end: ExReleaseResourceLite(&fileref->fcb->nonpaged->dir_children_lock); end2: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); TRACE("returning %08x\n", Status); diff --git a/drivers/filesystems/btrfs/fileinfo.c b/drivers/filesystems/btrfs/fileinfo.c index e79f453511..9f736671da 100644 --- a/drivers/filesystems/btrfs/fileinfo.c +++ b/drivers/filesystems/btrfs/fileinfo.c @@ -188,7 +188,7 @@ static NTSTATUS set_disposition_information(device_extension* Vcb, PIRP Irp, PFI if (!fileref) return STATUS_INVALID_PARAMETER; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); @@ -235,7 +235,7 @@ static NTSTATUS set_disposition_information(device_extension* Vcb, PIRP Irp, PFI end: ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); // send notification that directory is about to be deleted if (NT_SUCCESS(Status) && fdi->DeleteFile && fcb->type == BTRFS_TYPE_DIRECTORY) { @@ -1348,7 +1348,7 @@ static NTSTATUS set_rename_information(device_extension* Vcb, PIRP Irp, PFILE_OB } ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); if (fcb->ads) { @@ -1885,7 +1885,7 @@ end: do_rollback(Vcb, &rollback); ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return Status; @@ -1913,7 +1913,7 @@ NTSTATUS stream_set_end_of_file_information(device_extension* Vcb, UINT16 end, f TRACE("extending stream to %llx bytes\n", end); if (end > fcb->adsmaxlen) { - ERR("error - xattr too long (%llu > %u)\n", end, fcb->adsmaxlen); + ERR("error - xattr too long (%u > %u)\n", end, fcb->adsmaxlen); return STATUS_DISK_FULL; } @@ -2009,7 +2009,7 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI set_size = TRUE; } - filter = FILE_NOTIFY_CHANGE_SIZE; + filter = FILE_NOTIFY_CHANGE_STREAM_SIZE; if (!ccb->user_set_write_time) { KeQuerySystemTime(&time); @@ -2020,7 +2020,7 @@ static NTSTATUS set_end_of_file_information(device_extension* Vcb, PIRP Irp, PFI mark_fcb_dirty(fileref->parent->fcb); } - send_notification_fcb(fileref->parent, filter, FILE_ACTION_MODIFIED, &fileref->dc->name); + send_notification_fcb(fileref->parent, filter, FILE_ACTION_MODIFIED_STREAM, &fileref->dc->name); goto end; } @@ -2182,7 +2182,7 @@ static NTSTATUS set_link_information(device_extension* Vcb, PIRP Irp, PFILE_OBJE } ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); ExAcquireResourceExclusiveLite(fcb->Header.Resource, TRUE); if (fcb->type == BTRFS_TYPE_DIRECTORY) { @@ -2451,7 +2451,7 @@ end: do_rollback(Vcb, &rollback); ExReleaseResourceLite(fcb->Header.Resource); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return Status; @@ -3472,7 +3472,7 @@ static NTSTATUS fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, file_ len = bytes_needed; } } else { - ExAcquireResourceExclusiveLite(&fcb->Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(fcb->Vcb); if (IsListEmpty(&fcb->hardlinks)) { bytes_needed += sizeof(FILE_LINK_ENTRY_INFORMATION) + fileref->dc->name.Length - sizeof(WCHAR); @@ -3565,7 +3565,7 @@ static NTSTATUS fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, file_ } } - ExReleaseResourceLite(&fcb->Vcb->fcb_lock); + release_fcb_lock(fcb->Vcb); } fli->BytesNeeded = bytes_needed; diff --git a/drivers/filesystems/btrfs/flushthread.c b/drivers/filesystems/btrfs/flushthread.c index aa3d9b6b0f..ceb37c5a2a 100644 --- a/drivers/filesystems/btrfs/flushthread.c +++ b/drivers/filesystems/btrfs/flushthread.c @@ -7289,6 +7289,8 @@ NTSTATUS do_write(device_extension* Vcb, PIRP Irp) { #ifdef DEBUG_STATS static void print_stats(device_extension* Vcb) { + LARGE_INTEGER freq; + ERR("READ STATS:\n"); ERR("number of reads: %llu\n", Vcb->stats.num_reads); ERR("data read: %llu bytes\n", Vcb->stats.data_read); @@ -7297,7 +7299,9 @@ static void print_stats(device_extension* Vcb) { ERR("disk time taken: %llu\n", Vcb->stats.read_disk_time); ERR("other time taken: %llu\n", Vcb->stats.read_total_time - Vcb->stats.read_csum_time - Vcb->stats.read_disk_time); - ERR("OPEN STATS:\n"); + KeQueryPerformanceCounter(&freq); + + ERR("OPEN STATS (freq = %llu):\n", freq.QuadPart); ERR("number of opens: %llu\n", Vcb->stats.num_opens); ERR("total time taken: %llu\n", Vcb->stats.open_total_time); ERR("number of overwrites: %llu\n", Vcb->stats.num_overwrites); @@ -7305,6 +7309,9 @@ static void print_stats(device_extension* Vcb) { ERR("number of creates: %llu\n", Vcb->stats.num_creates); ERR("calls to open_fcb: %llu\n", Vcb->stats.open_fcb_calls); ERR("time spent in open_fcb: %llu\n", Vcb->stats.open_fcb_time); + ERR("calls to open_fileref_child: %llu\n", Vcb->stats.open_fileref_child_calls); + ERR("time spent in open_fileref_child: %llu\n", Vcb->stats.open_fileref_child_time); + ERR("time spent waiting for fcb_lock: %llu\n", Vcb->stats.fcb_lock_time); ERR("total time taken: %llu\n", Vcb->stats.create_total_time); RtlZeroMemory(&Vcb->stats, sizeof(debug_stats)); diff --git a/drivers/filesystems/btrfs/fsctl.c b/drivers/filesystems/btrfs/fsctl.c index 8e0fb3437b..87556c47e1 100644 --- a/drivers/filesystems/btrfs/fsctl.c +++ b/drivers/filesystems/btrfs/fsctl.c @@ -1002,10 +1002,10 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo rootfcb->inode_item_changed = TRUE; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); InsertTailList(&r->fcbs, &rootfcb->list_entry); InsertTailList(&Vcb->all_fcbs, &rootfcb->list_entry_all); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); rootfcb->Header.IsFastIoPossible = fast_io_possible(rootfcb); rootfcb->Header.AllocationSize.QuadPart = 0; @@ -1049,9 +1049,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo if (!fr) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fcb(Vcb, rootfcb); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; @@ -1073,9 +1073,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo fr->fcb->hash_ptrs = ExAllocatePoolWithTag(PagedPool, sizeof(LIST_ENTRY*) * 256, ALLOC_TAG); if (!fr->fcb->hash_ptrs) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; } @@ -1085,9 +1085,9 @@ static NTSTATUS create_subvol(device_extension* Vcb, PFILE_OBJECT FileObject, vo fr->fcb->hash_ptrs_uc = ExAllocatePoolWithTag(PagedPool, sizeof(LIST_ENTRY*) * 256, ALLOC_TAG); if (!fr->fcb->hash_ptrs_uc) { ERR("out of memory\n"); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); Status = STATUS_INSUFFICIENT_RESOURCES; goto end; } @@ -1155,9 +1155,9 @@ end: end2: if (fr) { - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); } return Status; @@ -2194,15 +2194,15 @@ static NTSTATUS lock_volume(device_extension* Vcb, PIRP Irp) { if (Vcb->locked) return STATUS_SUCCESS; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); goto end; } - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); if (Vcb->balance.thread && KeReadStateEvent(&Vcb->balance.event)) { ExAcquireResourceExclusiveLite(&Vcb->tree_lock, TRUE); @@ -2377,6 +2377,7 @@ static NTSTATUS invalidate_volumes(PIRP Irp) { if (!NT_SUCCESS(Status)) { ERR("do_write returned %08x\n", Status); ExReleaseResourceLite(&Vcb->tree_lock); + ExFreePool(newvpb); goto end; } @@ -3742,7 +3743,7 @@ static NTSTATUS mknod(device_extension* Vcb, PFILE_OBJECT FileObject, void* data name.Length = name.MaximumLength = bmn->namelen; name.Buffer = bmn->name; - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); Status = find_file_in_dir(&name, parfcb, &subvol, &inode, &dc, TRUE); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) { @@ -3982,7 +3983,7 @@ static NTSTATUS mknod(device_extension* Vcb, PFILE_OBJECT FileObject, void* data Status = STATUS_SUCCESS; end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExFreePool(utf8.Buffer); @@ -4429,11 +4430,11 @@ static NTSTATUS get_subvol_path(device_extension* Vcb, UINT64 id, WCHAR* out, UL return STATUS_INTERNAL_ERROR; } - ExAcquireResourceSharedLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_shared(Vcb); Status = open_fileref_by_inode(Vcb, r, r->root_item.objid, &fr, Irp); if (!NT_SUCCESS(Status)) { - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ERR("open_fileref_by_inode returned %08x\n", Status); return Status; } @@ -4451,7 +4452,7 @@ static NTSTATUS get_subvol_path(device_extension* Vcb, UINT64 id, WCHAR* out, UL free_fileref(Vcb, fr); - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); return Status; } diff --git a/drivers/filesystems/btrfs/pnp.c b/drivers/filesystems/btrfs/pnp.c index aac3ea3a54..34997cfd59 100644 --- a/drivers/filesystems/btrfs/pnp.c +++ b/drivers/filesystems/btrfs/pnp.c @@ -161,7 +161,7 @@ static NTSTATUS pnp_cancel_remove_device(PDEVICE_OBJECT DeviceObject) { ExAcquireResourceSharedLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; @@ -175,7 +175,7 @@ static NTSTATUS pnp_cancel_remove_device(PDEVICE_OBJECT DeviceObject) { } end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); return STATUS_SUCCESS; @@ -187,7 +187,7 @@ NTSTATUS pnp_query_remove_device(PDEVICE_OBJECT DeviceObject, PIRP Irp) { ExAcquireResourceExclusiveLite(&Vcb->tree_lock, TRUE); - ExAcquireResourceExclusiveLite(&Vcb->fcb_lock, TRUE); + acquire_fcb_lock_exclusive(Vcb); if (Vcb->root_fileref && Vcb->root_fileref->fcb && (Vcb->root_fileref->open_count > 0 || has_open_children(Vcb->root_fileref))) { Status = STATUS_ACCESS_DENIED; @@ -216,7 +216,7 @@ NTSTATUS pnp_query_remove_device(PDEVICE_OBJECT DeviceObject, PIRP Irp) { Status = STATUS_SUCCESS; end: - ExReleaseResourceLite(&Vcb->fcb_lock); + release_fcb_lock(Vcb); ExReleaseResourceLite(&Vcb->tree_lock); diff --git a/drivers/filesystems/btrfs/read.c b/drivers/filesystems/btrfs/read.c index 4fda650402..ddeea66c7a 100644 --- a/drivers/filesystems/btrfs/read.c +++ b/drivers/filesystems/btrfs/read.c @@ -3209,17 +3209,6 @@ NTSTATUS do_read(PIRP Irp, BOOLEAN wait, ULONG* bytes_read) { return STATUS_PENDING; } - if (!(Irp->Flags & IRP_PAGING_IO) && FileObject->SectionObjectPointer->DataSectionObject) { - IO_STATUS_BLOCK iosb; - - CcFlushCache(FileObject->SectionObjectPointer, &IrpSp->Parameters.Read.ByteOffset, length, &iosb); - - if (!NT_SUCCESS(iosb.Status)) { - ERR("CcFlushCache returned %08x\n", iosb.Status); - return iosb.Status; - } - } - if (fcb->ads) Status = read_stream(fcb, data, start, length, bytes_read); else @@ -3325,6 +3314,16 @@ NTSTATUS drv_read(PDEVICE_OBJECT DeviceObject, PIRP Irp) { if (Irp->Flags & IRP_PAGING_IO) wait = TRUE; + if (!(Irp->Flags & IRP_PAGING_IO) && FileObject->SectionObjectPointer->DataSectionObject) { + IO_STATUS_BLOCK iosb; + + CcFlushCache(FileObject->SectionObjectPointer, &IrpSp->Parameters.Read.ByteOffset, IrpSp->Parameters.Read.Length, &iosb); + if (!NT_SUCCESS(iosb.Status)) { + ERR("CcFlushCache returned %08x\n", iosb.Status); + return iosb.Status; + } + } + if (!ExIsResourceAcquiredSharedLite(fcb->Header.Resource)) { if (!ExAcquireResourceSharedLite(fcb->Header.Resource, wait)) { Status = STATUS_PENDING; diff --git a/drivers/filesystems/btrfs/reparse.c b/drivers/filesystems/btrfs/reparse.c index 440894323c..8e8d319b58 100644 --- a/drivers/filesystems/btrfs/reparse.c +++ b/drivers/filesystems/btrfs/reparse.c @@ -289,6 +289,10 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_INVALID_PARAMETER; } + // IFSTest insists on this, for some reason... + if (Irp->UserBuffer) + return STATUS_INVALID_PARAMETER; + fcb = FileObject->FsContext; ccb = FileObject->FsContext2; @@ -297,9 +301,7 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { return STATUS_INVALID_PARAMETER; } - // It isn't documented what permissions FSCTL_SET_REPARSE_POINT needs, but CreateSymbolicLinkW - // creates a file with FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE. - if (Irp->RequestorMode == UserMode && !(ccb->access & FILE_WRITE_ATTRIBUTES)) { + if (Irp->RequestorMode == UserMode && !(ccb->access & (FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA))) { WARN("insufficient privileges\n"); return STATUS_ACCESS_DENIED; } @@ -333,7 +335,13 @@ NTSTATUS set_reparse_point(PDEVICE_OBJECT DeviceObject, PIRP Irp) { if (buflen < sizeof(ULONG)) { WARN("buffer was not long enough to hold tag\n"); - Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_BUFFER_SIZE; + goto end; + } + + Status = FsRtlValidateReparsePointBuffer(buflen, rdb); + if (!NT_SUCCESS(Status)) { + ERR("FsRtlValidateReparsePointBuffer returned %08x\n", Status); goto end; } diff --git a/drivers/filesystems/btrfs/search.c b/drivers/filesystems/btrfs/search.c index 6f3dd62a2b..bec1aba420 100644 --- a/drivers/filesystems/btrfs/search.c +++ b/drivers/filesystems/btrfs/search.c @@ -913,8 +913,7 @@ void mountmgr_thread(_In_ void* context) { if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) ERR("IOCTL_MOUNTMGR_QUERY_POINTS 1 returned %08x\n", Status); - - if (mmps.Size > 0) { + else if (mmps.Size > 0) { MOUNTMGR_MOUNT_POINTS* mmps2; mmps2 = ExAllocatePoolWithTag(NonPagedPool, mmps.Size, ALLOC_TAG); diff --git a/drivers/filesystems/btrfs/volume.c b/drivers/filesystems/btrfs/volume.c index eff7f07c4c..5f7516a5c2 100755 --- a/drivers/filesystems/btrfs/volume.c +++ b/drivers/filesystems/btrfs/volume.c @@ -983,9 +983,9 @@ static BOOL allow_degraded_mount(BTRFS_UUID* uuid) { ZwClose(h); +end: ExFreePool(kvfi); -end: ExFreePool(path.Buffer); return degraded; diff --git a/drivers/filesystems/btrfs/write.c b/drivers/filesystems/btrfs/write.c index 95e6397424..c3a8fb7476 100644 --- a/drivers/filesystems/btrfs/write.c +++ b/drivers/filesystems/btrfs/write.c @@ -4335,6 +4335,11 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void Status = _SEH2_GetExceptionCode(); } _SEH2_END; + if (changed_length) { + send_notification_fcb(fcb->ads ? fileref->parent : fileref, fcb->ads ? FILE_NOTIFY_CHANGE_STREAM_SIZE : FILE_NOTIFY_CHANGE_SIZE, + fcb->ads ? FILE_ACTION_MODIFIED_STREAM : FILE_ACTION_MODIFIED, fcb->ads && fileref->dc ? &fileref->dc->name : NULL); + } + goto end; } @@ -4553,7 +4558,9 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void fileref->parent->fcb->inode_item_changed = TRUE; if (changed_length) - filter |= FILE_NOTIFY_CHANGE_SIZE; + filter |= FILE_NOTIFY_CHANGE_STREAM_SIZE; + + filter |= FILE_NOTIFY_CHANGE_STREAM_WRITE; } if (!ccb->user_set_write_time) { @@ -4585,7 +4592,8 @@ NTSTATUS write_file2(device_extension* Vcb, PIRP Irp, LARGE_INTEGER offset, void Status = STATUS_SUCCESS; if (filter != 0) - send_notification_fcb(fcb->ads ? fileref->parent : fileref, filter, FILE_ACTION_MODIFIED, fcb->ads && fileref->dc ? &fileref->dc->name : NULL); + send_notification_fcb(fcb->ads ? fileref->parent : fileref, filter, fcb->ads ? FILE_ACTION_MODIFIED_STREAM : FILE_ACTION_MODIFIED, + fcb->ads && fileref->dc ? &fileref->dc->name : NULL); end: if (NT_SUCCESS(Status) && FileObject->Flags & FO_SYNCHRONOUS_IO && !paging_io) {

1 0

[reactos] 01/01: [STORPORT] Implement StorPortSetBusDataByOffset. CORE-13866
by Eric Kohl 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=194df1ba58c74d0dd3084… commit 194df1ba58c74d0dd3084c7b88e7608b49298ac4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 16 20:05:27 2017 +0200 [STORPORT] Implement StorPortSetBusDataByOffset. CORE-13866 --- drivers/storage/port/storport/storport.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 170c4eb678..706b0b50e4 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -1005,7 +1005,7 @@ StorPortResumeDevice( /* - * @unimplemented + * @implemented */ STORPORT_API ULONG @@ -1019,9 +1019,29 @@ StorPortSetBusDataByOffset( _In_ ULONG Offset, _In_ ULONG Length) { - DPRINT1("StorPortSetBusDataByOffset()\n"); - UNIMPLEMENTED; - return 0; + PMINIPORT_DEVICE_EXTENSION MiniportExtension; + PBUS_INTERFACE_STANDARD Interface; + ULONG ReturnLength; + + DPRINT1("StorPortSetBusData(%p %lu %lu %lu %p %lu %lu)\n", + DeviceExtension, BusDataType, SystemIoBusNumber, SlotNumber, Buffer, Offset, Length); + + MiniportExtension = CONTAINING_RECORD(DeviceExtension, + MINIPORT_DEVICE_EXTENSION, + HwDeviceExtension); + DPRINT1("DeviceExtension %p MiniportExtension %p\n", + DeviceExtension, MiniportExtension); + + Interface = &MiniportExtension->Miniport->DeviceExtension->BusInterface; + + ReturnLength = Interface->SetBusData(Interface->Context, + BusDataType, + Buffer, + Offset, + Length); + DPRINT1("ReturnLength: %lu\n", ReturnLength); + + return ReturnLength; }

1 0

[reactos] 01/01: [BOOTDATA] Change readme encoding to UTF-8
by Stas'M 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1624c1d8c939a80dbf490… commit 1624c1d8c939a80dbf490c867d70a339bf0ab065 Author: Stas'M <x86corez(a)gmail.com> AuthorDate: Mon Oct 16 19:29:28 2017 +0300 [BOOTDATA] Change readme encoding to UTF-8 --- boot/bootdata/readme.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt index a8828dcb08..13b8e0332a 100644 --- a/boot/bootdata/readme.txt +++ b/boot/bootdata/readme.txt @@ -1,13 +1,13 @@ -======================== -ReactOS� Version 0.4.x +======================== +ReactOS™ Version 0.4.x Updated August 31, 2016 ======================== 1. What is ReactOS? ------------------- -ReactOS� is an Open Source effort to develop a quality operating system that is -compatible with applications and drivers written for the Microsoft� Windows� NT +ReactOS™ is an Open Source effort to develop a quality operating system that is +compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). More information is available at: https://www.reactos.org

1 0

[reactos] 01/01: [PSDK] Try to fix build
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a08d1f92bea146ca8bcc0… commit a08d1f92bea146ca8bcc042723a2c89360881e3c Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 16 18:32:23 2017 +0300 [PSDK] Try to fix build --- sdk/include/psdk/shlguid.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/include/psdk/shlguid.h b/sdk/include/psdk/shlguid.h index 3518f3c0e9..c790a8dd49 100644 --- a/sdk/include/psdk/shlguid.h +++ b/sdk/include/psdk/shlguid.h @@ -265,6 +265,5 @@ DEFINE_GUID(BHID_EnumAssocHandlers,0xB8AB0B9C, 0xC2EC, 0x4F7A, 0x91,0x8D, 0x31,0 DEFINE_GUID(CLSID_ISFBand, 0xD82BE2B0, 0x5764, 0x11D0, 0xA9, 0x6E, 0x00, 0xC0, 0x4F, 0xD7, 0x05, 0xA2); DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); -DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); #endif /* __WINE_SHLGUID_H */

1 0

[reactos] 01/01: [STOBJECT] Fix build on linux
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4576f55099602f05d06c… commit a4576f55099602f05d06cf1fab1b8d6448ffc26a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 16 18:21:02 2017 +0300 [STOBJECT] Fix build on linux --- dll/shellext/stobject/power.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 5853b2bdbf..a25de28cfb 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -8,10 +8,10 @@ * David Quintana <gigaherz(a)gmail.com> */ -#include <Windows.h> -#include <SetupAPI.h> +#include <windows.h> +#include <setupapi.h> #include <devguid.h> -#include <BatClass.h> +#include <batclass.h> #include "precomp.h" #include "powrprof.h"

1 0

[reactos] 01/01: [QCKLNCH] Fix gcc build
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c9aedfd1c8c1f44c80d2… commit 3c9aedfd1c8c1f44c80d26c05722f3456c1a55e9 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 16 18:15:20 2017 +0300 [QCKLNCH] Fix gcc build --- dll/shellext/qcklnch/CMakeLists.txt | 3 +++ dll/shellext/qcklnch/CQuickLaunchBand.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/shellext/qcklnch/CMakeLists.txt b/dll/shellext/qcklnch/CMakeLists.txt index bcc921891d..29b7ac8768 100644 --- a/dll/shellext/qcklnch/CMakeLists.txt +++ b/dll/shellext/qcklnch/CMakeLists.txt @@ -8,6 +8,9 @@ if(NOT MSVC) add_compile_flags_language("-std=c++11" "CXX") endif() +add_definitions( + -D_ATL_NO_EXCEPTIONS) + include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}) diff --git a/dll/shellext/qcklnch/CQuickLaunchBand.cpp b/dll/shellext/qcklnch/CQuickLaunchBand.cpp index d250a3c5ca..487fb9725e 100644 --- a/dll/shellext/qcklnch/CQuickLaunchBand.cpp +++ b/dll/shellext/qcklnch/CQuickLaunchBand.cpp @@ -11,7 +11,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); // {260CB95D-4544-44F6-A079-575BAA60B72F} -static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; +const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; // Componenet Category Registration HRESULT RegisterComCat()

1 0

[reactos] 01/01: [PSDK] Fix build.
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=129f98b4733e621b0d594… commit 129f98b4733e621b0d59405e4d248b9ff458a258 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 16 18:04:15 2017 +0300 [PSDK] Fix build. --- sdk/include/psdk/shlobj.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index fe01c6a1c7..1c36e4751c 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2418,6 +2418,8 @@ DECLARE_INTERFACE_(IShellFolderBand, IUnknown) STDMETHOD(SetBandInfoSFB)(THIS_ PBANDINFOSFB pbi) PURE; STDMETHOD(GetBandInfoSFB)(THIS_ PBANDINFOSFB pbi) PURE; }; +#undef INTERFACE + /***************************************************************************** * Control Panel functions

1 0

[reactos] 03/03: [STOBJECT] Implement the hotplug and the power icons in the system tray
by Shriraj Sawant 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fbc5f42302be64db4d33… commit 7fbc5f42302be64db4d3383060e3c14bcc1dfac6 Author: Shriraj Sawant <sr.official(a)hotmail.com> AuthorDate: Mon Oct 16 17:11:10 2017 +0300 [STOBJECT] Implement the hotplug and the power icons in the system tray --- dll/shellext/stobject/CMakeLists.txt | 4 + dll/shellext/stobject/csystray.cpp | 53 ++-- dll/shellext/stobject/csystray.h | 3 +- dll/shellext/stobject/hotplug.cpp | 315 ++++++++++++++++----- dll/shellext/stobject/lang/cs-CZ.rc | 4 +- dll/shellext/stobject/lang/de-DE.rc | 4 +- dll/shellext/stobject/lang/en-US.rc | 4 +- dll/shellext/stobject/lang/es-ES.rc | 4 +- dll/shellext/stobject/lang/fr-FR.rc | 4 +- dll/shellext/stobject/lang/it-IT.rc | 4 +- dll/shellext/stobject/lang/pl-PL.rc | 4 +- dll/shellext/stobject/lang/ro-RO.rc | 4 +- dll/shellext/stobject/lang/ru-RU.rc | 4 +- dll/shellext/stobject/lang/zh-CN.rc | 4 +- dll/shellext/stobject/lang/zh-TW.rc | 4 +- dll/shellext/stobject/power.cpp | 301 ++++++++++++++++---- dll/shellext/stobject/precomp.h | 3 - dll/shellext/stobject/resource.h | 16 ++ dll/shellext/stobject/resources/battery/0.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/battery/1.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/battery/2.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/battery/3.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/battery/4.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/battery/5.ico | Bin 0 -> 9062 bytes .../stobject/resources/battery/charging0.ico | Bin 0 -> 2550 bytes .../stobject/resources/battery/charging1.ico | Bin 0 -> 2550 bytes .../stobject/resources/battery/charging2.ico | Bin 0 -> 2550 bytes .../stobject/resources/battery/charging3.ico | Bin 0 -> 2550 bytes .../stobject/resources/battery/charging4.ico | Bin 0 -> 2550 bytes dll/shellext/stobject/resources/battery/error.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/resources/hotplug/0.ico | Bin 0 -> 2550 bytes dll/shellext/stobject/resources/hotplug/1.ico | Bin 0 -> 2550 bytes dll/shellext/stobject/stobject.rc | 19 ++ dll/shellext/stobject/volume.cpp | 29 +- 34 files changed, 592 insertions(+), 195 deletions(-) diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt index 2fa34e6144..341fe672ae 100644 --- a/dll/shellext/stobject/CMakeLists.txt +++ b/dll/shellext/stobject/CMakeLists.txt @@ -12,6 +12,9 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + spec2def(stobject.dll stobject.spec) file(GLOB_RECURSE stobject_rc_deps resources/*.*) @@ -30,6 +33,7 @@ set_module_type(stobject win32dll UNICODE) target_link_libraries(stobject uuid wine atlnew) add_importlibs(stobject + setupapi advapi32 winmm ole32 diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index 8551fbcf23..e4a2afe403 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -4,6 +4,7 @@ * FILE: dll/shellext/stobject/csystray.cpp * PURPOSE: Systray shell service object implementation * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> +* Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #include "precomp.h" @@ -97,7 +98,27 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR return S_FALSE; } -HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) +/*++ +* @name NotifyIcon +* +* Basically a Shell_NotifyIcon wrapper. +* Based on the parameters provided, it changes the current state of the notification icon. +* +* @param code +* Determines whether to add, delete or modify the notification icon (represented by uId). +* @param uId +* Represents the particular notification icon. +* @param hIcon +* A handle to an icon for the notification object. +* @param szTip +* A string for the tooltip of the notification. +* @param dwstate +* Determines whether to show or hide the notification icon. +* +* @return The error code. +* +*--*/ +HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { NOTIFYICONDATA nim = { 0 }; @@ -108,8 +129,8 @@ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) nim.hIcon = hIcon; nim.uID = uId; nim.uCallbackMessage = uId; - nim.dwState = 0; - nim.dwStateMask = 0; + nim.dwState = dwstate; + nim.dwStateMask = NIS_HIDDEN; nim.hWnd = m_hWnd; nim.uVersion = NOTIFYICON_VERSION; if (szTip) @@ -219,30 +240,8 @@ BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return TRUE; case WM_TIMER: - switch (wParam) - { - case 1: - UpdateIcons(); - return TRUE; - - case POWER_TIMER_ID: - Power_OnTimer(hWnd); - break; - - case VOLUME_TIMER_ID: - Volume_OnTimer(hWnd); - break; - - case HOTPLUG_TIMER_ID: - Hotplug_OnTimer(hWnd); - break; - } - break; - - case WM_DEVICECHANGE: - ERR("WM_DEVICECHANGE\n"); - break; - + UpdateIcons(); + return TRUE; case WM_DESTROY: KillTimer(1); ShutdownIcons(); diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index 04f7c1e292..b95cd65577 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -5,6 +5,7 @@ * PURPOSE: Systray shell service object * PROGRAMMERS: Robert Naumann * David Quintana <gigaherz(a)gmail.com> + * Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #pragma once @@ -43,7 +44,7 @@ class CSysTray : HRESULT ShutdownNetShell(); public: - HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip); + HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate = 0); HWND GetHWnd() { return m_hWnd; } diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index fbc22ea078..4b17a1baf2 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -2,38 +2,152 @@ * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/shellext/stobject/hotplug.cpp - * PURPOSE: Hotplug notification icon handler - * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> - * David Quintana <gigaherz(a)gmail.com> + * PURPOSE: Removable devices notification icon handler + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ - +#include <windows.h> #include "precomp.h" +#include <mmsystem.h> +#include <mmddk.h> +#include <atlstr.h> +#include <atlsimpcoll.h> +#include <dbt.h> +#include <setupapi.h> +#include <cfgmgr32.h> WINE_DEFAULT_DEBUG_CHANNEL(stobject); +#define DISPLAY_NAME_LEN 40 + +//BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY Handle); +CSimpleArray<DEVINST> g_devList; +/*static HDEVNOTIFY g_hDevNotify = NULL;*/ static HICON g_hIconHotplug = NULL; +static LPCWSTR g_strTooltip = L"Safely Remove Hardware and Eject Media"; +static WCHAR g_strMenuSel[DISPLAY_NAME_LEN]; static BOOL g_IsRunning = FALSE; - - -HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) +static BOOL g_IsRemoving = FALSE; + +/*++ +* @name EnumHotpluggedDevices +* +* Enumerates the connected safely removable devices. +* +* @param devList +* List of device instances, representing the currently attached devices. +* +* @return The error code. +* +*--*/ +HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) { - WCHAR strTooltip[128]; + devList.RemoveAll(); // Clear current devList + HDEVINFO hdev = SetupDiGetClassDevs(NULL, NULL, 0, DIGCF_ALLCLASSES | DIGCF_PRESENT); + if (INVALID_HANDLE_VALUE == hdev) + return E_HANDLE; + SP_DEVINFO_DATA did = { 0 }; + did.cbSize = sizeof(did); + + // Enumerate all the attached devices. + for (int idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); idev++) + { + DWORD dwCapabilities = 0, dwSize = sizeof(dwCapabilities); + WCHAR dispName[DISPLAY_NAME_LEN]; + ULONG ulStatus = 0, ulPnum = 0, ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); + CONFIGRET cr = CM_Get_DevNode_Status(&ulStatus, &ulPnum, did.DevInst, 0); + if (cr != CR_SUCCESS) + continue; + cr = CM_Get_DevNode_Registry_Property(did.DevInst, CM_DRP_DEVICEDESC, NULL, dispName, &ulLength, 0); + if (cr != CR_SUCCESS) + continue; + cr = CM_Get_DevNode_Registry_Property(did.DevInst, CM_DRP_CAPABILITIES, NULL, &dwCapabilities, &dwSize, 0); + if (cr != CR_SUCCESS) + continue; + + // Filter and make list of only the appropriate safely removable devices. + if ( (dwCapabilities & CM_DEVCAP_REMOVABLE) && + !(dwCapabilities & CM_DEVCAP_DOCKDEVICE) && + !(dwCapabilities & CM_DEVCAP_SURPRISEREMOVALOK) && + ((dwCapabilities & CM_DEVCAP_EJECTSUPPORTED) || (ulStatus & DN_DISABLEABLE)) && + !ulPnum) + { + devList.Add(did.DevInst); + } + } + SetupDiDestroyDeviceInfoList(hdev); - TRACE("Hotplug_Init\n"); + if (NO_ERROR != GetLastError() && ERROR_NO_MORE_ITEMS != GetLastError()) + { + return E_UNEXPECTED; + } - g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_EXTRACT)); + return S_OK; +} - LoadStringW(g_hInstance, IDS_HOTPLUG_REMOVE_1, strTooltip, _countof(strTooltip)); +/*++ +* @name NotifyBalloon +* +* Pops the balloon notification of the given notification icon. +* +* @param pSysTray +* Provides interface for acquiring CSysTray information as required. +* @param szTitle +* Title for the balloon notification. +* @param szInfo +* Main content for the balloon notification. +* @param uId +* Represents the particular notification icon. +* +* @return The error code. +* +*--*/ +HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) +{ + NOTIFYICONDATA nim = { 0 }; + nim.cbSize = sizeof(NOTIFYICONDATA); + nim.uID = uId; + nim.hWnd = pSysTray->GetHWnd(); + + nim.uFlags = NIF_INFO; + nim.uTimeout = 10; + nim.dwInfoFlags = NIIF_INFO; + + StringCchCopy(nim.szInfoTitle, _countof(nim.szInfoTitle), szTitle); + StringCchCopy(nim.szInfo, _countof(nim.szInfo), szInfo); + BOOL ret = Shell_NotifyIcon(NIM_MODIFY, &nim); + + Sleep(10000); /* As per windows, the balloon notification remains visible for atleast 10 sec. + This timer maintains the same condition. + Also it is required so that the icon doesn't hide instantly after last device is removed, + as that will prevent popping of notification. + */ + StringCchCopy(nim.szInfoTitle, _countof(nim.szInfoTitle), L""); + StringCchCopy(nim.szInfo, _countof(nim.szInfo), L""); + ret = Shell_NotifyIcon(NIM_MODIFY, &nim); + g_IsRemoving = FALSE; /* This flag is used to prevent instant icon hiding after last device is removed. + The above timer maintains the required state for the same. + */ + return ret ? S_OK : E_FAIL; +} +HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) +{ + TRACE("Hotplug_Init\n"); + g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_HOTPLUG_OK)); g_IsRunning = TRUE; + EnumHotpluggedDevices(g_devList); - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, strTooltip); + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); } HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Update\n"); - return S_OK; + + if(g_devList.GetSize() || g_IsRemoving) + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + else + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); } HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) @@ -45,79 +159,112 @@ HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_HOTPLUG, NULL, NULL); } -static void RunHotplug() +static void _RunHotplug(CSysTray * pSysTray) { - ShellExecuteW(NULL, NULL, L"rundll32.exe", L"shell32.dll,Control_RunDLL hotplug.dll", NULL, SW_SHOWNORMAL); + ShellExecuteW(pSysTray->GetHWnd(), L"open", L"rundll32.exe shell32.dll,Control_RunDLL hotplug.dll", NULL, NULL, SW_SHOWNORMAL); } -static void ShowContextMenu(CSysTray *pSysTray) +static void _ShowContextMenu(CSysTray * pSysTray) { - WCHAR szBuffer[128]; - DWORD id, msgPos; - HMENU hPopup; - - LoadStringW(g_hInstance, IDS_HOTPLUG_REMOVE_2, szBuffer, _countof(szBuffer)); + HMENU hPopup = CreatePopupMenu(); + ULONG ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); - hPopup = CreatePopupMenu(); - AppendMenuW(hPopup, MF_STRING, 1, szBuffer); + for (INT index = 0; index < g_devList.GetSize(); index++) + { + WCHAR dispName[DISPLAY_NAME_LEN], menuName[DISPLAY_NAME_LEN + 10]; + CONFIGRET cr = CM_Get_DevNode_Registry_Property(g_devList[index], CM_DRP_DEVICEDESC, NULL, dispName, &ulLength, 0); + if (cr != CR_SUCCESS) + StrCpyW(dispName, L"Unknown Device"); - msgPos = GetMessagePos(); + swprintf(menuName, L"Eject %wS", dispName); + AppendMenuW(hPopup, MF_STRING, index+1, menuName); + } SetForegroundWindow(pSysTray->GetHWnd()); - id = TrackPopupMenuEx(hPopup, - TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, - GET_X_LPARAM(msgPos), - GET_Y_LPARAM(msgPos), - pSysTray->GetHWnd(), - NULL); + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + POINT pt; + GetCursorPos(&pt); - DestroyMenu(hPopup); + DWORD id = TrackPopupMenuEx(hPopup, flags, + pt.x, pt.y, + pSysTray->GetHWnd(), NULL); + + if (id > 0) + { + id--; // since array indices starts from zero. + CONFIGRET cr = CM_Get_DevNode_Registry_Property(g_devList[id], CM_DRP_DEVICEDESC, NULL, g_strMenuSel, &ulLength, 0); + if (cr != CR_SUCCESS) + StrCpyW(g_strMenuSel, L"Unknown Device"); + + cr = CM_Request_Device_Eject_Ex(g_devList[id], 0, 0, 0, 0, 0); + if (cr != CR_SUCCESS) + { + WCHAR strInfo[128]; + swprintf(strInfo, L"Problem Ejecting %wS", g_strMenuSel); + MessageBox(0, L"The device cannot be stopped right now! Try stopping it again later!", strInfo, MB_OKCANCEL | MB_ICONEXCLAMATION); + } + else + { + //MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OKCANCEL | MB_ICONINFORMATION); + g_IsRemoving = TRUE; + g_devList.RemoveAt(id); /* thing is.. even after removing id at this point, the devnode_change occurs after some seconds of sucessful removal + and since pendrive is still plugged in it gets enumerated, if problem number is not filtered. + */ + } + } - if (id == 1) - RunHotplug(); + DestroyMenu(hPopup); } -static -VOID -ShowHotplugPopupMenu( - HWND hWnd) +static void _ShowContextMenuR(CSysTray * pSysTray) { -#if 0 - DWORD id, msgPos; - + CString strMenu((LPWSTR)IDS_HOTPLUG_REMOVE_2); HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_HOTPLUG_REMOVE_2, strMenu); - // FIXME - AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); - - msgPos = GetMessagePos(); - - SetForegroundWindow(hWnd); - id = TrackPopupMenuEx(hPopup, - TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, - GET_X_LPARAM(msgPos), - GET_Y_LPARAM(msgPos), - hWnd, - NULL); + SetForegroundWindow(pSysTray->GetHWnd()); + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + POINT pt; + GetCursorPos(&pt); - DestroyMenu(hPopup); + DWORD id = TrackPopupMenuEx(hPopup, flags, + pt.x, pt.y, + pSysTray->GetHWnd(), NULL); - if (id != 0) + if (id == IDS_HOTPLUG_REMOVE_2) { - // FIXME + _RunHotplug(pSysTray); } -#endif + + DestroyMenu(hPopup); } -HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) +HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) { + HRESULT hr = E_FAIL; TRACE("Hotplug_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); switch (uMsg) { + /*case WM_CREATE: + TRACE("Hotplug_Message: WM_CREATE\n"); + DEV_BROADCAST_DEVICEINTERFACE NotificationFilter; + + ZeroMemory(&NotificationFilter, sizeof(NotificationFilter)); + NotificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE); + NotificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + + g_hDevNotify = RegisterDeviceNotification(pSysTray->GetHWnd(), &NotificationFilter, DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES); + if (g_hDevNotify != NULL) + { + lResult = true; + return S_OK; + } + return S_FALSE;*/ + case WM_USER + 220: TRACE("Hotplug_Message: WM_USER+220\n"); - if (wParam == 2) + if (wParam == 1) { if (lParam == FALSE) return Hotplug_Init(pSysTray); @@ -128,7 +275,7 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WP case WM_USER + 221: TRACE("Hotplug_Message: WM_USER+221\n"); - if (wParam == 2) + if (wParam == 1) { lResult = (LRESULT)g_IsRunning; return S_OK; @@ -141,22 +288,21 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WP switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: + _ShowContextMenu(pSysTray); break; case WM_LBUTTONDBLCLK: - KillTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID); - RunHotplug(); + _RunHotplug(pSysTray); break; case WM_RBUTTONDOWN: break; case WM_RBUTTONUP: - ShowContextMenu(pSysTray); + _ShowContextMenuR(pSysTray); break; case WM_RBUTTONDBLCLK: @@ -167,6 +313,41 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WP } return S_OK; + case WM_DEVICECHANGE: + switch (wParam) + { + case DBT_DEVNODES_CHANGED: + hr = EnumHotpluggedDevices(g_devList); + if (FAILED(hr)) + return hr; + + lResult = true; + break; + case DBT_DEVICEARRIVAL: + break; + case DBT_DEVICEQUERYREMOVE: + break; + case DBT_DEVICEQUERYREMOVEFAILED: + break; + case DBT_DEVICEREMOVECOMPLETE: + WCHAR strInfo[128]; + swprintf(strInfo, L"The %wS can now be safely removed from the system.", g_strMenuSel); + NotifyBalloon(pSysTray, L"Safe to Remove Hardware", strInfo); + + lResult = true; + break; + case DBT_DEVICEREMOVEPENDING: + break; + } + return S_OK; + + /*case WM_CLOSE: + if (!UnregisterDeviceNotification(hDeviceNotify)) + { + return S_FALSE; + } + return S_OK;*/ + default: TRACE("Hotplug_Message received for unknown ID %d, ignoring.\n"); return S_FALSE; @@ -174,11 +355,3 @@ HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WP return S_FALSE; } - -VOID -Hotplug_OnTimer(HWND hWnd) -{ - TRACE("Hotplug_OnTimer\n!"); - KillTimer(hWnd, HOTPLUG_TIMER_ID); - ShowHotplugPopupMenu(hWnd); -} diff --git a/dll/shellext/stobject/lang/cs-CZ.rc b/dll/shellext/stobject/lang/cs-CZ.rc index 84fe3d4fb1..57ec1bca55 100644 --- a/dll/shellext/stobject/lang/cs-CZ.rc +++ b/dll/shellext/stobject/lang/cs-CZ.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Upravit možnosti napájení" IDS_PWR_METER "&Otevřít ukazatel spotřeby" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "zbývá %1!u!%%" - IDS_PWR_CHARGING " (nabíjení)" + IDS_PWR_PERCENT_REMAINING "zbývá %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Zbývá neznámo" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "zbývá %1!u!:%2!02u! hodin (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/de-DE.rc b/dll/shellext/stobject/lang/de-DE.rc index 1563baf172..cdb3aa2d48 100644 --- a/dll/shellext/stobject/lang/de-DE.rc +++ b/dll/shellext/stobject/lang/de-DE.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Energieverwaltungseigenschaften einstellen" IDS_PWR_METER "Batterieanzeige ö&ffnen" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%1!u!%% verbleibend" - IDS_PWR_CHARGING " (wird aufgeladen)" + IDS_PWR_PERCENT_REMAINING "%.2f%% verbleibend" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" IDS_PWR_AC "Mit Wechselstrom" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Stunden (%3!u!%%) verbleibend" diff --git a/dll/shellext/stobject/lang/en-US.rc b/dll/shellext/stobject/lang/en-US.rc index e10c25c3cc..ea1f17ffcd 100644 --- a/dll/shellext/stobject/lang/en-US.rc +++ b/dll/shellext/stobject/lang/en-US.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" - IDS_PWR_CHARGING " (charging)" + IDS_PWR_PERCENT_REMAINING "%.2f%% remaining" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" diff --git a/dll/shellext/stobject/lang/es-ES.rc b/dll/shellext/stobject/lang/es-ES.rc index c7a3d0d6b2..ac008f2dd9 100644 --- a/dll/shellext/stobject/lang/es-ES.rc +++ b/dll/shellext/stobject/lang/es-ES.rc @@ -19,8 +19,8 @@ BEGIN IDS_PWR_PROPERTIES "&Ajustar propiedades de energía" IDS_PWR_METER "Abrir &medidor de energía" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Queda un %1!u!%%" - IDS_PWR_CHARGING " (cargando)" + IDS_PWR_PERCENT_REMAINING "Queda un %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Estado de batería desconocido" IDS_PWR_AC "En corriente alterna" IDS_PWR_HOURS_REMAINING "Quedan %1!u!:%2!02u! horas (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/fr-FR.rc b/dll/shellext/stobject/lang/fr-FR.rc index 273cb83b89..de393af36f 100644 --- a/dll/shellext/stobject/lang/fr-FR.rc +++ b/dll/shellext/stobject/lang/fr-FR.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" - IDS_PWR_CHARGING " (charging)" + IDS_PWR_PERCENT_REMAINING "%.2f%% remaining" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" diff --git a/dll/shellext/stobject/lang/it-IT.rc b/dll/shellext/stobject/lang/it-IT.rc index a4d715427c..628466edbe 100644 --- a/dll/shellext/stobject/lang/it-IT.rc +++ b/dll/shellext/stobject/lang/it-IT.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Modifica proprietà alimentazione" IDS_PWR_METER "&Apri misuratore alimentazione" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%1!u!%% rimanenti" - IDS_PWR_CHARGING " (in carica)" + IDS_PWR_PERCENT_REMAINING "%.2f%% rimanenti" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Autonomia sconosciuta" IDS_PWR_AC "Alimentazione da rete AC" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! ore (%3!u!%%) rimanenti" diff --git a/dll/shellext/stobject/lang/pl-PL.rc b/dll/shellext/stobject/lang/pl-PL.rc index 0a2889edc4..def3249946 100644 --- a/dll/shellext/stobject/lang/pl-PL.rc +++ b/dll/shellext/stobject/lang/pl-PL.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Opcje zasilania" IDS_PWR_METER "&Otwórz miernik baterii" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Pozostało %1!u!%%" - IDS_PWR_CHARGING " (ładowanie)" + IDS_PWR_PERCENT_REMAINING "Pozostało %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Stan naładowania nieznany" IDS_PWR_AC "Podłączony do zasilacza" IDS_PWR_HOURS_REMAINING "Pozostało %1!u!:%2!02u! godzin (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/ro-RO.rc b/dll/shellext/stobject/lang/ro-RO.rc index 0de2e8de7c..bb19bd1d74 100644 --- a/dll/shellext/stobject/lang/ro-RO.rc +++ b/dll/shellext/stobject/lang/ro-RO.rc @@ -19,8 +19,8 @@ BEGIN IDS_PWR_PROPERTIES "&Ajustare proprietăți de consum energie" IDS_PWR_METER "&Deschide Contor de energie" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Au mai rămas %1!u!%%" - IDS_PWR_CHARGING " (în încărcare)" + IDS_PWR_PERCENT_REMAINING "Au mai rămas %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Nu este disponibil cât a mai rămas" IDS_PWR_AC "În rețea de CA" IDS_PWR_HOURS_REMAINING "Au mai rămas %1!u!:%2!02u! ore (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/ru-RU.rc b/dll/shellext/stobject/lang/ru-RU.rc index 572f1613fd..af307d3024 100644 --- a/dll/shellext/stobject/lang/ru-RU.rc +++ b/dll/shellext/stobject/lang/ru-RU.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "&Настройка параметров электропитания" IDS_PWR_METER "&Открыть показатели питания" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%1!u!%% осталось" - IDS_PWR_CHARGING " (зарядка)" + IDS_PWR_PERCENT_REMAINING "%.2f%% осталось" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Неизвестно" IDS_PWR_AC "От сети переменного тока" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! часов (%3!u!%%) осталось" diff --git a/dll/shellext/stobject/lang/zh-CN.rc b/dll/shellext/stobject/lang/zh-CN.rc index 6ba1f37f4b..1d402493d0 100644 --- a/dll/shellext/stobject/lang/zh-CN.rc +++ b/dll/shellext/stobject/lang/zh-CN.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "调整电源属性(&A)" IDS_PWR_METER "开放式电源表(&O)" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "剩余 %1!u!%%" - IDS_PWR_CHARGING " (充电中)" + IDS_PWR_PERCENT_REMAINING "剩余 %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "未知剩余" IDS_PWR_AC "交流电源" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! 小时剩余 (%3!u!%%) " diff --git a/dll/shellext/stobject/lang/zh-TW.rc b/dll/shellext/stobject/lang/zh-TW.rc index 35ae8c4a6f..3d9a5265b8 100644 --- a/dll/shellext/stobject/lang/zh-TW.rc +++ b/dll/shellext/stobject/lang/zh-TW.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "調整電源屬性(&A)" IDS_PWR_METER "開放式電源表(&O)" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "剩餘 %1!u!%%" - IDS_PWR_CHARGING " (充電中)" + IDS_PWR_PERCENT_REMAINING "剩餘 %.2f%%" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "未知剩餘" IDS_PWR_AC "交流電源" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! 小時剩餘 (%3!u!%%) " diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 24b5feb416..5853b2bdbf 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -4,14 +4,30 @@ * FILE: dll/shellext/stobject/power.cpp * PURPOSE: Power notification icon handler * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> * David Quintana <gigaherz(a)gmail.com> */ +#include <Windows.h> +#include <SetupAPI.h> +#include <devguid.h> +#include <BatClass.h> + #include "precomp.h" #include "powrprof.h" +#include <mmsystem.h> +#include <mmddk.h> +#include <atlstr.h> + +#define GBS_HASBATTERY 0x1 +#define GBS_ONBATTERY 0x2 + WINE_DEFAULT_DEBUG_CHANNEL(stobject); +int br_icons[5] = { IDI_BATTCAP0, IDI_BATTCAP1, IDI_BATTCAP2, IDI_BATTCAP3, IDI_BATTCAP4 }; // battery mode icons. +int bc_icons[5] = { IDI_BATTCHA0, IDI_BATTCHA1, IDI_BATTCHA2, IDI_BATTCHA3, IDI_BATTCHA4 }; // charging mode icons. + typedef struct _PWRSCHEMECONTEXT { HMENU hPopup; @@ -19,71 +35,261 @@ typedef struct _PWRSCHEMECONTEXT UINT uiLast; } PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; +CString g_strTooltip; +static float g_batCap = 0; static HICON g_hIconBattery = NULL; static BOOL g_IsRunning = FALSE; +/*++ +* @name GetBatteryState +* +* Enumerates the available battery devices and provides the remaining capacity. +* +* @param cap +* If no error occurs, then this will contain average remaining capacity. +* @param dwResult +* Helps in making battery type checks. +* { +* Returned value includes GBS_HASBATTERY if the system has a non-UPS battery, +* and GBS_ONBATTERY if the system is running on a battery. +* dwResult & GBS_ONBATTERY means we have not yet found AC power. +* dwResult & GBS_HASBATTERY means we have found a non-UPS battery. +* } +* +* @return The error code. +* +*--*/ +static HRESULT GetBatteryState(float& cap, DWORD& dwResult) +{ + cap = 0; + dwResult = GBS_ONBATTERY; -HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) + HDEVINFO hdev = SetupDiGetClassDevs(&GUID_DEVCLASS_BATTERY, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + if (INVALID_HANDLE_VALUE == hdev) + return E_HANDLE; + + // Limit search to 100 batteries max + for (int idev = 0, count = 0; idev < 100; idev++) + { + SP_DEVICE_INTERFACE_DATA did = { 0 }; + did.cbSize = sizeof(did); + + if (SetupDiEnumDeviceInterfaces(hdev, 0, &GUID_DEVCLASS_BATTERY, idev, &did)) + { + DWORD cbRequired = 0; + + SetupDiGetDeviceInterfaceDetail(hdev, &did, 0, 0, &cbRequired, 0); + if (ERROR_INSUFFICIENT_BUFFER == GetLastError()) + { + PSP_DEVICE_INTERFACE_DETAIL_DATA pdidd = (PSP_DEVICE_INTERFACE_DETAIL_DATA)LocalAlloc(LPTR, cbRequired); + if (pdidd) + { + pdidd->cbSize = sizeof(*pdidd); + if (SetupDiGetDeviceInterfaceDetail(hdev, &did, pdidd, cbRequired, &cbRequired, 0)) + { + // Enumerated a battery. Ask it for information. + HANDLE hBattery = CreateFile(pdidd->DevicePath, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (INVALID_HANDLE_VALUE != hBattery) + { + // Ask the battery for its tag. + BATTERY_QUERY_INFORMATION bqi = { 0 }; + + DWORD dwWait = 0; + DWORD dwOut; + + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_TAG, &dwWait, sizeof(dwWait), &bqi.BatteryTag, + sizeof(bqi.BatteryTag), &dwOut, NULL) && bqi.BatteryTag) + { + // With the tag, you can query the battery info. + BATTERY_INFORMATION bi = { 0 }; + bqi.InformationLevel = BatteryInformation; + + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &bi, + sizeof(bi), &dwOut, NULL)) + { + // Only non-UPS system batteries count + if (bi.Capabilities & BATTERY_SYSTEM_BATTERY) + { + if (!(bi.Capabilities & BATTERY_IS_SHORT_TERM)) + dwResult |= GBS_HASBATTERY; + + // Query the battery status. + BATTERY_WAIT_STATUS bws = { 0 }; + bws.BatteryTag = bqi.BatteryTag; + + BATTERY_STATUS bs; + if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_STATUS, &bws, sizeof(bws), + &bs, sizeof(bs), &dwOut, NULL)) + { + if (bs.PowerState & BATTERY_POWER_ON_LINE) + dwResult &= ~GBS_ONBATTERY; + + // Take average of total capacity of batteries detected! + cap = cap*(count)+(float)bs.Capacity / bi.FullChargedCapacity * 100; + cap /= count + 1; + count++; + } + } + } + } + CloseHandle(hBattery); + } + } + LocalFree(pdidd); + } + } + } + else if (ERROR_NO_MORE_ITEMS == GetLastError()) + { + break; // Enumeration failed - perhaps we're out of items + } + } + SetupDiDestroyDeviceInfoList(hdev); + + // Final cleanup: If we didn't find a battery, then presume that we + // are on AC power. + + if (!(dwResult & GBS_HASBATTERY)) + dwResult &= ~GBS_ONBATTERY; + + return S_OK; +} + +/*++ +* @name Quantize +* +* This function quantizes the mentioned quantity to nearest level. +* +* @param p +* Should be a quantity in percentage. +* @param lvl +* Quantization level (this excludes base level 0, which will always be present), default is 10. +* +* @return Nearest quantized level, can be directly used as array index based on context. +* +*--*/ +static UINT Quantize(float p, UINT lvl = 10) { - WCHAR strTooltip[128]; + int i = 0; + float f, q = (float)100 / lvl, d = q / 2; + for (f = 0; f < p; f += q, i++); + + if ((f - d) <= p) + return i; + else + return i - 1; +/* + @remarks This function uses centred/symmetric logic for quantization. + For the case of lvl = 4, You will get following integer levels if given (p) value falls in between the range partitions: + 0 <= p < 12.5 : returns 0; (corresponding to 0% centre) + 12.5 <= p < 37.5 : returns 1; (corresponding to 25% centre) + 37.5 <= p < 62.5 : returns 2; (corresponding to 50% centre) + 62.5 <= p < 87.5 : returns 3; (corresponding to 75% centre) + 87.5 <= p <= 100 : returns 4; (corresponding to 100% centre) +*/ +} - TRACE("Power_Init\n"); +/*++ +* @name DynamicLoadIcon +* +* Returns the respective icon as per the current battery capacity. +* It also does the work of setting global parameters of battery capacity and tooltips. +* +* @param hinst +* A handle to a instance of the module. +* +* @return The handle to respective battery icon. +* +*--*/ +static HICON DynamicLoadIcon(HINSTANCE hinst) +{ + HICON hBatIcon; + float cap = 0; + DWORD dw = 0; + UINT index = -1; + HRESULT hr = GetBatteryState(cap, dw); + + if (!FAILED(hr) && (dw & GBS_HASBATTERY)) + { + index = Quantize(cap, 4); + g_batCap = cap; + } + else + { + g_batCap = 0; + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_BATTCAP_ERR)); + g_strTooltip.LoadStringW(IDS_PWR_UNKNOWN_REMAINING); + return hBatIcon; + } - g_hIconBattery = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); + if (dw & GBS_ONBATTERY) + { + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(br_icons[index])); + g_strTooltip.Format(IDS_PWR_PERCENT_REMAINING, cap); + } + else + { + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(bc_icons[index])); + g_strTooltip.Format(IDS_PWR_CHARGING, cap); + } - LoadStringW(g_hInstance, IDS_PWR_AC, strTooltip, _countof(strTooltip)); + return hBatIcon; +} +HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) +{ + TRACE("Power_Init\n"); + g_hIconBattery = DynamicLoadIcon(g_hInstance); g_IsRunning = TRUE; - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, strTooltip); + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, g_strTooltip); } HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) { TRACE("Power_Update\n"); - return S_OK; + g_hIconBattery = DynamicLoadIcon(g_hInstance); + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, g_hIconBattery, g_strTooltip); } HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Power_Shutdown\n"); - g_IsRunning = FALSE; return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_POWER, NULL, NULL); } -static void RunPower() +static void _RunPower() { - ShellExecuteW(NULL, NULL, L"rundll32.exe", L"shell32.dll,Control_RunDLL powercfg.cpl", NULL, SW_SHOWNORMAL); + ShellExecuteW(NULL, NULL, L"powercfg.cpl", NULL, NULL, SW_SHOWNORMAL); } -static void ShowContextMenu(CSysTray * pSysTray) +static void _ShowContextMenu(CSysTray * pSysTray) { - WCHAR szBuffer[128]; - DWORD id, msgPos; - HMENU hPopup; - - LoadStringW(g_hInstance, IDS_PWR_PROPERTIES, szBuffer, _countof(szBuffer)); - - hPopup = CreatePopupMenu(); - AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, szBuffer); - SetMenuDefaultItem(hPopup, IDS_PWR_PROPERTIES, FALSE); - - msgPos = GetMessagePos(); + CString strOpen((LPCSTR)IDS_PWR_PROPERTIES); + HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen); SetForegroundWindow(pSysTray->GetHWnd()); - id = TrackPopupMenuEx(hPopup, - TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, - GET_X_LPARAM(msgPos), - GET_Y_LPARAM(msgPos), - pSysTray->GetHWnd(), - NULL); + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + POINT pt; + GetCursorPos(&pt); - DestroyMenu(hPopup); + DWORD id = TrackPopupMenuEx(hPopup, flags, + pt.x, pt.y, + pSysTray->GetHWnd(), NULL); - if (id == IDS_PWR_PROPERTIES) - RunPower(); + switch (id) + { + case IDS_PWR_PROPERTIES: + _RunPower(); + break; + } + DestroyMenu(hPopup); } static @@ -114,12 +320,12 @@ PowerSchemesEnumProc( static VOID ShowPowerSchemesPopupMenu( - HWND hWnd) + CSysTray *pSysTray) { PWRSCHEMECONTEXT PowerSchemeContext = {NULL, 0, 0}; UINT uiActiveScheme; - DWORD id, msgPos; - + DWORD id; + POINT pt; PowerSchemeContext.hPopup = CreatePopupMenu(); EnumPwrSchemes(PowerSchemesEnumProc, (LPARAM)&PowerSchemeContext); @@ -132,14 +338,14 @@ ShowPowerSchemesPopupMenu( MF_BYCOMMAND); } - msgPos = GetMessagePos(); - - SetForegroundWindow(hWnd); + SetForegroundWindow(pSysTray->GetHWnd()); + GetCursorPos(&pt); + id = TrackPopupMenuEx(PowerSchemeContext.hPopup, TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, - GET_X_LPARAM(msgPos), - GET_Y_LPARAM(msgPos), - hWnd, + pt.x, + pt.y, + pSysTray->GetHWnd(), NULL); DestroyMenu(PowerSchemeContext.hPopup); @@ -180,22 +386,21 @@ HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPA switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), POWER_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: + ShowPowerSchemesPopupMenu(pSysTray); break; case WM_LBUTTONDBLCLK: - KillTimer(pSysTray->GetHWnd(), POWER_TIMER_ID); - RunPower(); + _RunPower(); break; case WM_RBUTTONDOWN: break; case WM_RBUTTONUP: - ShowContextMenu(pSysTray); + _ShowContextMenu(pSysTray); break; case WM_RBUTTONDBLCLK: @@ -213,11 +418,3 @@ HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPA return S_FALSE; } - -VOID -Power_OnTimer(HWND hWnd) -{ - TRACE("Power_OnTimer\n!"); - KillTimer(hWnd, POWER_TIMER_ID); - ShowPowerSchemesPopupMenu(hWnd); -} diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index fd2ea78836..64824ba825 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -69,19 +69,16 @@ extern HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); -extern VOID Volume_OnTimer(HWND hWnd); extern HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); -extern VOID Hotplug_OnTimer(HWND hWnd); extern HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); -extern VOID Power_OnTimer(HWND hWnd); #define POWER_TIMER_ID 2 #define VOLUME_TIMER_ID 3 diff --git a/dll/shellext/stobject/resource.h b/dll/shellext/stobject/resource.h index 2637a12aea..a7466f77d3 100644 --- a/dll/shellext/stobject/resource.h +++ b/dll/shellext/stobject/resource.h @@ -39,4 +39,20 @@ #define IDS_KEYS_MOUSE 331 #define IDS_KEYS_FILTER 332 +#define IDI_BATTCAP0 400 +#define IDI_BATTCAP1 401 +#define IDI_BATTCAP2 402 +#define IDI_BATTCAP3 403 +#define IDI_BATTCAP4 404 +#define IDI_BATTCAP5 405 +#define IDI_BATTCHA0 406 +#define IDI_BATTCHA1 407 +#define IDI_BATTCHA2 408 +#define IDI_BATTCHA3 409 +#define IDI_BATTCHA4 410 +#define IDI_BATTCAP_ERR 412 + +#define IDI_HOTPLUG_ERR 420 +#define IDI_HOTPLUG_OK 421 + #define IDR_SYSTRAY 11001 diff --git a/dll/shellext/stobject/resources/battery/0.ico b/dll/shellext/stobject/resources/battery/0.ico new file mode 100644 index 0000000000..1610499aa3 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/0.ico differ diff --git a/dll/shellext/stobject/resources/battery/1.ico b/dll/shellext/stobject/resources/battery/1.ico new file mode 100644 index 0000000000..9c2f526f9e Binary files /dev/null and b/dll/shellext/stobject/resources/battery/1.ico differ diff --git a/dll/shellext/stobject/resources/battery/2.ico b/dll/shellext/stobject/resources/battery/2.ico new file mode 100644 index 0000000000..f1dc98aa7f Binary files /dev/null and b/dll/shellext/stobject/resources/battery/2.ico differ diff --git a/dll/shellext/stobject/resources/battery/3.ico b/dll/shellext/stobject/resources/battery/3.ico new file mode 100644 index 0000000000..59fabc2ef3 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/3.ico differ diff --git a/dll/shellext/stobject/resources/battery/4.ico b/dll/shellext/stobject/resources/battery/4.ico new file mode 100644 index 0000000000..edc24a071e Binary files /dev/null and b/dll/shellext/stobject/resources/battery/4.ico differ diff --git a/dll/shellext/stobject/resources/battery/5.ico b/dll/shellext/stobject/resources/battery/5.ico new file mode 100644 index 0000000000..cd4e3b8ee7 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/5.ico differ diff --git a/dll/shellext/stobject/resources/battery/charging0.ico b/dll/shellext/stobject/resources/battery/charging0.ico new file mode 100644 index 0000000000..7504162423 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/charging0.ico differ diff --git a/dll/shellext/stobject/resources/battery/charging1.ico b/dll/shellext/stobject/resources/battery/charging1.ico new file mode 100644 index 0000000000..3a6210c19a Binary files /dev/null and b/dll/shellext/stobject/resources/battery/charging1.ico differ diff --git a/dll/shellext/stobject/resources/battery/charging2.ico b/dll/shellext/stobject/resources/battery/charging2.ico new file mode 100644 index 0000000000..7c1c919a35 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/charging2.ico differ diff --git a/dll/shellext/stobject/resources/battery/charging3.ico b/dll/shellext/stobject/resources/battery/charging3.ico new file mode 100644 index 0000000000..fb92ab6213 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/charging3.ico differ diff --git a/dll/shellext/stobject/resources/battery/charging4.ico b/dll/shellext/stobject/resources/battery/charging4.ico new file mode 100644 index 0000000000..bd1f495c9a Binary files /dev/null and b/dll/shellext/stobject/resources/battery/charging4.ico differ diff --git a/dll/shellext/stobject/resources/battery/error.ico b/dll/shellext/stobject/resources/battery/error.ico new file mode 100644 index 0000000000..6afba7759d Binary files /dev/null and b/dll/shellext/stobject/resources/battery/error.ico differ diff --git a/dll/shellext/stobject/resources/hotplug/0.ico b/dll/shellext/stobject/resources/hotplug/0.ico new file mode 100644 index 0000000000..83025a942d Binary files /dev/null and b/dll/shellext/stobject/resources/hotplug/0.ico differ diff --git a/dll/shellext/stobject/resources/hotplug/1.ico b/dll/shellext/stobject/resources/hotplug/1.ico new file mode 100644 index 0000000000..f615f0ebd3 Binary files /dev/null and b/dll/shellext/stobject/resources/hotplug/1.ico differ diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index f7844dead4..4d7e6da69f 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -11,6 +11,25 @@ IDI_EXTRACT ICON "resources/2.ico" IDI_VOLUME ICON "resources/3.ico" IDI_VOLMUTE ICON "resources/4.ico" +IDI_BATTCAP0 ICON "resources/battery/0.ico" +IDI_BATTCAP1 ICON "resources/battery/1.ico" +IDI_BATTCAP2 ICON "resources/battery/2.ico" +IDI_BATTCAP3 ICON "resources/battery/3.ico" +IDI_BATTCAP4 ICON "resources/battery/4.ico" +IDI_BATTCAP5 ICON "resources/battery/5.ico" + +IDI_BATTCHA0 ICON "resources/battery/charging0.ico" +IDI_BATTCHA1 ICON "resources/battery/charging1.ico" +IDI_BATTCHA2 ICON "resources/battery/charging2.ico" +IDI_BATTCHA3 ICON "resources/battery/charging3.ico" +IDI_BATTCHA4 ICON "resources/battery/charging4.ico" + +IDI_BATTCAP_ERR ICON "resources/battery/error.ico" + +IDI_HOTPLUG_ERR ICON "resources/hotplug/0.ico" +IDI_HOTPLUG_OK ICON "resources/hotplug/1.ico" + + IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #include <reactos/manifest_dll.rc> diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index f82e6e0eee..b7cb3ff049 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -113,7 +113,7 @@ static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) return S_OK; } -HRESULT Volume_IsMute(VOID) +HRESULT Volume_IsMute() { #if 0 MIXERCONTROLDETAILS mixerControlDetails; @@ -217,10 +217,10 @@ HRESULT Volume_OnDeviceChange(_In_ CSysTray * pSysTray, WPARAM wParam, LPARAM lP return Volume_FindMixerControl(pSysTray); } -static void _RunVolume(BOOL bSmall) +static void _RunVolume() { // FIXME: ensure we are loading the right one - ShellExecuteW(NULL, NULL, L"sndvol32.exe", bSmall ? L"/t" : NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); } static void _RunMMCpl() @@ -238,14 +238,14 @@ static void _ShowContextMenu(CSysTray * pSysTray) HMENU hPopup = CreatePopupMenu(); AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); - SetMenuDefaultItem(hPopup, IDS_VOL_OPEN, FALSE); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; - DWORD msgPos = GetMessagePos(); - + POINT pt; SetForegroundWindow(pSysTray->GetHWnd()); + GetCursorPos(&pt); + DWORD id = TrackPopupMenuEx(hPopup, flags, - GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), + pt.x, pt.y, pSysTray->GetHWnd(), NULL); DestroyMenu(hPopup); @@ -253,7 +253,7 @@ static void _ShowContextMenu(CSysTray * pSysTray) switch (id) { case IDS_VOL_OPEN: - _RunVolume(FALSE); + _RunVolume(); break; case IDS_VOL_ADJUST: _RunMMCpl(); @@ -296,15 +296,14 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP switch (lParam) { case WM_LBUTTONDOWN: - SetTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: + TRACE("TODO: display volume slider\n"); break; case WM_LBUTTONDBLCLK: - KillTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID); - _RunVolume(FALSE); + _RunVolume(); break; case WM_RBUTTONDOWN: @@ -329,11 +328,3 @@ HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WP return S_FALSE; } - -VOID -Volume_OnTimer(HWND hWnd) -{ - TRACE("Volume_OnTimer\n!"); - KillTimer(hWnd, VOLUME_TIMER_ID); - _RunVolume(TRUE); -}

1 0

[reactos] 02/03: [QCKLNCH] Implement the quick launch shell extension including the CISFBand
by Shriraj Sawant 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a3865f1dff4793fea05c… commit 7a3865f1dff4793fea05ce8d6b07b9bfbaf6f9c3 Author: Shriraj Sawant <sr.official(a)hotmail.com> AuthorDate: Mon Oct 16 16:38:39 2017 +0300 [QCKLNCH] Implement the quick launch shell extension including the CISFBand --- dll/shellext/CMakeLists.txt | 1 + dll/shellext/qcklnch/CISFBand.cpp | 587 ++++++++++++++++++++++++++++++ dll/shellext/qcklnch/CISFBand.h | 196 ++++++++++ dll/shellext/qcklnch/CMakeLists.txt | 43 +++ dll/shellext/qcklnch/CQuickLaunchBand.cpp | 361 ++++++++++++++++++ dll/shellext/qcklnch/CQuickLaunchBand.h | 174 +++++++++ dll/shellext/qcklnch/lang/en-US.rc | 19 + dll/shellext/qcklnch/precomp.h | 41 +++ dll/shellext/qcklnch/qcklnch.cpp | 70 ++++ dll/shellext/qcklnch/qcklnch.rc | 15 + dll/shellext/qcklnch/qcklnch.spec | 4 + dll/shellext/qcklnch/resource.h | 11 + dll/shellext/qcklnch/rgs/qcklnch.rgs | 13 + 13 files changed, 1535 insertions(+) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 56fabe1299..2b5b3c6c65 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -6,5 +6,6 @@ add_subdirectory(devcpux) add_subdirectory(fontext) add_subdirectory(netshell) add_subdirectory(ntobjshex) +add_subdirectory(qcklnch) add_subdirectory(shellbtrfs) add_subdirectory(stobject) diff --git a/dll/shellext/qcklnch/CISFBand.cpp b/dll/shellext/qcklnch/CISFBand.cpp new file mode 100644 index 0000000000..34192b45d3 --- /dev/null +++ b/dll/shellext/qcklnch/CISFBand.cpp @@ -0,0 +1,587 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CISFBand.cpp + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ + +#include "precomp.h" +#include <commoncontrols.h> + +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + +WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +// ***Extras*** +/*++ +* @name _ILIsDesktop +* +* Checks whether the given PIDL is of Desktop folder or not. +* +* @param pidl +* PIDL to be checked. +* +* @return True if PIDL is of Desktop, otherwise false. +* +*--*/ +BOOL WINAPI _ILIsDesktop(LPCITEMIDLIST pidl) +{ + return (pidl == NULL || pidl->mkid.cb == 0); +} + +//***************************************************************************************** +// *** CISFBand *** + +CISFBand::CISFBand() : + m_BandID(0), + m_pidl(NULL), + m_textFlag(true), + m_iconFlag(true) +{ +} + +CISFBand::~CISFBand() +{ + CloseDW(0); +} + +// Toolbar +/*++ +* @name CreateSimpleToolbar +* +* Creates a toolbar and fills it up with buttons for enumerated objects. +* +* @param hWndParent +* Handle to the parent window, which receives the appropriate messages from child toolbar. +* +* @return The error code. +* +*--*/ +HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) +{ + // Declare and initialize local constants. + const DWORD buttonStyles = BTNS_AUTOSIZE; + + // Create the toolbar. + m_hWnd = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, + WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE | CCS_NODIVIDER, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, + hWndParent, NULL, 0, NULL); + if (m_hWnd == NULL) + return E_FAIL; + + // Set the image list. + HIMAGELIST* piml; + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); + if (FAILED_UNEXPECTEDLY(hr)) + { + DestroyWindow(); + return hr; + } + SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml); + + // Enumerate objects + CComPtr<IEnumIDList> pEndl; + LPITEMIDLIST pidl; + STRRET stret; + hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl); + if (FAILED_UNEXPECTEDLY(hr)) + { + DestroyWindow(); + return hr; + } + + for (int i=0; pEndl->Next(1, &pidl, NULL) != S_FALSE; i++) + { + WCHAR sz[MAX_PATH]; + int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); + hr = m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); + if (FAILED_UNEXPECTEDLY(hr)) + { + strcpyW(sz, L"<Unknown-Name>"); + } + else + StrRetToBuf(&stret, pidl, sz, _countof(sz)); + + TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; + SendMessage(m_hWnd, TB_INSERTBUTTONW, i, (LPARAM)&tb); + } + + // Resize the toolbar, and then show it. + SendMessage(m_hWnd, TB_AUTOSIZE, 0, 0); + + return hr; +} + +/*****************************************************************************/ + +// *** IObjectWithSite *** + STDMETHODIMP CISFBand::SetSite(IUnknown *pUnkSite) + { + HRESULT hr; + HWND hwndParent; + + TRACE("CISFBand::SetSite(0x%p)\n", pUnkSite); + + hr = IUnknown_GetWindow(pUnkSite, &hwndParent); + if (FAILED(hr)) + { + TRACE("Querying site window failed: 0x%x\n", hr); + return hr; + } + m_Site = pUnkSite; + + hr = CreateSimpleToolbar(hwndParent); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; + } + + STDMETHODIMP CISFBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) + { + TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + HRESULT hr; + if (m_Site != NULL) + { + hr = m_Site->QueryInterface(riid, ppvSite); + if (FAILED(hr)) return hr; + } + + *ppvSite = NULL; + return E_FAIL; + } + +/*****************************************************************************/ +// *** IDeskBand *** + STDMETHODIMP CISFBand::GetWindow(OUT HWND *phwnd) + { + if (!m_hWnd) + return E_FAIL; + if (!phwnd) + return E_POINTER; + *phwnd = m_hWnd; + + return S_OK; + } + + STDMETHODIMP CISFBand::ContextSensitiveHelp(IN BOOL fEnterMode) + { + /* FIXME: Implement */ + return E_NOTIMPL; + } + + STDMETHODIMP CISFBand::ShowDW(IN BOOL bShow) + { + if (m_hWnd) + { + ShowWindow(bShow ? SW_SHOW : SW_HIDE); + return S_OK; + } + + return E_FAIL; + } + + STDMETHODIMP CISFBand::CloseDW(IN DWORD dwReserved) + { + if (m_hWnd) + { + ShowWindow(SW_HIDE); + + TBBUTTON tb; + for (int i = 0; SendMessage(m_hWnd, TB_GETBUTTON, i, (LPARAM)&tb); i++) + { + CoTaskMemFree((LPITEMIDLIST)tb.dwData); + } + + DestroyWindow(); + m_hWnd = NULL; + return S_OK; + } + + return E_FAIL; + } + + STDMETHODIMP CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) + { + /* No need to implement this method */ + + return E_NOTIMPL; + } + + STDMETHODIMP CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) + { + TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); + + if (m_hWnd && pdbi) + { + m_BandID = dwBandID; + + RECT actualRect; + POINTL actualSize; + POINTL idealSize; + POINTL maxSize; + POINTL itemSize; + + GetWindowRect(&actualRect); + actualSize.x = actualRect.right - actualRect.left; + actualSize.y = actualRect.bottom - actualRect.top; + + // Obtain the ideal size, to be used as min and max + SendMessageW(m_hWnd, TB_AUTOSIZE, 0, 0); + SendMessageW(m_hWnd, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&maxSize)); + + idealSize = maxSize; + SendMessageW(m_hWnd, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&idealSize)); + + // Obtain the button size, to be used as the integral size + DWORD size = SendMessageW(m_hWnd, TB_GETBUTTONSIZE, 0, 0); + itemSize.x = GET_X_LPARAM(size); + itemSize.y = GET_Y_LPARAM(size); + + if (pdbi->dwMask & DBIM_MINSIZE) + { + pdbi->ptMinSize.x = -1; + pdbi->ptMinSize.y = idealSize.y; + } + if (pdbi->dwMask & DBIM_MAXSIZE) + { + pdbi->ptMaxSize = maxSize; + } + if (pdbi->dwMask & DBIM_INTEGRAL) + { + pdbi->ptIntegral = itemSize; + } + if (pdbi->dwMask & DBIM_ACTUAL) + { + pdbi->ptActual = actualSize; + } + if (pdbi->dwMask & DBIM_TITLE) + wcscpy(pdbi->wszTitle, L"Quick Launch"); + if (pdbi->dwMask & DBIM_MODEFLAGS) + { + pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT | DBIMF_USECHEVRON | DBIMF_NOMARGINS | DBIMF_BKCOLOR | DBIMF_ADDTOFRONT; + } + if (pdbi->dwMask & DBIM_BKCOLOR) + pdbi->dwMask &= ~DBIM_BKCOLOR; + + return S_OK; + } + + return E_FAIL; + } + +/*****************************************************************************/ +// *** IPersistStream *** + STDMETHODIMP CISFBand::GetClassID(OUT CLSID *pClassID) + { + TRACE("CISFBand::GetClassID(0x%p)\n", pClassID); + /* We're going to return the (internal!) CLSID of the quick launch band */ + *pClassID = CLSID_QuickLaunchBand; + + return S_OK; + } + + STDMETHODIMP CISFBand::IsDirty() + { + /* The object hasn't changed since the last save! */ + + return S_FALSE; + } + + STDMETHODIMP CISFBand::Load(IN IStream *pStm) + { + TRACE("CISFBand::Load called\n"); + /* Nothing to do */ + + return S_OK; + } + + STDMETHODIMP CISFBand::Save(IN IStream *pStm, IN BOOL fClearDirty) + { + /* Nothing to do */ + + return S_OK; + } + + STDMETHODIMP CISFBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) + { + TRACE("CISFBand::GetSizeMax called\n"); + + return S_OK; + } + +/*****************************************************************************/ +// *** IWinEventHandler *** + STDMETHODIMP CISFBand::ContainsWindow(IN HWND hWnd) + { + if (hWnd == m_hWnd || IsChild(hWnd)) + { + TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); + return S_OK; + } + + return S_FALSE; + } + + STDMETHODIMP CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) + { + switch (uMsg) + { + case WM_COMMAND: + { + TBBUTTON tb; + bool chk = SendMessage(m_hWnd, TB_GETBUTTON, LOWORD(wParam), (LPARAM)&tb); + if (chk) + SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData); + + *theResult = TRUE; + break; + } + case WM_NOTIFY: + { + switch (((LPNMHDR)lParam)->code) + { + case NM_RCLICK: + { + HRESULT hr; + POINT pt = ((LPNMMOUSE)lParam)->pt; + CComPtr<IContextMenu> picm; + HMENU fmenu = CreatePopupMenu(); + TBBUTTON tb; + + bool chk = SendMessage(m_hWnd, TB_GETBUTTON, ((LPNMMOUSE)lParam)->dwItemSpec, (LPARAM)&tb); + LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; + + if (chk) + { + ClientToScreen(&pt); + hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWnd, 0); + if (id > 0) + { + CMINVOKECOMMANDINFOEX info = { 0 }; + info.cbSize = sizeof(info); + info.fMask = CMIC_MASK_PTINVOKE; + if (GetKeyState(VK_CONTROL) < 0) + { + info.fMask |= CMIC_MASK_CONTROL_DOWN; + } + if (GetKeyState(VK_SHIFT) < 0) + { + info.fMask |= CMIC_MASK_SHIFT_DOWN; + } + info.hwnd = m_hWnd; + info.lpVerb = MAKEINTRESOURCEA(id - 1); + info.nShow = SW_SHOWNORMAL; + info.ptInvoke = pt; + picm->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); + } + } + DestroyMenu(fmenu); + + *theResult = TRUE; + break; + } + default: + *theResult = FALSE; + } + + break; + } + default: + *theResult = FALSE; + } + + return S_OK; + } + + STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd) + { + return (hWnd == m_hWnd) ? S_OK : S_FALSE; + } + +/*****************************************************************************/ +// *** IOleCommandTarget methods *** + STDMETHODIMP CISFBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) + { + UNIMPLEMENTED; + + return E_NOTIMPL; + } + + STDMETHODIMP CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) + { + if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) + { + return S_OK; + } + + if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) + { + return S_OK; + } + + UNIMPLEMENTED; + + return E_NOTIMPL; + } + +/*****************************************************************************/ +// *** IShellFolderBand *** + STDMETHODIMP CISFBand::GetBandInfoSFB(PBANDINFOSFB pbi) + { + return E_NOTIMPL; + } + + STDMETHODIMP CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl) + { + if (_ILIsDesktop(pidl)) + { + m_pISF = psf; + m_pidl = ILClone(pidl); + } + else + { + psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &m_pISF)); + m_pidl = ILClone(pidl); + } + + return S_OK; + } + + STDMETHODIMP CISFBand::SetBandInfoSFB( PBANDINFOSFB pbi) + { + return E_NOTIMPL; + } + +/*****************************************************************************/ +// *** IContextMenu *** + STDMETHODIMP CISFBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + /*HRESULT hr = E_INVALIDARG; + + if (idCmd == IDM_DISPLAY) + { + switch (uFlags) + { + case GCS_HELPTEXTW: + // Only useful for pre-Vista versions of Windows that + // have a Status bar. + hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), + cchMax, + L"Display File Name"); + break; + + case GCS_VERBW: + // GCS_VERBW is an optional feature that enables a caller + // to discover the canonical name for the verb that is passed in + // through idCommand. + hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), + cchMax, + L"DisplayFileName"); + break; + } + } + return hr; */ + + return S_OK; + } + + STDMETHODIMP CISFBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) + { + if (!HIWORD(pici->lpVerb)) + { + switch (LOWORD(pici->lpVerb)) + { + case IDM_LARGE_ICONS: + { + m_iconFlag = false; + + HIMAGELIST* piml = (HIMAGELIST*) SendMessage(m_hWnd, TB_GETIMAGELIST, 0, 0); + HRESULT hr = SHGetImageList(SHIL_LARGE, IID_IImageList, (void**)&piml); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml); + hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + break; + } + case IDM_SMALL_ICONS: + { + m_iconFlag = true; + + HIMAGELIST* piml = (HIMAGELIST*)SendMessage(m_hWnd, TB_GETIMAGELIST, 0, 0); + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml); + hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + break; + } + case IDM_SHOW_TEXT: + { + if (m_textFlag) + { + m_textFlag = false; + SendMessage(m_hWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + } + else + { + m_textFlag = true; + SendMessage(m_hWnd, TB_SETEXTENDEDSTYLE, 0, 0); + HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + } + break; + } + default: + return E_FAIL; + } + } + + return S_OK; + } + + STDMETHODIMP CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_POPUPMENU)); + if(m_textFlag) + CheckMenuItem(qMenu, IDM_SHOW_TEXT, MF_CHECKED); + else + CheckMenuItem(qMenu, IDM_SHOW_TEXT, MF_UNCHECKED); + + if (m_iconFlag) + { + CheckMenuItem(qMenu, IDM_SMALL_ICONS, MF_CHECKED); + CheckMenuItem(qMenu, IDM_LARGE_ICONS, MF_UNCHECKED); + } + else + { + CheckMenuItem(qMenu, IDM_LARGE_ICONS, MF_CHECKED); + CheckMenuItem(qMenu, IDM_SMALL_ICONS, MF_UNCHECKED); + } + + UINT idMax = Shell_MergeMenus(hmenu, GetSubMenu(qMenu, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + DestroyMenu(qMenu); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(idMax - idCmdFirst +1)); + } + +/*****************************************************************************/ +// C Constructor + extern "C" + HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv) + { + return ShellObjectCreator<CISFBand>(riid, ppv); + } + diff --git a/dll/shellext/qcklnch/CISFBand.h b/dll/shellext/qcklnch/CISFBand.h new file mode 100644 index 0000000000..fc74db0b7c --- /dev/null +++ b/dll/shellext/qcklnch/CISFBand.h @@ -0,0 +1,196 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CISFBand.h + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ +#pragma once + +// COM class for cisfband +class CISFBand : + public CWindow, + public CComCoClass<CISFBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IObjectWithSite, + public IDeskBand, + public IPersistStream, + public IWinEventHandler, + public IOleCommandTarget, + public IShellFolderBand, + public IContextMenu +{ + // Band + DWORD m_BandID; + CComPtr<IUnknown> m_Site; + + // Toolbar + CComPtr<IShellFolder> m_pISF; + PCIDLIST_ABSOLUTE m_pidl; + + // Menu + BOOL m_textFlag; + BOOL m_iconFlag; + +public: + + CISFBand(); + virtual ~CISFBand(); + +// Personal Methods + HRESULT CreateSimpleToolbar(HWND hWndParent); + +// IObjectWithSite + + virtual STDMETHODIMP GetSite( + IN REFIID riid, + OUT void **ppvSite + ); + + virtual STDMETHODIMP SetSite( + IN IUnknown *pUnkSite + ); + +// IDeskBand + + virtual STDMETHODIMP GetWindow( + OUT HWND *phwnd + ); + + virtual STDMETHODIMP ContextSensitiveHelp( + IN BOOL fEnterMode + ); + + virtual STDMETHODIMP ShowDW( + IN BOOL bShow + ); + + virtual STDMETHODIMP CloseDW( + IN DWORD dwReserved + ); + + virtual STDMETHODIMP ResizeBorderDW( + LPCRECT prcBorder, + IUnknown *punkToolbarSite, + BOOL fReserved + ); + + virtual STDMETHODIMP GetBandInfo( + IN DWORD dwBandID, + IN DWORD dwViewMode, + IN OUT DESKBANDINFO *pdbi + ); + +// IPersistStream + + virtual STDMETHODIMP GetClassID( + OUT CLSID *pClassID + ); + + virtual STDMETHODIMP GetSizeMax( + OUT ULARGE_INTEGER *pcbSize + ); + + virtual STDMETHODIMP IsDirty(); + + virtual STDMETHODIMP Load( + IN IStream *pStm + ); + + virtual STDMETHODIMP Save( + IN IStream *pStm, + IN BOOL fClearDirty + ); + +// IWinEventHandler + + virtual STDMETHODIMP ContainsWindow( + IN HWND hWnd + ); + + virtual STDMETHODIMP OnWinEvent( + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *theResult + ); + + virtual STDMETHODIMP IsWindowOwner( + HWND hWnd + ); + +// IOleCommandTarget + + virtual STDMETHODIMP Exec( + IN const GUID *pguidCmdGroup, + IN DWORD nCmdID, + IN DWORD nCmdexecopt, + IN VARIANT *pvaIn, + IN OUT VARIANT *pvaOut + ); + + virtual STDMETHODIMP QueryStatus( + IN const GUID *pguidCmdGroup, + IN ULONG cCmds, + IN OUT OLECMD prgCmds[], + IN OUT OLECMDTEXT *pCmdText + ); + +// IShellFolderBand + virtual STDMETHODIMP GetBandInfoSFB( + PBANDINFOSFB pbi + ); + + virtual STDMETHODIMP InitializeSFB( + IShellFolder *psf, + PCIDLIST_ABSOLUTE pidl + ); + + virtual STDMETHODIMP SetBandInfoSFB( + PBANDINFOSFB pbi + ); + +// IContextMenu + virtual STDMETHODIMP GetCommandString( + UINT_PTR idCmd, + UINT uFlags, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax + ); + + virtual STDMETHODIMP InvokeCommand( + LPCMINVOKECOMMANDINFO pici + ); + + virtual STDMETHODIMP QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags + ); + +//***************************************************************************************************** + + DECLARE_NOT_AGGREGATABLE(CISFBand) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CISFBand) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderBand, IShellFolderBand) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + END_COM_MAP() +}; + +// C Constructor +extern "C" +HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv); \ No newline at end of file diff --git a/dll/shellext/qcklnch/CMakeLists.txt b/dll/shellext/qcklnch/CMakeLists.txt new file mode 100644 index 0000000000..bcc921891d --- /dev/null +++ b/dll/shellext/qcklnch/CMakeLists.txt @@ -0,0 +1,43 @@ + +project(SHELL) + +set_cpp(WITH_RUNTIME) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${REACTOS_SOURCE_DIR}) + +spec2def(qcklnch.dll qcklnch.spec) + +add_library(qcklnch SHARED + qcklnch.rc + qcklnch.cpp + CQuickLaunchBand.cpp + CISFBand.cpp + CQuickLaunchBand.h + CISFBand.h + ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) + +set_module_type(qcklnch win32dll UNICODE) +target_link_libraries(qcklnch uuid wine atlnew) + +add_importlibs(qcklnch + advapi32 + winmm + ole32 + oleaut32 + shlwapi + shell32 + comctl32 + msvcrt + gdi32 + user32 + kernel32 + ntdll) + +add_cd_file(TARGET qcklnch DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/qcklnch/CQuickLaunchBand.cpp b/dll/shellext/qcklnch/CQuickLaunchBand.cpp new file mode 100644 index 0000000000..d250a3c5ca --- /dev/null +++ b/dll/shellext/qcklnch/CQuickLaunchBand.cpp @@ -0,0 +1,361 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CQuickLaunchBand.cpp + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +// {260CB95D-4544-44F6-A079-575BAA60B72F} +static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; + +// Componenet Category Registration + HRESULT RegisterComCat() + { + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) + { + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + } + return hr; + } + + HRESULT UnregisterComCat() + { + CComPtr<ICatRegister> pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); + if (SUCCEEDED(hr)) + { + CATID catid = CATID_DeskBand; + hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + } + return hr; + } + +// Pidl Browser +/*++ +* @name PidlBrowse +* +* Opens a folder browser dialog, +* allowing the user to select a folder for enumeration. +* +* @param hwnd +* A handle to browser dialog window. +* @param nCSIDL +* A CSIDL representing the root from which the browse folder dialog shows the files and folders. +* +* @return The PIDL to selected folder. +* +*--*/ + LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) + { + CComHeapPtr<ITEMIDLIST> pidlRoot; + + WCHAR path[MAX_PATH]; + + if (nCSIDL) + { + SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); + } + + CString biTitle((LPCSTR)IDS_BROWSEINFO_TITLE); + BROWSEINFO bi = { hwnd, pidlRoot, path, biTitle, 0, NULL, 0, 0 }; + LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); + + return pidlSelected; + } + +// CQuickLaunchBand + + CQuickLaunchBand::CQuickLaunchBand() {} + + CQuickLaunchBand::~CQuickLaunchBand() {} + +/*****************************************************************************/ +// ATL Construct +/*++ +* @name FinalConstruct +* +* Creates an instance of CISFBand, and initializes its Shell Folder Band for enumeration. +* +* @return The error code. +* +*--*/ + HRESULT CQuickLaunchBand::FinalConstruct() + { + HRESULT hr = CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolderBand> pISFB; + hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellFolder> pISF; + hr = SHGetDesktopFolder(&pISF); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); + if (pidl == NULL) + return E_FAIL; + pISFB->InitializeSFB(pISF, pidl); + + return hr; + } + +// IObjectWithSite + STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) + { + TRACE("CQuickLaunchBand::SetSite(0x%p)\n", pUnkSite); + + // Internal CISFBand Calls + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; + + return pIOWS->SetSite(pUnkSite); + } + + STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) + { + TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + // Internal CISFBand Calls + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr; + + return pIOWS->GetSite(riid, ppvSite); + } + +/*****************************************************************************/ +// IDeskBand + STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) + { + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->GetWindow(phwnd); + } + + STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) + { + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->ContextSensitiveHelp(fEnterMode); + } + + STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) + { + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->ShowDW(bShow); + } + + STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) + { + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->CloseDW(dwReserved); + } + + STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) + { + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); + } + + STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) + { + TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p)\n", dwBandID, dwViewMode, pdbi); + + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr; + + return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); + } + +/*****************************************************************************/ +// IPersistStream + STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) + { + TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID); + + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + + return pIPS->GetClassID(pClassID); + } + + STDMETHODIMP CQuickLaunchBand::IsDirty() + { + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + + return pIPS->IsDirty(); + } + + STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) + { + TRACE("CQuickLaunchBand::Load called\n"); + + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + + return pIPS->Load(pStm); + } + + STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) + { + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + + return pIPS->Save(pStm, fClearDirty); + } + + STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) + { + TRACE("CQuickLaunchBand::GetSizeMax called\n"); + + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr; + + return pIPS->GetSizeMax(pcbSize); + } + + +/*****************************************************************************/ +// IWinEventHandler + STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) + { + return E_NOTIMPL; + } + + STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) + { + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; + + return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + } + + STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) + { + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; + + return pWEH->IsWindowOwner(hWnd); + } + +/*****************************************************************************/ +// *** IOleCommandTarget methods *** + STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) + { + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; + + return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + } + + STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) + { + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr; + + return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + } + +/*****************************************************************************/ +// *** IContextMenu *** + STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); + } + + STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) + { + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->InvokeCommand(pici); + } + + STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + } \ No newline at end of file diff --git a/dll/shellext/qcklnch/CQuickLaunchBand.h b/dll/shellext/qcklnch/CQuickLaunchBand.h new file mode 100644 index 0000000000..c8a71dc9f4 --- /dev/null +++ b/dll/shellext/qcklnch/CQuickLaunchBand.h @@ -0,0 +1,174 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CQuickLaunchBand.h + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ +#pragma once + +extern const GUID CLSID_QuickLaunchBand; + +// Component category registration +HRESULT RegisterComCat(); +HRESULT UnregisterComCat(); + +// COM class for quick launch +class CQuickLaunchBand : + public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IObjectWithSite, + public IDeskBand, + public IPersistStream, + public IWinEventHandler, + public IOleCommandTarget, + public IContextMenu +{ + HWND m_hWndBro; + CComPtr<IUnknown> m_punkISFB; + + public: + + CQuickLaunchBand(); + virtual ~CQuickLaunchBand(); + +// ATL construct + + HRESULT FinalConstruct(); + +// IObjectWithSite + + virtual STDMETHODIMP GetSite( + IN REFIID riid, + OUT void **ppvSite + ); + + virtual STDMETHODIMP SetSite( + IN IUnknown *pUnkSite + ); + +// IDeskBand + + virtual STDMETHODIMP GetWindow( + OUT HWND *phwnd + ); + + virtual STDMETHODIMP ContextSensitiveHelp( + IN BOOL fEnterMode + ); + + virtual STDMETHODIMP ShowDW( + IN BOOL bShow + ); + + virtual STDMETHODIMP CloseDW( + IN DWORD dwReserved + ); + + virtual STDMETHODIMP ResizeBorderDW( + LPCRECT prcBorder, + IUnknown *punkToolbarSite, + BOOL fReserved + ); + + virtual STDMETHODIMP GetBandInfo( + IN DWORD dwBandID, + IN DWORD dwViewMode, + IN OUT DESKBANDINFO *pdbi + ); + +// IPersistStream + + virtual STDMETHODIMP GetClassID( + OUT CLSID *pClassID + ); + + virtual STDMETHODIMP GetSizeMax( + OUT ULARGE_INTEGER *pcbSize + ); + + virtual STDMETHODIMP IsDirty(); + + virtual STDMETHODIMP Load( + IN IStream *pStm + ); + + virtual STDMETHODIMP Save( + IN IStream *pStm, + IN BOOL fClearDirty + ); + +// IWinEventHandler + + virtual STDMETHODIMP ContainsWindow( + IN HWND hWnd + ); + + virtual STDMETHODIMP OnWinEvent( + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *theResult + ); + + virtual STDMETHODIMP IsWindowOwner( + HWND hWnd + ); + +// IOleCommandTarget + + virtual STDMETHODIMP Exec( + IN const GUID *pguidCmdGroup, + IN DWORD nCmdID, + IN DWORD nCmdexecopt, + IN VARIANT *pvaIn, + IN OUT VARIANT *pvaOut + ); + + virtual STDMETHODIMP QueryStatus( + IN const GUID *pguidCmdGroup, + IN ULONG cCmds, + IN OUT OLECMD prgCmds[], + IN OUT OLECMDTEXT *pCmdText + ); + +// IContextMenu + virtual STDMETHODIMP GetCommandString( + UINT_PTR idCmd, + UINT uFlags, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax + ); + + virtual STDMETHODIMP InvokeCommand( + LPCMINVOKECOMMANDINFO pici + ); + + virtual STDMETHODIMP QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags + ); + +//***************************************************************************************************** + + DECLARE_REGISTRY_RESOURCEID(IDR_QCKLNCH) + DECLARE_NOT_AGGREGATABLE(CQuickLaunchBand) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CQuickLaunchBand) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY2_IID(IID_IDockingWindow, IDockingWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + END_COM_MAP() +}; \ No newline at end of file diff --git a/dll/shellext/qcklnch/lang/en-US.rc b/dll/shellext/qcklnch/lang/en-US.rc new file mode 100644 index 0000000000..81c08eb5d0 --- /dev/null +++ b/dll/shellext/qcklnch/lang/en-US.rc @@ -0,0 +1,19 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDM_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END + +STRINGTABLE +BEGIN + IDS_BROWSEINFO_TITLE "Choose a folder" +END diff --git a/dll/shellext/qcklnch/precomp.h b/dll/shellext/qcklnch/precomp.h new file mode 100644 index 0000000000..12b27a9c15 --- /dev/null +++ b/dll/shellext/qcklnch/precomp.h @@ -0,0 +1,41 @@ +#pragma once + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <tchar.h> + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> +#include <ddeml.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <shlguid.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi_undoc.h> +#include <tchar.h> +#include <strsafe.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <atlstr.h> +#include <undocshell.h> +#include <shellutils.h> + +#include <shellapi.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "resource.h" +#include "CQuickLaunchBand.h" +#include "CISFBand.h" \ No newline at end of file diff --git a/dll/shellext/qcklnch/qcklnch.cpp b/dll/shellext/qcklnch/qcklnch.cpp new file mode 100644 index 0000000000..79a5a45542 --- /dev/null +++ b/dll/shellext/qcklnch/qcklnch.cpp @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/qcklnch.cpp + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ + +#include "precomp.h" + +#include <atlwin.h> + +WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) +END_OBJECT_MAP() + +HINSTANCE g_hInstance; +CComModule g_Module; + +STDAPI_(BOOL) +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + if (fdwReason == DLL_PROCESS_ATTACH) + { + g_hInstance = hinstDLL; + DisableThreadLibraryCalls(g_hInstance); + + g_Module.Init(ObjectMap, g_hInstance, NULL); + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + g_hInstance = NULL; + g_Module.Term(); + } + return TRUE; +} + +STDAPI +DllRegisterServer(void) +{ + HRESULT hr = g_Module.DllRegisterServer(FALSE); + if (FAILED(hr)) + return hr; + + return RegisterComCat(); +} + +STDAPI +DllUnregisterServer(void) +{ + HRESULT hr = UnregisterComCat(); + if (FAILED(hr)) + return hr; + + return g_Module.DllUnregisterServer(FALSE); +} + +STDAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return g_Module.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI +DllCanUnloadNow(void) +{ + return g_Module.DllCanUnloadNow(); +} diff --git a/dll/shellext/qcklnch/qcklnch.rc b/dll/shellext/qcklnch/qcklnch.rc new file mode 100644 index 0000000000..f44528e0af --- /dev/null +++ b/dll/shellext/qcklnch/qcklnch.rc @@ -0,0 +1,15 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDR_QCKLNCH REGISTRY "rgs/qcklnch.rgs" + +#include <reactos/manifest_dll.rc> + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif + diff --git a/dll/shellext/qcklnch/qcklnch.spec b/dll/shellext/qcklnch/qcklnch.spec new file mode 100644 index 0000000000..069be11627 --- /dev/null +++ b/dll/shellext/qcklnch/qcklnch.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() \ No newline at end of file diff --git a/dll/shellext/qcklnch/resource.h b/dll/shellext/qcklnch/resource.h new file mode 100644 index 0000000000..b5613db3c2 --- /dev/null +++ b/dll/shellext/qcklnch/resource.h @@ -0,0 +1,11 @@ +#pragma once + +#define IDR_QCKLNCH 1001 + +#define IDM_POPUPMENU 2001 +#define IDM_LARGE_ICONS 1 +#define IDM_SMALL_ICONS 2 +#define IDM_SHOW_TEXT 3 +#define IDM_VIEW_MENU 4 + +#define IDS_BROWSEINFO_TITLE 101 diff --git a/dll/shellext/qcklnch/rgs/qcklnch.rgs b/dll/shellext/qcklnch/rgs/qcklnch.rgs new file mode 100644 index 0000000000..3df55ca1d3 --- /dev/null +++ b/dll/shellext/qcklnch/rgs/qcklnch.rgs @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'Quick Launch' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} \ No newline at end of file

1 0

[reactos] 01/03: [PSDK] Add CLSID_ISFBand, IShellFolderBand and IFolderBandPriv
by Giannis Adamopoulos 16 Oct '17

16 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d114f48fd4045291d49c6… commit d114f48fd4045291d49c65521fb7459ba4d416b2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 16 16:35:11 2017 +0300 [PSDK] Add CLSID_ISFBand, IShellFolderBand and IFolderBandPriv --- sdk/include/psdk/shlguid.h | 4 ++++ sdk/include/psdk/shlobj.h | 33 +++++++++++++++++++++++++++++++++ sdk/include/psdk/shobjidl.idl | 17 +++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/sdk/include/psdk/shlguid.h b/sdk/include/psdk/shlguid.h index fa9b433373..3518f3c0e9 100644 --- a/sdk/include/psdk/shlguid.h +++ b/sdk/include/psdk/shlguid.h @@ -263,4 +263,8 @@ DEFINE_GUID(BHID_ThumbnailHandler, 0x7B2E650A, 0x8E20, 0x4F4A, 0xB0,0x9E, 0x65,0 DEFINE_GUID(BHID_AssociationArray, 0xBEA9EF17, 0x82F1, 0x4F60, 0x92,0x84, 0x4F,0x8D,0xB7,0x5C,0x3B,0xE9); DEFINE_GUID(BHID_EnumAssocHandlers,0xB8AB0B9C, 0xC2EC, 0x4F7A, 0x91,0x8D, 0x31,0x49,0x00,0xE6,0x28,0x0A); +DEFINE_GUID(CLSID_ISFBand, 0xD82BE2B0, 0x5764, 0x11D0, 0xA9, 0x6E, 0x00, 0xC0, 0x4F, 0xD7, 0x05, 0xA2); +DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); + #endif /* __WINE_SHLGUID_H */ diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 853e30cd06..fe01c6a1c7 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2386,6 +2386,39 @@ DECLARE_INTERFACE_(IDockingWindowSite, IOleWindow) typedef void (CALLBACK *PFNASYNCICONTASKBALLBACK)(LPCITEMIDLIST pidl, LPVOID pvData, LPVOID pvHint, INT iIconIndex, INT iOpenIconIndex); +#include <pshpack8.h> + +typedef struct { + DWORD dwMask; + DWORD dwStateMask; + DWORD dwState; + COLORREF crBkgnd; + COLORREF crBtnLt; + COLORREF crBtnDk; + WORD wViewMode; + WORD wAlign; + IShellFolder * psf; + PIDLIST_ABSOLUTE pidl; +} BANDINFOSFB, *PBANDINFOSFB; + +#include <poppack.h> + +#undef INTERFACE +#define INTERFACE IShellFolderBand + +DECLARE_INTERFACE_(IShellFolderBand, IUnknown) +{ + // *** IUnknown methods *** + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + // *** IShellFolderBand Methods *** + STDMETHOD(InitializeSFB)(THIS_ IShellFolder *psf, PCIDLIST_ABSOLUTE pidl) PURE; + STDMETHOD(SetBandInfoSFB)(THIS_ PBANDINFOSFB pbi) PURE; + STDMETHOD(GetBandInfoSFB)(THIS_ PBANDINFOSFB pbi) PURE; +}; + /***************************************************************************** * Control Panel functions */ diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index 5590163068..efcf9a362b 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -4458,3 +4458,20 @@ interface IShellTaskScheduler : IUnknown [in] DWORD dwReleaseStatus, [in] DWORD dwThreadTimeout); } + + +[ + uuid(47c01f95-e185-412c-b5c5-4f27df965aea), + object, + pointer_default(unique) +] +interface IFolderBandPriv : IUnknown +{ + HRESULT SetCascade([in] BOOL fCascade); + + HRESULT SetAccelerators([in] BOOL fAccelerators); + + HRESULT SetNoIcons([in] BOOL fNoIcons); + + HRESULT SetNoText([in] BOOL fNoText); +}

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017