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 38 matching lines @@
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
 #endif
 
 #if defined(OS_WIN)
 extern sandbox::TargetServices* g_target_services;
 #else
 extern void* g_target_services;
 #endif
 
+#if defined(OS_WIN)

[jschuh, 2014/01/15 00:15:45]

Move this function definition into the "#if defined(OS_WIN)" block above, below
the g_target_services declaration.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+// Used by EnumSystemLocalesEx right below for warming up
+static BOOL CALLBACK EnumLocalesProcEx
+    (LPWSTR lpLocaleString, DWORD dwFlags, LPARAM lParam) {

[jschuh, 2014/01/15 00:15:45]

Fix the indenting to comply with the style guide. Open parenth should be on the
first line and you can have the args start up there as lon as you don't exceed
80 cols.

[Ye Liu, 2014/01/15 07:59:54]

I change it to 
static BOOL CALLBACK EnumLocalesProcEx(LPWSTR lpLocaleString, DWORD dwFlags, 
     LPARAM lParam) {
     return true;
}
Is it ok?

+    return true;
+}
+
+typedef BOOL (WINAPI *PfnEnumSystemLocalesEx)

[jschuh, 2014/01/15 00:15:45]

Move this typedef down to where you use it.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+    (LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID);
+#endif
+
 namespace content {
 
 typedef int32_t (*InitializeBrokerFunc)
     (PP_ConnectInstance_Func* connect_instance_func);
 
 PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
     : is_broker_(is_broker),
       connect_instance_func_(NULL),
       local_pp_module_(
           base::RandInt(0, std::numeric_limits<PP_Module>::max())),
@@ skipping 212 matching lines @@
 
   // 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");
+
+      // GetModuleHandleW doesn't require FreeLibrary() per MSDN.

[jschuh, 2014/01/15 00:15:45]

You don't need the comment about GetModuleHandleW. Probably better to just have
the comment read "Warm up system locales."

[Ye Liu, 2014/01/15 07:59:54]

Done.

+      // Warm up EnumSystemLocalesEx() for Vista and above.
+      HMODULE hKernel32Dll = GetModuleHandleW(L"Kernel32.dll");
+      if (hKernel32Dll) {

[jschuh, 2014/01/15 00:15:45]

There's no need need to check this. All Windows processes must have kernel32.dll
loaded.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+        PfnEnumSystemLocalesEx lfpEnumSystemLocalesEx;
+        lfpEnumSystemLocalesEx = (PfnEnumSystemLocalesEx) GetProcAddress(

[jschuh, 2014/01/15 00:15:45]

assign in the initializer, rather than on a new line.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+            hKernel32Dll, "EnumSystemLocalesEx");

[jschuh, 2014/01/15 00:15:45]

indent at least four spaces for a continued line.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+
+        if (lfpEnumSystemLocalesEx) {

[jschuh, 2014/01/15 00:15:45]

No braces needed for single line if.

[Ye Liu, 2014/01/15 07:59:54]

Done.

+          lfpEnumSystemLocalesEx(EnumLocalesProcEx, 0, 0, 0);
+        }
+      }
     }
 
     // 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();
 
     g_target_services->LowerToken();
@@ skipping 164 matching lines @@
           histogram_name.str(),
           1,
           LOAD_RESULT_MAX,
           LOAD_RESULT_MAX + 1,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   histogram->Add(result);
 }
 
 }  // namespace content