[WiX-commits] wix/src/serverca/scaexec scaexec.cpp,1.9,1.10

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

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

Modified Files:
	scaexec.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: scaexec.cpp
===================================================================
RCS file: /cvsroot/wix/wix/src/serverca/scaexec/scaexec.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** scaexec.cpp	13 Feb 2005 20:55:35 -0000	1.9
--- scaexec.cpp	22 Mar 2005 23:56:43 -0000	1.10
***************
*** 422,426 ****
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_VERBOSE, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
--- 422,426 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
***************
*** 551,555 ****
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_VERBOSE, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
--- 551,555 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
***************
*** 708,712 ****
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_VERBOSE, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
--- 708,712 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
***************
*** 795,799 ****
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_VERBOSE, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
--- 795,799 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
! 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
  
  	pwz = pwzData;
***************
*** 885,889 ****
  	WCHAR wz[255];
  
- //	MessageBox(NULL, "RegisterPerfmon", "Debug", MB_OK);
  	hr = WcaInitialize(hInstall, "RegisterPerfmon");
  	ExitOnFailure(hr, "failed to initialize");
--- 885,888 ----
***************
*** 892,895 ****
--- 891,896 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	// do the perfmon registration
  	if (NULL == hMod)
***************
*** 932,944 ****
  	WCHAR wz[255];
  
- //	MessageBox(NULL, "UnregisterPerfmon", "Debug", MB_OK);
  	hr = WcaInitialize(hInstall, "UnregisterPerfmon");
  	ExitOnFailure(hr, "failed to initialize");
  
- 	WcaLog(LOGMSG_VERBOSE, "UnregisterPerfmon invoked!");
- 
  	hr = WcaGetProperty(L"CustomActionData", &pwzData);
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
  	// do the perfmon unregistration
  	hr = E_FAIL;
--- 933,944 ----
  	WCHAR wz[255];
  
  	hr = WcaInitialize(hInstall, "UnregisterPerfmon");
  	ExitOnFailure(hr, "failed to initialize");
  
  	hr = WcaGetProperty(L"CustomActionData", &pwzData);
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	// do the perfmon unregistration
  	hr = E_FAIL;
***************
*** 1003,1006 ****
--- 1003,1008 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	pwz = pwzData;
  	hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name
***************
*** 1091,1094 ****
--- 1093,1098 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	pwz = pwzData;
  	hr = WcaReadStringFromCaData(&pwz, &pwzFsKey); // share name
***************
*** 1140,1143 ****
--- 1144,1149 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzCaData);
+ 
  	pwz = pwzCaData;
  	hr = WcaReadStringFromCaData(&pwz, &pwzName);
***************
*** 1384,1387 ****
--- 1390,1395 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	//
  	// Read in the CustomActionData
***************
*** 1502,1505 ****
--- 1510,1515 ----
  	ExitOnFailure(hr, "failed to get CustomActionData");
  
+ 	WcaLog(LOGMSG_TRACEONLY, "CustomActionData: %S", pwzData);
+ 
  	//
  	// Read in the CustomActionData