moved helper stuff to spawn so it can reuse error handling

removed unused helper::init()
removed logging when deleting a credential that doesn't exist, happens all the time

1 files changed, 1 insertions, 106 deletions

diff --git a/src/helper.cpp b/src/helper.cpp
index 59a2d3d1..24446cb8 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -17,109 +17,4 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "helper.h"

-#include "utility.h"

-#include <report.h>

-#include <LMCons.h>

-

-#define WIN32_LEAN_AND_MEAN

-#include <Windows.h>

-

-#include <QDir>

-#include <QApplication>

-

-using MOBase::reportError;

-

-

-namespace Helper {

-

-

-static bool helperExec(LPCWSTR moDirectory, LPCWSTR commandLine, BOOL async)

-{

-  wchar_t fileName[MAX_PATH];

-  _snwprintf(fileName, MAX_PATH, L"%ls\\helper.exe", moDirectory);

-

-  SHELLEXECUTEINFOW execInfo = {0};

-

-  execInfo.cbSize = sizeof(SHELLEXECUTEINFOW);

-  execInfo.fMask = SEE_MASK_NOCLOSEPROCESS;

-  execInfo.hwnd = nullptr;

-  execInfo.lpVerb = L"runas";

-  execInfo.lpFile = fileName;

-  execInfo.lpParameters = commandLine;

-  execInfo.lpDirectory = moDirectory;

-  execInfo.nShow = SW_SHOW;

-

-  ::ShellExecuteExW(&execInfo);

-

-  if (execInfo.hProcess == 0) {

-    reportError(QObject::tr("helper failed"));

-    return false;

-  }

-

-  if (async) {

-    return true;

-  }

-

-  if (::WaitForSingleObject(execInfo.hProcess, INFINITE) != WAIT_OBJECT_0) {

-    reportError(QObject::tr("helper failed"));

-    return false;

-  }

-

-  DWORD exitCode;

-  GetExitCodeProcess(execInfo.hProcess, &exitCode);

-  return exitCode == NOERROR;

-}

-

-

-bool init(const std::wstring &moPath, const std::wstring &dataPath)

-{

-  DWORD userNameLen = UNLEN + 1;

-  wchar_t userName[UNLEN + 1];

-

-  if (!GetUserName(userName, &userNameLen)) {

-    reportError(QObject::tr("failed to determine account name"));

-    return false;

-  }

-  wchar_t *commandLine = new wchar_t[32768];

-

-  _snwprintf(commandLine, 32768, L"init \"%ls\" \"%ls\"",

-             dataPath.c_str(), userName);

-

-  bool res = helperExec(moPath.c_str(), commandLine, FALSE);

-  delete [] commandLine;

-

-  return res;

-}

-

-

-bool backdateBSAs(const std::wstring &moPath, const std::wstring &dataPath)

-{

-  wchar_t *commandLine = new wchar_t[32768];

-  _snwprintf(commandLine, 32768, L"backdateBSA \"%ls\"",

-             dataPath.c_str());

-

-  bool res = helperExec(moPath.c_str(), commandLine, FALSE);

-  delete [] commandLine;

-

-  return res;

-}

-

-

-bool adminLaunch(const std::wstring &moPath, const std::wstring &moFile, const std::wstring &workingDir)

-{

-  wchar_t *commandLine = new wchar_t[32768];

-  _snwprintf(commandLine, 32768, L"adminLaunch %d \"%ls\" \"%ls\"",

-             ::GetCurrentProcessId(),

-             moFile.c_str(),

-             workingDir.c_str()

-             );

-

-  bool res = helperExec(moPath.c_str(), commandLine, TRUE);

-  delete [] commandLine;

-

-  return res;

-}

-

-

-} // namespace

+// moved to spawn.cpp