|
@@ -27,7 +27,19 @@ FARPROC get_import(HMODULE library, const char *function, unsigned long *error)
|
|
FARPROC ret = GetProcAddress(library, function);
|
|
FARPROC ret = GetProcAddress(library, function);
|
|
if (! ret) {
|
|
if (! ret) {
|
|
*error = GetLastError();
|
|
*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;
|
|
return ret;
|