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

This reverts commit cafa475398d4a78236f69f822fda4826e8103901, reversing
changes made to 003e56f4e6804fb23557b66b56e2ae08664d3ca3.

diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
index 07b5ddf1ab485f04d43b595c874757284d38c513..dacc61c4b21a01e834e41cf5c38e2f8e881d7fa6 100644 (file)
--- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp
+++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
@@ -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());