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

Timestamp:

Sep 15, 2001, 11:32:00 AM (24 years ago)

Author:

sandervl

Message:

restored old version + wine update

File:

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

trunk/src/ole32/storage32.c

@@ -1 @@
-/* $Id: storage32.c,v 1.3 2001-09-05 13:17:12 bird Exp $ */
 /*
  * Compound Storage (32 bit version)
@@ -38 +37 @@
 #define FILE_BEGIN 0
 
+#ifdef __WIN32OS2__
+#undef FIXME
+#undef TRACE
+#ifdef DEBUG
+#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
+#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
+#else
+#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#endif
+#endif
+
 
 /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
@@ -48 +59 @@
 /* OLESTREAM memory structure to use for Get and Put Routines */
 /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
-typedef struct
+typedef struct 
 {
     DWORD dwOleID;
@@ -86 +97 @@
     DWORD dwExtentX;
     DWORD dwExtentY;
-    DWORD dwSize;
+    DWORD dwSize;  
     BYTE *pData;
 }OLECONVERT_ISTORAGE_OLEPRES;
@@ -111 +122 @@
   INT         typeOfRelation);
 
-static HRESULT adjustPropertyChain(
+static HRESULT adjustPropertyChain( 
   StorageImpl *This,
   StgProperty   propertyToDelete,
@@ -138 +149 @@
  * Declaration of miscellaneous functions...
  */
-static HRESULT validateSTGM(DWORD stgmValue);
+static HRESULT validateSTGM(DWORD stgmValue); 
 
 static DWORD GetShareModeFromSTGM(DWORD stgm);
@@ -224 +235 @@
  * This method implements the common QueryInterface for all IStorage32
  * implementations contained in this file.
- *
+ * 
  * See Windows documentation for more details on IUnknown methods.
  */
@@ -238 +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.
@@ -261 +272 @@
   if ((*ppvObject)==0)
     return E_NOINTERFACE;
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -270 +281 @@
   return S_OK;
 }
-
+        
 /************************************************************************
  * Storage32BaseImpl_AddRef (IUnknown)
@@ -276 +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)
 {
@@ -287 +298 @@
   return This->ref;
 }
-
+        
 /************************************************************************
  * Storage32BaseImpl_Release (IUnknown)
@@ -293 +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)
 {
@@ -311 +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.
      */
@@ -319 +330 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -330 +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);
@@ -344 +355 @@
   ULONG             foundPropertyIndex;
 
-  TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
+  TRACE("(%p, %s, %p, %lx, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
 
   /*
@@ -352 +363 @@
   if ( (pwcsName==NULL) || (ppstm==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the out parameter
    */
   *ppstm = 0;
-
+  
   /*
    * Validate the STGM flags
@@ -376 +387 @@
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-    This->ancestorStorage,
+    This->ancestorStorage, 
     This->rootPropertySetIndex);
-
+  
   /*
    * Search the enumeration for the property with the given name
@@ -386 +397 @@
     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)
     {
@@ -406 +417 @@
 
       /*
-       * 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);
-
+      
       return S_OK;
     }
-
+    
     return E_OUTOFMEMORY;
   }
-
+  
   return STG_E_FILENOTFOUND;
 }
@@ -424 +435 @@
  *
  * 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);
@@ -442 +453 @@
   ULONG                  foundPropertyIndex;
 
-  TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), pstgPriority,
-    grfMode, snbExclude, reserved, ppstg);
-
+  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.
@@ -451 +462 @@
   if ( (This==0) || (pwcsName==NULL) || (ppstg==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Validate the STGM flags
@@ -461 +472 @@
    * As documented.
    */
-  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) ||
+  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) || 
         (grfMode & STGM_DELETEONRELEASE) ||
         (grfMode & STGM_PRIORITY) )
@@ -470 +481 @@
    */
   *ppstg = 0;
-
+  
   /*
    * 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
@@ -485 +496 @@
                          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) )
   {
@@ -503 +514 @@
                    This->ancestorStorage,
                    foundPropertyIndex);
-
+    
     if (newStorage != 0)
     {
@@ -509 +520 @@
 
       /*
-       * 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);
-
+      
       return S_OK;
     }
-
+    
     return STG_E_INSUFFICIENTMEMORY;
   }
-
+  
   return STG_E_FILENOTFOUND;
 }
@@ -526 +537 @@
  * 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",
-    iface, reserved1, reserved2, reserved3, ppenum);
+  TRACE("(%p, %ld, %p, %ld, %p)\n", 
+        iface, reserved1, reserved2, reserved3, ppenum);
 
   /*
@@ -549 +560 @@
   if ( (This==0) || (ppenum==0))
     return E_INVALIDARG;
-
+  
   /*
    * Construct the enumerator.
@@ -566 +577 @@
      */
     IEnumSTATSTGImpl_AddRef(*ppenum);
-
+    
     return S_OK;
   }
@@ -577 +588 @@
  *
  * 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);
@@ -589 +600 @@
   BOOL         readSuccessful;
 
-  TRACE("(%p, %p, %lx)\n",
-    iface, pstatstg, grfStatFlag);
+  TRACE("(%p, %p, %lx)\n", 
+        iface, pstatstg, grfStatFlag);
 
   /*
@@ -609 +620 @@
   {
     StorageUtl_CopyPropertyToSTATSTG(
-      pstatstg,
-      &curProperty,
+      pstatstg, 
+      &curProperty, 
       grfStatFlag);
-
+    
     return S_OK;
   }
-
+  
   return E_FAIL;
 }
@@ -622 +633 @@
  * 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.
  */
@@ -640 +651 @@
   ULONG             foundPropertyIndex;
 
-  TRACE("(%p, %s, %s)\n",
-    iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
+  TRACE("(%p, %s, %s)\n", 
+        iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
 
   /*
@@ -687 +698 @@
      * 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
@@ -708 +719 @@
      */
     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.
@@ -757 +768 @@
     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); 
 
   }
@@ -781 +792 @@
  * 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.
@@ -799 +810 @@
   ULONG             foundPropertyIndex, newPropertyIndex;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), grfMode,
-    reserved1, reserved2, ppstm);
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), grfMode, 
+        reserved1, reserved2, ppstm);
 
   /*
@@ -846 +857 @@
   {
     /*
-     * 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));
@@ -878 +889 @@
   newStreamProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time
+  /* call CoFileTime to get the current time 
   newStreamProperty.timeStampS1
   newStreamProperty.timeStampD1
@@ -888 +899 @@
 
   /*
-   * Get a free property or create a new one
+   * Get a free property or create a new one 
    */
   newPropertyIndex = getFreeProperty(This->ancestorStorage);
@@ -894 +905 @@
   /*
    * 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.
    */
@@ -934 +945 @@
  * 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.
  *
@@ -949 +960 @@
 
   TRACE("(%p, %p)\n", iface, clsid);
-
+  
   success = StorageImpl_ReadProperty(This->ancestorStorage,
                                        This->rootPropertySetIndex,
@@ -970 +981 @@
 ** Storage32Impl implementation
 */
-
+        
 /************************************************************************
  * Storage32Impl_CreateStorage (IStorage)
@@ -978 +989 @@
  * 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;
@@ -995 +1006 @@
   HRESULT          hr;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), grfMode,
-    reserved1, reserved2, ppstg);
-
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), grfMode, 
+        reserved1, reserved2, ppstg);
+  
   /*
    * Validate parameters
@@ -1034 +1045 @@
   {
     /*
-     * 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));
@@ -1063 +1074 @@
   newProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time
+  /* call CoFileTime to get the current time 
   newProperty.timeStampS1
   newProperty.timeStampD1
@@ -1072 +1083 @@
   /*  newStorageProperty.propertyUniqueID */
 
-  /*
+  /* 
    * Obtain a free property in the property chain
    */
@@ -1079 +1090 @@
   /*
    * 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.
    */
@@ -1110 +1121 @@
   }
 
-
+  
   return S_OK;
 }
@@ -1141 +1152 @@
       if (currentProperty.sizeOfNameString == 0)
       {
-        /*
+        /* 
          * The property existis and is available, we found it.
          */
@@ -1158 +1169 @@
   } while (newPropertyIndex == PROPERTY_NULL);
 
-  /*
-   * grow the property chain
+  /* 
+   * grow the property chain 
    */
   if (! readSuccessful)
@@ -1169 +1180 @@
     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;
@@ -1204 +1215 @@
       StorageImpl_WriteProperty(
         storage->ancestorStorage,
-        propertyIndex,
+        propertyIndex, 
         &emptyProperty);
     }
@@ -1216 +1227 @@
  * Internal Method
  *
- * Case insensitive comparaison of StgProperty.name by first considering
+ * Case insensitive comparaison of StgProperty.name by first considering 
  * their size.
  *
@@ -1229 +1240 @@
   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
      */
@@ -1237 +1248 @@
   }
 
-  return diff;
+  return diff;  
 }
 
@@ -1249 +1260 @@
   StorageImpl *storage,
   ULONG         newPropertyIndex,
-  StgProperty   newProperty)
+  StgProperty   newProperty) 
 {
   StgProperty currentProperty;
@@ -1262 +1273 @@
   if (currentProperty.dirProperty != PROPERTY_NULL)
   {
-    /*
+    /* 
      * The root storage contains some element, therefore, start the research
      * for the appropriate location.
@@ -1275 +1286 @@
 
     /*
-     * Read
+     * Read 
      */
     StorageImpl_ReadProperty(storage->ancestorStorage,
@@ -1288 +1299 @@
     {
       LONG diff = propertyNameCmp( newProperty.name, currentProperty.name);
-
+  
       if (diff < 0)
       {
@@ -1327 +1338 @@
       else
       {
-    /*
-     * Trying to insert an item with the same name in the
-     * subtree structure.
-     */
-    assert(FALSE);
+        /*
+         * Trying to insert an item with the same name in the
+         * subtree structure.
+         */
+        assert(FALSE);
       }
 
@@ -1340 +1351 @@
   else
   {
-    /*
+    /* 
      * The root storage is empty, link the new property to it's dir property
      */
@@ -1350 +1361 @@
 }
 
-
+      
 /*************************************************************************
  * 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;
@@ -1370 +1381 @@
     FIXME("Exclude option not implemented\n");
 
-  TRACE("(%p, %ld, %p, %p, %p)\n",
-    iface, ciidExclude, rgiidExclude,
-    snbExclude, pstgDest);
+  TRACE("(%p, %ld, %p, %p, %p)\n", 
+        iface, ciidExclude, rgiidExclude, 
+        snbExclude, pstgDest);
 
   /*
@@ -1380 +1391 @@
     return STG_E_INVALIDPOINTER;
 
-  /*
+  /* 
    * Enumerate the elements
    */
@@ -1393 +1404 @@
   IStorage_Stat( iface, &curElement, STATFLAG_NONAME);
   IStorage_SetClass( pstgDest, &curElement.clsid );
-
+  
   do
   {
@@ -1413 +1424 @@
        */
       hr = IStorage_OpenStorage( iface, curElement.pwcsName, NULL,
-                 STGM_READ|STGM_SHARE_EXCLUSIVE,
-                 NULL, 0, &pstgChild );
+                                 STGM_READ|STGM_SHARE_EXCLUSIVE,
+                                 NULL, 0, &pstgChild );
 
       if (hr != S_OK)
@@ -1425 +1436 @@
       if (pstgChild == pstgDest)
       {
-    IEnumSTATSTG_Release(elements);
-
-    return STG_E_ACCESSDENIED;
+        IEnumSTATSTG_Release(elements);
+
+        return STG_E_ACCESSDENIED;
       }
-
+            
       /*
        * create a new storage in destination storage
@@ -1435 +1446 @@
       hr = IStorage_CreateStorage( pstgDest, curElement.pwcsName,
                                    STGM_FAILIFTHERE|STGM_WRITE|STGM_SHARE_EXCLUSIVE,
-                   0, 0,
+                                   0, 0,
                                    &pstgTmp );
       /*
@@ -1446 +1457 @@
                                    NULL, 0, &pstgTmp );
       }
-
+        
       if (hr != S_OK)
         break;
 
-
+        
       /*
        * do the copy recursively
@@ -1456 +1467 @@
       hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude,
                                snbExclude, pstgTmp );
-
+                                
       IStorage_Release( pstgTmp );
       IStorage_Release( pstgChild );
@@ -1477 +1488 @@
        */
       hr = IStorage_OpenStream( iface, curElement.pwcsName, NULL,
-                STGM_READ|STGM_SHARE_EXCLUSIVE,
-                0, &pstrChild );
+                                STGM_READ|STGM_SHARE_EXCLUSIVE,
+                                0, &pstrChild );
 
       if (hr != S_OK)
@@ -1492 +1503 @@
        */
       IStream_SetSize(pstrTmp, strStat.cbSize);
-
+      
       /*
        * do the copy
@@ -1498 +1509 @@
       hr = IStream_CopyTo( pstrChild, pstrTmp, strStat.cbSize,
                            NULL, NULL );
-
+                                
       IStream_Release( pstrTmp );
       IStream_Release( pstrChild );
@@ -1513 +1524 @@
    */
   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)
 {
@@ -1555 +1566 @@
  * 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;
@@ -1578 +1589 @@
   ULONG             parentPropertyId;
 
-  TRACE("(%p, %s)\n",
-    iface, debugstr_w(pwcsName));
+  TRACE("(%p, %s)\n", 
+        iface, debugstr_w(pwcsName));
 
   /*
    * 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,
@@ -1601 +1612 @@
   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,
@@ -1622 +1633 @@
   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...
@@ -1628 +1639 @@
   if ( parentProperty.dirProperty == foundPropertyIndexToDelete )
   {
-    /*
+    /* 
      * Set data as it would have been done in the else part...
      */
@@ -1634 +1645 @@
     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.
      */
@@ -1643 +1654 @@
 
     propertyEnumeration2 = IEnumSTATSTGImpl_Construct(
-      This->ancestorStorage,
+      This->ancestorStorage, 
       This->rootPropertySetIndex);
-
+  
     typeOfRelation = IEnumSTATSTGImpl_FindParentProperty(
       propertyEnumeration2,
@@ -1655 +1666 @@
   }
 
-  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;
 
@@ -1678 +1689 @@
   hr = adjustPropertyChain(
         This,
-        propertyToDelete,
+        propertyToDelete, 
         parentProperty,
         parentPropertyId,
@@ -1722 +1733 @@
   }
 
-  /*
+  /* 
    * Enumerate the elements
    */
@@ -1736 +1747 @@
     {
       destroyHr = StorageImpl_DestroyElement(
-                    (IStorage*)childStorage,
+                    (IStorage*)childStorage, 
                     (OLECHAR*)currentElement.pwcsName);
 
@@ -1761 +1772 @@
   IStorage_Release(childStorage);
   IEnumSTATSTG_Release(elements);
-
+    
   return destroyHr;
 }
@@ -1791 +1802 @@
          0,
          &pis);
-
+    
   if (hr!=S_OK)
   {
@@ -1797 +1808 @@
   }
 
-  /*
-   * Zap the stream
-   */
-  hr = IStream_SetSize(pis, size);
+  /* 
+   * Zap the stream 
+   */ 
+  hr = IStream_SetSize(pis, size); 
 
   if(hr != S_OK)
@@ -1812 +1823 @@
   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);
@@ -1851 +1862 @@
   res = StorageImpl_ReadProperty(
           storage->ancestorStorage,
-          storePropertyIndex,
+          storePropertyIndex, 
           &storeProperty);
 
@@ -1865 +1876 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.previousProperty,
                typeOfRelation);
@@ -1880 +1891 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.nextProperty,
                typeOfRelation);
@@ -1888 +1899 @@
       storeProperty.nextProperty = propertyIndexToStore;
     }
-  }
+  } 
   else if (typeOfRelation == PROPERTY_RELATION_DIR)
   {
@@ -1895 +1906 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.dirProperty,
                typeOfRelation);
@@ -1907 +1918 @@
   hr = StorageImpl_WriteProperty(
          storage->ancestorStorage,
-         storePropertyIndex,
+         storePropertyIndex, 
          &storeProperty);
 
@@ -1922 +1933 @@
  * 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,
@@ -1939 +1950 @@
   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;
@@ -1960 +1971 @@
         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;
@@ -1995 +2006 @@
         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
        */
@@ -2004 +2015 @@
     }
 
-    /*
+    /* 
      * 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;
@@ -2029 +2040 @@
         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
        */
@@ -2038 +2049 @@
     }
 
-    /*
+    /* 
      * 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);
@@ -2057 +2068 @@
 
   /*
-   * 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);
@@ -2076 +2087 @@
  * 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("not implemented!\n");
@@ -2090 +2101 @@
  * 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");
@@ -2111 +2122 @@
   BOOL      readSuccessful;
   ULONG       currentPropertyIndex;
-
+  
   if ( FAILED( validateSTGM(openFlags) ))
     return STG_E_INVALIDFLAG;
 
   memset(This, 0, sizeof(StorageImpl));
-
+  
   /*
    * Initialize the virtual fgunction table.
@@ -2122 +2133 @@
   ICOM_VTBL(This)    = &Storage32Impl_Vtbl;
   This->v_destructor = &StorageImpl_Destroy;
-
+  
   /*
    * This is the top-level storage so initialize the ancester pointer
@@ -2128 +2139 @@
    */
   This->ancestorStorage = This;
-
+  
   /*
    * Initialize the physical support of the storage.
    */
   This->hFile = hFile;
-
+  
   /*
    * Initialize the big block cache.
@@ -2147 +2158 @@
   if (This->bigBlockFile == 0)
     return E_FAIL;
-
+ 
   if (fileCreate)
   {
@@ -2159 +2170 @@
      * - There is no small block depot
      */
-    memset( This->bigBlockDepotStart,
-            BLOCK_UNUSED,
+    memset( This->bigBlockDepotStart,     
+            BLOCK_UNUSED, 
             sizeof(This->bigBlockDepotStart));
 
@@ -2214 +2225 @@
    */
   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)
@@ -2254 +2265 @@
    */
   currentPropertyIndex = 0;
-
+  
   do
   {
     readSuccessful = StorageImpl_ReadProperty(
-                      This,
-                      currentPropertyIndex,
+                      This, 
+                      currentPropertyIndex, 
                       &currentProperty);
-
+    
     if (readSuccessful)
     {
@@ -2272 +2283 @@
 
     currentPropertyIndex++;
-
+    
   } while (readSuccessful && (This->rootPropertySetIndex == PROPERTY_NULL) );
-
+  
   if (!readSuccessful)
   {
@@ -2285 +2296 @@
    */
   This->smallBlockRootChain = BlockChainStream_Construct(
-                                This,
-                                NULL,
+                                This, 
+                                NULL, 
                                 This->rootPropertySetIndex);
-
+  
   return hr;
 }
@@ -2821 +2832 @@
 
     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,   
+      &This->extBigBlockDepotStart);
+
     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.
@@ -2876 +2887 @@
       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.
      */
-    assert( (This->bigBlockSize==DEF_BIG_BLOCK_SIZE) &&
+    assert( (This->bigBlockSize==DEF_BIG_BLOCK_SIZE) && 
             (This->smallBlockSize==DEF_SMALL_BLOCK_SIZE));
-
+    
     /*
      * Release the block.
@@ -2891 +2902 @@
     hr = S_OK;
   }
-
+  
   return hr;
 }
@@ -2911 +2922 @@
    */
   success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock);
-
+  
   /*
    * If the block read failed, the file is probably new.
@@ -2921 +2932 @@
      */
     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
@@ -2936 +2947 @@
     StorageUtl_WriteDWord(headerBigBlock, 0x40, (DWORD)0x0001);
   }
-
+  
   /*
    * Write the information to the header.
@@ -2943 +2954 @@
   {
     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);
 
@@ -2980 +2991 @@
     {
       StorageUtl_WriteDWord(
-        headerBigBlock,
+        headerBigBlock, 
         OFFSET_BBDEPOTSTART + (sizeof(ULONG)*index),
         (This->bigBlockDepotStart[index]));
     }
   }
-
+  
   /*
    * Write the big block back to the file.
@@ -3009 +3020 @@
   offsetInPropSet.s.HighPart = 0;
   offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
-
+  
   readSuccessful = BlockChainStream_ReadAt(
                     This->rootBlockChain,
@@ -3016 +3027 @@
                     currentProperty,
                     &bytesRead);
-
+  
   if (readSuccessful)
   {
     memset(buffer->name, 0, sizeof(buffer->name));
     memcpy(
-      buffer->name,
-      currentProperty+OFFSET_PS_NAME,
+      buffer->name, 
+      currentProperty+OFFSET_PS_NAME, 
       PROPERTY_NAME_BUFFER_LEN );
 
     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);
 
@@ -3107 +3118 @@
 
   memcpy(
-    currentProperty + OFFSET_PS_NAME,
-    buffer->name,
+    currentProperty + OFFSET_PS_NAME, 
+    buffer->name, 
     PROPERTY_NAME_BUFFER_LEN );
 
@@ -3114 +3125 @@
 
   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);
 
@@ -3211 +3222 @@
 
     StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
-
+    
     return TRUE;
   }
-
+  
   return FALSE;
 }
@@ -3344 +3355 @@
 
 StorageInternalImpl* StorageInternalImpl_Construct(
-  StorageImpl* ancestorStorage,
+  StorageImpl* ancestorStorage,  
   ULONG          rootPropertyIndex)
 {
@@ -3395 +3406 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Commit(
+HRESULT WINAPI StorageInternalImpl_Commit( 
   IStorage*            iface,
-  DWORD                  grfCommitFlags)  /* [in] */
+  DWORD                  grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
 }
-
+        
 /******************************************************************************
 **
@@ -3409 +3420 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Revert(
+HRESULT WINAPI StorageInternalImpl_Revert( 
   IStorage*            iface)
 {
@@ -3426 +3437 @@
 
   newEnumeration = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumSTATSTGImpl));
-
+  
   if (newEnumeration!=0)
   {
@@ -3434 +3445 @@
     ICOM_VTBL(newEnumeration) = &IEnumSTATSTGImpl_Vtbl;
     newEnumeration->ref       = 0;
-
+    
     /*
      * We want to nail-down the reference to the storage in case the
@@ -3441 +3452 @@
     newEnumeration->parentStorage = parentStorage;
     IStorage_AddRef((IStorage*)newEnumeration->parentStorage);
-
+    
     newEnumeration->firstPropertyNode   = firstPropertyNode;
-
+    
     /*
      * Initialize the search stack
@@ -3449 +3460 @@
     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.
@@ -3457 +3468 @@
     IEnumSTATSTGImpl_Reset((IEnumSTATSTG*)newEnumeration);
   }
-
+  
   return newEnumeration;
 }
@@ -3489 +3500 @@
    * 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;
@@ -3512 +3523 @@
   return S_OK;
 }
-
+        
 ULONG   WINAPI IEnumSTATSTGImpl_AddRef(
   IEnumSTATSTG* iface)
@@ -3521 +3532 @@
   return This->ref;
 }
-
+        
 ULONG   WINAPI IEnumSTATSTGImpl_Release(
   IEnumSTATSTG* iface)
@@ -3560 +3571 @@
    */
   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
@@ -3568 +3579 @@
   if (pceltFetched==0)
     pceltFetched = &objectFetched;
-
+  
   /*
    * Start the iteration, we will iterate until we hit the end of the
@@ -3580 +3591 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( ( *pceltFetched < celt) &&
+  while ( ( *pceltFetched < celt) && 
           ( currentSearchNode!=PROPERTY_NULL) )
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3592 +3603 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       &currentProperty);
 
@@ -3601 +3612 @@
       &currentProperty,
       STATFLAG_DEFAULT);
-
+        
     /*
      * Step to the next item in the iteration
@@ -3625 +3636 @@
 }
 
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Skip(
   IEnumSTATSTG* iface,
@@ -3641 +3652 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( (objectFetched < celt) &&
+  while ( (objectFetched < celt) && 
           (currentSearchNode!=PROPERTY_NULL) )
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3653 +3664 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       &currentProperty);
-
+    
     /*
      * Step to the next item in the iteration
@@ -3677 +3688 @@
   return S_FALSE;
 }
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Reset(
   IEnumSTATSTG* iface)
@@ -3696 +3707 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    This->firstPropertyNode,
+                    This->firstPropertyNode, 
                     &rootProperty);
 
@@ -3711 +3722 @@
   return S_OK;
 }
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Clone(
   IEnumSTATSTG* iface,
@@ -3725 +3736 @@
   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
@@ -3736 +3747 @@
   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);
 
@@ -3757 +3768 @@
 INT IEnumSTATSTGImpl_FindParentProperty(
   IEnumSTATSTGImpl *This,
-  ULONG             childProperty,
+  ULONG             childProperty, 
   StgProperty      *currentProperty,
   ULONG            *thisNodeId)
@@ -3775 +3786 @@
    */
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
-
+  
 
   while (currentSearchNode!=PROPERTY_NULL)
@@ -3784 +3795 @@
     *thisNodeId = currentSearchNode;
 
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3794 +3805 @@
     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.
@@ -3834 +3845 @@
   while (currentSearchNode!=PROPERTY_NULL)
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3843 +3854 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       currentProperty);
 
     if ( propertyNameCmp(
-          (OLECHAR*)currentProperty->name,
+          (OLECHAR*)currentProperty->name, 
           (OLECHAR*)lpszPropName) == 0)
       return currentSearchNode;
@@ -3886 +3897 @@
 
     This->stackToVisit = HeapReAlloc(
-                           GetProcessHeap(),
+                           GetProcessHeap(), 
                            0,
                            This->stackToVisit,
@@ -3900 +3911 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    nodeToPush,
+                    nodeToPush, 
                     &rootProperty);
 
@@ -3987 +3998 @@
   else
   {
-    destination->pwcsName =
+    destination->pwcsName = 
       CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR));
 
     strcpyW((LPWSTR)destination->pwcsName, source->name);
   }
-
+  
   switch (source->propertyType)
   {
@@ -4004 +4015 @@
     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; 
 }
 
@@ -4025 +4036 @@
 
 BlockChainStream* BlockChainStream_Construct(
-  StorageImpl* parentStorage,
+  StorageImpl* parentStorage,  
   ULONG*         headOfStreamPlaceHolder,
   ULONG          propertyIndex)
@@ -4098 +4109 @@
  * 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)
@@ -4112 +4123 @@
 
     blockIndex = StorageImpl_GetNextBlockInChain(
-                   This->parentStorage,
+                   This->parentStorage, 
                    blockIndex);
   }
@@ -4120 +4131 @@
 
 /******************************************************************************
- *      BlockChainStream_ReadAt
+ *      BlockChainStream_ReadAt 
  *
  * Reads a specified number of bytes from this chain at the specified offset.
@@ -4160 +4171 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-
+    
     blockNoInSequence--;
   }
@@ -4173 +4184 @@
   *bytesRead   = 0;
   bufferWalker = buffer;
-
+  
   while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) )
   {
@@ -4179 +4190 @@
      * 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);
 
@@ -4204 +4215 @@
 
   }
-
+  
   return (size == 0);
 }
@@ -4249 +4260 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-
+    
     blockNoInSequence--;
   }
@@ -4269 +4280 @@
      * 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);
 
@@ -4292 +4303 @@
     offsetInBlock  = 0;      /* There is no offset on the next block */
   }
-
+  
   return (size == 0);
 }
@@ -4329 +4340 @@
   while (count < numBlocks)
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4336 +4347 @@
 
   /* 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);
 
@@ -4353 +4364 @@
   while (extraBlock != BLOCK_END_OF_CHAIN)
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, extraBlock);
 
@@ -4397 +4408 @@
 
       StorageImpl_ReadProperty(
-        This->parentStorage,
+        This->parentStorage, 
         This->ownerPropertyIndex,
         &chainProp);
 
-      chainProp.startingBlock = blockIndex;
+      chainProp.startingBlock = blockIndex; 
 
       StorageImpl_WriteProperty(
-        This->parentStorage,
+        This->parentStorage, 
         This->ownerPropertyIndex,
         &chainProp);
@@ -4453 +4464 @@
 
       StorageImpl_SetNextBlockInChain(
-    This->parentStorage,
-    currentBlock,
-    blockIndex);
+        This->parentStorage, 
+        currentBlock, 
+        blockIndex);
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage,
-    blockIndex,
-    BLOCK_END_OF_CHAIN);
+        This->parentStorage, 
+        blockIndex, 
+        BLOCK_END_OF_CHAIN);
 
       currentBlock = blockIndex;
@@ -4481 +4492 @@
  * 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(
@@ -4498 +4509 @@
   else
   {
-    ULARGE_INTEGER fileSize =
+    ULARGE_INTEGER fileSize = 
       BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
 
@@ -4507 +4518 @@
      */
     if ((diff % This->parentStorage->bigBlockSize) != 0)
-      diff += (This->parentStorage->bigBlockSize -
+      diff += (This->parentStorage->bigBlockSize - 
                 (diff % This->parentStorage->bigBlockSize) );
 
@@ -4531 +4542 @@
   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
      */
@@ -4545 +4556 @@
   {
     /*
-     * 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
      */
@@ -4552 +4563 @@
     result.s.HighPart = 0;
 
-    result.s.LowPart  =
-      BlockChainStream_GetCount(This) *
+    result.s.LowPart  = 
+      BlockChainStream_GetCount(This) * 
       This->parentStorage->bigBlockSize;
 
@@ -4565 +4576 @@
 
 SmallBlockChainStream* SmallBlockChainStream_Construct(
-  StorageImpl* parentStorage,
+  StorageImpl* parentStorage,  
   ULONG          propertyIndex)
 {
@@ -4616 +4627 @@
  *
  * Returns the index of the next small block in this chain.
- *
+ * 
  * Return Values:
  *    - BLOCK_END_OF_CHAIN: end of this chain
@@ -4743 +4754 @@
     else
     {
-      ULONG count =
+      ULONG count = 
         BlockChainStream_GetCount(This->parentStorage->smallBlockDepotChain);
 
@@ -4754 +4765 @@
       {
         sbdIndex = nextBlock;
-        nextBlock =
+        nextBlock = 
           StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex);
       }
@@ -4761 +4772 @@
       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);
 
@@ -4773 +4784 @@
        * Initialize all the small blocks to free
        */
-      smallBlockDepot =
+      smallBlockDepot = 
         StorageImpl_GetBigBlock(This->parentStorage, newsbdIndex);
 
@@ -4785 +4796 @@
          */
         StgProperty rootProp;
-        ULONG sbStartIndex;
+        ULONG sbStartIndex; 
 
         /*
@@ -4794 +4805 @@
 
         /*
-         * 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);
 
@@ -4814 +4825 @@
 
         StorageImpl_WriteProperty(
-          This->parentStorage,
-          This->parentStorage->rootPropertySetIndex,
+          This->parentStorage, 
+          This->parentStorage->rootPropertySetIndex, 
           &rootProp);
       }
@@ -4821 +4832 @@
   }
 
-  smallBlocksPerBigBlock =
+  smallBlocksPerBigBlock = 
     This->parentStorage->bigBlockSize / This->parentStorage->smallBlockSize;
 
@@ -4833 +4844 @@
 
     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))
     {
@@ -4843 +4854 @@
 
       BlockChainStream_SetSize(
-        This->parentStorage->smallBlockRootChain,
+        This->parentStorage->smallBlockRootChain, 
         rootProp.size);
 
       StorageImpl_WriteProperty(
-        This->parentStorage,
-        This->parentStorage->rootPropertySetIndex,
+        This->parentStorage, 
+        This->parentStorage->rootPropertySetIndex, 
         &rootProp);
     }
@@ -4861 +4872 @@
  * 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(
@@ -4871 +4882 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence =
+  ULONG blockNoInSequence = 
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -4908 +4919 @@
      * Calculate how many bytes we can copy from this small block.
      */
-    bytesToReadInBuffer =
+    bytesToReadInBuffer = 
       min(This->parentStorage->smallBlockSize - offsetInBlock, size);
 
@@ -4915 +4926 @@
      */
     offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   =
+    offsetInBigBlockFile.s.LowPart   = 
       blockIndex * This->parentStorage->smallBlockSize;
 
@@ -4959 +4970 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence =
+  ULONG blockNoInSequence = 
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -4967 +4978 @@
   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.
@@ -4998 +5009 @@
      * 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.
@@ -5018 +5029 @@
       bufferWalker,
       &bytesWrittenFromBigBlockFile);
-
+    
     assert(bytesWrittenFromBigBlockFile == bytesToWriteInBuffer);
-
+    
     /*
      * Step to the next big block.
@@ -5030 +5041 @@
     offsetInBlock  = 0;     /* There is no offset on the next block */
   }
-
+  
   return (size == 0);
 }
@@ -5037 +5048 @@
  *       SmallBlockChainStream_Shrink
  *
- * Shrinks this chain in the small block depot.
+ * Shrinks this chain in the small block depot. 
  */
 BOOL SmallBlockChainStream_Shrink(
@@ -5065 +5076 @@
   /*
    * If the count is 0, we have a special case, the head of the chain was
-   * just freed.
+   * just freed. 
    */
   if (count == 0)
@@ -5071 +5082 @@
     StgProperty chainProp;
 
-    StorageImpl_ReadProperty(This->parentStorage,
-                 This->ownerPropertyIndex,
-                 &chainProp);
+    StorageImpl_ReadProperty(This->parentStorage, 
+                             This->ownerPropertyIndex,
+                             &chainProp);
 
     chainProp.startingBlock = BLOCK_END_OF_CHAIN;
 
     StorageImpl_WriteProperty(This->parentStorage,
-                  This->ownerPropertyIndex,
-                  &chainProp);
+                              This->ownerPropertyIndex,
+                              &chainProp);
 
     /*
@@ -5093 +5104 @@
     /* Mark the new end of chain */
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
   }
@@ -5108 +5119 @@
   }
 
-  return TRUE;
+  return TRUE;  
 }
 
@@ -5144 +5155 @@
     blockIndex = chainProp.startingBlock;
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
   }
@@ -5178 +5189 @@
 
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
 
@@ -5220 +5231 @@
  * 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(
@@ -5278 +5289 @@
   WCHAR          tempFileName[MAX_PATH];
 
-  TRACE("(%s, %lx, %ld, %p)\n",
-    debugstr_w(pwcsName), grfMode,
-    reserved, ppstgOpen);
+  TRACE("(%s, %lx, %ld, %p)\n", 
+        debugstr_w(pwcsName), grfMode, 
+        reserved, ppstgOpen);
 
   /*
@@ -5326 +5337 @@
 
   /*
-   * Interpret the STGM value grfMode
+   * Interpret the STGM value grfMode 
    */
   shareMode    = GetShareModeFromSTGM(grfMode);
@@ -5351 +5362 @@
                         fileAttributes,
             0);
-
+ 
   if (hFile == INVALID_HANDLE_VALUE)
   {
@@ -5361 +5372 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+ 
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5372 +5383 @@
          TRUE,
          TRUE);
-
+ 
   if (FAILED(hr))
   {
@@ -5398 +5409 @@
   DWORD           grfMode,
   SNB           snbExclude,
-  DWORD           reserved,
+  DWORD           reserved, 
   IStorage      **ppstgOpen)
 {
@@ -5407 +5418 @@
   DWORD          accessMode;
 
-  TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
-    debugstr_w(pwcsName), pstgPriority, grfMode,
-    snbExclude, reserved, ppstgOpen);
+  TRACE("(%s, %p, %lx, %p, %ld, %p)\n", 
+        debugstr_w(pwcsName), pstgPriority, grfMode,
+        snbExclude, reserved, ppstgOpen);
 
   /*
@@ -5433 +5444 @@
    */
   *ppstgOpen = 0;
-
-  hFile = CreateFileW( pwcsName,
+  
+  hFile = CreateFileW( pwcsName, 
                        accessMode,
                        shareMode,
@@ -5441 +5452 @@
                        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
                        0);
-
-
+  
+  
   if (hFile==INVALID_HANDLE_VALUE)
   {
@@ -5478 +5489 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+  
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5489 +5500 @@
          TRUE,
          FALSE);
-
+  
   if (FAILED(hr))
   {
@@ -5497 +5508 @@
      */
     if(hr == STG_E_INVALIDHEADER)
-    return STG_E_FILEALREADYEXISTS;
+        return STG_E_FILEALREADYEXISTS;
     return hr;
   }
-
+  
   /*
    * Get an "out" pointer for the caller.
@@ -5508 +5519 @@
          (REFIID)&IID_IStorage,
          (void**)ppstgOpen);
-
+  
   return hr;
 }
@@ -5560 +5571 @@
          (void**)ppstgOpen);
 
-  return hr;
+  return hr;  
 }
 
@@ -5598 +5609 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+ 
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5634 +5645 @@
 HRESULT WINAPI StgSetTimes(WCHAR * str, FILETIME * a, FILETIME * b, FILETIME *c )
 {
-
+ 
   FIXME("(%p, %p, %p, %p),stub!\n", str, a, b, c);
   return FALSE;
@@ -5685 +5696 @@
     STATSTG pstatstg;
     HRESULT hRes;
-
+    
     TRACE("()\n");
 
@@ -5708 +5719 @@
 HRESULT  WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvObj)
 {
-    CLSID   clsid;
-    HRESULT res;
-    LPPERSISTSTREAM xstm;
+    CLSID       clsid;
+    HRESULT     res;
+    LPPERSISTSTREAM     xstm;
 
     TRACE("(%p,%s,%p)\n",pStm,debugstr_guid(iidInterface),ppvObj);
@@ -5716 +5727 @@
     res=ReadClassStm(pStm,&clsid);
     if (!SUCCEEDED(res))
-    return res;
+        return res;
     res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj);
     if (!SUCCEEDED(res))
-    return res;
+        return res;
     res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)&xstm);
     if (!SUCCEEDED(res)) {
-    IUnknown_Release((IUnknown*)*ppvObj);
-    return res;
+        IUnknown_Release((IUnknown*)*ppvObj);
+        return res;
     }
     res=IPersistStream_Load(xstm,pStm);
     IPersistStream_Release(xstm);
     /* FIXME: all refcounts ok at this point? I think they should be:
-     *      pStm    : unchanged
-     *      ppvObj  : 1
-     *      xstm    : 0 (released)
+     *          pStm    : unchanged
+     *          ppvObj  : 1
+     *          xstm    : 0 (released)
      */
     return res;
@@ -5746 +5757 @@
     CLSID clsid;
     HRESULT res;
-
+    
     TRACE("(%p,%p)\n",pPStm,pStm);
 
@@ -5752 +5763 @@
 
     if (SUCCEEDED(res)){
-
+        
         res=WriteClassStm(pStm,&clsid);
 
@@ -5770 +5781 @@
  * 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
@@ -5795 +5806 @@
   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);
@@ -5814 +5825 @@
   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
    */
@@ -5825 +5836 @@
       return E_FAIL;
 
-  /*
+  /* 
    * STGM_WRITE |  STGM_READWRITE | STGM_READ
    */
@@ -5833 +5844 @@
 
   /*
-   * 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;
 
@@ -5854 +5865 @@
   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;
@@ -5873 +5884 @@
  *
  * 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)
@@ -5943 +5954 @@
   /* All other cases */
   if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
-    FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
+        FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
   return CREATE_NEW;
 }
@@ -5949 +5960 @@
 
 /*************************************************************************
- * OLECONVERT_LoadOLE10 [Internal]
- *
- * Loads the OLE10 STREAM to memory
+ * OLECONVERT_LoadOLE10 [Internal] 
+ *
+ * Loads the OLE10 STREAM to memory 
  *
  * PARAMS
@@ -5964 +5975 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *
+ *     
  *     Memory allocated for pData must be freed by the caller
  */
 HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStrem1)
 {
-    DWORD dwSize;
-    HRESULT hRes = S_OK;
-    int nTryCnt=0;
-    int max_try = 6;
-
-    pData->pData = NULL;
-    pData->pstrOleObjFileName = (CHAR *) NULL;
-
-    for( nTryCnt=0;nTryCnt < max_try; nTryCnt++)
-    {
-    /* Get the OleID */
-    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleID), sizeof(pData->dwOleID));
-    if(dwSize != sizeof(pData->dwOleID))
-    {
-        hRes = CONVERT10_E_OLESTREAM_GET;
-    }
-    else if(pData->dwOleID != OLESTREAM_ID)
-    {
-        hRes = CONVERT10_E_OLESTREAM_FMT;
-    }
-        else
-        {
-            hRes = S_OK;
-            break;
-        }
-    }
-
-    if(hRes == S_OK)
-    {
-        /* Get the TypeID...more info needed for this field */
-        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwTypeID), sizeof(pData->dwTypeID));
-        if(dwSize != sizeof(pData->dwTypeID))
-        {
-            hRes = CONVERT10_E_OLESTREAM_GET;
-        }
-    }
-    if(hRes == S_OK)
-    {
-        if(pData->dwTypeID != 0)
-        {
-            /* Get the lenght of the OleTypeName */
-            dwSize = pOleStream->lpstbl->Get(pOleStream, (void *) &(pData->dwOleTypeNameLength), sizeof(pData->dwOleTypeNameLength));
-            if(dwSize != sizeof(pData->dwOleTypeNameLength))
-            {
-                hRes = CONVERT10_E_OLESTREAM_GET;
-            }
-
-            if(hRes == S_OK)
-            {
-                if(pData->dwOleTypeNameLength > 0)
-                {
-                    /* Get the OleTypeName */
-                    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->strOleTypeName, pData->dwOleTypeNameLength);
-                    if(dwSize != pData->dwOleTypeNameLength)
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-            if(bStrem1)
-            {
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength));
-                if(dwSize != sizeof(pData->dwOleObjFileNameLength))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            if(hRes == S_OK)
-            {
-                    if(pData->dwOleObjFileNameLength < 1) /* there is no file name exist */
-                        pData->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
-                    pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
-                    if(pData->pstrOleObjFileName)
-                    {
-                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->pstrOleObjFileName),pData->dwOleObjFileNameLength);
-                        if(dwSize != pData->dwOleObjFileNameLength)
-                        {
-                            hRes = CONVERT10_E_OLESTREAM_GET;
-                        }
-                    }
-                    else
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-            else
-            {
-                /* Get the Width of the Metafile */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileWidth), sizeof(pData->dwMetaFileWidth));
-                if(dwSize != sizeof(pData->dwMetaFileWidth))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            if(hRes == S_OK)
-            {
-                /* Get the Height of the Metafile */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileHeight), sizeof(pData->dwMetaFileHeight));
-                if(dwSize != sizeof(pData->dwMetaFileHeight))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-            }
-            if(hRes == S_OK)
-            {
-                /* Get the Lenght of the Data */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwDataLength), sizeof(pData->dwDataLength));
-                if(dwSize != sizeof(pData->dwDataLength))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-
-            if(hRes == S_OK) /* I don't know what is this 8 byts information is we have to figure out */
-            {
-                if(!bStrem1) /* if it is a second OLE stream data */
-                {
-                    pData->dwDataLength -= 8;
-                    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));
-                    if(dwSize != sizeof(pData->strUnknown))
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-            if(hRes == S_OK)
-            {
-                if(pData->dwDataLength > 0)
-                {
-                    pData->pData = (BYTE *)HeapAlloc(GetProcessHeap(),0,pData->dwDataLength);
-
-                    /* Get Data (ex. IStorage, Metafile, or BMP) */
-                    if(pData->pData)
-                    {
-                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->pData, pData->dwDataLength);
-                        if(dwSize != pData->dwDataLength)
-                        {
-                            hRes = CONVERT10_E_OLESTREAM_GET;
-                        }
-                    }
-                    else
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-        }
-    }
-    return hRes;
+        DWORD dwSize;
+        HRESULT hRes = S_OK;
+        int nTryCnt=0;
+        int max_try = 6;
+
+        pData->pData = NULL;
+        pData->pstrOleObjFileName = (CHAR *) NULL;
+
+        for( nTryCnt=0;nTryCnt < max_try; nTryCnt++)
+        {
+        /* Get the OleID */
+        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleID), sizeof(pData->dwOleID));
+        if(dwSize != sizeof(pData->dwOleID))
+        {
+                hRes = CONVERT10_E_OLESTREAM_GET;
+        }
+        else if(pData->dwOleID != OLESTREAM_ID)
+        {
+                hRes = CONVERT10_E_OLESTREAM_FMT;
+        }
+                else
+                {
+                        hRes = S_OK;
+                        break;
+                }
+        }
+
+        if(hRes == S_OK)
+        {
+                /* Get the TypeID...more info needed for this field */
+                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwTypeID), sizeof(pData->dwTypeID));
+                if(dwSize != sizeof(pData->dwTypeID))
+                {
+                        hRes = CONVERT10_E_OLESTREAM_GET;
+                }
+        }
+        if(hRes == S_OK)
+        {
+                if(pData->dwTypeID != 0)
+                {
+                        /* Get the lenght of the OleTypeName */
+                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *) &(pData->dwOleTypeNameLength), sizeof(pData->dwOleTypeNameLength));
+                        if(dwSize != sizeof(pData->dwOleTypeNameLength))
+                        {
+                                hRes = CONVERT10_E_OLESTREAM_GET;
+                        }
+
+                        if(hRes == S_OK)
+                        {
+                                if(pData->dwOleTypeNameLength > 0)
+                                {
+                                        /* Get the OleTypeName */
+                                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->strOleTypeName, pData->dwOleTypeNameLength);
+                                        if(dwSize != pData->dwOleTypeNameLength)
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                        if(bStrem1)
+                        {
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength));
+                                if(dwSize != sizeof(pData->dwOleObjFileNameLength))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        if(hRes == S_OK)
+                        {
+                                        if(pData->dwOleObjFileNameLength < 1) /* there is no file name exist */
+                                                pData->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
+                                        pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
+                                        if(pData->pstrOleObjFileName)
+                                        {
+                                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->pstrOleObjFileName),pData->dwOleObjFileNameLength);
+                                                if(dwSize != pData->dwOleObjFileNameLength)
+                                                {
+                                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                                }
+                                        }
+                                        else
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+                        else
+                        {
+                                /* Get the Width of the Metafile */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileWidth), sizeof(pData->dwMetaFileWidth));
+                                if(dwSize != sizeof(pData->dwMetaFileWidth))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        if(hRes == S_OK)
+                        {
+                                /* Get the Height of the Metafile */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileHeight), sizeof(pData->dwMetaFileHeight));
+                                if(dwSize != sizeof(pData->dwMetaFileHeight))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+                        }
+                        if(hRes == S_OK)
+                        {
+                                /* Get the Lenght of the Data */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwDataLength), sizeof(pData->dwDataLength));
+                                if(dwSize != sizeof(pData->dwDataLength))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+
+                        if(hRes == S_OK) /* I don't know what is this 8 byts information is we have to figure out */
+                        {
+                                if(!bStrem1) /* if it is a second OLE stream data */
+                                {
+                                        pData->dwDataLength -= 8;
+                                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));
+                                        if(dwSize != sizeof(pData->strUnknown))
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                        if(hRes == S_OK)
+                        {
+                                if(pData->dwDataLength > 0)
+                                {
+                                        pData->pData = (BYTE *)HeapAlloc(GetProcessHeap(),0,pData->dwDataLength);
+
+                                        /* Get Data (ex. IStorage, Metafile, or BMP) */
+                                        if(pData->pData)
+                                        {
+                                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->pData, pData->dwDataLength);
+                                                if(dwSize != pData->dwDataLength)
+                                                {
+                                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                                }
+                                        }
+                                        else
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                }
+        }
+        return hRes;
 }
 
 /*************************************************************************
- * OLECONVERT_SaveOLE10 [Internal]
- *
- * Saves the OLE10 STREAM From memory
+ * OLECONVERT_SaveOLE10 [Internal] 
+ *
+ * Saves the OLE10 STREAM From memory 
  *
  * PARAMS
@@ -6133 +6144 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  */
 HRESULT OLECONVERT_SaveOLE10(OLECONVERT_OLESTREAM_DATA *pData, LPOLESTREAM pOleStream)
@@ -6227 +6238 @@
 
 /*************************************************************************
- * 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
@@ -6243 +6254 @@
  *
  * NOTES
- *
- *
+ *     
+ *     
  */
 void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, BYTE *pBuffer, DWORD nBufferLength)
@@ -6279 +6290 @@
 
 /*************************************************************************
- * OLECONVERT_WriteOLE20ToBuffer [Internal]
- *
- * Saves the OLE10 STREAM From memory
+ * OLECONVERT_WriteOLE20ToBuffer [Internal] 
+ *
+ * Saves the OLE10 STREAM From memory 
  *
  * PARAMS
@@ -6294 +6305 @@
  *
  *     Used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  */
 DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData)
@@ -6306 +6317 @@
 
     *pData = NULL;
-
+    
     /* Create temp Storage */
     GetTempPathW(MAX_PATH, wstrTempDir);
@@ -6333 +6344 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOleStream [Internal]
+ * OLECONVERT_CreateOleStream [Internal] 
  *
  * Creates the "\001OLE" stream in the IStorage if neccessary.
@@ -6348 +6359 @@
  *     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)
@@ -6357 +6368 @@
     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 );
 
@@ -6378 +6389 @@
 
 /*************************************************************************
- * 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
@@ -6395 +6406 @@
  *
  *     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)
@@ -6417 +6428 @@
 
     /*  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)
@@ -6438 +6449 @@
             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)
             {
@@ -6480 +6491 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOlePresStream[Internal]
+ * OLECONVERT_CreateOlePresStream[Internal] 
  *
  * Creates the "\002OlePres000" Stream with the Metafile data
@@ -6487 +6498 @@
  *     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
@@ -6497 +6508 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *
+ *     
  */
 void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, DWORD dwExtentY , BYTE *pData, DWORD dwDataLength)
@@ -6504 +6515 @@
     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 );
 
@@ -6565 +6576 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOle10NativeStream [Internal]
+ * OLECONVERT_CreateOle10NativeStream [Internal] 
  *
  * Creates the "\001Ole10Native" Stream (should contain a BMP)
@@ -6581 +6592 @@
  *
  *     Might need to verify the data and return appropriate error message
- *
+ *     
  */
 void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, BYTE *pData, DWORD dwDataLength)
@@ -6588 +6599 @@
     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 );
 
@@ -6604 +6615 @@
 
 /*************************************************************************
- * OLECONVERT_GetOLE10ProgID [Internal]
+ * OLECONVERT_GetOLE10ProgID [Internal] 
  *
  * Finds the ProgID (or OleTypeID) from the IStorage
@@ -6620 +6631 @@
  *     This function is used by OleConvertIStorageToOLESTREAM only.
  *
- *
+ *     
  */
 HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DWORD *dwSize)
@@ -6631 +6642 @@
 
     /* 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)
@@ -6668 +6679 @@
             *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE);
         }
-
+ 
     }
     return hRes;
@@ -6674 +6685 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle10PresData [Internal]
+ * OLECONVERT_GetOle10PresData [Internal] 
  *
  * Converts IStorage "/001Ole10Native" stream to a OLE10 Stream
@@ -6689 +6700 @@
  *
  *     Memory allocated for pData must be freed by the caller
- *
- *
+ *      
+ *     
  */
 void OLECONVERT_GetOle10PresData(LPSTORAGE pStorage, OLECONVERT_OLESTREAM_DATA *pOleStreamData)
@@ -6710 +6721 @@
 
     /* 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)
@@ -6729 +6740 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle20PresData[Internal]
+ * OLECONVERT_GetOle20PresData[Internal] 
  *
  * Converts IStorage "/002OlePres000" stream to a OLE10 Stream
@@ -6742 +6753 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  *     Memory allocated for pData must be freed by the caller
  */
@@ -6769 +6780 @@
 
     /* 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)
@@ -6817 +6828 @@
 
 /*************************************************************************
- * OleConvertOLESTREAMToIStorage [OLE32.87]
+ * OleConvertOLESTREAMToIStorage [OLE32.87] 
  *
  * Read info on MSDN
@@ -6826 +6837 @@
  *      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)
 {
@@ -6902 +6913 @@
         }
         if(pOleStreamData[i].pstrOleObjFileName != NULL)
-    {
-            HeapFree(GetProcessHeap(),0,pOleStreamData[i].pstrOleObjFileName);
-            pOleStreamData[i].pstrOleObjFileName = NULL;
-    }
+        {
+                HeapFree(GetProcessHeap(),0,pOleStreamData[i].pstrOleObjFileName);
+                pOleStreamData[i].pstrOleObjFileName = NULL;
+        }
     }
     return hRes;
@@ -6921 +6932 @@
  *      Still some unknowns for the IStorage: "\002OlePres000", "\001CompObj",
  *      and "\001OLE" streams.
- *
+ *     
  */
 HRESULT WINAPI OleConvertIStorageToOLESTREAM (
-    LPSTORAGE pstg,
+    LPSTORAGE pstg, 
     LPOLESTREAM pOleStream)
 {
@@ -6949 +6960 @@
     {
         /*Was it originaly 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)
         {
@@ -6984 +6995 @@
 
 /***********************************************************************
- *      GetConvertStg (OLE32.68)
+ *              GetConvertStg (OLE32.68)
  */
 HRESULT WINAPI GetConvertStg(LPGUID guid) {
@@ -6998 +7009 @@
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
-    HFILE       hf;
-    OFSTRUCT    ofs;
-    BYTE        magic[24];
-
-    TRACE("(\'%s\')\n",fn);
-    hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
-    if (hf==HFILE_ERROR)
-        return STG_E_FILENOTFOUND;
-    if (24!=_lread(hf,magic,24)) {
-        WARN(" too short\n");
-        _lclose(hf);
-        return S_FALSE;
-    }
-    if (!memcmp(magic,STORAGE_magic,8)) {
-        WARN(" -> YES\n");
-        _lclose(hf);
-        return S_OK;
-    }
-    if (!memcmp(magic,STORAGE_notmagic,8)) {
-        WARN(" -> NO\n");
-        _lclose(hf);
-        return S_FALSE;
-    }
-    if (!memcmp(magic,STORAGE_oldmagic,8)) {
-        WARN(" -> old format\n");
-        _lclose(hf);
-        return STG_E_OLDFORMAT;
-    }
-    WARN(" -> Invalid header.\n");
-    _lclose(hf);
-    return STG_E_INVALIDHEADER;
+        HFILE           hf;
+        OFSTRUCT        ofs;
+        BYTE            magic[24];
+
+        TRACE("(\'%s\')\n",fn);
+        hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
+        if (hf==HFILE_ERROR)
+                return STG_E_FILENOTFOUND;
+        if (24!=_lread(hf,magic,24)) {
+                WARN(" too short\n");
+                _lclose(hf);
+                return S_FALSE;
+        }
+        if (!memcmp(magic,STORAGE_magic,8)) {
+                WARN(" -> YES\n");
+                _lclose(hf);
+                return S_OK;
+        }
+        if (!memcmp(magic,STORAGE_notmagic,8)) {
+                WARN(" -> NO\n");
+                _lclose(hf);
+                return S_FALSE;
+        }
+        if (!memcmp(magic,STORAGE_oldmagic,8)) {
+                WARN(" -> old format\n");
+                _lclose(hf);
+                return STG_E_OLDFORMAT;
+        }
+        WARN(" -> Invalid header.\n");
+        _lclose(hf);
+        return STG_E_INVALIDHEADER;
 }
 
@@ -7034 +7045 @@
  * StgIsStorageFile [OLE32.146]
  */
-HRESULT WINAPI
-StgIsStorageFile(LPCOLESTR fn)
-{
-    LPOLESTR16  xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
-    HRESULT ret = StgIsStorageFile16(xfn);
-
-    HeapFree(GetProcessHeap(),0,xfn);
-    return ret;
+HRESULT WINAPI 
+StgIsStorageFile(LPCOLESTR fn) 
+{
+        LPOLESTR16      xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
+        HRESULT ret = StgIsStorageFile16(xfn);
+
+        HeapFree(GetProcessHeap(),0,xfn);
+        return ret;
 }
 #endif