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

Timestamp:

Apr 26, 2001, 9:33:15 PM (25 years ago)

Author:

sandervl

Message:

resync with Wine 20010418

File:

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

trunk/src/ole32/storage32.c

@@ -12 +12 @@
 
 #ifdef __WIN32OS2__
-#define WINE_LARGE_INTEGER
-
 #include <odin.h>
 #include "ole32.h"
 #include "heapstring.h"
-
 #endif
 
@@ -5304 +5301 @@
     WCHAR prefix[] = { 'S', 'T', 'O', 0 };
 
+    if (!(grfMode & STGM_SHARE_EXCLUSIVE))
+      return STG_E_INVALIDFLAG;
+    if (!(grfMode & (STGM_WRITE|STGM_READWRITE)))
+      return STG_E_INVALIDFLAG;
+
     memset(tempPath, 0, sizeof(tempPath));
     memset(tempFileName, 0, sizeof(tempFileName));
@@ -5314 +5316 @@
     else
       return STG_E_INSUFFICIENTMEMORY;
+
+    creationMode = TRUNCATE_EXISTING;
+  }
+  else
+  {
+    creationMode = GetCreationModeFromSTGM(grfMode);
   }
 
@@ -5321 +5329 @@
   shareMode    = GetShareModeFromSTGM(grfMode);
   accessMode   = GetAccessModeFromSTGM(grfMode);
-  creationMode = GetCreationModeFromSTGM(grfMode);
 
   if (grfMode & STGM_DELETEONRELEASE)
@@ -5485 +5492 @@
   {
     HeapFree(GetProcessHeap(), 0, newStorage);
+    /*
+     * According to the docs if the file is not a storage, return STG_E_FILEALREADYEXISTS
+     */
+    if(hr == STG_E_INVALIDHEADER)
+        return STG_E_FILEALREADYEXISTS;
     return hr;
   }
@@ -5613 +5625 @@
   return hr;
 }
-#ifndef __WIN32OS2__
+
 /******************************************************************************
  *              StgSetTimes [ole32.150]
@@ -5625 +5637 @@
   return FALSE;
 }
-#endif
 
 /******************************************************************************
@@ -6414 +6425 @@
 
         /* copy the OleTypeName to the compobj struct */
-        /* Note: in the test made, these where Identical      */
+        /* Note: in the test made, these were Identical      */
         IStorageCompObj.dwProgIDNameLength = strlen(strOleTypeName)+1;
         strcpy(IStorageCompObj.strProgIDName, strOleTypeName);
@@ -6971 +6982 @@
 }
 
+/***********************************************************************
+ *              GetConvertStg (OLE32.68)
+ */
+HRESULT WINAPI GetConvertStg(LPGUID guid) {
+    FIXME("(%s), unimplemented stub!\n",debugstr_guid(guid));
+    return E_FAIL;
+}
+
 #ifdef __WIN32OS2__
+static const BYTE STORAGE_notmagic[8]={0x0e,0x11,0xfc,0x0d,0xd0,0xcf,0x11,0xe0};
+
 /******************************************************************************
  * StgIsStorageFile16 [STORAGE.5]
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
-static const BYTE STORAGE_notmagic[8]={0x0e,0x11,0xfc,0x0d,0xd0,0xcf,0x11,0xe0};
-        HFILE           hf;
-        OFSTRUCT        ofs;
-        BYTE            magic[24];
-
-        TRACE_(ole)("(\'%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_(ole)(" too short\n");
-                _lclose(hf);
-                return S_FALSE;
-        }
-        if (!memcmp(magic,STORAGE_magic,8)) {
-                WARN_(ole)(" -> YES\n");
-                _lclose(hf);
-                return S_OK;
-        }
-        if (!memcmp(magic,STORAGE_notmagic,8)) {
-                WARN_(ole)(" -> NO\n");
-                _lclose(hf);
-                return S_FALSE;
-        }
-        if (!memcmp(magic,STORAGE_oldmagic,8)) {
-                WARN_(ole)(" -> old format\n");
-                _lclose(hf);
-                return STG_E_OLDFORMAT;
-        }
-        WARN_(ole)(" -> Invalid header.\n");
-        _lclose(hf);
-        return STG_E_INVALIDHEADER;
-}
-
-HRESULT WINAPI
-StgIsStorageFile(LPCOLESTR fn)
-{
-        LPOLESTR16      xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
-        HRESULT       ret = StgIsStorageFile16(xfn);
-
-        HeapFree(GetProcessHeap(),0,xfn);
-        return ret;
+        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;
+}
+
+/******************************************************************************
+ * 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;
 }
 #endif