bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EventLogRecord.message fixes

This commit is contained in:
Doug MacEachern 2005-09-24 04:37:55 +00:00
parent 34db9d884b
commit e71a9e5b3e
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bindings/java/src/jni/win32/eventlog.c
View File

@ -2,7 +2,6 @@
#include "javasigar.h" #include "javasigar.h"
#include "win32bindings.h" #include "win32bindings.h"
#define MAX_INSERT_STRS 8
#define MAX_MSG_LENGTH 8192 #define MAX_MSG_LENGTH 8192
#define MAX_ERROR_LENGTH 1024 #define MAX_ERROR_LENGTH 1024
@ -74,8 +73,9 @@ static int get_formatted_message(EVENTLOGRECORD *pevlr, char *dllfile,
HINSTANCE hlib; HINSTANCE hlib;
LPTSTR msgbuf; LPTSTR msgbuf;
char msgdll[MAX_MSG_LENGTH]; char msgdll[MAX_MSG_LENGTH];
char *insert_strs[MAX_INSERT_STRS], *ch; char **insert_strs, *ch;
int i; int i;
DWORD result;
if (!ExpandEnvironmentStrings(dllfile, msgdll, MAX_PATH)) if (!ExpandEnvironmentStrings(dllfile, msgdll, MAX_PATH))
return GetLastError(); return GetLastError();
@ -84,29 +84,39 @@ static int get_formatted_message(EVENTLOGRECORD *pevlr, char *dllfile,
LOAD_LIBRARY_AS_DATAFILE))) LOAD_LIBRARY_AS_DATAFILE)))
return GetLastError(); return GetLastError();
insert_strs =
(char **)malloc(sizeof(char *) * pevlr->NumStrings);
ch = (char *)((LPBYTE)pevlr + pevlr->StringOffset); ch = (char *)((LPBYTE)pevlr + pevlr->StringOffset);
for (i = 0; i < pevlr->NumStrings && i < MAX_INSERT_STRS; i++) { for (i = 0; i < pevlr->NumStrings; i++) {
insert_strs[i] = ch; insert_strs[i] = ch;
ch += strlen(ch) + 1; ch += strlen(ch) + 1;
} }
FormatMessage(FORMAT_MESSAGE_FROM_HMODULE | result =
FORMAT_MESSAGE_ALLOCATE_BUFFER | FormatMessage(FORMAT_MESSAGE_FROM_HMODULE |
FORMAT_MESSAGE_ARGUMENT_ARRAY, FORMAT_MESSAGE_ALLOCATE_BUFFER |
hlib, FORMAT_MESSAGE_ARGUMENT_ARRAY,
pevlr->EventID, hlib,
MAKELANGID(LANG_NEUTRAL, SUBLANG_ENGLISH_US), pevlr->EventID,
(LPTSTR) &msgbuf, MAKELANGID(LANG_NEUTRAL, SUBLANG_ENGLISH_US),
MAX_MSG_LENGTH, (LPTSTR) &msgbuf,
insert_strs); 0,
insert_strs);
strncpy(msg, msgbuf, MAX_MSG_LENGTH); if (result) {
msg[MAX_MSG_LENGTH] = '\0'; strncpy(msg, msgbuf, MAX_MSG_LENGTH);
msg[MAX_MSG_LENGTH] = '\0';
result = 0;
}
else {
result = GetLastError();
}
FreeLibrary(hlib); FreeLibrary(hlib);
free(insert_strs);
LocalFree((HLOCAL)msgbuf); LocalFree((HLOCAL)msgbuf);
return 0; return result;
} }
JNIEXPORT void SIGAR_JNI(win32_EventLog_openlog) JNIEXPORT void SIGAR_JNI(win32_EventLog_openlog)