Merge lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent into lp:ocsinventory-windows-agent

Proposed by Stefan Weil on 2015-05-07
Status: Needs review
Proposed branch: lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent
Merge into: lp:ocsinventory-windows-agent
Diff against target: 1049 lines (+101/-101)
46 files modified
Agent/CapDownload.h (+1/-1)
Agent/CapExecute.cpp (+1/-1)
Agent/CapacityAbstract.cpp (+1/-1)
Agent/OCSInventory.cpp (+2/-2)
Agent/PluginApi.h (+1/-1)
Agent/Plugins.cpp (+1/-1)
Agent/Plugins.h (+1/-1)
CHANGELOG (+8/-8)
ComHTTP/HTTPCrypt.cpp (+1/-1)
Download/Download.h (+1/-1)
Download/Package.cpp (+2/-2)
Download/Package.h (+2/-2)
External_Deps/OCS_Make_Required_Libs.bat (+1/-1)
NSIS_agent_setup/Agent.ini (+2/-2)
NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi (+6/-6)
NSIS_agent_setup/Readme.txt (+2/-2)
OCSInventory Front/Config.cpp (+1/-1)
OCSInventory Front/Config.h (+2/-2)
OCSInventory Front/Deviceid.cpp (+1/-1)
OCSInventory Front/ExecCommand.h (+5/-5)
OCSInventory Front/InventoryRequest.cpp (+2/-2)
OCSInventory Front/Log.h (+2/-2)
OCSInventory Front/Markup.cpp (+1/-1)
OCSInventory Front/OcsUtils.cpp (+1/-1)
OCSInventory Front/RequestAbstract.cpp (+1/-1)
OCSInventory Front/commonDownload.h (+1/-1)
OPTIONS.TXT (+2/-2)
OcsNotifyUser/OcsNotifyUser.h (+1/-1)
OcsSystray/SystemTray.cpp (+2/-2)
README.TXT (+5/-5)
Service/NTService.cpp (+1/-1)
Service/OcsService.cpp (+4/-4)
SysInfo/DMI.cpp (+1/-1)
SysInfo/DMI.h (+1/-1)
SysInfo/Dtwinver.cpp (+3/-3)
SysInfo/EDID.cpp (+1/-1)
SysInfo/EDID.h (+3/-3)
SysInfo/Registry.cpp (+9/-9)
SysInfo/SnmpAPI.cpp (+1/-1)
SysInfo/StoragePeripheral.cpp (+1/-1)
SysInfo/SysInfo.cpp (+1/-1)
SysInfo/VMSystem.h (+4/-4)
TestSysInfo/TestSysInfoDlg.cpp (+8/-8)
logon/OcsLogon.nsi (+1/-1)
logon/Readme.txt (+1/-1)
ocsinventory.ini.sample (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent
Reviewer Review Type Date Requested Status
Didier Liroulet 2015-05-07 Pending
Review via email: mp+258540@code.launchpad.net

Description of the change

Fix typos (mostly in comments) found by Codespell.

To post a comment you must log in.

Unmerged revisions

505. By Stefan Weil <email address hidden> on 2015-05-07

Fix typos (most of them were reported by Codespell)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Agent/CapDownload.h'
--- Agent/CapDownload.h 2013-03-28 13:49:37 +0000
+++ Agent/CapDownload.h 2015-05-07 18:53:51 +0000
@@ -48,7 +48,7 @@
4848
49protected: // Attributes49protected: // Attributes
50 CObArray m_tPackages; // Array of package to process50 CObArray m_tPackages; // Array of package to process
51 CString m_csDownloadFragLatency; // Time to wait betwen fragment downloaded51 CString m_csDownloadFragLatency; // Time to wait between fragment downloaded
52 CString m_csDownloadCycleLatency; // Time to wait between download cycle52 CString m_csDownloadCycleLatency; // Time to wait between download cycle
53 CString m_csDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)53 CString m_csDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)
54 CString m_csDownloadPeriodLength; // Number of period in a download cycle54 CString m_csDownloadPeriodLength; // Number of period in a download cycle
5555
=== modified file 'Agent/CapExecute.cpp'
--- Agent/CapExecute.cpp 2013-12-27 12:43:13 +0000
+++ Agent/CapExecute.cpp 2015-05-07 18:53:51 +0000
@@ -119,7 +119,7 @@
119 continue;119 continue;
120 }120 }
121 m_pLogger->log( LOG_PRIORITY_WARNING, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output encoded to UTF-8, trying to reload XML document"), cFinder.GetFilePath());121 m_pLogger->log( LOG_PRIORITY_WARNING, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output encoded to UTF-8, trying to reload XML document"), cFinder.GetFilePath());
122 // UTF-8 encode successfull, try to reload122 // UTF-8 encode successful, try to reload
123 if (!myXml.LoadFile( csOutputFile))123 if (!myXml.LoadFile( csOutputFile))
124 {124 {
125 m_pLogger->log( LOG_PRIORITY_ERROR, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output is not a valid XML document"), cFinder.GetFilePath());125 m_pLogger->log( LOG_PRIORITY_ERROR, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output is not a valid XML document"), cFinder.GetFilePath());
126126
=== modified file 'Agent/CapacityAbstract.cpp'
--- Agent/CapacityAbstract.cpp 2011-05-19 16:55:18 +0000
+++ Agent/CapacityAbstract.cpp 2015-05-07 18:53:51 +0000
@@ -38,7 +38,7 @@
38{38{
39}39}
4040
41// Intialization41// Initialization
42void CCapacityAbstract::setProlog( CPrologRequest *pProlog)42void CCapacityAbstract::setProlog( CPrologRequest *pProlog)
43{43{
44 m_pProlog = pProlog;44 m_pProlog = pProlog;
4545
=== modified file 'Agent/OCSInventory.cpp'
--- Agent/OCSInventory.cpp 2014-04-09 16:22:56 +0000
+++ Agent/OCSInventory.cpp 2015-05-07 18:53:51 +0000
@@ -212,7 +212,7 @@
212 ****/212 ****/
213 if (m_pConfig->isLocalRequired())213 if (m_pConfig->isLocalRequired())
214 {214 {
215 m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode actived by /LOCAL argument: No network connection"));215 m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode activated by /LOCAL argument: No network connection"));
216 csMessage.Format( _T( "%s\\%s.ocs"), m_pConfig->getLocalInventoryFolder(), getOcsDeviceID()->getDeviceID());216 csMessage.Format( _T( "%s\\%s.ocs"), m_pConfig->getLocalInventoryFolder(), getOcsDeviceID()->getDeviceID());
217 // Create local connection object217 // Create local connection object
218 if ((pConnexion = new CConnexionLocal( csMessage)) == NULL)218 if ((pConnexion = new CConnexionLocal( csMessage)) == NULL)
@@ -322,7 +322,7 @@
322 DeleteFile( csLabelFile);322 DeleteFile( csLabelFile);
323 }323 }
324 else324 else
325 m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label sucessfully retrieved")); 325 m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label successfully retrieved"));
326 }326 }
327327
328 }328 }
329329
=== modified file 'Agent/PluginApi.h'
--- Agent/PluginApi.h 2012-08-29 09:30:04 +0000
+++ Agent/PluginApi.h 2015-05-07 18:53:51 +0000
@@ -36,7 +36,7 @@
36extern "C" {36extern "C" {
37#endif37#endif
3838
39// Hook called when agent loads, typicaly used to initialize plugin39// Hook called when agent loads, typically used to initialize plugin
40typedef int (*HOOK_START)(void);40typedef int (*HOOK_START)(void);
41OCSINVENTORY_API_EXPORTED int OCS_CALL_START_EXPORTED();41OCSINVENTORY_API_EXPORTED int OCS_CALL_START_EXPORTED();
42// Hook called before sending prolog to server, typically used to add/modify information to prolog request42// Hook called before sending prolog to server, typically used to add/modify information to prolog request
4343
=== modified file 'Agent/Plugins.cpp'
--- Agent/Plugins.cpp 2012-08-29 09:30:04 +0000
+++ Agent/Plugins.cpp 2015-05-07 18:53:51 +0000
@@ -141,7 +141,7 @@
141 nCount++;141 nCount++;
142 }142 }
143 cFinder.Close();143 cFinder.Close();
144 m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) succesfully loaded on %d DLL(s) found"), nPlugin, nCount);144 m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) successfully loaded on %d DLL(s) found"), nPlugin, nCount);
145 return nPlugin;145 return nPlugin;
146 }146 }
147 catch (CException *pEx)147 catch (CException *pEx)
148148
=== modified file 'Agent/Plugins.h'
--- Agent/Plugins.h 2012-08-29 09:30:04 +0000
+++ Agent/Plugins.h 2015-05-07 18:53:51 +0000
@@ -45,7 +45,7 @@
45 CPlugins();45 CPlugins();
46 virtual ~CPlugins();46 virtual ~CPlugins();
4747
48 // Call plugin Hook when agent loads, typicaly used to initialize plugin48 // Call plugin Hook when agent loads, typically used to initialize plugin
49 void startHook();49 void startHook();
50 // Call plugin Hook before sending prolog to server, typically used to add/modify information to prolog request50 // Call plugin Hook before sending prolog to server, typically used to add/modify information to prolog request
51 void prologWriteHook(CPrologRequest*);51 void prologWriteHook(CPrologRequest*);
5252
=== modified file 'CHANGELOG'
--- CHANGELOG 2014-05-16 22:32:18 +0000
+++ CHANGELOG 2015-05-07 18:53:51 +0000
@@ -10,7 +10,7 @@
102.1.0.4102.1.0.4
11 * Get DMI data using OcsWmi DLL, instead of using own WMI code11 * Get DMI data using OcsWmi DLL, instead of using own WMI code
12 * Fix bug #1062582 Windows agent leaks handles by initializing COM and COM Security into main executable, instead of DLL12 * Fix bug #1062582 Windows agent leaks handles by initializing COM and COM Security into main executable, instead of DLL
13 * Enable more detailled debug logs, and fixes small issues13 * Enable more detailed debug logs, and fixes small issues
142.1.0.3142.1.0.3
15 * Fix XSLT for displaying CPU into "show computer information" command of systrau applet15 * Fix XSLT for displaying CPU into "show computer information" command of systrau applet
16 * Fix Processor S/N filled with CPU Status if no serial number exist16 * Fix Processor S/N filled with CPU Status if no serial number exist
@@ -25,9 +25,9 @@
25 * Fix Bug #1217435: Packager tries to shutdown ocs service twice when upgrading from 1.X agent25 * Fix Bug #1217435: Packager tries to shutdown ocs service twice when upgrading from 1.X agent
26 * Fix bug displaying before installation user notification at the end of installation, instead of post installation notification text26 * Fix bug displaying before installation user notification at the end of installation, instead of post installation notification text
27 * Add package command start date/time and timeout date/time to log27 * Add package command start date/time and timeout date/time to log
28 * Fix bug #1184426: Retreive processor Serial Number28 * Fix bug #1184426: Retrieve processor Serial Number
29 * Fix bug disabling ability to control command execution timeout from server29 * Fix bug disabling ability to control command execution timeout from server
30 * Try to retreive CPU S/N using WMI30 * Try to retrieve CPU S/N using WMI
31 * There is now DMI table type greater than 127, so remove type lower and upper bound check31 * There is now DMI table type greater than 127, so remove type lower and upper bound check
32 * WMI meory bank type codes are not the same as DMI codes32 * WMI meory bank type codes are not the same as DMI codes
33 * Add printer information (Print server name and share, resolution, comment, Is printer shared, Is printer on network)33 * Add printer information (Print server name and share, resolution, comment, Is printer shared, Is printer on network)
@@ -52,7 +52,7 @@
52 * Fix bug #1045784: Ensure timestamp exists before verify expiration52 * Fix bug #1045784: Ensure timestamp exists before verify expiration
53 * Add download error to differenciate full download timeout ERR_TIMEOUT, execute error crashing agent and entering in loop (ERR_EXECUTE_TOO_MANY_TRY) or execute timeout (ERR_EXECUTE_TIMEOUT).53 * Add download error to differenciate full download timeout ERR_TIMEOUT, execute error crashing agent and entering in loop (ERR_EXECUTE_TOO_MANY_TRY) or execute timeout (ERR_EXECUTE_TIMEOUT).
54 * Rename ERR_ALREADY_SETUP en SUCCESS_ALREADY_SETUP 54 * Rename ERR_ALREADY_SETUP en SUCCESS_ALREADY_SETUP
55 * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retreive and set explicit message55 * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retrieve and set explicit message
56 * Fix bug #980740: As we only read process output each 200ms, we have to read output even after process exited, to capture last outputed data by process56 * Fix bug #980740: As we only read process output each 200ms, we have to read output even after process exited, to capture last outputed data by process
572.0.5.0572.0.5.0
58 * Enhanced dynamic DLL plugin API58 * Enhanced dynamic DLL plugin API
@@ -104,7 +104,7 @@
1042.0.2, aka 2.0.2.01042.0.2, aka 2.0.2.0
105 * Fix Bug #872768: Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted."105 * Fix Bug #872768: Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted."
106 * Ensure all array and objects are correctly freed106 * Ensure all array and objects are correctly freed
107 * Fix Bug #859574: Switch to WMI to retreive Bios infos even if DMI access is successfull, but serial or model is not valid107 * Fix Bug #859574: Switch to WMI to retrieve Bios infos even if DMI access is successful, but serial or model is not valid
108 * Fix Bug #435068: Do not register multiple time a monitor with the same serial108 * Fix Bug #435068: Do not register multiple time a monitor with the same serial
109 * Fix Bug #860466: Propagate inherited permissions from $AppData\OCS Inventory NG\Agent to Download directory109 * Fix Bug #860466: Propagate inherited permissions from $AppData\OCS Inventory NG\Agent to Download directory
1102.0.1, aka 2.0.1.01102.0.1, aka 2.0.1.0
@@ -124,7 +124,7 @@
124 * When upgrading from agent 1.X, do not copy cacert.pem from INSTDIR to APPDATADIR if file exists into APPDATADIR, to allow changing cacert.pem using Packager124 * When upgrading from agent 1.X, do not copy cacert.pem from INSTDIR to APPDATADIR if file exists into APPDATADIR, to allow changing cacert.pem using Packager
125 * Send setup result to server when deploying new OCS agent, without interfering with other package download125 * Send setup result to server when deploying new OCS agent, without interfering with other package download
126 * Fix bug #783611 semicolon added to Type under Bios when using WMI126 * Fix bug #783611 semicolon added to Type under Bios when using WMI
127 * When using WMI, get S/N from Win32_Bios, and if not availble, try Win32_SystemEnclosure then Win32_Baseboard127 * When using WMI, get S/N from Win32_Bios, and if not available, try Win32_SystemEnclosure then Win32_Baseboard
128 * Fix memory leak in WMI Storage query128 * Fix memory leak in WMI Storage query
129 * Delete OCS agent setup done file if found, when cleaning a package129 * Delete OCS agent setup done file if found, when cleaning a package
130 * Build libcurl using _BIND_TO_CURRENT_VCLIBS_VERSION preprocessor define to bind it to the installed CRT versions, and include libcurl manifest as resource into DLL130 * Build libcurl using _BIND_TO_CURRENT_VCLIBS_VERSION preprocessor define to bind it to the installed CRT versions, and include libcurl manifest as resource into DLL
@@ -133,7 +133,7 @@
133 * Fix memory leak into OCsWmi.dll133 * Fix memory leak into OCsWmi.dll
134 * Fix bogus network adapter description in some Cyrillic OS (perhaps other charset affected)134 * Fix bogus network adapter description in some Cyrillic OS (perhaps other charset affected)
1352.0.0.181352.0.0.18
136 * Uses MS CRT/MFC 9.00.21022.8 on Windows 2000 to fix compatibilty problem of MS11-025 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx)136 * Uses MS CRT/MFC 9.00.21022.8 on Windows 2000 to fix compatibility problem of MS11-025 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx)
137 * In NOTIFY mode, update only network inventory state, to avoid service launching agent every minute !137 * In NOTIFY mode, update only network inventory state, to avoid service launching agent every minute !
138 * In NOTIFY mode, do not launch Registry, Download or Ipdiscover capacity, neither VBS or executable plugins (only DLL plugins)138 * In NOTIFY mode, do not launch Registry, Download or Ipdiscover capacity, neither VBS or executable plugins (only DLL plugins)
139 * Fix some other memory leaks139 * Fix some other memory leaks
@@ -199,7 +199,7 @@
199 * Activate minimal log file ocsinventory.log by default into %PROGRAMDATA%\OCS Inventory NG\Agent199 * Activate minimal log file ocsinventory.log by default into %PROGRAMDATA%\OCS Inventory NG\Agent
200 * Delay WMI first use until app start, to fix hang under Vista and higher. WMI cannot be used until WinMain starts200 * Delay WMI first use until app start, to fix hang under Vista and higher. WMI cannot be used until WinMain starts
201 * Review WMI code, and use WMI to get Logical drives201 * Review WMI code, and use WMI to get Logical drives
202 * Add service description and dependancies to standards windows services RPCSS, EventLog, WMI and Tcpip202 * Add service description and dependencies to standards windows services RPCSS, EventLog, WMI and Tcpip
203 * Bug #568534 and #493609: Add 64 bits support for registry key203 * Bug #568534 and #493609: Add 64 bits support for registry key
204 * Bug #563796: NOTIFY should send the IPGATEWAY 204 * Bug #563796: NOTIFY should send the IPGATEWAY
205 * Bug #484115: Frequency of inventory for ip_discover computer 205 * Bug #484115: Frequency of inventory for ip_discover computer
206206
=== modified file 'ComHTTP/HTTPCrypt.cpp'
--- ComHTTP/HTTPCrypt.cpp 2011-07-13 08:55:00 +0000
+++ ComHTTP/HTTPCrypt.cpp 2015-05-07 18:53:51 +0000
@@ -120,7 +120,7 @@
120120
121BOOL CHTTPCrypt::encrypt( CString &csInput, CString &csOutput)121BOOL CHTTPCrypt::encrypt( CString &csInput, CString &csOutput)
122{122{
123 BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated intialization vector123 BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated initialization vector
124 EVP_CIPHER_CTX oEncCtx; // Cipher context124 EVP_CIPHER_CTX oEncCtx; // Cipher context
125 const EVP_CIPHER *oChiper = NULL; // Cipher object125 const EVP_CIPHER *oChiper = NULL; // Cipher object
126 LPBYTE pInBuffer = NULL, // Input buffer for data to encipher126 LPBYTE pInBuffer = NULL, // Input buffer for data to encipher
127127
=== modified file 'Download/Download.h'
--- Download/Download.h 2014-04-09 16:22:56 +0000
+++ Download/Download.h 2015-05-07 18:53:51 +0000
@@ -70,7 +70,7 @@
70 CLog *m_pLogger;70 CLog *m_pLogger;
71 CConfig *m_pConfig;71 CConfig *m_pConfig;
72 CConnexionAbstract *m_pConnexion;72 CConnexionAbstract *m_pConnexion;
73 UINT m_uDownloadFragLatency; // Time to wait betwen fragment downloaded73 UINT m_uDownloadFragLatency; // Time to wait between fragment downloaded
74 UINT m_uDownloadCycleLatency; // Time to wait between download cycle74 UINT m_uDownloadCycleLatency; // Time to wait between download cycle
75 UINT m_uDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)75 UINT m_uDownloadPeriodLatency; // Time to wait between each cycle priority ( = period)
76 UINT m_uDownloadPeriodLength; // Number of period in a download cycle76 UINT m_uDownloadPeriodLength; // Number of period in a download cycle
7777
=== modified file 'Download/Package.cpp'
--- Download/Package.cpp 2014-06-10 16:56:21 +0000
+++ Download/Package.cpp 2015-05-07 18:53:51 +0000
@@ -104,7 +104,7 @@
104104
105 if (m_csAction == OCS_DOWNLOAD_ACTION_LAUNCH)105 if (m_csAction == OCS_DOWNLOAD_ACTION_LAUNCH)
106 {106 {
107 // In LAUNCH, command is in the NAME atribute107 // In LAUNCH, command is in the NAME attribute
108 if( !ExpandEnvironmentStrings( m_csName, cCommand, 255 ))108 if( !ExpandEnvironmentStrings( m_csName, cCommand, 255 ))
109 {109 {
110 return FALSE;110 return FALSE;
@@ -705,7 +705,7 @@
705 // Check if first fragment exist705 // Check if first fragment exist
706 csFile.Format( _T( "%s\\%s\\%s-1"), getDownloadFolder(), m_csID, m_csID);706 csFile.Format( _T( "%s\\%s\\%s-1"), getDownloadFolder(), m_csID, m_csID);
707 if (fileExists( csFile))707 if (fileExists( csFile))
708 // Package not built, or previous build unsuccessfull708 // Package not built, or previous build unsuccessful
709 return FALSE;709 return FALSE;
710 // Check if ZIP exist710 // Check if ZIP exist
711 csFile.Format( _T( "%s\\%s\\%s"), getDownloadFolder(), m_csID, OCS_DOWNLOAD_BUILD);711 csFile.Format( _T( "%s\\%s\\%s"), getDownloadFolder(), m_csID, OCS_DOWNLOAD_BUILD);
712712
=== modified file 'Download/Package.h'
--- Download/Package.h 2014-06-10 16:56:21 +0000
+++ Download/Package.h 2015-05-07 18:53:51 +0000
@@ -104,7 +104,7 @@
104 BOOL regReadPackageDigest( CString &csDigest);104 BOOL regReadPackageDigest( CString &csDigest);
105 // Delete package digest from registry105 // Delete package digest from registry
106 BOOL regDeletePackageDigest();106 BOOL regDeletePackageDigest();
107 // Is execution result successfull107 // Is execution result successful
108 BOOL isExecSuccessful( int nExitCode, CString &csStatus);108 BOOL isExecSuccessful( int nExitCode, CString &csStatus);
109109
110protected:110protected:
@@ -131,7 +131,7 @@
131 CString m_csNotifyText; // Before package action user notification text131 CString m_csNotifyText; // Before package action user notification text
132 BOOL m_bNotifyCanAbort; // Is user able to abort package setup132 BOOL m_bNotifyCanAbort; // Is user able to abort package setup
133 BOOL m_bNotifyCanDelay; // Is user able to report package setup at next agent execution133 BOOL m_bNotifyCanDelay; // Is user able to report package setup at next agent execution
134 BOOL m_bNeedDoneAction; // Do we have to notify user after package successfull execution134 BOOL m_bNeedDoneAction; // Do we have to notify user after package successful execution
135 CString m_csNeedDoneActionText; // After package success notification text135 CString m_csNeedDoneActionText; // After package success notification text
136};136};
137137
138138
=== modified file 'External_Deps/OCS_Make_Required_Libs.bat'
--- External_Deps/OCS_Make_Required_Libs.bat 2014-08-25 13:08:56 +0000
+++ External_Deps/OCS_Make_Required_Libs.bat 2015-05-07 18:53:51 +0000
@@ -212,7 +212,7 @@
212echo * Please, fix problem before trying to build OCS Inventory NG ! *212echo * Please, fix problem before trying to build OCS Inventory NG ! *
213echo * *213echo * *
214echo * Here is some common errors: *214echo * Here is some common errors: *
215echo * - Have you reviewed paths at the begining of this batch file ? *215echo * - Have you reviewed paths at the beginning of this batch file ? *
216echo * - Have you updated Visual C++ version in cURL Makefile ? *216echo * - Have you updated Visual C++ version in cURL Makefile ? *
217echo * - Have you build ZipArchive "Release Unicode STL MD DLL" ? *217echo * - Have you build ZipArchive "Release Unicode STL MD DLL" ? *
218echo * *218echo * *
219219
=== modified file 'NSIS_agent_setup/Agent.ini'
--- NSIS_agent_setup/Agent.ini 2011-09-06 17:39:00 +0000
+++ NSIS_agent_setup/Agent.ini 2015-05-07 18:53:51 +0000
@@ -53,7 +53,7 @@
5353
54[Field 7]54[Field 7]
55Type=Checkbox55Type=Checkbox
56Text=Do not registrer service - agent must be launched manually (= /NO_SERVICE) 56Text=Do not register service - agent must be launched manually (= /NO_SERVICE)
57Left=1557Left=15
58Right=29058Right=290
59Top=8959Top=89
@@ -71,7 +71,7 @@
7171
72[Field 9]72[Field 9]
73Type=Checkbox73Type=Checkbox
74Text=Immediatly launch inventory (= /NOW)74Text=Immediately launch inventory (= /NOW)
75Left=1575Left=15
76Right=29076Right=290
77Top=12077Top=120
7878
=== modified file 'NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi'
--- NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi 2014-08-24 07:54:24 +0000
+++ NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi 2015-05-07 18:53:51 +0000
@@ -557,7 +557,7 @@
557 WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "0"557 WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "0"
558 goto ParseCmd_Now_End558 goto ParseCmd_Now_End
559ParseCmd_Now:559ParseCmd_Now:
560 ; Immediately maunch inventory560 ; Immediately launch inventory
561 WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "1"561 WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "1"
562ParseCmd_Now_End:562ParseCmd_Now_End:
563 ; Remove parsed arg from command line563 ; Remove parsed arg from command line
@@ -1517,7 +1517,7 @@
1517 IfErrors 0 +31517 IfErrors 0 +3
1518 StrCpy $logBuffer "Failed to remove key, but non blocking !"1518 StrCpy $logBuffer "Failed to remove key, but non blocking !"
1519 Call Write_Log1519 Call Write_Log
1520 ; Ensure service uninstall and migration process successfull1520 ; Ensure service uninstall and migration process successful
1521 IfFileExists "$INSTDIR\PsApi.dll" TestInstall_Upgrade_Error1521 IfFileExists "$INSTDIR\PsApi.dll" TestInstall_Upgrade_Error
1522 StrCpy $logBuffer "$\r$\nMigration process from old agent 4000 series succesfull, continuing setup...$\r$\n"1522 StrCpy $logBuffer "$\r$\nMigration process from old agent 4000 series succesfull, continuing setup...$\r$\n"
1523 Call Write_Log1523 Call Write_Log
@@ -1571,7 +1571,7 @@
1571 Call Write_Log1571 Call Write_Log
1572 strcpy $installSatus ":("1572 strcpy $installSatus ":("
1573 clearerrors1573 clearerrors
1574 ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)1574 ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER)
1575 SetOutPath "$INSTDIR"1575 SetOutPath "$INSTDIR"
1576 File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.CRT.manifest"1576 File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.CRT.manifest"
1577 Iferrors 0 +51577 Iferrors 0 +5
@@ -1597,7 +1597,7 @@
1597 Call Write_Log1597 Call Write_Log
1598 strcpy $installSatus ":("1598 strcpy $installSatus ":("
1599 clearerrors1599 clearerrors
1600 ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER)1600 ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER)
1601 File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.MFC.manifest"1601 File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.MFC.manifest"
1602 Iferrors 0 +51602 Iferrors 0 +5
1603 StrCpy $logBuffer "$logBuffer ERROR copying \Microsoft.VC90.MFC.manifest $\r$\n"1603 StrCpy $logBuffer "$logBuffer ERROR copying \Microsoft.VC90.MFC.manifest $\r$\n"
@@ -1913,14 +1913,14 @@
19131913
19141914
1915#####################################################################1915#####################################################################
1916# This function writes install status into log file when sucessfull install1916# This function writes install status into log file when successful install
1917#####################################################################1917#####################################################################
1918Function .onInstSuccess1918Function .onInstSuccess
1919 strcmp "$installSatus" ";-)" 0 onInstSuccess_Error1919 strcmp "$installSatus" ";-)" 0 onInstSuccess_Error
1920 Push "SUCCESS"1920 Push "SUCCESS"
1921 Call WriteAgentSetupDone1921 Call WriteAgentSetupDone
1922 ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $61922 ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
1923 StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfuly installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "1923 StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfully installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n "
1924 Call Write_Log1924 Call Write_Log
1925 goto onInstSuccess_end1925 goto onInstSuccess_end
1926onInstSuccess_Error:1926onInstSuccess_Error:
19271927
=== modified file 'NSIS_agent_setup/Readme.txt'
--- NSIS_agent_setup/Readme.txt 2012-07-30 20:07:46 +0000
+++ NSIS_agent_setup/Readme.txt 2015-05-07 18:53:51 +0000
@@ -36,7 +36,7 @@
3636
37MS11-025 critical fix introduces incompatibilty problem of MS CRT/MFC 9.0 with37MS11-025 critical fix introduces incompatibilty problem of MS CRT/MFC 9.0 with
38Windows 2000 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx).38Windows 2000 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx).
39So for Windows 2000 only, w've choosen to install original MS CRT/MFC 39So for Windows 2000 only, we have chosen to install original MS CRT/MFC
409.00.21022.8 provided with Visual C++ 2008 without Service Pack or hot fixes.409.00.21022.8 provided with Visual C++ 2008 without Service Pack or hot fixes.
41You must put these files into "vc2008_redist_9.00.21022.8_for_Windows_2000"41You must put these files into "vc2008_redist_9.00.21022.8_for_Windows_2000"
42sub directory before building NSIS installer.42sub directory before building NSIS installer.
@@ -82,4 +82,4 @@
8282
83We hope it will works for you !83We hope it will works for you !
8484
85OCS Inventory Team
86\ No newline at end of file85\ No newline at end of file
86OCS Inventory Team
8787
=== modified file 'OCSInventory Front/Config.cpp'
--- OCSInventory Front/Config.cpp 2011-09-06 17:39:00 +0000
+++ OCSInventory Front/Config.cpp 2015-05-07 18:53:51 +0000
@@ -180,7 +180,7 @@
180 m_csLocal.ReleaseBuffer();180 m_csLocal.ReleaseBuffer();
181 // Scan for installed software or not181 // Scan for installed software or not
182 m_bNoSoftware = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoSoftware"), FALSE, m_csConfigFile);182 m_bNoSoftware = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoSoftware"), FALSE, m_csConfigFile);
183 // Scanning HKEY_CURRENT_USER hive for printers and sofware183 // Scanning HKEY_CURRENT_USER hive for printers and software
184 m_bHKCU = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "HKCU"), FALSE, m_csConfigFile);184 m_bHKCU = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "HKCU"), FALSE, m_csConfigFile);
185 // Disable prompting user for TAG value185 // Disable prompting user for TAG value
186 m_bNoTag = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoTAG"), FALSE, m_csConfigFile);186 m_bNoTag = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoTAG"), FALSE, m_csConfigFile);
187187
=== modified file 'OCSInventory Front/Config.h'
--- OCSInventory Front/Config.h 2011-09-06 17:39:00 +0000
+++ OCSInventory Front/Config.h 2015-05-07 18:53:51 +0000
@@ -107,7 +107,7 @@
107 // What's the content of TAG (/TAG:"tag value")107 // What's the content of TAG (/TAG:"tag value")
108 BOOL isTagTextProvided();108 BOOL isTagTextProvided();
109 LPCTSTR getTagText();109 LPCTSTR getTagText();
110 // Does agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)110 // Does agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
111 BOOL isHkcuRequired();111 BOOL isHkcuRequired();
112 // Is Inventory forced (/FORCE)112 // Is Inventory forced (/FORCE)
113 BOOL isForceInventoryRequired();113 BOOL isForceInventoryRequired();
@@ -141,7 +141,7 @@
141 void setIpDiscoverLatency(LPCTSTR lpstrLatency = NULL);141 void setIpDiscoverLatency(LPCTSTR lpstrLatency = NULL);
142 // Does agent launches a fast IpDiscover scan, without taking care of network load, or not142 // Does agent launches a fast IpDiscover scan, without taking care of network load, or not
143 void setFastIpRequired( BOOL bFast = TRUE);143 void setFastIpRequired( BOOL bFast = TRUE);
144 // Set if agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU)144 // Set if agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU)
145 void setHkcuRequired( BOOL bHKCU = TRUE);145 void setHkcuRequired( BOOL bHKCU = TRUE);
146 // Set Communication Provider DLL to use without extension .DLL146 // Set Communication Provider DLL to use without extension .DLL
147 void setCommunicationProvider( LPCTSTR lpstrDll);147 void setCommunicationProvider( LPCTSTR lpstrDll);
148148
=== modified file 'OCSInventory Front/Deviceid.cpp'
--- OCSInventory Front/Deviceid.cpp 2011-05-19 16:55:18 +0000
+++ OCSInventory Front/Deviceid.cpp 2015-05-07 18:53:51 +0000
@@ -145,7 +145,7 @@
145 delete pCb;145 delete pCb;
146 return FALSE;146 return FALSE;
147 }147 }
148 // All sucessfull148 // All successful
149 delete pCb;149 delete pCb;
150 return TRUE;150 return TRUE;
151}151}
152152
=== modified file 'OCSInventory Front/ExecCommand.h'
--- OCSInventory Front/ExecCommand.h 2012-09-26 16:31:18 +0000
+++ OCSInventory Front/ExecCommand.h 2015-05-07 18:53:51 +0000
@@ -51,7 +51,7 @@
51 * We don't care about command ending, so stdout and stderr51 * We don't care about command ending, so stdout and stderr
52 * will not be grabbed, and we will not try to get process52 * will not be grabbed, and we will not try to get process
53 * exit code53 * exit code
54 * Return EXEC_SUCCESSFULL if all successfull54 * Return EXEC_SUCCESSFULL if all successful
55 * EXEC_ERROR_START_COMMAND if start command error55 * EXEC_ERROR_START_COMMAND if start command error
56 */56 */
57 int execNoWait(LPCTSTR lpstrCommand, LPCTSTR lpstrPath);57 int execNoWait(LPCTSTR lpstrCommand, LPCTSTR lpstrPath);
@@ -59,12 +59,12 @@
59 /**59 /**
60 * Exec command in the directory path. Make sure that the60 * Exec command in the directory path. Make sure that the
61 * executable is either in the path or specify the full path.61 * executable is either in the path or specify the full path.
62 * We will try to get process exit code (use getExitCode() to retreive it).62 * We will try to get process exit code (use getExitCode() to retrieve it).
63 * If bCapture is TRUE, stdout and stderr will be grabbed (use getOutput() 63 * If bCapture is TRUE, stdout and stderr will be grabbed (use getOutput()
64 * to retreive it)64 * to retrieve it)
65 * We will wait until command end (but if command starts other65 * We will wait until command end (but if command starts other
66 * processes/threads, we will not be able to wait for those ending)66 * processes/threads, we will not be able to wait for those ending)
67 * Return EXEC_SUCCESSFULL if all successfull67 * Return EXEC_SUCCESSFULL if all successful
68 * EXEC_ERROR_START_COMMAND if start command error68 * EXEC_ERROR_START_COMMAND if start command error
69 * EXEC_ERROR_WAIT_COMMAND if wait or get exit code/ouput error,69 * EXEC_ERROR_WAIT_COMMAND if wait or get exit code/ouput error,
70 */70 */
@@ -75,7 +75,7 @@
75 * executable is either in the path or specify the full path.75 * executable is either in the path or specify the full path.
76 * Wait for command AND ALL others threads/processes it may launch to finish.76 * Wait for command AND ALL others threads/processes it may launch to finish.
77 * In this case, we try get exit code, but NOT stdout and stderr77 * In this case, we try get exit code, but NOT stdout and stderr
78 * Return EXEC_SUCCESSFULL if all successfull78 * Return EXEC_SUCCESSFULL if all successful
79 * EXEC_ERROR_START_COMMAND if start command error79 * EXEC_ERROR_START_COMMAND if start command error
80 * EXEC_ERROR_WAIT_COMMAND if wait error,80 * EXEC_ERROR_WAIT_COMMAND if wait error,
81 */81 */
8282
=== modified file 'OCSInventory Front/InventoryRequest.cpp'
--- OCSInventory Front/InventoryRequest.cpp 2014-08-06 15:06:08 +0000
+++ OCSInventory Front/InventoryRequest.cpp 2015-05-07 18:53:51 +0000
@@ -156,7 +156,7 @@
156 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Port(s)"), m_PortList.GetCount());156 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Port(s)"), m_PortList.GetCount());
157 // Update System Controllers157 // Update System Controllers
158 bSuccess = bSuccess && m_pTheDB->UpdateSystemControllers( m_SystemControllerList);158 bSuccess = bSuccess && m_pTheDB->UpdateSystemControllers( m_SystemControllerList);
159 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controler(s)"), m_SystemControllerList.GetCount());159 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controller(s)"), m_SystemControllerList.GetCount());
160 // Update System Slots160 // Update System Slots
161 bSuccess = bSuccess && m_pTheDB->UpdateSystemSlots( m_SlotList);161 bSuccess = bSuccess && m_pTheDB->UpdateSystemSlots( m_SlotList);
162 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Slot(s)"), m_SlotList.GetCount());162 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Slot(s)"), m_SlotList.GetCount());
@@ -710,7 +710,7 @@
710 if (!m_pSysInfo->getSystemControllers( &m_SystemControllerList))710 if (!m_pSysInfo->getSystemControllers( &m_SystemControllerList))
711 m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controlers"));711 m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controlers"));
712 else712 else
713 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controler(s) found"),713 m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controller(s) found"),
714 m_SystemControllerList.GetCount());714 m_SystemControllerList.GetCount());
715 // Get Physical storage devices715 // Get Physical storage devices
716 if (!m_pSysInfo->getStoragePeripherals( &m_StorageList))716 if (!m_pSysInfo->getStoragePeripherals( &m_StorageList))
717717
=== modified file 'OCSInventory Front/Log.h'
--- OCSInventory Front/Log.h 2011-05-04 13:48:35 +0000
+++ OCSInventory Front/Log.h 2015-05-07 18:53:51 +0000
@@ -24,7 +24,7 @@
2424
25/* OCS Inventory NG log modes25/* OCS Inventory NG log modes
26 /DEBUG=0 => default mode 26 /DEBUG=0 => default mode
27 /DEBUG=1 => DEBUG mode, for more detailled logs27 /DEBUG=1 => DEBUG mode, for more detailed logs
28 /DEBUG=2 => TRACE mode, for full logs, including XML and SysInfo logs28 /DEBUG=2 => TRACE mode, for full logs, including XML and SysInfo logs
29*/29*/
3030
@@ -71,7 +71,7 @@
71 // Trace log for full mode debug71 // Trace log for full mode debug
72 void log_trace( LPCTSTR lpstrFormat, va_list args);72 void log_trace( LPCTSTR lpstrFormat, va_list args);
7373
74private: // Atributes74private: // Attributes
75 // Log filename75 // Log filename
76 CString m_csFileName;76 CString m_csFileName;
77 // The log file opened77 // The log file opened
7878
=== modified file 'OCSInventory Front/Markup.cpp'
--- OCSInventory Front/Markup.cpp 2012-10-25 19:49:58 +0000
+++ OCSInventory Front/Markup.cpp 2015-05-07 18:53:51 +0000
@@ -169,7 +169,7 @@
169 {169 {
170 // This a test child, remove it...170 // This a test child, remove it...
171 m_pCurrentNode->RemoveChild( pChild);171 m_pCurrentNode->RemoveChild( pChild);
172 // ...and restart from the begining of childs172 // ...and restart from the beginning of childs
173 pChild = NULL;173 pChild = NULL;
174 }174 }
175 }175 }
176176
=== modified file 'OCSInventory Front/OcsUtils.cpp'
--- OCSInventory Front/OcsUtils.cpp 2014-08-24 07:40:05 +0000
+++ OCSInventory Front/OcsUtils.cpp 2015-05-07 18:53:51 +0000
@@ -385,7 +385,7 @@
385 UINT uLength;385 UINT uLength;
386386
387 OpenSSL_add_all_digests();387 OpenSSL_add_all_digests();
388 // Set the algorythm388 // Set the algorithm
389 if (!(evpMD = EVP_get_digestbyname( GetAnsiFromUnicode( lpstrAlgo))))389 if (!(evpMD = EVP_get_digestbyname( GetAnsiFromUnicode( lpstrAlgo))))
390 // Unsupported digest390 // Unsupported digest
391 return FALSE;391 return FALSE;
392392
=== modified file 'OCSInventory Front/RequestAbstract.cpp'
--- OCSInventory Front/RequestAbstract.cpp 2011-05-19 16:55:18 +0000
+++ OCSInventory Front/RequestAbstract.cpp 2015-05-07 18:53:51 +0000
@@ -81,7 +81,7 @@
81 csXml.Delete( nIndex, nCount - nIndex);81 csXml.Delete( nIndex, nCount - nIndex);
82 // and insert space82 // and insert space
83 csXml.Insert( nIndex, " ");83 csXml.Insert( nIndex, " ");
84 // Find next occurence84 // Find next occurrence
85 nIndex = csXml.Find( "&#x", nIndex);85 nIndex = csXml.Find( "&#x", nIndex);
86 }86 }
87 m_cmXml.SetDoc( csXml);87 m_cmXml.SetDoc( csXml);
8888
=== modified file 'OCSInventory Front/commonDownload.h'
--- OCSInventory Front/commonDownload.h 2013-03-19 18:25:18 +0000
+++ OCSInventory Front/commonDownload.h 2015-05-07 18:53:51 +0000
@@ -101,7 +101,7 @@
101BOOL OCSINVENTORYFRONT_API resumeDownload();101BOOL OCSINVENTORYFRONT_API resumeDownload();
102// If suspend file exists, download is suspended102// If suspend file exists, download is suspended
103BOOL OCSINVENTORYFRONT_API isDownloadSuspended();103BOOL OCSINVENTORYFRONT_API isDownloadSuspended();
104// Get exclusive acces to download directory by locking lock file104// Get exclusive access to download directory by locking lock file
105BOOL OCSINVENTORYFRONT_API lockDownload();105BOOL OCSINVENTORYFRONT_API lockDownload();
106// Release exclusive access106// Release exclusive access
107BOOL OCSINVENTORYFRONT_API unlockDownload();107BOOL OCSINVENTORYFRONT_API unlockDownload();
108108
=== modified file 'OPTIONS.TXT'
--- OPTIONS.TXT 2011-09-06 17:39:00 +0000
+++ OPTIONS.TXT 2015-05-07 18:53:51 +0000
@@ -62,7 +62,7 @@
62/server=http[s]://server.domain.tld[:port]/ocsinventory62/server=http[s]://server.domain.tld[:port]/ocsinventory
63 Agent try to connect to Communication Server address and port Listening on http[s]://server.domain.tld[:port]/ocsinventory63 Agent try to connect to Communication Server address and port Listening on http[s]://server.domain.tld[:port]/ocsinventory
64 64
65/ssl=0|1 When usng SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate) 65/ssl=0|1 When using SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate)
6666
67/ca="path_to_cabundle.pem" Path to CA certificate chain file in PEM format, for server certificate validation67/ca="path_to_cabundle.pem" Path to CA certificate chain file in PEM format, for server certificate validation
68 68
@@ -94,7 +94,7 @@
94; Enable local inventory mode (path to folder to store .ocs file => enabled,94; Enable local inventory mode (path to folder to store .ocs file => enabled,
95; empty => disabled) 95; empty => disabled)
96Local=96Local=
97; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware97; Enable agent scanning HKEY_CURRENT_USER hive for printers and software
98; (0 => disabled, 1 => enabled) 98; (0 => disabled, 1 => enabled)
99HKCU=099HKCU=0
100; Disable scanning computer for installed software (0 => software scan allowed, 1 => disabled) 100; Disable scanning computer for installed software (0 => software scan allowed, 1 => disabled)
101101
=== modified file 'OcsNotifyUser/OcsNotifyUser.h'
--- OcsNotifyUser/OcsNotifyUser.h 2012-10-26 00:23:27 +0000
+++ OcsNotifyUser/OcsNotifyUser.h 2015-05-07 18:53:51 +0000
@@ -60,7 +60,7 @@
6060
61protected: //Attributes61protected: //Attributes
62 CLog *m_pLogger;62 CLog *m_pLogger;
63 UINT m_uNotifcation; // Notifcation type63 UINT m_uNotifcation; // Notification type
64 CString m_csMessage; // Message to display to user64 CString m_csMessage; // Message to display to user
65 BOOL m_bCancel; // Is cancel allowed or not65 BOOL m_bCancel; // Is cancel allowed or not
66 BOOL m_bDelay; // Is delaying action allowed or not66 BOOL m_bDelay; // Is delaying action allowed or not
6767
=== modified file 'OcsSystray/SystemTray.cpp'
--- OcsSystray/SystemTray.cpp 2010-07-07 20:56:04 +0000
+++ OcsSystray/SystemTray.cpp 2015-05-07 18:53:51 +0000
@@ -53,7 +53,7 @@
53// Explorer crashed53// Explorer crashed
54// Fixed resource leak in SetIcon54// Fixed resource leak in SetIcon
55// Animate() now checks for empty icon list - Anton Treskunov55// Animate() now checks for empty icon list - Anton Treskunov
56// Added the virutal CustomizeMenu() method - Anton Treskunov56// Added the virtual CustomizeMenu() method - Anton Treskunov
57// 57//
58//58//
59// This code may be used in compiled form in any way you desire. This59// This code may be used in compiled form in any way you desire. This
@@ -112,7 +112,7 @@
112 Initialise();112 Initialise();
113}113}
114114
115CSystemTray::CSystemTray(CWnd* pParent, // The window that will recieve tray notifications115CSystemTray::CSystemTray(CWnd* pParent, // The window that will receive tray notifications
116 UINT uCallbackMessage, // the callback message to send to parent116 UINT uCallbackMessage, // the callback message to send to parent
117 LPCTSTR szToolTip, // tray icon tooltip117 LPCTSTR szToolTip, // tray icon tooltip
118 HICON icon, // Handle to icon118 HICON icon, // Handle to icon
119119
=== modified file 'README.TXT'
--- README.TXT 2011-11-25 14:46:24 +0000
+++ README.TXT 2015-05-07 18:53:51 +0000
@@ -24,12 +24,12 @@
24============24============
2525
26- Microsoft Visual C++ 2008 SP1 or higher26- Microsoft Visual C++ 2008 SP1 or higher
27- Perl 5.8 or newer for building dependancies (you can use XAMPP perl addon)27- Perl 5.8 or newer for building dependencies (you can use XAMPP perl addon)
28- Source code exported from Launchpad Bazaar repository. 28- Source code exported from Launchpad Bazaar repository.
29 svn co https://29 svn co https://
3030
3131
32BUILDING DEPENDANCIES32BUILDING DEPENDENCIES
33=====================33=====================
3434
35OCS Inventory NG Agent for Windows needs followong libraries:35OCS Inventory NG Agent for Windows needs followong libraries:
@@ -59,7 +59,7 @@
59http://blog.kalmbach-software.de/2009/05/27/deployment-of-vc2008-apps-without-installing-anything/)59http://blog.kalmbach-software.de/2009/05/27/deployment-of-vc2008-apps-without-installing-anything/)
60Save and build to create unicode DLL for ZipArchive Library.60Save and build to create unicode DLL for ZipArchive Library.
6161
62Script for building dependancy automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008,62Script for building dependency automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008,
63by adding "/D_BIND_TO_CURRENT_VCLIBS_VERSION" to the CFLAGS. As is, libcurl and net-snmp63by adding "/D_BIND_TO_CURRENT_VCLIBS_VERSION" to the CFLAGS. As is, libcurl and net-snmp
64DLL will be binded to lastest Visual C++ 2008 SP1 CRT versions.64DLL will be binded to lastest Visual C++ 2008 SP1 CRT versions.
6565
@@ -89,7 +89,7 @@
89Then, launch script "OCS_Make_Required_Libs.bat" to create all libs and prepare for building OCS agent.89Then, launch script "OCS_Make_Required_Libs.bat" to create all libs and prepare for building OCS agent.
9090
9191
92BUIDLING AGENT92BUILDING AGENT
93==============93==============
9494
95You need Visual C++ 2008, which includes MS Windows SDK 6.0A.95You need Visual C++ 2008, which includes MS Windows SDK 6.0A.
@@ -100,4 +100,4 @@
100100
101We hope it will works for you !101We hope it will works for you !
102102
103OCS Inventory Team
104\ No newline at end of file103\ No newline at end of file
104OCS Inventory Team
105105
=== modified file 'Service/NTService.cpp'
--- Service/NTService.cpp 2012-07-25 16:38:31 +0000
+++ Service/NTService.cpp 2015-05-07 18:53:51 +0000
@@ -213,7 +213,7 @@
213 szFilePath, // Main binary213 szFilePath, // Main binary
214 NULL, // Load order group214 NULL, // Load order group
215 NULL, // Tag ID to order service start in group215 NULL, // Tag ID to order service start in group
216 lpstrDependancies, // Service dependancies216 lpstrDependancies, // Service dependencies
217 NULL, // Service runs under Local system account,217 NULL, // Service runs under Local system account,
218 NULL); // so no user and password218 NULL); // so no user and password
219 if (!hService) 219 if (!hService)
220220
=== modified file 'Service/OcsService.cpp'
--- Service/OcsService.cpp 2014-04-09 16:22:56 +0000
+++ Service/OcsService.cpp 2015-05-07 18:53:51 +0000
@@ -488,7 +488,7 @@
488 {488 {
489 if (!bNotifyInventory && isInventoryStateChanged())489 if (!bNotifyInventory && isInventoryStateChanged())
490 {490 {
491 // Inventory state changed, force inventory immediatly491 // Inventory state changed, force inventory immediately
492 m_iTToWait = 0;492 m_iTToWait = 0;
493 bNotifyInventory = TRUE;493 bNotifyInventory = TRUE;
494 }494 }
@@ -691,7 +691,7 @@
691 // Create inventory691 // Create inventory
692 if ((pRequest = new CInventoryRequest()) == NULL)692 if ((pRequest = new CInventoryRequest()) == NULL)
693 {693 {
694 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retreive inventory informations"));694 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retrieve inventory informations"));
695 return FALSE;695 return FALSE;
696 }696 }
697 if (!pRequest->final())697 if (!pRequest->final())
@@ -723,7 +723,7 @@
723 catch (CException *pEx)723 catch (CException *pEx)
724 {724 {
725 pEx->Delete();725 pEx->Delete();
726 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while trying to generate inventory informations"));726 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while trying to generate inventory informations"));
727 return FALSE;727 return FALSE;
728 }728 }
729}729}
@@ -755,7 +755,7 @@
755 catch (CException *pEx)755 catch (CException *pEx)
756 {756 {
757 pEx->Delete();757 pEx->Delete();
758 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while rotating log files"));758 LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while rotating log files"));
759 return FALSE;759 return FALSE;
760 }760 }
761 return TRUE;761 return TRUE;
762762
=== modified file 'SysInfo/DMI.cpp'
--- SysInfo/DMI.cpp 2014-08-06 15:06:08 +0000
+++ SysInfo/DMI.cpp 2015-05-07 18:53:51 +0000
@@ -291,7 +291,7 @@
291 DmiHeader *dmi;291 DmiHeader *dmi;
292292
293 if (bStart)293 if (bStart)
294 // Search from begining of tables294 // Search from beginning of tables
295 nPosition = 0;295 nPosition = 0;
296296
297 while (nPosition < m_nStructureLength)297 while (nPosition < m_nStructureLength)
298298
=== modified file 'SysInfo/DMI.h'
--- SysInfo/DMI.h 2014-04-09 17:35:05 +0000
+++ SysInfo/DMI.h 2015-05-07 18:53:51 +0000
@@ -86,7 +86,7 @@
86 BOOL CheckSum(const BYTE *buf, int length);86 BOOL CheckSum(const BYTE *buf, int length);
87 // Get length of DMI table at position nPosition87 // Get length of DMI table at position nPosition
88 int GetTableLength( int nPosition);88 int GetTableLength( int nPosition);
89 // Get next DMI table of type uType, and start seraching form begining89 // Get next DMI table of type uType, and start seraching form beginning
90 // of table, or from current position90 // of table, or from current position
91 UCHAR *GetNextTable( UCHAR uType, BOOL bStart = FALSE);91 UCHAR *GetNextTable( UCHAR uType, BOOL bStart = FALSE);
9292
9393
=== modified file 'SysInfo/Dtwinver.cpp'
--- SysInfo/Dtwinver.cpp 2013-05-28 09:08:01 +0000
+++ SysInfo/Dtwinver.cpp 2015-05-07 18:53:51 +0000
@@ -1531,7 +1531,7 @@
1531 }1531 }
1532 #endif1532 #endif
1533 1533
1534 #else //We must be runing on an emulated or real version of Win16 or DOS1534 #else //We must be running on an emulated or real version of Win16 or DOS
1535 lpVersionInformation->EmulatedProcessorType = IA32_PROCESSOR; //We can only be running x86-32 code from Win16 or DOS1535 lpVersionInformation->EmulatedProcessorType = IA32_PROCESSOR; //We can only be running x86-32 code from Win16 or DOS
15361536
1537 #ifdef _WINDOWS //Running on some version of Windows 1537 #ifdef _WINDOWS //Running on some version of Windows
@@ -1639,7 +1639,7 @@
1639 _fstrcpy(lpVersionInformation->szUnderlyingCSDVersion, "");1639 _fstrcpy(lpVersionInformation->szUnderlyingCSDVersion, "");
1640 }1640 }
1641 #else //Must be some version of real or emulated DOS1641 #else //Must be some version of real or emulated DOS
1642 //Retreive the current version of emulated DOS1642 //Retrieve the current version of emulated DOS
1643 BYTE DosMinor;1643 BYTE DosMinor;
1644 BYTE DosMajor;1644 BYTE DosMajor;
1645 _asm1645 _asm
@@ -3054,7 +3054,7 @@
3054 //puts in the ProductSuite. In Windows 2000 Datacenter it does not matter as it3054 //puts in the ProductSuite. In Windows 2000 Datacenter it does not matter as it
3055 //supports GetVersionEx using a OSVERSIONINFOEX structure.3055 //supports GetVersionEx using a OSVERSIONINFOEX structure.
30563056
3057 //Turn on appropiate fields in the "wSuiteMask" bit field3057 //Turn on appropriate fields in the "wSuiteMask" bit field
3058 if (_tcsicmp(lpszSuite, _T("Terminal Server")) == 0) 3058 if (_tcsicmp(lpszSuite, _T("Terminal Server")) == 0)
3059 lpVersionInformation->dwSuiteMask |= COSVERSION_SUITE_TERMINAL;3059 lpVersionInformation->dwSuiteMask |= COSVERSION_SUITE_TERMINAL;
3060 else if ((_tcsicmp(lpszSuite, _T("SBS")) == 0) || (_tcsicmp(lpszSuite, _T("Small Business")) == 0))3060 else if ((_tcsicmp(lpszSuite, _T("SBS")) == 0) || (_tcsicmp(lpszSuite, _T("Small Business")) == 0))
30613061
=== modified file 'SysInfo/EDID.cpp'
--- SysInfo/EDID.cpp 2013-11-27 16:28:03 +0000
+++ SysInfo/EDID.cpp 2015-05-07 18:53:51 +0000
@@ -415,7 +415,7 @@
415 }415 }
416 memset( szResult, 0, 15);416 memset( szResult, 0, 15);
417 strncpy( szResult, (LPCSTR) (lpByte+DESCRIPTOR_DATA_OFFSET), 14);417 strncpy( szResult, (LPCSTR) (lpByte+DESCRIPTOR_DATA_OFFSET), 14);
418 // Ignore space characters at begining418 // Ignore space characters at beginning
419 for (i=0; i<strlen( szResult) && szResult[i]==' '; i++);419 for (i=0; i<strlen( szResult) && szResult[i]==' '; i++);
420 m_csBuffer.Format( "%s", szResult+i);420 m_csBuffer.Format( "%s", szResult+i);
421 return m_csBuffer;421 return m_csBuffer;
422422
=== modified file 'SysInfo/EDID.h'
--- SysInfo/EDID.h 2010-12-08 22:42:33 +0000
+++ SysInfo/EDID.h 2015-05-07 18:53:51 +0000
@@ -75,7 +75,7 @@
75 BYTE Vertical_Frequency;75 BYTE Vertical_Frequency;
76} EDIDMode;76} EDIDMode;
7777
78// Format of Detailed_Timing_DescriptionX if it is a Detailled Timing78// Format of Detailed_Timing_DescriptionX if it is a Detailed Timing
79typedef struct tag_EDID_Detailled_Timing79typedef struct tag_EDID_Detailled_Timing
80{80{
81 BYTE Horizontal_Frequency; // horizontal frequency in kHz (if 00h, may be text)(see #00135)81 BYTE Horizontal_Frequency; // horizontal frequency in kHz (if 00h, may be text)(see #00135)
@@ -160,7 +160,7 @@
160 BYTE Checksum; // (radix-complement: 256-low byte of 16-bit sum of 00h-7Eh)160 BYTE Checksum; // (radix-complement: 256-low byte of 16-bit sum of 00h-7Eh)
161} Standard_EDID;161} Standard_EDID;
162162
163 // Detailled Timing enumeration types163 // Detailed Timing enumeration types
164enum DetailTiming164enum DetailTiming
165{165{
166 Detailed_Timing_Description = 0,166 Detailed_Timing_Description = 0,
@@ -191,7 +191,7 @@
191 BOOL ParseEDID( LPBYTE lpByte, Standard_EDID &myEDID);191 BOOL ParseEDID( LPBYTE lpByte, Standard_EDID &myEDID);
192 // Return manufacturer code (3 letters)192 // Return manufacturer code (3 letters)
193 LPCSTR GetManufacturerID(BYTE ID[2]);193 LPCSTR GetManufacturerID(BYTE ID[2]);
194 // Retreive EDID data from registry194 // Retrieve EDID data from registry
195 BOOL GetDisplayEDID( HDEVINFO hDeviceInfoSet, SP_DEVINFO_DATA *pDevInfoData, Standard_EDID &myEDID);195 BOOL GetDisplayEDID( HDEVINFO hDeviceInfoSet, SP_DEVINFO_DATA *pDevInfoData, Standard_EDID &myEDID);
196 // Decode DPMS flags to get monitor type196 // Decode DPMS flags to get monitor type
197 LPCSTR DecodeDPMSFlag( BYTE Flag);197 LPCSTR DecodeDPMSFlag( BYTE Flag);
198198
=== modified file 'SysInfo/Registry.cpp'
--- SysInfo/Registry.cpp 2014-08-06 15:06:08 +0000
+++ SysInfo/Registry.cpp 2015-05-07 18:53:51 +0000
@@ -2023,7 +2023,7 @@
20232023
2024 AddLog( _T( "Registry NT GetSystemControllers: Trying to find Floppy Controllers in HKLM\\%s...\n"),2024 AddLog( _T( "Registry NT GetSystemControllers: Trying to find Floppy Controllers in HKLM\\%s...\n"),
2025 NT_CONTROLER_FLOPPY_KEY);2025 NT_CONTROLER_FLOPPY_KEY);
2026 // Windows NT => Open the floppy controler key2026 // Windows NT => Open the floppy controller key
2027 if (RegOpenKeyEx( m_hKey, NT_CONTROLER_FLOPPY_KEY, 0, KEY_READ|KEY_WOW64_64KEY, &hKeyEnum) == ERROR_SUCCESS)2027 if (RegOpenKeyEx( m_hKey, NT_CONTROLER_FLOPPY_KEY, 0, KEY_READ|KEY_WOW64_64KEY, &hKeyEnum) == ERROR_SUCCESS)
2028 {2028 {
2029 // Enum the devices subkeys to find devices2029 // Enum the devices subkeys to find devices
@@ -2136,7 +2136,7 @@
2136 }2136 }
2137 else2137 else
2138 AddLog( _T( "\tFailed because no valid object !\n"));2138 AddLog( _T( "\tFailed because no valid object !\n"));
2139 // Windows NT => Open the IDE controler key2139 // Windows NT => Open the IDE controller key
2140 uIndex = 0;2140 uIndex = 0;
2141 dwIndexEnum = 0;2141 dwIndexEnum = 0;
2142 AddLog( _T( "Registry NT GetSystemControllers: Trying to find IDE Controllers in HKLM\\%s...\n"),2142 AddLog( _T( "Registry NT GetSystemControllers: Trying to find IDE Controllers in HKLM\\%s...\n"),
@@ -2253,7 +2253,7 @@
2253 }2253 }
2254 else2254 else
2255 AddLog( _T( "\tFailed because no valid object !\n"));2255 AddLog( _T( "\tFailed because no valid object !\n"));
2256 // Windows NT => Open the SCSI controler key2256 // Windows NT => Open the SCSI controller key
2257 uIndex = 0;2257 uIndex = 0;
2258 dwIndexEnum = 0;2258 dwIndexEnum = 0;
2259 AddLog( _T( "Registry NT GetSystemControllers: Trying to find SCSI Controllers in HKLM\\%s...\n"),2259 AddLog( _T( "Registry NT GetSystemControllers: Trying to find SCSI Controllers in HKLM\\%s...\n"),
@@ -2370,7 +2370,7 @@
2370 }2370 }
2371 else2371 else
2372 AddLog( _T( "\tFailed because no valid object !\n"));2372 AddLog( _T( "\tFailed because no valid object !\n"));
2373 // Windows NT => Open the InfraRed controler key2373 // Windows NT => Open the InfraRed controller key
2374 uIndex = 0;2374 uIndex = 0;
2375 dwIndexEnum = 0;2375 dwIndexEnum = 0;
2376 AddLog( _T( "Registry NT GetSystemControllers: Trying to find InfraRed Controllers in HKLM\\%s...\n"),2376 AddLog( _T( "Registry NT GetSystemControllers: Trying to find InfraRed Controllers in HKLM\\%s...\n"),
@@ -2447,7 +2447,7 @@
2447 csSubKey, NT_CONTROLER_INFRARED_VERSION_VALUE);2447 csSubKey, NT_CONTROLER_INFRARED_VERSION_VALUE);
2448 csVersion = NOT_AVAILABLE;2448 csVersion = NOT_AVAILABLE;
2449 }2449 }
2450 // Ensure it is a controler2450 // Ensure it is a controller
2451 if (GetValue( hKeyObject, NT_CONTROLER_INFRARED_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)2451 if (GetValue( hKeyObject, NT_CONTROLER_INFRARED_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)
2452 {2452 {
2453 bHaveToStore = TRUE;2453 bHaveToStore = TRUE;
@@ -2498,7 +2498,7 @@
2498 }2498 }
2499 else2499 else
2500 AddLog( _T( "\tFailed because no valid object !\n"));2500 AddLog( _T( "\tFailed because no valid object !\n"));
2501 // Windows NT => Open the USB controler key2501 // Windows NT => Open the USB controller key
2502 uIndex = 0;2502 uIndex = 0;
2503 dwIndexEnum = 0;2503 dwIndexEnum = 0;
2504 AddLog( _T( "Registry NT GetSystemControllers: Trying to find USB Controllers in HKLM\\%s...\n"),2504 AddLog( _T( "Registry NT GetSystemControllers: Trying to find USB Controllers in HKLM\\%s...\n"),
@@ -2575,7 +2575,7 @@
2575 csSubKey, NT_CONTROLER_USB_VERSION_VALUE);2575 csSubKey, NT_CONTROLER_USB_VERSION_VALUE);
2576 csVersion = NOT_AVAILABLE;2576 csVersion = NOT_AVAILABLE;
2577 }2577 }
2578 // Ensure it is a controler2578 // Ensure it is a controller
2579 if (GetValue( hKeyObject, NT_CONTROLER_USB_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)2579 if (GetValue( hKeyObject, NT_CONTROLER_USB_CONTROLER_VALUE, csValue) == ERROR_SUCCESS)
2580 {2580 {
2581 bHaveToStore = TRUE;2581 bHaveToStore = TRUE;
@@ -2626,7 +2626,7 @@
2626 }2626 }
2627 else2627 else
2628 AddLog( _T( "\tFailed because no valid object !\n"));2628 AddLog( _T( "\tFailed because no valid object !\n"));
2629 // Windows NT => Open the IEEE1394 controler key2629 // Windows NT => Open the IEEE1394 controller key
2630 uIndex = 0;2630 uIndex = 0;
2631 dwIndexEnum = 0;2631 dwIndexEnum = 0;
2632 AddLog( _T( "Registry NT GetSystemControllers: Trying to find IEEE1394 Controllers in HKLM\\%s...\n"),2632 AddLog( _T( "Registry NT GetSystemControllers: Trying to find IEEE1394 Controllers in HKLM\\%s...\n"),
@@ -2743,7 +2743,7 @@
2743 }2743 }
2744 else2744 else
2745 AddLog( _T( "\tFailed because no valid object !\n"));2745 AddLog( _T( "\tFailed because no valid object !\n"));
2746 // Windows NT => Open the PCMCIA controler key2746 // Windows NT => Open the PCMCIA controller key
2747 uIndex = 0;2747 uIndex = 0;
2748 dwIndexEnum = 0;2748 dwIndexEnum = 0;
2749 AddLog( _T( "Registry NT GetSystemControllers: Trying to find PCMCIA Controllers in HKLM\\%s...\n"),2749 AddLog( _T( "Registry NT GetSystemControllers: Trying to find PCMCIA Controllers in HKLM\\%s...\n"),
27502750
=== modified file 'SysInfo/SnmpAPI.cpp'
--- SysInfo/SnmpAPI.cpp 2011-05-19 16:55:18 +0000
+++ SysInfo/SnmpAPI.cpp 2015-05-07 18:53:51 +0000
@@ -121,7 +121,7 @@
121//* network traffic via a WebPage.121//* network traffic via a WebPage.
122//* http://www.ee.ethz.ch/~oetiker/webtools/mrtg/122//* http://www.ee.ethz.ch/~oetiker/webtools/mrtg/
123//*123//*
124//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers124//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributors
125//* to MRTG125//* to MRTG
126//* All rights reserved.126//* All rights reserved.
127//* 127//*
128128
=== modified file 'SysInfo/StoragePeripheral.cpp'
--- SysInfo/StoragePeripheral.cpp 2014-08-24 07:40:05 +0000
+++ SysInfo/StoragePeripheral.cpp 2015-05-07 18:53:51 +0000
@@ -160,7 +160,7 @@
160 }160 }
161 StrForSQL( m_csSN);161 StrForSQL( m_csSN);
162 if (is_printable( m_csSN))162 if (is_printable( m_csSN))
163 // Hex decode successfull163 // Hex decode successful
164 return;164 return;
165 }165 }
166 // Not hex encoded (or hex decode failed), ensure printable166 // Not hex encoded (or hex decode failed), ensure printable
167167
=== modified file 'SysInfo/SysInfo.cpp'
--- SysInfo/SysInfo.cpp 2014-05-16 20:32:33 +0000
+++ SysInfo/SysInfo.cpp 2015-05-07 18:53:51 +0000
@@ -147,7 +147,7 @@
147 }147 }
148 else if (os.IsWindowsME(&osvi))148 else if (os.IsWindowsME(&osvi))
149 {149 {
150 csName = _T( "Microsoft Windows Millenium");150 csName = _T( "Microsoft Windows Millennium");
151 csComment.Empty();151 csComment.Empty();
152 }152 }
153 else153 else
154154
=== modified file 'SysInfo/VMSystem.h'
--- SysInfo/VMSystem.h 2011-03-24 13:26:32 +0000
+++ SysInfo/VMSystem.h 2015-05-07 18:53:51 +0000
@@ -20,13 +20,13 @@
20 CVMSystem(void);20 CVMSystem(void);
21 ~CVMSystem(void);21 ~CVMSystem(void);
2222
23 // Try to detect hypervisor we're runnning on using Bios23 // Try to detect hypervisor we're running on using Bios
24 BOOL DetectVM( CBios *pBios, CString &csVMSystem);24 BOOL DetectVM( CBios *pBios, CString &csVMSystem);
25 // Try to detect hypervisor we're runnning on using System controller25 // Try to detect hypervisor we're running on using System controller
26 BOOL DetectVM( CSystemControllerList *pMyList, CString &csVMSystem);26 BOOL DetectVM( CSystemControllerList *pMyList, CString &csVMSystem);
27 // Try to detect hypervisor we're runnning on using Storage Peripherals27 // Try to detect hypervisor we're running on using Storage Peripherals
28 BOOL DetectVM( CStoragePeripheralList *pMyList, CString &csVMSystem);28 BOOL DetectVM( CStoragePeripheralList *pMyList, CString &csVMSystem);
29 // Try to detect hypervisor we're runnning on using Video Adapter29 // Try to detect hypervisor we're running on using Video Adapter
30 BOOL DetectVM( CVideoAdapterList *pMyList, CString &csVMSystem);30 BOOL DetectVM( CVideoAdapterList *pMyList, CString &csVMSystem);
31protected:31protected:
32 // Try to find Hypervisor signature into a string32 // Try to find Hypervisor signature into a string
3333
=== modified file 'TestSysInfo/TestSysInfoDlg.cpp'
--- TestSysInfo/TestSysInfoDlg.cpp 2013-07-22 16:30:50 +0000
+++ TestSysInfo/TestSysInfoDlg.cpp 2015-05-07 18:53:51 +0000
@@ -968,7 +968,7 @@
968 }968 }
969969
970 m_List.AddString( _T( "------------------------------------------------------"));970 m_List.AddString( _T( "------------------------------------------------------"));
971 m_List.AddString( _T( "Video Controler infos"));971 m_List.AddString( _T( "Video Controller infos"));
972 m_List.AddString( _T( "------------------------------------------------------"));972 m_List.AddString( _T( "------------------------------------------------------"));
973 if (myWmiDll.BeginEnumClassObject( _T( "Win32_VideoController")))973 if (myWmiDll.BeginEnumClassObject( _T( "Win32_VideoController")))
974 {974 {
@@ -1263,7 +1263,7 @@
1263 }1263 }
12641264
1265 m_List.AddString( _T( "------------------------------------------------------"));1265 m_List.AddString( _T( "------------------------------------------------------"));
1266 m_List.AddString( _T( "Floppy Controler infos"));1266 m_List.AddString( _T( "Floppy Controller infos"));
1267 m_List.AddString( _T( "------------------------------------------------------"));1267 m_List.AddString( _T( "------------------------------------------------------"));
1268 if (myWmiDll.BeginEnumClassObject( _T( "Win32_FloppyController")))1268 if (myWmiDll.BeginEnumClassObject( _T( "Win32_FloppyController")))
1269 {1269 {
@@ -1302,7 +1302,7 @@
1302 }1302 }
13031303
1304 m_List.AddString( _T( "------------------------------------------------------"));1304 m_List.AddString( _T( "------------------------------------------------------"));
1305 m_List.AddString( _T( "IDE Controler infos"));1305 m_List.AddString( _T( "IDE Controller infos"));
1306 m_List.AddString( _T( "------------------------------------------------------"));1306 m_List.AddString( _T( "------------------------------------------------------"));
1307 if (myWmiDll.BeginEnumClassObject( _T( "Win32_IDEController")))1307 if (myWmiDll.BeginEnumClassObject( _T( "Win32_IDEController")))
1308 {1308 {
@@ -1341,7 +1341,7 @@
1341 }1341 }
13421342
1343 m_List.AddString( _T( "------------------------------------------------------"));1343 m_List.AddString( _T( "------------------------------------------------------"));
1344 m_List.AddString( _T( "SCSI Controler infos"));1344 m_List.AddString( _T( "SCSI Controller infos"));
1345 m_List.AddString( _T( "------------------------------------------------------"));1345 m_List.AddString( _T( "------------------------------------------------------"));
1346 if (myWmiDll.BeginEnumClassObject( _T( "Win32_SCSIController")))1346 if (myWmiDll.BeginEnumClassObject( _T( "Win32_SCSIController")))
1347 {1347 {
@@ -1388,7 +1388,7 @@
1388 }1388 }
13891389
1390 m_List.AddString( _T( "------------------------------------------------------"));1390 m_List.AddString( _T( "------------------------------------------------------"));
1391 m_List.AddString( _T( "InfraRed Controler infos"));1391 m_List.AddString( _T( "InfraRed Controller infos"));
1392 m_List.AddString( _T( "------------------------------------------------------"));1392 m_List.AddString( _T( "------------------------------------------------------"));
1393 if (myWmiDll.BeginEnumClassObject( _T( "Win32_InfraredDevice")))1393 if (myWmiDll.BeginEnumClassObject( _T( "Win32_InfraredDevice")))
1394 {1394 {
@@ -1427,7 +1427,7 @@
1427 }1427 }
14281428
1429 m_List.AddString( _T( "------------------------------------------------------"));1429 m_List.AddString( _T( "------------------------------------------------------"));
1430 m_List.AddString( _T( "USB Controler infos"));1430 m_List.AddString( _T( "USB Controller infos"));
1431 m_List.AddString( _T( "------------------------------------------------------"));1431 m_List.AddString( _T( "------------------------------------------------------"));
1432 if (myWmiDll.BeginEnumClassObject( _T( "Win32_USBController")))1432 if (myWmiDll.BeginEnumClassObject( _T( "Win32_USBController")))
1433 {1433 {
@@ -1466,7 +1466,7 @@
1466 }1466 }
14671467
1468 m_List.AddString( _T( "------------------------------------------------------"));1468 m_List.AddString( _T( "------------------------------------------------------"));
1469 m_List.AddString( _T( "IEEE 1394 Controler infos"));1469 m_List.AddString( _T( "IEEE 1394 Controller infos"));
1470 m_List.AddString( _T( "------------------------------------------------------"));1470 m_List.AddString( _T( "------------------------------------------------------"));
1471 if (myWmiDll.BeginEnumClassObject( _T( "Win32_1394Controller")))1471 if (myWmiDll.BeginEnumClassObject( _T( "Win32_1394Controller")))
1472 {1472 {
@@ -1505,7 +1505,7 @@
1505 }1505 }
15061506
1507 m_List.AddString( _T( "------------------------------------------------------"));1507 m_List.AddString( _T( "------------------------------------------------------"));
1508 m_List.AddString( _T( "PCMCIA Controler infos"));1508 m_List.AddString( _T( "PCMCIA Controller infos"));
1509 m_List.AddString( _T( "------------------------------------------------------"));1509 m_List.AddString( _T( "------------------------------------------------------"));
1510 if (myWmiDll.BeginEnumClassObject( _T( "Win32_PCMCIAController")))1510 if (myWmiDll.BeginEnumClassObject( _T( "Win32_PCMCIAController")))
1511 {1511 {
15121512
=== modified file 'logon/OcsLogon.nsi'
--- logon/OcsLogon.nsi 2014-01-08 16:29:30 +0000
+++ logon/OcsLogon.nsi 2015-05-07 18:53:51 +0000
@@ -60,7 +60,7 @@
60# Global variables60# Global variables
61#####################################################################61#####################################################################
62var /GLOBAL nGpo ; Set to 1 if /GPO is provided62var /GLOBAL nGpo ; Set to 1 if /GPO is provided
63var /GLOBAL nShowlog ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, usefull for debugging63var /GLOBAL nShowlog ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, useful for debugging
64var /GLOBAL nUninstall ; Set to 1 if /Uninstall is provided64var /GLOBAL nUninstall ; Set to 1 if /Uninstall is provided
65var /GLOBAL nForce ; Do we overwrite installed version (=1) or not (=0)65var /GLOBAL nForce ; Do we overwrite installed version (=1) or not (=0)
66var /GLOBAL nTimeOut ; Download timeout (default 60 sec)66var /GLOBAL nTimeOut ; Download timeout (default 60 sec)
6767
=== modified file 'logon/Readme.txt'
--- logon/Readme.txt 2011-05-27 13:56:11 +0000
+++ logon/Readme.txt 2015-05-07 18:53:51 +0000
@@ -18,7 +18,7 @@
18By default, OcsLogon try to download and install standard Agent setup file 18By default, OcsLogon try to download and install standard Agent setup file
19"ocsagent.exe", but it can also use "ocspackage.exe", file created by OCS19"ocsagent.exe", but it can also use "ocspackage.exe", file created by OCS
20Inventory NG Packager, which can embbed certificate file and can be executed20Inventory NG Packager, which can embbed certificate file and can be executed
21under a fixed administrator account. This is usefull when user logon script 21under a fixed administrator account. This is useful when user logon script
22is used in Samba domain, to allow installation process by non administrator22is used in Samba domain, to allow installation process by non administrator
23users. 23users.
2424
2525
=== modified file 'ocsinventory.ini.sample'
--- ocsinventory.ini.sample 2010-07-07 20:56:04 +0000
+++ ocsinventory.ini.sample 2015-05-07 18:53:51 +0000
@@ -5,7 +5,7 @@
5; Enable local inventory mode (path to folder to store .ocs file => enabled,5; Enable local inventory mode (path to folder to store .ocs file => enabled,
6; empty => disabled) 6; empty => disabled)
7Local=7Local=
8; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware8; Enable agent scanning HKEY_CURRENT_USER hive for printers and software
9; (0 => disabled, 1 => enabled) 9; (0 => disabled, 1 => enabled)
10HKCU=010HKCU=0
11; Disable prompting user for TAG value (0 => prompt allowed, 1 => disabled) 11; Disable prompting user for TAG value (0 => prompt allowed, 1 => disabled)

Subscribers

People subscribed via source and target branches