Merge lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent into lp:ocsinventory-windows-agent
- ocsinventory-windows-agent
- Merge into trunk
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Liroulet | 2015-05-07 | Pending | |
Review via email:
|
Commit message
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
1 | === modified file 'Agent/CapDownload.h' |
2 | --- Agent/CapDownload.h 2013-03-28 13:49:37 +0000 |
3 | +++ Agent/CapDownload.h 2015-05-07 18:53:51 +0000 |
4 | @@ -48,7 +48,7 @@ |
5 | |
6 | protected: // Attributes |
7 | CObArray m_tPackages; // Array of package to process |
8 | - CString m_csDownloadFragLatency; // Time to wait betwen fragment downloaded |
9 | + CString m_csDownloadFragLatency; // Time to wait between fragment downloaded |
10 | CString m_csDownloadCycleLatency; // Time to wait between download cycle |
11 | CString m_csDownloadPeriodLatency; // Time to wait between each cycle priority ( = period) |
12 | CString m_csDownloadPeriodLength; // Number of period in a download cycle |
13 | |
14 | === modified file 'Agent/CapExecute.cpp' |
15 | --- Agent/CapExecute.cpp 2013-12-27 12:43:13 +0000 |
16 | +++ Agent/CapExecute.cpp 2015-05-07 18:53:51 +0000 |
17 | @@ -119,7 +119,7 @@ |
18 | continue; |
19 | } |
20 | m_pLogger->log( LOG_PRIORITY_WARNING, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output encoded to UTF-8, trying to reload XML document"), cFinder.GetFilePath()); |
21 | - // UTF-8 encode successfull, try to reload |
22 | + // UTF-8 encode successful, try to reload |
23 | if (!myXml.LoadFile( csOutputFile)) |
24 | { |
25 | m_pLogger->log( LOG_PRIORITY_ERROR, _T( "EXECUTABLE PLUGIN => Executable plugin <%s> output is not a valid XML document"), cFinder.GetFilePath()); |
26 | |
27 | === modified file 'Agent/CapacityAbstract.cpp' |
28 | --- Agent/CapacityAbstract.cpp 2011-05-19 16:55:18 +0000 |
29 | +++ Agent/CapacityAbstract.cpp 2015-05-07 18:53:51 +0000 |
30 | @@ -38,7 +38,7 @@ |
31 | { |
32 | } |
33 | |
34 | -// Intialization |
35 | +// Initialization |
36 | void CCapacityAbstract::setProlog( CPrologRequest *pProlog) |
37 | { |
38 | m_pProlog = pProlog; |
39 | |
40 | === modified file 'Agent/OCSInventory.cpp' |
41 | --- Agent/OCSInventory.cpp 2014-04-09 16:22:56 +0000 |
42 | +++ Agent/OCSInventory.cpp 2015-05-07 18:53:51 +0000 |
43 | @@ -212,7 +212,7 @@ |
44 | ****/ |
45 | if (m_pConfig->isLocalRequired()) |
46 | { |
47 | - m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode actived by /LOCAL argument: No network connection")); |
48 | + m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Local mode activated by /LOCAL argument: No network connection")); |
49 | csMessage.Format( _T( "%s\\%s.ocs"), m_pConfig->getLocalInventoryFolder(), getOcsDeviceID()->getDeviceID()); |
50 | // Create local connection object |
51 | if ((pConnexion = new CConnexionLocal( csMessage)) == NULL) |
52 | @@ -322,7 +322,7 @@ |
53 | DeleteFile( csLabelFile); |
54 | } |
55 | else |
56 | - m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label sucessfully retrieved")); |
57 | + m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "AGENT => Label successfully retrieved")); |
58 | } |
59 | |
60 | } |
61 | |
62 | === modified file 'Agent/PluginApi.h' |
63 | --- Agent/PluginApi.h 2012-08-29 09:30:04 +0000 |
64 | +++ Agent/PluginApi.h 2015-05-07 18:53:51 +0000 |
65 | @@ -36,7 +36,7 @@ |
66 | extern "C" { |
67 | #endif |
68 | |
69 | -// Hook called when agent loads, typicaly used to initialize plugin |
70 | +// Hook called when agent loads, typically used to initialize plugin |
71 | typedef int (*HOOK_START)(void); |
72 | OCSINVENTORY_API_EXPORTED int OCS_CALL_START_EXPORTED(); |
73 | // Hook called before sending prolog to server, typically used to add/modify information to prolog request |
74 | |
75 | === modified file 'Agent/Plugins.cpp' |
76 | --- Agent/Plugins.cpp 2012-08-29 09:30:04 +0000 |
77 | +++ Agent/Plugins.cpp 2015-05-07 18:53:51 +0000 |
78 | @@ -141,7 +141,7 @@ |
79 | nCount++; |
80 | } |
81 | cFinder.Close(); |
82 | - m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) succesfully loaded on %d DLL(s) found"), nPlugin, nCount); |
83 | + m_pLogger->log(LOG_PRIORITY_DEBUG, _T( "DLL PLUGIN => %d DLL Plug-in(s) successfully loaded on %d DLL(s) found"), nPlugin, nCount); |
84 | return nPlugin; |
85 | } |
86 | catch (CException *pEx) |
87 | |
88 | === modified file 'Agent/Plugins.h' |
89 | --- Agent/Plugins.h 2012-08-29 09:30:04 +0000 |
90 | +++ Agent/Plugins.h 2015-05-07 18:53:51 +0000 |
91 | @@ -45,7 +45,7 @@ |
92 | CPlugins(); |
93 | virtual ~CPlugins(); |
94 | |
95 | - // Call plugin Hook when agent loads, typicaly used to initialize plugin |
96 | + // Call plugin Hook when agent loads, typically used to initialize plugin |
97 | void startHook(); |
98 | // Call plugin Hook before sending prolog to server, typically used to add/modify information to prolog request |
99 | void prologWriteHook(CPrologRequest*); |
100 | |
101 | === modified file 'CHANGELOG' |
102 | --- CHANGELOG 2014-05-16 22:32:18 +0000 |
103 | +++ CHANGELOG 2015-05-07 18:53:51 +0000 |
104 | @@ -10,7 +10,7 @@ |
105 | 2.1.0.4 |
106 | * Get DMI data using OcsWmi DLL, instead of using own WMI code |
107 | * Fix bug #1062582 Windows agent leaks handles by initializing COM and COM Security into main executable, instead of DLL |
108 | - * Enable more detailled debug logs, and fixes small issues |
109 | + * Enable more detailed debug logs, and fixes small issues |
110 | 2.1.0.3 |
111 | * Fix XSLT for displaying CPU into "show computer information" command of systrau applet |
112 | * Fix Processor S/N filled with CPU Status if no serial number exist |
113 | @@ -25,9 +25,9 @@ |
114 | * Fix Bug #1217435: Packager tries to shutdown ocs service twice when upgrading from 1.X agent |
115 | * Fix bug displaying before installation user notification at the end of installation, instead of post installation notification text |
116 | * Add package command start date/time and timeout date/time to log |
117 | - * Fix bug #1184426: Retreive processor Serial Number |
118 | + * Fix bug #1184426: Retrieve processor Serial Number |
119 | * Fix bug disabling ability to control command execution timeout from server |
120 | - * Try to retreive CPU S/N using WMI |
121 | + * Try to retrieve CPU S/N using WMI |
122 | * There is now DMI table type greater than 127, so remove type lower and upper bound check |
123 | * WMI meory bank type codes are not the same as DMI codes |
124 | * Add printer information (Print server name and share, resolution, comment, Is printer shared, Is printer on network) |
125 | @@ -52,7 +52,7 @@ |
126 | * Fix bug #1045784: Ensure timestamp exists before verify expiration |
127 | * 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). |
128 | * Rename ERR_ALREADY_SETUP en SUCCESS_ALREADY_SETUP |
129 | - * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retreive and set explicit message |
130 | + * Bug #1031935: Windows MAK or VLK activation key are not stored on computer, so unable to retrieve and set explicit message |
131 | * 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 |
132 | 2.0.5.0 |
133 | * Enhanced dynamic DLL plugin API |
134 | @@ -104,7 +104,7 @@ |
135 | 2.0.2, aka 2.0.2.0 |
136 | * Fix Bug #872768: Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted." |
137 | * Ensure all array and objects are correctly freed |
138 | - * Fix Bug #859574: Switch to WMI to retreive Bios infos even if DMI access is successfull, but serial or model is not valid |
139 | + * Fix Bug #859574: Switch to WMI to retrieve Bios infos even if DMI access is successful, but serial or model is not valid |
140 | * Fix Bug #435068: Do not register multiple time a monitor with the same serial |
141 | * Fix Bug #860466: Propagate inherited permissions from $AppData\OCS Inventory NG\Agent to Download directory |
142 | 2.0.1, aka 2.0.1.0 |
143 | @@ -124,7 +124,7 @@ |
144 | * 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 |
145 | * Send setup result to server when deploying new OCS agent, without interfering with other package download |
146 | * Fix bug #783611 semicolon added to Type under Bios when using WMI |
147 | - * When using WMI, get S/N from Win32_Bios, and if not availble, try Win32_SystemEnclosure then Win32_Baseboard |
148 | + * When using WMI, get S/N from Win32_Bios, and if not available, try Win32_SystemEnclosure then Win32_Baseboard |
149 | * Fix memory leak in WMI Storage query |
150 | * Delete OCS agent setup done file if found, when cleaning a package |
151 | * 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 |
152 | @@ -133,7 +133,7 @@ |
153 | * Fix memory leak into OCsWmi.dll |
154 | * Fix bogus network adapter description in some Cyrillic OS (perhaps other charset affected) |
155 | 2.0.0.18 |
156 | - * 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) |
157 | + * 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) |
158 | * In NOTIFY mode, update only network inventory state, to avoid service launching agent every minute ! |
159 | * In NOTIFY mode, do not launch Registry, Download or Ipdiscover capacity, neither VBS or executable plugins (only DLL plugins) |
160 | * Fix some other memory leaks |
161 | @@ -199,7 +199,7 @@ |
162 | * Activate minimal log file ocsinventory.log by default into %PROGRAMDATA%\OCS Inventory NG\Agent |
163 | * Delay WMI first use until app start, to fix hang under Vista and higher. WMI cannot be used until WinMain starts |
164 | * Review WMI code, and use WMI to get Logical drives |
165 | - * Add service description and dependancies to standards windows services RPCSS, EventLog, WMI and Tcpip |
166 | + * Add service description and dependencies to standards windows services RPCSS, EventLog, WMI and Tcpip |
167 | * Bug #568534 and #493609: Add 64 bits support for registry key |
168 | * Bug #563796: NOTIFY should send the IPGATEWAY |
169 | * Bug #484115: Frequency of inventory for ip_discover computer |
170 | |
171 | === modified file 'ComHTTP/HTTPCrypt.cpp' |
172 | --- ComHTTP/HTTPCrypt.cpp 2011-07-13 08:55:00 +0000 |
173 | +++ ComHTTP/HTTPCrypt.cpp 2015-05-07 18:53:51 +0000 |
174 | @@ -120,7 +120,7 @@ |
175 | |
176 | BOOL CHTTPCrypt::encrypt( CString &csInput, CString &csOutput) |
177 | { |
178 | - BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated intialization vector |
179 | + BYTE pInitVector[AES_BLOCK_SIZE]; // Random generated initialization vector |
180 | EVP_CIPHER_CTX oEncCtx; // Cipher context |
181 | const EVP_CIPHER *oChiper = NULL; // Cipher object |
182 | LPBYTE pInBuffer = NULL, // Input buffer for data to encipher |
183 | |
184 | === modified file 'Download/Download.h' |
185 | --- Download/Download.h 2014-04-09 16:22:56 +0000 |
186 | +++ Download/Download.h 2015-05-07 18:53:51 +0000 |
187 | @@ -70,7 +70,7 @@ |
188 | CLog *m_pLogger; |
189 | CConfig *m_pConfig; |
190 | CConnexionAbstract *m_pConnexion; |
191 | - UINT m_uDownloadFragLatency; // Time to wait betwen fragment downloaded |
192 | + UINT m_uDownloadFragLatency; // Time to wait between fragment downloaded |
193 | UINT m_uDownloadCycleLatency; // Time to wait between download cycle |
194 | UINT m_uDownloadPeriodLatency; // Time to wait between each cycle priority ( = period) |
195 | UINT m_uDownloadPeriodLength; // Number of period in a download cycle |
196 | |
197 | === modified file 'Download/Package.cpp' |
198 | --- Download/Package.cpp 2014-06-10 16:56:21 +0000 |
199 | +++ Download/Package.cpp 2015-05-07 18:53:51 +0000 |
200 | @@ -104,7 +104,7 @@ |
201 | |
202 | if (m_csAction == OCS_DOWNLOAD_ACTION_LAUNCH) |
203 | { |
204 | - // In LAUNCH, command is in the NAME atribute |
205 | + // In LAUNCH, command is in the NAME attribute |
206 | if( !ExpandEnvironmentStrings( m_csName, cCommand, 255 )) |
207 | { |
208 | return FALSE; |
209 | @@ -705,7 +705,7 @@ |
210 | // Check if first fragment exist |
211 | csFile.Format( _T( "%s\\%s\\%s-1"), getDownloadFolder(), m_csID, m_csID); |
212 | if (fileExists( csFile)) |
213 | - // Package not built, or previous build unsuccessfull |
214 | + // Package not built, or previous build unsuccessful |
215 | return FALSE; |
216 | // Check if ZIP exist |
217 | csFile.Format( _T( "%s\\%s\\%s"), getDownloadFolder(), m_csID, OCS_DOWNLOAD_BUILD); |
218 | |
219 | === modified file 'Download/Package.h' |
220 | --- Download/Package.h 2014-06-10 16:56:21 +0000 |
221 | +++ Download/Package.h 2015-05-07 18:53:51 +0000 |
222 | @@ -104,7 +104,7 @@ |
223 | BOOL regReadPackageDigest( CString &csDigest); |
224 | // Delete package digest from registry |
225 | BOOL regDeletePackageDigest(); |
226 | - // Is execution result successfull |
227 | + // Is execution result successful |
228 | BOOL isExecSuccessful( int nExitCode, CString &csStatus); |
229 | |
230 | protected: |
231 | @@ -131,7 +131,7 @@ |
232 | CString m_csNotifyText; // Before package action user notification text |
233 | BOOL m_bNotifyCanAbort; // Is user able to abort package setup |
234 | BOOL m_bNotifyCanDelay; // Is user able to report package setup at next agent execution |
235 | - BOOL m_bNeedDoneAction; // Do we have to notify user after package successfull execution |
236 | + BOOL m_bNeedDoneAction; // Do we have to notify user after package successful execution |
237 | CString m_csNeedDoneActionText; // After package success notification text |
238 | }; |
239 | |
240 | |
241 | === modified file 'External_Deps/OCS_Make_Required_Libs.bat' |
242 | --- External_Deps/OCS_Make_Required_Libs.bat 2014-08-25 13:08:56 +0000 |
243 | +++ External_Deps/OCS_Make_Required_Libs.bat 2015-05-07 18:53:51 +0000 |
244 | @@ -212,7 +212,7 @@ |
245 | echo * Please, fix problem before trying to build OCS Inventory NG ! * |
246 | echo * * |
247 | echo * Here is some common errors: * |
248 | -echo * - Have you reviewed paths at the begining of this batch file ? * |
249 | +echo * - Have you reviewed paths at the beginning of this batch file ? * |
250 | echo * - Have you updated Visual C++ version in cURL Makefile ? * |
251 | echo * - Have you build ZipArchive "Release Unicode STL MD DLL" ? * |
252 | echo * * |
253 | |
254 | === modified file 'NSIS_agent_setup/Agent.ini' |
255 | --- NSIS_agent_setup/Agent.ini 2011-09-06 17:39:00 +0000 |
256 | +++ NSIS_agent_setup/Agent.ini 2015-05-07 18:53:51 +0000 |
257 | @@ -53,7 +53,7 @@ |
258 | |
259 | [Field 7] |
260 | Type=Checkbox |
261 | -Text=Do not registrer service - agent must be launched manually (= /NO_SERVICE) |
262 | +Text=Do not register service - agent must be launched manually (= /NO_SERVICE) |
263 | Left=15 |
264 | Right=290 |
265 | Top=89 |
266 | @@ -71,7 +71,7 @@ |
267 | |
268 | [Field 9] |
269 | Type=Checkbox |
270 | -Text=Immediatly launch inventory (= /NOW) |
271 | +Text=Immediately launch inventory (= /NOW) |
272 | Left=15 |
273 | Right=290 |
274 | Top=120 |
275 | |
276 | === modified file 'NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi' |
277 | --- NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi 2014-08-24 07:54:24 +0000 |
278 | +++ NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi 2015-05-07 18:53:51 +0000 |
279 | @@ -557,7 +557,7 @@ |
280 | WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "0" |
281 | goto ParseCmd_Now_End |
282 | ParseCmd_Now: |
283 | - ; Immediately maunch inventory |
284 | + ; Immediately launch inventory |
285 | WriteINIStr "$PLUGINSDIR\agent.ini" "Field 9" "State" "1" |
286 | ParseCmd_Now_End: |
287 | ; Remove parsed arg from command line |
288 | @@ -1517,7 +1517,7 @@ |
289 | IfErrors 0 +3 |
290 | StrCpy $logBuffer "Failed to remove key, but non blocking !" |
291 | Call Write_Log |
292 | - ; Ensure service uninstall and migration process successfull |
293 | + ; Ensure service uninstall and migration process successful |
294 | IfFileExists "$INSTDIR\PsApi.dll" TestInstall_Upgrade_Error |
295 | StrCpy $logBuffer "$\r$\nMigration process from old agent 4000 series succesfull, continuing setup...$\r$\n" |
296 | Call Write_Log |
297 | @@ -1571,7 +1571,7 @@ |
298 | Call Write_Log |
299 | strcpy $installSatus ":(" |
300 | clearerrors |
301 | - ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER) |
302 | + ; MSVC 9 CRT redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER) |
303 | SetOutPath "$INSTDIR" |
304 | File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.CRT.manifest" |
305 | Iferrors 0 +5 |
306 | @@ -1597,7 +1597,7 @@ |
307 | Call Write_Log |
308 | strcpy $installSatus ":(" |
309 | clearerrors |
310 | - ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatiblity only (DO NOT WORK ON XP AND HIGHER) |
311 | + ; MSVC 9 MFC redist 9.00.21022.8 for Windows 2000 compatibility only (DO NOT WORK ON XP AND HIGHER) |
312 | File "vc2008_redist_9.00.21022.8_for_Windows_2000\Microsoft.VC90.MFC.manifest" |
313 | Iferrors 0 +5 |
314 | StrCpy $logBuffer "$logBuffer ERROR copying \Microsoft.VC90.MFC.manifest $\r$\n" |
315 | @@ -1913,14 +1913,14 @@ |
316 | |
317 | |
318 | ##################################################################### |
319 | -# This function writes install status into log file when sucessfull install |
320 | +# This function writes install status into log file when successful install |
321 | ##################################################################### |
322 | Function .onInstSuccess |
323 | strcmp "$installSatus" ";-)" 0 onInstSuccess_Error |
324 | Push "SUCCESS" |
325 | Call WriteAgentSetupDone |
326 | ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6 |
327 | - StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfuly installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n " |
328 | + StrCpy $logBuffer "SUCCESS: ${PRODUCT_NAME} ${PRODUCT_VERSION} successfully installed on $0/$1/$2 at $4:$5:$6$\r$\n$installSatus$\r$\n " |
329 | Call Write_Log |
330 | goto onInstSuccess_end |
331 | onInstSuccess_Error: |
332 | |
333 | === modified file 'NSIS_agent_setup/Readme.txt' |
334 | --- NSIS_agent_setup/Readme.txt 2012-07-30 20:07:46 +0000 |
335 | +++ NSIS_agent_setup/Readme.txt 2015-05-07 18:53:51 +0000 |
336 | @@ -36,7 +36,7 @@ |
337 | |
338 | MS11-025 critical fix introduces incompatibilty problem of MS CRT/MFC 9.0 with |
339 | Windows 2000 (http://blogs.msdn.com/b/vcblog/archive/2011/04/26/10158277.aspx). |
340 | -So for Windows 2000 only, w've choosen to install original MS CRT/MFC |
341 | +So for Windows 2000 only, we have chosen to install original MS CRT/MFC |
342 | 9.00.21022.8 provided with Visual C++ 2008 without Service Pack or hot fixes. |
343 | You must put these files into "vc2008_redist_9.00.21022.8_for_Windows_2000" |
344 | sub directory before building NSIS installer. |
345 | @@ -82,4 +82,4 @@ |
346 | |
347 | We hope it will works for you ! |
348 | |
349 | -OCS Inventory Team |
350 | \ No newline at end of file |
351 | +OCS Inventory Team |
352 | |
353 | === modified file 'OCSInventory Front/Config.cpp' |
354 | --- OCSInventory Front/Config.cpp 2011-09-06 17:39:00 +0000 |
355 | +++ OCSInventory Front/Config.cpp 2015-05-07 18:53:51 +0000 |
356 | @@ -180,7 +180,7 @@ |
357 | m_csLocal.ReleaseBuffer(); |
358 | // Scan for installed software or not |
359 | m_bNoSoftware = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoSoftware"), FALSE, m_csConfigFile); |
360 | - // Scanning HKEY_CURRENT_USER hive for printers and sofware |
361 | + // Scanning HKEY_CURRENT_USER hive for printers and software |
362 | m_bHKCU = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "HKCU"), FALSE, m_csConfigFile); |
363 | // Disable prompting user for TAG value |
364 | m_bNoTag = (BOOL)GetPrivateProfileInt( OCS_AGENT_SECTION, _T( "NoTAG"), FALSE, m_csConfigFile); |
365 | |
366 | === modified file 'OCSInventory Front/Config.h' |
367 | --- OCSInventory Front/Config.h 2011-09-06 17:39:00 +0000 |
368 | +++ OCSInventory Front/Config.h 2015-05-07 18:53:51 +0000 |
369 | @@ -107,7 +107,7 @@ |
370 | // What's the content of TAG (/TAG:"tag value") |
371 | BOOL isTagTextProvided(); |
372 | LPCTSTR getTagText(); |
373 | - // Does agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU) |
374 | + // Does agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU) |
375 | BOOL isHkcuRequired(); |
376 | // Is Inventory forced (/FORCE) |
377 | BOOL isForceInventoryRequired(); |
378 | @@ -141,7 +141,7 @@ |
379 | void setIpDiscoverLatency(LPCTSTR lpstrLatency = NULL); |
380 | // Does agent launches a fast IpDiscover scan, without taking care of network load, or not |
381 | void setFastIpRequired( BOOL bFast = TRUE); |
382 | - // Set if agent also scan HKEY_CURRENT_USER hive for printers and sofware (/HKCU) |
383 | + // Set if agent also scan HKEY_CURRENT_USER hive for printers and software (/HKCU) |
384 | void setHkcuRequired( BOOL bHKCU = TRUE); |
385 | // Set Communication Provider DLL to use without extension .DLL |
386 | void setCommunicationProvider( LPCTSTR lpstrDll); |
387 | |
388 | === modified file 'OCSInventory Front/Deviceid.cpp' |
389 | --- OCSInventory Front/Deviceid.cpp 2011-05-19 16:55:18 +0000 |
390 | +++ OCSInventory Front/Deviceid.cpp 2015-05-07 18:53:51 +0000 |
391 | @@ -145,7 +145,7 @@ |
392 | delete pCb; |
393 | return FALSE; |
394 | } |
395 | - // All sucessfull |
396 | + // All successful |
397 | delete pCb; |
398 | return TRUE; |
399 | } |
400 | |
401 | === modified file 'OCSInventory Front/ExecCommand.h' |
402 | --- OCSInventory Front/ExecCommand.h 2012-09-26 16:31:18 +0000 |
403 | +++ OCSInventory Front/ExecCommand.h 2015-05-07 18:53:51 +0000 |
404 | @@ -51,7 +51,7 @@ |
405 | * We don't care about command ending, so stdout and stderr |
406 | * will not be grabbed, and we will not try to get process |
407 | * exit code |
408 | - * Return EXEC_SUCCESSFULL if all successfull |
409 | + * Return EXEC_SUCCESSFULL if all successful |
410 | * EXEC_ERROR_START_COMMAND if start command error |
411 | */ |
412 | int execNoWait(LPCTSTR lpstrCommand, LPCTSTR lpstrPath); |
413 | @@ -59,12 +59,12 @@ |
414 | /** |
415 | * Exec command in the directory path. Make sure that the |
416 | * executable is either in the path or specify the full path. |
417 | - * We will try to get process exit code (use getExitCode() to retreive it). |
418 | + * We will try to get process exit code (use getExitCode() to retrieve it). |
419 | * If bCapture is TRUE, stdout and stderr will be grabbed (use getOutput() |
420 | - * to retreive it) |
421 | + * to retrieve it) |
422 | * We will wait until command end (but if command starts other |
423 | * processes/threads, we will not be able to wait for those ending) |
424 | - * Return EXEC_SUCCESSFULL if all successfull |
425 | + * Return EXEC_SUCCESSFULL if all successful |
426 | * EXEC_ERROR_START_COMMAND if start command error |
427 | * EXEC_ERROR_WAIT_COMMAND if wait or get exit code/ouput error, |
428 | */ |
429 | @@ -75,7 +75,7 @@ |
430 | * executable is either in the path or specify the full path. |
431 | * Wait for command AND ALL others threads/processes it may launch to finish. |
432 | * In this case, we try get exit code, but NOT stdout and stderr |
433 | - * Return EXEC_SUCCESSFULL if all successfull |
434 | + * Return EXEC_SUCCESSFULL if all successful |
435 | * EXEC_ERROR_START_COMMAND if start command error |
436 | * EXEC_ERROR_WAIT_COMMAND if wait error, |
437 | */ |
438 | |
439 | === modified file 'OCSInventory Front/InventoryRequest.cpp' |
440 | --- OCSInventory Front/InventoryRequest.cpp 2014-08-06 15:06:08 +0000 |
441 | +++ OCSInventory Front/InventoryRequest.cpp 2015-05-07 18:53:51 +0000 |
442 | @@ -156,7 +156,7 @@ |
443 | m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Port(s)"), m_PortList.GetCount()); |
444 | // Update System Controllers |
445 | bSuccess = bSuccess && m_pTheDB->UpdateSystemControllers( m_SystemControllerList); |
446 | - m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controler(s)"), m_SystemControllerList.GetCount()); |
447 | + m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Controller(s)"), m_SystemControllerList.GetCount()); |
448 | // Update System Slots |
449 | bSuccess = bSuccess && m_pTheDB->UpdateSystemSlots( m_SlotList); |
450 | m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u System Slot(s)"), m_SlotList.GetCount()); |
451 | @@ -710,7 +710,7 @@ |
452 | if (!m_pSysInfo->getSystemControllers( &m_SystemControllerList)) |
453 | m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controlers")); |
454 | else |
455 | - m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controler(s) found"), |
456 | + m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controller(s) found"), |
457 | m_SystemControllerList.GetCount()); |
458 | // Get Physical storage devices |
459 | if (!m_pSysInfo->getStoragePeripherals( &m_StorageList)) |
460 | |
461 | === modified file 'OCSInventory Front/Log.h' |
462 | --- OCSInventory Front/Log.h 2011-05-04 13:48:35 +0000 |
463 | +++ OCSInventory Front/Log.h 2015-05-07 18:53:51 +0000 |
464 | @@ -24,7 +24,7 @@ |
465 | |
466 | /* OCS Inventory NG log modes |
467 | /DEBUG=0 => default mode |
468 | - /DEBUG=1 => DEBUG mode, for more detailled logs |
469 | + /DEBUG=1 => DEBUG mode, for more detailed logs |
470 | /DEBUG=2 => TRACE mode, for full logs, including XML and SysInfo logs |
471 | */ |
472 | |
473 | @@ -71,7 +71,7 @@ |
474 | // Trace log for full mode debug |
475 | void log_trace( LPCTSTR lpstrFormat, va_list args); |
476 | |
477 | -private: // Atributes |
478 | +private: // Attributes |
479 | // Log filename |
480 | CString m_csFileName; |
481 | // The log file opened |
482 | |
483 | === modified file 'OCSInventory Front/Markup.cpp' |
484 | --- OCSInventory Front/Markup.cpp 2012-10-25 19:49:58 +0000 |
485 | +++ OCSInventory Front/Markup.cpp 2015-05-07 18:53:51 +0000 |
486 | @@ -169,7 +169,7 @@ |
487 | { |
488 | // This a test child, remove it... |
489 | m_pCurrentNode->RemoveChild( pChild); |
490 | - // ...and restart from the begining of childs |
491 | + // ...and restart from the beginning of childs |
492 | pChild = NULL; |
493 | } |
494 | } |
495 | |
496 | === modified file 'OCSInventory Front/OcsUtils.cpp' |
497 | --- OCSInventory Front/OcsUtils.cpp 2014-08-24 07:40:05 +0000 |
498 | +++ OCSInventory Front/OcsUtils.cpp 2015-05-07 18:53:51 +0000 |
499 | @@ -385,7 +385,7 @@ |
500 | UINT uLength; |
501 | |
502 | OpenSSL_add_all_digests(); |
503 | - // Set the algorythm |
504 | + // Set the algorithm |
505 | if (!(evpMD = EVP_get_digestbyname( GetAnsiFromUnicode( lpstrAlgo)))) |
506 | // Unsupported digest |
507 | return FALSE; |
508 | |
509 | === modified file 'OCSInventory Front/RequestAbstract.cpp' |
510 | --- OCSInventory Front/RequestAbstract.cpp 2011-05-19 16:55:18 +0000 |
511 | +++ OCSInventory Front/RequestAbstract.cpp 2015-05-07 18:53:51 +0000 |
512 | @@ -81,7 +81,7 @@ |
513 | csXml.Delete( nIndex, nCount - nIndex); |
514 | // and insert space |
515 | csXml.Insert( nIndex, " "); |
516 | - // Find next occurence |
517 | + // Find next occurrence |
518 | nIndex = csXml.Find( "&#x", nIndex); |
519 | } |
520 | m_cmXml.SetDoc( csXml); |
521 | |
522 | === modified file 'OCSInventory Front/commonDownload.h' |
523 | --- OCSInventory Front/commonDownload.h 2013-03-19 18:25:18 +0000 |
524 | +++ OCSInventory Front/commonDownload.h 2015-05-07 18:53:51 +0000 |
525 | @@ -101,7 +101,7 @@ |
526 | BOOL OCSINVENTORYFRONT_API resumeDownload(); |
527 | // If suspend file exists, download is suspended |
528 | BOOL OCSINVENTORYFRONT_API isDownloadSuspended(); |
529 | -// Get exclusive acces to download directory by locking lock file |
530 | +// Get exclusive access to download directory by locking lock file |
531 | BOOL OCSINVENTORYFRONT_API lockDownload(); |
532 | // Release exclusive access |
533 | BOOL OCSINVENTORYFRONT_API unlockDownload(); |
534 | |
535 | === modified file 'OPTIONS.TXT' |
536 | --- OPTIONS.TXT 2011-09-06 17:39:00 +0000 |
537 | +++ OPTIONS.TXT 2015-05-07 18:53:51 +0000 |
538 | @@ -62,7 +62,7 @@ |
539 | /server=http[s]://server.domain.tld[:port]/ocsinventory |
540 | Agent try to connect to Communication Server address and port Listening on http[s]://server.domain.tld[:port]/ocsinventory |
541 | |
542 | -/ssl=0|1 When usng SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate) |
543 | +/ssl=0|1 When using SSL connections, 0 => SSL without certificate validation, 1 => SSL with server certificate validation required (needs CA certificate) |
544 | |
545 | /ca="path_to_cabundle.pem" Path to CA certificate chain file in PEM format, for server certificate validation |
546 | |
547 | @@ -94,7 +94,7 @@ |
548 | ; Enable local inventory mode (path to folder to store .ocs file => enabled, |
549 | ; empty => disabled) |
550 | Local= |
551 | -; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware |
552 | +; Enable agent scanning HKEY_CURRENT_USER hive for printers and software |
553 | ; (0 => disabled, 1 => enabled) |
554 | HKCU=0 |
555 | ; Disable scanning computer for installed software (0 => software scan allowed, 1 => disabled) |
556 | |
557 | === modified file 'OcsNotifyUser/OcsNotifyUser.h' |
558 | --- OcsNotifyUser/OcsNotifyUser.h 2012-10-26 00:23:27 +0000 |
559 | +++ OcsNotifyUser/OcsNotifyUser.h 2015-05-07 18:53:51 +0000 |
560 | @@ -60,7 +60,7 @@ |
561 | |
562 | protected: //Attributes |
563 | CLog *m_pLogger; |
564 | - UINT m_uNotifcation; // Notifcation type |
565 | + UINT m_uNotifcation; // Notification type |
566 | CString m_csMessage; // Message to display to user |
567 | BOOL m_bCancel; // Is cancel allowed or not |
568 | BOOL m_bDelay; // Is delaying action allowed or not |
569 | |
570 | === modified file 'OcsSystray/SystemTray.cpp' |
571 | --- OcsSystray/SystemTray.cpp 2010-07-07 20:56:04 +0000 |
572 | +++ OcsSystray/SystemTray.cpp 2015-05-07 18:53:51 +0000 |
573 | @@ -53,7 +53,7 @@ |
574 | // Explorer crashed |
575 | // Fixed resource leak in SetIcon |
576 | // Animate() now checks for empty icon list - Anton Treskunov |
577 | -// Added the virutal CustomizeMenu() method - Anton Treskunov |
578 | +// Added the virtual CustomizeMenu() method - Anton Treskunov |
579 | // |
580 | // |
581 | // This code may be used in compiled form in any way you desire. This |
582 | @@ -112,7 +112,7 @@ |
583 | Initialise(); |
584 | } |
585 | |
586 | -CSystemTray::CSystemTray(CWnd* pParent, // The window that will recieve tray notifications |
587 | +CSystemTray::CSystemTray(CWnd* pParent, // The window that will receive tray notifications |
588 | UINT uCallbackMessage, // the callback message to send to parent |
589 | LPCTSTR szToolTip, // tray icon tooltip |
590 | HICON icon, // Handle to icon |
591 | |
592 | === modified file 'README.TXT' |
593 | --- README.TXT 2011-11-25 14:46:24 +0000 |
594 | +++ README.TXT 2015-05-07 18:53:51 +0000 |
595 | @@ -24,12 +24,12 @@ |
596 | ============ |
597 | |
598 | - Microsoft Visual C++ 2008 SP1 or higher |
599 | -- Perl 5.8 or newer for building dependancies (you can use XAMPP perl addon) |
600 | +- Perl 5.8 or newer for building dependencies (you can use XAMPP perl addon) |
601 | - Source code exported from Launchpad Bazaar repository. |
602 | svn co https:// |
603 | |
604 | |
605 | -BUILDING DEPENDANCIES |
606 | +BUILDING DEPENDENCIES |
607 | ===================== |
608 | |
609 | OCS Inventory NG Agent for Windows needs followong libraries: |
610 | @@ -59,7 +59,7 @@ |
611 | http://blog.kalmbach-software.de/2009/05/27/deployment-of-vc2008-apps-without-installing-anything/) |
612 | Save and build to create unicode DLL for ZipArchive Library. |
613 | |
614 | -Script for building dependancy automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008, |
615 | +Script for building dependency automatically fixess cURL and net-snmp Makefiles for Visual C++ 2008, |
616 | by adding "/D_BIND_TO_CURRENT_VCLIBS_VERSION" to the CFLAGS. As is, libcurl and net-snmp |
617 | DLL will be binded to lastest Visual C++ 2008 SP1 CRT versions. |
618 | |
619 | @@ -89,7 +89,7 @@ |
620 | Then, launch script "OCS_Make_Required_Libs.bat" to create all libs and prepare for building OCS agent. |
621 | |
622 | |
623 | -BUIDLING AGENT |
624 | +BUILDING AGENT |
625 | ============== |
626 | |
627 | You need Visual C++ 2008, which includes MS Windows SDK 6.0A. |
628 | @@ -100,4 +100,4 @@ |
629 | |
630 | We hope it will works for you ! |
631 | |
632 | -OCS Inventory Team |
633 | \ No newline at end of file |
634 | +OCS Inventory Team |
635 | |
636 | === modified file 'Service/NTService.cpp' |
637 | --- Service/NTService.cpp 2012-07-25 16:38:31 +0000 |
638 | +++ Service/NTService.cpp 2015-05-07 18:53:51 +0000 |
639 | @@ -213,7 +213,7 @@ |
640 | szFilePath, // Main binary |
641 | NULL, // Load order group |
642 | NULL, // Tag ID to order service start in group |
643 | - lpstrDependancies, // Service dependancies |
644 | + lpstrDependancies, // Service dependencies |
645 | NULL, // Service runs under Local system account, |
646 | NULL); // so no user and password |
647 | if (!hService) |
648 | |
649 | === modified file 'Service/OcsService.cpp' |
650 | --- Service/OcsService.cpp 2014-04-09 16:22:56 +0000 |
651 | +++ Service/OcsService.cpp 2015-05-07 18:53:51 +0000 |
652 | @@ -488,7 +488,7 @@ |
653 | { |
654 | if (!bNotifyInventory && isInventoryStateChanged()) |
655 | { |
656 | - // Inventory state changed, force inventory immediatly |
657 | + // Inventory state changed, force inventory immediately |
658 | m_iTToWait = 0; |
659 | bNotifyInventory = TRUE; |
660 | } |
661 | @@ -691,7 +691,7 @@ |
662 | // Create inventory |
663 | if ((pRequest = new CInventoryRequest()) == NULL) |
664 | { |
665 | - LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retreive inventory informations")); |
666 | + LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "Unable to retrieve inventory informations")); |
667 | return FALSE; |
668 | } |
669 | if (!pRequest->final()) |
670 | @@ -723,7 +723,7 @@ |
671 | catch (CException *pEx) |
672 | { |
673 | pEx->Delete(); |
674 | - LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while trying to generate inventory informations")); |
675 | + LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while trying to generate inventory informations")); |
676 | return FALSE; |
677 | } |
678 | } |
679 | @@ -755,7 +755,7 @@ |
680 | catch (CException *pEx) |
681 | { |
682 | pEx->Delete(); |
683 | - LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occured while rotating log files")); |
684 | + LogEvent( EVENTLOG_ERROR_TYPE, EVMSG_GENERIC_ERROR, _T( "An unknown error occurred while rotating log files")); |
685 | return FALSE; |
686 | } |
687 | return TRUE; |
688 | |
689 | === modified file 'SysInfo/DMI.cpp' |
690 | --- SysInfo/DMI.cpp 2014-08-06 15:06:08 +0000 |
691 | +++ SysInfo/DMI.cpp 2015-05-07 18:53:51 +0000 |
692 | @@ -291,7 +291,7 @@ |
693 | DmiHeader *dmi; |
694 | |
695 | if (bStart) |
696 | - // Search from begining of tables |
697 | + // Search from beginning of tables |
698 | nPosition = 0; |
699 | |
700 | while (nPosition < m_nStructureLength) |
701 | |
702 | === modified file 'SysInfo/DMI.h' |
703 | --- SysInfo/DMI.h 2014-04-09 17:35:05 +0000 |
704 | +++ SysInfo/DMI.h 2015-05-07 18:53:51 +0000 |
705 | @@ -86,7 +86,7 @@ |
706 | BOOL CheckSum(const BYTE *buf, int length); |
707 | // Get length of DMI table at position nPosition |
708 | int GetTableLength( int nPosition); |
709 | - // Get next DMI table of type uType, and start seraching form begining |
710 | + // Get next DMI table of type uType, and start seraching form beginning |
711 | // of table, or from current position |
712 | UCHAR *GetNextTable( UCHAR uType, BOOL bStart = FALSE); |
713 | |
714 | |
715 | === modified file 'SysInfo/Dtwinver.cpp' |
716 | --- SysInfo/Dtwinver.cpp 2013-05-28 09:08:01 +0000 |
717 | +++ SysInfo/Dtwinver.cpp 2015-05-07 18:53:51 +0000 |
718 | @@ -1531,7 +1531,7 @@ |
719 | } |
720 | #endif |
721 | |
722 | - #else //We must be runing on an emulated or real version of Win16 or DOS |
723 | + #else //We must be running on an emulated or real version of Win16 or DOS |
724 | lpVersionInformation->EmulatedProcessorType = IA32_PROCESSOR; //We can only be running x86-32 code from Win16 or DOS |
725 | |
726 | #ifdef _WINDOWS //Running on some version of Windows |
727 | @@ -1639,7 +1639,7 @@ |
728 | _fstrcpy(lpVersionInformation->szUnderlyingCSDVersion, ""); |
729 | } |
730 | #else //Must be some version of real or emulated DOS |
731 | - //Retreive the current version of emulated DOS |
732 | + //Retrieve the current version of emulated DOS |
733 | BYTE DosMinor; |
734 | BYTE DosMajor; |
735 | _asm |
736 | @@ -3054,7 +3054,7 @@ |
737 | //puts in the ProductSuite. In Windows 2000 Datacenter it does not matter as it |
738 | //supports GetVersionEx using a OSVERSIONINFOEX structure. |
739 | |
740 | - //Turn on appropiate fields in the "wSuiteMask" bit field |
741 | + //Turn on appropriate fields in the "wSuiteMask" bit field |
742 | if (_tcsicmp(lpszSuite, _T("Terminal Server")) == 0) |
743 | lpVersionInformation->dwSuiteMask |= COSVERSION_SUITE_TERMINAL; |
744 | else if ((_tcsicmp(lpszSuite, _T("SBS")) == 0) || (_tcsicmp(lpszSuite, _T("Small Business")) == 0)) |
745 | |
746 | === modified file 'SysInfo/EDID.cpp' |
747 | --- SysInfo/EDID.cpp 2013-11-27 16:28:03 +0000 |
748 | +++ SysInfo/EDID.cpp 2015-05-07 18:53:51 +0000 |
749 | @@ -415,7 +415,7 @@ |
750 | } |
751 | memset( szResult, 0, 15); |
752 | strncpy( szResult, (LPCSTR) (lpByte+DESCRIPTOR_DATA_OFFSET), 14); |
753 | - // Ignore space characters at begining |
754 | + // Ignore space characters at beginning |
755 | for (i=0; i<strlen( szResult) && szResult[i]==' '; i++); |
756 | m_csBuffer.Format( "%s", szResult+i); |
757 | return m_csBuffer; |
758 | |
759 | === modified file 'SysInfo/EDID.h' |
760 | --- SysInfo/EDID.h 2010-12-08 22:42:33 +0000 |
761 | +++ SysInfo/EDID.h 2015-05-07 18:53:51 +0000 |
762 | @@ -75,7 +75,7 @@ |
763 | BYTE Vertical_Frequency; |
764 | } EDIDMode; |
765 | |
766 | -// Format of Detailed_Timing_DescriptionX if it is a Detailled Timing |
767 | +// Format of Detailed_Timing_DescriptionX if it is a Detailed Timing |
768 | typedef struct tag_EDID_Detailled_Timing |
769 | { |
770 | BYTE Horizontal_Frequency; // horizontal frequency in kHz (if 00h, may be text)(see #00135) |
771 | @@ -160,7 +160,7 @@ |
772 | BYTE Checksum; // (radix-complement: 256-low byte of 16-bit sum of 00h-7Eh) |
773 | } Standard_EDID; |
774 | |
775 | - // Detailled Timing enumeration types |
776 | + // Detailed Timing enumeration types |
777 | enum DetailTiming |
778 | { |
779 | Detailed_Timing_Description = 0, |
780 | @@ -191,7 +191,7 @@ |
781 | BOOL ParseEDID( LPBYTE lpByte, Standard_EDID &myEDID); |
782 | // Return manufacturer code (3 letters) |
783 | LPCSTR GetManufacturerID(BYTE ID[2]); |
784 | - // Retreive EDID data from registry |
785 | + // Retrieve EDID data from registry |
786 | BOOL GetDisplayEDID( HDEVINFO hDeviceInfoSet, SP_DEVINFO_DATA *pDevInfoData, Standard_EDID &myEDID); |
787 | // Decode DPMS flags to get monitor type |
788 | LPCSTR DecodeDPMSFlag( BYTE Flag); |
789 | |
790 | === modified file 'SysInfo/Registry.cpp' |
791 | --- SysInfo/Registry.cpp 2014-08-06 15:06:08 +0000 |
792 | +++ SysInfo/Registry.cpp 2015-05-07 18:53:51 +0000 |
793 | @@ -2023,7 +2023,7 @@ |
794 | |
795 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find Floppy Controllers in HKLM\\%s...\n"), |
796 | NT_CONTROLER_FLOPPY_KEY); |
797 | - // Windows NT => Open the floppy controler key |
798 | + // Windows NT => Open the floppy controller key |
799 | if (RegOpenKeyEx( m_hKey, NT_CONTROLER_FLOPPY_KEY, 0, KEY_READ|KEY_WOW64_64KEY, &hKeyEnum) == ERROR_SUCCESS) |
800 | { |
801 | // Enum the devices subkeys to find devices |
802 | @@ -2136,7 +2136,7 @@ |
803 | } |
804 | else |
805 | AddLog( _T( "\tFailed because no valid object !\n")); |
806 | - // Windows NT => Open the IDE controler key |
807 | + // Windows NT => Open the IDE controller key |
808 | uIndex = 0; |
809 | dwIndexEnum = 0; |
810 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find IDE Controllers in HKLM\\%s...\n"), |
811 | @@ -2253,7 +2253,7 @@ |
812 | } |
813 | else |
814 | AddLog( _T( "\tFailed because no valid object !\n")); |
815 | - // Windows NT => Open the SCSI controler key |
816 | + // Windows NT => Open the SCSI controller key |
817 | uIndex = 0; |
818 | dwIndexEnum = 0; |
819 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find SCSI Controllers in HKLM\\%s...\n"), |
820 | @@ -2370,7 +2370,7 @@ |
821 | } |
822 | else |
823 | AddLog( _T( "\tFailed because no valid object !\n")); |
824 | - // Windows NT => Open the InfraRed controler key |
825 | + // Windows NT => Open the InfraRed controller key |
826 | uIndex = 0; |
827 | dwIndexEnum = 0; |
828 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find InfraRed Controllers in HKLM\\%s...\n"), |
829 | @@ -2447,7 +2447,7 @@ |
830 | csSubKey, NT_CONTROLER_INFRARED_VERSION_VALUE); |
831 | csVersion = NOT_AVAILABLE; |
832 | } |
833 | - // Ensure it is a controler |
834 | + // Ensure it is a controller |
835 | if (GetValue( hKeyObject, NT_CONTROLER_INFRARED_CONTROLER_VALUE, csValue) == ERROR_SUCCESS) |
836 | { |
837 | bHaveToStore = TRUE; |
838 | @@ -2498,7 +2498,7 @@ |
839 | } |
840 | else |
841 | AddLog( _T( "\tFailed because no valid object !\n")); |
842 | - // Windows NT => Open the USB controler key |
843 | + // Windows NT => Open the USB controller key |
844 | uIndex = 0; |
845 | dwIndexEnum = 0; |
846 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find USB Controllers in HKLM\\%s...\n"), |
847 | @@ -2575,7 +2575,7 @@ |
848 | csSubKey, NT_CONTROLER_USB_VERSION_VALUE); |
849 | csVersion = NOT_AVAILABLE; |
850 | } |
851 | - // Ensure it is a controler |
852 | + // Ensure it is a controller |
853 | if (GetValue( hKeyObject, NT_CONTROLER_USB_CONTROLER_VALUE, csValue) == ERROR_SUCCESS) |
854 | { |
855 | bHaveToStore = TRUE; |
856 | @@ -2626,7 +2626,7 @@ |
857 | } |
858 | else |
859 | AddLog( _T( "\tFailed because no valid object !\n")); |
860 | - // Windows NT => Open the IEEE1394 controler key |
861 | + // Windows NT => Open the IEEE1394 controller key |
862 | uIndex = 0; |
863 | dwIndexEnum = 0; |
864 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find IEEE1394 Controllers in HKLM\\%s...\n"), |
865 | @@ -2743,7 +2743,7 @@ |
866 | } |
867 | else |
868 | AddLog( _T( "\tFailed because no valid object !\n")); |
869 | - // Windows NT => Open the PCMCIA controler key |
870 | + // Windows NT => Open the PCMCIA controller key |
871 | uIndex = 0; |
872 | dwIndexEnum = 0; |
873 | AddLog( _T( "Registry NT GetSystemControllers: Trying to find PCMCIA Controllers in HKLM\\%s...\n"), |
874 | |
875 | === modified file 'SysInfo/SnmpAPI.cpp' |
876 | --- SysInfo/SnmpAPI.cpp 2011-05-19 16:55:18 +0000 |
877 | +++ SysInfo/SnmpAPI.cpp 2015-05-07 18:53:51 +0000 |
878 | @@ -121,7 +121,7 @@ |
879 | //* network traffic via a WebPage. |
880 | //* http://www.ee.ethz.ch/~oetiker/webtools/mrtg/ |
881 | //* |
882 | -//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers |
883 | +//* Copyright (c) 1996-2001 Tobias Oetiker and all the Contributors |
884 | //* to MRTG |
885 | //* All rights reserved. |
886 | //* |
887 | |
888 | === modified file 'SysInfo/StoragePeripheral.cpp' |
889 | --- SysInfo/StoragePeripheral.cpp 2014-08-24 07:40:05 +0000 |
890 | +++ SysInfo/StoragePeripheral.cpp 2015-05-07 18:53:51 +0000 |
891 | @@ -160,7 +160,7 @@ |
892 | } |
893 | StrForSQL( m_csSN); |
894 | if (is_printable( m_csSN)) |
895 | - // Hex decode successfull |
896 | + // Hex decode successful |
897 | return; |
898 | } |
899 | // Not hex encoded (or hex decode failed), ensure printable |
900 | |
901 | === modified file 'SysInfo/SysInfo.cpp' |
902 | --- SysInfo/SysInfo.cpp 2014-05-16 20:32:33 +0000 |
903 | +++ SysInfo/SysInfo.cpp 2015-05-07 18:53:51 +0000 |
904 | @@ -147,7 +147,7 @@ |
905 | } |
906 | else if (os.IsWindowsME(&osvi)) |
907 | { |
908 | - csName = _T( "Microsoft Windows Millenium"); |
909 | + csName = _T( "Microsoft Windows Millennium"); |
910 | csComment.Empty(); |
911 | } |
912 | else |
913 | |
914 | === modified file 'SysInfo/VMSystem.h' |
915 | --- SysInfo/VMSystem.h 2011-03-24 13:26:32 +0000 |
916 | +++ SysInfo/VMSystem.h 2015-05-07 18:53:51 +0000 |
917 | @@ -20,13 +20,13 @@ |
918 | CVMSystem(void); |
919 | ~CVMSystem(void); |
920 | |
921 | - // Try to detect hypervisor we're runnning on using Bios |
922 | + // Try to detect hypervisor we're running on using Bios |
923 | BOOL DetectVM( CBios *pBios, CString &csVMSystem); |
924 | - // Try to detect hypervisor we're runnning on using System controller |
925 | + // Try to detect hypervisor we're running on using System controller |
926 | BOOL DetectVM( CSystemControllerList *pMyList, CString &csVMSystem); |
927 | - // Try to detect hypervisor we're runnning on using Storage Peripherals |
928 | + // Try to detect hypervisor we're running on using Storage Peripherals |
929 | BOOL DetectVM( CStoragePeripheralList *pMyList, CString &csVMSystem); |
930 | - // Try to detect hypervisor we're runnning on using Video Adapter |
931 | + // Try to detect hypervisor we're running on using Video Adapter |
932 | BOOL DetectVM( CVideoAdapterList *pMyList, CString &csVMSystem); |
933 | protected: |
934 | // Try to find Hypervisor signature into a string |
935 | |
936 | === modified file 'TestSysInfo/TestSysInfoDlg.cpp' |
937 | --- TestSysInfo/TestSysInfoDlg.cpp 2013-07-22 16:30:50 +0000 |
938 | +++ TestSysInfo/TestSysInfoDlg.cpp 2015-05-07 18:53:51 +0000 |
939 | @@ -968,7 +968,7 @@ |
940 | } |
941 | |
942 | m_List.AddString( _T( "------------------------------------------------------")); |
943 | - m_List.AddString( _T( "Video Controler infos")); |
944 | + m_List.AddString( _T( "Video Controller infos")); |
945 | m_List.AddString( _T( "------------------------------------------------------")); |
946 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_VideoController"))) |
947 | { |
948 | @@ -1263,7 +1263,7 @@ |
949 | } |
950 | |
951 | m_List.AddString( _T( "------------------------------------------------------")); |
952 | - m_List.AddString( _T( "Floppy Controler infos")); |
953 | + m_List.AddString( _T( "Floppy Controller infos")); |
954 | m_List.AddString( _T( "------------------------------------------------------")); |
955 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_FloppyController"))) |
956 | { |
957 | @@ -1302,7 +1302,7 @@ |
958 | } |
959 | |
960 | m_List.AddString( _T( "------------------------------------------------------")); |
961 | - m_List.AddString( _T( "IDE Controler infos")); |
962 | + m_List.AddString( _T( "IDE Controller infos")); |
963 | m_List.AddString( _T( "------------------------------------------------------")); |
964 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_IDEController"))) |
965 | { |
966 | @@ -1341,7 +1341,7 @@ |
967 | } |
968 | |
969 | m_List.AddString( _T( "------------------------------------------------------")); |
970 | - m_List.AddString( _T( "SCSI Controler infos")); |
971 | + m_List.AddString( _T( "SCSI Controller infos")); |
972 | m_List.AddString( _T( "------------------------------------------------------")); |
973 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_SCSIController"))) |
974 | { |
975 | @@ -1388,7 +1388,7 @@ |
976 | } |
977 | |
978 | m_List.AddString( _T( "------------------------------------------------------")); |
979 | - m_List.AddString( _T( "InfraRed Controler infos")); |
980 | + m_List.AddString( _T( "InfraRed Controller infos")); |
981 | m_List.AddString( _T( "------------------------------------------------------")); |
982 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_InfraredDevice"))) |
983 | { |
984 | @@ -1427,7 +1427,7 @@ |
985 | } |
986 | |
987 | m_List.AddString( _T( "------------------------------------------------------")); |
988 | - m_List.AddString( _T( "USB Controler infos")); |
989 | + m_List.AddString( _T( "USB Controller infos")); |
990 | m_List.AddString( _T( "------------------------------------------------------")); |
991 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_USBController"))) |
992 | { |
993 | @@ -1466,7 +1466,7 @@ |
994 | } |
995 | |
996 | m_List.AddString( _T( "------------------------------------------------------")); |
997 | - m_List.AddString( _T( "IEEE 1394 Controler infos")); |
998 | + m_List.AddString( _T( "IEEE 1394 Controller infos")); |
999 | m_List.AddString( _T( "------------------------------------------------------")); |
1000 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_1394Controller"))) |
1001 | { |
1002 | @@ -1505,7 +1505,7 @@ |
1003 | } |
1004 | |
1005 | m_List.AddString( _T( "------------------------------------------------------")); |
1006 | - m_List.AddString( _T( "PCMCIA Controler infos")); |
1007 | + m_List.AddString( _T( "PCMCIA Controller infos")); |
1008 | m_List.AddString( _T( "------------------------------------------------------")); |
1009 | if (myWmiDll.BeginEnumClassObject( _T( "Win32_PCMCIAController"))) |
1010 | { |
1011 | |
1012 | === modified file 'logon/OcsLogon.nsi' |
1013 | --- logon/OcsLogon.nsi 2014-01-08 16:29:30 +0000 |
1014 | +++ logon/OcsLogon.nsi 2015-05-07 18:53:51 +0000 |
1015 | @@ -60,7 +60,7 @@ |
1016 | # Global variables |
1017 | ##################################################################### |
1018 | var /GLOBAL nGpo ; Set to 1 if /GPO is provided |
1019 | -var /GLOBAL nShowlog ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, usefull for debugging |
1020 | +var /GLOBAL nShowlog ; Set to 1 if /SHOWLOG is provided, to display log file at the end of exec, useful for debugging |
1021 | var /GLOBAL nUninstall ; Set to 1 if /Uninstall is provided |
1022 | var /GLOBAL nForce ; Do we overwrite installed version (=1) or not (=0) |
1023 | var /GLOBAL nTimeOut ; Download timeout (default 60 sec) |
1024 | |
1025 | === modified file 'logon/Readme.txt' |
1026 | --- logon/Readme.txt 2011-05-27 13:56:11 +0000 |
1027 | +++ logon/Readme.txt 2015-05-07 18:53:51 +0000 |
1028 | @@ -18,7 +18,7 @@ |
1029 | By default, OcsLogon try to download and install standard Agent setup file |
1030 | "ocsagent.exe", but it can also use "ocspackage.exe", file created by OCS |
1031 | Inventory NG Packager, which can embbed certificate file and can be executed |
1032 | -under a fixed administrator account. This is usefull when user logon script |
1033 | +under a fixed administrator account. This is useful when user logon script |
1034 | is used in Samba domain, to allow installation process by non administrator |
1035 | users. |
1036 | |
1037 | |
1038 | === modified file 'ocsinventory.ini.sample' |
1039 | --- ocsinventory.ini.sample 2010-07-07 20:56:04 +0000 |
1040 | +++ ocsinventory.ini.sample 2015-05-07 18:53:51 +0000 |
1041 | @@ -5,7 +5,7 @@ |
1042 | ; Enable local inventory mode (path to folder to store .ocs file => enabled, |
1043 | ; empty => disabled) |
1044 | Local= |
1045 | -; Enable agent scanning HKEY_CURRENT_USER hive for printers and sofware |
1046 | +; Enable agent scanning HKEY_CURRENT_USER hive for printers and software |
1047 | ; (0 => disabled, 1 => enabled) |
1048 | HKCU=0 |
1049 | ; Disable prompting user for TAG value (0 => prompt allowed, 1 => disabled) |