Module: wine Branch: master Commit: 0ed1041c63be8bf443da1947185baee931e05df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed1041c63be8bf443da194718...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Apr 1 18:20:21 2009 +0200
oleaut32: Don't use 16-bit headers.
---
dlls/oleaut32/olepicture.c | 3 +-- dlls/oleaut32/typelib.c | 21 ++++++++++++++++++++- dlls/oleaut32/typelib.h | 1 - 3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 03119f2..adaad97 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -81,8 +81,7 @@ #include "urlmon.h" #include "wine/debug.h" #include "wine/unicode.h" - -#include "wine/wingdi16.h" +#include "wine/library.h"
#include "ungif.h"
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d1a719b..75a30d2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -66,7 +66,6 @@ #include "winuser.h" #include "lzexpand.h"
-#include "wine/winbase16.h" #include "wine/unicode.h" #include "objbase.h" #include "typelib.h" @@ -77,6 +76,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib);
+typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; /* Type identifier */ + WORD count; /* Number of resources of this type */ + DWORD resloader; /* SetResourceHandler() */ + /* + * Name info array. + */ +} NE_TYPEINFO; + static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr);
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 821981f..1fe8ecf 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "oleauto.h" -#include "wine/windef16.h"
#define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1)