Revert 212230 "Create top-level separate targets for browser and..."

trunk/src/chrome/app/client_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 56 matching lines @@
 void RecordDidRun(const string16& dll_path) {
   bool system_level = !InstallUtil::IsPerUserInstall(dll_path.c_str());
   GoogleUpdateSettings::UpdateDidRunState(true, system_level);
 }
 
 void ClearDidRun(const string16& dll_path) {
   bool system_level = !InstallUtil::IsPerUserInstall(dll_path.c_str());
   GoogleUpdateSettings::UpdateDidRunState(false, system_level);
 }
 
+#if defined(CHROME_SPLIT_DLL)
+// Deferred initialization entry point for chrome1.dll.
+typedef BOOL (__stdcall *DoDeferredCrtInitFunc)(HINSTANCE hinstance);
+
+bool InitSplitChromeDll(HMODULE mod) {
+  if (!mod)
+    return false;
+  DoDeferredCrtInitFunc init = reinterpret_cast<DoDeferredCrtInitFunc>(
+      ::GetProcAddress(mod, "_DoDeferredCrtInit@4"));
+  return (init(mod) == TRUE);
+}
+#endif
 }  // namespace
 
 string16 GetExecutablePath() {
   wchar_t path[MAX_PATH];
   ::GetModuleFileNameW(NULL, path, MAX_PATH);
   if (!::PathRemoveFileSpecW(path))
     return string16();
   string16 exe_path(path);
   return exe_path.append(1, L'\\');
 }
@@ skipping 60 matching lines @@
     out_file->append(*out_version).append(1, L'\\');
     dll = LoadChromeWithDirectory(out_file);
     if (!dll) {
       PLOG(ERROR) << "Failed to load Chrome DLL from " << *out_file;
       return NULL;
     }
   }
 
   DCHECK(dll);
 
+#if defined(CHROME_SPLIT_DLL)
+  // In split dlls mode, we need to manually initialize both DLLs because
+  // the circular dependencies between them make the loader not call the
+  // Dllmain for DLL_PROCESS_ATTACH.
+  InitSplitChromeDll(dll);
+  InitSplitChromeDll(::GetModuleHandleA("chrome1.dll"));
+#endif
+
   return dll;
 }
 
 // Launching is a matter of loading the right dll, setting the CHROME_VERSION
 // environment variable and just calling the entry point. Derived classes can
 // add custom code in the OnBeforeLaunch callback.
 int MainDllLoader::Launch(HINSTANCE instance,
                           sandbox::SandboxInterfaceInfo* sbox_info) {
   string16 version;
   string16 file;
@@ skipping 69 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }