oleaut32: SafeArrayAllocData should succeed when cbElements is 0.

dlls/oleaut32/safearray.c

@@ -228,7 +228,7 @@ static SAFEARRAY* SAFEARRAY_Create(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsab
     if (ulSize)
       psa->cbElements = ulSize;
 
-    if (FAILED(SafeArrayAllocData(psa)))
+    if (!psa->cbElements || FAILED(SafeArrayAllocData(psa)))
     {
       SafeArrayDestroyDescriptor(psa);
       psa = NULL;
@@ -533,10 +533,6 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa)
   {
     ULONG ulSize = SAFEARRAY_GetCellCount(psa);
 
-    hRet = E_OUTOFMEMORY;
-
-    if (psa->cbElements)
-    {
     psa->pvData = SAFEARRAY_Malloc(ulSize * psa->cbElements);
 
     if (psa->pvData)
@@ -545,7 +541,8 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa)
       TRACE("%u bytes allocated for data at %p (%u objects).\n",
             ulSize * psa->cbElements, psa->pvData, ulSize);
     }
-    }
+    else
+      hRet = E_OUTOFMEMORY;
   }
   return hRet;
 }

dlls/oleaut32/tests/safearray.c

@@ -690,10 +690,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void)
   sa->rgsabound[0].lLbound = 1;
 
   hres = SafeArrayAllocData(sa);
-  todo_wine
-  {
   ok(hres == S_OK, "SafeArrayAllocData gave hres 0x%x\n", hres);
-  }
 }
 
 static void test_SafeArrayCreateLockDestroy(void)