Skip to content

W
wine-winehq
Commit 3d506467 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Fixed GetObject macro problem.

parent 0c91d0af
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
include/ole.h
View file @ 3d506467
...@@ -178,8 +178,12 @@ typedef struct _OLESERVERDOCVTBL { ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment