mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3042 from nextcloud/temp-fix-vfs-failure-wow6432"

Browse Source 
This reverts commit cafa475398, reversing
changes made to 003e56f4e6.
This commit is contained in:
allexzander 2021-03-26 22:25:31 +02:00
parent cafa475398
commit ab128cc4aa
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsync/vfs/cfapi/cfapiwrapper.cpp
View File

@ -452,12 +452,6 @@ bool deleteSyncRootRegistryKey(const QString &syncRootPath, const QString &provi
OCC::Result<void, QString> OCC::CfApiWrapper::registerSyncRoot(const QString &path, const QString &providerName, const QString &providerVersion, const QString &folderAlias, const QString &displayName, const QString &accountDisplayName)
{
Q_UNUSED(displayName);
Q_UNUSED(folderAlias);
Q_UNUSED(providerName);
Q_UNUSED(accountDisplayName);
/*
* TODO: Figure out how to fix the WOW6432Node issue, then, uncomment this block
// even if we fail to register our sync root with shell, we can still proceed with using the VFS
const auto createRegistryKeyResult = createSyncRootRegistryKeys(providerName, folderAlias, displayName, accountDisplayName, path);
Q_ASSERT(createRegistryKeyResult);
@ -465,7 +459,6 @@ OCC::Result<void, QString> OCC::CfApiWrapper::registerSyncRoot(const QString &pa
if (!createRegistryKeyResult) {
qCWarning(lcCfApiWrapper) << "Failed to create the registry key for path:" << path;
}
*/
const auto p = path.toStdWString();
const auto name = providerName.toStdWString();
@ -498,17 +491,12 @@ OCC::Result<void, QString> OCC::CfApiWrapper::registerSyncRoot(const QString &pa
OCC::Result<void, QString> OCC::CfApiWrapper::unregisterSyncRoot(const QString &path, const QString &providerName, const QString &accountDisplayName)
{
Q_UNUSED(providerName);
Q_UNUSED(accountDisplayName);
/*
* TODO: Figure out how to fix the WOW6432Node issue, then, uncomment this block
const auto deleteRegistryKeyResult = deleteSyncRootRegistryKey(path, providerName, accountDisplayName);
Q_ASSERT(deleteRegistryKeyResult);
if (!deleteRegistryKeyResult) {
qCWarning(lcCfApiWrapper) << "Failed to delete the registry key for path:" << path;
}
*/
const auto p = path.toStdWString();
const qint64 result = CfUnregisterSyncRoot(p.data());