From 30a46dacb7327cbb9c39b72fdf86a9408425f4a7 Mon Sep 17 00:00:00 2001 From: alex-z Date: Fri, 16 Feb 2024 16:25:06 +0100 Subject: [PATCH] VFS. CfAPI. Provide detailed error message for leading '#' placeholder update failure. Signed-off-by: alex-z --- src/libsync/vfs/cfapi/cfapiwrapper.cpp | 38 ++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp index 12c4f740238a5..c928a3a809d23 100644 --- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp +++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp @@ -48,6 +48,24 @@ constexpr auto syncRootFlagsNoCfApiContextMenu = 2; constexpr auto syncRootManagerRegKey = R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SyncRootManager)"; +constexpr auto forbiddenLeadingCharacterInPath = "#"; + +QString createErrorMessageForPlaceholderUpdateAndCreate(const QString &path, const QString &originalErrorMessage) +{ + const auto pathFromNativeSeparators = QDir::fromNativeSeparators(path); + if (!pathFromNativeSeparators.contains(QStringLiteral("/%1").arg(forbiddenLeadingCharacterInPath))) { + return originalErrorMessage; + } + const auto fileComponents = pathFromNativeSeparators.split("/"); + for (const auto &fileComponent : fileComponents) { + if (fileComponent.startsWith(forbiddenLeadingCharacterInPath)) { + qCInfo(lcCfApiWrapper) << "Failed to create/update a placeholder for path \"" << pathFromNativeSeparators << "\" that has a leading '#'."; + return {(originalErrorMessage + QStringLiteral(": ") + QObject::tr("Paths beginning with '#' character are not supported in VFS mode."))}; + } + } + return originalErrorMessage; +} + DWORD sizeToDWORD(size_t size) { return OCC::Utility::convertSizeToDWORD(size); @@ -297,8 +315,9 @@ OCC::Result updatePlaceholderStat nullptr, 0, CF_UPDATE_FLAG_MARK_IN_SYNC, nullptr, nullptr); if (result != S_OK) { - qCWarning(lcCfApiWrapper) << "Couldn't update placeholder info for" << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()) << replacesPath; - return { "Couldn't update placeholder info" }; + const auto errorMessage = createErrorMessageForPlaceholderUpdateAndCreate(path, "Couldn't update placeholder info"); + qCWarning(lcCfApiWrapper) << errorMessage << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()) << replacesPath; + return errorMessage; } // Pin state tends to be lost on updates, so restore it every time @@ -827,8 +846,9 @@ OCC::Result OCC::CfApiWrapper::de nullptr); if (result != S_OK) { - qCWarning(lcCfApiWrapper) << "Couldn't update placeholder info for" << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); - return {"Couldn't update placeholder info"}; + const auto errorMessage = createErrorMessageForPlaceholderUpdateAndCreate(path, "Couldn't update placeholder info"); + qCWarning(lcCfApiWrapper) << errorMessage << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); + return errorMessage; } } else { const qint64 result = CfConvertToPlaceholder(handleForPath(path).get(), @@ -839,8 +859,9 @@ OCC::Result OCC::CfApiWrapper::de nullptr); if (result != S_OK) { - qCWarning(lcCfApiWrapper) << "Couldn't convert to placeholder" << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); - return {"Couldn't convert to placeholder"}; + const auto errorMessage = createErrorMessageForPlaceholderUpdateAndCreate(path, "Couldn't convert to placeholder"); + qCWarning(lcCfApiWrapper) << errorMessage << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); + return errorMessage; } } @@ -857,8 +878,9 @@ OCC::Result OCC::CfApiWrapper::co const qint64 result = CfConvertToPlaceholder(handleForPath(path).get(), fileIdentity.data(), sizeToDWORD(fileIdentitySize), CF_CONVERT_FLAG_MARK_IN_SYNC, nullptr, nullptr); Q_ASSERT(result == S_OK); if (result != S_OK) { - qCCritical(lcCfApiWrapper) << "Couldn't convert to placeholder" << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); - return { "Couldn't convert to placeholder" }; + const auto errorMessage = createErrorMessageForPlaceholderUpdateAndCreate(path, "Couldn't convert to placeholder"); + qCWarning(lcCfApiWrapper) << errorMessage << path << ":" << QString::fromWCharArray(_com_error(result).ErrorMessage()); + return errorMessage; } const auto originalInfo = findPlaceholderInfo(replacesPath);