Skip to content

Remove dependency on CorError.h #2300

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 1 commit into from
Dec 11, 2019
Merged

Remove dependency on CorError.h #2300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,19 @@ using namespace System::Security;
namespace MS { namespace Internal { namespace Text { namespace TextInterface { namespace Native
{
#include "DWrite.h"
#include "CorError.h"

// --Begin-- Copied from CorError.h,
// which is not visible to WPF .NetCore builds without installing .NET 4.6.1 SDK
#ifndef FACILITY_URT
#define FACILITY_URT 0x13
#endif
#ifndef EMAKEHR
#define SMAKEHR(val) MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_URT, val)
#define EMAKEHR(val) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_URT, val)
#endif

#define COR_E_INVALIDOPERATION EMAKEHR(0x1509)
// --End-- copy from CorError.h

private ref class Util sealed
{
Expand Down