fix #128, use 16-bit mask for upper/lower parts of DWORD

twall · twall · commit 245eb88b40f4 · 2012-10-06T00:49:17.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -20,6 +20,7 @@ Bug Fixes
 * Cleanup maven poms and publishing to central repo - [@bhamail](https://github.com/bhamail).
 * [#129](https://github.com/twall/jna/issues/129): Allow `Memory` field in structure - [@twall](https://github.com/twall).
 * Preserve `PointerType` fields on `Structure.read()` if unchanged - [@twall](https://github.com/twall).
+* [#128](https://github.com/twall/jna/issues/128): Fix masking extracting DWORD upper and lower WORD values - [@twall](https://github.com/twall).
 
 Release 3.4.2
 =============
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java b/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java
@@ -65,7 +65,7 @@ public DWORD(long value) {
          *  Low WORD.
          */
         public WORD getLow() {
-            return new WORD(longValue() & 0xFF);
+            return new WORD(longValue() & 0xFFFF);
         }
 				
         /**
@@ -74,7 +74,7 @@ public WORD getLow() {
          *  High WORD.
          */
         public WORD getHigh() {
-            return new WORD((longValue() >> 16) & 0xFF);
+            return new WORD((longValue() >> 16) & 0xFFFF);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public DWORD(long value) {`
`65`	`65`	`* Low WORD.`
`66`	`66`	`*/`
`67`	`67`	`public WORD getLow() {`
`68`		`- return new WORD(longValue() & 0xFF);`
	`68`	`+ return new WORD(longValue() & 0xFFFF);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`@@ -74,7 +74,7 @@ public WORD getLow() {`
`74`	`74`	`* High WORD.`
`75`	`75`	`*/`
`76`	`76`	`public WORD getHigh() {`
`77`		`- return new WORD((longValue() >> 16) & 0xFF);`
	`77`	`+ return new WORD((longValue() >> 16) & 0xFFFF);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`