Do konca sem usposobil podporo za delo z registrom.
Nekaj skupnih sporočil o napakah sem preselil iz MSITSCA sem. Branje in zapisovanje na tok podatkov ATL::CAtlFile zdaj preverja dolžino prebranih/zapisanih podatkov. Estetski popravki. Verzijo sem nastavil na 1.0.1.
This commit is contained in:
Simon Rozman
parent
dba8f12586
commit
83e41fc94b
@ -1,8 +1,5 @@
|
||||
#include "StdAfx.h"
|
||||
|
||||
#pragma comment(lib, "msi.lib")
|
||||
#pragma comment(lib, "mstask.lib")
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// Local constants
|
||||
@ -179,26 +176,26 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
|
||||
sSequenceFilename2.Format(_T("%.*ls-cm%ls"), pszExtension - (LPCTSTR)sSequenceFilename, (LPCTSTR)sSequenceFilename, pszExtension);
|
||||
uiResult = ::MsiSetProperty(hInstall, _T("CommitScheduledTasks"), sSequenceFilename2);
|
||||
if (uiResult != ERROR_SUCCESS) {
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_SCHEDULED_TASKS_PROPERTY_SET) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("CommitScheduledTasks") ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_PROPERTY_SET) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("CommitScheduledTasks")) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
::MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecordProg);
|
||||
}
|
||||
} else {
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_SCHEDULED_TASKS_PROPERTY_SET) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("RollbackScheduledTasks") ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_PROPERTY_SET ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("RollbackScheduledTasks")) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
::MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecordProg);
|
||||
}
|
||||
} else {
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_SCHEDULED_TASKS_PROPERTY_SET) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("InstallScheduledTasks") ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_PROPERTY_SET ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, _T("InstallScheduledTasks")) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, uiResult ) == ERROR_SUCCESS);
|
||||
::MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecordProg);
|
||||
}
|
||||
if (uiResult != ERROR_SUCCESS) ::DeleteFile(sSequenceFilename);
|
||||
} else {
|
||||
uiResult = ERROR_INSTALL_SCHEDULED_TASKS_SCRIPT_WRITE;
|
||||
uiResult = ERROR_INSTALL_SCRIPT_WRITE;
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, uiResult ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, sSequenceFilename) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, hr ) == ERROR_SUCCESS);
|
||||
@ -219,7 +216,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
uiResult = ERROR_INSTALL_SCHEDULED_TASKS_DATABASE_OPEN;
|
||||
uiResult = ERROR_INSTALL_DATABASE_OPEN;
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, uiResult) == ERROR_SUCCESS);
|
||||
::MsiProcessMessage(hInstall, INSTALLMESSAGE_ERROR, hRecordProg);
|
||||
}
|
||||
@ -314,7 +311,7 @@ UINT MSITSCA_API InstallScheduledTasks(MSIHANDLE hInstall)
|
||||
// Sequence loading failed. Probably, LOCAL SYSTEM doesn't have read access to user's temp directory.
|
||||
PMSIHANDLE hRecordProg = ::MsiCreateRecord(3);
|
||||
assert(hRecordProg);
|
||||
uiResult = ERROR_INSTALL_SCHEDULED_TASKS_SCRIPT_READ;
|
||||
uiResult = ERROR_INSTALL_SCRIPT_READ;
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 1, uiResult ) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetString (hRecordProg, 2, sSequenceFilename) == ERROR_SUCCESS);
|
||||
verify(::MsiRecordSetInteger(hRecordProg, 3, hr ) == ERROR_SUCCESS);
|
||||
|
||||
@ -132,11 +132,7 @@ Vse :: "$(JEZIK).$(CFG).$(PLAT).Error-2.idt"
|
||||
Error Message
|
||||
i2 L0
|
||||
1250 Error Error
|
||||
2550 Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na svojo tehnično službo.
|
||||
2551 Pri pripravi seznama razvršèenih opravil je prišlo do napake [2]. Obrnite se na svojo tehnièno službo.
|
||||
2552 Pri pisanju v datoteko seznama razporejenih opravil »[2]« je prišlo do napake [3]. Obrnite se na svojo tehnično službo.
|
||||
2553 Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na svojo tehnično službo.
|
||||
2560 Pri branju iz datoteke seznama razporejenih opravil »[2]« je prišlo do napake [3]. Obrnite se na svojo tehnično službo.
|
||||
<<NOKEEP
|
||||
|
||||
"De.$(CFG).$(PLAT).Error-2.idt" : "Sl.$(CFG).$(PLAT).Error-2.idtx" "..\res\de_DE.po"
|
||||
|
||||
@ -2,7 +2,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: MSITSCA\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-04-26 11:07+0100\n"
|
||||
"POT-Creation-Date: 2013-06-07 20:27+0100\n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
|
||||
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
|
||||
@ -34,8 +34,6 @@ msgstr "0x409"
|
||||
# Privzeta kodna stran ANSI za ta jezik (desetiško)
|
||||
#: MSITSCA.rcx:61 ..\msm/Sl.DebugU.Win32.ActionText-2.idtx:3
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:3
|
||||
#: ..\msm/Sl.DebugU.x64.ActionText-2.idtx:3
|
||||
#: ..\msm/Sl.DebugU.x64.Error-2.idtx:3
|
||||
msgid "1250"
|
||||
msgstr "1252"
|
||||
|
||||
@ -70,37 +68,7 @@ msgstr "SUBLANG_DEFAULT"
|
||||
msgid "Vse pravice pridržane © Amebis, d. o. o., Kamnik, 2012"
|
||||
msgstr "Copyright © Amebis, d. o. o., Kamnik, 2012"
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:8 ..\msm/Sl.DebugU.x64.Error-2.idtx:8
|
||||
msgid ""
|
||||
"Pri branju iz datoteke seznama razporejenih opravil »[2]« je prišlo do "
|
||||
"napake [3]. Obrnite se na svojo tehnično službo."
|
||||
msgstr ""
|
||||
"Error [3] reading from \"[2]\" scheduled task list file. Please, contact "
|
||||
"your support personnel."
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:7 ..\msm/Sl.DebugU.x64.Error-2.idtx:7
|
||||
msgid ""
|
||||
"Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na "
|
||||
"svojo tehnično službo."
|
||||
msgstr ""
|
||||
"Error [3] setting \"[2]\" parameter. Please, contact your support personnel."
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:4 ..\msm/Sl.DebugU.x64.Error-2.idtx:4
|
||||
msgid ""
|
||||
"Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na svojo "
|
||||
"tehnično službo."
|
||||
msgstr ""
|
||||
"Error opening installation package. Please, contact your support personnel."
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:6 ..\msm/Sl.DebugU.x64.Error-2.idtx:6
|
||||
msgid ""
|
||||
"Pri pisanju v datoteko seznama razporejenih opravil »[2]« je prišlo do "
|
||||
"napake [3]. Obrnite se na svojo tehnično službo."
|
||||
msgstr ""
|
||||
"Error [3] writing to \"[2]\" scheduled task list file. Please, contact your "
|
||||
"support personnel."
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:5 ..\msm/Sl.DebugU.x64.Error-2.idtx:5
|
||||
#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:4
|
||||
msgid ""
|
||||
"Pri pripravi seznama razvrščenih opravil je prišlo do napake [2]. Obrnite se "
|
||||
"na svojo tehnično službo."
|
||||
@ -109,11 +77,37 @@ msgstr ""
|
||||
"personnel."
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.ActionText-2.idtx:4
|
||||
#: ..\msm/Sl.DebugU.x64.ActionText-2.idtx:4
|
||||
msgid "Razporejeno opravilo: [1]"
|
||||
msgstr "Scheduled task: [1]"
|
||||
|
||||
#: ..\msm/Sl.DebugU.Win32.ActionText-2.idtx:4
|
||||
#: ..\msm/Sl.DebugU.x64.ActionText-2.idtx:4
|
||||
msgid "Registracija razporejenih opravil"
|
||||
msgstr "Registering scheduled tasks"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Pri branju iz datoteke seznama razporejenih opravil »[2]« je prišlo do "
|
||||
#~ "napake [3]. Obrnite se na svojo tehnično službo."
|
||||
#~ msgstr ""
|
||||
#~ "Error [3] reading from \"[2]\" scheduled task list file. Please, contact "
|
||||
#~ "your support personnel."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na "
|
||||
#~ "svojo tehnično službo."
|
||||
#~ msgstr ""
|
||||
#~ "Error [3] setting \"[2]\" parameter. Please, contact your support "
|
||||
#~ "personnel."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na "
|
||||
#~ "svojo tehnično službo."
|
||||
#~ msgstr ""
|
||||
#~ "Error opening installation package. Please, contact your support "
|
||||
#~ "personnel."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Pri pisanju v datoteko seznama razporejenih opravil »[2]« je prišlo do "
|
||||
#~ "napake [3]. Obrnite se na svojo tehnično službo."
|
||||
#~ msgstr ""
|
||||
#~ "Error [3] writing to \"[2]\" scheduled task list file. Please, contact "
|
||||
#~ "your support personnel."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user