diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-01-26 21:05:20 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-01-26 21:05:20 +0000 |
| commit | 7646d1a111e689ba2f25fcc26de9a1668547de8a (patch) | |
| tree | 6f20243ab3f37db56720d6600b522a971034bc18 /winsup/w32api/include/objbase.h | |
| parent | cd7053e78b5bc0753b76c2514a64973b29b5ee25 (diff) | |
| download | cygnal-7646d1a111e689ba2f25fcc26de9a1668547de8a.tar.gz cygnal-7646d1a111e689ba2f25fcc26de9a1668547de8a.tar.bz2 cygnal-7646d1a111e689ba2f25fcc26de9a1668547de8a.zip | |
* Apply Danny Smith patch 102275
2000-11-05 Danny Smith <danny_r_smith_2001@yahoo.co.nz>
* include/objbase.h: (COM_RIGHTS): Add definition.
(tagSTDMSHLFLAGS): add enumeration.
(CoInitializeEx): Add prototypes.
(CoGetStdMarshalEx): ditto.
(CoCreateInstanceEx): ditto.
(CoInitializeSecurity): ditto.
(CoGetCallContext): ditto.
(CoQueryProxyBlanket): ditto.
(CoSetProxyBlanket): ditto.
(CoCopyProxy): ditto.
(CoQueryClientBlanket): ditto.
(CoImpersonateClient): ditto.
(CoRevertToSelf): ditto.
(CoQueryAuthenticationServices): ditto.
(CoSwitchCallContext): ditto.
(CoGetInstanceFromFile): ditto.
(CoGetInstanceFromIStorage): ditto.
* include/objidl.h: (SOLE_AUTHENTICATION_SERVICE): Add structure.
(SOLE_AUTHENTICATION_INFO): ditto.
(EOLE_AUTHENTICATION_CAPABILITIES): Add enumeration.
(COLE_DEFAULT_PRINCIPAL): Add definition.
(COLE_DEFAULT_AUTHINFO): Ditto.
* include/rpcdce.h: (RPC_C_AUTHZ_DEFAULT): Add definition.
(RPC_PROTSEQ_VECTOR) Fix typo.
(RpcRaiseException): add DECLSPEC_NORETURN attribute.
* include/winbase.h: (FreeLibraryAndExitThread): add DECLSPEC_NORETURN
attribute.
Diffstat (limited to 'winsup/w32api/include/objbase.h')
| -rw-r--r-- | winsup/w32api/include/objbase.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h index 5e83ad5ae..b2541a15f 100644 --- a/winsup/w32api/include/objbase.h +++ b/winsup/w32api/include/objbase.h @@ -40,6 +40,8 @@ #define STG_TOEND 0xFFFFFFFF #define STG_LAYOUT_SEQUENTIAL 0 #define STG_LAYOUT_INTERLEAVED 1 +#define COM_RIGHTS_EXECUTE 1 +#define COM_RIGHTS_SAFE_FOR_SCRIPTING 2 typedef enum tagREGCLS { REGCLS_SINGLEUSE = 0, REGCLS_MULTIPLEUSE = 1, @@ -69,9 +71,14 @@ typedef enum tagCOINIT { COINIT_DISABLE_OLE1DDE = 0x4, COINIT_SPEED_OVER_MEMORY = 0x8, } COINIT; +typedef enum tagSTDMSHLFLAGS { + SMEXF_SERVER = 0x01, + SMEXF_HANDLER = 0x02 +} STDMSHLFLAGS; WINOLEAPI_(DWORD) CoBuildVersion(void); WINOLEAPI CoInitialize(PVOID); +WINOLEAPI CoInitializeEx(LPVOID,DWORD); WINOLEAPI_(void) CoUninitialize(void); WINOLEAPI CoGetMalloc(DWORD,LPMALLOC*); WINOLEAPI_(DWORD) CoGetCurrentProcess(void); @@ -94,6 +101,7 @@ WINOLEAPI CoReleaseMarshalData(LPSTREAM); WINOLEAPI CoDisconnectObject(LPUNKNOWN,DWORD); WINOLEAPI CoLockObjectExternal(LPUNKNOWN,BOOL,BOOL); WINOLEAPI CoGetStandardMarshal(REFIID,LPUNKNOWN,DWORD,PVOID,DWORD,LPMARSHAL*); +WINOLEAPI CoGetStdMarshalEx(LPUNKNOWN,DWORD,LPUNKNOWN*); WINOLEAPI_(BOOL) CoIsHandlerConnected(LPUNKNOWN); WINOLEAPI_(BOOL) CoHasStrongExternalConnections(LPUNKNOWN); WINOLEAPI CoMarshalInterThreadInterfaceInStream(REFIID,LPUNKNOWN,LPSTREAM*); @@ -104,6 +112,7 @@ WINOLEAPI_(void) CoFreeLibrary(HINSTANCE); WINOLEAPI_(void) CoFreeAllLibraries(void); WINOLEAPI_(void) CoFreeUnusedLibraries(void); WINOLEAPI CoCreateInstance(REFCLSID,LPUNKNOWN,DWORD,REFIID,PVOID*); +WINOLEAPI CoCreateInstanceEx(REFCLSID,IUnknown*,DWORD,COSERVERINFO*,DWORD,MULTI_QI*); WINOLEAPI StringFromCLSID(REFCLSID,LPOLESTR*); WINOLEAPI CLSIDFromString(LPOLESTR,LPCLSID); WINOLEAPI StringFromIID(REFIID,LPOLESTR*); @@ -147,5 +156,18 @@ WINOLEAPI CreateItemMoniker(LPCOLESTR,LPCOLESTR,LPMONIKER*); WINOLEAPI CreateAntiMoniker(LPMONIKER*); WINOLEAPI CreatePointerMoniker(LPUNKNOWN,LPMONIKER*); WINOLEAPI GetRunningObjectTable(DWORD,LPRUNNINGOBJECTTABLE*); +WINOLEAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR,LONG,SOLE_AUTHENTICATION_SERVICE*, void*,DWORD,DWORD,void*,DWORD,void*); +WINOLEAPI CoGetCallContext(REFIID,void**); +WINOLEAPI CoQueryProxyBlanket(IUnknown*, DWORD*,DWORD*,OLECHAR**,DWORD*,DWORD*,RPC_AUTH_IDENTITY_HANDLE*,DWORD*); +WINOLEAPI CoSetProxyBlanket(IUnknown*,DWORD,DWORD,OLECHAR*,DWORD,DWORD,RPC_AUTH_IDENTITY_HANDLE, DWORD); +WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**); +WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*); +WINOLEAPI CoImpersonateClient(); +WINOLEAPI CoRevertToSelf(); +WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**); +WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**); +WINOLEAPI CoGetInstanceFromFile(COSERVERINFO*, CLSID*,IUnknown*,DWORD,DWORD,OLECHAR*,DWORD,MULTI_QI*); +WINOLEAPI CoGetInstanceFromIStorage(COSERVERINFO*,CLSID*, IUnknown*,DWORD,struct IStorage*, DWORD,MULTI_QI*); + #pragma pack(pop) #endif |