diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-04-02 09:00:14 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-04-02 09:00:14 +0000 |
| commit | e432b38efed39310dbdd2763db075ab439f59654 (patch) | |
| tree | 310e23c528988b63ef5c5f1725558d1e9d3f4e82 | |
| parent | d4dca0e42e10a00ec1bdcc444083e86765b15ea3 (diff) | |
| download | cygnal-e432b38efed39310dbdd2763db075ab439f59654.tar.gz cygnal-e432b38efed39310dbdd2763db075ab439f59654.tar.bz2 cygnal-e432b38efed39310dbdd2763db075ab439f59654.zip | |
* include/objidl.h (IRunningObjectTable.Register): Correct
prototype.
* include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE,
ROTFLAGS_ALLOWANYCLIENT): Add defines.
* include/wtypes.h (enum tagCLSCTX): Change formatting.
| -rw-r--r-- | winsup/w32api/ChangeLog | 11 | ||||
| -rw-r--r-- | winsup/w32api/include/objidl.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/wtypes.h | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index cd9ffaab8..18e09f487 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,14 @@ +2002-04-02 Danny Smith <dannysmith@users.sourceforge.net> + + * include/wtypes.h (enum tagCLSCTX): Change formatting. + +2002-04-02 Pat Thoyts <patthoyts@users.sourceforge.net> + + * include/objidl.h (IRunningObjectTable.Register): Correct + prototype. + * include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE, + ROTFLAGS_ALLOWANYCLIENT): Add defines. + 2002-03-31 Victor Porton <porton@narod.ru> * include/shellapi.h (SHGFI_ATTR_SPECIFIED): Add define. diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index 34ebe8e69..dfabbee18 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 6c24def02..936b43fdc 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; |