Skip to content

R
runtime

dotNET Platform / runtime
大约 1 年 前同步成功

通知 1
Star 1
Fork 0
R
runtime

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 8e93e728 编写于 作者: E Elinor Fung 提交者： GitHub
浏览文件
操作

Slight refactor in looking at app paths in AssemblyBinder::BindByTpaList (#115)

上级 4593d2b0
隐藏空白更改
内联 并排
Showing with 139 addition and 147 deletion
src/coreclr/src/binder/assemblybinder.cpp
浏览文件 @ 8e93e728
......@@ -711,55 +711,120 @@ namespace BINDER_SPACE
return pBoundAssemblyName->Equals(pRequestedAssemblyName, dwIncludeFlags);
}
HRESULT BindSatelliteResourceByResourceRoots(ApplicationContext *pApplicationContext,
StringArrayList *pResourceRoots,
AssemblyName *pRequestedAssemblyName,
BindResult *pBindResult)
namespace
{
HRESULT hr = S_OK;
HRESULT BindSatelliteResourceByProbingPaths(
const StringArrayList *pResourceRoots,
AssemblyName *pRequestedAssemblyName,
BindResult *pBindResult)
{
HRESULT hr = S_OK;
SString &simpleNameRef = pRequestedAssemblyName->GetSimpleName();
SString &cultureRef = pRequestedAssemblyName->GetCulture();
SString &simpleNameRef = pRequestedAssemblyName->GetSimpleName();
SString &cultureRef = pRequestedAssemblyName->GetCulture();
_ASSERTE(!cultureRef.IsEmpty() && !cultureRef.EqualsCaseInsensitive(g_BinderVariables->cultureNeutral));
_ASSERTE(!cultureRef.IsEmpty() && !cultureRef.EqualsCaseInsensitive(g_BinderVariables->cultureNeutral));
for (UINT i = 0; i < pResourceRoots->GetCount(); i++)
{
ReleaseHolder<Assembly> pAssembly;
SString &wszBindingPath = (*pResourceRoots)[i];
SString fileName(wszBindingPath);
for (UINT i = 0; i < pResourceRoots->GetCount(); i++)
{
ReleaseHolder<Assembly> pAssembly;
SString &wszBindingPath = (*pResourceRoots)[i];
SString fileName(wszBindingPath);
CombinePath(fileName, cultureRef, fileName);
CombinePath(fileName, simpleNameRef, fileName);
fileName.Append(W(".dll"));
CombinePath(fileName, cultureRef, fileName);
CombinePath(fileName, simpleNameRef, fileName);
fileName.Append(W(".dll"));
hr = AssemblyBinder::GetAssembly(fileName,
FALSE /* fIsInGAC */,
FALSE /* fExplicitBindToNativeImage */,
&pAssembly);
hr = AssemblyBinder::GetAssembly(fileName,
FALSE /* fIsInGAC */,
FALSE /* fExplicitBindToNativeImage */,
&pAssembly);
// Missing files are okay and expected when probing
if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
{
continue;
}
// Missing files are okay and expected when probing
if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
{
continue;
IF_FAIL_GO(hr);
AssemblyName *pBoundAssemblyName = pAssembly->GetAssemblyName();
if (TestCandidateRefMatchesDef(pRequestedAssemblyName, pBoundAssemblyName, false /*tpaListAssembly*/))
{
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
}
IF_FAIL_GO(FUSION_E_REF_DEF_MISMATCH);
}
IF_FAIL_GO(hr);
// Up-stack expects S_OK when we don't find any candidate assemblies and no fatal error occurred (ie, no S_FALSE)
hr = S_OK;
Exit:
return hr;
}
HRESULT BindAssemblyByProbingPaths(
const StringArrayList *pBindingPaths,
AssemblyName *pRequestedAssemblyName,
bool useNativeImages,
Assembly **ppAssembly)
{
SString &simpleName = pRequestedAssemblyName->GetSimpleName();
AssemblyName *pBoundAssemblyName = pAssembly->GetAssemblyName();
if (TestCandidateRefMatchesDef(pRequestedAssemblyName, pBoundAssemblyName, false /*tpaListAssembly*/))
// Loop through the binding paths looking for a matching assembly
for (DWORD i = 0; i < pBindingPaths->GetCount(); i++)
{
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
HRESULT hr;
ReleaseHolder<Assembly> pAssembly;
LPCWSTR wszBindingPath = (*pBindingPaths)[i];
PathString fileNameWithoutExtension(wszBindingPath);
CombinePath(fileNameWithoutExtension, simpleName, fileNameWithoutExtension);
// Look for a matching dll first
PathString fileName(fileNameWithoutExtension);
fileName.Append(useNativeImages ? W(".ni.dll") : W(".dll"));
hr = AssemblyBinder::GetAssembly(fileName,
FALSE, // fIsInGAC
useNativeImages, // fExplicitBindToNativeImage
&pAssembly);
if (FAILED(hr))
{
fileName.Set(fileNameWithoutExtension);
fileName.Append(useNativeImages ? W(".ni.exe") : W(".exe"));
hr = AssemblyBinder::GetAssembly(fileName,
FALSE, // fIsInGAC
useNativeImages, // fExplicitBindToNativeImage
&pAssembly);
}
// Since we're probing, file not founds are ok and we should just try another
// probing path
if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
{
continue;
}
if (FAILED(hr))
return hr;
// We found a candidate.
//
// Below this point, we either establish that the ref-def matches, or
// we fail the bind.
// Compare requested AssemblyName with that from the candidate assembly
if (!TestCandidateRefMatchesDef(pRequestedAssemblyName, pAssembly->GetAssemblyName(), false /*tpaListAssembly*/))
return FUSION_E_REF_DEF_MISMATCH;
*ppAssembly = pAssembly.Extract();
return S_OK;
}
IF_FAIL_GO(FUSION_E_REF_DEF_MISMATCH);
return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
}
// Up-stack expects S_OK when we don't find any candidate assemblies and no fatal error occurred (ie, no S_FALSE)
hr = S_OK;
Exit:
return hr;
}
/*
......@@ -794,10 +859,9 @@ namespace BINDER_SPACE
// followed by App Paths.
//
hr = BindSatelliteResourceByResourceRoots(pApplicationContext,
pApplicationContext->GetPlatformResourceRoots(),
pRequestedAssemblyName,
pBindResult);
hr = BindSatelliteResourceByProbingPaths(pApplicationContext->GetPlatformResourceRoots(),
pRequestedAssemblyName,
pBindResult);
// We found a platform resource file with matching file name, but whose ref-def didn't match. Fall
// back to application resource lookup to handle case where a user creates resources with the same
......@@ -809,10 +873,9 @@ namespace BINDER_SPACE
if (!pBindResult->HaveResult())
{
IF_FAIL_GO(BindSatelliteResourceByResourceRoots(pApplicationContext,
pApplicationContext->GetAppPaths(),
pRequestedAssemblyName,
pBindResult));
IF_FAIL_GO(BindSatelliteResourceByProbingPaths(pApplicationContext->GetAppPaths(),
pRequestedAssemblyName,
pBindResult));
}
}
else
......@@ -869,120 +932,49 @@ namespace BINDER_SPACE
if (!excludeAppPaths)
{
// This loop executes twice max. First time through we probe AppNiPaths, the second time we probe AppPaths
bool parseAppNiPaths = true;
for (;;)
// Probe AppNiPaths first, then AppPaths
ReleaseHolder<Assembly> pAssembly;
hr = BindAssemblyByProbingPaths(pApplicationContext->GetAppNiPaths(),
pRequestedAssemblyName,
true, // useNativeImages
&pAssembly);
if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
{
StringArrayList *pBindingPaths = parseAppNiPaths ? pApplicationContext->GetAppNiPaths() : pApplicationContext->GetAppPaths();
// Loop through the binding paths looking for a matching assembly
for (DWORD i = 0; i < pBindingPaths->GetCount(); i++)
{
ReleaseHolder<Assembly> pAssembly;
LPCWSTR wszBindingPath = (*pBindingPaths)[i];
SString &simpleName = pRequestedAssemblyName->GetSimpleName();
// Look for a matching dll first
hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
{
SString fileName(wszBindingPath);
CombinePath(fileName, simpleName, fileName);
if (parseAppNiPaths)
{
fileName.Append(W(".ni.dll"));
hr = GetAssembly(fileName,
FALSE, // fIsInGAC
TRUE, // fExplicitBindToNativeImage
&pAssembly);
}
else
{
fileName.Append(W(".dll"));
hr = GetAssembly(fileName,
FALSE, // fIsInGAC
FALSE, // fExplicitBindToNativeImage
&pAssembly);
}
}
if (FAILED(hr))
{
SString fileName(wszBindingPath);
CombinePath(fileName, simpleName, fileName);
hr = BindAssemblyByProbingPaths(pApplicationContext->GetAppPaths(),
pRequestedAssemblyName,
false, // useNativeImages
&pAssembly);
}
if (parseAppNiPaths)
{
fileName.Append(W(".ni.exe"));
hr = GetAssembly(fileName,
FALSE, // fIsInGAC
TRUE, // fExplicitBindToNativeImage
&pAssembly);
}
else
{
fileName.Append(W(".exe"));
hr = GetAssembly(fileName,
FALSE, // fIsInGAC
FALSE, // fExplicitBindToNativeImage
&pAssembly);
}
}
if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
{
IF_FAIL_GO(hr);
// Since we're probing, file not founds are ok and we should just try another
// probing path
if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
// At this point, we have found an assembly with the expected name in the App paths. If this was also found on TPA,
// make sure that the app assembly has the same fullname (excluding version) as the TPA version. If it does, then
// we should bind to the TPA assembly. If it does not, then bind to the app assembly since it has a different fullname than the
// TPA assembly.
if (fPartialMatchOnTpa)
{
if (TestCandidateRefMatchesDef(pAssembly->GetAssemblyName(), pTPAAssembly->GetAssemblyName(), true /*tpaListAssembly*/))
{
continue;
// Fullname (SimpleName+Culture+PKT) matched for TPA and app assembly - so bind to TPA instance.
pBindResult->SetResult(pTPAAssembly);
GO_WITH_HRESULT(S_OK);
}
IF_FAIL_GO(hr);
// We found a candidate.
//
// Below this point, we either establish that the ref-def matches, or
// we fail the bind.
// Compare requested AssemblyName with that from the candidate assembly
if (TestCandidateRefMatchesDef(pRequestedAssemblyName, pAssembly->GetAssemblyName(), false /*tpaListAssembly*/))
else
{
// At this point, we have found an assembly with the expected name in the App paths. If this was also found on TPA,
// make sure that the app assembly has the same fullname (excluding version) as the TPA version. If it does, then
// we should bind to the TPA assembly. If it does not, then bind to the app assembly since it has a different fullname than the
// TPA assembly.
if (fPartialMatchOnTpa)
{
if (TestCandidateRefMatchesDef(pAssembly->GetAssemblyName(), pTPAAssembly->GetAssemblyName(), true /*tpaListAssembly*/))
{
// Fullname (SimpleName+Culture+PKT) matched for TPA and app assembly - so bind to TPA instance.
pBindResult->SetResult(pTPAAssembly);
GO_WITH_HRESULT(S_OK);
}
else
{
// Fullname (SimpleName+Culture+PKT) did not match for TPA and app assembly - so bind to app instance.
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
}
}
else
{
// We didn't see this assembly on TPA - so simply bind to the app instance.
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
}
// Fullname (SimpleName+Culture+PKT) did not match for TPA and app assembly - so bind to app instance.
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
}
IF_FAIL_GO(FUSION_E_REF_DEF_MISMATCH);
}
if (!parseAppNiPaths)
else
{
break;
// We didn't see this assembly on TPA - so simply bind to the app instance.
pBindResult->SetResult(pAssembly);
GO_WITH_HRESULT(S_OK);
}
parseAppNiPaths = false;
}
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或