Skip to content
Snippets Groups Projects
Commit 247ae983 authored by Elizabeth Figura's avatar Elizabeth Figura Committed by Alexandre Julliard
Browse files

stdole2: Avoid defining Automation typedefs as part of the public library.

This fixes a regression introduced by 70e5d5fd.

If the VARIANT struct is defined inside the library block, widl generates
typeinfo for it at index 0. This confuses typelibs that import stdole2.tlb.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45949


Signed-off-by: default avatarZebediah Figura <z.figura12@gmail.com>
Signed-off-by: default avatarHuw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard's avatarAlexandre Julliard <julliard@winehq.org>
parent 2ef62f90
No related branches found
No related tags found
No related merge requests found
......@@ -25,6 +25,17 @@
#include <olectl.h>
/* These typedefs need to have the same size as their real counterparts. */
typedef short VARIANT_BOOL;
typedef void *BSTR;
typedef double CURRENCY;
typedef unsigned long HRESULT;
typedef struct {
short word1, word2, word3, word4;
void *ptr1, *ptr2;
} VARIANT;
typedef unsigned long SCODE;
[
uuid(00020430-0000-0000-C000-000000000046),
version(2.0),
......@@ -32,17 +43,6 @@
]
library stdole
{
/* These typedefs need to have the same size as their real counterparts. */
typedef short VARIANT_BOOL;
typedef void *BSTR;
typedef double CURRENCY;
typedef unsigned long HRESULT;
typedef struct {
short word1, word2, word3, word4;
void *ptr1, *ptr2;
} VARIANT;
typedef unsigned long SCODE;
typedef struct GUID {
unsigned long Data1;
unsigned short Data2;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment