Fix for free data handle in DdemlUtil.

stolarczykt · matthiasblaesing · commit 9ce9fc80af66 · 2017-02-16T21:03:15.000+01:00
Adding additional comment for DdeAccessData binding.
diff --git a/CHANGES.md b/CHANGES.md
@@ -14,6 +14,7 @@ Bug Fixes
 * [#754](https://github.com/java-native-access/jna/issues/754): Move MSVC build to standard stdbool.h and require Visual C++ 2015 (sizeof(bool) = 1 is now also true on MSVC build) - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#399](https://github.com/java-native-access/jna/issues/399): Check native version before attempting to call into native code - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#763](https://github.com/java-native-access/jna/issues/763): Fix vararg calls without fixed parts - [@matthiasblaesing](https://github.com/matthiasblaesing).
+* [#770](https://github.com/java-native-access/jna/pull/770): Fix for free data handle in DdemlUtil. - [@stolarczykt](https://github.com/stolarczykt).
 
 Release 4.3.0
 =============
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Ddeml.java b/contrib/platform/src/com/sun/jna/platform/win32/Ddeml.java
@@ -2561,6 +2561,7 @@ public HDDEDATA DdeCreateDataHandle(
     public int DdeGetData(HDDEDATA hData, Pointer pDst, int cbMax, int cbOff);
 
     /**
+     * Provides access to the data in the specified Dynamic Data Exchange (DDE) object.
      * An application must call the DdeUnaccessData function when it has
      * finished accessing the data in the object.
      *
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/DdemlUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/DdemlUtil.java
@@ -731,7 +731,7 @@ public Ddeml.HDDEDATA createDataHandle(Pointer pSrc, int cb, int cbOff, Ddeml.HS
         }
 
         public void freeDataHandle(Ddeml.HDDEDATA hData) {
-            boolean result = Ddeml.INSTANCE.DdeUnaccessData(hData);
+            boolean result = Ddeml.INSTANCE.DdeFreeDataHandle(hData);
             if(! result) {
                 throw DdemlException.create(getLastError());
             }

Original file line number	Diff line number	Diff line change
`@@ -2561,6 +2561,7 @@ public HDDEDATA DdeCreateDataHandle(`
`2561`	`2561`	`public int DdeGetData(HDDEDATA hData, Pointer pDst, int cbMax, int cbOff);`
`2562`	`2562`
`2563`	`2563`	`/**`
	`2564`	`+ * Provides access to the data in the specified Dynamic Data Exchange (DDE) object.`
`2564`	`2565`	`* An application must call the DdeUnaccessData function when it has`
`2565`	`2566`	`* finished accessing the data in the object.`
`2566`	`2567`	`*`
Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ public Ddeml.HDDEDATA createDataHandle(Pointer pSrc, int cb, int cbOff, Ddeml.HS`
`731`	`731`	`}`
`732`	`732`
`733`	`733`	`public void freeDataHandle(Ddeml.HDDEDATA hData) {`
`734`		`- boolean result = Ddeml.INSTANCE.DdeUnaccessData(hData);`
	`734`	`+ boolean result = Ddeml.INSTANCE.DdeFreeDataHandle(hData);`
`735`	`735`	`if(! result) {`
`736`	`736`	`throw DdemlException.create(getLastError());`
`737`	`737`	`}`