Cleanup (Windows)

Author: manuelbl

java-does-usb/jextract/windows/gen_win.cmd

@@ -12,12 +12,10 @@ call %JEXTRACT% --source --output ../../src/main/java ^
   --include-function GetModuleHandleW ^
   --include-function FormatMessageW ^
   --include-function LocalFree ^
-  --include-constant ERROR_SUCCESS ^
   --include-constant ERROR_NO_MORE_ITEMS ^
   --include-constant ERROR_MORE_DATA ^
   --include-constant ERROR_INSUFFICIENT_BUFFER ^
   --include-constant ERROR_FILE_NOT_FOUND ^
-  --include-constant ERROR_SEM_TIMEOUT ^
   --include-constant ERROR_GEN_FAILURE ^
   --include-constant ERROR_NOT_FOUND ^
   --include-constant ERROR_IO_PENDING ^
@@ -65,13 +63,6 @@ call %JEXTRACT% --source --output ../../src/main/java ^
   --include-constant DIREG_DEV ^
   windows_headers.h
 
-call %JEXTRACT% --source --output ../../src/main/java ^
-  -D _AMD64_ -D _M_AMD64=100 -D UNICODE -D _UNICODE ^
-  --header-class-name StdLib ^
-  --target-package net.codecrete.usb.windows.gen.stdlib ^
-  --include-function wcslen ^
-  windows_headers.h
-
 call %JEXTRACT% --source --output ../../src/main/java ^
   -D _AMD64_ -D _M_AMD64=100 -D UNICODE -D _UNICODE ^
   -I "%SDK_DIR%\um" ^

java-does-usb/jextract/windows/windows_headers.h

@@ -1,6 +1,5 @@
 #include <windows.h>
 #include <setupapi.h>
-#include <string.h>
 #include <usbioctl.h>
 #include <winusb.h>
 #include <dbt.h>

java-does-usb/src/main/java/net/codecrete/usb/linux/USBDevFS.java

@@ -12,16 +12,12 @@
  */
 public class USBDevFS {
 
-    public static final long CONTROL = 0xc0185500L;
-    public static final long BULK = 0xc0185502L;
     public static final long CLAIMINTERFACE = 0x8004550FL;
     public static final long RELEASEINTERFACE = 0x80045510L;
     public static final long SETINTERFACE = 0x80085504L;
     public static final long CLEAR_HALT = 0x80045515L;
     public static final long SUBMITURB = 0x8038550AL;
     public static final long DISCARDURB = 0x550BL;
-    public static final long REAPURB = 0x4008550CL;
     public static final long REAPURBNDELAY = 0x4008550DL;
-    public static final long RESETEP = 0x80045503L;
 
 }

java-does-usb/src/main/java/net/codecrete/usb/windows/Win.java

@@ -8,7 +8,6 @@
 package net.codecrete.usb.windows;
 
 import net.codecrete.usb.windows.gen.kernel32.GUID;
-import net.codecrete.usb.windows.gen.stdlib.StdLib;
 
 import java.lang.foreign.*;
 import java.lang.invoke.VarHandle;
@@ -85,8 +84,12 @@ public static MemorySegment createSegmentFromString(String str, Arena arena) {
      * @return copied string
      */
     public static String createStringFromSegment(MemorySegment segment) {
-        long strLen = StdLib.wcslen(segment);
-        return new String(segment.asSlice(0, 2L * strLen).toArray(JAVA_CHAR));
+        int len = 0;
+        while (segment.get(JAVA_CHAR, len) != 0) {
+            len += 2;
+        }
+
+        return new String(segment.asSlice(0, len).toArray(JAVA_CHAR));
     }
 
     /**

java-does-usb/src/main/java/net/codecrete/usb/windows/gen/kernel32/Kernel32.java

@@ -176,14 +176,6 @@ public static int GENERIC_WRITE() {
     public static int INFINITE() {
         return (int)4294967295L;
     }
-    /**
-     * {@snippet :
-     * #define ERROR_SUCCESS 0
-     * }
-     */
-    public static int ERROR_SUCCESS() {
-        return (int)0L;
-    }
     /**
      * {@snippet :
      * #define ERROR_FILE_NOT_FOUND 2
@@ -200,14 +192,6 @@ public static int ERROR_FILE_NOT_FOUND() {
     public static int ERROR_GEN_FAILURE() {
         return (int)31L;
     }
-    /**
-     * {@snippet :
-     * #define ERROR_SEM_TIMEOUT 121
-     * }
-     */
-    public static int ERROR_SEM_TIMEOUT() {
-        return (int)121L;
-    }
     /**
      * {@snippet :
      * #define ERROR_INSUFFICIENT_BUFFER 122