Changeset 3167 for trunk/src/ole32/datacache.cpp

Timestamp:

Mar 19, 2000, 4:35:32 PM (25 years ago)

Author:

davidr

Message:

Ported changes from wine/corel sources

File:

• trunk/src/ole32/datacache.cpp (modified) (3 diffs)

trunk/src/ole32/datacache.cpp

@@ -1 @@
-/* $Id: datacache.cpp,v 1.1 1999-09-24 21:49:42 davidr Exp $ */
+/* $Id: datacache.cpp,v 1.2 2000-03-19 15:33:05 davidr Exp $ */
 /* 
  *  OLE 2 Data cache
@@ -1315 +1315 @@
   TRACE("(%p, %p)\n", iface, pStgNew);
 
-  /*
-   * First, make sure we get our hands off any storage we have.
-   */
-  DataCache_HandsOffStorage(iface);
-
-  /*
-   * Then, attach to the new storage.
-   */
-  DataCache_Load(iface, pStgNew);
+  if (pStgNew)
+  {
+      /*
+       * First, make sure we get our hands off any storage we have.
+       */
+      DataCache_HandsOffStorage(iface);
+
+      /*
+       * Then, attach to the new storage.
+       */
+      DataCache_Load(iface, pStgNew);
+  }
 
   return S_OK;
@@ -1443 +1446 @@
     return E_INVALIDARG;
 
+/** Hack for WPO2000 release. */
+  if (dwDrawAspect != DVASPECT_CONTENT)
+  {
+      FIXME("only CONTENT aspect implemented\n");
+      dwDrawAspect = DVASPECT_CONTENT;
+  }
+/***/
+
   /*
    * First, we need to retrieve the dimensions of the