Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsistent use of boolean and HRESULT

Browse Source
This commit is contained in:
Maarten Bent
2020-04-26 21:43:56 +02:00
parent 52d830398a
commit 57c385350d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/rt/utils.h
View File

@@ -28,7 +28,7 @@ bool WXDLLIMPEXP_CORE Initialize();
void WXDLLIMPEXP_CORE Uninitialize();
bool WXDLLIMPEXP_CORE GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory);
HRESULT WXDLLIMPEXP_CORE GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory);
// RAII class initializing WinRT in its ctor and undoing it in its dtor.
class WXDLLIMPEXP_CORE Initializer

8
src/msw/rt/utilsrt.cpp
View File

@@ -215,19 +215,17 @@ void Uninitialize()
RTCore::Get().RoUninitialize();
}
bool GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory)
HRESULT GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory)
{
if ( !RTCore::IsAvailable() )
return false;
return CLASS_E_CLASSNOTAVAILABLE;
HRESULT hr = RTCore::Get().RoGetActivationFactory(TempStringRef(activatableClassId), iid, factory);
if ( FAILED(hr) )
{
wxLogDebug("RoGetActivationFactory failed %.8x", hr);
return false;
}
else
return true;
return hr;
}
// ----------------------------------------------------------------------------