X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=imports.cpp;h=f50591cc77a4777084f6fe061d32a60ac6cfb867;hb=94d25a5dcfad872c97e71b646429fc87dc66acc2;hp=ec3a2a843968249db1934cdcb4dac6b67b846b63;hpb=b6f7fe3b11fd130f46eb6b5009391cc3bb0cad49;p=nssm.git

diff --git a/imports.cpp b/imports.cpp
index ec3a2a8..f50591c 100644
--- a/imports.cpp
+++ b/imports.cpp
@@ -15,7 +15,7 @@ HMODULE get_dll(const TCHAR *dll, unsigned long *error) {
   HMODULE ret = LoadLibrary(dll);
   if (! ret) {
     *error = GetLastError();
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_LOADLIBRARY_FAILED, dll, error_string(*error), 0);
+    if (*error != ERROR_PROC_NOT_FOUND) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_LOADLIBRARY_FAILED, dll, error_string(*error), 0);
   }
 
   return ret;
@@ -27,19 +27,21 @@ FARPROC get_import(HMODULE library, const char *function, unsigned long *error)
   FARPROC ret = GetProcAddress(library, function);
   if (! ret) {
     *error = GetLastError();
-    TCHAR *function_name;
+    if (*error != ERROR_PROC_NOT_FOUND) {
+      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);
+      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;
+      function_name = (TCHAR *) function;
 #endif
-    if (*error != ERROR_PROC_NOT_FOUND) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function_name, error_string(*error), 0);
+      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);
+      if (function_name) HeapFree(GetProcessHeap(), 0, function_name);
 #endif
+    }
   }
 
   return ret;
@@ -57,14 +59,19 @@ int get_imports() {
       if (error != ERROR_PROC_NOT_FOUND) return 2;
     }
 
+    imports.QueryFullProcessImageName = (QueryFullProcessImageName_ptr) get_import(imports.kernel32, QUERYFULLPROCESSIMAGENAME_EXPORT, &error);
+    if (! imports.QueryFullProcessImageName) {
+      if (error != ERROR_PROC_NOT_FOUND) return 3;
+    }
+
     imports.SleepConditionVariableCS = (SleepConditionVariableCS_ptr) get_import(imports.kernel32, "SleepConditionVariableCS", &error);
     if (! imports.SleepConditionVariableCS) {
-      if (error != ERROR_PROC_NOT_FOUND) return 3;
+      if (error != ERROR_PROC_NOT_FOUND) return 4;
     }
 
     imports.WakeConditionVariable = (WakeConditionVariable_ptr) get_import(imports.kernel32, "WakeConditionVariable", &error);
     if (! imports.WakeConditionVariable) {
-      if (error != ERROR_PROC_NOT_FOUND) return 4;
+      if (error != ERROR_PROC_NOT_FOUND) return 5;
     }
   }
   else if (error != ERROR_MOD_NOT_FOUND) return 1;
@@ -73,14 +80,14 @@ int get_imports() {
   if (imports.advapi32) {
     imports.CreateWellKnownSid = (CreateWellKnownSid_ptr) get_import(imports.advapi32, "CreateWellKnownSid", &error);
     if (! imports.CreateWellKnownSid) {
-      if (error != ERROR_PROC_NOT_FOUND) return 6;
+      if (error != ERROR_PROC_NOT_FOUND) return 7;
     }
     imports.IsWellKnownSid = (IsWellKnownSid_ptr) get_import(imports.advapi32, "IsWellKnownSid", &error);
     if (! imports.IsWellKnownSid) {
-      if (error != ERROR_PROC_NOT_FOUND) return 7;
+      if (error != ERROR_PROC_NOT_FOUND) return 8;
     }
   }
-  else if (error != ERROR_MOD_NOT_FOUND) return 5;
+  else if (error != ERROR_MOD_NOT_FOUND) return 6;
 
   return 0;
 }