Implemented support for arrays and safe arrays in VARIANT data

include/oaidl.h

@@ -7,38 +7,6 @@
 /* the following depend only on obj_base.h */
 #include "wine/obj_oleaut.h"
 
-
-/*****************************************************************
- *  SafeArray defines and structs 
- */
-
-#define FADF_AUTO       ( 0x1 )
-#define FADF_STATIC     ( 0x2 )
-#define FADF_EMBEDDED   ( 0x4 )
-#define FADF_FIXEDSIZE  ( 0x10 )
-#define FADF_BSTR       ( 0x100 )
-#define FADF_UNKNOWN    ( 0x200 )
-#define FADF_DISPATCH   ( 0x400 )
-#define FADF_VARIANT    ( 0x800 )
-#define FADF_RESERVED   ( 0xf0e8 )
-
-typedef struct  tagSAFEARRAYBOUND 
-{
-  ULONG cElements;                  /* Number of elements in dimension */
-  LONG  lLbound;                    /* Lower bound of dimension */
-} SAFEARRAYBOUND;
-
-typedef struct  tagSAFEARRAY
-{ 
-  USHORT          cDims;            /* Count of array dimension */
-  USHORT          fFeatures;        /* Flags describing the array */
-  ULONG           cbElements;       /* Size of each element */
-  ULONG           cLocks;           /* Number of lock on array */
-  PVOID           pvData;           /* Pointer to data valid when cLocks > 0 */
-  SAFEARRAYBOUND  rgsabound[ 1 ];   /* One bound for each dimension */
-} SAFEARRAY, *LPSAFEARRAY;
-
-
 typedef enum tagCALLCONV {
     CC_CDECL    = 1,
     CC_MSCPASCAL  = CC_CDECL + 1,

include/wine/obj_oleaut.h

@@ -65,6 +65,37 @@ typedef struct ISupportErrorInfo ISupportErrorInfo,*LPSUPPORTERRORINFO;
  * Automation data types
  */
 
+/*****************************************************************
+ *  SafeArray defines and structs 
+ */
+
+#define FADF_AUTO       ( 0x1 )
+#define FADF_STATIC     ( 0x2 )
+#define FADF_EMBEDDED   ( 0x4 )
+#define FADF_FIXEDSIZE  ( 0x10 )
+#define FADF_BSTR       ( 0x100 )
+#define FADF_UNKNOWN    ( 0x200 )
+#define FADF_DISPATCH   ( 0x400 )
+#define FADF_VARIANT    ( 0x800 )
+#define FADF_RESERVED   ( 0xf0e8 )
+
+typedef struct  tagSAFEARRAYBOUND 
+{
+  ULONG cElements;                  /* Number of elements in dimension */
+  LONG  lLbound;                    /* Lower bound of dimension */
+} SAFEARRAYBOUND;
+
+typedef struct  tagSAFEARRAY
+{ 
+  USHORT          cDims;            /* Count of array dimension */
+  USHORT          fFeatures;        /* Flags describing the array */
+  ULONG           cbElements;       /* Size of each element */
+  ULONG           cLocks;           /* Number of lock on array */
+  PVOID           pvData;           /* Pointer to data valid when cLocks > 0 */
+  SAFEARRAYBOUND  rgsabound[ 1 ];   /* One bound for each dimension */
+} SAFEARRAY, *LPSAFEARRAY;
+
+
 /*
  * Data types for Variants.
  */
@@ -175,8 +206,8 @@ struct tagVARIANT {
         DECIMAL decVal;
 		IUnknown* punkVal;
 		IDispatch* pdispVal;
-        SAFEARRAY* parray;
         */
+	        SAFEARRAY* parray;
 
 		/* By reference
 		 */
@@ -201,8 +232,8 @@ struct tagVARIANT {
         DECIMAL* pdecVal;
 		IUnknown** ppunkVal;
 		IDispatch** ppdispVal;
-        SAFEARRAY** pparray;
         */
+	        SAFEARRAY** pparray;
   } _wine_tagVARIANT_UNION_NAME;
 };
 

ole/safearray.c

@@ -387,6 +387,13 @@ HRESULT WINAPI SafeArrayGetLBound(
 UINT WINAPI SafeArrayGetDim(
   SAFEARRAY * psa)
 { 
+  /*
+   * A quick test in Windows shows that the behavior here for an invalid
+   * pointer is to return 0.
+   */
+  if(! validArg(psa)) 
+    return 0;
+
   return psa->cDims;
 }
 
@@ -396,6 +403,13 @@ UINT WINAPI SafeArrayGetDim(
 UINT WINAPI SafeArrayGetElemsize(
   SAFEARRAY * psa)
 { 
+  /*
+   * A quick test in Windows shows that the behavior here for an invalid
+   * pointer is to return 0.
+   */
+  if(! validArg(psa)) 
+    return 0;
+
   return psa->cbElements;
 }
 
@@ -728,6 +742,12 @@ static BOOL validArg(
   LONG descSize = 0;
   LONG fullSize = 0;
 
+  /*
+   * Let's check for the null pointer just in case.
+   */
+  if (psa == NULL)
+    return FALSE;
+
   /* Check whether the size of the chunk make sens... That's the only thing
      I can think of now... */