Alternative open_registry_key() signature.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index ddd1561..0b586f3 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -65,16 +65,10 @@ static int elevate(int argc, TCHAR **argv, unsigned long message) {
   ZeroMemory(&sei, sizeof(sei));\r
   sei.cbSize = sizeof(sei);\r
   sei.lpVerb = _T("runas");\r
-  sei.lpFile = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, PATH_LENGTH);\r
-  if (! sei.lpFile) {\r
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetModuleFileName()"), _T("elevate()"));\r
-    return 111;\r
-  }\r
-  GetModuleFileName(0, (TCHAR *) sei.lpFile, PATH_LENGTH);\r
+  sei.lpFile = (TCHAR *) nssm_imagepath();\r
 \r
   TCHAR *args = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EXE_LENGTH * sizeof(TCHAR));\r
   if (! args) {\r
-    HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetCommandLine()"), _T("elevate()"));\r
     return 111;\r
   }\r
@@ -91,7 +85,6 @@ static int elevate(int argc, TCHAR **argv, unsigned long message) {
   unsigned long exitcode = 0;\r
   if (! ShellExecuteEx(&sei)) exitcode = 100;\r
 \r
-  HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
   HeapFree(GetProcessHeap(), 0, (void *) args);\r
   return exitcode;\r
 }\r