Moved a couple of definitions from include/wine/obj_oleaut.h to
include/oleauto.h.
This commit is contained in:
parent
db9692d022
commit
008f4ce91a
|
@ -28,6 +28,8 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
|
||||||
|
|
||||||
struct tagSAFEARRAY;
|
struct tagSAFEARRAY;
|
||||||
struct tagSAFEARRAYBOUND;
|
struct tagSAFEARRAYBOUND;
|
||||||
struct tagVARIANT;
|
struct tagVARIANT;
|
||||||
|
@ -633,6 +635,13 @@ HRESULT WINAPI GetActiveObject(REFCLSID, void*, IUnknown**);
|
||||||
* TypeLib API
|
* TypeLib API
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define MEMBERID_NIL DISPID_UNKNOWN
|
||||||
|
|
||||||
|
#define DISPATCH_METHOD 0x1
|
||||||
|
#define DISPATCH_PROPERTYGET 0x2
|
||||||
|
#define DISPATCH_PROPERTYPUT 0x4
|
||||||
|
#define DISPATCH_PROPERTYPUTREF 0x8
|
||||||
|
|
||||||
HRESULT WINAPI CreateTypeLib(SYSKIND,const OLECHAR*,ICreateTypeLib**);
|
HRESULT WINAPI CreateTypeLib(SYSKIND,const OLECHAR*,ICreateTypeLib**);
|
||||||
HRESULT WINAPI CreateTypeLib2(SYSKIND,LPCOLESTR,ICreateTypeLib2**);
|
HRESULT WINAPI CreateTypeLib2(SYSKIND,LPCOLESTR,ICreateTypeLib2**);
|
||||||
HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**);
|
HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**);
|
||||||
|
|
|
@ -21,9 +21,6 @@
|
||||||
#ifndef __WINE_WINE_OBJ_OLEAUT_H
|
#ifndef __WINE_WINE_OBJ_OLEAUT_H
|
||||||
#define __WINE_WINE_OBJ_OLEAUT_H
|
#define __WINE_WINE_OBJ_OLEAUT_H
|
||||||
|
|
||||||
|
|
||||||
DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Predeclare the interfaces
|
* Predeclare the interfaces
|
||||||
*/
|
*/
|
||||||
|
@ -215,11 +212,6 @@ typedef LONG DISPID;
|
||||||
typedef DWORD HREFTYPE;
|
typedef DWORD HREFTYPE;
|
||||||
typedef DISPID MEMBERID;
|
typedef DISPID MEMBERID;
|
||||||
|
|
||||||
#define DISPATCH_METHOD 0x1
|
|
||||||
#define DISPATCH_PROPERTYGET 0x2
|
|
||||||
#define DISPATCH_PROPERTYPUT 0x4
|
|
||||||
#define DISPATCH_PROPERTYPUTREF 0x8
|
|
||||||
|
|
||||||
#define DISPID_UNKNOWN ( -1 )
|
#define DISPID_UNKNOWN ( -1 )
|
||||||
#define DISPID_VALUE ( 0 )
|
#define DISPID_VALUE ( 0 )
|
||||||
#define DISPID_PROPERTYPUT ( -3 )
|
#define DISPID_PROPERTYPUT ( -3 )
|
||||||
|
@ -229,8 +221,6 @@ typedef DISPID MEMBERID;
|
||||||
#define DISPID_DESTRUCTOR ( -7 )
|
#define DISPID_DESTRUCTOR ( -7 )
|
||||||
#define DISPID_COLLECT ( -8 )
|
#define DISPID_COLLECT ( -8 )
|
||||||
|
|
||||||
#define MEMBERID_NIL DISPID_UNKNOWN
|
|
||||||
|
|
||||||
#define IMPLTYPEFLAG_FDEFAULT (0x1)
|
#define IMPLTYPEFLAG_FDEFAULT (0x1)
|
||||||
#define IMPLTYPEFLAG_FSOURCE (0x2)
|
#define IMPLTYPEFLAG_FSOURCE (0x2)
|
||||||
#define IMPLTYPEFLAG_FRESTRICTED (0x4)
|
#define IMPLTYPEFLAG_FRESTRICTED (0x4)
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "winuser.h"
|
#include "winuser.h"
|
||||||
|
|
||||||
#include "objbase.h"
|
#include "objbase.h"
|
||||||
|
#include "oleauto.h"
|
||||||
#include "olectl.h"
|
#include "olectl.h"
|
||||||
#include "initguid.h"
|
#include "initguid.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue