Skip to content

Code Quality: Introduced ComPtr.As() to QI easily #16382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 4, 2024
Merged

Code Quality: Introduced ComPtr.As() to QI easily #16382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f0044e
Use null for null checks
0x5bfa Oct 24, 2024
ee155d8
Introduce ComPtr.As<U>()
0x5bfa Oct 24, 2024
9276088
Fix pointer referencing
0x5bfa Oct 24, 2024
8db1429
Fix for _ptr
0x5bfa Oct 24, 2024
7ff121c
Update Windows.Win32.ComPtr.cs
0x5bfa Oct 24, 2024
04395fb
Init
0x5bfa Oct 24, 2024
2a13d49
Merge remote-tracking branch 'refs/remotes/origin/5bfa/CQ-ComPtrAs' i…
0x5bfa Oct 24, 2024
1e8ba93
Update Windows.Win32.ComPtr.cs
0x5bfa Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Files.App.CsWin32/Windows.Win32.ComHeapPtr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public unsafe struct ComHeapPtr<T> : IDisposable where T : unmanaged
private T* _ptr;

public bool IsNull
=> _ptr == default;
=> _ptr == null;

public ComHeapPtr(T* ptr)
{
Expand Down
10 changes: 9 additions & 1 deletion src/Files.App.CsWin32/Windows.Win32.ComPtr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public unsafe struct ComPtr<T> : IDisposable where T : unmanaged
private T* _ptr;

public bool IsNull
=> _ptr == default;
=> _ptr == null;

public ComPtr(T* ptr)
{
Expand All @@ -38,6 +38,14 @@ public ComPtr(T* ptr)
return (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public readonly ComPtr<U> As<U>(Guid riid) where U : unmanaged
{
ComPtr<U> pNewPtr = default;
((IUnknown*)_ptr)->QueryInterface(&riid, (void**)pNewPtr.GetAddressOf());
return pNewPtr;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Dispose()
{
Expand Down
Loading