activex: recompiled activex IDL using MIDL 6.0

activex/axvlc.idl

@@ -28,7 +28,7 @@ import "oaidl.idl";
 [
   uuid(DF2BBE39-40A8-433b-A279-073F48DA94B6),
   version(1.0),
-  helpstring("VideoLAN VLC ActiveX Plugin")
+  helpstring("VideoLAN VLC ActiveX Plugin"),
 ]
 library AXVLC
 {
@@ -79,7 +79,6 @@ library AXVLC
       uuid(C2FA41D0-B113-476e-AC8C-9BD14999C1C1),
       helpstring("VLC Control (deprecated)"),
       dual,
-      hidden,
       oleautomation
     ]
     interface IVLCControl : IDispatch
@@ -165,7 +164,6 @@ library AXVLC
     [
       uuid(DF48072F-5EF8-434e-9B40-E2F3AE759B5F),
       helpstring("Event interface for VLC control"),
-      hidden
     ]
     dispinterface DVLCEvents
     {
@@ -183,9 +181,7 @@ library AXVLC
       odl,
       uuid(9E0BD17B-2D3C-4656-B94D-03084F3FD9D4),
       helpstring("VLC Audio APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCAudio : IDispatch
@@ -208,9 +204,7 @@ library AXVLC
       odl,
       uuid(49E0DBD1-9440-466C-9C97-95C67190C603),
       helpstring("VLC Input APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCInput : IDispatch
@@ -247,9 +241,7 @@ library AXVLC
       odl,
       uuid(9ED00AFA-7BCD-4FFF-8D48-7DD4DB2C800D),
       helpstring("VLC Log Message"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCMessage: IDispatch
@@ -277,9 +269,7 @@ library AXVLC
       odl,
       uuid(15179CD8-CC12-4242-A58E-E412217FF343),
       helpstring("VLC Log iterator"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCMessageIterator : IDispatch
@@ -295,9 +285,7 @@ library AXVLC
       odl,
       uuid(6C5CE55D-2D6C-4AAD-8299-C62D2371F106),
       helpstring("VLC Log APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCMessages : IDispatch
@@ -319,9 +307,7 @@ library AXVLC
       odl,
       uuid(8E3BC3D9-62E9-48FB-8A6D-993F9ABC4A0A),
       helpstring("VLC Log APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCLog : IDispatch
@@ -339,9 +325,7 @@ library AXVLC
       odl,
       uuid(54613049-40BF-4035-9E70-0A9312C0188D),
       helpstring("VLC Playlist APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCPlaylist : IDispatch
@@ -384,9 +368,7 @@ library AXVLC
       odl,
       uuid(0AAEDF0B-D333-4B27-A0C6-BBF31413A42E),
       helpstring("VLC Video APIs"),
-      hidden,
       dual,
-      nonextensible,
       oleautomation
     ]
     interface IVLCVideo : IDispatch
@@ -415,7 +397,6 @@ library AXVLC
       odl,
       uuid(2D719729-5333-406C-BF12-8DE787FD65E3),
       helpstring("VLC Control"),
-      hidden,
       dual,
       oleautomation
     ]
@@ -496,6 +477,5 @@ library AXVLC
     {
         [default] interface IVLCControl2;
         interface IVLCControl;
-        [default, source] dispinterface DVLCEvents;
     };
 };

activex/axvlc_idl.c

-/*** Autogenerated by WIDL 0.9.20 from axvlc.idl - Do not edit ***/
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 6.00.0361 */
+/* at Wed Nov 15 18:43:43 2006
+ */
+/* Compiler settings for axvlc.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+//@@MIDL_FILE_HEADING(  )
+
+#if !defined(_M_IA64) && !defined(_M_AMD64)
+
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
 
 #include <rpc.h>
 #include <rpcndr.h>
 
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
 #define INITGUID
 #include <guiddef.h>
-
-#ifdef __cplusplus
-extern "C" {
+#undef INITGUID
+#else
+#include <guiddef.h>
 #endif
 
-DEFINE_GUID(LIBID_AXVLC, 0xdf2bbe39, 0x40a8, 0x433b, 0xa2,0x79, 0x07,0x3f,0x48,0xda,0x94,0xb6);
-DEFINE_GUID(IID_IVLCControl, 0xc2fa41d0, 0xb113, 0x476e, 0xac,0x8c, 0x9b,0xd1,0x49,0x99,0xc1,0xc1);
-DEFINE_GUID(DIID_DVLCEvents, 0xdf48072f, 0x5ef8, 0x434e, 0x9b,0x40, 0xe2,0xf3,0xae,0x75,0x9b,0x5f);
-DEFINE_GUID(IID_IVLCAudio, 0x9e0bd17b, 0x2d3c, 0x4656, 0xb9,0x4d, 0x03,0x08,0x4f,0x3f,0xd9,0xd4);
-DEFINE_GUID(IID_IVLCInput, 0x49e0dbd1, 0x9440, 0x466c, 0x9c,0x97, 0x95,0xc6,0x71,0x90,0xc6,0x03);
-DEFINE_GUID(IID_IVLCMessage, 0x9ed00afa, 0x7bcd, 0x4fff, 0x8d,0x48, 0x7d,0xd4,0xdb,0x2c,0x80,0x0d);
-DEFINE_GUID(IID_IVLCMessageIterator, 0x15179cd8, 0xcc12, 0x4242, 0xa5,0x8e, 0xe4,0x12,0x21,0x7f,0xf3,0x43);
-DEFINE_GUID(IID_IVLCMessages, 0x6c5ce55d, 0x2d6c, 0x4aad, 0x82,0x99, 0xc6,0x2d,0x23,0x71,0xf1,0x06);
-DEFINE_GUID(IID_IVLCLog, 0x8e3bc3d9, 0x62e9, 0x48fb, 0x8a,0x6d, 0x99,0x3f,0x9a,0xbc,0x4a,0x0a);
-DEFINE_GUID(IID_IVLCPlaylist, 0x54613049, 0x40bf, 0x4035, 0x9e,0x70, 0x0a,0x93,0x12,0xc0,0x18,0x8d);
-DEFINE_GUID(IID_IVLCVideo, 0x0aaedf0b, 0xd333, 0x4b27, 0xa0,0xc6, 0xbb,0xf3,0x14,0x13,0xa4,0x2e);
-DEFINE_GUID(IID_IVLCControl2, 0x2d719729, 0x5333, 0x406c, 0xbf,0x12, 0x8d,0xe7,0x87,0xfd,0x65,0xe3);
-DEFINE_GUID(CLSID_VLCPlugin, 0xe23fe9c6, 0x778e, 0x49d4, 0xb5,0x37, 0x38,0xfc,0xde,0x48,0x87,0xd8);
-DEFINE_GUID(CLSID_VLCPlugin2, 0x9be31822, 0xfdad, 0x461b, 0xad,0x51, 0xbe,0x1d,0x1c,0x15,0x99,0x21);
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, LIBID_AXVLC,0xDF2BBE39,0x40A8,0x433b,0xA2,0x79,0x07,0x3F,0x48,0xDA,0x94,0xB6);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCControl,0xC2FA41D0,0xB113,0x476e,0xAC,0x8C,0x9B,0xD1,0x49,0x99,0xC1,0xC1);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCAudio,0x9E0BD17B,0x2D3C,0x4656,0xB9,0x4D,0x03,0x08,0x4F,0x3F,0xD9,0xD4);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCInput,0x49E0DBD1,0x9440,0x466C,0x9C,0x97,0x95,0xC6,0x71,0x90,0xC6,0x03);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCLog,0x8E3BC3D9,0x62E9,0x48FB,0x8A,0x6D,0x99,0x3F,0x9A,0xBC,0x4A,0x0A);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCMessage,0x9ED00AFA,0x7BCD,0x4FFF,0x8D,0x48,0x7D,0xD4,0xDB,0x2C,0x80,0x0D);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCMessageIterator,0x15179CD8,0xCC12,0x4242,0xA5,0x8E,0xE4,0x12,0x21,0x7F,0xF3,0x43);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCMessages,0x6C5CE55D,0x2D6C,0x4AAD,0x82,0x99,0xC6,0x2D,0x23,0x71,0xF1,0x06);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCPlaylist,0x54613049,0x40BF,0x4035,0x9E,0x70,0x0A,0x93,0x12,0xC0,0x18,0x8D);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCVideo,0x0AAEDF0B,0xD333,0x4B27,0xA0,0xC6,0xBB,0xF3,0x14,0x13,0xA4,0x2E);
+
+
+MIDL_DEFINE_GUID(IID, IID_IVLCControl2,0x2D719729,0x5333,0x406C,0xBF,0x12,0x8D,0xE7,0x87,0xFD,0x65,0xE3);
+
+
+MIDL_DEFINE_GUID(IID, DIID_DVLCEvents,0xDF48072F,0x5EF8,0x434e,0x9B,0x40,0xE2,0xF3,0xAE,0x75,0x9B,0x5F);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_VLCPlugin,0xE23FE9C6,0x778E,0x49D4,0xB5,0x37,0x38,0xFC,0xDE,0x48,0x87,0xD8);
+
+
+MIDL_DEFINE_GUID(CLSID, CLSID_VLCPlugin2,0x9BE31822,0xFDAD,0x461B,0xAD,0x51,0xBE,0x1D,0x1C,0x15,0x99,0x21);
+
+#undef MIDL_DEFINE_GUID
 
 #ifdef __cplusplus
 }
 #endif
+
+
+
+#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/
+

configure.ac

@@ -5040,7 +5040,8 @@ then
     fi
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADERS(ole2.h olectl.h,
-      [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
+      [ VLC_ADD_CPPFLAGS([activex],[-D_MIDL_USE_GUIDDEF_])
+        VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
         VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) 
         AC_CHECK_HEADERS(objsafe.h,
           VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,

vlc-config.in.in

@@ -206,6 +206,8 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
+    activex)
+      ;;
     pic)
       ;;
     external)