Tidy up French GUI.

[nssm.git] / imports.cpp

diff --git a/imports.cpp b/imports.cpp
index f50591c..18d84f8 100644 (file)
--- a/imports.cpp
+++ b/imports.cpp
@@ -29,18 +29,10 @@ FARPROC get_import(HMODULE library, const char *function, unsigned long *error)
     *error = GetLastError();\r
     if (*error != ERROR_PROC_NOT_FOUND) {\r
       TCHAR *function_name;\r
-#ifdef UNICODE\r
-      size_t buflen;\r
-      mbstowcs_s(&buflen, NULL, 0, function, _TRUNCATE);\r
-      function_name = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, buflen * sizeof(TCHAR));\r
-      if (function_name) mbstowcs_s(&buflen, function_name, buflen * sizeof(TCHAR), function, _TRUNCATE);\r
-#else\r
-      function_name = (TCHAR *) function;\r
-#endif\r
-      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function_name, error_string(*error), 0);\r
-#ifdef UNICODE\r
-      if (function_name) HeapFree(GetProcessHeap(), 0, function_name);\r
-#endif\r
+      if (! from_utf8(function, &function_name, 0)) {\r
+        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function_name, error_string(*error), 0);\r
+        HeapFree(GetProcessHeap(), 0, function_name);\r
+      }\r
     }\r
   }\r
 \r