Merge branch 'development'

WolverinDEV · Dec 30, 2023 · 3b496b0 · 3b496b0
2 parents 113bb0d + 20b829d
commit 3b496b0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/windows-projfs/Cargo.toml b/windows-projfs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows-projfs"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 authors = ["M. Hadenfeldt <[email protected]>"]
 description = "A rust library for the Windows projected file system API"

diff --git a/windows-projfs/src/aligned_buffer.rs b/windows-projfs/src/aligned_buffer.rs
@@ -1,23 +1,34 @@
-use std::ffi::c_void;
-
-use windows::Win32::Storage::ProjectedFileSystem::{
-    PrjAllocateAlignedBuffer,
-    PrjFreeAlignedBuffer,
-    PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT,
+use std::{
+    ffi::c_void,
+    sync::Arc,
 };
 
+use windows::Win32::Storage::ProjectedFileSystem::PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT;
+
+use crate::library::ProjectedFSLibrary;
+
 pub struct PrjAlignedBuffer {
+    library: Arc<dyn ProjectedFSLibrary>,
+
     length: usize,
     raw_buffer: *mut c_void,
 }
 
 impl PrjAlignedBuffer {
-    pub fn allocate(context: PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT, length: usize) -> Option<Self> {
-        let raw_buffer = unsafe { PrjAllocateAlignedBuffer(context, length) };
+    pub fn allocate(
+        library: Arc<dyn ProjectedFSLibrary>,
+        context: PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT,
+        length: usize,
+    ) -> Option<Self> {
+        let raw_buffer = unsafe { library.prj_allocate_aligned_buffer(context, length) };
         if raw_buffer.is_null() {
             None
         } else {
-            Some(Self { length, raw_buffer })
+            Some(Self {
+                library,
+                length,
+                raw_buffer,
+            })
         }
     }
 
@@ -28,6 +39,6 @@ impl PrjAlignedBuffer {
 
 impl Drop for PrjAlignedBuffer {
     fn drop(&mut self) {
-        unsafe { PrjFreeAlignedBuffer(self.raw_buffer) };
+        unsafe { self.library.prj_free_aligned_buffer(self.raw_buffer) };
     }
 }
diff --git a/windows-projfs/src/fs.rs b/windows-projfs/src/fs.rs
@@ -593,6 +593,7 @@ mod native {
             };
 
             let mut buffer = PrjAlignedBuffer::allocate(
+                context.library.clone(),
                 callback_data.namespace_virtualization_context,
                 chunk_length,
             )