Fix bugs

Author: ShirasawaSama

.gitignore

@@ -4,6 +4,7 @@ cbuild
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+*.log
 
 ### IntelliJ IDEA ###
 .idea

build.gradle

@@ -6,8 +6,8 @@ plugins {
 group 'cn.apisium.shm'
 version '1.0.0'
 
-sourceCompatibility = 19
-targetCompatibility = 19
+sourceCompatibility = JavaVersion.VERSION_19
+targetCompatibility = JavaVersion.VERSION_19
 
 repositories {
     mavenCentral()
@@ -28,3 +28,13 @@ publishing {
         }
     }
 }
+
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+test {
+    useJUnitPlatform()
+    jvmArgs(['--enable-preview', '--enable-native-access=ALL-UNNAMED'])
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

include/jshm.h

@@ -41,9 +41,10 @@ namespace jshm {
 
 		static shared_memory* init(const char* name, int size, bool isCreate) {
 #ifdef _WIN32
-			auto hMapFile = isCreate ? CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, name) : OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, name);
+			auto hMapFile = isCreate ? CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_COMMIT, 0, size, name)
+				: OpenFileMapping(SECTION_MAP_WRITE | SECTION_MAP_READ, FALSE, name);
 			if (hMapFile == NULL) return nullptr;
-			auto pBuf = (LPTSTR)MapViewOfFile(hMapFile, FILE_MAP_ALL_ACCESS, 0, 0, size);
+			auto pBuf = (LPTSTR)MapViewOfFile(hMapFile, SECTION_MAP_WRITE | SECTION_MAP_READ, 0, 0, size);
 			if (pBuf == NULL) {
 				CloseHandle(hMapFile);
 				throw nullptr;

src/main/java/cn/apisium/shm/impl/WindowsSharedMemory.java

@@ -7,9 +7,17 @@
 import java.lang.invoke.MethodHandle;
 import java.nio.ByteBuffer;
 
+@SuppressWarnings("unused")
 public class WindowsSharedMemory implements SharedMemory {
     private static MemorySession session;
     private static MethodHandle createFileMapping, openFileMapping, closeHandle, mapViewOfFile, unmapViewOfFile;
+    private static final int SECTION_QUERY = 0x0001, SECTION_MAP_WRITE = 0x0002, SECTION_MAP_READ = 0x0004,
+            SECTION_MAP_EXECUTE = 0x0008, SECTION_EXTEND_SIZE = 0x0010, SECTION_MAP_EXECUTE_EXPLICIT = 0x0020,
+            SECTION_ALL_ACCESS = SECTION_QUERY | SECTION_MAP_WRITE | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_EXTEND_SIZE | SECTION_MAP_EXECUTE_EXPLICIT;
+    private static final int PAGE_NOACCESS = 0x01, PAGE_READONLY = 0x02, PAGE_READWRITE = 0x04, PAGE_WRITECOPY = 0x08,
+            PAGE_EXECUTE = 0x10, PAGE_EXECUTE_READ = 0x20, PAGE_EXECUTE_READWRITE = 0x40, PAGE_EXECUTE_WRITECOPY = 0x80,
+            PAGE_GUARD = 0x100, PAGE_NOCACHE = 0x200, PAGE_WRITECOMBINE = 0x400;
+    private static final int SEC_COMMIT = 0x08000000, SEC_LARGE_PAGES = 0x80000000, FILE_MAP_LARGE_PAGES = 0x20000000;
 
     static {
         if (CABI.SYSTEM_TYPE == CABI.SystemType.Windows) {
@@ -53,7 +61,6 @@ public class WindowsSharedMemory implements SharedMemory {
     private final MemoryAddress hMapFile, pBuf;
     private final ByteBuffer buffer;
 
-    @SuppressWarnings("unused")
     public WindowsSharedMemory(String name, int size) throws Throwable { this(name, size, true); }
     public WindowsSharedMemory(String name, int size, boolean isCreate) throws Throwable {
         if (CABI.SYSTEM_TYPE != CABI.SystemType.Windows) throw new UnsupportedOperationException("Only Windows is supported");
@@ -62,15 +69,15 @@ public WindowsSharedMemory(String name, int size, boolean isCreate) throws Throw
         hMapFile = isCreate ? (MemoryAddress) createFileMapping.invokeExact(
                 (Addressable) MemoryAddress.ofLong(-1),
                 (Addressable) MemoryAddress.NULL,
-                0x04,
+                PAGE_READWRITE | SEC_COMMIT,
                 0,
                 size,
                 (Addressable) session.allocateUtf8String(name)
-        ) : (MemoryAddress) openFileMapping.invokeExact(0x02, 0, name);
-        if (hMapFile.toRawLongValue() == 0) throw new IllegalStateException("CreateFileMapping failed");
+        ) : (MemoryAddress) openFileMapping.invokeExact(SECTION_MAP_WRITE | SECTION_MAP_READ, 0, name);
+        if (hMapFile.toRawLongValue() == 0) throw new IllegalStateException("CreateFileMapping failed.");
         try {
-            pBuf = (MemoryAddress) mapViewOfFile.invokeExact((Addressable) hMapFile, 0x02, 0, 0, 1024);
-            if (pBuf.toRawLongValue() == 0) throw new IllegalStateException("CreateFileMapping failed");
+            pBuf = (MemoryAddress) mapViewOfFile.invokeExact((Addressable) hMapFile, SECTION_MAP_WRITE | SECTION_MAP_READ, 0, 0, size);
+            if (pBuf.toRawLongValue() == 0) throw new IllegalStateException("MapViewOfFile failed.");
         } catch (Throwable th) {
             closeHandle.invokeExact((Addressable) hMapFile);
             throw th;

src/test/java/cn/apisium/shm/SharedMemoryTest.java

@@ -0,0 +1,42 @@
+package cn.apisium.shm;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class SharedMemoryTest {
+    private static SharedMemory shm;
+    @BeforeAll
+    public static void init() {
+        shm = SharedMemory.create("jshm-test", 8192);
+    }
+
+    @Test
+    public void test() {
+        var buf = shm.toByteBuffer();
+        var array = "Hello, World!".getBytes();
+        buf.put(array);
+        var array2 = new byte[array.length];
+        buf.rewind();
+        buf.get(array2);
+        Assertions.assertEquals("Hello, World!", new String(array2));
+    }
+
+    @Test
+    public void testFull() {
+        var buf = shm.toByteBuffer();
+        var array = new byte[shm.size()];
+        for (int i = 0; i < shm.size(); i++) array[i] = (byte)i;
+        buf.put(array);
+        var array2 = new byte[shm.size()];
+        buf.rewind();
+        buf.get(array2);
+        Assertions.assertArrayEquals(array, array2);
+    }
+
+    @AfterAll
+    public static void close() throws Exception {
+        if (shm != null) shm.close();
+    }
+}