From 442f992abe9804fab3a2f3d38aa7bd55c4464a42 Mon Sep 17 00:00:00 2001 From: dannysmith Date: Tue, 2 Apr 2002 09:00:07 +0000 Subject: [PATCH] * include/objidl.h (IRunningObjectTable.Register): Correct prototype. * include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE, ROTFLAGS_ALLOWANYCLIENT): Add defines. * include/wtypes.h (enum tagCLSCTX): Change formatting. --- winsup/w32api/ChangeLog | 11 +++++++++++ winsup/w32api/include/objidl.h | 2 +- winsup/w32api/include/wtypes.h | 6 ++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index cd9ffaab87..18e09f4872 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,14 @@ +2002-04-02 Danny Smith + + * include/wtypes.h (enum tagCLSCTX): Change formatting. + +2002-04-02 Pat Thoyts + + * include/objidl.h (IRunningObjectTable.Register): Correct + prototype. + * include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE, + ROTFLAGS_ALLOWANYCLIENT): Add defines. + 2002-03-31 Victor Porton * include/shellapi.h (SHGFI_ATTR_SPECIFIED): Add define. diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index 34ebe8e694..dfabbee185 100644 --- a/winsup/w32api/include/objidl.h +++ b/winsup/w32api/include/objidl.h @@ -561,7 +561,7 @@ DECLARE_INTERFACE_(IRunningObjectTable,IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(Register)(THIS_ LPUNKNOWN,LPMONIKER,PDWORD) PURE; + STDMETHOD(Register)(THIS_ DWORD,LPUNKNOWN,LPMONIKER,PDWORD) PURE; STDMETHOD(Revoke)(THIS_ DWORD) PURE; STDMETHOD(IsRunning)(THIS_ LPMONIKER) PURE; STDMETHOD(GetObject)(THIS_ LPMONIKER,LPUNKNOWN*) PURE; diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h index 6c24def02a..936b43fdc7 100644 --- a/winsup/w32api/include/wtypes.h +++ b/winsup/w32api/include/wtypes.h @@ -15,6 +15,9 @@ extern "C" { #define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt)) #define DECIMAL_NEG ((BYTE)0x80) #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;} +#define ROTFLAGS_REGISTRATIONKEEPSALIVE 0x01 +#define ROTFLAGS_ALLOWANYCLIENT 0x02 + #ifndef __BLOB_T_DEFINED /* also in winsock2.h */ #define __BLOB_T_DEFINED typedef struct _BLOB { @@ -49,8 +52,7 @@ typedef enum tagMSHCTX { MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC } MSHCTX; -typedef -enum tagCLSCTX { +typedef enum tagCLSCTX { CLSCTX_INPROC_SERVER=1,CLSCTX_INPROC_HANDLER=2,CLSCTX_LOCAL_SERVER=4, CLSCTX_INPROC_SERVER16=8,CLSCTX_REMOTE_SERVER=16 } CLSCTX; -- 2.11.0