Changeset 8620 for trunk/src/ole32/storage32.c

Timestamp:

Jun 9, 2002, 6:37:22 PM (23 years ago)

Author:

sandervl

Message:

Resync with latest Wine

File:

• trunk/src/ole32/storage32.c (modified) (282 diffs)

trunk/src/ole32/storage32.c

@@ -24 +24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifdef __WIN32OS2__
 #include "ole32.h"
@@ -60 +59 @@
 /* OLESTREAM memory structure to use for Get and Put Routines */
 /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
-typedef struct 
+typedef struct
 {
     DWORD dwOleID;
@@ -98 +97 @@
     DWORD dwExtentX;
     DWORD dwExtentY;
-    DWORD dwSize;  
+    DWORD dwSize;
     BYTE *pData;
 }OLECONVERT_ISTORAGE_OLEPRES;
@@ -123 +122 @@
   INT         typeOfRelation);
 
-static HRESULT adjustPropertyChain( 
+static HRESULT adjustPropertyChain(
   StorageImpl *This,
   StgProperty   propertyToDelete,
@@ -150 +149 @@
  * Declaration of miscellaneous functions...
  */
-static HRESULT validateSTGM(DWORD stgmValue); 
+static HRESULT validateSTGM(DWORD stgmValue);
 
 static DWORD GetShareModeFromSTGM(DWORD stgm);
@@ -236 +235 @@
  * This method implements the common QueryInterface for all IStorage32
  * implementations contained in this file.
- * 
+ *
  * See Windows documentation for more details on IUnknown methods.
  */
@@ -250 +249 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-  
+
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-  
+
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
   {
     *ppvObject = (IStorage*)This;
   }
-  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0) 
+  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0)
   {
     *ppvObject = (IStorage*)This;
   }
-  
+
   /*
    * Check that we obtained an interface.
@@ -273 +272 @@
   if ((*ppvObject)==0)
     return E_NOINTERFACE;
-  
+
   /*
    * Query Interface always increases the reference count by one when it is
@@ -282 +281 @@
   return S_OK;
 }
-        
+
 /************************************************************************
  * Storage32BaseImpl_AddRef (IUnknown)
@@ -288 +287 @@
  * This method implements the common AddRef for all IStorage32
  * implementations contained in this file.
- * 
+ *
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI StorageBaseImpl_AddRef( 
+ULONG WINAPI StorageBaseImpl_AddRef(
             IStorage* iface)
 {
@@ -299 +298 @@
   return This->ref;
 }
-        
+
 /************************************************************************
  * Storage32BaseImpl_Release (IUnknown)
@@ -305 +304 @@
  * This method implements the common Release for all IStorage32
  * implementations contained in this file.
- * 
+ *
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI StorageBaseImpl_Release( 
+ULONG WINAPI StorageBaseImpl_Release(
       IStorage* iface)
 {
@@ -323 +322 @@
   {
     /*
-     * Since we are using a system of base-classes, we want to call the 
-     * destructor of the appropriate derived class. To do this, we are 
+     * Since we are using a system of base-classes, we want to call the
+     * destructor of the appropriate derived class. To do this, we are
      * using virtual functions to implement the destructor.
      */
@@ -331 +330 @@
     return 0;
   }
-  
+
   return This->ref;
 }
@@ -342 +341 @@
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI StorageBaseImpl_OpenStream( 
+HRESULT WINAPI StorageBaseImpl_OpenStream(
   IStorage*        iface,
   const OLECHAR*   pwcsName,  /* [string][in] */
   void*            reserved1, /* [unique][in] */
-  DWORD            grfMode,   /* [in]  */        
-  DWORD            reserved2, /* [in]  */        
-  IStream**        ppstm)     /* [out] */       
+  DWORD            grfMode,   /* [in]  */
+  DWORD            reserved2, /* [in]  */
+  IStream**        ppstm)     /* [out] */
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -357 +356 @@
   HRESULT           res = STG_E_UNKNOWN;
 
-  TRACE("(%p, %s, %p, %lx, %ld, %p)\n", 
+  TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
         iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
 
@@ -368 +367 @@
     goto end;
   }
-  
+
   /*
    * Initialize the out parameter
    */
   *ppstm = NULL;
-  
+
   /*
    * Validate the STGM flags
@@ -398 +397 @@
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-    This->ancestorStorage, 
+    This->ancestorStorage,
     This->rootPropertySetIndex);
-  
+
   /*
    * Search the enumeration for the property with the given name
@@ -408 +407 @@
     pwcsName,
     &currentProperty);
-  
+
   /*
    * Delete the property enumeration since we don't need it anymore
    */
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
-  
+
   /*
    * If it was found, construct the stream object and return a pointer to it.
    */
-  if ( (foundPropertyIndex!=PROPERTY_NULL) && 
+  if ( (foundPropertyIndex!=PROPERTY_NULL) &&
        (currentProperty.propertyType==PROPTYPE_STREAM) )
   {
     newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex);
-    
+
     if (newStream!=0)
     {
@@ -428 +427 @@
 
       /*
-       * Since we are returning a pointer to the interface, we have to 
+       * Since we are returning a pointer to the interface, we have to
        * nail down the reference.
        */
       StgStreamImpl_AddRef(*ppstm);
-      
+
       res = S_OK;
       goto end;
     }
-    
+
     res = E_OUTOFMEMORY;
     goto end;
   }
-  
+
   res = STG_E_FILENOTFOUND;
 
@@ -454 +453 @@
  *
  * This method will open a new storage object from the current storage.
- * 
+ *
  * See Windows documentation for more details on IStorage methods.
- */        
-HRESULT WINAPI StorageBaseImpl_OpenStorage( 
+ */
+HRESULT WINAPI StorageBaseImpl_OpenStorage(
   IStorage*        iface,
-  const OLECHAR*   pwcsName,      /* [string][unique][in] */ 
-  IStorage*        pstgPriority,  /* [unique][in] */         
-  DWORD            grfMode,       /* [in] */                 
-  SNB              snbExclude,    /* [unique][in] */         
-  DWORD            reserved,      /* [in] */                 
-  IStorage**       ppstg)         /* [out] */                        
+  const OLECHAR*   pwcsName,      /* [string][unique][in] */
+  IStorage*        pstgPriority,  /* [unique][in] */
+  DWORD            grfMode,       /* [in] */
+  SNB              snbExclude,    /* [unique][in] */
+  DWORD            reserved,      /* [in] */
+  IStorage**       ppstg)         /* [out] */
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -473 +472 @@
   HRESULT                res = STG_E_UNKNOWN;
 
-  TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n", 
-        iface, debugstr_w(pwcsName), pstgPriority, 
+  TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
+        iface, debugstr_w(pwcsName), pstgPriority,
         grfMode, snbExclude, reserved, ppstg);
-  
+
   /*
    * Perform a sanity check on the parameters.
@@ -485 +484 @@
     goto end;
   }
-  
+
   /* as documented */
   if (snbExclude != NULL)
@@ -492 +491 @@
     goto end;
   }
-  
+
   /*
    * Validate the STGM flags
@@ -505 +504 @@
    * As documented.
    */
-  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) || 
+  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) ||
         (grfMode & STGM_DELETEONRELEASE) ||
         (grfMode & STGM_PRIORITY) )
@@ -517 +516 @@
    */
   *ppstg = NULL;
-  
+
   /*
    * Create a property enumeration to search the properties
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-                          This->ancestorStorage, 
+                          This->ancestorStorage,
                           This->rootPropertySetIndex);
-  
+
   /*
    * Search the enumeration for the property with the given name
@@ -532 +531 @@
                          pwcsName,
                          &currentProperty);
-  
+
   /*
    * Delete the property enumeration since we don't need it anymore
    */
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
-  
+
   /*
    * If it was found, construct the stream object and return a pointer to it.
    */
-  if ( (foundPropertyIndex!=PROPERTY_NULL) && 
+  if ( (foundPropertyIndex!=PROPERTY_NULL) &&
        (currentProperty.propertyType==PROPTYPE_STORAGE) )
   {
@@ -550 +549 @@
                    This->ancestorStorage,
                    foundPropertyIndex);
-    
+
     if (newStorage != 0)
     {
@@ -556 +555 @@
 
       /*
-       * Since we are returning a pointer to the interface, 
+       * Since we are returning a pointer to the interface,
        * we have to nail down the reference.
        */
       StorageBaseImpl_AddRef(*ppstg);
-      
+
       res = S_OK;
       goto end;
     }
-    
+
     res = STG_E_INSUFFICIENTMEMORY;
     goto end;
   }
-  
+
   res = STG_E_FILENOTFOUND;
 
@@ -579 +578 @@
  * Storage32BaseImpl_EnumElements (IStorage)
  *
- * This method will create an enumerator object that can be used to 
+ * This method will create an enumerator object that can be used to
  * retrieve informatino about all the properties in the storage object.
- * 
+ *
  * See Windows documentation for more details on IStorage methods.
- */        
-HRESULT WINAPI StorageBaseImpl_EnumElements( 
+ */
+HRESULT WINAPI StorageBaseImpl_EnumElements(
   IStorage*       iface,
-  DWORD           reserved1, /* [in] */                  
-  void*           reserved2, /* [size_is][unique][in] */ 
-  DWORD           reserved3, /* [in] */                  
-  IEnumSTATSTG**  ppenum)    /* [out] */                 
+  DWORD           reserved1, /* [in] */
+  void*           reserved2, /* [size_is][unique][in] */
+  DWORD           reserved3, /* [in] */
+  IEnumSTATSTG**  ppenum)    /* [out] */
 {
   ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* newEnum;
 
-  TRACE("(%p, %ld, %p, %ld, %p)\n", 
+  TRACE("(%p, %ld, %p, %ld, %p)\n",
         iface, reserved1, reserved2, reserved3, ppenum);
 
@@ -602 +601 @@
   if ( (This==0) || (ppenum==0))
     return E_INVALIDARG;
-  
+
   /*
    * Construct the enumerator.
@@ -619 +618 @@
      */
     IEnumSTATSTGImpl_AddRef(*ppenum);
-    
+
     return S_OK;
   }
@@ -630 +629 @@
  *
  * This method will retrieve information about this storage object.
- * 
+ *
  * See Windows documentation for more details on IStorage methods.
- */        
-HRESULT WINAPI StorageBaseImpl_Stat( 
+ */
+HRESULT WINAPI StorageBaseImpl_Stat(
   IStorage*        iface,
-  STATSTG*         pstatstg,     /* [out] */ 
-  DWORD            grfStatFlag)  /* [in] */  
+  STATSTG*         pstatstg,     /* [out] */
+  DWORD            grfStatFlag)  /* [in] */
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -643 +642 @@
   HRESULT        res = STG_E_UNKNOWN;
 
-  TRACE("(%p, %p, %lx)\n", 
+  TRACE("(%p, %p, %lx)\n",
         iface, pstatstg, grfStatFlag);
 
@@ -666 +665 @@
   {
     StorageUtl_CopyPropertyToSTATSTG(
-      pstatstg, 
-      &curProperty, 
+      pstatstg,
+      &curProperty,
       grfStatFlag);
-    
+
     res = S_OK;
     goto end;
   }
-  
+
   res = E_FAIL;
 
@@ -688 +687 @@
  * Storage32BaseImpl_RenameElement (IStorage)
  *
- * This method will rename the specified element. 
+ * This method will rename the specified element.
  *
  * See Windows documentation for more details on IStorage methods.
- * 
- * Implementation notes: The method used to rename consists of creating a clone 
- *    of the deleted StgProperty object setting it with the new name and to 
+ *
+ * Implementation notes: The method used to rename consists of creating a clone
+ *    of the deleted StgProperty object setting it with the new name and to
  *    perform a DestroyElement of the old StgProperty.
  */
@@ -706 +705 @@
   ULONG             foundPropertyIndex;
 
-  TRACE("(%p, %s, %s)\n", 
+  TRACE("(%p, %s, %s)\n",
         iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
 
@@ -753 +752 @@
      * Setup a new property for the renamed property
      */
-    renamedProperty.sizeOfNameString = 
+    renamedProperty.sizeOfNameString =
       ( lstrlenW(pwcsNewName)+1 ) * sizeof(WCHAR);
-  
+
     if (renamedProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
       return STG_E_INVALIDNAME;
-  
+
     strcpyW(renamedProperty.name, pwcsNewName);
- 
+
     renamedProperty.propertyType  = currentProperty.propertyType;
     renamedProperty.startingBlock = currentProperty.startingBlock;
     renamedProperty.size.s.LowPart  = currentProperty.size.s.LowPart;
     renamedProperty.size.s.HighPart = currentProperty.size.s.HighPart;
-  
+
     renamedProperty.previousProperty = PROPERTY_NULL;
     renamedProperty.nextProperty     = PROPERTY_NULL;
-  
+
     /*
      * Bring the dirProperty link in case it is a storage and in which
@@ -774 +773 @@
      */
     renamedProperty.dirProperty = currentProperty.dirProperty;
-  
-    /* call CoFileTime to get the current time 
+
+    /* call CoFileTime to get the current time
     renamedProperty.timeStampS1
     renamedProperty.timeStampD1
     renamedProperty.timeStampS2
     renamedProperty.timeStampD2
-    renamedProperty.propertyUniqueID 
+    renamedProperty.propertyUniqueID
     */
-  
-    /* 
+
+    /*
      * Obtain a free property in the property chain
      */
     renamedPropertyIndex = getFreeProperty(This->ancestorStorage);
-  
+
     /*
      * Save the new property into the new property spot
-     */  
+     */
     StorageImpl_WriteProperty(
       This->ancestorStorage,
-      renamedPropertyIndex, 
+      renamedPropertyIndex,
       &renamedProperty);
-  
-    /* 
+
+    /*
      * Find a spot in the property chain for our newly created property.
      */
     updatePropertyChain(
       (StorageImpl*)This,
-      renamedPropertyIndex, 
+      renamedPropertyIndex,
       renamedProperty);
 
     /*
-     * At this point the renamed property has been inserted in the tree, 
-     * now, before to Destroy the old property we must zeroed it's dirProperty 
-     * otherwise the DestroyProperty below will zap it all and we do not want 
+     * At this point the renamed property has been inserted in the tree,
+     * now, before to Destroy the old property we must zeroed it's dirProperty
+     * otherwise the DestroyProperty below will zap it all and we do not want
      * this to happen.
      * Also, we fake that the old property is a storage so the DestroyProperty
      * will not do a SetSize(0) on the stream data.
-     * 
+     *
      * This means that we need to tweek the StgProperty if it is a stream or a
      * non empty storage.
@@ -823 +822 @@
     StorageImpl_WriteProperty(
       This->ancestorStorage,
-      foundPropertyIndex, 
+      foundPropertyIndex,
       &currentProperty);
 
-    /* 
-     * Invoke Destroy to get rid of the ole property and automatically redo 
-     * the linking of it's previous and next members... 
-     */ 
-    StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); 
+    /*
+     * Invoke Destroy to get rid of the ole property and automatically redo
+     * the linking of it's previous and next members...
+     */
+    StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName);
 
   }
@@ -847 +846 @@
  * Storage32BaseImpl_CreateStream (IStorage)
  *
- * This method will create a stream object within this storage 
+ * This method will create a stream object within this storage
  *
  * See Windows documentation for more details on IStorage methods.
@@ -865 +864 @@
   ULONG             foundPropertyIndex, newPropertyIndex;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
-        iface, debugstr_w(pwcsName), grfMode, 
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
+        iface, debugstr_w(pwcsName), grfMode,
         reserved1, reserved2, ppstm);
 
@@ -912 +911 @@
   {
     /*
-     * An element with this name already exists 
+     * An element with this name already exists
      */
     if (grfMode & STGM_CREATE)
     {
-      IStorage_DestroyElement(iface, pwcsName); 
-    }
-    else 
+      IStorage_DestroyElement(iface, pwcsName);
+    }
+    else
       return STG_E_FILEALREADYEXISTS;
   }
 
-  /* 
-   * memset the empty property 
+  /*
+   * memset the empty property
    */
   memset(&newStreamProperty, 0, sizeof(StgProperty));
@@ -944 +943 @@
   newStreamProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time 
+  /* call CoFileTime to get the current time
   newStreamProperty.timeStampS1
   newStreamProperty.timeStampD1
@@ -954 +953 @@
 
   /*
-   * Get a free property or create a new one 
+   * Get a free property or create a new one
    */
   newPropertyIndex = getFreeProperty(This->ancestorStorage);
@@ -960 +959 @@
   /*
    * Save the new property into the new property spot
-   */  
+   */
   StorageImpl_WriteProperty(
     This->ancestorStorage,
-    newPropertyIndex, 
+    newPropertyIndex,
     &newStreamProperty);
 
-  /* 
+  /*
    * Find a spot in the property chain for our newly created property.
    */
   updatePropertyChain(
     (StorageImpl*)This,
-    newPropertyIndex, 
+    newPropertyIndex,
     newStreamProperty);
 
-  /* 
+  /*
    * Open the stream to return it.
    */
@@ -1000 +999 @@
  * Storage32BaseImpl_SetClass (IStorage)
  *
- * This method will write the specified CLSID in the property of this 
+ * This method will write the specified CLSID in the property of this
  * storage.
  *
@@ -1015 +1014 @@
 
   TRACE("(%p, %p)\n", iface, clsid);
-  
+
   success = StorageImpl_ReadProperty(This->ancestorStorage,
                                        This->rootPropertySetIndex,
@@ -1036 +1035 @@
 ** Storage32Impl implementation
 */
-        
+
 /************************************************************************
  * Storage32Impl_CreateStorage (IStorage)
@@ -1044 +1043 @@
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI StorageImpl_CreateStorage( 
+HRESULT WINAPI StorageImpl_CreateStorage(
   IStorage*      iface,
-  const OLECHAR  *pwcsName, /* [string][in] */ 
-  DWORD            grfMode,   /* [in] */ 
-  DWORD            reserved1, /* [in] */ 
-  DWORD            reserved2, /* [in] */ 
-  IStorage       **ppstg)   /* [out] */ 
+  const OLECHAR  *pwcsName, /* [string][in] */
+  DWORD            grfMode,   /* [in] */
+  DWORD            reserved1, /* [in] */
+  DWORD            reserved2, /* [in] */
+  IStorage       **ppstg)   /* [out] */
 {
   StorageImpl* const This=(StorageImpl*)iface;
@@ -1061 +1060 @@
   HRESULT          hr;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
-        iface, debugstr_w(pwcsName), grfMode, 
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
+        iface, debugstr_w(pwcsName), grfMode,
         reserved1, reserved2, ppstg);
-  
+
   /*
    * Validate parameters
@@ -1100 +1099 @@
   {
     /*
-     * An element with this name already exists 
+     * An element with this name already exists
      */
     if (grfMode & STGM_CREATE)
-      IStorage_DestroyElement(iface, pwcsName); 
-    else 
+      IStorage_DestroyElement(iface, pwcsName);
+    else
       return STG_E_FILEALREADYEXISTS;
   }
 
-  /* 
-   * memset the empty property 
+  /*
+   * memset the empty property
    */
   memset(&newProperty, 0, sizeof(StgProperty));
@@ -1129 +1128 @@
   newProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time 
+  /* call CoFileTime to get the current time
   newProperty.timeStampS1
   newProperty.timeStampD1
@@ -1138 +1137 @@
   /*  newStorageProperty.propertyUniqueID */
 
-  /* 
+  /*
    * Obtain a free property in the property chain
    */
@@ -1145 +1144 @@
   /*
    * Save the new property into the new property spot
-   */  
+   */
   StorageImpl_WriteProperty(
     This->ancestorStorage,
-    newPropertyIndex, 
+    newPropertyIndex,
     &newProperty);
 
-  /* 
+  /*
    * Find a spot in the property chain for our newly created property.
    */
   updatePropertyChain(
     This,
-    newPropertyIndex, 
+    newPropertyIndex,
     newProperty);
 
-  /* 
+  /*
    * Open it to get a pointer to return.
    */
@@ -1176 +1175 @@
   }
 
-  
+
   return S_OK;
 }
@@ -1207 +1206 @@
       if (currentProperty.sizeOfNameString == 0)
       {
-        /* 
+        /*
          * The property existis and is available, we found it.
          */
@@ -1224 +1223 @@
   } while (newPropertyIndex == PROPERTY_NULL);
 
-  /* 
-   * grow the property chain 
+  /*
+   * grow the property chain
    */
   if (! readSuccessful)
@@ -1235 +1234 @@
     ULONG          blockCount    = 0;
 
-    /* 
-     * obtain the new count of property blocks 
+    /*
+     * obtain the new count of property blocks
      */
     blockCount = BlockChainStream_GetCount(
                    storage->ancestorStorage->rootBlockChain)+1;
 
-    /* 
-     * initialize the size used by the property stream 
+    /*
+     * initialize the size used by the property stream
      */
     newSize.s.HighPart = 0;
     newSize.s.LowPart  = storage->bigBlockSize * blockCount;
 
-    /* 
-     * add a property block to the property chain 
+    /*
+     * add a property block to the property chain
      */
     BlockChainStream_SetSize(storage->ancestorStorage->rootBlockChain, newSize);
 
-    /* 
-     * memset the empty property in order to initialize the unused newly 
+    /*
+     * memset the empty property in order to initialize the unused newly
      * created property
      */
     memset(&emptyProperty, 0, sizeof(StgProperty));
 
-    /* 
+    /*
      * initialize them
      */
-    lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; 
-    
+    lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount;
+
     for(
       propertyIndex = newPropertyIndex;
@@ -1270 +1269 @@
       StorageImpl_WriteProperty(
         storage->ancestorStorage,
-        propertyIndex, 
+        propertyIndex,
         &emptyProperty);
     }
@@ -1282 +1281 @@
  * Internal Method
  *
- * Case insensitive comparaison of StgProperty.name by first considering 
+ * Case insensitive comparaison of StgProperty.name by first considering
  * their size.
  *
@@ -1295 +1294 @@
   LONG diff      = lstrlenW(newProperty) - lstrlenW(currentProperty);
 
-  if (diff == 0) 
-  {
-    /* 
+  if (diff == 0)
+  {
+    /*
      * We compare the string themselves only when they are of the same lenght
      */
@@ -1303 +1302 @@
   }
 
-  return diff;  
+  return diff;
 }
 
@@ -1315 +1314 @@
   StorageImpl *storage,
   ULONG         newPropertyIndex,
-  StgProperty   newProperty) 
+  StgProperty   newProperty)
 {
   StgProperty currentProperty;
@@ -1328 +1327 @@
   if (currentProperty.dirProperty != PROPERTY_NULL)
   {
-    /* 
+    /*
      * The root storage contains some element, therefore, start the research
      * for the appropriate location.
@@ -1341 +1340 @@
 
     /*
-     * Read 
+     * Read
      */
     StorageImpl_ReadProperty(storage->ancestorStorage,
@@ -1354 +1353 @@
     {
       LONG diff = propertyNameCmp( newProperty.name, currentProperty.name);
-  
+
       if (diff < 0)
       {
@@ -1406 +1405 @@
   else
   {
-    /* 
+    /*
      * The root storage is empty, link the new property to it's dir property
      */
@@ -1416 +1415 @@
 }
 
-      
+
 /*************************************************************************
  * CopyTo (IStorage)
  */
-HRESULT WINAPI StorageImpl_CopyTo( 
+HRESULT WINAPI StorageImpl_CopyTo(
   IStorage*   iface,
-  DWORD       ciidExclude,  /* [in] */ 
-  const IID*  rgiidExclude, /* [size_is][unique][in] */ 
-  SNB         snbExclude,   /* [unique][in] */ 
-  IStorage*   pstgDest)     /* [unique][in] */ 
+  DWORD       ciidExclude,  /* [in] */
+  const IID*  rgiidExclude, /* [size_is][unique][in] */
+  SNB         snbExclude,   /* [unique][in] */
+  IStorage*   pstgDest)     /* [unique][in] */
 {
   IEnumSTATSTG *elements     = 0;
@@ -1436 +1435 @@
     FIXME("Exclude option not implemented\n");
 
-  TRACE("(%p, %ld, %p, %p, %p)\n", 
-        iface, ciidExclude, rgiidExclude, 
+  TRACE("(%p, %ld, %p, %p, %p)\n",
+        iface, ciidExclude, rgiidExclude,
         snbExclude, pstgDest);
 
@@ -1446 +1445 @@
     return STG_E_INVALIDPOINTER;
 
-  /* 
+  /*
    * Enumerate the elements
    */
@@ -1459 +1458 @@
   IStorage_Stat( iface, &curElement, STATFLAG_NONAME);
   IStorage_SetClass( pstgDest, &curElement.clsid );
-  
+
   do
   {
@@ -1495 +1494 @@
         return STG_E_ACCESSDENIED;
       }
-            
+
       /*
        * create a new storage in destination storage
@@ -1512 +1511 @@
                                    NULL, 0, &pstgTmp );
       }
-        
+
       if (hr != S_OK)
         break;
 
-        
+
       /*
        * do the copy recursively
@@ -1522 +1521 @@
       hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude,
                                snbExclude, pstgTmp );
-                                
+
       IStorage_Release( pstgTmp );
       IStorage_Release( pstgChild );
@@ -1558 +1557 @@
        */
       IStream_SetSize(pstrTmp, strStat.cbSize);
-      
+
       /*
        * do the copy
@@ -1564 +1563 @@
       hr = IStream_CopyTo( pstrChild, pstrTmp, strStat.cbSize,
                            NULL, NULL );
-                                
+
       IStream_Release( pstrTmp );
       IStream_Release( pstrChild );
@@ -1579 +1578 @@
    */
   IEnumSTATSTG_Release(elements);
-  
+
   return hr;
 }
-        
+
 /*************************************************************************
  * MoveElementTo (IStorage)
  */
-HRESULT WINAPI StorageImpl_MoveElementTo( 
+HRESULT WINAPI StorageImpl_MoveElementTo(
   IStorage*     iface,
-  const OLECHAR *pwcsName,   /* [string][in] */ 
-  IStorage      *pstgDest,   /* [unique][in] */ 
-  const OLECHAR *pwcsNewName,/* [string][in] */ 
-  DWORD           grfFlags)    /* [in] */ 
+  const OLECHAR *pwcsName,   /* [string][in] */
+  IStorage      *pstgDest,   /* [unique][in] */
+  const OLECHAR *pwcsNewName,/* [string][in] */
+  DWORD           grfFlags)    /* [in] */
 {
   FIXME("not implemented!\n");
   return E_NOTIMPL;
 }
-        
+
 /*************************************************************************
  * Commit (IStorage)
  */
-HRESULT WINAPI StorageImpl_Commit( 
+HRESULT WINAPI StorageImpl_Commit(
   IStorage*   iface,
-  DWORD         grfCommitFlags)/* [in] */ 
+  DWORD         grfCommitFlags)/* [in] */
 {
   FIXME("(%ld): stub!\n", grfCommitFlags);
   return S_OK;
 }
-        
+
 /*************************************************************************
  * Revert (IStorage)
  */
-HRESULT WINAPI StorageImpl_Revert( 
+HRESULT WINAPI StorageImpl_Revert(
   IStorage* iface)
 {
@@ -1621 +1620 @@
  * DestroyElement (IStorage)
  *
- * Stategy: This implementation is build this way for simplicity not for speed. 
+ * Stategy: This implementation is build this way for simplicity not for speed.
  *          I always delete the top most element of the enumeration and adjust
- *          the deleted element pointer all the time.  This takes longer to 
- *          do but allow to reinvoke DestroyElement whenever we encounter a 
+ *          the deleted element pointer all the time.  This takes longer to
+ *          do but allow to reinvoke DestroyElement whenever we encounter a
  *          storage object.  The optimisation reside in the usage of another
- *          enumeration stategy that would give all the leaves of a storage 
+ *          enumeration stategy that would give all the leaves of a storage
  *          first. (postfix order)
  */
-HRESULT WINAPI StorageImpl_DestroyElement( 
+HRESULT WINAPI StorageImpl_DestroyElement(
   IStorage*     iface,
-  const OLECHAR *pwcsName)/* [string][in] */ 
+  const OLECHAR *pwcsName)/* [string][in] */
 {
   StorageImpl* const This=(StorageImpl*)iface;
@@ -1644 +1643 @@
   ULONG             parentPropertyId;
 
-  TRACE("(%p, %s)\n", 
+  TRACE("(%p, %s)\n",
         iface, debugstr_w(pwcsName));
 
@@ -1650 +1649 @@
    * Perform a sanity check on the parameters.
    */
-  if (pwcsName==NULL) 
+  if (pwcsName==NULL)
     return STG_E_INVALIDPOINTER;
-  
+
   /*
    * Create a property enumeration to search the property with the given name
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-    This->ancestorStorage, 
+    This->ancestorStorage,
     This->rootPropertySetIndex);
-  
+
   foundPropertyIndexToDelete = IEnumSTATSTGImpl_FindProperty(
     propertyEnumeration,
@@ -1667 +1666 @@
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
 
-  if ( foundPropertyIndexToDelete == PROPERTY_NULL )  
+  if ( foundPropertyIndexToDelete == PROPERTY_NULL )
   {
     return STG_E_FILENOTFOUND;
   }
 
-  /* 
-   * Find the parent property of the property to delete (the one that 
-   * link to it).  If This->dirProperty == foundPropertyIndexToDelete, 
+  /*
+   * Find the parent property of the property to delete (the one that
+   * link to it).  If This->dirProperty == foundPropertyIndexToDelete,
    * the parent is This. Otherwise, the parent is one of it's sibling...
    */
 
-  /* 
+  /*
    * First, read This's StgProperty..
    */
-  res = StorageImpl_ReadProperty( 
+  res = StorageImpl_ReadProperty(
           This->ancestorStorage,
           This->rootPropertySetIndex,
@@ -1688 +1687 @@
   assert(res==TRUE);
 
-  /* 
+  /*
    * Second, check to see if by any chance the actual storage (This) is not
    * the parent of the property to delete... We never know...
@@ -1694 +1693 @@
   if ( parentProperty.dirProperty == foundPropertyIndexToDelete )
   {
-    /* 
+    /*
      * Set data as it would have been done in the else part...
      */
@@ -1700 +1699 @@
     parentPropertyId = This->rootPropertySetIndex;
   }
-  else 
-  { 
-    /*
-     * Create a property enumeration to search the parent properties, and 
+  else
+  {
+    /*
+     * Create a property enumeration to search the parent properties, and
      * delete it once done.
      */
@@ -1709 +1708 @@
 
     propertyEnumeration2 = IEnumSTATSTGImpl_Construct(
-      This->ancestorStorage, 
+      This->ancestorStorage,
       This->rootPropertySetIndex);
-  
+
     typeOfRelation = IEnumSTATSTGImpl_FindParentProperty(
       propertyEnumeration2,
@@ -1721 +1720 @@
   }
 
-  if ( propertyToDelete.propertyType == PROPTYPE_STORAGE ) 
+  if ( propertyToDelete.propertyType == PROPTYPE_STORAGE )
   {
     hr = deleteStorageProperty(
-           This, 
+           This,
            foundPropertyIndexToDelete,
            propertyToDelete);
-  } 
+  }
   else if ( propertyToDelete.propertyType == PROPTYPE_STREAM )
   {
     hr = deleteStreamProperty(
-           This, 
+           This,
            foundPropertyIndexToDelete,
            propertyToDelete);
   }
 
-  if (hr!=S_OK) 
+  if (hr!=S_OK)
     return hr;
 
@@ -1744 +1743 @@
   hr = adjustPropertyChain(
         This,
-        propertyToDelete, 
+        propertyToDelete,
         parentProperty,
         parentPropertyId,
@@ -1753 +1752 @@
 
 
-/************************************************************************ 
- * StorageImpl_Stat (IStorage) 
- * 
- * This method will retrieve information about this storage object. 
- *  
- * See Windows documentation for more details on IStorage methods. 
+/************************************************************************
+ * StorageImpl_Stat (IStorage)
+ *
+ * This method will retrieve information about this storage object.
+ *
+ * See Windows documentation for more details on IStorage methods.
  */
 HRESULT WINAPI StorageImpl_Stat( IStorage* iface,
@@ -1814 +1813 @@
   }
 
-  /* 
+  /*
    * Enumerate the elements
    */
@@ -1828 +1827 @@
     {
       destroyHr = StorageImpl_DestroyElement(
-                    (IStorage*)childStorage, 
+                    (IStorage*)childStorage,
                     (OLECHAR*)currentElement.pwcsName);
 
@@ -1853 +1852 @@
   IStorage_Release(childStorage);
   IEnumSTATSTG_Release(elements);
-    
+
   return destroyHr;
 }
@@ -1883 +1882 @@
          0,
          &pis);
-    
+
   if (hr!=S_OK)
   {
@@ -1889 +1888 @@
   }
 
-  /* 
-   * Zap the stream 
-   */ 
-  hr = IStream_SetSize(pis, size); 
+  /*
+   * Zap the stream
+   */
+  hr = IStream_SetSize(pis, size);
 
   if(hr != S_OK)
@@ -1904 +1903 @@
   IStream_Release(pis);
 
-  /* 
+  /*
    * Invalidate the property by zeroing it's name member.
    */
   propertyToDelete.sizeOfNameString = 0;
 
-  /* 
+  /*
    * Here we should re-read the property so we get the updated pointer
    * but since we are here to zap it, I don't do it...
    */
   StorageImpl_WriteProperty(
-    parentStorage->ancestorStorage, 
+    parentStorage->ancestorStorage,
     indexOfPropertyToDelete,
     &propertyToDelete);
@@ -1943 +1942 @@
   res = StorageImpl_ReadProperty(
           storage->ancestorStorage,
-          storePropertyIndex, 
+          storePropertyIndex,
           &storeProperty);
 
@@ -1957 +1956 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore, 
+               propertyIndexToStore,
                storeProperty.previousProperty,
                typeOfRelation);
@@ -1972 +1971 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore, 
+               propertyIndexToStore,
                storeProperty.nextProperty,
                typeOfRelation);
@@ -1980 +1979 @@
       storeProperty.nextProperty = propertyIndexToStore;
     }
-  } 
+  }
   else if (typeOfRelation == PROPERTY_RELATION_DIR)
   {
@@ -1987 +1986 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore, 
+               propertyIndexToStore,
                storeProperty.dirProperty,
                typeOfRelation);
@@ -1999 +1998 @@
   hr = StorageImpl_WriteProperty(
          storage->ancestorStorage,
-         storePropertyIndex, 
+         storePropertyIndex,
          &storeProperty);
 
@@ -2014 +2013 @@
  * Internal Method
  *
- * This method takes the previous and the next property link of a property 
+ * This method takes the previous and the next property link of a property
  * to be deleted and find them a place in the Storage.
  */
-static HRESULT adjustPropertyChain( 
+static HRESULT adjustPropertyChain(
   StorageImpl *This,
   StgProperty   propertyToDelete,
@@ -2031 +2030 @@
   HRESULT hr                     = S_OK;
   BOOL  res                    = TRUE;
-  
-  if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) 
-  {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL)  
-    {
-      /* 
+
+  if (typeOfRelation == PROPERTY_RELATION_PREVIOUS)
+  {
+    if (propertyToDelete.previousProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent previous to the property to delete previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
 
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)
       {
         /*
-         * We also need to find a storage for the other link, setup variables 
+         * We also need to find a storage for the other link, setup variables
          * to do this at the end...
-         */      
+         */
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -2052 +2051 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    } 
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
-    {
-      /* 
+    }
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent previous to the property to delete next
        */
       newLinkProperty = propertyToDelete.nextProperty;
     }
-   
-    /* 
+
+    /*
      * Link it for real...
-     */ 
+     */
     parentProperty.previousProperty = newLinkProperty;
-  
-  } 
-  else if (typeOfRelation == PROPERTY_RELATION_NEXT) 
-  {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL)  
-    {
-      /* 
+
+  }
+  else if (typeOfRelation == PROPERTY_RELATION_NEXT)
+  {
+    if (propertyToDelete.previousProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent next to the property to delete next previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
-      
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)
       {
         /*
-         * We also need to find a storage for the other link, setup variables 
+         * We also need to find a storage for the other link, setup variables
          * to do this at the end...
-         */      
+         */
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -2087 +2086 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    } 
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
-    {
-      /* 
+    }
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent next to the property to delete next
        */
@@ -2096 +2095 @@
     }
 
-    /* 
+    /*
      * Link it for real...
-     */ 
+     */
     parentProperty.nextProperty = newLinkProperty;
-  } 
+  }
   else /* (typeOfRelation == PROPERTY_RELATION_DIR) */
   {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL) 
-    {
-      /* 
+    if (propertyToDelete.previousProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent dir to the property to delete previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
 
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)
       {
         /*
-         * We also need to find a storage for the other link, setup variables 
+         * We also need to find a storage for the other link, setup variables
          * to do this at the end...
-         */      
+         */
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -2121 +2120 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    } 
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
-    {
-      /* 
+    }
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
+    {
+      /*
        * Set the parent dir to the property to delete next
        */
@@ -2130 +2129 @@
     }
 
-    /* 
+    /*
      * Link it for real...
-     */ 
+     */
     parentProperty.dirProperty = newLinkProperty;
   }
 
-  /* 
-   * Write back the parent property    
+  /*
+   * Write back the parent property
    */
   res = StorageImpl_WriteProperty(
-          This->ancestorStorage, 
+          This->ancestorStorage,
           parentPropertyId,
           &parentProperty);
@@ -2149 +2148 @@
 
   /*
-   * If a placeholder is required for the other link, then, find one and 
+   * If a placeholder is required for the other link, then, find one and
    * get out of here...
    */
-  if (needToFindAPlaceholder) 
+  if (needToFindAPlaceholder)
   {
     hr = findPlaceholder(
-           This, 
-           toStoreNode, 
+           This,
+           toStoreNode,
            storeNode,
            relationType);
@@ -2168 +2167 @@
  * SetElementTimes (IStorage)
  */
-HRESULT WINAPI StorageImpl_SetElementTimes( 
+HRESULT WINAPI StorageImpl_SetElementTimes(
   IStorage*     iface,
-  const OLECHAR *pwcsName,/* [string][in] */ 
-  const FILETIME  *pctime,  /* [in] */ 
-  const FILETIME  *patime,  /* [in] */ 
-  const FILETIME  *pmtime)  /* [in] */ 
+  const OLECHAR *pwcsName,/* [string][in] */
+  const FILETIME  *pctime,  /* [in] */
+  const FILETIME  *patime,  /* [in] */
+  const FILETIME  *pmtime)  /* [in] */
 {
   FIXME("(%s,...), stub!\n",debugstr_w(pwcsName));
@@ -2182 +2181 @@
  * SetStateBits (IStorage)
  */
-HRESULT WINAPI StorageImpl_SetStateBits( 
+HRESULT WINAPI StorageImpl_SetStateBits(
   IStorage*   iface,
-  DWORD         grfStateBits,/* [in] */ 
-  DWORD         grfMask)     /* [in] */ 
+  DWORD         grfStateBits,/* [in] */
+  DWORD         grfMask)     /* [in] */
 {
   FIXME("not implemented!\n");
@@ -2209 +2208 @@
 
   memset(This, 0, sizeof(StorageImpl));
-  
+
   /*
    * Initialize the virtual function table.
@@ -2215 +2214 @@
   ICOM_VTBL(This)    = &Storage32Impl_Vtbl;
   This->v_destructor = &StorageImpl_Destroy;
-  
+
   /*
    * This is the top-level storage so initialize the ancestor pointer
@@ -2221 +2220 @@
    */
   This->ancestorStorage = This;
-  
+
   /*
    * Initialize the physical support of the storage.
    */
   This->hFile = hFile;
-  
+
   /*
    * Store copy of file path.
    */
   if(pwcsName) {
-      This->pwcsName = HeapAlloc(GetProcessHeap(), 0, 
+      This->pwcsName = HeapAlloc(GetProcessHeap(), 0,
                                 (lstrlenW(pwcsName)+1)*sizeof(WCHAR));
       if (!This->pwcsName)
          return STG_E_INSUFFICIENTMEMORY;
-      strcpyW(This->pwcsName, pwcsName); 
+      strcpyW(This->pwcsName, pwcsName);
   }
 
@@ -2251 +2250 @@
   if (This->bigBlockFile == 0)
     return E_FAIL;
- 
+
   if (fileCreate)
   {
@@ -2263 +2262 @@
      * - There is no small block depot
      */
-    memset( This->bigBlockDepotStart,     
-            BLOCK_UNUSED, 
+    memset( This->bigBlockDepotStart,
+            BLOCK_UNUSED,
             sizeof(This->bigBlockDepotStart));
 
@@ -2318 +2317 @@
    */
   This->prevFreeBlock = 0;
-  
+
   /*
    * Create the block chain abstractions.
    */
-  This->rootBlockChain = 
+  This->rootBlockChain =
     BlockChainStream_Construct(This, &This->rootStartBlock, PROPERTY_NULL);
 
   This->smallBlockDepotChain = BlockChainStream_Construct(
-                                 This, 
-                                 &This->smallBlockDepotStart, 
+                                 This,
+                                 &This->smallBlockDepotStart,
                                  PROPERTY_NULL);
 
   /*
-   * Write the root property 
+   * Write the root property
    */
   if (fileCreate)
@@ -2358 +2357 @@
    */
   currentPropertyIndex = 0;
-  
+
   do
   {
     readSuccessful = StorageImpl_ReadProperty(
-                      This, 
-                      currentPropertyIndex, 
+                      This,
+                      currentPropertyIndex,
                       &currentProperty);
-    
+
     if (readSuccessful)
     {
@@ -2376 +2375 @@
 
     currentPropertyIndex++;
-    
+
   } while (readSuccessful && (This->rootPropertySetIndex == PROPERTY_NULL) );
-  
+
   if (!readSuccessful)
   {
@@ -2389 +2388 @@
    */
   This->smallBlockRootChain = BlockChainStream_Construct(
-                                This, 
-                                NULL, 
+                                This,
+                                NULL,
                                 This->rootPropertySetIndex);
-  
+
   return hr;
 }
@@ -2928 +2927 @@
 
     StorageUtl_ReadWord(
-      headerBigBlock, 
-      OFFSET_BIGBLOCKSIZEBITS,   
+      headerBigBlock,
+      OFFSET_BIGBLOCKSIZEBITS,
       &This->bigBlockSizeBits);
 
     StorageUtl_ReadWord(
-      headerBigBlock, 
-      OFFSET_SMALLBLOCKSIZEBITS, 
+      headerBigBlock,
+      OFFSET_SMALLBLOCKSIZEBITS,
       &This->smallBlockSizeBits);
 
     StorageUtl_ReadDWord(
-      headerBigBlock, 
-      OFFSET_BBDEPOTCOUNT,      
+      headerBigBlock,
+      OFFSET_BBDEPOTCOUNT,
       &This->bigBlockDepotCount);
 
     StorageUtl_ReadDWord(
-      headerBigBlock, 
-      OFFSET_ROOTSTARTBLOCK,    
+      headerBigBlock,
+      OFFSET_ROOTSTARTBLOCK,
       &This->rootStartBlock);
 
     StorageUtl_ReadDWord(
-      headerBigBlock, 
-      OFFSET_SBDEPOTSTART,      
+      headerBigBlock,
+      OFFSET_SBDEPOTSTART,
       &This->smallBlockDepotStart);
 
-    StorageUtl_ReadDWord( 
-      headerBigBlock, 
-      OFFSET_EXTBBDEPOTSTART,   
+    StorageUtl_ReadDWord(
+      headerBigBlock,
+      OFFSET_EXTBBDEPOTSTART,
       &This->extBigBlockDepotStart);
 
     StorageUtl_ReadDWord(
-      headerBigBlock, 
-      OFFSET_EXTBBDEPOTCOUNT,   
+      headerBigBlock,
+      OFFSET_EXTBBDEPOTCOUNT,
       &This->extBigBlockDepotCount);
-    
+
     for (index = 0; index < COUNT_BBDEPOTINHEADER; index ++)
     {
       StorageUtl_ReadDWord(
-        headerBigBlock, 
+        headerBigBlock,
         OFFSET_BBDEPOTSTART + (sizeof(ULONG)*index),
         &(This->bigBlockDepotStart[index]));
     }
-    
+
     /*
      * Make the bitwise arithmetic to get the size of the blocks in bytes.
@@ -2983 +2982 @@
       This->smallBlockSize = 0x000000001 >> (DWORD)This->smallBlockSizeBits;
     }
-    
-    /*
-     * Right now, the code is making some assumptions about the size of the 
+
+    /*
+     * Right now, the code is making some assumptions about the size of the
      * blocks, just make sure they are what we're expecting.
      */
@@ -2996 +2995 @@
     else
         hr = S_OK;
-    
+
     /*
      * Release the block.
@@ -3002 +3001 @@
     StorageImpl_ReleaseBigBlock(This, headerBigBlock);
   }
-  
+
   return hr;
 }
@@ -3022 +3021 @@
    */
   success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock);
-  
+
   /*
    * If the block read failed, the file is probably new.
@@ -3032 +3031 @@
      */
     memset(headerBigBlock, 0, BIG_BLOCK_SIZE);
-    
+
     /*
      * Initialize the magic number.
      */
     memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic));
-    
+
     /*
      * And a bunch of things we don't know what they mean
@@ -3047 +3046 @@
     StorageUtl_WriteDWord(headerBigBlock, 0x40, (DWORD)0x0001);
   }
-  
+
   /*
    * Write the information to the header.
@@ -3054 +3053 @@
   {
     StorageUtl_WriteWord(
-      headerBigBlock, 
-      OFFSET_BIGBLOCKSIZEBITS,   
+      headerBigBlock,
+      OFFSET_BIGBLOCKSIZEBITS,
       This->bigBlockSizeBits);
 
     StorageUtl_WriteWord(
-      headerBigBlock, 
-      OFFSET_SMALLBLOCKSIZEBITS, 
+      headerBigBlock,
+      OFFSET_SMALLBLOCKSIZEBITS,
       This->smallBlockSizeBits);
 
     StorageUtl_WriteDWord(
-      headerBigBlock, 
-      OFFSET_BBDEPOTCOUNT,      
+      headerBigBlock,
+      OFFSET_BBDEPOTCOUNT,
       This->bigBlockDepotCount);
 
     StorageUtl_WriteDWord(
-      headerBigBlock, 
-      OFFSET_ROOTSTARTBLOCK,    
+      headerBigBlock,
+      OFFSET_ROOTSTARTBLOCK,
       This->rootStartBlock);
 
     StorageUtl_WriteDWord(
-      headerBigBlock, 
-      OFFSET_SBDEPOTSTART,      
+      headerBigBlock,
+      OFFSET_SBDEPOTSTART,
       This->smallBlockDepotStart);
 
     StorageUtl_WriteDWord(
-      headerBigBlock, 
-      OFFSET_EXTBBDEPOTSTART,   
+      headerBigBlock,
+      OFFSET_EXTBBDEPOTSTART,
       This->extBigBlockDepotStart);
 
     StorageUtl_WriteDWord(
-      headerBigBlock, 
-      OFFSET_EXTBBDEPOTCOUNT,   
+      headerBigBlock,
+      OFFSET_EXTBBDEPOTCOUNT,
       This->extBigBlockDepotCount);
 
@@ -3091 +3090 @@
     {
       StorageUtl_WriteDWord(
-        headerBigBlock, 
+        headerBigBlock,
         OFFSET_BBDEPOTSTART + (sizeof(ULONG)*index),
         (This->bigBlockDepotStart[index]));
     }
   }
-  
+
   /*
    * Write the big block back to the file.
@@ -3120 +3119 @@
   offsetInPropSet.s.HighPart = 0;
   offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
-  
+
   readSuccessful = BlockChainStream_ReadAt(
                     This->rootBlockChain,
@@ -3136 +3135 @@
     memset(buffer->name, 0, sizeof(buffer->name));
     memcpy(
-      buffer->name, 
-      propName, 
+      buffer->name,
+      propName,
       PROPERTY_NAME_BUFFER_LEN );
     TRACE("storage name: %s\n", debugstr_w(buffer->name));
 
     memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_PROPERTYTYPE, 1);
-    
+
     StorageUtl_ReadWord(
-      currentProperty,  
-      OFFSET_PS_NAMELENGTH,  
+      currentProperty,
+      OFFSET_PS_NAMELENGTH,
       &buffer->sizeOfNameString);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_PREVIOUSPROP, 
+      currentProperty,
+      OFFSET_PS_PREVIOUSPROP,
       &buffer->previousProperty);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_NEXTPROP,     
+      currentProperty,
+      OFFSET_PS_NEXTPROP,
       &buffer->nextProperty);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_DIRPROP,      
+      currentProperty,
+      OFFSET_PS_DIRPROP,
       &buffer->dirProperty);
 
     StorageUtl_ReadGUID(
-      currentProperty,  
-      OFFSET_PS_GUID,        
+      currentProperty,
+      OFFSET_PS_GUID,
       &buffer->propertyUniqueID);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_TSS1,         
+      currentProperty,
+      OFFSET_PS_TSS1,
       &buffer->timeStampS1);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_TSD1,         
+      currentProperty,
+      OFFSET_PS_TSD1,
       &buffer->timeStampD1);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_TSS2,         
+      currentProperty,
+      OFFSET_PS_TSS2,
       &buffer->timeStampS2);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_TSD2,         
+      currentProperty,
+      OFFSET_PS_TSD2,
       &buffer->timeStampD2);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_STARTBLOCK,   
+      currentProperty,
+      OFFSET_PS_STARTBLOCK,
       &buffer->startingBlock);
 
     StorageUtl_ReadDWord(
-      currentProperty, 
-      OFFSET_PS_SIZE,         
+      currentProperty,
+      OFFSET_PS_SIZE,
       &buffer->size.s.LowPart);
 
@@ -3223 +3222 @@
 
   memcpy(
-    currentProperty + OFFSET_PS_NAME, 
-    buffer->name, 
+    currentProperty + OFFSET_PS_NAME,
+    buffer->name,
     PROPERTY_NAME_BUFFER_LEN );
 
@@ -3230 +3229 @@
 
   StorageUtl_WriteWord(
-    currentProperty,  
-      OFFSET_PS_NAMELENGTH,   
+    currentProperty,
+      OFFSET_PS_NAMELENGTH,
       buffer->sizeOfNameString);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_PREVIOUSPROP, 
+    currentProperty,
+      OFFSET_PS_PREVIOUSPROP,
       buffer->previousProperty);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_NEXTPROP,     
+    currentProperty,
+      OFFSET_PS_NEXTPROP,
       buffer->nextProperty);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_DIRPROP,      
+    currentProperty,
+      OFFSET_PS_DIRPROP,
       buffer->dirProperty);
 
   StorageUtl_WriteGUID(
-    currentProperty,  
-      OFFSET_PS_GUID,        
+    currentProperty,
+      OFFSET_PS_GUID,
       &buffer->propertyUniqueID);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_TSS1,         
+    currentProperty,
+      OFFSET_PS_TSS1,
       buffer->timeStampS1);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_TSD1,         
+    currentProperty,
+      OFFSET_PS_TSD1,
       buffer->timeStampD1);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_TSS2,         
+    currentProperty,
+      OFFSET_PS_TSS2,
       buffer->timeStampS2);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_TSD2,         
+    currentProperty,
+      OFFSET_PS_TSD2,
       buffer->timeStampD2);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_STARTBLOCK,   
+    currentProperty,
+      OFFSET_PS_STARTBLOCK,
       buffer->startingBlock);
 
   StorageUtl_WriteDWord(
-    currentProperty, 
-      OFFSET_PS_SIZE,         
+    currentProperty,
+      OFFSET_PS_SIZE,
       buffer->size.s.LowPart);
 
@@ -3327 +3326 @@
 
     StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
-    
+
     return TRUE;
   }
-  
+
   return FALSE;
 }
@@ -3460 +3459 @@
 
 StorageInternalImpl* StorageInternalImpl_Construct(
-  StorageImpl* ancestorStorage,  
+  StorageImpl* ancestorStorage,
   ULONG          rootPropertyIndex)
 {
@@ -3511 +3510 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Commit( 
+HRESULT WINAPI StorageInternalImpl_Commit(
   IStorage*            iface,
-  DWORD                  grfCommitFlags)  /* [in] */ 
+  DWORD                  grfCommitFlags)  /* [in] */
 {
   return S_OK;
 }
-        
+
 /******************************************************************************
 **
@@ -3525 +3524 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Revert( 
+HRESULT WINAPI StorageInternalImpl_Revert(
   IStorage*            iface)
 {
@@ -3542 +3541 @@
 
   newEnumeration = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumSTATSTGImpl));
-  
+
   if (newEnumeration!=0)
   {
@@ -3550 +3549 @@
     ICOM_VTBL(newEnumeration) = &IEnumSTATSTGImpl_Vtbl;
     newEnumeration->ref       = 0;
-    
+
     /*
      * We want to nail-down the reference to the storage in case the
@@ -3557 +3556 @@
     newEnumeration->parentStorage = parentStorage;
     IStorage_AddRef((IStorage*)newEnumeration->parentStorage);
-    
+
     newEnumeration->firstPropertyNode   = firstPropertyNode;
-    
+
     /*
      * Initialize the search stack
@@ -3565 +3564 @@
     newEnumeration->stackSize    = 0;
     newEnumeration->stackMaxSize = ENUMSTATSGT_SIZE_INCREMENT;
-    newEnumeration->stackToVisit = 
+    newEnumeration->stackToVisit =
       HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG)*ENUMSTATSGT_SIZE_INCREMENT);
-    
+
     /*
      * Make sure the current node of the iterator is the first one.
@@ -3573 +3572 @@
     IEnumSTATSTGImpl_Reset((IEnumSTATSTG*)newEnumeration);
   }
-  
+
   return newEnumeration;
 }
@@ -3605 +3604 @@
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
   {
     *ppvObject = (IEnumSTATSTG*)This;
   }
-  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IEnumSTATSTG)) == 0) 
+  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IEnumSTATSTG)) == 0)
   {
     *ppvObject = (IEnumSTATSTG*)This;
@@ -3628 +3627 @@
   return S_OK;
 }
-        
+
 ULONG   WINAPI IEnumSTATSTGImpl_AddRef(
   IEnumSTATSTG* iface)
@@ -3637 +3636 @@
   return This->ref;
 }
-        
+
 ULONG   WINAPI IEnumSTATSTGImpl_Release(
   IEnumSTATSTG* iface)
@@ -3656 +3655 @@
   }
 
-  return newRef;;
+  return newRef;
 }
 
@@ -3676 +3675 @@
    */
   if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) )
-    return E_INVALIDARG;  
-  
+    return E_INVALIDARG;
+
   /*
    * To avoid the special case, get another pointer to a ULONG value if
@@ -3684 +3683 @@
   if (pceltFetched==0)
     pceltFetched = &objectFetched;
-  
+
   /*
    * Start the iteration, we will iterate until we hit the end of the
@@ -3696 +3695 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( ( *pceltFetched < celt) && 
+  while ( ( *pceltFetched < celt) &&
           ( currentSearchNode!=PROPERTY_NULL) )
   {
-    /* 
+    /*
      * Remove the top node from the stack
      */
@@ -3708 +3707 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode, 
+      currentSearchNode,
       &currentProperty);
 
@@ -3717 +3716 @@
       &currentProperty,
       STATFLAG_DEFAULT);
-        
+
     /*
      * Step to the next item in the iteration
@@ -3741 +3740 @@
 }
 
-        
+
 HRESULT WINAPI IEnumSTATSTGImpl_Skip(
   IEnumSTATSTG* iface,
@@ -3757 +3756 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( (objectFetched < celt) && 
+  while ( (objectFetched < celt) &&
           (currentSearchNode!=PROPERTY_NULL) )
   {
-    /* 
+    /*
      * Remove the top node from the stack
      */
@@ -3769 +3768 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode, 
+      currentSearchNode,
       &currentProperty);
-    
+
     /*
      * Step to the next item in the iteration
@@ -3793 +3792 @@
   return S_FALSE;
 }
-        
+
 HRESULT WINAPI IEnumSTATSTGImpl_Reset(
   IEnumSTATSTG* iface)
@@ -3812 +3811 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    This->firstPropertyNode, 
+                    This->firstPropertyNode,
                     &rootProperty);
 
@@ -3827 +3826 @@
   return S_OK;
 }
-        
+
 HRESULT WINAPI IEnumSTATSTGImpl_Clone(
   IEnumSTATSTG* iface,
@@ -3841 +3840 @@
   if (ppenum==0)
     return E_INVALIDARG;
-  
+
   newClone = IEnumSTATSTGImpl_Construct(This->parentStorage,
                This->firstPropertyNode);
 
-  
+
   /*
    * The new clone enumeration must point to the same current node as
@@ -3852 +3851 @@
   newClone->stackSize    = This->stackSize    ;
   newClone->stackMaxSize = This->stackMaxSize ;
-  newClone->stackToVisit = 
+  newClone->stackToVisit =
     HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * newClone->stackMaxSize);
 
   memcpy(
-    newClone->stackToVisit, 
-    This->stackToVisit, 
+    newClone->stackToVisit,
+    This->stackToVisit,
     sizeof(ULONG) * newClone->stackSize);
 
@@ -3873 +3872 @@
 INT IEnumSTATSTGImpl_FindParentProperty(
   IEnumSTATSTGImpl *This,
-  ULONG             childProperty, 
+  ULONG             childProperty,
   StgProperty      *currentProperty,
   ULONG            *thisNodeId)
@@ -3891 +3890 @@
    */
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
-  
+
 
   while (currentSearchNode!=PROPERTY_NULL)
@@ -3900 +3899 @@
     *thisNodeId = currentSearchNode;
 
-    /* 
+    /*
      * Remove the top node from the stack
      */
@@ -3910 +3909 @@
     StorageImpl_ReadProperty(
       This->parentStorage,
-      currentSearchNode, 
+      currentSearchNode,
       currentProperty);
-      
+
     if (currentProperty->previousProperty == childProperty)
       return PROPERTY_RELATION_PREVIOUS;
 
-    else if (currentProperty->nextProperty == childProperty)  
+    else if (currentProperty->nextProperty == childProperty)
       return PROPERTY_RELATION_NEXT;
-  
+
     else if (currentProperty->dirProperty == childProperty)
       return PROPERTY_RELATION_DIR;
-       
+
     /*
      * Push the next search node in the search stack.
@@ -3950 +3949 @@
   while (currentSearchNode!=PROPERTY_NULL)
   {
-    /* 
+    /*
      * Remove the top node from the stack
      */
@@ -3959 +3958 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode, 
+      currentSearchNode,
       currentProperty);
 
     if ( propertyNameCmp(
-          (OLECHAR*)currentProperty->name, 
+          (OLECHAR*)currentProperty->name,
           (OLECHAR*)lpszPropName) == 0)
       return currentSearchNode;
@@ -4002 +4001 @@
 
     This->stackToVisit = HeapReAlloc(
-                           GetProcessHeap(), 
+                           GetProcessHeap(),
                            0,
                            This->stackToVisit,
@@ -4016 +4015 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    nodeToPush, 
+                    nodeToPush,
                     &rootProperty);
 
@@ -4103 +4102 @@
   else
   {
-    destination->pwcsName = 
+    destination->pwcsName =
       CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR));
 
     strcpyW((LPWSTR)destination->pwcsName, source->name);
   }
-  
+
   switch (source->propertyType)
   {
@@ -4120 +4119 @@
     default:
       destination->type = STGTY_STREAM;
-      break;        
+      break;
   }
 
   destination->cbSize            = source->size;
-/*    
+/*
   currentReturnStruct->mtime     = {0}; TODO
   currentReturnStruct->ctime     = {0};
-  currentReturnStruct->atime     = {0}; 
+  currentReturnStruct->atime     = {0};
 */
   destination->grfMode           = 0;
-  destination->grfLocksSupported = 0; 
+  destination->grfLocksSupported = 0;
   destination->clsid             = source->propertyUniqueID;
-  destination->grfStateBits      = 0; 
-  destination->reserved          = 0; 
+  destination->grfStateBits      = 0;
+  destination->reserved          = 0;
 }
 
@@ -4141 +4140 @@
 
 BlockChainStream* BlockChainStream_Construct(
-  StorageImpl* parentStorage,  
+  StorageImpl* parentStorage,
   ULONG*         headOfStreamPlaceHolder,
   ULONG          propertyIndex)
@@ -4214 +4213 @@
  * Returns the number of blocks that comprises this chain.
  * This is not the size of the stream as the last block may not be full!
- * 
+ *
  */
 ULONG BlockChainStream_GetCount(BlockChainStream* This)
@@ -4228 +4227 @@
 
     blockIndex = StorageImpl_GetNextBlockInChain(
-                   This->parentStorage, 
+                   This->parentStorage,
                    blockIndex);
   }
@@ -4236 +4235 @@
 
 /******************************************************************************
- *      BlockChainStream_ReadAt 
+ *      BlockChainStream_ReadAt
  *
  * Reads a specified number of bytes from this chain at the specified offset.
@@ -4276 +4275 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex = 
+    blockIndex =
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-    
+
     blockNoInSequence--;
   }
@@ -4289 +4288 @@
   *bytesRead   = 0;
   bufferWalker = buffer;
-  
+
   while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) )
   {
@@ -4295 +4294 @@
      * Calculate how many bytes we can copy from this big block.
      */
-    bytesToReadInBuffer = 
+    bytesToReadInBuffer =
       min(This->parentStorage->bigBlockSize - offsetInBlock, size);
-    
+
     /*
      * Copy those bytes to the buffer
      */
-    bigBlockBuffer = 
+    bigBlockBuffer =
       StorageImpl_GetROBigBlock(This->parentStorage, blockIndex);
-    
+
     memcpy(bufferWalker, bigBlockBuffer + offsetInBlock, bytesToReadInBuffer);
-    
+
     StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
-    
+
     /*
      * Step to the next big block.
      */
-    blockIndex    = 
+    blockIndex    =
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4320 +4319 @@
 
   }
-  
+
   return (size == 0);
 }
@@ -4365 +4364 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex = 
+    blockIndex =
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-    
+
     blockNoInSequence--;
   }
@@ -4385 +4384 @@
      * Calculate how many bytes we can copy from this big block.
      */
-    bytesToWrite = 
+    bytesToWrite =
       min(This->parentStorage->bigBlockSize - offsetInBlock, size);
-    
+
     /*
      * Copy those bytes to the buffer
      */
     bigBlockBuffer = StorageImpl_GetBigBlock(This->parentStorage, blockIndex);
-    
+
     memcpy(bigBlockBuffer + offsetInBlock, bufferWalker, bytesToWrite);
-    
+
     StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
-    
+
     /*
      * Step to the next big block.
      */
-    blockIndex    = 
+    blockIndex    =
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4408 +4407 @@
     offsetInBlock  = 0;      /* There is no offset on the next block */
   }
-  
+
   return (size == 0);
 }
@@ -4445 +4444 @@
   while (count < numBlocks)
   {
-    blockIndex = 
+    blockIndex =
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4452 +4451 @@
 
   /* Get the next block before marking the new end */
-  extraBlock = 
+  extraBlock =
     StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
   /* Mark the new end of chain */
   StorageImpl_SetNextBlockInChain(
-    This->parentStorage, 
-    blockIndex, 
+    This->parentStorage,
+    blockIndex,
     BLOCK_END_OF_CHAIN);
 
@@ -4469 +4468 @@
   while (extraBlock != BLOCK_END_OF_CHAIN)
   {
-    blockIndex = 
+    blockIndex =
       StorageImpl_GetNextBlockInChain(This->parentStorage, extraBlock);
 
@@ -4513 +4512 @@
 
       StorageImpl_ReadProperty(
-        This->parentStorage, 
+        This->parentStorage,
         This->ownerPropertyIndex,
         &chainProp);
 
-      chainProp.startingBlock = blockIndex; 
+      chainProp.startingBlock = blockIndex;
 
       StorageImpl_WriteProperty(
-        This->parentStorage, 
+        This->parentStorage,
         This->ownerPropertyIndex,
         &chainProp);
@@ -4569 +4568 @@
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage, 
-        currentBlock, 
+        This->parentStorage,
+        currentBlock,
         blockIndex);
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage, 
-        blockIndex, 
+        This->parentStorage,
+        blockIndex,
         BLOCK_END_OF_CHAIN);
 
@@ -4597 +4596 @@
  * TODO: Free the actual blocks in the file when we shrink the chain.
  *       Currently, the blocks are still in the file. So the file size
- *       doesn't shrink even if we shrink streams. 
+ *       doesn't shrink even if we shrink streams.
  */
 BOOL BlockChainStream_SetSize(
@@ -4614 +4613 @@
   else
   {
-    ULARGE_INTEGER fileSize = 
+    ULARGE_INTEGER fileSize =
       BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
 
@@ -4623 +4622 @@
      */
     if ((diff % This->parentStorage->bigBlockSize) != 0)
-      diff += (This->parentStorage->bigBlockSize - 
+      diff += (This->parentStorage->bigBlockSize -
                 (diff % This->parentStorage->bigBlockSize) );
 
@@ -4647 +4646 @@
   if(This->headOfStreamPlaceHolder == NULL)
   {
-    /* 
-     * This chain is a data stream read the property and return 
+    /*
+     * This chain is a data stream read the property and return
      * the appropriate size
      */
@@ -4661 +4660 @@
   {
     /*
-     * this chain is a chain that does not have a property, figure out the 
-     * size by making the product number of used blocks times the 
+     * this chain is a chain that does not have a property, figure out the
+     * size by making the product number of used blocks times the
      * size of them
      */
@@ -4668 +4667 @@
     result.s.HighPart = 0;
 
-    result.s.LowPart  = 
-      BlockChainStream_GetCount(This) * 
+    result.s.LowPart  =
+      BlockChainStream_GetCount(This) *
       This->parentStorage->bigBlockSize;
 
@@ -4681 +4680 @@
 
 SmallBlockChainStream* SmallBlockChainStream_Construct(
-  StorageImpl* parentStorage,  
+  StorageImpl* parentStorage,
   ULONG          propertyIndex)
 {
@@ -4732 +4731 @@
  *
  * Returns the index of the next small block in this chain.
- * 
+ *
  * Return Values:
  *    - BLOCK_END_OF_CHAIN: end of this chain
@@ -4859 +4858 @@
     else
     {
-      ULONG count = 
+      ULONG count =
         BlockChainStream_GetCount(This->parentStorage->smallBlockDepotChain);
 
@@ -4870 +4869 @@
       {
         sbdIndex = nextBlock;
-        nextBlock = 
+        nextBlock =
           StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex);
       }
@@ -4877 +4876 @@
       if (sbdIndex != BLOCK_END_OF_CHAIN)
         StorageImpl_SetNextBlockInChain(
-          This->parentStorage, 
-          sbdIndex, 
+          This->parentStorage,
+          sbdIndex,
           newsbdIndex);
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage, 
-        newsbdIndex, 
+        This->parentStorage,
+        newsbdIndex,
         BLOCK_END_OF_CHAIN);
 
@@ -4889 +4888 @@
        * Initialize all the small blocks to free
        */
-      smallBlockDepot = 
+      smallBlockDepot =
         StorageImpl_GetBigBlock(This->parentStorage, newsbdIndex);
 
@@ -4901 +4900 @@
          */
         StgProperty rootProp;
-        ULONG sbStartIndex; 
+        ULONG sbStartIndex;
 
         /*
@@ -4910 +4909 @@
 
         /*
-         * And allocate the first big block that will contain small blocks 
+         * And allocate the first big block that will contain small blocks
          */
-        sbStartIndex = 
+        sbStartIndex =
           StorageImpl_GetNextFreeBigBlock(This->parentStorage);
 
         StorageImpl_SetNextBlockInChain(
-          This->parentStorage, 
-          sbStartIndex, 
+          This->parentStorage,
+          sbStartIndex,
           BLOCK_END_OF_CHAIN);
 
         StorageImpl_ReadProperty(
-          This->parentStorage, 
-          This->parentStorage->rootPropertySetIndex, 
+          This->parentStorage,
+          This->parentStorage->rootPropertySetIndex,
           &rootProp);
 
@@ -4930 +4929 @@
 
         StorageImpl_WriteProperty(
-          This->parentStorage, 
-          This->parentStorage->rootPropertySetIndex, 
+          This->parentStorage,
+          This->parentStorage->rootPropertySetIndex,
           &rootProp);
       }
@@ -4937 +4936 @@
   }
 
-  smallBlocksPerBigBlock = 
+  smallBlocksPerBigBlock =
     This->parentStorage->bigBlockSize / This->parentStorage->smallBlockSize;
 
@@ -4949 +4948 @@
 
     StorageImpl_ReadProperty(
-      This->parentStorage, 
-      This->parentStorage->rootPropertySetIndex, 
+      This->parentStorage,
+      This->parentStorage->rootPropertySetIndex,
       &rootProp);
 
-    if (rootProp.size.s.LowPart < 
+    if (rootProp.size.s.LowPart <
        (blocksRequired * This->parentStorage->bigBlockSize))
     {
@@ -4959 +4958 @@
 
       BlockChainStream_SetSize(
-        This->parentStorage->smallBlockRootChain, 
+        This->parentStorage->smallBlockRootChain,
         rootProp.size);
 
       StorageImpl_WriteProperty(
-        This->parentStorage, 
-        This->parentStorage->rootPropertySetIndex, 
+        This->parentStorage,
+        This->parentStorage->rootPropertySetIndex,
         &rootProp);
     }
@@ -4977 +4976 @@
  * Reads a specified number of bytes from this chain at the specified offset.
  * bytesRead may be NULL.
- * Failure will be returned if the specified number of bytes has not been read. 
+ * Failure will be returned if the specified number of bytes has not been read.
  */
 BOOL SmallBlockChainStream_ReadAt(
@@ -4987 +4986 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence = 
+  ULONG blockNoInSequence =
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -5024 +5023 @@
      * Calculate how many bytes we can copy from this small block.
      */
-    bytesToReadInBuffer = 
+    bytesToReadInBuffer =
       min(This->parentStorage->smallBlockSize - offsetInBlock, size);
 
@@ -5031 +5030 @@
      */
     offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   = 
+    offsetInBigBlockFile.s.LowPart   =
       blockIndex * This->parentStorage->smallBlockSize;
 
@@ -5075 +5074 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence = 
+  ULONG blockNoInSequence =
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -5083 +5082 @@
   ULONG bytesWrittenFromBigBlockFile;
   BYTE* bufferWalker;
-  
+
   /*
    * This should never happen on a small block file.
    */
   assert(offset.s.HighPart==0);
-  
+
   /*
    * Find the first block in the stream that contains part of the buffer.
    */
   blockIndex = SmallBlockChainStream_GetHeadOfChain(This);
-  
+
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
     blockIndex = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex);
-    
+
     blockNoInSequence--;
   }
-  
+
   /*
    * Start writing the buffer.
@@ -5114 +5113 @@
      * Calculate how many bytes we can copy to this small block.
      */
-    bytesToWriteInBuffer = 
+    bytesToWriteInBuffer =
       min(This->parentStorage->smallBlockSize - offsetInBlock, size);
-    
+
     /*
      * Calculate the offset of the small block in the small block file.
      */
     offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   = 
+    offsetInBigBlockFile.s.LowPart   =
       blockIndex * This->parentStorage->smallBlockSize;
 
     offsetInBigBlockFile.s.LowPart  += offsetInBlock;
-    
+
     /*
      * Write those bytes in the buffer to the small block file.
@@ -5134 +5133 @@
       bufferWalker,
       &bytesWrittenFromBigBlockFile);
-    
+
     assert(bytesWrittenFromBigBlockFile == bytesToWriteInBuffer);
-    
+
     /*
      * Step to the next big block.
@@ -5146 +5145 @@
     offsetInBlock  = 0;     /* There is no offset on the next block */
   }
-  
+
   return (size == 0);
 }
@@ -5153 +5152 @@
  *       SmallBlockChainStream_Shrink
  *
- * Shrinks this chain in the small block depot. 
+ * Shrinks this chain in the small block depot.
  */
 BOOL SmallBlockChainStream_Shrink(
@@ -5181 +5180 @@
   /*
    * If the count is 0, we have a special case, the head of the chain was
-   * just freed. 
+   * just freed.
    */
   if (count == 0)
@@ -5187 +5186 @@
     StgProperty chainProp;
 
-    StorageImpl_ReadProperty(This->parentStorage, 
+    StorageImpl_ReadProperty(This->parentStorage,
                              This->ownerPropertyIndex,
                              &chainProp);
@@ -5209 +5208 @@
     /* Mark the new end of chain */
     SmallBlockChainStream_SetNextBlockInChain(
-      This, 
-      blockIndex, 
+      This,
+      blockIndex,
       BLOCK_END_OF_CHAIN);
   }
@@ -5224 +5223 @@
   }
 
-  return TRUE;  
+  return TRUE;
 }
 
@@ -5260 +5259 @@
     blockIndex = chainProp.startingBlock;
     SmallBlockChainStream_SetNextBlockInChain(
-      This, 
-      blockIndex, 
+      This,
+      blockIndex,
       BLOCK_END_OF_CHAIN);
   }
@@ -5294 +5293 @@
 
     SmallBlockChainStream_SetNextBlockInChain(
-      This, 
-      blockIndex, 
+      This,
+      blockIndex,
       BLOCK_END_OF_CHAIN);
 
@@ -5336 +5335 @@
  * TODO: Free the actual blocks in the file when we shrink the chain.
  *       Currently, the blocks are still in the file. So the file size
- *       doesn't shrink even if we shrink streams. 
+ *       doesn't shrink even if we shrink streams.
  */
 BOOL SmallBlockChainStream_SetSize(
@@ -5394 +5393 @@
   WCHAR          tempFileName[MAX_PATH];
 
-  TRACE("(%s, %lx, %ld, %p)\n", 
-        debugstr_w(pwcsName), grfMode, 
+  TRACE("(%s, %lx, %ld, %p)\n",
+        debugstr_w(pwcsName), grfMode,
         reserved, ppstgOpen);
 
@@ -5442 +5441 @@
 
   /*
-   * Interpret the STGM value grfMode 
+   * Interpret the STGM value grfMode
    */
   shareMode    = GetShareModeFromSTGM(grfMode);
@@ -5467 +5466 @@
                         fileAttributes,
             0);
- 
+
   if (hFile == INVALID_HANDLE_VALUE)
   {
@@ -5477 +5476 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
- 
+
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5489 +5488 @@
          TRUE,
          TRUE);
- 
+
   if (FAILED(hr))
   {
@@ -5515 +5514 @@
   DWORD           grfMode,
   SNB           snbExclude,
-  DWORD           reserved, 
+  DWORD           reserved,
   IStorage      **ppstgOpen)
 {
@@ -5526 +5525 @@
   DWORD          length;
 
-  TRACE("(%s, %p, %lx, %p, %ld, %p)\n", 
+  TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
         debugstr_w(pwcsName), pstgPriority, grfMode,
         snbExclude, reserved, ppstgOpen);
@@ -5558 +5557 @@
    */
   *ppstgOpen = 0;
-  
-  hFile = CreateFileW( pwcsName, 
+
+  hFile = CreateFileW( pwcsName,
                        accessMode,
                        shareMode,
@@ -5566 +5565 @@
                        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
                        0);
-  
+
   length = GetFileSize(hFile, NULL);
-  
+
   if (hFile==INVALID_HANDLE_VALUE)
   {
@@ -5605 +5604 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-  
+
   if (newStorage == 0)
   {
@@ -5621 +5620 @@
          TRUE,
          !length );
-  
+
   if (FAILED(hr))
   {
@@ -5632 +5631 @@
     goto end;
   }
-  
+
   /* prepare the file name string given in lieu of the root property name */
   GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL);
@@ -5645 +5644 @@
          (REFIID)&IID_IStorage,
          (void**)ppstgOpen);
-  
+
 end:
   TRACE("<-- %08lx, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL);
@@ -5700 +5699 @@
          (void**)ppstgOpen);
 
-  return hr;  
+  return hr;
 }
 
@@ -5738 +5737 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
- 
+
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5826 +5825 @@
     STATSTG pstatstg;
     HRESULT hRes;
-    
+
     TRACE("()\n");
 
@@ -5887 +5886 @@
     CLSID clsid;
     HRESULT res;
-    
+
     TRACE("(%p,%p)\n",pPStm,pStm);
 
@@ -5893 +5892 @@
 
     if (SUCCEEDED(res)){
-        
+
         res=WriteClassStm(pStm,&clsid);
 
@@ -5911 +5910 @@
  * STGM_TRANSACTED           0x00010000
  * STGM_SIMPLE               0x08000000
- * 
+ *
  * STGM_READ                 0x00000000
  * STGM_WRITE                0x00000001
  * STGM_READWRITE            0x00000002
- * 
+ *
  * STGM_SHARE_DENY_NONE      0x00000040
  * STGM_SHARE_DENY_READ      0x00000030
  * STGM_SHARE_DENY_WRITE     0x00000020
  * STGM_SHARE_EXCLUSIVE      0x00000010
- * 
+ *
  * STGM_PRIORITY             0x00040000
  * STGM_DELETEONRELEASE      0x04000000
@@ -5936 +5935 @@
   BOOL bSTGM_SIMPLE           = ((stgm & STGM_SIMPLE) == STGM_SIMPLE);
   BOOL bSTGM_DIRECT           = ! (bSTGM_TRANSACTED || bSTGM_SIMPLE);
-   
+
   BOOL bSTGM_WRITE            = ((stgm & STGM_WRITE) == STGM_WRITE);
   BOOL bSTGM_READWRITE        = ((stgm & STGM_READWRITE) == STGM_READWRITE);
   BOOL bSTGM_READ             = ! (bSTGM_WRITE || bSTGM_READWRITE);
-   
+
   BOOL bSTGM_SHARE_DENY_NONE  =
                      ((stgm & STGM_SHARE_DENY_NONE)  == STGM_SHARE_DENY_NONE);
@@ -5955 +5954 @@
   BOOL bSTGM_CREATE           = ((stgm & STGM_CREATE) == STGM_CREATE);
   BOOL bSTGM_CONVERT          = ((stgm & STGM_CONVERT) == STGM_CONVERT);
-   
+
   BOOL bSTGM_NOSCRATCH        = ((stgm & STGM_NOSCRATCH) == STGM_NOSCRATCH);
   BOOL bSTGM_NOSNAPSHOT       = ((stgm & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT);
 
-  /* 
+  /*
    * STGM_DIRECT | STGM_TRANSACTED | STGM_SIMPLE
    */
@@ -5966 +5965 @@
       return E_FAIL;
 
-  /* 
+  /*
    * STGM_WRITE |  STGM_READWRITE | STGM_READ
    */
@@ -5974 +5973 @@
 
   /*
-   * STGM_SHARE_DENY_NONE | others 
+   * STGM_SHARE_DENY_NONE | others
    * (I assume here that DENY_READ implies DENY_WRITE)
    */
   if ( bSTGM_SHARE_DENY_NONE )
     if ( bSTGM_SHARE_DENY_READ ||
-         bSTGM_SHARE_DENY_WRITE || 
-         bSTGM_SHARE_EXCLUSIVE) 
+         bSTGM_SHARE_DENY_WRITE ||
+         bSTGM_SHARE_EXCLUSIVE)
       return E_FAIL;
 
@@ -5995 +5994 @@
   if ( bSTGM_NOSCRATCH && ! bSTGM_TRANSACTED )
     return E_FAIL;
-  
-  /*
-   * STGM_NOSNAPSHOT requires STGM_TRANSACTED and 
+
+  /*
+   * STGM_NOSNAPSHOT requires STGM_TRANSACTED and
    * not STGM_SHARE_EXCLUSIVE or STGM_SHARE_DENY_WRITE`
    */
   if (bSTGM_NOSNAPSHOT)
   {
-    if ( ! ( bSTGM_TRANSACTED && 
+    if ( ! ( bSTGM_TRANSACTED &&
            !(bSTGM_SHARE_EXCLUSIVE || bSTGM_SHARE_DENY_WRITE)) )
     return E_FAIL;
@@ -6014 +6013 @@
  *
  * This method will return a share mode flag from a STGM value.
- * The STGM value is assumed valid. 
+ * The STGM value is assumed valid.
  */
 static DWORD GetShareModeFromSTGM(DWORD stgm)
@@ -6090 +6089 @@
 
 /*************************************************************************
- * OLECONVERT_LoadOLE10 [Internal] 
- *
- * Loads the OLE10 STREAM to memory 
+ * OLECONVERT_LoadOLE10 [Internal]
+ *
+ * Loads the OLE10 STREAM to memory
  *
  * PARAMS
@@ -6105 +6104 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *     
+ *
  *     Memory allocated for pData must be freed by the caller
  */
@@ -6260 +6259 @@
 
 /*************************************************************************
- * OLECONVERT_SaveOLE10 [Internal] 
- *
- * Saves the OLE10 STREAM From memory 
+ * OLECONVERT_SaveOLE10 [Internal]
+ *
+ * Saves the OLE10 STREAM From memory
  *
  * PARAMS
@@ -6274 +6273 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *     
+ *
  */
 HRESULT OLECONVERT_SaveOLE10(OLECONVERT_OLESTREAM_DATA *pData, LPOLESTREAM pOleStream)
@@ -6368 +6367 @@
 
 /*************************************************************************
- * OLECONVERT_GetOLE20FromOLE10[Internal] 
+ * OLECONVERT_GetOLE20FromOLE10[Internal]
  *
  * This function copies OLE10 Data (the IStorage in the OLESTREAM) to disk,
- * opens it, and copies the content to the dest IStorage for 
+ * opens it, and copies the content to the dest IStorage for
  * OleConvertOLESTREAMToIStorage
- * 
+ *
  *
  * PARAMS
@@ -6384 +6383 @@
  *
  * NOTES
- *     
- *     
+ *
+ *
  */
 void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, BYTE *pBuffer, DWORD nBufferLength)
@@ -6420 +6419 @@
 
 /*************************************************************************
- * OLECONVERT_WriteOLE20ToBuffer [Internal] 
- *
- * Saves the OLE10 STREAM From memory 
+ * OLECONVERT_WriteOLE20ToBuffer [Internal]
+ *
+ * Saves the OLE10 STREAM From memory
  *
  * PARAMS
@@ -6435 +6434 @@
  *
  *     Used by OleConvertIStorageToOLESTREAM only.
- *     
+ *
  */
 DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData)
@@ -6447 +6446 @@
 
     *pData = NULL;
-    
+
     /* Create temp Storage */
     GetTempPathW(MAX_PATH, wstrTempDir);
@@ -6474 +6473 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOleStream [Internal] 
+ * OLECONVERT_CreateOleStream [Internal]
  *
  * Creates the "\001OLE" stream in the IStorage if neccessary.
@@ -6489 +6488 @@
  *     This stream is still unknown, MS Word seems to have extra data
  *     but since the data is stored in the OLESTREAM there should be
- *     no need to recreate the stream.  If the stream is manually 
+ *     no need to recreate the stream.  If the stream is manually
  *     deleted it will create it with this default data.
- *     
+ *
  */
 void OLECONVERT_CreateOleStream(LPSTORAGE pStorage)
@@ -6498 +6497 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {1,'O', 'l', 'e', 0};
-    BYTE pOleStreamHeader [] = 
-    {
-        0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00 
+    BYTE pOleStreamHeader [] =
+    {
+        0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00
     };
-    
+
     /* Create stream if not present */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
         STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6519 +6518 @@
 
 /*************************************************************************
- * OLECONVERT_CreateCompObjStream [Internal] 
+ * OLECONVERT_CreateCompObjStream [Internal]
  *
  * Creates a "\001CompObj" is the destination IStorage if necessary.
  *
  * PARAMS
- *     pStorage       [I] The dest IStorage to create the CompObj Stream 
+ *     pStorage       [I] The dest IStorage to create the CompObj Stream
  *                        if necessary.
  *     strOleTypeName [I] The ProgID
@@ -6536 +6535 @@
  *
  *     The stream data is stored in the OLESTREAM and there should be
- *     no need to recreate the stream.  If the stream is manually 
+ *     no need to recreate the stream.  If the stream is manually
  *     deleted it will attempt to create it by querying the registry.
  *
- *     
+ *
  */
 HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName)
@@ -6558 +6557 @@
 
     /*  Create a CompObj stream if it doesn't exist */
-    hStorageRes = IStorage_CreateStream(pStorage, wstrStreamName, 
+    hStorageRes = IStorage_CreateStream(pStorage, wstrStreamName,
         STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
     if(hStorageRes == S_OK)
@@ -6579 +6578 @@
             LONG hErr;
             /* Get the CLSID Default Name from the Registry */
-            hErr = RegOpenKeyA(HKEY_CLASSES_ROOT, IStorageCompObj.strProgIDName, &hKey); 
+            hErr = RegOpenKeyA(HKEY_CLASSES_ROOT, IStorageCompObj.strProgIDName, &hKey);
             if(hErr == ERROR_SUCCESS)
             {
@@ -6621 +6620 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOlePresStream[Internal] 
+ * OLECONVERT_CreateOlePresStream[Internal]
  *
  * Creates the "\002OlePres000" Stream with the Metafile data
@@ -6628 +6627 @@
  *     pStorage     [I] The dest IStorage to create \002OLEPres000 stream in.
  *     dwExtentX    [I] Width of the Metafile
- *     dwExtentY    [I] Height of the Metafile 
+ *     dwExtentY    [I] Height of the Metafile
  *     pData        [I] Metafile data
  *     dwDataLength [I] Size of the Metafile data
@@ -6638 +6637 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *     
+ *
  */
 void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, DWORD dwExtentY , BYTE *pData, DWORD dwDataLength)
@@ -6645 +6644 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0};
-    BYTE pOlePresStreamHeader [] = 
-    {
-        0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 
-        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
+    BYTE pOlePresStreamHeader [] =
+    {
+        0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,
+        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
         0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00
     };
 
-    BYTE pOlePresStreamHeaderEmpty [] = 
-    {
-        0x00, 0x00, 0x00, 0x00, 
-        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
+    BYTE pOlePresStreamHeaderEmpty [] =
+    {
+        0x00, 0x00, 0x00, 0x00,
+        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
         0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00
     };
-     
+
     /* Create the OlePres000 Stream */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
         STGM_CREATE | STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6706 +6705 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOle10NativeStream [Internal] 
+ * OLECONVERT_CreateOle10NativeStream [Internal]
  *
  * Creates the "\001Ole10Native" Stream (should contain a BMP)
@@ -6722 +6721 @@
  *
  *     Might need to verify the data and return appropriate error message
- *     
+ *
  */
 void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, BYTE *pData, DWORD dwDataLength)
@@ -6729 +6728 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {1, 'O', 'l', 'e', '1', '0', 'N', 'a', 't', 'i', 'v', 'e', 0};
-    
+
     /* Create the Ole10Native Stream */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
         STGM_CREATE | STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6745 +6744 @@
 
 /*************************************************************************
- * OLECONVERT_GetOLE10ProgID [Internal] 
+ * OLECONVERT_GetOLE10ProgID [Internal]
  *
  * Finds the ProgID (or OleTypeID) from the IStorage
@@ -6761 +6760 @@
  *     This function is used by OleConvertIStorageToOLESTREAM only.
  *
- *     
+ *
  */
 HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DWORD *dwSize)
@@ -6772 +6771 @@
 
     /* Open the CompObj Stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6809 +6808 @@
             *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE);
         }
- 
+
     }
     return hRes;
@@ -6815 +6814 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle10PresData [Internal] 
+ * OLECONVERT_GetOle10PresData [Internal]
  *
  * Converts IStorage "/001Ole10Native" stream to a OLE10 Stream
@@ -6830 +6829 @@
  *
  *     Memory allocated for pData must be freed by the caller
- *      
- *     
+ *
+ *
  */
 void OLECONVERT_GetOle10PresData(LPSTORAGE pStorage, OLECONVERT_OLESTREAM_DATA *pOleStreamData)
@@ -6851 +6850 @@
 
     /* Open Ole10Native Stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6870 +6869 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle20PresData[Internal] 
+ * OLECONVERT_GetOle20PresData[Internal]
  *
  * Converts IStorage "/002OlePres000" stream to a OLE10 Stream
@@ -6883 +6882 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *     
+ *
  *     Memory allocated for pData must be freed by the caller
  */
@@ -6910 +6909 @@
 
     /* Open OlePress000 stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6958 +6957 @@
 
 /*************************************************************************
- * OleConvertOLESTREAMToIStorage [OLE32.87] 
+ * OleConvertOLESTREAMToIStorage [OLE32.87]
  *
  * Read info on MSDN
@@ -6967 +6966 @@
  *      Still some unknowns for the IStorage: "\002OlePres000", "\001CompObj",
  *      and "\001OLE" streams
- *     
+ *
  */
 HRESULT WINAPI OleConvertOLESTREAMToIStorage (
-    LPOLESTREAM pOleStream, 
-    LPSTORAGE pstg, 
+    LPOLESTREAM pOleStream,
+    LPSTORAGE pstg,
     const DVTARGETDEVICE* ptd)
 {
@@ -7062 +7061 @@
  *      Still some unknowns for the IStorage: "\002OlePres000", "\001CompObj",
  *      and "\001OLE" streams.
- *     
+ *
  */
 HRESULT WINAPI OleConvertIStorageToOLESTREAM (
-    LPSTORAGE pstg, 
+    LPSTORAGE pstg,
     LPOLESTREAM pOleStream)
 {
@@ -7090 +7089 @@
     {
         /* Was it originally Ole10 */
-        hRes = IStorage_OpenStream(pstg, wstrStreamName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &pStream);    
+        hRes = IStorage_OpenStream(pstg, wstrStreamName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &pStream);
         if(hRes == S_OK)
         {