Warm up EnumSystemLocalesEx() for Flash Player.

content/ppapi_plugin/ppapi_thread.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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
@@ skipping 34 matching lines @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "sandbox/win/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
 #endif
 
 #if defined(OS_WIN)
 extern sandbox::TargetServices* g_target_services;
+// Used by EnumSystemLocales for warming up

[jschuh, 2014/01/16 07:54:34]

Add a blank line above this comment.

+static BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) {
+  return true;
+}
 #else
 extern void* g_target_services;
 #endif
 
 namespace content {
 
 typedef int32_t (*InitializeBrokerFunc)
     (PP_ConnectInstance_Func* connect_instance_func);
 
 PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
@@ skipping 215 matching lines @@
   base::win::SetAbortBehaviorForCrashReporting();
 
   // Once we lower the token the sandbox is locked down and no new modules
   // can be loaded. TODO(cpu): consider changing to the loading style of
   // regular plugins.
   if (g_target_services) {
     // Let Flash load DRM before lockdown on Vista+.
     if (permissions.HasPermission(ppapi::PERMISSION_FLASH) &&
         base::win::OSInfo::GetInstance()->version() >=
         base::win::VERSION_VISTA ) {
-      LoadLibrary(L"dxva2.dll");
+        LoadLibrary(L"dxva2.dll");
     }
 
     // Cause advapi32 to load before the sandbox is turned on.
     unsigned int dummy_rand;
     rand_s(&dummy_rand);
     // Warm up language subsystems before the sandbox is turned on.
     ::GetUserDefaultLangID();
     ::GetUserDefaultLCID();
 
+    if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) {
+      // Warm up system locales.

[jschuh, 2014/01/16 07:54:34]

You don't need to manually load EnumSystemLocales. It's present on all supported
Windows versions, so the loader will handle it for you. You just need to call it
directly.

+      typedef BOOL (WINAPI *PfnEnumSystemLocales) (LOCALE_ENUMPROC, DWORD);
+      HMODULE hKernel32Dll = GetModuleHandleW(L"Kernel32.dll");
+      PfnEnumSystemLocales lfpEnumSystemLocales = (PfnEnumSystemLocales)
+          GetProcAddress(hKernel32Dll, "EnumSystemLocalesW");
+
+      if (lfpEnumSystemLocales)
+          lfpEnumSystemLocales(EnumLocalesProc, LCID_INSTALLED);
+    }
+
     g_target_services->LowerToken();
   }
 #endif
 
   if (is_broker_) {
     // Get the InitializeBroker function (required).
     InitializeBrokerFunc init_broker =
         reinterpret_cast<InitializeBrokerFunc>(
             library.GetFunctionPointer("PPP_InitializeBroker"));
     if (!init_broker) {
@@ skipping 155 matching lines @@
           histogram_name.str(),
           1,
           LOAD_RESULT_MAX,
           LOAD_RESULT_MAX + 1,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   histogram->Add(result);
 }
 
 }  // namespace content