*** empty log message ***

svn path=/trunk/boinc/; revision=4864
This commit is contained in:
Rom Walton 2004-12-16 19:00:46 +00:00
parent bb9b5d8d69
commit 5f239ec229
1 changed files with 18 additions and 11 deletions

View File

@ -32,6 +32,13 @@ Const msiMessageTypeActionData = &H09000000
Const msiMessageTypeProgress = &H0A000000 Const msiMessageTypeProgress = &H0A000000
Const msiMessageTypeCommonData = &H0B000000 Const msiMessageTypeCommonData = &H0B000000
Const msiDoActionStatusNoAction = 0
Const msiDoActionStatusSuccess = 1
Const msiDoActionStatusUserExit = 2
Const msiDoActionStatusFailure = 3
Const msiDoActionStatusSuspend = 4
Const msiDoActionStatusFinished = 5
'' ''
'' Detect the previous version of BOINC if it was installed with the old installer '' Detect the previous version of BOINC if it was installed with the old installer
@ -51,14 +58,14 @@ Function DetectOldInstaller()
oRecord.IntegerData(1) = 25000 oRecord.IntegerData(1) = 25000
Message msiMessageTypeInfo, oRecord Message msiMessageTypeInfo, oRecord
DetectOldInstaller = 1 DetectOldInstaller = msiDoActionStatusSuccess
Exit Function Exit Function
Else Else
oRecord.IntegerData(1) = 25001 oRecord.IntegerData(1) = 25001
Message msiMessageTypeFatalExit Or vbCritical Or vbOKOnly, oRecord Message msiMessageTypeFatalExit Or vbCritical Or vbOKOnly, oRecord
End If End If
DetectOldInstaller = 3 DetectOldInstaller = msiDoActionStatusFailure
End Function End Function
@ -84,19 +91,19 @@ Function DetectUsername()
If ( Len(strValue) = 0 ) Then If ( Len(strValue) = 0 ) Then
strUserName = oNetwork.UserName strUserName = oNetwork.UserName
If ( Err.Number <> 0 ) Then If ( Err.Number <> 0 ) Then
DetectUsername = 3 DetectUsername = msiDoActionStatusFailure
Exit Function Exit Function
End If End If
strUserDomain = oNetwork.UserDomain strUserDomain = oNetwork.UserDomain
If ( Err.Number <> 0 ) Then If ( Err.Number <> 0 ) Then
DetectUsername = 3 DetectUsername = msiDoActionStatusFailure
Exit Function Exit Function
End If End If
strComputerName = oNetwork.ComputerName strComputerName = oNetwork.ComputerName
If ( Err.Number <> 0 ) Then If ( Err.Number <> 0 ) Then
DetectUsername = 3 DetectUsername = msiDoActionStatusFailure
Exit Function Exit Function
End If End If
@ -109,7 +116,7 @@ Function DetectUsername()
Property("SERVICE_USERNAME") = strNewValue Property("SERVICE_USERNAME") = strNewValue
End If End If
DetectUsername = 1 DetectUsername = msiDoActionStatusSuccess
End Function End Function
@ -131,7 +138,7 @@ Function ValidateSetupType()
oRecord.IntegerData(1) = 25002 oRecord.IntegerData(1) = 25002
Message msiMessageTypeFatalExit, oRecord Message msiMessageTypeFatalExit, oRecord
ValidateSetupType = 3 ValidateSetupType = msiDoActionStatusFailure
Exit Function Exit Function
End If End If
Else Else
@ -139,13 +146,13 @@ Function ValidateSetupType()
oRecord.IntegerData(1) = 25005 oRecord.IntegerData(1) = 25005
Message msiMessageTypeFatalExit, oRecord Message msiMessageTypeFatalExit, oRecord
ValidateSetupType = 3 ValidateSetupType = msiDoActionStatusFailure
Exit Function Exit Function
End If End If
End If End If
End If End If
ValidateSetupType = 1 ValidateSetupType = msiDoActionStatusSuccess
End Function End Function
@ -179,7 +186,7 @@ Function CopyAccountFiles()
oRecord.IntegerData(1) = 25003 oRecord.IntegerData(1) = 25003
Message msiMessageTypeInfo, oRecord Message msiMessageTypeInfo, oRecord
CopyAccountFiles = 1 CopyAccountFiles = msiDoActionStatusSuccess
Exit Function Exit Function
Else Else
oRecord.IntegerData(1) = 25004 oRecord.IntegerData(1) = 25004
@ -187,5 +194,5 @@ Function CopyAccountFiles()
End If End If
End If End If
CopyAccountFiles = 3 CopyAccountFiles = msiDoActionStatusFailure
End Function End Function