SafeArrayDestroyData: FADF_STATIC

Walt Ogburn reuben at ugcs.caltech.edu
Mon Oct 18 19:58:07 CDT 2004


ChangeLog:
SafeArrayDestroyData - keep pointer, don't destroy data if FADF_STATIC is
set

- Walter


Index: dlls/oleaut32/safearray.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/safearray.c,v
retrieving revision 1.40
diff -u -r1.40 safearray.c
--- dlls/oleaut32/safearray.c   20 Sep 2004 19:11:48 -0000      1.40
+++ dlls/oleaut32/safearray.c   18 Oct 2004 23:43:53 -0000
@@ -1254,7 +1254,8 @@
   if (psa->cLocks)
     return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */

-  if (psa->pvData)
+  /* If static, keep pvData and don't free */
+  if (psa->pvData && !(psa->fFeatures & FADF_STATIC))
   {
     /* Delete the actual item data */
     if (FAILED(SAFEARRAY_DestroyData(psa, 0)))




More information about the wine-patches mailing list