[WiX-commits] wix/src/wix/Msi MsmMerge.cs,1.1,1.2 SummaryInformation.cs,1.1,1.2

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

Update of /cvsroot/wix/wix/src/wix/Msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1348/src/wix/Msi

Modified Files:
	MsmMerge.cs SummaryInformation.cs 
Log Message:
all - support Patch Creation Package (.pcp) generation
all - support Configurable Merge Modules
all - enable source files to specify a minimum required version of WiX toolset
all - fix incorrect date/time handling
candle, light - Improved message handling
dark - new -vsi switch to ignore some of the dumb things Visual Studio Installer does
light - suppress assembly population
light - suppress file population
light - extension mechanism to control how file paths are resolved
light - Localization can now override the codepage for the output
sca - server custom actions are finally released
tallow - new "tool" to do selfreg capture, file tree walking, assembly com interop registration, RC file conversion
binder - correctly handle compression flags on files
binder - smarter image layout
compiler - clean up CopyFile element processing
compiler, schema - allow Media elements to separate their contents using "src" attribute
compiler - clean up Registry element processing
compiler - clean up RemoveFile element processing
documentation - more documentation (still need more)


Index: MsmMerge.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/wix/Msi/MsmMerge.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MsmMerge.cs	5 Apr 2004 07:16:20 -0000	1.1
--- MsmMerge.cs	28 Jul 2004 15:50:23 -0000	1.2
***************
*** 78,82 ****
          /// </summary>
          /// <param name="o">Pointer to a memory location containing another pointer to an IMsmErrors interface.</param>
!         void get_Errors([Out, MarshalAs(UnmanagedType.Interface)] out object o);
  
          /// <summary>
--- 78,82 ----
          /// </summary>
          /// <param name="o">Pointer to a memory location containing another pointer to an IMsmErrors interface.</param>
!         void get_Errors([Out, MarshalAs(UnmanagedType.Interface)] out IMsmErrors errors);
  
          /// <summary>
***************
*** 178,181 ****
--- 178,230 ----
          void get_ModuleFiles([Out, MarshalAs(UnmanagedType.Interface)] out object o);
      }
+     
+     /// <summary>
+     /// IMsmErrors interface.
+     /// </summary>
+     [Guid("0ADDA82A-2C26-11D2-AD65-00A0C9AF11A6"), InterfaceType(ComInterfaceType.InterfaceIsDual)]
+     interface IMsmErrors
+     {
+         /// <summary>
+         /// Gets an error item by index.
+         /// </summary>
+         /// <param name="item">Index of the item.</param>
+         /// <param name="o">IMsmError being retrieved.</param>
+         void get_Item(long item, [Out, MarshalAs(UnmanagedType.Interface)] out object o);
+         
+         /// <summary>
+         /// Gets the count of IMsmError objects in this collection.
+         /// </summary>
+         /// <returns>The number of objects in this collection.</returns>
+         long get_Count();
+         
+         /// <summary>
+         /// Gets a new enumerator.
+         /// </summary>
+         /// <param name="o">Object being retrieved.</param>
+         void get_NewEnum([Out, MarshalAs(UnmanagedType.Interface)] out object o);
+     }
+ 
+     /// <summary>
+     /// Callback for configurable merge modules.
+     /// </summary>
+     [ComImport, Guid("AC013209-18A7-4851-8A21-2353443D70A0"), InterfaceType(ComInterfaceType.InterfaceIsIDispatch)]
+     interface IMsmConfigureModule
+     {
+         /// <summary>
+         /// Callback to retrieve text data for configurable merge modules.
+         /// </summary>
+         /// <param name="name">Name of the data to be retrieved.</param>
+         /// <param name="configData">The data corresponding to the name.</param>
+         [PreserveSig]
+         int ProvideTextData([In, MarshalAs(UnmanagedType.BStr)] string Name, [MarshalAs(UnmanagedType.BStr)] out string ConfigData);
+ 
+         /// <summary>
+         /// Callback to retrieve integer data for configurable merge modules.
+         /// </summary>
+         /// <param name="name">Name of the data to be retrieved.</param>
+         /// <param name="configData">The data corresponding to the name.</param>
+         [PreserveSig]
+         int ProvideIntegerData([In, MarshalAs(UnmanagedType.BStr)] string Name, out int ConfigData);
+     }
  
      /// <summary>
***************
*** 186,188 ****
--- 235,238 ----
      {
      }
+ 
  }

Index: SummaryInformation.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/wix/Msi/SummaryInformation.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SummaryInformation.cs	5 Apr 2004 07:16:20 -0000	1.1
--- SummaryInformation.cs	28 Jul 2004 15:50:24 -0000	1.2
***************
*** 192,196 ****
                  if (11 == index || 12 == index || 13 == index)   // must be a FileTime object
                  {
!                     long l = Common.ToFileUtc(Convert.ToDateTime(value));
                      ft.dwHighDateTime = (int)(l >> 32);
                      ft.dwLowDateTime = (int)(l & 0xFFFFFFFF);
--- 192,196 ----
                  if (11 == index || 12 == index || 13 == index)   // must be a FileTime object
                  {
!                     long l = Common.ToFileUtc(Convert.ToDateTime(value, System.Globalization.CultureInfo.InvariantCulture));
                      ft.dwHighDateTime = (int)(l >> 32);
                      ft.dwLowDateTime = (int)(l & 0xFFFFFFFF);