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=45949Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

stdole2: Avoid defining Automation typedefs as part of the public library.
247ae983 · Zebediah Figura · Alexandre Julliard · 2ef62f90 · 247ae983
Commit 247ae983 authored Nov 18, 2018 by Zebediah Figura Committed by Alexandre Julliard Nov 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 11 deletions

stdole2.idl include/stdole2.idl +11 -11

No files found.
--- a/include/stdole2.idl
+++ b/include/stdole2.idl
@@ -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;