diff options
Diffstat (limited to 'src/vm/assemblyname.cpp')
-rw-r--r-- | src/vm/assemblyname.cpp | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/vm/assemblyname.cpp b/src/vm/assemblyname.cpp index d7689e8b88..686527f8c2 100644 --- a/src/vm/assemblyname.cpp +++ b/src/vm/assemblyname.cpp @@ -62,15 +62,11 @@ FCIMPL1(Object*, AssemblyNameNative::GetFileInformation, StringObject* filenameU EX_TRY { -#ifdef FEATURE_CORECLR // Allow AssemblyLoadContext.GetAssemblyName for native images on CoreCLR if (pImage->HasNTHeaders() && pImage->HasCorHeader() && pImage->HasNativeHeader()) pImage->VerifyIsNIAssembly(); else pImage->VerifyIsAssembly(); -#else - pImage->VerifyIsAssembly(); -#endif } EX_CATCH { @@ -84,9 +80,6 @@ FCIMPL1(Object*, AssemblyNameNative::GetFileInformation, StringObject* filenameU AssemblySpec spec; spec.InitializeSpec(TokenFromRid(mdtAssembly,1),pImage->GetMDImport(),NULL,TRUE); -#ifndef FEATURE_CORECLR - spec.SetCodeBase(sUrl); -#endif spec.AssemblyNameInit(&gc.result, pImage); HELPER_METHOD_FRAME_END(); @@ -168,52 +161,6 @@ FCIMPL1(Object*, AssemblyNameNative::GetPublicKeyToken, Object* refThisUNSAFE) } FCIMPLEND -#ifndef FEATURE_CORECLR -FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAFE) -{ - FCALL_CONTRACT; - - STRINGREF rv = NULL; - STRINGREF filename = (STRINGREF) filenameUNSAFE; - HELPER_METHOD_FRAME_BEGIN_RET_1(filename); - - LPWSTR pCodeBase = NULL; - DWORD dwCodeBase = 0; - CQuickBytes qb; - - if (filename != NULL) { - WCHAR* pString; - int iString; - filename->RefInterpretGetStringValuesDangerousForGC(&pString, &iString); - dwCodeBase = (DWORD) iString; - pCodeBase = (LPWSTR) qb.AllocThrows((++dwCodeBase) * sizeof(WCHAR)); - memcpy(pCodeBase, pString, dwCodeBase*sizeof(WCHAR)); - } - - if(pCodeBase) { - CQuickBytes qb2; - DWORD dwEscaped = 1; - - DWORD flags = 0; - if (RunningOnWin7()) - flags |= URL_ESCAPE_AS_UTF8; - - UrlEscape(pCodeBase, (LPWSTR) qb2.Ptr(), &dwEscaped, flags); - - LPWSTR result = (LPWSTR)qb2.AllocThrows((++dwEscaped) * sizeof(WCHAR)); - HRESULT hr = UrlEscape(pCodeBase, result, &dwEscaped, flags); - - if (SUCCEEDED(hr)) - rv = StringObject::NewString(result); - else - COMPlusThrowHR(hr); - } - - HELPER_METHOD_FRAME_END(); - return OBJECTREFToObject(rv); -} -FCIMPLEND -#endif // !FEATURE_CORECLR FCIMPL4(void, AssemblyNameNative::Init, Object * refThisUNSAFE, OBJECTREF * pAssemblyRef, CLR_BOOL fForIntrospection, CLR_BOOL fRaiseResolveEvent) { |