Changeset 4241 for trunk/include/win/ole.h

Timestamp:

Sep 12, 2000, 8:40:16 PM (25 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/ole.h (modified) (6 diffs)

trunk/include/win/ole.h

@@ -1 @@
-/* $Id: ole.h,v 1.3 1999-06-10 16:21:51 achimha Exp $ */
+/* $Id: ole.h,v 1.4 2000-09-12 18:40:15 sandervl Exp $ */
 /*
  *      ole.h   -       Declarations for OLESVR and OLECLI
@@ -161 +161 @@
 typedef struct _OLESTREAM* LPOLESTREAM;
 typedef struct _OLESTREAMVTBL {
-        DWORD   (CALLBACK *Get)(LPOLESTREAM,LPSTR,DWORD);
-        DWORD   (CALLBACK *Put)(LPOLESTREAM,LPSTR,DWORD);
+        DWORD   (* CALLBACK Get)(LPOLESTREAM,LPSTR,DWORD);
+        DWORD   (* CALLBACK Put)(LPOLESTREAM,LPSTR,DWORD);
 } OLESTREAMVTBL;
 typedef OLESTREAMVTBL*  LPOLESTREAMVTBL;
@@ -172 +172 @@
 typedef struct _OLECLIENT*      LPOLECLIENT;
 typedef struct _OLESERVERDOCVTBL {
-        OLESTATUS       (CALLBACK *Save)(LPOLESERVERDOC);
-        OLESTATUS       (CALLBACK *Close)(LPOLESERVERDOC);
-        OLESTATUS       (CALLBACK *SetHostNames)(LPOLESERVERDOC,LPCOLESTR16,LPCOLESTR16);
-        OLESTATUS       (CALLBACK *SetDocDimensions)(LPOLESERVERDOC,LPRECT16);
+        OLESTATUS       (* CALLBACK Save)(LPOLESERVERDOC);
+        OLESTATUS       (* CALLBACK Close)(LPOLESERVERDOC);
+        OLESTATUS       (* CALLBACK SetHostNames)(LPOLESERVERDOC,LPCOLESTR16,LPCOLESTR16);
+        OLESTATUS       (* CALLBACK SetDocDimensions)(LPOLESERVERDOC,LPRECT16);
 #ifdef __WINE__
 /* GetObject is a WINELIB_NAME macro so it cannot be used in Wine itself */
-        OLESTATUS       (CALLBACK *pGetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
+        OLESTATUS       (* CALLBACK pGetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
 #else
-        OLESTATUS       (CALLBACK *GetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
+        OLESTATUS       (* CALLBACK GetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
 #endif
-        OLESTATUS       (CALLBACK *Release)(LPOLESERVERDOC);
-        OLESTATUS       (CALLBACK *SetColorScheme)(LPOLESERVERDOC,LPLOGPALETTE);
-        OLESTATUS       (CALLBACK *Execute)(LPOLESERVERDOC,HGLOBAL16);
+        OLESTATUS       (* CALLBACK Release)(LPOLESERVERDOC);
+        OLESTATUS       (* CALLBACK SetColorScheme)(LPOLESERVERDOC,LPLOGPALETTE);
+        OLESTATUS       (* CALLBACK Execute)(LPOLESERVERDOC,HGLOBAL16);
 } OLESERVERDOCVTBL;
 typedef OLESERVERDOCVTBL*       LPOLESERVERDOCVTBL;
@@ -194 +194 @@
 typedef struct _OLESERVER*      LPOLESERVER;
 typedef struct _OLESERVERVTBL {
-        OLESTATUS       (CALLBACK *Open)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPOLESERVERDOC *);
-        OLESTATUS       (CALLBACK *Create)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC*);
-        OLESTATUS       (CALLBACK *CreateFromTemplate)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
-        OLESTATUS       (CALLBACK *Edit)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
-        OLESTATUS       (CALLBACK *Exit)(LPOLESERVER);
-        OLESTATUS       (CALLBACK *Release)(LPOLESERVER); 
-        OLESTATUS       (CALLBACK *Execute)(LPOLESERVER); 
+        OLESTATUS       (* CALLBACK Open)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPOLESERVERDOC *);
+        OLESTATUS       (* CALLBACK Create)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC*);
+        OLESTATUS       (* CALLBACK CreateFromTemplate)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
+        OLESTATUS       (* CALLBACK Edit)(LPOLESERVER,LHSERVERDOC,LPCOLESTR16,LPCOLESTR16,LPOLESERVERDOC *);
+        OLESTATUS       (* CALLBACK Exit)(LPOLESERVER);
+        OLESTATUS       (* CALLBACK Release)(LPOLESERVER); 
+        OLESTATUS       (* CALLBACK Execute)(LPOLESERVER); 
 } OLESERVERVTBL; 
 typedef OLESERVERVTBL   *LPOLESERVERVTBL;
@@ -208 +208 @@
 } OLESERVER;
 typedef struct _OLECLIENTVTBL {
-        int (CALLBACK *CallBack)(LPOLECLIENT,OLE_NOTIFICATION,LPOLEOBJECT);
+        int (* CALLBACK CallBack)(LPOLECLIENT,OLE_NOTIFICATION,LPOLEOBJECT);
 } OLECLIENTVTBL;
 typedef OLECLIENTVTBL   *LPOLECLIENTVTBL;
@@ -218 +218 @@
 
 typedef struct _OLEOBJECTVTBL {
-        void *          (CALLBACK *QueryProtocol)(LPOLEOBJECT,LPCOLESTR16);
-        OLESTATUS       (CALLBACK *Release)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *Show)(LPOLEOBJECT,BOOL16);
-        OLESTATUS       (CALLBACK *DoVerb)(LPOLEOBJECT,UINT16,BOOL16,BOOL16);
-        OLESTATUS       (CALLBACK *GetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *);
-        OLESTATUS       (CALLBACK *SetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16);
-        OLESTATUS       (CALLBACK *SetTargetDevice)(LPOLEOBJECT,HGLOBAL16);
-        OLESTATUS       (CALLBACK *SetBounds)(LPOLEOBJECT,LPRECT16);
-        OLESTATUS       (CALLBACK *EnumFormats)(LPOLEOBJECT,OLECLIPFORMAT);
-        OLESTATUS       (CALLBACK *SetColorScheme)(LPOLEOBJECT,LPLOGPALETTE);
-        OLESTATUS       (CALLBACK *Delete)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *SetHostNames)(LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16);
-        OLESTATUS       (CALLBACK *SaveToStream)(LPOLEOBJECT,LPOLESTREAM);
-        OLESTATUS       (CALLBACK *Clone)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
-        OLESTATUS       (CALLBACK *CopyFromLink)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
-        OLESTATUS       (CALLBACK *Equal)(LPOLEOBJECT,LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *CopyToClipBoard)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *Draw)(LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16);
-        OLESTATUS       (CALLBACK *Activate)(LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16);
-        OLESTATUS       (CALLBACK *Execute)(LPOLEOBJECT,HGLOBAL16,UINT16);
-        OLESTATUS       (CALLBACK *Close)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *Update)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *Reconnect)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *ObjectConvert)(LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT*);
-        OLESTATUS       (CALLBACK *GetLinkUpdateOptions)(LPOLEOBJECT,LPOLEOPT_UPDATE);
-        OLESTATUS       (CALLBACK *SetLinkUpdateOptions)(LPOLEOBJECT,OLEOPT_UPDATE);
-        OLESTATUS       (CALLBACK *Rename)(LPOLEOBJECT,LPCOLESTR16);
-        OLESTATUS       (CALLBACK *QueryName)(LPOLEOBJECT,LPSTR,LPUINT16);
-        OLESTATUS       (CALLBACK *QueryType)(LPOLEOBJECT,LPLONG);
-        OLESTATUS       (CALLBACK *QueryBounds)(LPOLEOBJECT,LPRECT16);
-        OLESTATUS       (CALLBACK *QuerySize)(LPOLEOBJECT,LPDWORD);
-        OLESTATUS       (CALLBACK *QueryOpen)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *QueryOutOfDate)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *QueryReleaseStatus)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *QueryReleaseError)(LPOLEOBJECT);
-        OLE_RELEASE_METHOD (CALLBACK *QueryReleaseMethod)(LPOLEOBJECT);
-        OLESTATUS       (CALLBACK *RequestData)(LPOLEOBJECT,OLECLIPFORMAT);
-        OLESTATUS       (CALLBACK *ObjectLong)(LPOLEOBJECT,UINT16,LPLONG);
+        void *          (* CALLBACK QueryProtocol)(LPOLEOBJECT,LPCOLESTR16);
+        OLESTATUS       (* CALLBACK Release)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK Show)(LPOLEOBJECT,BOOL16);
+        OLESTATUS       (* CALLBACK DoVerb)(LPOLEOBJECT,UINT16,BOOL16,BOOL16);
+        OLESTATUS       (* CALLBACK GetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *);
+        OLESTATUS       (* CALLBACK SetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE16);
+        OLESTATUS       (* CALLBACK SetTargetDevice)(LPOLEOBJECT,HGLOBAL16);
+        OLESTATUS       (* CALLBACK SetBounds)(LPOLEOBJECT,LPRECT16);
+        OLESTATUS       (* CALLBACK EnumFormats)(LPOLEOBJECT,OLECLIPFORMAT);
+        OLESTATUS       (* CALLBACK SetColorScheme)(LPOLEOBJECT,LPLOGPALETTE);
+        OLESTATUS       (* CALLBACK Delete)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK SetHostNames)(LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16);
+        OLESTATUS       (* CALLBACK SaveToStream)(LPOLEOBJECT,LPOLESTREAM);
+        OLESTATUS       (* CALLBACK Clone)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
+        OLESTATUS       (* CALLBACK CopyFromLink)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT *);
+        OLESTATUS       (* CALLBACK Equal)(LPOLEOBJECT,LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK CopyToClipBoard)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK Draw)(LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16);
+        OLESTATUS       (* CALLBACK Activate)(LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16);
+        OLESTATUS       (* CALLBACK Execute)(LPOLEOBJECT,HGLOBAL16,UINT16);
+        OLESTATUS       (* CALLBACK Close)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK Update)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK Reconnect)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK ObjectConvert)(LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,LPOLEOBJECT*);
+        OLESTATUS       (* CALLBACK GetLinkUpdateOptions)(LPOLEOBJECT,LPOLEOPT_UPDATE);
+        OLESTATUS       (* CALLBACK SetLinkUpdateOptions)(LPOLEOBJECT,OLEOPT_UPDATE);
+        OLESTATUS       (* CALLBACK Rename)(LPOLEOBJECT,LPCOLESTR16);
+        OLESTATUS       (* CALLBACK QueryName)(LPOLEOBJECT,LPSTR,LPUINT16);
+        OLESTATUS       (* CALLBACK QueryType)(LPOLEOBJECT,LPLONG);
+        OLESTATUS       (* CALLBACK QueryBounds)(LPOLEOBJECT,LPRECT16);
+        OLESTATUS       (* CALLBACK QuerySize)(LPOLEOBJECT,LPDWORD);
+        OLESTATUS       (* CALLBACK QueryOpen)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK QueryOutOfDate)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK QueryReleaseStatus)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK QueryReleaseError)(LPOLEOBJECT);
+        OLE_RELEASE_METHOD (* CALLBACK QueryReleaseMethod)(LPOLEOBJECT);
+        OLESTATUS       (* CALLBACK RequestData)(LPOLEOBJECT,OLECLIPFORMAT);
+        OLESTATUS       (* CALLBACK ObjectLong)(LPOLEOBJECT,UINT16,LPLONG);
 } OLEOBJECTVTBL;
 typedef OLEOBJECTVTBL*  LPOLEOBJECTVTBL;