Merge branch 'new_build_system' of https://git.fifthgrid.com/blockstorage/repertory into new_build_system
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit

# Conflicts:
#	repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp
This commit is contained in:
2024-08-30 09:40:13 -05:00
2 changed files with 2 additions and 1 deletions

View File

@ -513,6 +513,7 @@ auto winfsp_drive::GetSecurityByName(PWSTR file_name, PUINT32 attributes,
if (sds != 0U) { if (sds != 0U) {
*descriptor_size = static_cast<SIZE_T>(sds); *descriptor_size = static_cast<SIZE_T>(sds);
} }
RAISE_WINFSP_EVENT(function_name, api_path, ret); RAISE_WINFSP_EVENT(function_name, api_path, ret);
return ret; return ret;
} }

View File

@ -81,7 +81,7 @@ static void root_creation_test(const std::string &mount_point) {
TEST_HEADER(__FUNCTION__); TEST_HEADER(__FUNCTION__);
WIN32_FILE_ATTRIBUTE_DATA ad{}; WIN32_FILE_ATTRIBUTE_DATA ad{};
EXPECT_TRUE( EXPECT_TRUE(
::GetFileAttributesEx(&mount_point[0], GetFileExInfoStandard, &ad)); ::GetFileAttributesEx(mount_point.c_str(), GetFileExInfoStandard, &ad));
EXPECT_EQ(FILE_ATTRIBUTE_DIRECTORY, ad.dwFileAttributes); EXPECT_EQ(FILE_ATTRIBUTE_DIRECTORY, ad.dwFileAttributes);
EXPECT_EQ(0, ad.nFileSizeHigh); EXPECT_EQ(0, ad.nFileSizeHigh);
EXPECT_EQ(0, ad.nFileSizeLow); EXPECT_EQ(0, ad.nFileSizeLow);