Bug 792106. r=rstrong
authorBrian R. Bondy <netzen@gmail.com>
Wed, 14 Nov 2012 22:44:36 -0500
changeset 113343 6ec27ac9edac53ec819ee8c92aab709af237c180
parent 113342 0c386d6fadec759f5ed525c76ca110dea810757f
child 113344 216ad89546aba4254298e9ee231c2b79fed7b15e
push id23869
push useremorley@mozilla.com
push dateThu, 15 Nov 2012 16:18:16 +0000
treeherdermozilla-central@a37525d304d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs792106
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 792106. r=rstrong
other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
+++ b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
@@ -136,17 +136,17 @@ static inline bool IsItWindowsNT()
 
 // Delayed load libraries are loaded when the first symbol is used.
 // The following ensures that we load the delayed loaded libraries from the
 // system directory.
 struct AutoLoadSystemDependencies
 {
   AutoLoadSystemDependencies()
   {
-    static LPCWSTR delayDLLs[] = { L"dwmapi.dll", L"cryptbase.dll" };
+    static LPCWSTR delayDLLs[] = { L"dwmapi.dll", L"cryptbase.dll", L"SHCore.dll", L"uxtheme.dll" };
     WCHAR systemDirectory[MAX_PATH + 1] = { L'\0' };
     // If GetSystemDirectory fails we accept that we'll load the DLLs from the
     // normal search path.
     GetSystemDirectoryW(systemDirectory, MAX_PATH + 1);
     size_t systemDirLen = wcslen(systemDirectory);
 
     // Make the system directory path terminate with a slash
     if (systemDirectory[systemDirLen - 1] != L'\\' && systemDirLen) {