marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This fixes a regression introduced by 70e5d5fd2e.

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: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Zebediah Figura 2018-11-18 14:35:51 -06:00 committed by Alexandre Julliard
parent 2ef62f9085
commit 247ae9838f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/stdole2.idl
View File

@ -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;