Merge with branch1.2

10 files changed, 54 insertions, 50 deletions

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index 919764b4..82b285b7 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -30,8 +30,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 namespace MOShared {

 

-Fallout3Info::Fallout3Info(const std::wstring &omoDirectory, const std::wstring &gameDirectory)

-  : GameInfo(omoDirectory, gameDirectory)

+Fallout3Info::Fallout3Info(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory)

+  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

 {

   identifyMyGamesDirectory(L"fallout3");

 }

@@ -267,7 +267,7 @@ bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*)
 }

 

 

-std::vector<ExecutableInfo> Fallout3Info::getExecutables()

+/*std::vector<ExecutableInfo> Fallout3Info::getExecutables()

 {

   std::vector<ExecutableInfo> result;

   result.push_back(ExecutableInfo(L"FOSE", L"fose_loader.exe", L"", L"", DEFAULT_CLOSE));

@@ -278,5 +278,5 @@ std::vector<ExecutableInfo> Fallout3Info::getExecutables()
   result.push_back(ExecutableInfo(L"BOSS", L"BOSS/BOSS.exe", L"", L"", NEVER_CLOSE));

 

   return result;

-}

+}*/

 } // namespace MOShared

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index 1e8d1e0c..7e39cce4 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -87,13 +87,13 @@ public:
 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SArchiveList"; }

 

 private:

 

-  Fallout3Info(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  Fallout3Info(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);

 

diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp
index ff441f13..178ce8b4 100644
--- a/src/shared/falloutnvinfo.cpp
+++ b/src/shared/falloutnvinfo.cpp
@@ -31,8 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

-FalloutNVInfo::FalloutNVInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory)

-  : GameInfo(omoDirectory, gameDirectory)

+FalloutNVInfo::FalloutNVInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory)

+  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

 {

   identifyMyGamesDirectory(L"falloutnv");

 }

@@ -257,7 +257,7 @@ bool FalloutNVInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)
   return false;

 }

 

-

+/*

 std::vector<ExecutableInfo> FalloutNVInfo::getExecutables()

 {

   std::vector<ExecutableInfo> result;

@@ -269,5 +269,5 @@ std::vector<ExecutableInfo> FalloutNVInfo::getExecutables()
   result.push_back(ExecutableInfo(L"BOSS", L"BOSS/BOSS.exe", L"", L"", NEVER_CLOSE));

 

   return result;

-}

+}*/

 } // namespace MOShared

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index d862d313..231311de 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -88,13 +88,13 @@ public:
 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SArchiveList"; }

 

 private:

 

-  FalloutNVInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  FalloutNVInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);

 };

diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 6a6e6c22..5439efff 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -27,10 +27,12 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "skyriminfo.h"

 #include "util.h"

 

+

 #include <shlobj.h>

 #include <sstream>

 #include <cassert>

 #include <boost/assign.hpp>

+#include <boost/format.hpp>

 

 namespace MOShared {

 

@@ -38,8 +40,8 @@ namespace MOShared {
 GameInfo* GameInfo::s_Instance = NULL;

 

 

-GameInfo::GameInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory)

-  : m_GameDirectory(gameDirectory), m_OrganizerDirectory(omoDirectory)

+GameInfo::GameInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory)

+  : m_GameDirectory(gameDirectory), m_OrganizerDirectory(moDirectory), m_OrganizerDataDirectory(moDataDirectory)

 {

   atexit(&cleanup);

 }

@@ -74,42 +76,47 @@ void GameInfo::identifyMyGamesDirectory(const std::wstring &file)
       }

     }

   }

-  if (!FileExists(m_MyGamesDirectory.substr().append(L"/").append(file))) {

-    m_MyGamesDirectory.assign(getSpecialPath(L"Personal")).append(L"\\My Games");

+  // c) finally, look in the registry. This is discouraged

+  if (m_MyGamesDirectory.empty()

+      || !FileExists(m_MyGamesDirectory + L"\\" + file)) {

+    std::wstring fromRegistry = getSpecialPath(L"Personal") + L"\\My Games";

+    if (FileExists(fromRegistry + L"\\" + file)) {

+      m_MyGamesDirectory = fromRegistry;

+    }

   }

 }

 

 

-bool GameInfo::identifyGame(const std::wstring &moDirectory, const std::wstring &searchPath)

+bool GameInfo::identifyGame(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &searchPath)

 {

   if (OblivionInfo::identifyGame(searchPath)) {

-    s_Instance = new OblivionInfo(moDirectory, searchPath);

+    s_Instance = new OblivionInfo(moDirectory, moDataDirectory, searchPath);

   } else if (Fallout3Info::identifyGame(searchPath)) {

-    s_Instance = new Fallout3Info(moDirectory, searchPath);

+    s_Instance = new Fallout3Info(moDirectory, moDataDirectory, searchPath);

   } else if (FalloutNVInfo::identifyGame(searchPath)) {

-    s_Instance = new FalloutNVInfo(moDirectory, searchPath);

+    s_Instance = new FalloutNVInfo(moDirectory, moDataDirectory, searchPath);

   } else if (SkyrimInfo::identifyGame(searchPath)) {

-    s_Instance = new SkyrimInfo(moDirectory, searchPath);

+    s_Instance = new SkyrimInfo(moDirectory, moDataDirectory, searchPath);

   }

 

   return s_Instance != NULL;

 }

 

 

-bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &gamePath)

+bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gamePath)

 {

   if (s_Instance == NULL) {

     if (gamePath.length() == 0) {

       // search upward in the directory until a recognized game-binary is found

       std::wstring searchPath(moDirectory);

-      while (!identifyGame(moDirectory, searchPath)) {

+      while (!identifyGame(moDirectory, moDataDirectory, searchPath)) {

         size_t lastSep = searchPath.find_last_of(L"/\\");

         if (lastSep == std::string::npos) {

           return false;

         }

         searchPath.erase(lastSep);

       }

-    } else if (!identifyGame(moDirectory, gamePath)) {

+    } else if (!identifyGame(moDirectory, moDataDirectory, gamePath)) {

       return false;

     }

   }

@@ -207,11 +214,11 @@ std::wstring GameInfo::getLocalAppFolder() const
 std::wstring GameInfo::getSpecialPath(LPCWSTR name) const

 {

   HKEY key;

-  LONG errorcode = ::RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders",

-                                  0, KEY_QUERY_VALUE, &key);

+  LONG errorcode = ::RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders",

+                                   0, KEY_QUERY_VALUE, &key);

 

   if (errorcode != ERROR_SUCCESS) {

-    throw windows_error("failed to look up special folder", errorcode);

+    throw windows_error("failed to look up special folder (path)", errorcode);

   }

 

   WCHAR temp[MAX_PATH];

@@ -219,7 +226,7 @@ std::wstring GameInfo::getSpecialPath(LPCWSTR name) const
 

   errorcode = ::RegQueryValueExW(key, name, NULL, NULL, (LPBYTE)temp, &bufferSize);

   if (errorcode != ERROR_SUCCESS) {

-    throw windows_error("failed to look up special folder", errorcode);

+    throw windows_error((boost::format("failed to look up special folder (%1%)") % ToString(name, true)).str(), errorcode);

   }

 

   WCHAR temp2[MAX_PATH];

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index 33467cb9..c11679f3 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -28,7 +28,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>

 

 namespace MOShared {

-

+/*

 enum CloseMOStyle {

   DEFAULT_CLOSE,

   DEFAULT_STAY,

@@ -53,7 +53,7 @@ struct ExecutableInfo {
   CloseMOStyle closeMO;

   std::wstring steamAppID;

 };

-

+*/

 

 /**

   Class to manage information that depends on the used game type. The intention is to keep

@@ -160,21 +160,17 @@ public:
 

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) = 0;

 

-  // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

-  // the game directory. the boolean says whether omo should be closed when the executable is started

-  virtual std::vector<ExecutableInfo> getExecutables() = 0;

-

 public:

 

-  // initialise with the path to the omo directory (needs to be where hook.dll is stored). This

+  // initialise with the path to the mo directory (needs to be where hook.dll is stored). This

   // needs to be called before the instance can be retrieved

-  static bool init(const std::wstring &omoDirectory, const std::wstring &gamePath = L"");

+  static bool init(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gamePath = L"");

 

   static GameInfo& instance();

 

 protected:

 

-  GameInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  GameInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   std::wstring getLocalAppFolder() const;

   const std::wstring &getMyGamesDirectory() const { return m_MyGamesDirectory; }

@@ -182,7 +178,7 @@ protected:
 

 private:

 

-  static bool identifyGame(const std::wstring &omoDirectory, const std::wstring &searchPath);

+  static bool identifyGame(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &searchPath);

   std::wstring getSpecialPath(LPCWSTR name) const;

 

   static void cleanup();

@@ -195,6 +191,7 @@ private:
 

   std::wstring m_GameDirectory;

   std::wstring m_OrganizerDirectory;

+  std::wstring m_OrganizerDataDirectory;

 

 };

 

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index 288ab17f..89a795a5 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -31,8 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

-OblivionInfo::OblivionInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory)

-  : GameInfo(omoDirectory, gameDirectory)

+OblivionInfo::OblivionInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory)

+  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

 {

   identifyMyGamesDirectory(L"oblivion");

 }

@@ -273,7 +273,7 @@ std::wstring OblivionInfo::getSteamAPPId(int) const
   return L"22330";

 }

 

-

+/*

 std::vector<ExecutableInfo> OblivionInfo::getExecutables()

 {

   std::vector<ExecutableInfo> result;

@@ -286,5 +286,5 @@ std::vector<ExecutableInfo> OblivionInfo::getExecutables()
   result.push_back(ExecutableInfo(L"BOSS (old)", L"Data/BOSS.exe", L"", L"", NEVER_CLOSE));

 

   return result;

-}

+}*/

 } // namespace MOShared

diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index 7544e5ce..cb506c01 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -84,13 +84,13 @@ public:
 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SArchiveList"; }

 

 private:

 

-  OblivionInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory);

+  OblivionInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);

 

diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index fc1401d8..1203e3ed 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -33,8 +33,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOShared {

 

 

-SkyrimInfo::SkyrimInfo(const std::wstring &moDirectory, const std::wstring &gameDirectory)

-  : GameInfo(moDirectory, gameDirectory)

+SkyrimInfo::SkyrimInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory)

+  : GameInfo(moDirectory, moDataDirectory, gameDirectory)

 {

   identifyMyGamesDirectory(L"skyrim");

 

@@ -306,7 +306,7 @@ bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPa
 }

 

 

-std::vector<ExecutableInfo> SkyrimInfo::getExecutables()

+/*std::vector<ExecutableInfo> SkyrimInfo::getExecutables()

 {

   std::vector<ExecutableInfo> result;

   result.push_back(ExecutableInfo(L"SKSE", L"skse_loader.exe", L"", L"", DEFAULT_CLOSE));

@@ -317,6 +317,6 @@ std::vector<ExecutableInfo> SkyrimInfo::getExecutables()
   result.push_back(ExecutableInfo(L"Creation Kit", L"CreationKit.exe", L"", L"", DEFAULT_STAY, L"202480"));

 

   return result;

-}

+}*/

 

 } // namespace MOShared

diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index 33a612df..ad6ab95d 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -94,13 +94,13 @@ public:
 

   // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

   // the game directory

-  virtual std::vector<ExecutableInfo> getExecutables();

+  //virtual std::vector<ExecutableInfo> getExecutables();

 

   virtual std::wstring archiveListKey() { return L"SResourceArchiveList"; }

 

 private:

 

-  SkyrimInfo(const std::wstring &moDirectory, const std::wstring &gameDirectory);

+  SkyrimInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);