Merge mozilla-central into mozilla-inbound

This commit is contained in:
Ehsan Akhgari 2012-11-08 22:06:29 -05:00
commit 60b2718413
2 changed files with 1 additions and 1 deletions

View File

@ -141,7 +141,7 @@ struct AutoLoadSystemDependencies
{
AutoLoadSystemDependencies()
{
static LPCWSTR delayDLLs[] = { L"dwmapi.dll" };
static LPCWSTR delayDLLs[] = { L"dwmapi.dll", L"cryptbase.dll" };
WCHAR systemDirectory[MAX_PATH + 1] = { L'\0' };
// If GetSystemDirectory fails we accept that we'll load the DLLs from the
// normal search path.