[WiX-commits] wix/src/tallow tallow.cs,1.1,1.2

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

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

Modified Files:
	tallow.cs 
Log Message:
all - more error message cleanup
sca - major perf improvements when writing to metabase
sca - progress text while writing to metabase
sfbug:964214 - don't modularize operators in conditions
sfbug:969332 - dark handles service dependencies correctly
sfbug:973735 - Empty Package/@Comment attribute fails
sfbug:976021 - updated tables.xml
sfbug:973838 - updated to support Environment/@Separator
sfbug:987217 - fix Merge documentation
sfbug:978316 - fix Modularization 
sfbug:1001866 - fix tallow SelfReg processing


Index: tallow.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/tallow/tallow.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tallow.cs	28 Jul 2004 15:50:21 -0000	1.1
--- tallow.cs	7 Aug 2004 21:14:58 -0000	1.2
***************
*** 653,660 ****
              {
                  // quit overriding
                  EndOverridingRegHive(HkeyClassesRoot, writer, @"SOFTWARE\WiX\HKCR");
                  EndOverridingRegHive(HkeyCurrentUser, writer, @"SOFTWARE\WiX\HKCU");
                  EndOverridingRegHive(HkeyUsers, writer, @"SOFTWARE\WiX\HKU");
-                 EndOverridingRegHive(HkeyLocalMachine, writer, @"SOFTWARE\WiX\HKLM");
  
                  // delete the "private registry" key
--- 653,660 ----
              {
                  // quit overriding
+                 EndOverridingRegHive(HkeyLocalMachine, writer, @"SOFTWARE\WiX\HKLM"); // must end override first
                  EndOverridingRegHive(HkeyClassesRoot, writer, @"SOFTWARE\WiX\HKCR");
                  EndOverridingRegHive(HkeyCurrentUser, writer, @"SOFTWARE\WiX\HKCU");
                  EndOverridingRegHive(HkeyUsers, writer, @"SOFTWARE\WiX\HKU");
  
                  // delete the "private registry" key