Improve binding of TypeLib bindings

- fix wrong function signature in ITypeLib/TypeLib for FindName/IsName and adjust callers - TypeLib#ReleaseLibAttr did not pass parameter to native method - LPOLESTR.ByReference is derived from wrong type (BSTR instead of LPOLESTR) - Fix/Add unittests
java-native-access · Feb 10, 2016 · 2d4d2c7 · 2d4d2c7
1 parent a858c42
commit 2d4d2c7
Show file tree

Hide file tree

Showing 7 changed files with 206 additions and 109 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -44,6 +44,7 @@ Bug Fixes
 * [#566](https://github.com/java-native-access/jna/pull/566): Fix return type of Native#loadLibrary to match unconstrained generic [@lgoldstein](https://github.com/lgoldstein)
 * [#584](https://github.com/java-native-access/jna/pull/584): Promote float varargs to double - [@marco2357](https://github.com/marco2357).
 * [#588](https://github.com/java-native-access/jna/pull/588): Fix varargs calls on arm - [@twall](https://github.com/twall).
+* [#593](https://github.com/java-native-access/jna/pull/593): Improve binding of TypeLib bindings - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 4.2.1
 =============

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/ITypeLib.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/ITypeLib.java
@@ -12,6 +12,7 @@
  */
 package com.sun.jna.platform.win32.COM;
 
+import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Guid.GUID;
 import com.sun.jna.platform.win32.OaIdl.MEMBERID;
 import com.sun.jna.platform.win32.OaIdl.TLIBATTR;
@@ -69,9 +70,9 @@ public HRESULT IsName(
 
     public HRESULT FindName(
     /* [annotation][out][in] */
-    BSTRByReference szNameBuf,
+    LPOLESTR szNameBuf,
     /* [in] */ULONG lHashVal,
-    /* [length_is][size_is][out] */PointerByReference ppTInfo,
+    /* [length_is][size_is][out] */Pointer[] ppTInfo,
     /* [length_is][size_is][out] */MEMBERID[] rgMemId,
     /* [out][in] */USHORTByReference pcFound);
 

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLib.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLib.java
@@ -188,8 +188,7 @@ public HRESULT GetDocumentation(
      * @return the hresult
      */
     public HRESULT IsName(
-    /* [annotation][out][in] */
-    LPOLESTR szNameBuf,
+    /* [annotation][out][in] */ LPOLESTR szNameBuf,
     /* [in] */ULONG lHashVal,
     /* [out] */BOOLByReference pfName) {
 
@@ -214,10 +213,9 @@ public HRESULT IsName(
      * @return the hresult
      */
     public HRESULT FindName(
-    /* [annotation][out][in] */
-    BSTRByReference szNameBuf,
+    /* [annotation][out][in] */ LPOLESTR szNameBuf,
     /* [in] */ULONG lHashVal,
-    /* [length_is][size_is][out] */PointerByReference ppTInfo,
+    /* [length_is][size_is][out] */Pointer[] ppTInfo,
     /* [length_is][size_is][out] */MEMBERID[] rgMemId,
     /* [out][in] */USHORTByReference pcFound) {
 
@@ -233,7 +231,7 @@ public HRESULT FindName(
      *            the t lib attr
      */
     public void ReleaseTLibAttr(/* [in] */TLIBATTR pTLibAttr) {
-        this._invokeNativeObject(12, new Object[] { this.getPointer() },
-                HRESULT.class);
+        this._invokeNativeObject(12, new Object[] { this.getPointer(), 
+            pTLibAttr.getPointer() },  HRESULT.class);
     }
 }
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLibUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLibUtil.java
@@ -12,6 +12,7 @@
  */
 package com.sun.jna.platform.win32.COM;
 
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.WString;
 import com.sun.jna.platform.win32.Guid.CLSID;
@@ -21,6 +22,7 @@
 import com.sun.jna.platform.win32.OaIdl.TYPEKIND;
 import com.sun.jna.platform.win32.Ole32;
 import com.sun.jna.platform.win32.OleAuto;
+import com.sun.jna.platform.win32.WTypes;
 import com.sun.jna.platform.win32.WTypes.BSTRByReference;
 import com.sun.jna.platform.win32.WTypes.LPOLESTR;
 import com.sun.jna.platform.win32.WinDef.BOOLByReference;
@@ -364,32 +366,29 @@ public boolean isName() {
      * @param name
      *            the name
      * @param hashVal
-     *            the hash val
-     * @param found
-     *            the found
+     *            the hash val or 0 if unknown
+     * @param maxResult
+     *            maximum number of items to search
      * @return the find name
      */
-    public FindName FindName(String name, int hashVal, short found) {
-        /* [annotation][out][in] */
-        BSTRByReference szNameBuf = new BSTRByReference(
-                OleAuto.INSTANCE.SysAllocString(name));
-        /* [in] */ULONG lHashVal = new ULONG(hashVal);
-        /* [out][in] */USHORTByReference pcFound = new USHORTByReference(found);
-
-        HRESULT hr = this.typelib.FindName(szNameBuf, lHashVal, null, null,
-                pcFound);
-        COMUtils.checkRC(hr);
+    public FindName FindName(String name, int hashVal, short maxResult) {
+        Pointer p = Ole32.INSTANCE.CoTaskMemAlloc((name.length() + 1L) * Native.WCHAR_SIZE);
+        WTypes.LPOLESTR olestr = new WTypes.LPOLESTR(p);
+        olestr.setValue(name);
 
-        found = pcFound.getValue().shortValue();
-        /* [length_is][size_is][out] */PointerByReference ppTInfo = new PointerByReference();
-        /* [length_is][size_is][out] */MEMBERID[] rgMemId = new MEMBERID[found];
-        hr = this.typelib.FindName(szNameBuf, lHashVal, ppTInfo, rgMemId,
+        ULONG lHashVal = new ULONG(hashVal);
+        USHORTByReference pcFound = new USHORTByReference(maxResult);
+
+        Pointer[] ppTInfo = new Pointer[maxResult];
+        MEMBERID[] rgMemId = new MEMBERID[maxResult];
+        HRESULT hr = this.typelib.FindName(olestr, lHashVal, ppTInfo, rgMemId,
                 pcFound);
         COMUtils.checkRC(hr);
 
-        FindName findName = new FindName(szNameBuf.getString(), ppTInfo,
-                rgMemId, found);
-        OLEAUTO.SysFreeString(szNameBuf.getValue());
+        FindName findName = new FindName(olestr.getValue(), ppTInfo,
+                rgMemId, pcFound.getValue().shortValue());
+
+        Ole32.INSTANCE.CoTaskMemFree(p);
 
         return findName;
     }
@@ -405,7 +404,7 @@ public static class FindName {
         private String nameBuf;
 
         /** The p t info. */
-        private PointerByReference pTInfo;
+        private Pointer[] pTInfo;
 
         /** The rg mem id. */
         private MEMBERID[] rgMemId;
@@ -423,12 +422,14 @@ public static class FindName {
  *            the rg mem id
          * @param pcFound
          */
-        public FindName(String nameBuf, PointerByReference pTInfo, MEMBERID[] rgMemId,
+        FindName(String nameBuf, Pointer[] pTInfo, MEMBERID[] rgMemId,
                         short pcFound) {
             this.nameBuf = nameBuf;
-            this.pTInfo = pTInfo;
-            this.rgMemId = rgMemId;
+            this.pTInfo = new Pointer[pcFound];
+            this.rgMemId = new MEMBERID[pcFound];
             this.pcFound = pcFound;
+            System.arraycopy(pTInfo, 0, this.pTInfo, 0, pcFound);
+            System.arraycopy(rgMemId, 0, this.rgMemId, 0, pcFound);
         }
 
         /**
@@ -446,12 +447,10 @@ public String getNameBuf() {
          * @return the t info
          */
         public ITypeInfo[] getTInfo() {
-
-            Pointer pVals = pTInfo.getValue();
             ITypeInfo[] values=new ITypeInfo[pcFound];
             for(int i=0;i<pcFound;i++)
             {
-                values[i]=new TypeInfo(pVals.getPointer(i*Pointer.SIZE));
+                values[i]=new TypeInfo(pTInfo[i]);
             }
             return values;
         }

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java b/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java
@@ -196,7 +196,7 @@ public String toString() {
     }
 
     public static class LPOLESTR extends PointerType {
-        public static class ByReference extends BSTR implements
+        public static class ByReference extends LPOLESTR implements
                 Structure.ByReference {
         }