diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/zabbix_agent_win32/Release/ZabbixW32.exe | bin | 102400 -> 102400 bytes | |||
| -rw-r--r-- | src/zabbix_agent_win32/messages.mc | 12 | ||||
| -rw-r--r-- | src/zabbix_agent_win32/util.cpp | 10 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/zabbix_agent_win32/Release/ZabbixW32.exe b/src/zabbix_agent_win32/Release/ZabbixW32.exe Binary files differindex 53b1bde6..ebef7518 100755 --- a/src/zabbix_agent_win32/Release/ZabbixW32.exe +++ b/src/zabbix_agent_win32/Release/ZabbixW32.exe diff --git a/src/zabbix_agent_win32/messages.mc b/src/zabbix_agent_win32/messages.mc index 2953147f..5e282ea8 100644 --- a/src/zabbix_agent_win32/messages.mc +++ b/src/zabbix_agent_win32/messages.mc @@ -200,4 +200,16 @@ Language=English Active checks [%1] . +MessageId= +SymbolicName=MSG_GET_COMPUTER_NAME_FAILED +Language=English +GetComputerName failed: %1 +. + +MessageId= +SymbolicName=MSG_LOOKUP_FAILED +Language=English +PdhLookupPerfNameByIndex failed: %1 +. + ;#endif diff --git a/src/zabbix_agent_win32/util.cpp b/src/zabbix_agent_win32/util.cpp index 7c37183f..18919ffc 100644 --- a/src/zabbix_agent_win32/util.cpp +++ b/src/zabbix_agent_win32/util.cpp @@ -424,8 +424,12 @@ char *GetCounterName(DWORD index) counterName->next = perfCounterList; sprintf(hostname, "\\\\"); - dwSize = MAX_COMPUTERNAME_LENGTH; - GetComputerName((char *) &hostname + 2, &dwSize); + dwSize = MAX_COMPUTERNAME_LENGTH+1; + if(GetComputerName((char *) &hostname + 2, &dwSize)!=ERROR_SUCCESS) + { + WriteLog(MSG_GET_COMPUTER_NAME_FAILED,EVENTLOG_ERROR_TYPE, + "s",GetSystemErrorText(GetLastError())); + } dwSize = MAX_COUNTER_NAME; if (PdhLookupPerfNameByIndex((char *)&hostname, index, (char *)&counterName->name, &dwSize)==ERROR_SUCCESS) @@ -434,6 +438,8 @@ char *GetCounterName(DWORD index) } else { + WriteLog(MSG_LOOKUP_FAILED,EVENTLOG_ERROR_TYPE, + "s", GetSystemErrorText(GetLastError())); free(counterName); return "UnknownPerformanceCounter"; } |