Switch out the setup api for using the cabinet API directly....

chrome/installer/mini_installer/mini_installer.cc

 // Copyright (c) 2006-2009 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.
 
 // mini_installer.exe is the first exe that is run when chrome is being
 // installed or upgraded. It is designed to be extremely small (~5KB with no
 // extra resources linked) and it has two main jobs:
 //   1) unpack the resources (possibly decompressing some)
 //   2) run the real installer (setup.exe) with appropiate flags.
 //
@@ skipping 15 matching lines @@
 // memcpy and memset intrinsics.
 
 // having the linker merge the sections is saving us ~500 bytes.
 #pragma comment(linker, "/MERGE:.rdata=.text")
 
 #include <windows.h>
 #include <setupapi.h>
 #include <shellapi.h>
 
 #include "chrome/installer/mini_installer/appid.h"
+#include "chrome/installer/mini_installer/decompress.h"
 #include "chrome/installer/mini_installer/mini_installer.h"
 #include "chrome/installer/mini_installer/mini_string.h"
 #include "chrome/installer/mini_installer/pe_resource.h"
 
 // arraysize borrowed from basictypes.h
 template <typename T, size_t N>
 char (&ArraySizeHelper(T (&array)[N]))[N];
 #define arraysize(array) (sizeof(ArraySizeHelper(array)))
 
 // Required linker symbol. See remarks above.
@@ skipping 374 matching lines @@
 
   // setup.exe wasn't sent as 'B7', lets see if it was sent as 'BL'
   // (compressed setup).
   if (!::EnumResourceNames(module, kLZCResourceType, OnResourceFound,
                            reinterpret_cast<LONG_PTR>(&context)) &&
       ::GetLastError() != ERROR_RESOURCE_TYPE_NOT_FOUND)
     return false;
 
   if (setup_path->length() > 0) {
     // Uncompress LZ compressed resource. Setup is packed with 'MSCF'
-    // as opposed to old DOS way of 'SZDD'. Hence use SetupInstallFile
-    // instead of LZCopy.
-    // Note that the API will automatically delete the original file
-    // if the extraction was successful.
-    // TODO(tommi): Use the cabinet API directly.
-    if (!SetupInstallFile(NULL, NULL, setup_path->get(), NULL,
-                          setup_dest_path.get(),
-                          SP_COPY_DELETESOURCE | SP_COPY_SOURCE_ABSOLUTE,
-                          NULL, NULL)) {
-      DeleteFile(setup_path->get());
-      return false;
+    // as opposed to old DOS way of 'SZDD'. Hence we don't use LZCopy.
+    bool success = mini_installer::Expand(setup_path->get(),
+                                          setup_dest_path.get());
+    ::DeleteFile(setup_path->get());
+    if (success) {
+      if (!setup_path->assign(setup_dest_path.get())) {
+        ::DeleteFile(setup_dest_path.get());
+        success = false;
+      }
     }
 
-    return setup_path->assign(setup_dest_path.get());
+    return success;
   }
 
   // setup.exe still not found. So finally check if it was sent as 'BN'
   // (uncompressed setup).
   // TODO(tommi): We don't need BN anymore so let's remove it (and remove
   // it from create_installer_archive.py).
   if (!::EnumResourceNames(module, kBinResourceType, OnResourceFound,
                            reinterpret_cast<LONG_PTR>(&context)) &&
       ::GetLastError() != ERROR_RESOURCE_TYPE_NOT_FOUND)
     return false;
@@ skipping 362 matching lines @@
 
   return exit_code;
 }
 
 }  // namespace mini_installer
 
 int MainEntryPoint() {
   int result = mini_installer::WMain(::GetModuleHandle(NULL));
   ::ExitProcess(result);
 }