Menu
▾
▴
[WiX-commits] wix/src/ca/wcautil custommsierrors.h,1.6,1.7
|
From: Rob M. <ro...@us...> - 2008-08-29 09:52:48
|
Update of /cvsroot/wix/wix/src/ca/wcautil In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17775/src/ca/wcautil Modified Files: custommsierrors.h Log Message: WixBuild: Version 3.0.4422.0 MiCarls: SFBug:1848752 - NativeImage CA detects GAC'd assemblies incorrectly Also fix a regression that occured in the bugfix for SFBug:1848762 RobMen: SFBUG:1591591 - don't fail when there is no data for ScaWebSvcExtCommit(). BobArnso: Expose MSBuild /verbosity switch from make.bat and wix.build EricStJ: Allow CloseApps to send close messages to apps with multiple top-most windows. a-DaMans: SFBUG:2041989 - Candle exception when inculding an invalid wxi file. BobArnso: Integrate fix for sfbug:2010047 RobMen: SFBUG:1741663 - don't always fail products with AppPools on XP. BobArnso: Fix sfbug:2077095 [Firewall Extension fails] by adding abort/retry/ignore dialog like WixIIsExtension. AaronSte: Add WixExitEarlyWithSuccess custom action to provide an option to exit early in major upgrade out of order installs but not fail the install process. AaronSte: Adding VS 2008 SP1 detection properties to WixVSExtension. CandyC: CHM Updates. Index: custommsierrors.h =================================================================== RCS file: /cvsroot/wix/wix/src/ca/wcautil/custommsierrors.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** custommsierrors.h 27 Jun 2007 05:36:04 -0000 1.6 --- custommsierrors.h 29 Aug 2008 09:52:43 -0000 1.7 *************** *** 2,18 **** //--------------------------------------------------------------------------- // CustomMsiErrors.h ! // Indexes for office custom errors in the MSI // - // Created 3/12/00 AndrewH - RADDev - // // Note: Custom Errors must be in the range 25000-30000, all other error // codes are reserved for the Windows Installer as standard error ranges // NEVER reuse an error number or you're likely to break the builds. - // //--------------------------------------------------------------------------- // Instructions: // 1. add the index to this file ! // 2. define the error table entry in msi\src\sdl\misc\CustomErrors.sdl // 3. #include CustomMsiErrors to refer to the index // 4. Import Misc\CustomErrors { MYDEFINE=1 }; with your errorgroup under MYDEFINE --- 2,15 ---- //--------------------------------------------------------------------------- // CustomMsiErrors.h ! // Indexes for custom errors in the MSI // // Note: Custom Errors must be in the range 25000-30000, all other error // codes are reserved for the Windows Installer as standard error ranges // NEVER reuse an error number or you're likely to break the builds. //--------------------------------------------------------------------------- // Instructions: // 1. add the index to this file ! // 2. define the error table row // 3. #include CustomMsiErrors to refer to the index // 4. Import Misc\CustomErrors { MYDEFINE=1 }; with your errorgroup under MYDEFINE *************** *** 20,99 **** //--------------------------------------------------------------------------- - // Office Core 25000-25089 - - #define OFFICE_ERROR_BASE 25000 - - #define msierrFirstRunNotAdmin 25002 - #define msierrMsiidSourceConsistency 25003 - - //--------------------------------------------------------------------------- - // LocalCache 25090-25099 - - #define LOCALCACHE_ERROR_BASE 25090 - - #define msierrFailedInitializeInjector 25090 - #define msierrFailedChangeSource 25091 - - //--------------------------------------------------------------------------- - // OWS 25101-25200 - #define OWS_ERROR_BASE 25101 - - #define msierrOws1 25101 - - // STSTPKPL 25111-25120 -- within STS range - #define msierrStstpkplNeeds_STS2 25111 - #define msierrNoLaunchFromChainer 25112 - - //--------------------------------------------------------------------------- - // O10 91581: put up nice error dialog on particular error calling IE - // OSP 25201-25220 - #define OSP_ERROR_BASE 25201 - - #define msierrIE5SetupNotAvailable 25201 - #define msierrIE5SetupCannotInstall 25202 - - - //--------------------------------------------------------------------------- - // SKU variation - // SKU features' range 25301-25400 - #define SKU_ERROR_BASE 25301 - - #define msierrAdminNotSupported 25301 - #define msierrQuietNotSupported 25302 - #define msierrCIWNotSupported 25303 - #define msierrPidkeyRequired 25304 - #define msierrOfficeLiteOverFull 25305 - #define msierrCMWNotSupported 25306 - - //--------------------------------------------------------------------------- - // ORK 25401-25450 - #define ORK_ERROR_BASE 25401 - - #define msierrOrkPolEditSql 25401 - #define msierrOrkPolEditSql2 25402 - #define msierrOrkPolEditData 25403 - #define msierrOrkPolEditReg 25404 - - //--------------------------------------------------------------------------- - // MUI 25451 - 25500 - #define MUI_ERROR_BASE 25451 - - #define msierrMUINotSupported 25452 - - //--------------------------------------------------------------------------- // GLOBAL 25501-25600 #define GLOBAL_ERROR_BASE 25501 - #define msierrUrlTransformReq 25501 - #define msierrFeatureDepSql 25502 - #define msierrFeatureDepReadData 25503 - #define msierrFeatureDepFailed 25504 - #define msierrTSPidkeyRequired 25505 - #define msierrOSPCheckInsufficientVersion 25506 - #define msierrOSPCheckNoAccess 25507 - #define msierrOSPCheckAbsent 25508 - #define msierrOSPCheckAbsentOrNoAccess 25509 - #define msierrOSPCheckMissing 25510 - #define msierrSecureObjectsFailedCreateSD 25520 #define msierrSecureObjectsFailedSet 25521 --- 17,23 ---- *************** *** 110,113 **** --- 34,39 ---- #define msierrXmlConfigFailedSave 25543 + #define msierrFirewallCannotConnect 25580 + //--------------------------------------------------------------------------- // Server CustomAction Errors |