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

Timestamp:

Feb 15, 2002, 6:18:52 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync

File:

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

trunk/src/ole32/storage32.c

@@ -10 +10 @@
  * Copyright 1999 Thuy Nguyen
  */
-
 #ifdef __WIN32OS2__
 #include <odin.h>
@@ -36 +35 @@
 
 #define FILE_BEGIN 0
-
 
 
@@ -167 +165 @@
     StorageBaseImpl_SetClass,
     StorageImpl_SetStateBits,
-    StorageBaseImpl_Stat
+    StorageImpl_Stat
 };
 
@@ -343 +341 @@
   StgProperty       currentProperty;
   ULONG             foundPropertyIndex;
+  HRESULT           res = STG_E_UNKNOWN;
 
   TRACE("(%p, %s, %p, %lx, %ld, %p)\n", 
@@ -351 +350 @@
    */
   if ( (pwcsName==NULL) || (ppstm==0) )
-    return E_INVALIDARG;
+  {
+    res = E_INVALIDARG;
+    goto end;
+  }
   
   /*
    * Initialize the out parameter
    */
-  *ppstm = 0;
+  *ppstm = NULL;
   
   /*
@@ -362 +364 @@
    */
   if ( FAILED( validateSTGM(grfMode) ))
-    return STG_E_INVALIDFLAG;
+  {
+    res = STG_E_INVALIDFLAG;
+    goto end;
+  }
 
   /*
@@ -370 +375 @@
         (grfMode & STGM_DELETEONRELEASE) ||
         (grfMode & STGM_TRANSACTED) )
-    return STG_E_INVALIDFUNCTION;
+  {
+    res = STG_E_INVALIDFUNCTION;
+    goto end;
+  }
 
   /*
@@ -411 +419 @@
       StgStreamImpl_AddRef(*ppstm);
       
-      return S_OK;
+      res = S_OK;
+      goto end;
     }
     
-    return E_OUTOFMEMORY;
-  }
-  
-  return STG_E_FILENOTFOUND;
+    res = E_OUTOFMEMORY;
+    goto end;
+  }
+  
+  res = STG_E_FILENOTFOUND;
+
+end:
+  if (res == S_OK)
+    TRACE("<-- IStream %p\n", *ppstm);
+  TRACE("<-- %08lx\n", res);
+  return res;
 }
 
@@ -441 +457 @@
   StgProperty            currentProperty;
   ULONG                  foundPropertyIndex;
+  HRESULT                res = STG_E_UNKNOWN;
 
   TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n", 
@@ -450 +467 @@
    */
   if ( (This==0) || (pwcsName==NULL) || (ppstg==0) )
-    return E_INVALIDARG;
+  {
+    res = E_INVALIDARG;
+    goto end;
+  }
+  
+  /* as documented */
+  if (snbExclude != NULL)
+  {
+    res = STG_E_INVALIDPARAMETER;
+    goto end;
+  }
   
   /*
@@ -456 +483 @@
    */
   if ( FAILED( validateSTGM(grfMode) ))
-    return STG_E_INVALIDFLAG;
+  {
+    res = STG_E_INVALIDFLAG;
+    goto end;
+  }
 
   /*
@@ -464 +494 @@
         (grfMode & STGM_DELETEONRELEASE) ||
         (grfMode & STGM_PRIORITY) )
-    return STG_E_INVALIDFUNCTION;
+  {
+    res = STG_E_INVALIDFUNCTION;
+    goto end;
+  }
 
   /*
    * Initialize the out parameter
    */
-  *ppstg = 0;
+  *ppstg = NULL;
   
   /*
@@ -514 +547 @@
       StorageBaseImpl_AddRef(*ppstg);
       
-      return S_OK;
+      res = S_OK;
+      goto end;
     }
     
-    return STG_E_INSUFFICIENTMEMORY;
-  }
-  
-  return STG_E_FILENOTFOUND;
+    res = STG_E_INSUFFICIENTMEMORY;
+    goto end;
+  }
+  
+  res = STG_E_FILENOTFOUND;
+
+end:
+  TRACE("<-- %08lx\n", res);
+  return res;
 }
 
@@ -587 +626 @@
   ICOM_THIS(StorageBaseImpl,iface);
   StgProperty    curProperty;
-  BOOL         readSuccessful;
+  BOOL           readSuccessful;
+  HRESULT        res = STG_E_UNKNOWN;
 
   TRACE("(%p, %p, %lx)\n", 
@@ -596 +636 @@
    */
   if ( (This==0) || (pstatstg==0))
-    return E_INVALIDARG;
+  {
+    res = E_INVALIDARG;
+    goto end;
+  }
 
   /*
@@ -613 +656 @@
       grfStatFlag);
     
-    return S_OK;
-  }
-  
-  return E_FAIL;
+    res = S_OK;
+    goto end;
+  }
+  
+  res = E_FAIL;
+
+end:
+  if (res == S_OK)
+  {
+    TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.s.LowPart, pstatstg->cbSize.s.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
+  }
+  TRACE("<-- %08lx\n", res);
+  return res;
 }
 
@@ -1687 +1739 @@
 
 
+/************************************************************************ 
+ * StorageImpl_Stat (IStorage) 
+ * 
+ * This method will retrieve information about this storage object. 
+ *  
+ * See Windows documentation for more details on IStorage methods. 
+ */
+HRESULT WINAPI StorageImpl_Stat( IStorage* iface,
+                                 STATSTG*  pstatstg,     /* [out] */
+                                 DWORD     grfStatFlag)  /* [in] */
+{
+  StorageImpl* const This = (StorageImpl*)iface;
+  HRESULT result = StorageBaseImpl_Stat( iface, pstatstg, grfStatFlag );
+
+  if ( !FAILED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName )
+  {
+      CoTaskMemFree(pstatstg->pwcsName);
+      pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->pwcsName)+1)*sizeof(WCHAR));
+      strcpyW(pstatstg->pwcsName, This->pwcsName);
+  }
+
+  return result;
+}
+
+
+
 /*********************************************************************
  *
@@ -2083 +2161 @@
   const FILETIME  *pmtime)  /* [in] */ 
 {
-  FIXME("not implemented!\n");
-  return E_NOTIMPL;
+  FIXME("(%s,...), stub!\n",debugstr_w(pwcsName));
+  return S_OK;
 }
 
@@ -2102 +2180 @@
   StorageImpl* This,
   HANDLE       hFile,
+  LPCOLESTR    pwcsName,
   ILockBytes*  pLkbyt,
   DWORD        openFlags,
@@ -2111 +2190 @@
   BOOL      readSuccessful;
   ULONG       currentPropertyIndex;
-  
+
   if ( FAILED( validateSTGM(openFlags) ))
     return STG_E_INVALIDFLAG;
@@ -2118 +2197 @@
   
   /*
-   * Initialize the virtual fgunction table.
+   * Initialize the virtual function table.
    */
   ICOM_VTBL(This)    = &Storage32Impl_Vtbl;
@@ -2124 +2203 @@
   
   /*
-   * This is the top-level storage so initialize the ancester pointer
+   * This is the top-level storage so initialize the ancestor pointer
    * to this.
    */
@@ -2134 +2213 @@
   This->hFile = hFile;
   
+  /*
+   * Store copy of file path.
+   */
+  if(pwcsName) {
+      This->pwcsName = HeapAlloc(GetProcessHeap(), 0, 
+                                (lstrlenW(pwcsName)+1)*sizeof(WCHAR));
+      if (!This->pwcsName)
+         return STG_E_INSUFFICIENTMEMORY;
+      strcpyW(This->pwcsName, pwcsName); 
+  }
+
   /*
    * Initialize the big block cache.
@@ -2251 +2341 @@
 
   /*
-   * Find the ID of the root int he property sets.
+   * Find the ID of the root in the property sets.
    */
   currentPropertyIndex = 0;
@@ -2296 +2386 @@
 {
   TRACE("(%p)\n", This);
+
+  if(This->pwcsName)
+    HeapFree(GetProcessHeap(), 0, This->pwcsName);
 
   BlockChainStream_Destroy(This->smallBlockRootChain);
@@ -2881 +2974 @@
      * blocks, just make sure they are what we're expecting.
      */
-    assert( (This->bigBlockSize==DEF_BIG_BLOCK_SIZE) && 
-            (This->smallBlockSize==DEF_SMALL_BLOCK_SIZE));
+    if (This->bigBlockSize != DEF_BIG_BLOCK_SIZE ||
+        This->smallBlockSize != DEF_SMALL_BLOCK_SIZE)
+    {
+        WARN("Broken OLE storage file\n");
+        hr = STG_E_INVALIDHEADER;
+    }
+    else
+        hr = S_OK;
     
     /*
@@ -2888 +2987 @@
      */
     StorageImpl_ReleaseBigBlock(This, headerBigBlock);
-
-    hr = S_OK;
   }
   
@@ -3016 +3113 @@
                     currentProperty,
                     &bytesRead);
-  
+
   if (readSuccessful)
   {
+    /* replace the name of root entry (often "Root Entry") by the file name */
+    WCHAR *propName = (index == This->rootPropertySetIndex) ?
+                        This->filename : (WCHAR *)currentProperty+OFFSET_PS_NAME;
+
     memset(buffer->name, 0, sizeof(buffer->name));
     memcpy(
       buffer->name, 
-      currentProperty+OFFSET_PS_NAME, 
+      propName, 
       PROPERTY_NAME_BUFFER_LEN );
+    TRACE("storage name: %s\n", debugstr_w(buffer->name));
 
     memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_PROPERTYTYPE, 1);
@@ -5368 +5470 @@
          newStorage,
          hFile,
+        pwcsName,
          NULL,
          grfMode,
@@ -5406 +5509 @@
   DWORD          shareMode;
   DWORD          accessMode;
+  WCHAR          fullname[MAX_PATH];
+  WIN32_FILE_ATTRIBUTE_DATA Fad;
 
   TRACE("(%s, %p, %lx, %p, %ld, %p)\n", 
@@ -5415 +5520 @@
    */
   if (( pwcsName == 0) || (ppstgOpen == 0) )
-    return STG_E_INVALIDPOINTER;
+  {
+    hr = STG_E_INVALIDPOINTER;
+    goto end;
+  }
 
   /*
@@ -5421 +5529 @@
    */
   if ( FAILED( validateSTGM(grfMode) ))
-    return STG_E_INVALIDFLAG;
+  {
+    hr = STG_E_INVALIDFLAG;
+    goto end;
+  }
 
   /*
@@ -5445 +5556 @@
   if (hFile==INVALID_HANDLE_VALUE)
   {
-    HRESULT hr = E_FAIL;
     DWORD last_error = GetLastError();
+
+    hr = E_FAIL;
 
     switch (last_error)
@@ -5471 +5583 @@
     }
 
-    return hr;
+    goto end;
   }
 
@@ -5480 +5592 @@
   
   if (newStorage == 0)
-    return STG_E_INSUFFICIENTMEMORY;
-
+  {
+    hr = STG_E_INSUFFICIENTMEMORY;
+    goto end;
+  }
+
+  /* if the file's length was zero, initialize the storage */
   hr = StorageImpl_Construct(
          newStorage,
          hFile,
+        pwcsName,
          NULL,
          grfMode,
          TRUE,
-         FALSE);
+         !(Fad.nFileSizeHigh || Fad.nFileSizeLow) /* FALSE */ );
   
   if (FAILED(hr))
@@ -5497 +5614 @@
      */
     if(hr == STG_E_INVALIDHEADER)
-        return STG_E_FILEALREADYEXISTS;
-    return hr;
-  }
-  
+        hr = STG_E_FILEALREADYEXISTS;
+    goto end;
+  }
+  
+  /* prepare the file name string given in lieu of the root property name */
+  GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL);
+  memcpy(newStorage->filename, fullname, PROPERTY_NAME_BUFFER_LEN);
+  newStorage->filename[PROPERTY_NAME_BUFFER_LEN-1] = '\0';
+
   /*
    * Get an "out" pointer for the caller.
@@ -5509 +5631 @@
          (void**)ppstgOpen);
   
+end:
+  TRACE("<-- %08lx, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL);
   return hr;
 }
@@ -5541 +5665 @@
          newStorage,
          0,
+        0,
          plkbyt,
          grfMode,
@@ -5605 +5730 @@
          newStorage,
          0,
+        0,
          plkbyt,
          grfMode,
@@ -5629 +5755 @@
 /******************************************************************************
  *              StgSetTimes [ole32.150]
- *
- *
- */
-HRESULT WINAPI StgSetTimes(WCHAR * str, FILETIME * a, FILETIME * b, FILETIME *c )
-{
- 
-  FIXME("(%p, %p, %p, %p),stub!\n", str, a, b, c);
-  return FALSE;
+ *              StgSetTimes [OLE32.150]
+ *
+ *
+ */
+HRESULT WINAPI StgSetTimes(OLECHAR *str, FILETIME *a, FILETIME *b, FILETIME *c )
+{
+  FIXME("(%s, %p, %p, %p),stub!\n", debugstr_w(str), a, b, c);
+  return S_OK;
 }
 
@@ -5677 +5803 @@
 
 /***********************************************************************
- *    ReadClassStg
+ *    ReadClassStg (OLE32.134)
  *
  * This method reads the CLSID previously written to a storage object with the WriteClassStg.
@@ -5702 +5828 @@
 
 /***********************************************************************
- *    OleLoadFromStream
+ *    OleLoadFromStream (OLE32.113)
  *
  * This function loads an object from stream
@@ -5736 +5862 @@
 
 /***********************************************************************
- *    OleSaveToStream
+ *    OleSaveToStream (OLE32.125)
  *
  * This function saves an object with the IPersistStream interface on it
@@ -6948 +7074 @@
     if(hRes == S_OK)
     {
-        /*Was it originaly Ole10 */
+        /* Was it originally Ole10 */
         hRes = IStorage_OpenStream(pstg, wstrStreamName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &pStream);    
         if(hRes == S_OK)
         {
             IStream_Release(pStream);
-            /*Get Presentation Data for Ole10Native */
+            /* Get Presentation Data for Ole10Native */
             OLECONVERT_GetOle10PresData(pstg, pOleStreamData);
         }
         else
         {
-            /*Get Presentation Data (OLE20)*/
+            /* Get Presentation Data (OLE20) */
             OLECONVERT_GetOle20PresData(pstg, pOleStreamData);
         }
@@ -6992 +7118 @@
 
 #ifdef __WIN32OS2__
+
 static const BYTE STORAGE_notmagic[8]={0x0e,0x11,0xfc,0x0d,0xd0,0xcf,0x11,0xe0};
 
 /******************************************************************************
- * StgIsStorageFile16 [STORAGE.5]
+ * StgIsStorageFile [STORAGE.5]
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
@@ -7037 +7164 @@
 StgIsStorageFile(LPCOLESTR fn) 
 {
-        LPOLESTR16      xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
-        HRESULT ret = StgIsStorageFile16(xfn);
-
-        HeapFree(GetProcessHeap(),0,xfn);
-        return ret;
+    HRESULT ret;
+    DWORD len = WideCharToMultiByte( CP_ACP, 0, fn, -1, NULL, 0, NULL, NULL );
+    LPSTR strA = HeapAlloc( GetProcessHeap(), 0, len );
+
+    WideCharToMultiByte( CP_ACP, 0, fn, -1, strA, len, NULL, NULL );
+    ret = StgIsStorageFile16(strA);
+    HeapFree( GetProcessHeap(), 0, strA );
+    return ret;
 }
 #endif