Miscellaneous tiny cleanups done while converting files to use ScopedCOMInitializer, pulled out sep…

printing/backend/win_helper.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 "printing/backend/win_helper.h"
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/file_version_info.h"
@@ skipping 221 matching lines @@
 
 HRESULT XPSModule::ReleaseMemory(PVOID buffer) {
   return g_release_memory_proc(buffer);
 }
 
 HRESULT XPSModule::CloseProvider(HPTPROVIDER provider) {
   return g_close_provider_proc(provider);
 }
 
 ScopedXPSInitializer::ScopedXPSInitializer() : initialized_(false) {
-  if (XPSModule::Init()) {
-    // Calls to XPS APIs typically require the XPS provider to be opened with
-    // PTOpenProvider. PTOpenProvider calls CoInitializeEx with
-    // COINIT_MULTITHREADED. We have seen certain buggy HP printer driver DLLs
-    // that call CoInitializeEx with COINIT_APARTMENTTHREADED in the context of
-    // PTGetPrintCapabilities. This call fails but the printer driver calls
-    // CoUninitialize anyway. This results in the apartment being torn down too
-    // early and the msxml DLL being unloaded which in turn causes code in
-    // unidrvui.dll to have a dangling pointer to an XML document which causes a
-    // crash. To protect ourselves from such drivers we make sure we always have
-    // an extra CoInitialize (calls to CoInitialize/CoUninitialize are
-    // refcounted).
-    HRESULT coinit_ret = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-    // If this succeeded we are done because the PTOpenProvider call will
-    // provide the extra refcount on the apartment. If it failed because someone
-    // already called CoInitializeEx with COINIT_APARTMENTTHREADED, we try
-    // the other model to provide the additional refcount (since we don't know
-    // which model buggy printer drivers will use).
-    if (coinit_ret == RPC_E_CHANGED_MODE)
-      coinit_ret = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-    DCHECK(SUCCEEDED(coinit_ret));
-    initialized_ = true;
-  }
+  if (!XPSModule::Init())
+    return;
+  // Calls to XPS APIs typically require the XPS provider to be opened with
+  // PTOpenProvider. PTOpenProvider calls CoInitializeEx with
+  // COINIT_MULTITHREADED. We have seen certain buggy HP printer driver DLLs
+  // that call CoInitializeEx with COINIT_APARTMENTTHREADED in the context of
+  // PTGetPrintCapabilities. This call fails but the printer driver calls
+  // CoUninitialize anyway. This results in the apartment being torn down too
+  // early and the msxml DLL being unloaded which in turn causes code in
+  // unidrvui.dll to have a dangling pointer to an XML document which causes a
+  // crash. To protect ourselves from such drivers we make sure we always have
+  // an extra CoInitialize (calls to CoInitialize/CoUninitialize are
+  // refcounted).
+  HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+  // If this succeeded we are done because the PTOpenProvider call will provide
+  // the extra refcount on the apartment. If it failed because someone already
+  // called CoInitializeEx with COINIT_APARTMENTTHREADED, we try the other model
+  // to provide the additional refcount (since we don't know which model buggy
+  // printer drivers will use).

[cpu_(ooo_6.6-7.5), 2012/09/27 19:14:36]

and this is the kind of crap that make one hate com.

+  if (!SUCCEEDED(hr))
+    hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+  DCHECK(SUCCEEDED(hr));
+  initialized_ = true;
 }
 
 ScopedXPSInitializer::~ScopedXPSInitializer() {
   if (initialized_)
     CoUninitialize();
   initialized_ = false;
 }
 
 bool XPSPrintModule::Init() {
   static bool initialized = InitImpl();
@@ skipping 95 matching lines @@
   for (size_t i = 0; i < arraysize(info); ++i) {
     std::replace(info[i].begin(), info[i].end(), ';', ',');
     driver_info.append(info[i]);
     if (i < arraysize(info) - 1)
       driver_info.append(";");
   }
   return driver_info;
 }
 
 }  // namespace printing