Fix variant constructors, add a test that makes sure they now longer throw immediately

Lauri W Ahonen · dblock · commit e94f781198ce · 2015-03-16T10:33:00.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -45,6 +45,7 @@ Bug Fixes
 * Fix publish doc links - [@bhamail](https://github.com/bhamail).
 * [#388](https://github.com/twall/jna/issues/388): Ensure native library always opened with provided flags - [@zolyfarkas](https://github.com/zolyfarkas).  
 * [#403](https://github.com/twall/jna/pull/403): Fix `com.sun.jna.platform.win32.COM.COMUtils.SUCCEEDED` and `FAILED` - [@lwahonen](https://github.com/lwahonen).
+* [#404](https://github.com/twall/jna/pull/404): Fix `VARIANT` constructors for `int`, `short`, and `long` - [@lwahonen](https://github.com/lwahonen).
 
 Release 4.1
 ===========
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Variant.java b/contrib/platform/src/com/sun/jna/platform/win32/Variant.java
@@ -116,6 +116,32 @@ public static class VARIANT extends Union {
 
         public static class ByReference extends VARIANT implements
                 Structure.ByReference {
+            public ByReference(VARIANT variant) {
+                setValue(variant.getVarType(), variant.getValue());
+            }
+
+            public ByReference(Pointer variant) {
+                super(variant);
+            }
+
+            public ByReference() {
+                super();
+            }
+        }
+
+        public static class ByValue extends VARIANT implements
+                Structure.ByValue {
+            public ByValue(VARIANT variant) {
+                setValue(variant.getVarType(), variant.getValue());
+            }
+
+            public ByValue(Pointer variant) {
+                super(variant);
+            }
+
+            public ByValue() {
+                super();
+            }
         }
 
         public _VARIANT _variant;
@@ -170,17 +196,17 @@ public VARIANT(DATE value) {
 
         public VARIANT(short value) {
             this();
-            this.setValue(VT_I2, value);
+            this.setValue(VT_I2, new SHORT(value));
         }
 
         public VARIANT(int value) {
             this();
-            this.setValue(VT_I4, value);
+            this.setValue(VT_I4, new LONG(value));
         }
 
         public VARIANT(long value) {
             this();
-            this.setValue(VT_I8, value);
+            this.setValue(VT_I8, new LONGLONG(value));
         }
 
         public VARIANT(float value) {
diff --git a/contrib/platform/test/com/sun/jna/platform/win32/VariantTest.java b/contrib/platform/test/com/sun/jna/platform/win32/VariantTest.java
@@ -10,6 +10,8 @@
 import com.sun.jna.platform.win32.WinNT.HRESULT;
 import com.sun.jna.ptr.DoubleByReference;
 
+import java.util.Date;
+
 public class VariantTest extends TestCase {
 
     public static void main(String[] args) {
@@ -56,15 +58,25 @@ public void testVariantDate() {
 
         VARIANT variantDate = new VARIANT(new DATE(pvtime.getValue()));
     }
-    
+
     public void testVariantRecord() {
-        VARIANT._VARIANT.__VARIANT.BRECORD pvRecord = new VARIANT._VARIANT.__VARIANT.BRECORD(); 
+        VARIANT._VARIANT.__VARIANT.BRECORD pvRecord = new VARIANT._VARIANT.__VARIANT.BRECORD();
         VARIANT._VARIANT.__VARIANT.BRECORD pvRecord2;
-        
+
         VARIANT variant = new VARIANT();
         variant.setValue(Variant.VT_RECORD, pvRecord);
-        
+
         pvRecord2 = (VARIANT._VARIANT.__VARIANT.BRECORD)variant.getValue();
     }
-    
+
+    public void testVariantConstructors() {
+        VARIANT variant = new VARIANT((short) 1);
+        variant = new VARIANT((int) 1);
+        variant = new VARIANT((long) 1);
+        variant = new VARIANT((float) 1);
+        variant = new VARIANT((double) 1);
+        variant = new VARIANT("1");
+        variant = new VARIANT(true);
+        variant = new VARIANT(new Date());
+    }
 }
