Skip to content

Commit de06d58

Browse files
authored
Improve WinVFS error messages (#12371)
Adds error codes in 2 cases, cosmetic changes in 2 other cases.
1 parent 8d24cf8 commit de06d58

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/plugins/vfs/win/vfs_win.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ void VfsWinPrivate::registerFolder(const VfsSetupParams &params)
638638
providerInfo.Path(f);
639639
} catch (winrt::hresult_error const& ex) {
640640
qCWarning(lcVfs) << "Could not retrieve StorageFolder for" << syncRoot << "error:" << ex.code() << hstringToQString(ex.message());
641-
Q_EMIT q->error(tr("Could not retrieve StorageFolder for %1 %2").arg(syncRoot, hstringToQString(ex.message())));
641+
Q_EMIT q->error(tr("Could not retrieve StorageFolder for %1 %2 (0x%3)").arg(syncRoot, hstringToQString(ex.message()), QString::number(ex.code(), 16)));
642642
return;
643643
}
644644

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

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

0 commit comments

Comments
 (0)