Commit 07b143ed authored by Juergen Schmied's avatar Juergen Schmied Committed by Alexandre Julliard

- removed hack to find the right resource

- updated to use the ICOM macros - cleaned up use typelib and typelib2 (was mixed up)
parent 5370930a
......@@ -133,7 +133,7 @@ import ole32.dll
149 stdcall SysStringByteLen(ptr) SysStringByteLen
150 stdcall SysAllocStringByteLen(ptr long) SysAllocStringByteLen
160 stub CreateTypeLib
161 stdcall LoadTypeLib (ptr ptr) LoadTypeLib
161 stdcall LoadTypeLib (wstr ptr) LoadTypeLib
162 stdcall LoadRegTypeLib (ptr long long long ptr) LoadRegTypeLib
163 stdcall RegisterTypeLib(ptr str str) RegisterTypeLib
164 stdcall QueryPathOfRegTypeLib(ptr long long long ptr) QueryPathOfRegTypeLib
......
......@@ -20,114 +20,6 @@
#define HREFTYPE_INTHISFILE(href) (!((href) & 3))
#define HREFTYPE_INDEX(href) ((href) /sizeof(TLBTypeInfoBase))
typedef struct tagTLBCustData {
GUID guid;
VARIANT data;
struct tagTLBCustData* next;
} TLBCustData;
/* internal Parameter data */
typedef struct tagTLBParDesc{
PCHAR Name;
int ctCustData;
TLBCustData * pCustData; /* linked list to cust data; */
} TLBParDesc;
/* internal Function data */
typedef struct tagTLBFuncDesc{
FUNCDESC funcdesc; /* lots of info on the function and its attributes. */
PCHAR Name; /* the name of this function */
TLBParDesc *pParamDesc; /* array with name and custom data */
int helpcontext;
int HelpStringContext;
PCHAR HelpString;
PCHAR Entry; /* if its Hiword==0, it numeric; -1 is not present*/
int ctCustData;
TLBCustData * pCustData; /* linked list to cust data; */
struct tagTLBFuncDesc * next;
} TLBFuncDesc;
/* internal Variable data */
typedef struct tagTLBVarDesc{
VARDESC vardesc; /* lots of info on the variable and its attributes. */
PCHAR Name; /* the name of this variable */
int HelpContext;
int HelpStringContext; /* fixme: where? */
PCHAR HelpString;
int ctCustData;
TLBCustData * pCustData;/* linked list to cust data; */
struct tagTLBVarDesc * next;
} TLBVarDesc;
/* data for refernced types in a coclass, or an inherited interface */
typedef struct tagTLBRefType {
GUID guid; /* guid of the referenced type */
/* (important if its a imported type) */
HREFTYPE reference;
int flags;
int ctCustData;
TLBCustData * pCustData;/* linked list to custom data; */
struct tagTLBImpLib *pImpTLInfo;
struct tagTLBRefType * next;
}TLBRefType;
/* internal TypeInfo data */
typedef struct tagTYPEINFO {
LPTYPEINFO_VTABLE lpvtbl;
UINT ref;
TYPEATTR TypeAttr ; /* _lots_ of type information. */
struct tagTYPELIB * pTypeLib; /* back pointer to typelib */
int index; /* index in this typelib; */
/* type libs seem to store the doc strings in ascii
* so why should we do it in unicode?
*/
PCHAR Name;
PCHAR DocString;
unsigned long dwHelpContext;
unsigned long dwHelpStringContext;
/* functions */
TLBFuncDesc * funclist; /* linked list with function descriptions */
/* variables */
TLBVarDesc * varlist; /* linked list with variable descriptions */
/* Implemented Interfaces */
TLBRefType * impltypelist;
int ctCustData;
TLBCustData * pCustData; /* linked list to cust data; */
struct tagTYPEINFO * next;
} TLBTypeInfo;
/* data structure for import typelibs */
typedef struct tagTLBImpLib {
int offset; /* offset in the file */
GUID guid; /* libid */
PCHAR name; /* name; */
struct tagTYPELIB *pImpTypeLib; /* pointer to loaded typelib */
struct tagTLBImpLib * next;
} TLBImpLib;
/* internal TypeLib data */
typedef struct tagTYPELIB {
LPTYPELIB_VTABLE lpvtbl;
UINT ref;
TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */
/* type libs seem to store the doc strings in ascii
* so why should we do it in unicode?
*/
PCHAR Name;
PCHAR DocString;
PCHAR HelpFile;
PCHAR HelpStringDll;
unsigned long dwHelpContext;
int TypeInfoCount; /* nr of typeinfo's in librarry */
TLBTypeInfo *pTypeInfo; /* linked list of type info data */
int ctCustData; /* number of items in cust data list */
TLBCustData * pCustData; /* linked list to cust data; */
TLBImpLib * pImpLibs; /* linked list to all imported typelibs */
TYPEDESC * pTypeDesc; /* array of TypeDescriptions found in the libary */
} TLBLibInfo;
/*-------------------------FILE STRUCTURES-----------------------------------*/
......
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