Commit f386482a authored by damienf's avatar damienf
Browse files

- activex: few fixes, generate latest tlb

parent 1e4db902
No preview for this file type
/*** Autogenerated by WIDL 0.9.20 from axvlc.idl - Do not edit ***/
/*** Autogenerated by WIDL 0.9.27 from axvlc.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
......
/*** Autogenerated by WIDL 0.9.20 from axvlc.idl - Do not edit ***/
/*** Autogenerated by WIDL 0.9.27 from axvlc.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
......@@ -391,7 +391,7 @@ typedef struct IVLCControlVtbl {
END_INTERFACE
} IVLCControlVtbl;
interface IVLCControl {
const IVLCControlVtbl* lpVtbl;
CONST_VTBL IVLCControlVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -770,7 +770,7 @@ typedef struct DVLCEventsVtbl {
END_INTERFACE
} DVLCEventsVtbl;
interface DVLCEvents {
const DVLCEventsVtbl* lpVtbl;
CONST_VTBL DVLCEventsVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -814,6 +814,18 @@ interface IVLCAudio : public IDispatch
virtual HRESULT STDMETHODCALLTYPE toggleMute(
) = 0;
virtual HRESULT STDMETHODCALLTYPE get_track(
long* track) = 0;
virtual HRESULT STDMETHODCALLTYPE put_track(
long track) = 0;
virtual HRESULT STDMETHODCALLTYPE get_channel(
BSTR* channel) = 0;
virtual HRESULT STDMETHODCALLTYPE put_channel(
BSTR channel) = 0;
};
#else
typedef struct IVLCAudioVtbl {
......@@ -881,10 +893,26 @@ typedef struct IVLCAudioVtbl {
HRESULT (STDMETHODCALLTYPE *toggleMute)(
IVLCAudio* This);
HRESULT (STDMETHODCALLTYPE *get_track)(
IVLCAudio* This,
long* track);
HRESULT (STDMETHODCALLTYPE *put_track)(
IVLCAudio* This,
long track);
HRESULT (STDMETHODCALLTYPE *get_channel)(
IVLCAudio* This,
BSTR* channel);
HRESULT (STDMETHODCALLTYPE *put_channel)(
IVLCAudio* This,
BSTR channel);
END_INTERFACE
} IVLCAudioVtbl;
interface IVLCAudio {
const IVLCAudioVtbl* lpVtbl;
CONST_VTBL IVLCAudioVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -903,6 +931,10 @@ interface IVLCAudio {
#define IVLCAudio_get_volume(p,a) (p)->lpVtbl->get_volume(p,a)
#define IVLCAudio_put_volume(p,a) (p)->lpVtbl->put_volume(p,a)
#define IVLCAudio_toggleMute(p) (p)->lpVtbl->toggleMute(p)
#define IVLCAudio_get_track(p,a) (p)->lpVtbl->get_track(p,a)
#define IVLCAudio_put_track(p,a) (p)->lpVtbl->put_track(p,a)
#define IVLCAudio_get_channel(p,a) (p)->lpVtbl->get_channel(p,a)
#define IVLCAudio_put_channel(p,a) (p)->lpVtbl->put_channel(p,a)
#endif
#endif
......@@ -946,6 +978,38 @@ void __RPC_STUB IVLCAudio_toggleMute_Stub(
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IVLCAudio_get_track_Proxy(
IVLCAudio* This,
long* track);
void __RPC_STUB IVLCAudio_get_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IVLCAudio_put_track_Proxy(
IVLCAudio* This,
long track);
void __RPC_STUB IVLCAudio_put_track_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IVLCAudio_get_channel_Proxy(
IVLCAudio* This,
BSTR* channel);
void __RPC_STUB IVLCAudio_get_channel_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IVLCAudio_put_channel_Proxy(
IVLCAudio* This,
BSTR channel);
void __RPC_STUB IVLCAudio_put_channel_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
#endif /* __IVLCAudio_INTERFACE_DEFINED__ */
......@@ -1080,7 +1144,7 @@ typedef struct IVLCInputVtbl {
END_INTERFACE
} IVLCInputVtbl;
interface IVLCInput {
const IVLCInputVtbl* lpVtbl;
CONST_VTBL IVLCInputVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -1294,7 +1358,7 @@ typedef struct IVLCMessageVtbl {
END_INTERFACE
} IVLCMessageVtbl;
interface IVLCMessage {
const IVLCMessageVtbl* lpVtbl;
CONST_VTBL IVLCMessageVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -1444,7 +1508,7 @@ typedef struct IVLCMessageIteratorVtbl {
END_INTERFACE
} IVLCMessageIteratorVtbl;
interface IVLCMessageIterator {
const IVLCMessageIteratorVtbl* lpVtbl;
CONST_VTBL IVLCMessageIteratorVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -1571,7 +1635,7 @@ typedef struct IVLCMessagesVtbl {
END_INTERFACE
} IVLCMessagesVtbl;
interface IVLCMessages {
const IVLCMessagesVtbl* lpVtbl;
CONST_VTBL IVLCMessagesVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -1709,7 +1773,7 @@ typedef struct IVLCLogVtbl {
END_INTERFACE
} IVLCLogVtbl;
interface IVLCLog {
const IVLCLogVtbl* lpVtbl;
CONST_VTBL IVLCLogVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -1843,7 +1907,7 @@ typedef struct IVLCPlaylistItemsVtbl {
END_INTERFACE
} IVLCPlaylistItemsVtbl;
interface IVLCPlaylistItems {
const IVLCPlaylistItemsVtbl* lpVtbl;
CONST_VTBL IVLCPlaylistItemsVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -2035,7 +2099,7 @@ typedef struct IVLCPlaylistVtbl {
END_INTERFACE
} IVLCPlaylistVtbl;
interface IVLCPlaylist {
const IVLCPlaylistVtbl* lpVtbl;
CONST_VTBL IVLCPlaylistVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -2270,7 +2334,7 @@ typedef struct IVLCVideoVtbl {
END_INTERFACE
} IVLCVideoVtbl;
interface IVLCVideo {
const IVLCVideoVtbl* lpVtbl;
CONST_VTBL IVLCVideoVtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -2554,7 +2618,7 @@ typedef struct IVLCControl2Vtbl {
END_INTERFACE
} IVLCControl2Vtbl;
interface IVLCControl2 {
const IVLCControl2Vtbl* lpVtbl;
CONST_VTBL IVLCControl2Vtbl* lpVtbl;
};
#ifdef COBJMACROS
......@@ -2779,14 +2843,14 @@ typedef struct VLCPlugin2 VLCPlugin2;
/* Begin additional prototypes for all interfaces */
unsigned long __RPC_USER VARIANT_UserSize (unsigned long *, unsigned long, VARIANT *);
unsigned char * __RPC_USER VARIANT_UserMarshal (unsigned long *, unsigned char *, VARIANT *);
unsigned char * __RPC_USER VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT *);
void __RPC_USER VARIANT_UserFree (unsigned long *, VARIANT *);
unsigned long __RPC_USER BSTR_UserSize (unsigned long *, unsigned long, BSTR *);
unsigned char * __RPC_USER BSTR_UserMarshal (unsigned long *, unsigned char *, BSTR *);
unsigned char * __RPC_USER BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR *);
void __RPC_USER BSTR_UserFree (unsigned long *, BSTR *);
ULONG __RPC_USER VARIANT_UserSize (ULONG *, ULONG, VARIANT *);
unsigned char * __RPC_USER VARIANT_UserMarshal (ULONG *, unsigned char *, VARIANT *);
unsigned char * __RPC_USER VARIANT_UserUnmarshal(ULONG *, unsigned char *, VARIANT *);
void __RPC_USER VARIANT_UserFree (ULONG *, VARIANT *);
ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *);
unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *);
unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *);
void __RPC_USER BSTR_UserFree (ULONG *, BSTR *);
/* End additional prototypes */
......
......@@ -263,9 +263,8 @@ STDMETHODIMP VLCAudio::get_channel(BSTR *channel)
if( NULL == psz_channel )
return E_OUTOFMEMORY;
*channel = SysAllocStringByteLen(psz_channel, strlen(psz_channel));
*channel = BSTRFromCStr(CP_UTF8, psz_channel);
free( psz_channel );
psz_channel = NULL;
return NOERROR;
}
if( psz_channel ) free( psz_channel );
......@@ -2358,7 +2357,7 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
const char *versionStr = VLC_Version();
if( NULL != versionStr )
{
*version = BSTRFromCStr(_p_instance->getCodePage(), versionStr);
*version = BSTRFromCStr(CP_UTF8, versionStr);
return NULL == *version ? E_OUTOFMEMORY : NOERROR;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment