Skip to content

Improve WinVFS error messages #12371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikjv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve WinVFS error messages #12371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/plugins/vfs/win/vfs_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
providerInfo.Path(f);
} catch (winrt::hresult_error const& ex) {
qCWarning(lcVfs) << "Could not retrieve StorageFolder for" << syncRoot << "error:" << ex.code() << hstringToQString(ex.message());
Q_EMIT q->error(tr("Could not retrieve StorageFolder for %1 %2").arg(syncRoot, hstringToQString(ex.message())));
Q_EMIT q->error(tr("Could not retrieve StorageFolder for %1 %2 (0x%3)").arg(syncRoot, hstringToQString(ex.message()), QString::number(ex.code(), 16)));
return;
}

Expand Down Expand Up @@ -680,7 +680,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
}
} else {
qCWarning(lcVfs) << "Id did not match" << hstringToQString(previousInfo.Id()) << "!=" << oldId;
Q_EMIT q->error(tr("The folder is used by a different client %1").arg(hstringToQString(previousInfo.DisplayNameResource())));
Q_EMIT q->error(tr("The folder is used by a different client: %1").arg(hstringToQString(previousInfo.DisplayNameResource())));
return;
}
_registrationId = previousInfo.Id();
Expand All @@ -702,7 +702,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
StorageProviderSyncRootManager::Register(providerInfo);
} catch (winrt::hresult_error const& ex) {
qCWarning(lcVfs) << "Error registering StorageProvider for" << params.filesystemPath << QString::number(ex.code()) << hstringToQString(ex.message());
Q_EMIT q->error(tr("Error registering StorageProvider for %1: %2 %3").arg(params.filesystemPath, QString::number(ex.code()), hstringToQString(ex.message())));
Q_EMIT q->error(tr("Error registering StorageProvider for %1: %2 (0x%3)").arg(params.filesystemPath, hstringToQString(ex.message()), QString::number(ex.code(), 16)));
return;
}

Expand Down Expand Up @@ -735,7 +735,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
| CF_CONNECT_FLAG_REQUIRE_FULL_FILE_PATH, // request that callbacks get the full path
&_connectionKey);
if (FAILED(ok)) {
Q_EMIT q->error(tr("CfConnectSyncRoot: %1 error: %2").arg(syncRoot, Utility::formatWinError(ok)));
Q_EMIT q->error(tr("Unable to connect sync root: %1 error: %2").arg(syncRoot, Utility::formatWinError(ok)));
return;
}
// We have not discovered what the status ends up being used for
Expand Down
Loading