-
Notifications
You must be signed in to change notification settings - Fork 1.8k
C++: Add ComPtr
MaD models
#20301
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.
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
C++: Add ComPtr
MaD models
#20301
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6f64129
C++: Add ComPtr tests.
MathiasVP 246ed9d
C++: Add a model for ComPtr.
MathiasVP 9e9f6dd
C++: Accept test changes.
MathiasVP 96b6986
C++: Fix duplicated entries.
MathiasVP 7c05622
C++: Add missing type and accept test changes.
MathiasVP 8c07a3e
C++: Add testcase with missing model.
MathiasVP bebfe03
C++: Add missing model and accept test changes.
MathiasVP File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
extensions: | ||
- addsTo: | ||
pack: codeql/cpp-all | ||
extensible: summaryModel | ||
data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance | ||
- ["Microsoft::WRL", "ComPtr", True, "ComPtr<T>", "(T *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(const ComPtr &)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(ComPtr &&)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "As", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "As", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "AsIID", "", "", "Argument[-1]", "Argument[*1]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"] | ||
MathiasVP marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- ["Microsoft::WRL", "ComPtr", True, "Attach", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr<T>", True, "CopyTo", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "CopyTo", "(REFIID,void **)", "", "Argument[-1].Element[@]", "Argument[**@1]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"] | ||
MathiasVP marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- ["Microsoft::WRL", "ComPtr", True, "Get", "", "", "Argument[-1].Element[@]", "ReturnValue[*]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "GetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "ReleaseAndGetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"] | ||
- ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1241,4 +1241,134 @@ namespace ATL { | |
sink(static_cast<CStrBufT<char>::PCXSTR>(b)); // $ ir | ||
sink(static_cast<CStrBufT<char>::PXSTR>(b)); // $ ir | ||
} | ||
} | ||
|
||
namespace Microsoft { | ||
namespace WRL { | ||
template <typename T> | ||
class ComPtr; | ||
|
||
struct GUID; | ||
|
||
typedef GUID IID; | ||
|
||
typedef IID *REFIID; | ||
|
||
class IUnknown; | ||
|
||
class WeakRef; | ||
|
||
template <typename T> | ||
class ComPtr | ||
{ | ||
public: | ||
using InterfaceType = T; | ||
|
||
ComPtr(); | ||
ComPtr(const ComPtr &); | ||
ComPtr(&&other); | ||
MathiasVP marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
template <typename U> | ||
ComPtr(U *); | ||
|
||
~ComPtr(); | ||
|
||
template <typename U> | ||
HRESULT As(ComPtr<U> *p) const; | ||
|
||
HRESULT AsWeak(WeakRef *); | ||
|
||
void Attach(InterfaceType *); | ||
|
||
HRESULT CopyTo(InterfaceType **); | ||
|
||
HRESULT CopyTo(REFIID, void **) const; | ||
|
||
template <typename U> | ||
HRESULT CopyTo(U **) const; | ||
|
||
T *Detach(); | ||
|
||
T *Get() const; | ||
|
||
T *const *GetAddressOf() const; | ||
T **GetAddressOf(); | ||
|
||
T **ReleaseAndGetAddressOf(); | ||
|
||
unsigned long Reset(); | ||
|
||
void Swap(ComPtr &&r); | ||
|
||
void Swap(ComPtr &r); | ||
}; | ||
|
||
} | ||
} | ||
|
||
namespace std { | ||
template<class T> T&& move(T& t) noexcept; // simplified signature | ||
} | ||
|
||
void test_constructor() | ||
{ | ||
Microsoft::WRL::ComPtr<int> p0; | ||
sink(*p0.Get()); // clean | ||
|
||
int x = source<int>(); | ||
Microsoft::WRL::ComPtr<int> p1(new int(x)); | ||
sink(*p1.Get()); // $ ir MISSING: ast | ||
sink(*p1.Detach()); // $ ir MISSING: ast | ||
|
||
Microsoft::WRL::ComPtr<int> p2(p1); | ||
sink(*p2.Get()); // $ ir MISSING: ast | ||
|
||
Microsoft::WRL::ComPtr<int> p3(std::move(p1)); | ||
sink(*p3.Get()); // $ ir MISSING: ast | ||
} | ||
|
||
void test_As() | ||
{ | ||
int x = source<int>(); | ||
Microsoft::WRL::ComPtr<int> p1(new int(x)); | ||
Microsoft::WRL::ComPtr<int> p2; | ||
p1.As(&p2); | ||
sink(*p2.Get()); // $ ir MISSING: ast | ||
} | ||
|
||
void test_CopyTo() | ||
{ | ||
int x = source<int>(); | ||
Microsoft::WRL::ComPtr<int> p1(new int(x)); | ||
int *raw = nullptr; | ||
p1.CopyTo(&raw); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is using the template version right? I seem to be missing a test for the non-template, 1 argument version? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
sink(*raw); // $ ir MISSING: ast | ||
|
||
Microsoft::WRL::ComPtr<int> p2; | ||
p1.CopyTo(nullptr, (void**)&raw); | ||
sink(*raw); // $ ir MISSING: ast | ||
} | ||
|
||
void test_Swap() | ||
{ | ||
int x = source<int>(); | ||
Microsoft::WRL::ComPtr<int> p1(new int(x)); | ||
Microsoft::WRL::ComPtr<int> p2; | ||
p1.Swap(p2); | ||
sink(*p2.Get()); // $ ir MISSING: ast | ||
sink(*p1.Get()); // $ SPURIOUS: ir | ||
} | ||
|
||
void test_GetAddressOf() | ||
{ | ||
int x = source<int>(); | ||
Microsoft::WRL::ComPtr<int> p1(new int(x)); | ||
sink(**p1.GetAddressOf()); // $ ir MISSING: ast | ||
|
||
const Microsoft::WRL::ComPtr<int> p2(new int(x)); | ||
sink(**p2.GetAddressOf()); // $ ir MISSING: ast | ||
|
||
Microsoft::WRL::ComPtr<int> p3(new int(x)); | ||
int **pp = p3.ReleaseAndGetAddressOf(); | ||
sink(**pp); // $ ir MISSING: ast | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.