TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the crash dump path to get from local app data.

Browse Source 
PiperOrigin-RevId: 534220487
This commit is contained in:
Eiden Kim
2023-05-22 16:29:45 -07:00
committed by Copybara-Service
parent d420e9ff33
commit 27267f57b8
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/device_info.cc
+19 -27
View File
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2021-2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ using IAsyncOperation = winrt::Windows::Foundation::IAsyncOperation<T>;
constexpr char window_class_name[] = "NearbySharingDLL_MessageWindowClass";
constexpr char window_name[] = "NearbySharingDLL_MessageWindow";
constexpr char kLogsRelativePath[] = "Google\\Nearby\\Sharing\\Logs";
constexpr char kCrashDumpsRelativePath[] =
constexpr char logs_relative_path[] = "Google\\Nearby\\Sharing\\Logs";
constexpr char crash_dumps_relative_path[] =
"Google\\Nearby\\Sharing\\CrashDumps";
namespace {
@@ -355,15 +355,16 @@ std::optional<std::filesystem::path> DeviceInfo::GetDownloadPath() const {
}
std::optional<std::filesystem::path> DeviceInfo::GetLocalAppDataPath() const {
std::string path;
path.resize(MAX_PATH);
HRESULT result = SHGetFolderPathA(nullptr, CSIDL_LOCAL_APPDATA, nullptr,
SHGFP_TYPE_CURRENT, path.data());
PWSTR path;
HRESULT result = SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_DEFAULT,
/*hToken=*/nullptr, &path);
if (result == S_OK) {
path.resize(strlen(path.data()));
return std::filesystem::path(path);
std::wstring local_appdata_path{path};
CoTaskMemFree(path);
return std::filesystem::path(local_appdata_path);
}
CoTaskMemFree(path);
return std::nullopt;
}
@@ -372,9 +373,9 @@ std::optional<std::filesystem::path> DeviceInfo::GetCommonAppDataPath() const {
HRESULT result = SHGetKnownFolderPath(FOLDERID_ProgramData, KF_FLAG_DEFAULT,
/*hToken=*/nullptr, &path);
if (result == S_OK) {
std::wstring download_path{path};
std::wstring common_app_data_path{path};
CoTaskMemFree(path);
return std::filesystem::path(download_path);
return std::filesystem::path(common_app_data_path);
}
CoTaskMemFree(path);
@@ -386,28 +387,19 @@ std::optional<std::filesystem::path> DeviceInfo::GetTemporaryPath() const {
}
std::optional<std::filesystem::path> DeviceInfo::GetLogPath() const {
PWSTR path;
HRESULT result = SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_DEFAULT,
/*hToken=*/nullptr, &path);
if (result == S_OK) {
std::filesystem::path prefixPath = path;
CoTaskMemFree(path);
return std::filesystem::path(prefixPath / kLogsRelativePath);
auto prefix_path = GetLocalAppDataPath();
if (prefix_path.has_value()) {
return std::filesystem::path(prefix_path.value() / logs_relative_path);
}
CoTaskMemFree(path);
return std::nullopt;
}
std::optional<std::filesystem::path> DeviceInfo::GetCrashDumpPath() const {
PWSTR path;
HRESULT result = SHGetKnownFolderPath(FOLDERID_ProgramData, KF_FLAG_DEFAULT,
/*hToken=*/nullptr, &path);
if (result == S_OK) {
std::filesystem::path prefixPath = path;
CoTaskMemFree(path);
return std::filesystem::path(prefixPath / kCrashDumpsRelativePath);
auto prefix_path = GetLocalAppDataPath();
if (prefix_path.has_value()) {
return std::filesystem::path(prefix_path.value() /
crash_dumps_relative_path);
}
CoTaskMemFree(path);
return std::nullopt;
}
internal/platform/implementation/windows/device_info_test.cc
+9 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2021-2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -65,6 +65,14 @@ TEST(DeviceInfo, DISABLED_GetTemporaryPath) {
EXPECT_TRUE(DeviceInfo().GetTemporaryPath().has_value());
}
TEST(DeviceInfo, DISABLED_GetLogPath) {
EXPECT_TRUE(DeviceInfo().GetLogPath().has_value());
}
TEST(DeviceInfo, DISABLED_GetCrashDumpPath) {
EXPECT_TRUE(DeviceInfo().GetCrashDumpPath().has_value());
}
TEST(DeviceInfo, DISABLED_IsScreenLocked) {
EXPECT_FALSE(DeviceInfo().IsScreenLocked());
}