[WiX-commits] wix/src/wcautil wcautil.h,1.3,1.4 wcawrap.cpp,1.4,1.5

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

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

Modified Files:
	wcautil.h wcawrap.cpp 
Log Message:
candle - pedantic switch to catch things that "are just not a good idea"
dark - support explicit sequencing of actions
dark - support splitting MSI/MSM into multiple fragments
dark - start support for extensions
sca - fix errors in out of memory conditions
light - add support for storing identifiers on tuples
light - add support for skipping file version/language/hash info gathering
sca - SQL now can sequence on Reinstall
binder - more error handling around missing files
all - new ComponentGroup element
sfbug:1162877 - allow "no" for File/Assembly attribute
compiler - fix handling of permissions on registry keys
all - improve message handling
data - correctly localize more columns and fix some validation mistakes
dark - complete coverage of all standard tables
votive - many fixes

Index: wcautil.h
===================================================================
RCS file: /cvsroot/wix/wix/src/wcautil/wcautil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wcautil.h	8 Sep 2004 05:03:36 -0000	1.3
--- wcautil.h	22 Mar 2005 23:56:47 -0000	1.4
***************
*** 68,72 ****
  enum LOGLEVEL
  { 
! 	LOGMSG_TRACEONLY,  // Never written to the log file
  	LOGMSG_VERBOSE,    // Written to log when LOGVERBOSE
  	LOGMSG_STANDARD    // Written to log whenever informational logging is enabled
--- 68,72 ----
  enum LOGLEVEL
  { 
! 	LOGMSG_TRACEONLY,  // Never written to the log file (except in DEBUG builds)
  	LOGMSG_VERBOSE,    // Written to log when LOGVERBOSE
  	LOGMSG_STANDARD    // Written to log whenever informational logging is enabled
***************
*** 107,110 ****
--- 107,114 ----
  	IN INSTALLSTATE isAction
  	);
+ BOOL WcaIsReInstalling(
+ 	IN INSTALLSTATE isInstalled,
+ 	IN INSTALLSTATE isAction
+ 	);
  BOOL WcaIsUninstalling(
  	IN INSTALLSTATE isInstalled,

Index: wcawrap.cpp
===================================================================
RCS file: /cvsroot/wix/wix/src/wcautil/wcawrap.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wcawrap.cpp	13 Feb 2005 20:55:37 -0000	1.4
--- wcawrap.cpp	22 Mar 2005 23:56:47 -0000	1.5
***************
*** 179,182 ****
--- 179,198 ----
  }
  
+ /********************************************************************
+  WcaIsReInstalling() - determines if a pair of installstates means install
+ 
+ ********************************************************************/
+ extern "C" BOOL WcaIsReInstalling(
+ 	IN INSTALLSTATE isInstalled,
+ 	IN INSTALLSTATE isAction
+ 	)
+ {
+ 	return ((INSTALLSTATE_LOCAL == isAction ||
+ 			INSTALLSTATE_SOURCE == isAction ||
+ 			INSTALLSTATE_DEFAULT == isAction) &&
+ 			(INSTALLSTATE_LOCAL == isInstalled ||
+ 			INSTALLSTATE_SOURCE == isInstalled));
+ }
+ 
  
  /********************************************************************