X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=imports.cpp;h=d0970bdc8a894d5e28c87921c5e03bb1ed731e1f;hb=d15087151daf260f0069a1f209284d0d3fb5b376;hp=947b88542b870f4eb3c832aca79c1be31cfad8d1;hpb=2294db794e6dfd5698fe57d135cd0da67aca95b0;p=nssm.git

diff --git a/imports.cpp b/imports.cpp
index 947b885..d0970bd 100644
--- a/imports.cpp
+++ b/imports.cpp
@@ -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 * sizeof(TCHAR), function, _TRUNCATE);
+#else
+    function_name = (TCHAR *) 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;