Changeset 7916 for trunk/src/oleaut32/safearray.c

Timestamp:

Feb 15, 2002, 4:07:41 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync + added extended logging

File:

• trunk/src/oleaut32/safearray.c (modified) (10 diffs)

trunk/src/oleaut32/safearray.c

@@ -21 +21 @@
 #define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))
 
-/* Localy used methods */
+/* Locally used methods */
 static INT  
 endOfDim(LONG *coor, SAFEARRAYBOUND *mat, LONG dim, LONG realDim);
@@ -102 +102 @@
 };
 
-static const int LAST_VARTYPE = sizeof(VARTYPE_SIZE)/sizeof(ULONG);
+static const int LAST_VARTYPE = sizeof(VARTYPE_SIZE)/sizeof(VARTYPE_SIZE[0]);
 
 
@@ -128 +128 @@
 
   return(S_OK);
+}
+
+/*************************************************************************
+ *              SafeArrayAllocDescriptorEx (OLEAUT32.429)
+ * Allocate the appropriate amount of memory for the SafeArray descriptor
+ *
+ * This is a minimal implementation just to get things moving.
+ *
+ * The MSDN documentation on this doesn't tell us much.
+ */
+HRESULT WINAPI SafeArrayAllocDescriptorEx( 
+  VARTYPE vt,
+  UINT    cDims, 
+  SAFEARRAY **ppsaOut) 
+{
+  if ( (vt >= LAST_VARTYPE) ||
+       ( VARTYPE_SIZE[vt] == VARTYPE_NOT_SUPPORTED ) )
+    return E_UNEXPECTED;
+
+  return SafeArrayAllocDescriptor (cDims, ppsaOut);
 }
 
@@ -357 +377 @@
     }
     else if( psa->fFeatures == FADF_VARIANT) {
-      HRESULT hr = VariantCopy(pv, elementStorageAddress);
+      HRESULT hr;
+      VariantInit(pv);
+      hr = VariantCopy(pv, elementStorageAddress);
       if (FAILED(hr)) {
         SafeArrayUnlock(psa);
@@ -514 +536 @@
   if(! validCoordinate(rgIndices, psa)) 
     return DISP_E_BADINDEX;
+
+  /* Although it is dangerous to do this without having a lock, it is not
+   * illegal.  Microsoft do warn of the danger.
+   */
 
   /* Figure out the number of items to skip */
@@ -786 +812 @@
     lDelta *= psa->rgsabound[cDims].cElements;
 
+  TRACE("elements=%ld, Lbound=%ld (delta=%ld)\n", psaboundNew->cElements, psaboundNew->lLbound, lDelta);
+
   if (lDelta == 0) { ;/* same size, maybe a change of lLbound, just set it */
 
@@ -883 +911 @@
        releasing to the system the unused memory */
 
-    if((pvNewBlock = HeapReAlloc(GetProcessHeap(), 0, psa->pvData, 
+    if((pvNewBlock = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, psa->pvData, 
        (ulWholeArraySize + lDelta) * psa->cbElements)) == NULL) 
         return FALSE; /* TODO If we get here it means:
@@ -896 +924 @@
        the descriptor in SafeArrayCreateVector function. */
 
-    if((pvNewBlock = HeapAlloc(GetProcessHeap(), 0,
+    if((pvNewBlock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
        ulWholeArraySize * psa->cbElements)) == NULL) 
         return FALSE;
@@ -993 +1021 @@
   HRESULT hRes;
 
+  if (!psa->cDims) return FALSE;
   for(; iter<psa->cDims; iter++) {
+    TRACE("coor[%d]=%ld\n", iter, coor[iter]);
     if((hRes = SafeArrayGetLBound(psa, (iter+1), &lLBound)) != S_OK)
       return FALSE;
@@ -999 +1029 @@
       return FALSE;
  
-    if(lLBound == lUBound) 
+    if(lLBound > lUBound) 
       return FALSE; 
-   
-    if((coor[iter] >= lLBound) && (coor[iter] <= lUBound))
-      return TRUE;
-    else
+
+    if((coor[iter] < lLBound) || (coor[iter] > lUBound))
       return FALSE;
   }
-  return FALSE;
+  return TRUE;
 }