[WiX-commits] wix/src/setupexe setupexe.cpp,1.6,1.7

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/src/setupexe
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6964/src/setupexe

Modified Files:
	setupexe.cpp 
Log Message:
RobMen: SFBUG:1653864 - fix off by 1 error in SQL String reading.

HeathS: Added support for @RequiredVersion to WiX extension elements

HeathS: Added support for attribute references in schemas

MiCarls: Add a light error when trying to put an assembly that has no strong name into
         the MsiAssembly table, with "File_Application" column empty (installing to the GAC).

HeathS: Converted chm.build to chm.proj

HeathS: Added topics on bind variables and localization

BobArnso: Switch to Server 2008 SDK build of .cubs to avoid false hits on MSI
          4.0 features (sfbug:1841830, sfbug:1841341).

MiCarls: Fix various exceptions related to bad file paths specified on the commandline
         also, stop parsing commandline parameters when "-?" is encountered.

BobArnso: - Make the Extension element attribute-extensible
          - Modernize IniFile Name/LongName in Decompiler

WixBuild: Version 3.0.3829.0

MGhazna: Implemented the ShowAllFiles feature for Votive projects.

MilenL: Fix various project properties related bugs, mostly UI fit & finish

VaraBall: Fixed Light and Lit targets authoring to pass project references.

BobArnso: - Add Error table automatically if summary info schema set to <=100
            (to avoid ICE40 warning).
          - Add link-time checking for IsolatedComponent table that require
            MSI 1.1+ with summary info schema set to <110.
          - Add link-time checking for Shortcut columns that require MSI 4.0+
            with summary info schema set to <400.
          - Suppress ICE66 by default: The above checks make it obsolete and it
            incorrectly reports *any* Shortcut table with the MSI 4.0 columns
            as a warning, even if the column values are NULL.

MiCarls: Cleaner warnings when scheduling rollback fails in SecureObjects CA

PMarcu: Fixing error when multiple instance transforms have the same Id.
        Fix for instance transform generation failure when Product/@Id="*".

MiCarls: Ensure Wow64 filesystem redirection is enabled when we get the MSXML interface

BobArnso: SFBUG:1909111 - Add en-us strings to MSMQ and COM+ extensions.

Index: setupexe.cpp
===================================================================
RCS file: /cvsroot/wix/wix/src/setupexe/setupexe.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** setupexe.cpp	22 Feb 2008 09:36:22 -0000	1.6
--- setupexe.cpp	7 Mar 2008 08:34:22 -0000	1.7
***************
*** 968,971 ****
--- 968,972 ----
  
      BOOL bDropMsi = FALSE;
+     BOOL bDropOnlyMsi = FALSE;
      LPCWSTR wzDropDir = NULL;
      LPCWSTR wzMsiArgs = NULL;
***************
*** 996,999 ****
--- 997,1010 ----
                  wzDropDir = argv[++i];
              }
+             else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"o1", -1))
+             {
+                 if (i + 1 >= argc)
+                 {
+                     ExitOnFailure(hr = E_INVALIDARG, "Must specify a filename with the /o1 switch.");
+                 }
+ 
+                 bDropOnlyMsi = TRUE;
+                 wzDropDir = argv[++i];
+             }
              else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"msicl", -1))
              {
***************
*** 1028,1031 ****
--- 1039,1055 ----
          ExitOnFailure(hr, "Failure in extracting msi.");
      }
+     else if (bDropOnlyMsi)
+     {
+         SETUP_INSTALL_CHAIN* pSetupChain = NULL;
+         DWORD cbSetupChain = 0;
+ 
+         hr = ResReadData("MANIFEST", (LPVOID*)&pSetupChain, &cbSetupChain);
+         ExitOnFailure(hr, "Failed to get manifest for setup chain.");
+ 
+         SETUP_INSTALL_PACKAGE* pPackage = pSetupChain->rgPackages + 0;
+ 
+         hr = ResExportDataToFile(pPackage->szSource, wzDropDir, CREATE_ALWAYS);
+         ExitOnFailure1(hr, "Failed to write msi package to %S.", wzDropDir);
+     }
      else // Default is to install the package.
      {