Skip to content

Commit

Permalink
Fixed Unicode display of GetProcAddress() errors.
Browse files Browse the repository at this point in the history
GetProcAddress() takes char *name as an argument but we were
trying to print TCHAR *name when logging that we couldn't find the
function pointer.
  • Loading branch information
Iain Patterson committed Dec 21, 2013
1 parent 2b47d65 commit d3b4f28
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion imports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,19 @@ FARPROC get_import(HMODULE library, const char *function, unsigned long *error)
FARPROC ret = GetProcAddress(library, function);
if (! ret) {
*error = GetLastError();
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function, error_string(*error), 0);
TCHAR *function_name;
#ifdef UNICODE
size_t buflen;
mbstowcs_s(&buflen, NULL, 0, function, _TRUNCATE);
function_name = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, buflen * sizeof(TCHAR));
if (function_name) mbstowcs_s(&buflen, function_name, buflen, function, _TRUNCATE);
#else
function_name = function;
#endif
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function_name, error_string(*error), 0);
#ifdef UNICODE
if (function_name) HeapFree(GetProcessHeap(), 0, function_name);
#endif
}

return ret;
Expand Down

0 comments on commit d3b4f28

Please sign in to comment.