David Bremner committed some fixes.

[nssm.git] / imports.cpp

diff --git a/imports.cpp b/imports.cpp
index 99661be..ec3a2a8 100644 (file)
--- a/imports.cpp
+++ b/imports.cpp
@@ -1,66 +1,92 @@
-#include "nssm.h"
-
-imports_t imports;
-
-/*
-  Try to set up function pointers.
-  In this first implementation it is not an error if we can't load them
-  because we aren't currently trying to load any functions which we
-  absolutely need.  If we later add some indispensible imports we can
-  return non-zero here to force an application exit.
-*/
-HMODULE get_dll(const char *dll, unsigned long *error) {
-  *error = 0;
-
-  HMODULE ret = LoadLibrary(dll);
-  if (! ret) {
-    *error = GetLastError();
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_LOADLIBRARY_FAILED, dll, error_string(*error));
-  }
-
-  return ret;
-}
-
-FARPROC get_import(HMODULE library, const char *function, unsigned long *error) {
-  *error = 0;
-
-  FARPROC ret = GetProcAddress(library, function);
-  if (! ret) {
-    *error = GetLastError();
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_GETPROCADDRESS_FAILED, function, error_string(*error));
-  }
-
-  return ret;
-}
-
-int get_imports() {
-  unsigned long error;
-
-  ZeroMemory(&imports, sizeof(imports));
-
-  imports.kernel32 = get_dll("kernel32.dll", &error);
-  if (imports.kernel32) {
-    imports.AttachConsole = (AttachConsole_ptr) get_import(imports.kernel32, "AttachConsole", &error);
-    if (! imports.AttachConsole) {
-      if (error != ERROR_PROC_NOT_FOUND) return 2;
-    }
-
-    imports.SleepConditionVariableCS = (SleepConditionVariableCS_ptr) get_import(imports.kernel32, "SleepConditionVariableCS", &error);
-    if (! imports.SleepConditionVariableCS) {
-      if (error != ERROR_PROC_NOT_FOUND) return 3;
-    }
-
-    imports.WakeConditionVariable = (WakeConditionVariable_ptr) get_import(imports.kernel32, "WakeConditionVariable", &error);
-    if (! imports.WakeConditionVariable) {
-      if (error != ERROR_PROC_NOT_FOUND) return 4;
-    }
-  }
-  else if (error != ERROR_MOD_NOT_FOUND) return 1;
-
-  return 0;
-}
-
-void free_imports() {
-  if (imports.kernel32) FreeLibrary(imports.kernel32);
-  ZeroMemory(&imports, sizeof(imports));
-}
+#include "nssm.h"\r
+\r
+imports_t imports;\r
+\r
+/*\r
+  Try to set up function pointers.\r
+  In this first implementation it is not an error if we can't load them\r
+  because we aren't currently trying to load any functions which we\r
+  absolutely need.  If we later add some indispensible imports we can\r
+  return non-zero here to force an application exit.\r
+*/\r
+HMODULE get_dll(const TCHAR *dll, unsigned long *error) {\r
+  *error = 0;\r
+\r
+  HMODULE ret = LoadLibrary(dll);\r
+  if (! ret) {\r
+    *error = GetLastError();\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_LOADLIBRARY_FAILED, dll, error_string(*error), 0);\r
+  }\r
+\r
+  return ret;\r
+}\r
+\r
+FARPROC get_import(HMODULE library, const char *function, unsigned long *error) {\r
+  *error = 0;\r
+\r
+  FARPROC ret = GetProcAddress(library, function);\r
+  if (! ret) {\r
+    *error = GetLastError();\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
+    if (*error != ERROR_PROC_NOT_FOUND) 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
+  }\r
+\r
+  return ret;\r
+}\r
+\r
+int get_imports() {\r
+  unsigned long error;\r
+\r
+  ZeroMemory(&imports, sizeof(imports));\r
+\r
+  imports.kernel32 = get_dll(_T("kernel32.dll"), &error);\r
+  if (imports.kernel32) {\r
+    imports.AttachConsole = (AttachConsole_ptr) get_import(imports.kernel32, "AttachConsole", &error);\r
+    if (! imports.AttachConsole) {\r
+      if (error != ERROR_PROC_NOT_FOUND) return 2;\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
+    }\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
+    }\r
+  }\r
+  else if (error != ERROR_MOD_NOT_FOUND) return 1;\r
+\r
+  imports.advapi32 = get_dll(_T("advapi32.dll"), &error);\r
+  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
+    }\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
+    }\r
+  }\r
+  else if (error != ERROR_MOD_NOT_FOUND) return 5;\r
+\r
+  return 0;\r
+}\r
+\r
+void free_imports() {\r
+  if (imports.kernel32) FreeLibrary(imports.kernel32);\r
+  if (imports.advapi32) FreeLibrary(imports.advapi32);\r
+  ZeroMemory(&imports, sizeof(imports));\r
+}\r