export pdb::file to winapi-common's File

3 files changed, 5 insertions, 66 deletions

diff --git a/src/dbghelp.cpp b/src/dbghelp.cpp
index fb94835..d42c900 100644
--- a/src/dbghelp.cpp
+++ b/src/dbghelp.cpp
@@ -6,6 +6,7 @@
 #include <pdb/all.hpp>
 
 #include <winapi/error.hpp>
+#include <winapi/file.hpp>
 #include <winapi/utf8.hpp>
 
 #include <dbghelp.h>
@@ -127,7 +128,7 @@ ModuleInfo DbgHelp::load_pdb(const std::string& path) const {
     DWORD size = 0;
 
     {
-        const auto raw_size = file::get_size(path);
+        const auto raw_size = winapi::File::open_read_attributes(path).get_size();
         if (raw_size > std::numeric_limits<decltype(size)>::max())
             throw std::range_error{"PDB file is too large"};
         size = static_cast<decltype(size)>(raw_size);
diff --git a/src/repo.cpp b/src/repo.cpp
index af56373..610ef9a 100644
--- a/src/repo.cpp
+++ b/src/repo.cpp
@@ -5,6 +5,8 @@
 
 #include <pdb/all.hpp>
 
+#include <winapi/file.hpp>
+
 #include <map>
 #include <sstream>
 #include <stdexcept>
@@ -89,7 +91,7 @@ Address Repo::add_pdb(Address online_base, const std::string& path) {
     if (online_bases.find(online_base) != online_bases.cend())
         throw std::runtime_error{pdb_already_loaded(online_base, path)};
 
-    auto file_id = file::query_id(path);
+    auto file_id = winapi::File::open_read_attributes(path).query_id();
     if (file_ids.find(file_id) != file_ids.cend())
         throw std::runtime_error{pdb_already_loaded(path)};
 
diff --git a/src/utils/file.cpp b/src/utils/file.cpp
deleted file mode 100644
index fdc695f..0000000
--- a/src/utils/file.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2017 Egor Tensin <Egor.Tensin@gmail.com>
-// This file is part of the "winapi-debug" project.
-// For details, see https://github.com/egor-tensin/winapi-debug.
-// Distributed under the MIT License.
-
-#include <pdb/all.hpp>
-
-#include <winapi/error.hpp>
-#include <winapi/utf8.hpp>
-
-#include <windows.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <stdexcept>
-#include <string>
-
-namespace pdb {
-namespace file {
-
-std::size_t get_size(const std::string& path) {
-    const Handle handle{CreateFileW(winapi::widen(path).c_str(),
-                                    FILE_READ_ATTRIBUTES,
-                                    FILE_SHARE_READ,
-                                    NULL,
-                                    OPEN_EXISTING,
-                                    FILE_ATTRIBUTE_NORMAL,
-                                    NULL)};
-
-    if (handle.get() == INVALID_HANDLE_VALUE)
-        throw winapi::error::windows(GetLastError(), "CreateFileW");
-
-    LARGE_INTEGER size;
-
-    if (!GetFileSizeEx(handle.get(), &size))
-        throw winapi::error::windows(GetLastError(), "GetFileSizeEx");
-
-    if (size.QuadPart < 0 || size.QuadPart > SIZE_MAX)
-        throw std::runtime_error{"invalid file size"};
-    return static_cast<std::size_t>(size.QuadPart);
-}
-
-ID query_id(const std::string& path) {
-    const Handle handle{CreateFileW(winapi::widen(path).c_str(),
-                                    FILE_READ_ATTRIBUTES,
-                                    FILE_SHARE_READ | FILE_SHARE_WRITE,
-                                    NULL,
-                                    OPEN_EXISTING,
-                                    FILE_ATTRIBUTE_NORMAL,
-                                    NULL)};
-
-    if (handle.get() == INVALID_HANDLE_VALUE)
-        throw winapi::error::windows(GetLastError(), "CreateFileW");
-
-    FILE_ID_INFO id;
-
-    if (!GetFileInformationByHandleEx(handle.get(), FileIdInfo, &id, sizeof(id)))
-        throw winapi::error::windows(GetLastError(), "GetFileInformationByHandleEx");
-
-    return {id};
-}
-
-} // namespace file
-} // namespace pdb