[WiX-commits] wix/src/ca/serverca/scasched scasmbsched.cpp,1.2,1.3 scauser.cpp,1.1,1.2 scauser.h,1.1,1.2

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

Update of /cvsroot/wix/wix/src/ca/serverca/scasched
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25943/src/ca/serverca/scasched

Modified Files:
	scasmbsched.cpp scauser.cpp scauser.h 
Log Message:
all - fix multi-line response files
compiler - sfbug:1123827 - allow icon RadioButtons
sca - cleanup error messages

Index: scauser.cpp
===================================================================
RCS file: /cvsroot/wix/wix/src/ca/serverca/scasched/scauser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scauser.cpp	2 May 2005 05:48:37 -0000	1.1
--- scauser.cpp	13 May 2005 01:48:17 -0000	1.2
***************
*** 422,425 ****
--- 422,426 ----
  
  					er = ::NetApiBufferFree((LPVOID)pUserInfo);
+ 					pUserInfo = NULL;
  				}
  				ExitOnFailure1(hr = HRESULT_FROM_WIN32(er), "failed user existence check on user: %S", psu->wzName);
***************
*** 489,492 ****
--- 490,496 ----
  
  LExit:
+ 	if (pUserInfo)
+ 		::NetApiBufferFree((LPVOID)pUserInfo);
+ 
  	ReleaseStr(pwzActionData);
  

Index: scauser.h
===================================================================
RCS file: /cvsroot/wix/wix/src/ca/serverca/scasched/scauser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scauser.h	2 May 2005 05:48:37 -0000	1.1
--- scauser.h	13 May 2005 01:48:17 -0000	1.2
***************
*** 57,64 ****
  	SCA_GROUP* pscag
  	);
- HRESULT __stdcall ScaGetGroup(
- 	LPCWSTR wzGroup, 
- 	SCA_GROUP* pscag
- 	);
  HRESULT ScaBuildDomainUserName(
  	WCHAR* wzDest, 
--- 57,60 ----

Index: scasmbsched.cpp
===================================================================
RCS file: /cvsroot/wix/wix/src/ca/serverca/scasched/scasmbsched.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scasmbsched.cpp	3 May 2005 15:18:43 -0000	1.2
--- scasmbsched.cpp	13 May 2005 01:48:17 -0000	1.3
***************
*** 194,198 ****
  			pss->fLegacyUserProvided = TRUE;
  			hr = ScaGetUser(pwzData, &pss->scau);
! 			ExitOnFailure1(hr, "Failed to get user information for database: '%S'", pss->wzShareName);
  		}
  		else
--- 194,198 ----
  			pss->fLegacyUserProvided = TRUE;
  			hr = ScaGetUser(pwzData, &pss->scau);
! 			ExitOnFailure1(hr, "Failed to get user information for fileshare: '%S'", pss->wzShareName);
  		}
  		else
***************
*** 269,276 ****
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData);
! 	ExitOnFailure(hr, "failed to add DBKey to CustomActionData");
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData);
! 	ExitOnFailure(hr, "failed to add DBKey to CustomActionData");
  
  	hr = WcaWriteStringToCaData(pss->wzDescription, &pwzCustomActionData);
--- 269,276 ----
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzRollbackCustomActionData);
! 	ExitOnFailure(hr, "failed to add ShareName to CustomActionData");
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData);
! 	ExitOnFailure(hr, "failed to add ShareName to CustomActionData");
  
  	hr = WcaWriteStringToCaData(pss->wzDescription, &pwzCustomActionData);
***************
*** 353,357 ****
  		{
  			hr = SchedCreateSmb(pss);
! 			ExitOnFailure1(hr, "Failed to ensure database %S exists", pss->wzShareName);
  		}
  	}
--- 353,357 ----
  		{
  			hr = SchedCreateSmb(pss);
! 			ExitOnFailure1(hr, "Failed to schedule the creation of the fileshare: %S", pss->wzShareName);
  		}
  	}
***************
*** 374,378 ****
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData);
! 	ExitOnFailure(hr, "failed to add DBKey to CustomActionData");
  
  	hr = WcaDoDeferredAction(L"DropSmb", pwzCustomActionData, COST_SMB_DROPSMB);
--- 374,378 ----
  
  	hr = WcaWriteStringToCaData(pss->wzShareName, &pwzCustomActionData);
! 	ExitOnFailure(hr, "failed to add ShareName to CustomActionData");
  
  	hr = WcaDoDeferredAction(L"DropSmb", pwzCustomActionData, COST_SMB_DROPSMB);
***************
*** 460,464 ****
  		ExitOnFailure(hr, "Failed to get FileSharePermissions.User");
  		hr = ScaGetUser(pwzData, &pExUserPerms->scau);
! 		ExitOnFailure1(hr, "Failed to get user information for database: '%S'", pss->wzShareName);
  
  		hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions);
--- 460,464 ----
  		ExitOnFailure(hr, "Failed to get FileSharePermissions.User");
  		hr = ScaGetUser(pwzData, &pExUserPerms->scau);
! 		ExitOnFailure1(hr, "Failed to get user information for fileshare: '%S'", pss->wzShareName);
  
  		hr = WcaGetRecordInteger(hRec, ssupqPermissions, &pExUserPerms->nPermissions);