option to disable transacted filesystems

in some situations the transacted filesystem operations do not work add an option that disables all transacted filesystem operations
Loksim3D · Jun 14, 2020 · 2cbb8b4 · 2cbb8b4
1 parent 29b4613
commit 2cbb8b4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 3 deletions.
diff --git a/PackageManager/L3dPackageInstaller/DBHelper.cpp b/PackageManager/L3dPackageInstaller/DBHelper.cpp
@@ -40,6 +40,8 @@ namespace packageinstaller
 		const std::wstring DBHelper::PREF_DEINSTALL_ALWAYS_ASK = L"DEINSTALL_ALWAYS_ASK";
 		const std::wstring DBHelper::PREF_ALLOW_UNDO = L"DEINSTALL_ALLOW_UNDO";
 
+		const std::wstring DBHelper::PREF_DISABLE_TRANSACTIONS = L"DISABLE_TRANSACTIONS";
+
 		DBHelper::DBHelper(void) : newDbCreated(false)
 		{
 		}

diff --git a/PackageManager/L3dPackageInstaller/DBHelper.h b/PackageManager/L3dPackageInstaller/DBHelper.h
@@ -94,6 +94,7 @@ class DBHelper
 	static const std::wstring PREF_INSTALL_ONLY_OLDER;
 	static const std::wstring PREF_DEINSTALL_ALWAYS_ASK;
 	static const std::wstring PREF_ALLOW_UNDO;
+	static const std::wstring PREF_DISABLE_TRANSACTIONS;
 
 protected:
 	DBHelper(void);

diff --git a/PackageManager/L3dPackageInstaller/DlgPackageInstall.cpp b/PackageManager/L3dPackageInstaller/DlgPackageInstall.cpp
@@ -28,10 +28,12 @@ using namespace std;
 using namespace db;
 
 DlgPackageInstall::DlgPackageInstall(const std::wstring& l3dPath, const std::vector<std::wstring>& packagesToInstall) : 
-	curListSel(-1), installationStarted(false), installManager(new InstallManager(l3dPath)), hListPackages(nullptr), 
+	curListSel(-1), installationStarted(false), hListPackages(nullptr), 
 	dropTarget{ { L".zip", L".l3dpack" } }, argPackagesToInstall(packagesToInstall)
 
 {
+	bool disableTransactions = DBHelper::instance().GetPreferenceValue(DBHelper::PREF_DISABLE_TRANSACTIONS, false);
+	installManager = std::make_unique<InstallManager>(l3dPath, disableTransactions);
 	dropTarget.SetOnDropNotify(this);
 }
 

diff --git a/PackageManager/L3dPackageInstaller/DlgSettings.cpp b/PackageManager/L3dPackageInstaller/DlgSettings.cpp
@@ -50,6 +50,9 @@ INT_PTR DlgSettings::OnInitDlg(WPARAM wParam, LPARAM lParam)
 	SendDlgItemMessage(GetHwnd(), IDC_SET_ALLOW_UNDO, BM_SETCHECK, 
 		DBHelper::instance().GetPreferenceValue(DBHelper::PREF_ALLOW_UNDO, false) ? BST_CHECKED : BST_UNCHECKED, 0);
 
+	SendDlgItemMessage(GetHwnd(), IDC_USE_TRANSACTIONS, BM_SETCHECK,
+		DBHelper::instance().GetPreferenceValue(DBHelper::PREF_DISABLE_TRANSACTIONS, false) ? BST_UNCHECKED : BST_CHECKED, 0);
+
 	HWND cb = GetDlgItem(GetHwnd(), IDC_COMBOLANG);
 	ComboBox_AddString(cb, strTab.Load(IDS_LANG_DE));
 	ComboBox_AddString(cb, strTab.Load(IDS_LANG_EN));
@@ -90,6 +93,9 @@ INT_PTR DlgSettings::OnCommand(WPARAM wParam, LPARAM lParam)
 			DBHelper::instance().SetPreferenceValue(DBHelper::PREF_ALLOW_UNDO,  
 				Button_GetCheck(GetDlgItem(GetHwnd(), IDC_SET_ALLOW_UNDO)) == BST_CHECKED);
 
+			DBHelper::instance().SetPreferenceValue(DBHelper::PREF_DISABLE_TRANSACTIONS,
+				Button_GetCheck(GetDlgItem(GetHwnd(), IDC_USE_TRANSACTIONS)) == BST_UNCHECKED);
+
 			int sel = ComboBox_GetCurSel(GetDlgItem(GetHwnd(), IDC_COMBOLANG));
 			wchar_t *lang = nullptr;
 			if (sel == 0)

diff --git a/PackageManager/L3dPackageInstaller/InstallManager.cpp b/PackageManager/L3dPackageInstaller/InstallManager.cpp
@@ -31,7 +31,8 @@ namespace l3d
 		using namespace Kompex;
 		using namespace l3d::packageinstaller::fs;
 
-		InstallManager::InstallManager(const std::wstring& loksimPath) : 
+		InstallManager::InstallManager(const std::wstring& loksimPath, bool disableTransactions) :
+			transactFs(NULL, 0, NULL, NULL, !disableTransactions),
 			l3dPath(loksimPath), replaceOnlyOlder(true), alwaysAskBeforeOverwrite(false), installState(InstallPreparing), cntTotalFiles(0), cancelled(false), dbAgent(loksimPath), installInfoLock()
 		{
 			usedTransactions = transactFs.UseTransactedFunctions();

diff --git a/PackageManager/L3dPackageInstaller/InstallManager.h b/PackageManager/L3dPackageInstaller/InstallManager.h
@@ -44,7 +44,7 @@ class InstallManager
 		InstallPreparing, InstallRunning, InstallPassOneFinished, InstallPassTwoRunning, InstallSuccessfullyFinished, InstallErrorOccurred, InstallCancelled
 	};
 public:
-	InstallManager(const std::wstring& loksimPath);
+	InstallManager(const std::wstring& loksimPath, bool disableTransactions = false);
 	~InstallManager(void);
 
 	/**

diff --git a/PackageManager/L3dPackageInstaller/L3dPackageInstaller.rc b/PackageManager/L3dPackageInstaller/L3dPackageInstaller.rc
diff --git a/PackageManager/L3dPackageInstaller/Resource.h b/PackageManager/L3dPackageInstaller/Resource.h
@@ -172,3 +172,4 @@
 #define IDS_NO                                  40068
 #define IDS_EXPORTLISTTIMEPKG                   40069
 #define IDS_EXPORTLISTTIMEFS                    40070
+#define IDC_USE_TRANSACTIONS					40071