mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 09:52:56 +00:00
[ATL] atlimage.h: s/IsGuidEqual/::IsEqualGUID/
CORE-18867
This commit is contained in:
parent
a1f7b3f2dd
commit
4ff55ad48e
1 changed files with 2 additions and 14 deletions
|
@ -557,7 +557,7 @@ public:
|
||||||
|
|
||||||
// if the file type is null, get the file type from extension
|
// if the file type is null, get the file type from extension
|
||||||
const GUID *FileType = &guidFileType;
|
const GUID *FileType = &guidFileType;
|
||||||
if (IsGuidEqual(guidFileType, GUID_NULL))
|
if (::IsEqualGUID(guidFileType, GUID_NULL))
|
||||||
{
|
{
|
||||||
LPCWSTR pszExt = GetFileExtension(pszNameW);
|
LPCWSTR pszExt = GetFileExtension(pszNameW);
|
||||||
FileType = FileTypeFromExtension(pszExt);
|
FileType = FileTypeFromExtension(pszExt);
|
||||||
|
@ -1074,7 +1074,7 @@ protected:
|
||||||
const size_t count = _countof(table);
|
const size_t count = _countof(table);
|
||||||
for (size_t i = 0; i < count; ++i)
|
for (size_t i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
if (IsGuidEqual(table[i].guid, *guid))
|
if (::IsEqualGUID(table[i].guid, *guid))
|
||||||
{
|
{
|
||||||
int num = GetEncoderClsid(table[i].mime, clsid);
|
int num = GetEncoderClsid(table[i].mime, clsid);
|
||||||
if (num >= 0)
|
if (num >= 0)
|
||||||
|
@ -1116,18 +1116,6 @@ protected:
|
||||||
return -1; // failure
|
return -1; // failure
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsGuidEqual(const GUID& guid1, const GUID& guid2) const
|
|
||||||
{
|
|
||||||
RPC_STATUS status;
|
|
||||||
if (::UuidEqual(const_cast<GUID *>(&guid1),
|
|
||||||
const_cast<GUID *>(&guid2), &status))
|
|
||||||
{
|
|
||||||
if (status == RPC_S_OK)
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation,
|
void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation,
|
||||||
LONG iTransColor)
|
LONG iTransColor)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue