Fixed GetObject macro problem.
This commit is contained in:
parent
0c91d0afab
commit
3d50646786
|
@ -178,8 +178,12 @@ typedef struct _OLESERVERDOCVTBL {
|
||||||
OLESTATUS (CALLBACK *Close)(LPOLESERVERDOC);
|
OLESTATUS (CALLBACK *Close)(LPOLESERVERDOC);
|
||||||
OLESTATUS (CALLBACK *SetHostNames)(LPOLESERVERDOC,LPCOLESTR16,LPCOLESTR16);
|
OLESTATUS (CALLBACK *SetHostNames)(LPOLESERVERDOC,LPCOLESTR16,LPCOLESTR16);
|
||||||
OLESTATUS (CALLBACK *SetDocDimensions)(LPOLESERVERDOC,LPRECT16);
|
OLESTATUS (CALLBACK *SetDocDimensions)(LPOLESERVERDOC,LPRECT16);
|
||||||
#undef GetObject /* FIXME */
|
#ifdef __WINE__
|
||||||
|
/* GetObject is a WINELIB_NAME macro so it cannot be used in Wine itself */
|
||||||
|
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 *Release)(LPOLESERVERDOC);
|
||||||
OLESTATUS (CALLBACK *SetColorScheme)(LPOLESERVERDOC,LPLOGPALETTE);
|
OLESTATUS (CALLBACK *SetColorScheme)(LPOLESERVERDOC,LPLOGPALETTE);
|
||||||
OLESTATUS (CALLBACK *Execute)(LPOLESERVERDOC,HGLOBAL16);
|
OLESTATUS (CALLBACK *Execute)(LPOLESERVERDOC,HGLOBAL16);
|
||||||
|
|
Loading…
Reference in New Issue