Load DLLs independent of java.library.path

manuelbl · manuelbl · commit 1715a715c387 · 2026-01-18T23:20:43.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -53,7 +53,7 @@ jobs:
         echo "JAVA_HOME=$JAVA_HOME_25_X64" >> "$GITHUB_ENV"
         echo "$JAVA_HOME_25_X64/bin" >> "$GITHUB_PATH"
     - name: Generate full Windows API
-      run: java --class-path windowsapi-code-generator/target/test-classes:windowsapi-code-generator/target/code-generator-0.8.3.jar net.codecrete.windowsapi.special.FullBuild integration-tests/full-build/src/main/java
+      run: java -Djava.library.path=C:/Users --class-path windowsapi-code-generator/target/test-classes:windowsapi-code-generator/target/code-generator-0.8.4-SNAPSHOT.jar net.codecrete.windowsapi.special.FullBuild integration-tests/full-build/src/main/java
     - name: Build full Windows API
       run: mvn package
       working-directory: ./integration-tests/full-build
diff --git a/examples/enum_windows/app/build.gradle.kts b/examples/enum_windows/app/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
     alias(libs.plugins.kotlin.jvm) version "2.3.0"
 
-    id("net.codecrete.windows-api") version "0.8.3"
+    id("net.codecrete.windows-api") version "0.8.4-SNAPSHOT"
 
     // Java support
     java
diff --git a/examples/medium_story/build.gradle b/examples/medium_story/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id "net.codecrete.windows-api" version "0.8.3"
+    id "net.codecrete.windows-api" version "0.8.4-SNAPSHOT"
 }
 
 group = 'org.example'
diff --git a/examples/messagebox/pom.xml b/examples/messagebox/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>messagebox-example</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>messagebox</name>
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>net.codecrete.windows-api</groupId>
         <artifactId>windowsapi-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.4-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/examples/registry/app/build.gradle b/examples/registry/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'application'
 
-    id "net.codecrete.windows-api" version "0.8.3"
+    id "net.codecrete.windows-api" version "0.8.4-SNAPSHOT"
 }
 
 repositories {
diff --git a/examples/taskbar/pom.xml b/examples/taskbar/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>net.codecrete.windows-api</groupId>
         <artifactId>windowsapi-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.4-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/examples/user_notification_java/pom.xml b/examples/user_notification_java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>user_notification</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>user_notification</name>
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>net.codecrete.windows-api</groupId>
         <artifactId>windowsapi-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.4-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/examples/user_notification_kotlin/pom.xml b/examples/user_notification_kotlin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>user_notification</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>user_notification</name>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>net.codecrete.windows-api</groupId>
         <artifactId>windowsapi-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.4-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/integration-tests/full-build/pom.xml b/integration-tests/full-build/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>full-build</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
 
   <packaging>jar</packaging>
   <name>full-build</name>
diff --git a/integration-tests/windows-api-tests/pom.xml b/integration-tests/windows-api-tests/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>windows-api-tests</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Windows API Tests</name>
@@ -61,7 +61,7 @@
       <plugin>
         <groupId>net.codecrete.windows-api</groupId>
         <artifactId>windowsapi-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.4-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
diff --git a/windowsapi-code-generator/pom.xml b/windowsapi-code-generator/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>code-generator</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.3-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.release>21</maven.compiler.release>
diff --git a/windowsapi-code-generator/src/main/java/net/codecrete/windowsapi/writer/FunctionCodeWriter.java b/windowsapi-code-generator/src/main/java/net/codecrete/windowsapi/writer/FunctionCodeWriter.java
@@ -60,15 +60,18 @@ public class Apis {
                 
                 """);
 
-        writer.println("    static {");
+        writer.print("""
+                static {
+                    var libraryPath = System.getenv("WINDIR") + "\\\\SYSTEM32\\\\";
+            """);
         functions.stream().map(Method::dll).filter(Objects::nonNull).distinct().sorted().forEach(dll ->
                 writer.printf("""
-                                System.loadLibrary("%s");
-                        """, dllName(dll)));
+                            System.load(libraryPath + "%s.dll");
+                    """, dllName(dll)));
         writer.print("""
-                    }
-                
-                """);
+                }
+            
+            """);
 
         boolean usesLastError = anyFunctionUsesLastError(functions);
 
diff --git a/windowsapi-gradle-plugin/windowsapi-gradle-plugin/build.gradle.kts b/windowsapi-gradle-plugin/windowsapi-gradle-plugin/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "net.codecrete.windows-api"
-version = "0.8.3"
+version = "0.8.4-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    implementation("net.codecrete.windows-api:code-generator:0.8.3")
+    implementation("net.codecrete.windows-api:code-generator:0.8.4-SNAPSHOT")
 }
 
 testing {
diff --git a/windowsapi-maven-plugin/pom.xml b/windowsapi-maven-plugin/pom.xml
@@ -5,15 +5,15 @@
 
   <groupId>net.codecrete.windows-api</groupId>
   <artifactId>windowsapi-maven-plugin</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.release>21</maven.compiler.release>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <code-generator.version>0.8.3</code-generator.version>
+    <code-generator.version>0.8.4-SNAPSHOT</code-generator.version>
 
     <assertj.version>3.27.3</assertj.version>
     <junit.version>5.12.0</junit.version>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'java'`
`3`		`- id "net.codecrete.windows-api" version "0.8.3"`
	`3`	`+ id "net.codecrete.windows-api" version "0.8.4-SNAPSHOT"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`group = 'org.example'`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'application'`
`3`	`3`
`4`		`- id "net.codecrete.windows-api" version "0.8.3"`
	`4`	`+ id "net.codecrete.windows-api" version "0.8.4-SNAPSHOT"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`repositories {`