diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2021-05-13 22:04:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 22:04:46 +0300 |
| commit | c1e7ca823f45082c3459e3211ece37456b2604dd (patch) | |
| tree | 27006813192e83d56d3e03c990630a7cd433346f /src/coreclr/utilcode | |
| parent | d77854a16eaa29f1a141f1da267885dcf2675027 (diff) | |
Low level API support for Objective-C interop. (#52146)
* Add Objective-C interop support.
* Include handling of HNDTYPE_REFCOUNTED when FEATURE_OBJCMARSHAL is defined (#47534)
* Allow overriding of Objective-C message send P/Invokes (#47721)
* Add new flag to MethodTable for types with ObjectiveCTrackedTypeAttribute.
Discover attribute during type load and set bit.
Update EagerFinalizer callout to query bit.
* Add testing for API
* Bridge API for propagating managed exception to native.
* Update GCEE interface to support GCServer scenario for Objective-C.
The new callbacks now fire when before the GC scans handles and is
non-concurrent.
* Comment added for ExceptionTracker non-NULL condition.
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
Co-authored-by: Elinor Fung <elfung@microsoft.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Diffstat (limited to 'src/coreclr/utilcode')
| -rw-r--r-- | src/coreclr/utilcode/util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coreclr/utilcode/util.cpp b/src/coreclr/utilcode/util.cpp index 1a90a6e7fcf..9f19ec53a02 100644 --- a/src/coreclr/utilcode/util.cpp +++ b/src/coreclr/utilcode/util.cpp @@ -237,7 +237,7 @@ namespace StackSString ssDllName; if ((wszDllPath == nullptr) || (wszDllPath[0] == W('\0')) || fIsDllPathPrefix) { -#ifndef TARGET_UNIX +#ifdef HOST_WINDOWS IfFailRet(Clr::Util::Com::FindInprocServer32UsingCLSID(rclsid, ssDllName)); EX_TRY @@ -256,9 +256,9 @@ namespace IfFailRet(hr); wszDllPath = ssDllName.GetUnicode(); -#else // !TARGET_UNIX +#else // HOST_WINDOWS return E_FAIL; -#endif // !TARGET_UNIX +#endif // HOST_WINDOWS } _ASSERTE(wszDllPath != nullptr); |