Changeset 31711 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 16, 2010 4:32:16 PM (14 years ago)

Author:

vboxsync

Message:

Java glue: update, MSCOM compiles again

File:

• trunk/src/VBox/Main/glue/glue-java.xsl (modified) (14 diffs)

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -295 +295 @@
     <xsl:when test="($G_vboxGlueStyle='xpcom')">
       <xsl:choose>
-        <xsl:when test="$type='unsigned long long'">
-          <!-- stupid, rewrite the bridge -->
-          <xsl:value-of select="'double'" />
-        </xsl:when>
-
         <xsl:when test="$type='long long'">
           <xsl:value-of select="'long'" />
@@ -391 +386 @@
         <xsl:when test="//enum[@name=$type]">
           <xsl:value-of select="concat($G_virtualBoxPackageCom, '.', $type)" />
-        </xsl:when>
-
-        <xsl:when test="$type='unsigned long long'">
-          <xsl:value-of select="'BigInteger'" />
         </xsl:when>
 
@@ -553 +544 @@
         </xsl:call-template>
       </xsl:variable>
-      <xsl:value-of select="concat('Helper.wrap(', $elemgluetype, '.class, ', $value,'.toSafeArray())')"/>
+      <xsl:choose>
+        <xsl:when test="($idltype='octet')">
+          <xsl:value-of select="concat('Helper.wrapBytes(', $value, '.toSafeArray())')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat('Helper.wrap(', $elemgluetype, '.class, ', $value,'.toSafeArray())')"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:when>
 
@@ -599 +597 @@
     <xsl:when test="$idltype='long long'">
       <xsl:value-of select="concat($value,'.getLong()')"/>
-    </xsl:when>
-
-    <xsl:when test="$idltype='unsigned long long'">
-      <xsl:value-of select="concat('Helper.longToBigInteger(',$value,'.getLong())')"/>
     </xsl:when>
 
@@ -817 +811 @@
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$idltype='unsigned long long'">
-      <xsl:value-of select="concat('Helper.bigIntegerToDouble(', $value,')')"/>
     </xsl:when>
 
@@ -1957 +1947 @@
   </xsl:call-template>
 
-   <xsl:text>import java.math.BigInteger;&#10;</xsl:text>
    <xsl:text>import java.util.List;&#10;</xsl:text>
 
@@ -2008 +1997 @@
   </xsl:call-template>
 
-  <xsl:text>import java.math.BigInteger;&#10;</xsl:text>
   <xsl:text>import java.util.List;&#10;</xsl:text>
 
@@ -2032 +2020 @@
   </xsl:call-template>
 
-  <xsl:text>import java.math.BigInteger;&#10;</xsl:text>
   <xsl:text>import java.util.List;&#10;</xsl:text>
 
@@ -2202 +2189 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
 
 public class Helper {
@@ -2280 +2266 @@
     }
 
-    public static List<BigInteger> wrapUnsignedLongLong(double vals[]) {
-        List<BigInteger> ret = new ArrayList<BigInteger>(vals.length);
-        for (double v : vals) {
-                ret.add(doubleToBigInteger(v));
-        }
-        return ret;
-    }
-
-
     public static short[] unwrap(List<Short> vals) {
         if (vals==null)
@@ -2433 +2410 @@
         return ret;
     }
-
-    /* We do loose precision here */
-    public static BigInteger doubleToBigInteger(double val) {
-        return new BigInteger(Long.toString((long)val));
-    }
-    public static double bigIntegerToDouble(BigInteger val) {
-        return val.doubleValue();
-    }
 }
 ]]></xsl:text>
@@ -2702 +2671 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
 import com.jacob.com.*;
 
@@ -2798 +2766 @@
     }
 
+    public static byte[] wrapBytes(SafeArray sa) {
+        if (sa==null)  return null;
+
+        int saLen = sa.getUBound() - sa.getLBound() + 1;
+
+        byte[] ret = new byte[saLen];
+        int j = 0;
+        for (int i = sa.getLBound(); i <= sa.getUBound(); i++)
+        {
+           Variant v = sa.getVariant(i);
+           // come upo with more effective approach!!!
+           ret[j++] = v.getByte();
+        }
+        return ret;
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> List<T> wrap(Class<T> wrapperClass, SafeArray sa) {
@@ -2943 +2927 @@
         return ret;
     }
-
-    public static BigInteger longToBigInteger(long value) {
-         return BigInteger.valueOf(value);
-    }
-
+   
     /* We have very long invoke lists sometimes */
     public static Variant invoke(Dispatch d, String method, Object ... args)