Tidy up French GUI.

[nssm.git] / imports.cpp

diff --git a/imports.cpp b/imports.cpp
index 230bf43..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
@@ -59,14 +51,19 @@ int get_imports() {
       if (error != ERROR_PROC_NOT_FOUND) return 2;\r
     }\r
 \r
+    imports.QueryFullProcessImageName = (QueryFullProcessImageName_ptr) get_import(imports.kernel32, QUERYFULLPROCESSIMAGENAME_EXPORT, &error);\r
+    if (! imports.QueryFullProcessImageName) {\r
+      if (error != ERROR_PROC_NOT_FOUND) return 3;\r
+    }\r
+\r
     imports.SleepConditionVariableCS = (SleepConditionVariableCS_ptr) get_import(imports.kernel32, "SleepConditionVariableCS", &error);\r
     if (! imports.SleepConditionVariableCS) {\r
-      if (error != ERROR_PROC_NOT_FOUND) return 3;\r
+      if (error != ERROR_PROC_NOT_FOUND) return 4;\r
     }\r
 \r
     imports.WakeConditionVariable = (WakeConditionVariable_ptr) get_import(imports.kernel32, "WakeConditionVariable", &error);\r
     if (! imports.WakeConditionVariable) {\r
-      if (error != ERROR_PROC_NOT_FOUND) return 4;\r
+      if (error != ERROR_PROC_NOT_FOUND) return 5;\r
     }\r
   }\r
   else if (error != ERROR_MOD_NOT_FOUND) return 1;\r
@@ -75,14 +72,14 @@ int get_imports() {
   if (imports.advapi32) {\r
     imports.CreateWellKnownSid = (CreateWellKnownSid_ptr) get_import(imports.advapi32, "CreateWellKnownSid", &error);\r
     if (! imports.CreateWellKnownSid) {\r
-      if (error != ERROR_PROC_NOT_FOUND) return 6;\r
+      if (error != ERROR_PROC_NOT_FOUND) return 7;\r
     }\r
     imports.IsWellKnownSid = (IsWellKnownSid_ptr) get_import(imports.advapi32, "IsWellKnownSid", &error);\r
     if (! imports.IsWellKnownSid) {\r
-      if (error != ERROR_PROC_NOT_FOUND) return 7;\r
+      if (error != ERROR_PROC_NOT_FOUND) return 8;\r
     }\r
   }\r
-  else if (error != ERROR_MOD_NOT_FOUND) return 5;\r
+  else if (error != ERROR_MOD_NOT_FOUND) return 6;\r
 \r
   return 0;\r
 }\r