Fixed inheritance of LPVOID and simplified access to CoTaskMem*

java-native-access · May 25, 2014 · e52c425 · twall · Jun 1, 2014 · e52c425
1 parent a0eaa3f
commit e52c425
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java b/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java
@@ -230,7 +230,7 @@ HRESULT CoCreateInstance(GUID rclsid, Pointer pUnkOuter, int dwClsContext,
 	 * @param cb The size of the memory block to be allocated, in bytes.
 	 * @return If the function succeeds, it returns the allocated memory block. Otherwise, it returns NULL.
 	 */
-    LPVOID CoTaskMemAlloc(SIZE_T cb);
+    Pointer CoTaskMemAlloc(long cb);
 
     /**
 	 * Changes the size of a previously allocated block of task memory. This function changes the size of a previously
@@ -256,7 +256,7 @@ HRESULT CoCreateInstance(GUID rclsid, Pointer pUnkOuter, int dwClsContext,
 	 * @param cb The size of the memory block to be reallocated, in bytes. This parameter can be 0.
 	 * @return If the function succeeds, it returns the reallocated memory block. Otherwise, it returns NULL.
 	 */
-    LPVOID CoTaskMemRealloc(LPVOID pv, SIZE_T cb);
+    Pointer CoTaskMemRealloc(Pointer pv, long cb);
 
     /**
 	 * Frees a block of task memory previously allocated through a call to the {@link #CoTaskMemAlloc} or
@@ -265,6 +265,6 @@ HRESULT CoCreateInstance(GUID rclsid, Pointer pUnkOuter, int dwClsContext,
 	 * pointed to by pv is invalid and can no longer be used.
 	 * @param pv A pointer to the memory block to be freed. If this parameter is NULL, the function has no effect.
 	 */
-    void CoTaskMemFree(LPVOID pv);
+    void CoTaskMemFree(Pointer pv);
 
 }
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java
@@ -84,7 +84,7 @@ public static String getKnownFolderPath(GUID guid) throws Win32Exception
         }
 
         String result = outPath.getValue().getWideString(0);
-        Ole32.INSTANCE.CoTaskMemFree(new LPVOID(outPath.getPointer().getLong(0)));
+        Ole32.INSTANCE.CoTaskMemFree(outPath.getValue());
 
         return result;
     }

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java b/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java
@@ -978,7 +978,7 @@ public ATOM(long value) {
     public static class PVOID extends PointerType {
 
         public PVOID() {
-            // TODO Auto-generated constructor stub
+            super();
         }
 
         /**
@@ -992,25 +992,23 @@ public PVOID(Pointer pointer) {
     }
 
     /**
-     * Message parameter.
+     * LPVOID is simply a Windows API typedef for void* - to pointer to any type so to speak.
      */
-    public static class LPVOID extends LONG_PTR {
+    public static class LPVOID extends PointerType {
 
         /**
-         * Instantiates a new lpvoid.
+         * Instantiates a new instance to NULL.
          */
         public LPVOID() {
-            this(0);
+            super();
         }
 
         /**
-         * Instantiates a new lpvoid.
-         *
-         * @param value
-         *            the value
+         * Instantiates a new instance using a given pointer.
+         * @param p the pointer
          */
-        public LPVOID(long value) {
-            super(value);
+        public LPVOID(Pointer p) {
+            super(p);
         }
     }
 

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java
@@ -110,21 +110,21 @@ public final void testCLSIDFromProgID() {
 	}
 
     public void testCoTaskMemAlloc() {
-        LPVOID ptr = Ole32.INSTANCE.CoTaskMemAlloc(new SIZE_T(256));
+        Pointer ptr = Ole32.INSTANCE.CoTaskMemAlloc(256);
 
-        assertTrue(ptr.longValue() != 0);
+        assertTrue(!ptr.equals(Pointer.NULL));
 
         Ole32.INSTANCE.CoTaskMemFree(ptr);
     }
 
     public void testCoTaskMemRealloc() {
-        LPVOID ptr = Ole32.INSTANCE.CoTaskMemAlloc(new SIZE_T(256));
+        Pointer ptr = Ole32.INSTANCE.CoTaskMemAlloc(256);
 
-        assertTrue(ptr.longValue() != 0);
+        assertTrue(!ptr.equals(Pointer.NULL));
 
-        ptr = Ole32.INSTANCE.CoTaskMemRealloc(ptr, new SIZE_T(128));
+        ptr = Ole32.INSTANCE.CoTaskMemRealloc(ptr, 128);
 
-        assertTrue(ptr.longValue() != 0);
+        assertTrue(!ptr.equals(Pointer.NULL));
 
         Ole32.INSTANCE.CoTaskMemFree(ptr);
     }

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java
@@ -139,7 +139,7 @@ public void testSHGetKnownFolderPath()
         GUID guid = KnownFolders.FOLDERID_Fonts;
         HRESULT hr = Shell32.INSTANCE.SHGetKnownFolderPath(guid, flags, token, outPath);
 
-        Ole32.INSTANCE.CoTaskMemFree(new LPVOID(outPath.getPointer().getLong(0)));
+        Ole32.INSTANCE.CoTaskMemFree(outPath.getValue());
 
         assertTrue(W32Errors.SUCCEEDED(hr.intValue()));
     }