Removed unused native items

Author: jonatino

build.gradle

@@ -2,15 +2,23 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group = 'com.beaudoin.jmm'
-version = '1.3'
+version = '1.4'
 
 repositories {
     mavenCentral()
 
     maven { url "https://jitpack.io" }
+
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+
 }
 
 dependencies {
-    compile "net.java.dev.jna:jna-platform:4.2.2"
     compile "net.openhft:zero-allocation-hashing:0.6"
+    compile "net.java.dev.jna:jna:$jna_version"
+    compile "net.java.dev.jna:jna-platform:$jna_version"
+}
+
+buildscript {
+    ext.jna_version = '4.3.0-SNAPSHOT'
 }

src/main/java/com/beaudoin/jmm/natives/unix/unix.java

@@ -26,7 +26,6 @@
 
 import com.sun.jna.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -49,7 +48,7 @@ public static class iovec extends Structure {
 
 		@Override
 		protected List<String> getFieldOrder() {
-			return Arrays.asList("iov_base", "iov_len");
+			return createFieldsOrder("iov_base", "iov_len");
 		}
 
 	}

src/main/java/com/beaudoin/jmm/natives/win32/Kernel32.java

@@ -28,14 +28,9 @@
 import com.sun.jna.Native;
 import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
-import com.sun.jna.Structure;
 import com.sun.jna.platform.win32.Tlhelp32;
-import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.win32.W32APIOptions;
 
-import java.util.Arrays;
-import java.util.List;
-
 public final class Kernel32 {
 
 	static {
@@ -50,115 +45,10 @@ public final class Kernel32 {
 
 	public static native boolean Process32Next(Pointer pointer, Tlhelp32.PROCESSENTRY32 entry);
 
-	public static native boolean Module32NextW(Pointer pointer, Kernel32.MODULEENTRY32W entry);
+	public static native boolean Module32NextW(Pointer pointer, Tlhelp32.MODULEENTRY32W entry);
 
 	public static native long ReadProcessMemory(Pointer process, Pointer address, MemoryBuffer memory, int size, int written);
 
 	public static native long WriteProcessMemory(Pointer process, Pointer address, MemoryBuffer memory, int size, int written);
 
-	/**
-	 * Describes an entry from a list of the modules belonging to the specified
-	 * process.
-	 *
-	 * @see <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms684225(v=vs.85).aspx">MSDN</a>
-	 */
-	public static class MODULEENTRY32W extends Structure {
-
-		public static final int MAX_MODULE_NAME32 = 255;
-
-		/**
-		 * A representation of a MODULEENTRY32 structure as a reference
-		 */
-		public static class ByReference extends MODULEENTRY32W implements Structure.ByReference {
-			public ByReference() {
-			}
-
-			public ByReference(Pointer memory) {
-				super(memory);
-			}
-		}
-
-		/**
-		 * The size of the structure, in bytes. Before calling the Module32First
-		 * function, set this member to sizeof(MODULEENTRY32). If you do not
-		 * initialize dwSize, Module32First fails.
-		 */
-		public WinDef.DWORD dwSize;
-
-		/**
-		 * This member is no longer used, and is always set to one.
-		 */
-		public WinDef.DWORD th32ModuleID;
-
-		/**
-		 * The identifier of the process whose modules are to be examined.
-		 */
-		public WinDef.DWORD th32ProcessID;
-
-		/**
-		 * The load count of the module, which is not generally meaningful, and
-		 * usually equal to 0xFFFF.
-		 */
-		public WinDef.DWORD GlblcntUsage;
-
-		/**
-		 * The load count of the module (same as GlblcntUsage), which is not
-		 * generally meaningful, and usually equal to 0xFFFF.
-		 */
-		public WinDef.DWORD ProccntUsage;
-
-		/**
-		 * The base address of the module in the context of the owning process.
-		 */
-		public Pointer modBaseAddr;
-
-		/**
-		 * The size of the module, in bytes.
-		 */
-		public WinDef.DWORD modBaseSize;
-
-		/**
-		 * A handle to the module in the context of the owning process.
-		 */
-		public WinDef.HMODULE hModule;
-
-		/**
-		 * The module name.
-		 */
-		public char[] szModule = new char[MAX_MODULE_NAME32 + 1];
-
-		/**
-		 * The module path.
-		 */
-		public char[] szExePath = new char[com.sun.jna.platform.win32.Kernel32.MAX_PATH];
-
-		public MODULEENTRY32W() {
-			dwSize = new WinDef.DWORD(size());
-		}
-
-		public MODULEENTRY32W(Pointer memory) {
-			super(memory);
-			read();
-		}
-
-		/**
-		 * @return The module name.
-		 */
-		public String szModule() {
-			return Native.toString(this.szModule);
-		}
-
-		/**
-		 * @return The module path.
-		 */
-		public String szExePath() {
-			return Native.toString(this.szExePath);
-		}
-
-		@Override
-		protected List<String> getFieldOrder() {
-			return Arrays.asList("dwSize", "th32ModuleID", "th32ProcessID", "GlblcntUsage", "ProccntUsage", "modBaseAddr", "modBaseSize", "hModule", "szModule", "szExePath");
-		}
-	}
-
 }