Commit f68bee1f authored by Gilles Dubois's avatar Gilles Dubois
Browse files

Merge pull request #4 from stweil/master

Fix several typos (mostly found by codespell) Thx to @stweil 
parents 31575672 148670c2
......@@ -48,7 +48,7 @@ protected: // Methods
protected: // Attributes
CObArray m_tPackages; // Array of package to process
CString m_csDownloadFragLatency; // Time to wait betwen fragment downloaded
CString m_csDownloadFragLatency; // Time to wait between fragment downloaded
CString m_csDownloadCycleLatency; // Time to wait between download cycle
CString m_csDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)
CString m_csDownloadPeriodLength; // Number of period in a download cycle
......
......@@ -119,7 +119,7 @@ BOOL CCapExecute::execute( BOOL bScript, LPCTSTR lpstrPath)
continue;
}
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output encoded to UTF-8, trying to reload XML document"), cFinder.GetFilePath());
// UTF-8 encode successfull, try to reload
// UTF-8 encode successful, try to reload
if (!myXml.LoadFile( csOutputFile))
{
m_pLogger->log( LOG_PRIORITY_ERROR, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output is not a valid XML document"), cFinder.GetFilePath());
......
......@@ -38,7 +38,7 @@ CCapacityAbstract::~CCapacityAbstract()
{
}
// Intialization
// Initialization
void CCapacityAbstract::setProlog( CPrologRequest *pProlog)
{
m_pProlog = pProlog;
......
......@@ -212,7 +212,7 @@ BOOL COCSInventoryApp::InitInstance()
****/
if (m_pConfig->isLocalRequired())
{
m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode actived by /LOCAL argument: No network connection"));
m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode activated by /LOCAL argument: No network connection"));
csMessage.Format( _T( "%s\\%s.ocs"), m_pConfig->getLocalInventoryFolder(), getOcsDeviceID()->getDeviceID());
// Create local connection object
if ((pConnexion = new CConnexionLocal( csMessage)) == NULL)
......@@ -322,7 +322,7 @@ BOOL COCSInventoryApp::InitInstance()
DeleteFile( csLabelFile);
}
else
m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label sucessfully retrieved"));
m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label successfully retrieved"));
}
}
......
......@@ -36,7 +36,7 @@
extern "C" {
#endif
// Hook called when agent loads, typicaly used to initialize plugin
// Hook called when agent loads, typically used to initialize plugin
typedef int (*HOOK_START)(void);
OCSINVENTORY_API_EXPORTED int OCS_CALL_START_EXPORTED();
// Hook called before sending prolog to server, typically used to add/modify information to prolog request
......
......@@ -141,7 +141,7 @@ int CPlugins::Load( LPCTSTR lpstrPath)
nCount++;
}
cFinder.Close();
m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) succesfully loaded on %d DLL(s) found"), nPlugin, nCount);
m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) successfully loaded on %d DLL(s) found"), nPlugin, nCount);
return nPlugin;
}
catch (CException *pEx)
......
......@@ -45,7 +45,7 @@ public:
CPlugins();
virtual ~CPlugins();
// Call plugin Hook when agent loads, typicaly used to initialize plugin
// Call plugin Hook when agent loads, typically used to initialize plugin
void startHook();
// Call plugin Hook before sending prolog to server, typically used to add/modify information to prolog request
void prologWriteHook(CPrologRequest*);
......
......@@ -199,7 +199,7 @@
* Activate minimal log file ocsinventory.log by default into %PROGRAMDATA%\OCS Inventory NG\Agent
* Delay WMI first use until app start, to fix hang under Vista and higher. WMI cannot be used until WinMain starts
* Review WMI code, and use WMI to get Logical drives
* Add service description and dependancies to standards windows services RPCSS, EventLog, WMI and Tcpip
* Add service description and dependencies to standards windows services RPCSS, EventLog, WMI and Tcpip
* Bug #568534 and #493609: Add 64 bits support for registry key
* Bug #563796: NOTIFY should send the IPGATEWAY
* Bug #484115: Frequency of inventory for ip_discover computer
......
......@@ -120,7 +120,7 @@ BOOL CHTTPCrypt::retrievePreKey()
BOOL CHTTPCrypt::encrypt( CString &csInput, CString &csOutput)
{
BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated intialization vector
BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated initialization vector
EVP_CIPHER_CTX oEncCtx; // Cipher context
const EVP_CIPHER *oChiper = NULL; // Cipher object
LPBYTE pInBuffer = NULL, // Input buffer for data to encipher
......
......@@ -70,11 +70,11 @@ protected: //Attributes
CLog *m_pLogger;
CConfig *m_pConfig;
CConnexionAbstract *m_pConnexion;
UINT m_uDownloadFragLatency; // Time to wait betwen fragment downloaded
UINT m_uDownloadFragLatency; // Time to wait between fragment downloaded
UINT m_uDownloadCycleLatency; // Time to wait between download cycle
UINT m_uDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)
UINT m_uDownloadPeriodLength; // Number of period in a download cycle
UINT m_uDownloadTimeout; // Package deployement Timeout in days
UINT m_uDownloadTimeout; // Package deployment timeout in days
UINT m_uCommandTimeout; // Command Execution Timeout in minutes
BOOL m_bDownloadOn; // Is download enabled
CBlackList m_BlackList; // Blacklist of package IDs, package to not process during the period
......
......@@ -104,7 +104,7 @@ BOOL CPackage::load( LPCTSTR lpstrFile)
if (m_csAction == OCS_DOWNLOAD_ACTION_LAUNCH)
{
// In LAUNCH, command is in the NAME atribute
// In LAUNCH, command is in the NAME attribute
if( !ExpandEnvironmentStrings( m_csName, cCommand, 255 ))
{
return FALSE;
......@@ -705,7 +705,7 @@ BOOL CPackage::isBuilt()
// Check if first fragment exist
csFile.Format( _T( "%s\\%s\\%s-1"), getDownloadFolder(), m_csID, m_csID);
if (fileExists( csFile))
// Package not built, or previous build unsuccessfull
// Package not built, or previous build unsuccessful
return FALSE;
// Check if ZIP exist
csFile.Format( _T( "%s\\%s\\%s"), getDownloadFolder(), m_csID, OCS_DOWNLOAD_BUILD);
......
......@@ -104,7 +104,7 @@ protected:
BOOL regReadPackageDigest( CString &csDigest);
// Delete package digest from registry
BOOL regDeletePackageDigest();
// Is execution result successfull
// Is execution result successful
BOOL isExecSuccessful( int nExitCode, CString &csStatus);
protected:
......@@ -131,7 +131,7 @@ protected:
CString m_csNotifyText; // Before package action user notification text
BOOL m_bNotifyCanAbort; // Is user able to abort package setup
BOOL m_bNotifyCanDelay; // Is user able to report package setup at next agent execution
BOOL m_bNeedDoneAction; // Do we have to notify user after package successfull execution
BOOL m_bNeedDoneAction; // Do we have to notify user after package successful execution
CString m_csNeedDoneActionText; // After package success notification text
};
......
......@@ -212,10 +212,10 @@ echo * *
echo * Please, fix problem before trying to build OCS Inventory NG ! *
echo * *
echo * Here is some common errors: *
echo * - Have you reviewed paths at the begining of this batch file ? *
echo * - Have you reviewed paths at the beginning of this batch file ? *
echo * - Have you updated Visual C++ version in cURL Makefile ? *
echo * - Have you build ZipArchive "Release Unicode STL MD DLL" ? *
echo * *
echo *************************************************************************
:END
\ No newline at end of file
:END
......@@ -71,7 +71,7 @@ State=0
[Field 9]
Type=Checkbox
Text=Immediatly launch inventory (= /NOW)
Text=Immediately launch inventory (= /NOW)
Left=15
Right=290
Top=120
......
......@@ -597,11 +597,11 @@ ParseCmd_NoSplash_End:
; /UPGRADE switch to set deployment status
${GetOptions} '$9' '/UPGRADE' $R0
IfErrors 0 ParseCmd_Upgrade
; Do not write deployement status file
; Do not write deployment status file
StrCpy $OcsUpgrade "FALSE"
goto ParseCmd_Upgrade_End
ParseCmd_Upgrade:
; Write deployement status file
; Write deployment status file
StrCpy $OcsUpgrade "TRUE"
ParseCmd_Upgrade_End:
; Remove parsed arg from command line
......@@ -1177,7 +1177,7 @@ FunctionEnd
# stored by agent into the same folder as the installer
#####################################################################
Function WriteAgentSetupDone
; Write deployement status file if required
; Write deployment status file if required
StrCmp "$OcsUpgrade" "TRUE" 0 WriteAgentSetupDone_end
; Read package ID from same directory as the installer
FileOpen $0 "$EXEDIR\OCSNG-Windows-Agent-PackageID" r
......@@ -1517,7 +1517,7 @@ UpgradeSkipUnregister:
IfErrors 0 +3
StrCpy $logBuffer "Failed to remove key, but non blocking !"
Call Write_Log
; Ensure service uninstall and migration process successfull
; Ensure service uninstall and migration process successful
IfFileExists "$INSTDIR\PsApi.dll" TestInstall_Upgrade_Error
StrCpy $logBuffer "$\r$\nMigration process from old agent 4000 series succesfull, continuing setup...$\r$\n"
Call Write_Log
......@@ -1571,7 +1571,7 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)
; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatibility only (DOES NOT WORK ON XP AND HIGHER)
SetOutPath "$INSTDIR"
File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.CRT.manifest"
Iferrors 0 +5
......@@ -1597,7 +1597,7 @@ Section "OCS Inventory Agent" SEC03
Call Write_Log
strcpy $installSatus ":("
clearerrors
; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)
; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatibility only (DOES NOT WORK ON XP AND HIGHER)
File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.MFC.manifest"
Iferrors 0 +5
StrCpy $logBuffer "$logBuffer ERROR copying \Microsoft.VC90.MFC.manifest $\r$\n"
......@@ -1913,14 +1913,14 @@ SectionEnd
#####################################################################
# This function writes install status into log file when sucessfull install
# This function writes install status into log file when successful install
#####################################################################
Function .onInstSuccess
strcmp "$installSatus" ";-)" 0 onInstSuccess_Error
Push "SUCCESS"
Call WriteAgentSetupDone
${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfuly installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "
StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfully installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "
Call Write_Log
goto onInstSuccess_end
onInstSuccess_Error:
......
......@@ -36,7 +36,7 @@ Just download this package and unzip it into nsis_agent_setup folder.
MS11-025 critical fix introduces incompatibilty problem of MS CRT/MFC 9.0 with
Windows 2000 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx).
So for Windows 2000 only, w've choosen to install original MS CRT/MFC
So for Windows 2000 only, we have chosen to install original MS CRT/MFC
9.00.21022.8 provided with Visual C++ 2008 without Service Pack or hot fixes.
You must put these files into "vc2008_redist_9.00.21022.8_for_Windows_2000"
sub directory before building NSIS installer.
......@@ -49,7 +49,7 @@ INSTALLER COMMAND LINE OPTIONS
- /NOSPLASH disable spash screen when installer starts
- /UPGRADE to deploy new agent through OCS deployement feature.
- /UPGRADE to deploy new agent through OCS deployment feature.
Because you upgrade agent using agent itself to run the upgrade, it is needed
to notify the installer (which terminates agent's processes) to specify the
result in order to send it back to the server next time agent will run
......@@ -82,4 +82,4 @@ parameters (see agent's options for more detail):
We hope it will works for you !
OCS Inventory Team
\ No newline at end of file
OCS Inventory Team
......@@ -180,7 +180,7 @@ BOOL CConfig::load( LPCTSTR lpstrFile)
m_csLocal.ReleaseBuffer();
// Scan for installed software or not
m_bNoSoftware = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoSoftware"), FALSE, m_csConfigFile);
// Scanning HKEY_CURRENT_USER hive for printers and sofware
// Scanning HKEY_CURRENT_USER hive for printers and software
m_bHKCU = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "HKCU"), FALSE, m_csConfigFile);
// Disable prompting user for TAG value
m_bNoTag = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoTAG"), FALSE, m_csConfigFile);
......
......@@ -107,7 +107,7 @@ public: // Methods
// What's the content of TAG (/TAG:"tag value")
BOOL isTagTextProvided();
LPCTSTR getTagText();
// Does agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)
// Does agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
BOOL isHkcuRequired();
// Is Inventory forced (/FORCE)
BOOL isForceInventoryRequired();
......@@ -141,7 +141,7 @@ public: // Methods
void setIpDiscoverLatency(LPCTSTR lpstrLatency = NULL);
// Does agent launches a fast IpDiscover scan, without taking care of network load, or not
void setFastIpRequired( BOOL bFast = TRUE);
// Set if agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)
// Set if agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
void setHkcuRequired( BOOL bHKCU = TRUE);
// Set Communication Provider DLL to use without extension .DLL
void setCommunicationProvider( LPCTSTR lpstrDll);
......
......@@ -145,7 +145,7 @@ BOOL CDeviceid::writeDeviceid()
delete pCb;
return FALSE;
}
// All sucessfull
// All successful
delete pCb;
return TRUE;
}
......
......@@ -51,7 +51,7 @@ public:
* We don't care about command ending, so stdout and stderr
* will not be grabbed, and we will not try to get process
* exit code
* Return EXEC_SUCCESSFULL if all successfull
* Return EXEC_SUCCESSFULL if all successful
* EXEC_ERROR_START_COMMAND if start command error
*/
int execNoWait(LPCTSTR lpstrCommand, LPCTSTR lpstrPath);
......@@ -59,12 +59,12 @@ public:
/**
* Exec command in the directory path. Make sure that the
* executable is either in the path or specify the full path.
* We will try to get process exit code (use getExitCode() to retreive it).
* We will try to get process exit code (use getExitCode() to retrieve it).
* If bCapture is TRUE, stdout and stderr will be grabbed (use getOutput()
* to retreive it)
* to retrieve it)
* We will wait until command end (but if command starts other
* processes/threads, we will not be able to wait for those ending)
* Return EXEC_SUCCESSFULL if all successfull
* Return EXEC_SUCCESSFULL if all successful
* EXEC_ERROR_START_COMMAND if start command error
* EXEC_ERROR_WAIT_COMMAND if wait or get exit code/ouput error,
*/
......@@ -75,7 +75,7 @@ public:
* executable is either in the path or specify the full path.
* Wait for command AND ALL others threads/processes it may launch to finish.
* In this case, we try get exit code, but NOT stdout and stderr
* Return EXEC_SUCCESSFULL if all successfull
* Return EXEC_SUCCESSFULL if all successful
* EXEC_ERROR_START_COMMAND if start command error
* EXEC_ERROR_WAIT_COMMAND if wait error,
*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment