fix: compilation on Windows

Author: vincentdchan

jetpack/src/ModuleProvider.cpp

@@ -34,7 +34,7 @@ namespace jetpack {
 
         std::string source_path = module_path.string();
 
-        if (unlikely(source_path.rfind(base_path_, 0) != 0)) {  // is not under working dir
+        if (unlikely(source_path.rfind(base_path_.string(), 0) != 0)) {  // is not under working dir
             std::cerr << fmt::format("path {} is not under working dir: {}", source_path, base_path_.string()) << std::endl;
             return std::nullopt;
         }

jetpack/src/ModuleResolver.cpp

@@ -98,7 +98,7 @@ namespace jetpack {
             }
         }
 
-        std::optional<ghc::filesystem::path> base_path = base_path_override.empty() ? FindPathOfPackageJson(target_p) : ghc::filesystem::path(base_path_override);
+        std::optional<ghc::filesystem::path> base_path = base_path_override.empty() ? FindPathOfPackageJson(target_p.string()) : ghc::filesystem::path(base_path_override);
         if (unlikely(!base_path.has_value())) {
             ghc::filesystem::path p = target_p.parent_path();
             base_path = { p.string() };
@@ -108,7 +108,7 @@ namespace jetpack {
         auto fileProvider = std::make_shared<FileModuleProvider>(*base_path);
         providers_.push_back(fileProvider);
 
-        pBeginFromEntry(fileProvider, config, target_p.lexically_relative(*base_path));
+        pBeginFromEntry(fileProvider, config, target_p.lexically_relative(*base_path).string());
     }
 
     void ModuleResolver::BeginFromEntryString(const parser::Config& config,
@@ -227,10 +227,11 @@ namespace jetpack {
             return nullptr;
         }
 
-        mf->resolved_map[path] = match_result.second;
+        std::string match_path_str = match_result.second.string();
+        mf->resolved_map[path] = match_path_str;
 
         bool isNew = false;
-        Sp<ModuleFile> childMod = modules_table_.CreateNewIfNotExists(match_result.second, isNew);
+        Sp<ModuleFile> childMod = modules_table_.CreateNewIfNotExists(match_path_str, isNew);
         if (!isNew) {
             mf->ref_mods.push_back(childMod);
             return childMod;

jetpack/src/utils/io/FileIO.cpp

@@ -151,29 +151,29 @@ namespace jetpack::io {
 #ifdef _WIN32
             hFile = ::CreateFileA(path_.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
             if (hFile == INVALID_HANDLE_VALUE) {
-                std::cerr << "open file failed: " << filename << ", " << ::GetLastError() << std::endl;
+                std::cerr << fmt::format("open file {} failed: {}", path_, ::GetLastError()) << std::endl;
                 return IOError::OpenFailed;
             }
 
             DWORD file_size;
             ::GetFileSize(hFile, &file_size);
-            size = int64_t(file_size);
+            current_size_ = int64_t(file_size);
 
-            hMapping = ::CreateFileMapping(hFile, NULL, PAGE_READWRITE, 0, size, NULL);
+            hMapping = ::CreateFileMapping(hFile, NULL, PAGE_READWRITE, 0, current_size_, NULL);
             if (hMapping == NULL) {
                 ::CloseHandle(hFile);
-                std::cerr << "read file failed: " << filename << ", " << ::GetLastError() << std::endl;
+                std::cerr << fmt::format("read file {} failed: {}", path_, ::GetLastError()) << std::endl;
                 return IOError::ReadFailed;
             }
 
             void* p = MapViewOfFile(hMapping, FILE_MAP_WRITE, 0, 0, 0);
             if (p == NULL) {
                 ::CloseHandle(hMapping);
                 ::CloseHandle(hFile);
-                std::cerr << "read file failed: " << filename << ", " << ::GetLastError() << std::endl;
+                std::cerr << fmt::format("read file {} failed: {}", path_, ::GetLastError()) << std::endl;
                 return IOError::ReadFailed;
             }
-            mapped_mem = reinterpret_cast<uintptr_t>(p);
+            mapped_mem_ = reinterpret_cast<unsigned char*>(p);
             return IOError::Ok;
 #else
         fd = ::open(path_.c_str(), O_RDWR | O_CREAT, 0644);
@@ -202,6 +202,46 @@ namespace jetpack::io {
     }
 
     IOError FileWriterInternal::Resize(uint64_t size) {
+#ifdef _WIN32
+		::UnmapViewOfFile(mapped_mem_);
+        ::CloseHandle(hMapping);
+
+        bool ok = false;
+
+        LARGE_INTEGER large_size;
+        large_size.QuadPart = size;
+        ok = ::SetFilePointerEx(hFile, large_size, NULL, FILE_BEGIN);
+        if (!ok) {
+            std::cerr << fmt::format("can not set file pointer of {}", path_) << std::endl;
+            return IOError::ResizeFailed;
+        }
+
+        ok = ::SetEndOfFile(hFile);
+        if (!ok) {
+            std::cerr << fmt::format("can not set end of {}", path_) << std::endl;
+            return IOError::ResizeFailed;
+        }
+
+        current_size_ = size;
+
+		hMapping = ::CreateFileMapping(hFile, NULL, PAGE_READWRITE, 0, current_size_, NULL);
+		if (hMapping == NULL) {
+			::CloseHandle(hFile);
+			std::cerr << fmt::format("create file mapping {} failed: {}", path_, ::GetLastError()) << std::endl;
+			return IOError::ResizeFailed;
+		}
+
+		void* p = MapViewOfFile(hMapping, FILE_MAP_WRITE, 0, 0, 0);
+		if (p == NULL) {
+			::CloseHandle(hMapping);
+			::CloseHandle(hFile);
+			std::cerr << fmt::format("map file {} failed: {}", path_, ::GetLastError()) << std::endl;
+			return IOError::ResizeFailed;
+		}
+		mapped_mem_ = reinterpret_cast<unsigned char*>(p);
+
+        return IOError::Ok;
+#else
         ::munmap(mapped_mem_, current_size_);
 
         if (::ftruncate(fd, size) != 0) {
@@ -217,6 +257,7 @@ namespace jetpack::io {
         }
 
         return IOError::Ok;
+#endif
     }
 
     IOError FileWriterInternal::EnsureSize(uint64_t size) {
@@ -253,9 +294,9 @@ namespace jetpack::io {
 
     FileWriterInternal::~FileWriterInternal() {
 #ifdef _WIN32
+		::UnmapViewOfFile(mapped_mem_);
         ::CloseHandle(hMapping);
-            ::UnmapViewOfFile(hFile);
-            ::CloseHandle(hFile);
+		::CloseHandle(hFile);
 #else
         if (likely(mapped_mem_ != nullptr)) {
             ::munmap(mapped_mem_, current_size_);