2004-01-09 Stuart Cunningham <stuart_hc@users.sourceforge.net>

	* include/objbase.h (STGFMT): Declare enum.
	(STGOPTIONS): Declare structure.
	(StgCreateStorageEx, StgOpenStorageEx): Declare.
	(STGOPTIONS_VERSION): Define.
	* lib/ole32.def (StgCreateStorageEx, StgOpenStorageEx): Add stubs.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f9da51e..6ad9967 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-09  Stuart Cunningham  <stuart_hc@users.sourceforge.net>
+
+       * include/objbase.h (STGFMT): Declare enum.
+       (STGOPTIONS): Declare structure.
+       (StgCreateStorageEx, StgOpenStorageEx): Declare.
+       (STGOPTIONS_VERSION): Define.
+       * lib/ole32.def (StgCreateStorageEx, StgOpenStorageEx): Add stubs.
+
 2004-04-13  Filip Navara  <xnavara@volny.cz>
 
        * include/winuser.h (IS_INTRESOURCE, MB_CANCELTRYCONTINUE,

diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h
index 144d52d..a18235e 100644 (file)
--- a/winsup/w32api/include/objbase.h
+++ b/winsup/w32api/include/objbase.h
@@ -50,6 +50,19 @@
 #define STG_LAYOUT_INTERLEAVED 1
 #define COM_RIGHTS_EXECUTE 1
 #define COM_RIGHTS_SAFE_FOR_SCRIPTING 2
+#define STGOPTIONS_VERSION 2
+typedef enum tagSTGFMT {
+       STGFMT_STORAGE = 0, 
+       STGFMT_FILE = 3, 
+       STGFMT_ANY = 4, 
+       STGFMT_DOCFILE = 5
+} STGFMT;
+typedef struct tagSTGOPTIONS {
+       USHORT usVersion;
+       USHORT reserved;
+       ULONG ulSectorSize;
+       const WCHAR pwcsTemplateFile;
+} STGOPTIONS;
 typedef enum tagREGCLS {
        REGCLS_SINGLEUSE = 0,
        REGCLS_MULTIPLEUSE = 1,
@@ -152,6 +165,8 @@ WINOLEAPI StgOpenStorageOnILockBytes(ILockBytes*,IStorage*,DWORD,SNB,DWORD,IStor
 WINOLEAPI StgIsStorageFile(const OLECHAR*);
 WINOLEAPI StgIsStorageILockBytes(ILockBytes*);
 WINOLEAPI StgSetTimes(OLECHAR const*,FILETIME const*,FILETIME const*,FILETIME const*);
+WINOLEAPI StgCreateStorageEx(const WCHAR*,DWORD,DWORD,DWORD,STGOPTIONS*,void*,REFIID,void**);
+WINOLEAPI StgOpenStorageEx(const WCHAR*,DWORD,DWORD,DWORD,STGOPTIONS*,void*,REFIID,void**);
 WINOLEAPI BindMoniker(LPMONIKER,DWORD,REFIID,PVOID*);
 WINOLEAPI CoGetObject(LPCWSTR,BIND_OPTS*,REFIID,void**);
 WINOLEAPI MkParseDisplayName(LPBC,LPCOLESTR,ULONG*,LPMONIKER*);

diff --git a/winsup/w32api/lib/ole32.def b/winsup/w32api/lib/ole32.def
index ebac6bf..d190b18 100644 (file)
--- a/winsup/w32api/lib/ole32.def
+++ b/winsup/w32api/lib/ole32.def
@@ -238,6 +238,8 @@ StgOpenAsyncDocfileOnIFillLockBytes@16
 StgOpenStorage@24
 StgOpenStorageOnILockBytes@24
 StgSetTimes@16
+StgCreateStorageEx@32
+StgOpenStorageEx@32
 StringFromCLSID@8
 StringFromGUID2@12
 StringFromIID@8