Ignore:
Timestamp:
Mar 19, 2000, 4:35:32 PM (26 years ago)
Author:
davidr
Message:

Ported changes from wine/corel sources

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ole32/storage.h

    r1033 r3167  
    1 /* $Id: storage.h,v 1.1 1999-09-24 21:49:45 davidr Exp $ */
     1/* $Id: storage.h,v 1.2 2000-03-19 15:35:15 davidr Exp $ */
    22/*
    33 * Compound Storage (32 bit version)
    … …  
    8989static const BYTE STORAGE_magic[8]    ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1};
    9090static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d};
    91 static const BYTE STORAGE_notmagic[8]={0x0e,0x11,0xfc,0x0d,0xd0,0xcf,0x11,0xe0};
    9291
    9392/*
    … …  
    138137typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE;
    139138typedef struct MappedPage   MappedPage,*LPMAPPEDPAGE;
    140 typedef struct BigBlock     BigBlock,*LPBIGBLOCK;
    141139
    142140struct BigBlockFile
    … …  
    148146  HANDLE hfilemap;
    149147  DWORD flProtect;
    150   MappedPage *maplisthead;
     148  MappedPage *maplist;
     149  MappedPage *victimhead, *victimtail;
     150  ULONG num_victim_pages;
    151151  ILockBytes *pLkbyt;
    152152  HGLOBAL hbytearray;
    153153  LPVOID pbytearray;
    154   BigBlock *headblock;
    155154};
    156155
    … …  
    182181struct StorageBaseImpl
    183182{
    184   ICOM_VTABLE(IStorage)*  lpvtbl;   /* Needs to be the first item in the stuct
    185                                        * since we want to cast this in a Storage32 pointer */
     183  ICOM_VFIELD(IStorage);   /* Needs to be the first item in the stuct
     184                            * since we want to cast this in a Storage32 pointer */
    186185
    187186  /*
    … …  
    276275struct StorageImpl
    277276{
    278   ICOM_VTABLE(IStorage) *lpvtbl;   /* Needs to be the first item in the stuct
     277  ICOM_VFIELD(IStorage);   /* Needs to be the first item in the stuct
    279278                                      * since we want to cast this in a Storage32 pointer */
    280279
    … …  
    323322   */
    324323  BigBlockFile* bigBlockFile;
     324
     325  /*****************************************************************************************/
     326  /* warning: this is a temp fix for bugs related to save file to mounted network drive    */
     327  /* TBD: these lines should be removed when we will get the final fix                     */
     328  /*****************************************************************************************/
     329  WCHAR* srcDestFiles[2];
     330  /*****************************************************************************************/
    325331};
    326332
    … …  
    378384
    379385HRESULT StorageImpl_Construct(
    380             StorageImpl* This,
    381             HANDLE       hFile,
    382       ILockBytes*  pLkbyt,
    383             DWORD        openFlags,
    384       BOOL         fileBased);
     386            StorageImpl* This,
     387            HANDLE       hFile,
     388            ILockBytes*  pLkbyt,
     389            DWORD        openFlags,
     390            BOOL         fileBased,
     391            BOOL         fileCreate);
    385392
    386393BOOL StorageImpl_ReadBigBlock(
    … …  
    465472struct StorageInternalImpl
    466473{
    467   ICOM_VTABLE(IStorage) *lpvtbl;        /* Needs to be the first item in the stuct
    468                                         * since we want to cast this in a Storage32 pointer */
     474  ICOM_VFIELD(IStorage);        /* Needs to be the first item in the stuct
     475                                * since we want to cast this in a Storage32 pointer */
    469476
    470477  /*
    … …  
    509516struct IEnumSTATSTGImpl
    510517{
    511   ICOM_VTABLE(IEnumSTATSTG) *lpvtbl;    /* Needs to be the first item in the stuct
     518  ICOM_VFIELD(IEnumSTATSTG);    /* Needs to be the first item in the stuct
    512519                                         * since we want to cast this in a IEnumSTATSTG pointer */
    513520 
    … …  
    594601struct StgStreamImpl
    595602{
    596   ICOM_VTABLE(IStream) *lpvtbl;  /* Needs to be the first item in the stuct
     603  ICOM_VFIELD(IStream);  /* Needs to be the first item in the stuct
    597604                                    * since we want to cast this in a IStream pointer */
    598605 
    … …  
    606613   */
    607614  StorageBaseImpl* parentStorage;
     615
     616  /*
     617   * Access mode of this stream.
     618   */
     619  DWORD grfMode;
    608620
    609621  /*
    … …  
    637649StgStreamImpl* StgStreamImpl_Construct(
    638650                StorageBaseImpl* parentStorage,
    639                 ULONG              ownerProperty);
     651    DWORD            grfMode,
     652    ULONG            ownerProperty);
    640653
    641654void StgStreamImpl_Destroy(
    … …  
    723736void StorageUtl_ReadDWord(void* buffer, ULONG offset, DWORD* value);
    724737void StorageUtl_WriteDWord(void* buffer, ULONG offset, DWORD value);
     738void StorageUtl_ReadDWords(void *buffer, ULONG offset, DWORD *values,
     739                           ULONG len);
    725740void StorageUtl_ReadGUID(void* buffer, ULONG offset, GUID* value);
    726741void StorageUtl_WriteGUID(void* buffer, ULONG offset, GUID* value);
    … …  
    744759  ULONG        tailIndex;
    745760  ULONG        numBlocks;
     761  BOOL         lazyInitComplete;
    746762};
    747763
Note: See TracChangeset for help on using the changeset viewer.