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

Fix AssocQueryString() error reporting in wxMSW.

Browse Source 
Don't report ERROR_NO_ASSOCIATION as an (unexpected) error, it is perfectly
normal to get it if a command is not defined for the given extension.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-10 16:51:02 +00:00
parent 42def6f4ee
commit 36f51e1479
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/mimetype.cpp
View File

@@ -262,11 +262,15 @@ wxString wxAssocQueryString(ASSOCSTR assoc,
&dwSize // And its size &dwSize // And its size
); );
// Do not use FAILED() here as S_FALSE can be returned but is still an // Do not use SUCCEEDED() here as S_FALSE could, in principle, be returned
// error in this context. // but would still be an error in this context.
if ( hr != S_OK ) if ( hr != S_OK )
{ {
wxLogApiError("AssocQueryString", hr); // The only really expected error here is that no association is
// defined, anything else is not expected.
if ( hr != HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) )
wxLogApiError("AssocQueryString", hr);
return wxString(); return wxString();
} }