| wmdrmsdk.h (11.0.7601.18741-Windows_7.0) | | wmdrmsdk.h (11.0.9600.17415-Windows_8.1) |
| | |
| /* this ALWAYS GENERATED file contains the definitions for the interfaces */ | | /* this ALWAYS GENERATED file contains the definitions for the interfaces */ |
| | |
|
| /* File created by MIDL compiler version 7.00.0555 */ | | /* File created by MIDL compiler version 8.00.0603 */ |
| /* Compiler settings for wmdrmsdk.idl: | | |
| Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 | | |
| 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( ) */ | | /* @@MIDL_FILE_HEADING( ) */ |
| | |
| #pragma warning( disable: 4049 ) /* more than 64k source lines */ | | #pragma warning( disable: 4049 ) /* more than 64k source lines */ |
| | |
| /* verify that the <rpcndr.h> version is high enough to compile this file*/ | | /* verify that the <rpcndr.h> version is high enough to compile this file*/ |
| #ifndef __REQUIRED_RPCNDR_H_VERSION__ | | #ifndef __REQUIRED_RPCNDR_H_VERSION__ |
| #define __REQUIRED_RPCNDR_H_VERSION__ 500 | | #define __REQUIRED_RPCNDR_H_VERSION__ 500 |
| #endif | | #endif |
| | |
| /* verify that the <rpcsal.h> version is high enough to compile this file*/ | | /* verify that the <rpcsal.h> version is high enough to compile this file*/ |
| | |
| skipping to change at line 157 | | skipping to change at line 166 |
| #include "mfobjects.h" | | #include "mfobjects.h" |
| #include "mfidl.h" | | #include "mfidl.h" |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C"{ | | extern "C"{ |
| #endif | | #endif |
| | |
| /* interface __MIDL_itf_wmdrmsdk_0000_0000 */ | | /* interface __MIDL_itf_wmdrmsdk_0000_0000 */ |
| /* [local] */ | | /* [local] */ |
| | |
|
| | #include <winapifamily.h> |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_ACTIONLIST_TAG
= L"ACTIONLIST"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_ACTIONLIST_TAG
= L"ACTIONLIST"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_ACTION_TAG
= L"ACTION"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_ACTION_TAG
= L"ACTION"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_PLAYBACK
= L"Play"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_PLAYBACK
= L"Play"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY
= L"Copy"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY
= L"Copy"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_PLAYLIST_BURN
= L"PlaylistBurn"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_PLAYLIST_BURN
= L"PlaylistBurn"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_CREATE_THUMBNAIL_IMAGE
= L"CreateThumbnailImage"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_CREATE_THUMBNAIL_IMAGE
= L"CreateThumbnailImage"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_CD
= L"Print.redbook"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_CD
= L"Print.redbook"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_SDMI_DEVICE
= L"Transfer.SDMI"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_SDMI_DEVICE
= L"Transfer.SDMI"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_NON_SDMI_DEVIC
E = L"Transfer.NONSDMI"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_COPY_TO_NON_SDMI_DEVIC
E = L"Transfer.NONSDMI"; |
| EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_BACKUP
= L"Backup"; | | EXTERN_C const DECLSPEC_SELECTANY WCHAR *g_wszWMDRM_RIGHT_BACKUP
= L"Backup"; |
| | |
| skipping to change at line 225 | | skipping to change at line 237 |
| #define WMDRM_CERTIFICATE_TYPE_XML 1 | | #define WMDRM_CERTIFICATE_TYPE_XML 1 |
| #define WMDRM_PROTECTION_TYPE_RC4 1 | | #define WMDRM_PROTECTION_TYPE_RC4 1 |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_APP, 0x90A37313, 0x0ECF, 0x4CAA, 0xA9
, 0x06, 0xB1, 0x88, 0xF6, 0x12, 0x93, 0x00 ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_APP, 0x90A37313, 0x0ECF, 0x4CAA, 0xA9
, 0x06, 0xB1, 0x88, 0xF6, 0x12, 0x93, 0x00 ); |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_DEVICE, 0x3129E375, 0xCEB0, 0x47D5, 0x9C
, 0xCA, 0x9D, 0xB7, 0x4C, 0xFD, 0x43, 0x32 ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_DEVICE, 0x3129E375, 0xCEB0, 0x47D5, 0x9C
, 0xCA, 0x9D, 0xB7, 0x4C, 0xFD, 0x43, 0x32 ); |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_CARDEA, 0xCD75E604, 0x543D, 0x4A9C, 0x9F
, 0x09, 0xFE, 0x6D, 0x24, 0xE8, 0xBF, 0x90 ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_CARDEA, 0xCD75E604, 0x543D, 0x4A9C, 0x9F
, 0x09, 0xFE, 0x6D, 0x24, 0xE8, 0xBF, 0x90 ); |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_REVINFO, 0xCCDE5A55, 0xA688, 0x4405, 0xA8
, 0x8B, 0xD1, 0x3F, 0x90, 0xD5, 0xBA, 0x3E ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_REVINFO, 0xCCDE5A55, 0xA688, 0x4405, 0xA8
, 0x8B, 0xD1, 0x3F, 0x90, 0xD5, 0xBA, 0x3E ); |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_GRL, 0xa2190240, 0xb2ca, 0x40b3, 0xb4
, 0x8d, 0x9b, 0xc4, 0xc2, 0xdc, 0x42, 0x8d ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_GRL, 0xa2190240, 0xb2ca, 0x40b3, 0xb4
, 0x8d, 0x9b, 0xc4, 0xc2, 0xdc, 0x42, 0x8d ); |
| EXTERN_GUID( WMDRM_REVOCATIONTYPE_HDCP, 0xe627553a, 0x820f, 0x40fd, 0xb4
, 0x65, 0xa4, 0x28, 0x30, 0xa5, 0x74, 0xc9 ); | | EXTERN_GUID( WMDRM_REVOCATIONTYPE_HDCP, 0xe627553a, 0x820f, 0x40fd, 0xb4
, 0x65, 0xa4, 0x28, 0x30, 0xa5, 0x74, 0xc9 ); |
| typedef | | typedef |
| enum DRM_CRYPTO_TYPE | | enum DRM_CRYPTO_TYPE |
|
| { CRYPTO_TYPE_MCE = 0 | | { |
| | CRYPTO_TYPE_MCE = 0 |
| } DRM_CRYPTO_TYPE; | | } DRM_CRYPTO_TYPE; |
| | |
| #if !DRM_LICENSE_STATE_TYPES_DEFINED | | #if !DRM_LICENSE_STATE_TYPES_DEFINED |
| #define DRM_LICENSE_STATE_TYPES_DEFINED 1 | | #define DRM_LICENSE_STATE_TYPES_DEFINED 1 |
| typedef | | typedef |
| enum DRM_LICENSE_STATE_CATEGORY | | enum DRM_LICENSE_STATE_CATEGORY |
|
| { WM_DRM_LICENSE_STATE_NORIGHT = 0, | | { |
| WM_DRM_LICENSE_STATE_UNLIM = ( WM_DRM_LICENSE_STATE_NORIGHT + 1 ) , | | WM_DRM_LICENSE_STATE_NORIGHT = 0, |
| WM_DRM_LICENSE_STATE_COUNT = ( WM_DRM_LICENSE_STATE_UNLIM + 1 ) , | | WM_DRM_LICENSE_STATE_UNLIM = ( WM_DRM_LICENSE_STATE_NORIGHT + 1 ) , |
| WM_DRM_LICENSE_STATE_FROM = ( WM_DRM_LICENSE_STATE_COUNT + 1 ) , | | WM_DRM_LICENSE_STATE_COUNT = ( WM_DRM_LICENSE_STATE_UNLIM + 1 ) , |
| WM_DRM_LICENSE_STATE_UNTIL = ( WM_DRM_LICENSE_STATE_FROM + 1 ) , | | WM_DRM_LICENSE_STATE_FROM = ( WM_DRM_LICENSE_STATE_COUNT + 1 ) , |
| WM_DRM_LICENSE_STATE_FROM_UNTIL = ( WM_DRM_LICENSE_STATE_UNTIL + 1 ) , | | WM_DRM_LICENSE_STATE_UNTIL = ( WM_DRM_LICENSE_STATE_FROM + 1 ) , |
| WM_DRM_LICENSE_STATE_COUNT_FROM = ( WM_DRM_LICENSE_STATE_FROM_UNTIL + 1 ) | | WM_DRM_LICENSE_STATE_FROM_UNTIL = ( WM_DRM_LICENSE_STATE_UNTIL + |
| , | | 1 ) , |
| WM_DRM_LICENSE_STATE_COUNT_UNTIL = ( WM_DRM_LICENSE_STATE_COUNT_FR | | WM_DRM_LICENSE_STATE_COUNT_FROM = ( WM_DRM_LICENSE_STATE_FROM_UNT |
| OM + 1 ) , | | IL + 1 ) , |
| WM_DRM_LICENSE_STATE_COUNT_FROM_UNTIL = ( WM_DRM_LICENSE_STATE_COUNT_UN | | WM_DRM_LICENSE_STATE_COUNT_UNTIL = ( WM_DRM_LICENSE_STATE_COUNT_FR |
| TIL + 1 ) , | | OM + 1 ) , |
| WM_DRM_LICENSE_STATE_EXPIRATION_AFTER_FIRSTUSE = ( WM_DRM_LICENSE_STATE_ | | WM_DRM_LICENSE_STATE_COUNT_FROM_UNTIL = ( WM_DRM_LICENSE_STATE_COUNT_UN |
| COUNT_FROM_UNTIL + 1 ) | | TIL + 1 ) , |
| | WM_DRM_LICENSE_STATE_EXPIRATION_AFTER_FIRSTUSE = ( WM_DRM_LICENSE_STATE_ |
| | COUNT_FROM_UNTIL + 1 ) |
| } DRM_LICENSE_STATE_CATEGORY; | | } DRM_LICENSE_STATE_CATEGORY; |
| | |
| typedef struct _DRM_LICENSE_STATE_DATA | | typedef struct _DRM_LICENSE_STATE_DATA |
| { | | { |
| DWORD dwStreamId; | | DWORD dwStreamId; |
| DRM_LICENSE_STATE_CATEGORY dwCategory; | | DRM_LICENSE_STATE_CATEGORY dwCategory; |
| DWORD dwNumCounts; | | DWORD dwNumCounts; |
| DWORD dwCount[ 4 ]; | | DWORD dwCount[ 4 ]; |
| DWORD dwNumDates; | | DWORD dwNumDates; |
| FILETIME datetime[ 4 ]; | | FILETIME datetime[ 4 ]; |
| DWORD dwVague; | | DWORD dwVague; |
| } DRM_LICENSE_STATE_DATA; | | } DRM_LICENSE_STATE_DATA; |
| | |
| #endif | | #endif |
| typedef | | typedef |
| enum MSDRM_STATUS | | enum MSDRM_STATUS |
|
| { DRM_ERROR = 0, | | { |
| DRM_INFORMATION = 1, | | DRM_ERROR = 0, |
| DRM_BACKUPRESTORE_BEGIN = 2, | | DRM_INFORMATION = 1, |
| DRM_BACKUPRESTORE_END = 3, | | DRM_BACKUPRESTORE_BEGIN = 2, |
| DRM_BACKUPRESTORE_CONNECTING = 4, | | DRM_BACKUPRESTORE_END = 3, |
| DRM_BACKUPRESTORE_DISCONNECTING = 5, | | DRM_BACKUPRESTORE_CONNECTING = 4, |
| DRM_ERROR_WITHURL = 6, | | DRM_BACKUPRESTORE_DISCONNECTING = 5, |
| DRM_RESTRICTED_LICENSE = 7, | | DRM_ERROR_WITHURL = 6, |
| DRM_NEEDS_INDIVIDUALIZATION = 8, | | DRM_RESTRICTED_LICENSE = 7, |
| DRM_PLAY_OPL_NOTIFICATION = 9, | | DRM_NEEDS_INDIVIDUALIZATION = 8, |
| DRM_COPY_OPL_NOTIFICATION = 10, | | DRM_PLAY_OPL_NOTIFICATION = 9, |
| DRM_REFRESHCRL_COMPLETE = 11 | | DRM_COPY_OPL_NOTIFICATION = 10, |
| | DRM_REFRESHCRL_COMPLETE = 11 |
| } MSDRM_STATUS; | | } MSDRM_STATUS; |
| | |
| typedef | | typedef |
| enum DRM_ATTR_DATATYPE | | enum DRM_ATTR_DATATYPE |
|
| { DRM_TYPE_DWORD = 0, | | { |
| DRM_TYPE_STRING = 1, | | DRM_TYPE_DWORD = 0, |
| DRM_TYPE_BINARY = 2, | | DRM_TYPE_STRING = 1, |
| DRM_TYPE_BOOL = 3, | | DRM_TYPE_BINARY = 2, |
| DRM_TYPE_QWORD = 4, | | DRM_TYPE_BOOL = 3, |
| DRM_TYPE_WORD = 5, | | DRM_TYPE_QWORD = 4, |
| DRM_TYPE_GUID = 6 | | DRM_TYPE_WORD = 5, |
| | DRM_TYPE_GUID = 6 |
| } DRM_ATTR_DATATYPE; | | } DRM_ATTR_DATATYPE; |
| | |
| typedef | | typedef |
| enum DRM_HTTP_STATUS | | enum DRM_HTTP_STATUS |
|
| { HTTP_NOTINITIATED = 0, | | { |
| HTTP_CONNECTING = ( HTTP_NOTINITIATED + 1 ) , | | HTTP_NOTINITIATED = 0, |
| HTTP_REQUESTING = ( HTTP_CONNECTING + 1 ) , | | HTTP_CONNECTING = ( HTTP_NOTINITIATED + 1 ) , |
| HTTP_RECEIVING = ( HTTP_REQUESTING + 1 ) , | | HTTP_REQUESTING = ( HTTP_CONNECTING + 1 ) , |
| HTTP_COMPLETED = ( HTTP_RECEIVING + 1 ) | | HTTP_RECEIVING = ( HTTP_REQUESTING + 1 ) , |
| | HTTP_COMPLETED = ( HTTP_RECEIVING + 1 ) |
| } DRM_HTTP_STATUS; | | } DRM_HTTP_STATUS; |
| | |
| typedef | | typedef |
| enum DRM_INDIVIDUALIZATION_STATUS | | enum DRM_INDIVIDUALIZATION_STATUS |
|
| { INDI_UNDEFINED = 0, | | { |
| INDI_BEGIN = 0x1, | | INDI_UNDEFINED = 0, |
| INDI_SUCCEED = 0x2, | | INDI_BEGIN = 0x1, |
| INDI_FAIL = 0x4, | | INDI_SUCCEED = 0x2, |
| INDI_CANCEL = 0x8, | | INDI_FAIL = 0x4, |
| INDI_DOWNLOAD = 0x10, | | INDI_CANCEL = 0x8, |
| INDI_INSTALL = 0x20 | | INDI_DOWNLOAD = 0x10, |
| | INDI_INSTALL = 0x20 |
| } DRM_INDIVIDUALIZATION_STATUS; | | } DRM_INDIVIDUALIZATION_STATUS; |
| | |
| typedef | | typedef |
| enum _DRM_ACTION_ALLOWED_QUERY_RESULTS | | enum _DRM_ACTION_ALLOWED_QUERY_RESULTS |
|
| { DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED = 0x1, | | { |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_LICENSE = 0x2, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED = 0x1, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_RIGHT = 0x4, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_LICENSE = 0x2, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_EXHAUSTED = 0x8, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_RIGHT = 0x4, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_EXPIRED = 0x10, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_EXHAUSTED = 0x8, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NOT_STARTED = 0x20, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_EXPIRED = 0x10, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_APPSEC_TOO_LOW = 0x40, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NOT_STARTED = 0x20, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_REQ_INDIV = 0x80, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_APPSEC_TOO_LOW = 0x40, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_COPY_OPL_TOO_LOW = 0x100, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_REQ_INDIV = 0x80, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_COPY_OPL_EXCLUDED = 0x200, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_COPY_OPL_TOO_LOW = 0x100, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_CLOCK_SUPPORT = 0x400, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_COPY_OPL_EXCLUDED = 0x200, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_METERING_SUPPORT = 0x800, | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_CLOCK_SUPPORT = 0x400, |
| DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_CHAIN_DEPTH_TOO_HIGH = 0x1000 | | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_NO_METERING_SUPPORT = 0x800, |
| | DRM_ACTION_ALLOWED_QUERY_NOT_ENABLED_CHAIN_DEPTH_TOO_HIGH = 0x1000 |
| } DRM_ACTION_ALLOWED_QUERY_RESULTS; | | } DRM_ACTION_ALLOWED_QUERY_RESULTS; |
| | |
| typedef struct _WMDRMCryptoData | | typedef struct _WMDRMCryptoData |
| { | | { |
| DRM_CRYPTO_TYPE cryptoType; | | DRM_CRYPTO_TYPE cryptoType; |
| unsigned __int64 qwCounterID; | | unsigned __int64 qwCounterID; |
| unsigned __int64 qwOffset; | | unsigned __int64 qwOffset; |
| } WMDRMCryptoData; | | } WMDRMCryptoData; |
| | |
| typedef struct _WMIndividualizeStatus | | typedef struct _WMIndividualizeStatus |
| | |
| skipping to change at line 462 | | skipping to change at line 481 |
| typedef struct _WMDRMAnalogVideoRestrictionsEx | | typedef struct _WMDRMAnalogVideoRestrictionsEx |
| { | | { |
| DWORD dwVersion; | | DWORD dwVersion; |
| GUID guidRestrictionID; | | GUID guidRestrictionID; |
| DWORD cbRestrictionData; | | DWORD cbRestrictionData; |
| BYTE *pbRestrictionData; | | BYTE *pbRestrictionData; |
| } WMDRM_ANALOG_VIDEO_RESTRICTIONS_EX; | | } WMDRM_ANALOG_VIDEO_RESTRICTIONS_EX; |
| | |
| typedef | | typedef |
| enum _WMDRMNET_POLICY_TYPE | | enum _WMDRMNET_POLICY_TYPE |
|
| { WMDRMNET_POLICY_TYPE_UNDEFINED = 0, | | { |
| WMDRMNET_POLICY_TYPE_TRANSCRYPTPLAY = 0x1 | | WMDRMNET_POLICY_TYPE_UNDEFINED = 0, |
| | WMDRMNET_POLICY_TYPE_TRANSCRYPTPLAY = 0x1 |
| } WMDRMNET_POLICY_TYPE; | | } WMDRMNET_POLICY_TYPE; |
| | |
| typedef struct _tagWMDRMNET_POLICY | | typedef struct _tagWMDRMNET_POLICY |
| { | | { |
| WMDRMNET_POLICY_TYPE ePolicyType; | | WMDRMNET_POLICY_TYPE ePolicyType; |
| BYTE *pbPolicy; | | BYTE *pbPolicy; |
| } WMDRMNET_POLICY; | | } WMDRMNET_POLICY; |
| | |
| typedef struct _WMDRMNET_POLICY_TRANSCRYPTPLAY | | typedef struct _WMDRMNET_POLICY_TRANSCRYPTPLAY |
| { | | { |
| | |
| skipping to change at line 537 | | skipping to change at line 557 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IDRMStatusCallbackVtbl | | typedef struct IDRMStatusCallbackVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IDRMStatusCallback * This, | | IDRMStatusCallback * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IDRMStatusCallback * This); | | IDRMStatusCallback * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IDRMStatusCallback * This); | | IDRMStatusCallback * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *OnStatus )( | | HRESULT ( STDMETHODCALLTYPE *OnStatus )( |
| IDRMStatusCallback * This, | | IDRMStatusCallback * This, |
| /* [in] */ MSDRM_STATUS Status, | | /* [in] */ MSDRM_STATUS Status, |
| | |
| skipping to change at line 612 | | skipping to change at line 632 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMEventGeneratorVtbl | | typedef struct IWMDRMEventGeneratorVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMEventGenerator * This); | | IWMDRMEventGenerator * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMEventGenerator * This); | | IWMDRMEventGenerator * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetEvent )( | | HRESULT ( STDMETHODCALLTYPE *GetEvent )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| /* [in] */ DWORD dwFlags, | | /* [in] */ DWORD dwFlags, |
| | |
| skipping to change at line 634 | | skipping to change at line 654 |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| /* [in] */ IMFAsyncCallback *pCallback, | | /* [in] */ IMFAsyncCallback *pCallback, |
| /* [in] */ IUnknown *punkState); | | /* [in] */ IUnknown *punkState); |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| /* [in] */ IMFAsyncResult *pResult, | | /* [in] */ IMFAsyncResult *pResult, |
| /* [annotation][out] */ | | /* [annotation][out] */ |
|
| __out IMFMediaEvent **ppEvent); | | _Out_ IMFMediaEvent **ppEvent); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueueEvent )( | | HRESULT ( STDMETHODCALLTYPE *QueueEvent )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| /* [in] */ MediaEventType met, | | /* [in] */ MediaEventType met, |
| /* [in] */ REFGUID guidExtendedType, | | /* [in] */ REFGUID guidExtendedType, |
| /* [in] */ HRESULT hrStatus, | | /* [in] */ HRESULT hrStatus, |
| /* [unique][in] */ const PROPVARIANT *pvValue); | | /* [unique][in] */ const PROPVARIANT *pvValue); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( | | HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( |
| IWMDRMEventGenerator * This, | | IWMDRMEventGenerator * This, |
| | |
| skipping to change at line 723 | | skipping to change at line 743 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMProviderVtbl | | typedef struct IWMDRMProviderVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMProvider * This, | | IWMDRMProvider * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMProvider * This); | | IWMDRMProvider * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMProvider * This); | | IWMDRMProvider * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CreateObject )( | | HRESULT ( STDMETHODCALLTYPE *CreateObject )( |
| IWMDRMProvider * This, | | IWMDRMProvider * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| | |
| skipping to change at line 839 | | skipping to change at line 859 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMSecurityVtbl | | typedef struct IWMDRMSecurityVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMSecurity * This); | | IWMDRMSecurity * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMSecurity * This); | | IWMDRMSecurity * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetEvent )( | | HRESULT ( STDMETHODCALLTYPE *GetEvent )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| /* [in] */ DWORD dwFlags, | | /* [in] */ DWORD dwFlags, |
| | |
| skipping to change at line 861 | | skipping to change at line 881 |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| /* [in] */ IMFAsyncCallback *pCallback, | | /* [in] */ IMFAsyncCallback *pCallback, |
| /* [in] */ IUnknown *punkState); | | /* [in] */ IUnknown *punkState); |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| /* [in] */ IMFAsyncResult *pResult, | | /* [in] */ IMFAsyncResult *pResult, |
| /* [annotation][out] */ | | /* [annotation][out] */ |
|
| __out IMFMediaEvent **ppEvent); | | _Out_ IMFMediaEvent **ppEvent); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueueEvent )( | | HRESULT ( STDMETHODCALLTYPE *QueueEvent )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| /* [in] */ MediaEventType met, | | /* [in] */ MediaEventType met, |
| /* [in] */ REFGUID guidExtendedType, | | /* [in] */ REFGUID guidExtendedType, |
| /* [in] */ HRESULT hrStatus, | | /* [in] */ HRESULT hrStatus, |
| /* [unique][in] */ const PROPVARIANT *pvValue); | | /* [unique][in] */ const PROPVARIANT *pvValue); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( | | HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( |
| IWMDRMSecurity * This, | | IWMDRMSecurity * This, |
| | |
| skipping to change at line 1036 | | skipping to change at line 1056 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMEncryptVtbl | | typedef struct IWMDRMEncryptVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMEncrypt * This, | | IWMDRMEncrypt * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMEncrypt * This); | | IWMDRMEncrypt * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMEncrypt * This); | | IWMDRMEncrypt * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *Encrypt )( | | HRESULT ( STDMETHODCALLTYPE *Encrypt )( |
| IWMDRMEncrypt * This, | | IWMDRMEncrypt * This, |
| /* [size_is][out][in] */ BYTE *pbData, | | /* [size_is][out][in] */ BYTE *pbData, |
| | |
| skipping to change at line 1115 | | skipping to change at line 1135 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMEncryptScatterVtbl | | typedef struct IWMDRMEncryptScatterVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMEncryptScatter * This, | | IWMDRMEncryptScatter * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMEncryptScatter * This); | | IWMDRMEncryptScatter * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMEncryptScatter * This); | | IWMDRMEncryptScatter * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *InitEncryptScatter )( | | HRESULT ( STDMETHODCALLTYPE *InitEncryptScatter )( |
| IWMDRMEncryptScatter * This, | | IWMDRMEncryptScatter * This, |
| /* [in] */ DWORD cStreams, | | /* [in] */ DWORD cStreams, |
| | |
| skipping to change at line 1198 | | skipping to change at line 1218 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMDecryptVtbl | | typedef struct IWMDRMDecryptVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMDecrypt * This, | | IWMDRMDecrypt * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMDecrypt * This); | | IWMDRMDecrypt * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMDecrypt * This); | | IWMDRMDecrypt * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *Decrypt )( | | HRESULT ( STDMETHODCALLTYPE *Decrypt )( |
| IWMDRMDecrypt * This, | | IWMDRMDecrypt * This, |
| /* [size_is][out][in] */ BYTE *pbData, | | /* [size_is][out][in] */ BYTE *pbData, |
| | |
| skipping to change at line 1314 | | skipping to change at line 1334 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMLicenseVtbl | | typedef struct IWMDRMLicenseVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMLicense * This, | | IWMDRMLicense * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMLicense * This); | | IWMDRMLicense * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMLicense * This); | | IWMDRMLicense * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *ResetEnumeration )( | | HRESULT ( STDMETHODCALLTYPE *ResetEnumeration )( |
| IWMDRMLicense * This); | | IWMDRMLicense * This); |
| | |
| | |
| skipping to change at line 1492 | | skipping to change at line 1512 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMLicenseQueryVtbl | | typedef struct IWMDRMLicenseQueryVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| __RPC__in IWMDRMLicenseQuery * This, | | __RPC__in IWMDRMLicenseQuery * This, |
| /* [in] */ __RPC__in REFIID riid, | | /* [in] */ __RPC__in REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| __RPC__in IWMDRMLicenseQuery * This); | | __RPC__in IWMDRMLicenseQuery * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| __RPC__in IWMDRMLicenseQuery * This); | | __RPC__in IWMDRMLicenseQuery * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryLicenseState )( | | HRESULT ( STDMETHODCALLTYPE *QueryLicenseState )( |
| __RPC__in IWMDRMLicenseQuery * This, | | __RPC__in IWMDRMLicenseQuery * This, |
| /* [in] */ __RPC__in BSTR bstrKID, | | /* [in] */ __RPC__in BSTR bstrKID, |
| | |
| skipping to change at line 1651 | | skipping to change at line 1671 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMLicenseManagementVtbl | | typedef struct IWMDRMLicenseManagementVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| __RPC__in IWMDRMLicenseManagement * This, | | __RPC__in IWMDRMLicenseManagement * This, |
| /* [in] */ __RPC__in REFIID riid, | | /* [in] */ __RPC__in REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| __RPC__in IWMDRMLicenseManagement * This); | | __RPC__in IWMDRMLicenseManagement * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| __RPC__in IWMDRMLicenseManagement * This); | | __RPC__in IWMDRMLicenseManagement * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetEvent )( | | HRESULT ( STDMETHODCALLTYPE *GetEvent )( |
| __RPC__in IWMDRMLicenseManagement * This, | | __RPC__in IWMDRMLicenseManagement * This, |
| /* [in] */ DWORD dwFlags, | | /* [in] */ DWORD dwFlags, |
| | |
| skipping to change at line 1673 | | skipping to change at line 1693 |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( |
| IWMDRMLicenseManagement * This, | | IWMDRMLicenseManagement * This, |
| /* [in] */ IMFAsyncCallback *pCallback, | | /* [in] */ IMFAsyncCallback *pCallback, |
| /* [in] */ IUnknown *punkState); | | /* [in] */ IUnknown *punkState); |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( |
| IWMDRMLicenseManagement * This, | | IWMDRMLicenseManagement * This, |
| /* [in] */ IMFAsyncResult *pResult, | | /* [in] */ IMFAsyncResult *pResult, |
| /* [annotation][out] */ | | /* [annotation][out] */ |
|
| __out IMFMediaEvent **ppEvent); | | _Out_ IMFMediaEvent **ppEvent); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueueEvent )( | | HRESULT ( STDMETHODCALLTYPE *QueueEvent )( |
| __RPC__in IWMDRMLicenseManagement * This, | | __RPC__in IWMDRMLicenseManagement * This, |
| /* [in] */ MediaEventType met, | | /* [in] */ MediaEventType met, |
| /* [in] */ __RPC__in REFGUID guidExtendedType, | | /* [in] */ __RPC__in REFGUID guidExtendedType, |
| /* [in] */ HRESULT hrStatus, | | /* [in] */ HRESULT hrStatus, |
| /* [unique][in] */ __RPC__in_opt const PROPVARIANT *pvValue); | | /* [unique][in] */ __RPC__in_opt const PROPVARIANT *pvValue); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( | | HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( |
| __RPC__in IWMDRMLicenseManagement * This, | | __RPC__in IWMDRMLicenseManagement * This, |
| | |
| skipping to change at line 1877 | | skipping to change at line 1897 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMNetReceiverVtbl | | typedef struct IWMDRMNetReceiverVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMNetReceiver * This); | | IWMDRMNetReceiver * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMNetReceiver * This); | | IWMDRMNetReceiver * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetEvent )( | | HRESULT ( STDMETHODCALLTYPE *GetEvent )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| /* [in] */ DWORD dwFlags, | | /* [in] */ DWORD dwFlags, |
| | |
| skipping to change at line 1899 | | skipping to change at line 1919 |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| /* [in] */ IMFAsyncCallback *pCallback, | | /* [in] */ IMFAsyncCallback *pCallback, |
| /* [in] */ IUnknown *punkState); | | /* [in] */ IUnknown *punkState); |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| /* [in] */ IMFAsyncResult *pResult, | | /* [in] */ IMFAsyncResult *pResult, |
| /* [annotation][out] */ | | /* [annotation][out] */ |
|
| __out IMFMediaEvent **ppEvent); | | _Out_ IMFMediaEvent **ppEvent); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueueEvent )( | | HRESULT ( STDMETHODCALLTYPE *QueueEvent )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| /* [in] */ MediaEventType met, | | /* [in] */ MediaEventType met, |
| /* [in] */ REFGUID guidExtendedType, | | /* [in] */ REFGUID guidExtendedType, |
| /* [in] */ HRESULT hrStatus, | | /* [in] */ HRESULT hrStatus, |
| /* [unique][in] */ const PROPVARIANT *pvValue); | | /* [unique][in] */ const PROPVARIANT *pvValue); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( | | HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( |
| IWMDRMNetReceiver * This, | | IWMDRMNetReceiver * This, |
| | |
| skipping to change at line 2031 | | skipping to change at line 2051 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMNetReceiver2Vtbl | | typedef struct IWMDRMNetReceiver2Vtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMNetReceiver2 * This); | | IWMDRMNetReceiver2 * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMNetReceiver2 * This); | | IWMDRMNetReceiver2 * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetEvent )( | | HRESULT ( STDMETHODCALLTYPE *GetEvent )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| /* [in] */ DWORD dwFlags, | | /* [in] */ DWORD dwFlags, |
| | |
| skipping to change at line 2053 | | skipping to change at line 2073 |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *BeginGetEvent )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| /* [in] */ IMFAsyncCallback *pCallback, | | /* [in] */ IMFAsyncCallback *pCallback, |
| /* [in] */ IUnknown *punkState); | | /* [in] */ IUnknown *punkState); |
| | |
| /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( | | /* [local] */ HRESULT ( STDMETHODCALLTYPE *EndGetEvent )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| /* [in] */ IMFAsyncResult *pResult, | | /* [in] */ IMFAsyncResult *pResult, |
| /* [annotation][out] */ | | /* [annotation][out] */ |
|
| __out IMFMediaEvent **ppEvent); | | _Out_ IMFMediaEvent **ppEvent); |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueueEvent )( | | HRESULT ( STDMETHODCALLTYPE *QueueEvent )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| /* [in] */ MediaEventType met, | | /* [in] */ MediaEventType met, |
| /* [in] */ REFGUID guidExtendedType, | | /* [in] */ REFGUID guidExtendedType, |
| /* [in] */ HRESULT hrStatus, | | /* [in] */ HRESULT hrStatus, |
| /* [unique][in] */ const PROPVARIANT *pvValue); | | /* [unique][in] */ const PROPVARIANT *pvValue); |
| | |
| HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( | | HRESULT ( STDMETHODCALLTYPE *CancelAsyncOperation )( |
| IWMDRMNetReceiver2 * This, | | IWMDRMNetReceiver2 * This, |
| | |
| skipping to change at line 2209 | | skipping to change at line 2229 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMNetTransmitterVtbl | | typedef struct IWMDRMNetTransmitterVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMNetTransmitter * This, | | IWMDRMNetTransmitter * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMNetTransmitter * This); | | IWMDRMNetTransmitter * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMNetTransmitter * This); | | IWMDRMNetTransmitter * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *SetLicenseChallenge )( | | HRESULT ( STDMETHODCALLTYPE *SetLicenseChallenge )( |
| IWMDRMNetTransmitter * This, | | IWMDRMNetTransmitter * This, |
| /* [size_is][in] */ BYTE *pbLicenseChallenge, | | /* [size_is][in] */ BYTE *pbLicenseChallenge, |
| | |
| skipping to change at line 2303 | | skipping to change at line 2323 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMNetTransmitter2Vtbl | | typedef struct IWMDRMNetTransmitter2Vtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMNetTransmitter2 * This, | | IWMDRMNetTransmitter2 * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMNetTransmitter2 * This); | | IWMDRMNetTransmitter2 * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMNetTransmitter2 * This); | | IWMDRMNetTransmitter2 * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *SetLicenseChallenge )( | | HRESULT ( STDMETHODCALLTYPE *SetLicenseChallenge )( |
| IWMDRMNetTransmitter2 * This, | | IWMDRMNetTransmitter2 * This, |
| /* [size_is][in] */ BYTE *pbLicenseChallenge, | | /* [size_is][in] */ BYTE *pbLicenseChallenge, |
| | |
| skipping to change at line 2404 | | skipping to change at line 2424 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMIndividualizationStatusVtbl | | typedef struct IWMDRMIndividualizationStatusVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMIndividualizationStatus * This, | | IWMDRMIndividualizationStatus * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMIndividualizationStatus * This); | | IWMDRMIndividualizationStatus * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMIndividualizationStatus * This); | | IWMDRMIndividualizationStatus * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetStatus )( | | HRESULT ( STDMETHODCALLTYPE *GetStatus )( |
| IWMDRMIndividualizationStatus * This, | | IWMDRMIndividualizationStatus * This, |
| /* [out] */ WM_INDIVIDUALIZE_STATUS *pStatus); | | /* [out] */ WM_INDIVIDUALIZE_STATUS *pStatus); |
| | |
| skipping to change at line 2473 | | skipping to change at line 2493 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMLicenseBackupRestoreStatusVtbl | | typedef struct IWMDRMLicenseBackupRestoreStatusVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMLicenseBackupRestoreStatus * This, | | IWMDRMLicenseBackupRestoreStatus * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMLicenseBackupRestoreStatus * This); | | IWMDRMLicenseBackupRestoreStatus * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMLicenseBackupRestoreStatus * This); | | IWMDRMLicenseBackupRestoreStatus * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetStatus )( | | HRESULT ( STDMETHODCALLTYPE *GetStatus )( |
| IWMDRMLicenseBackupRestoreStatus * This, | | IWMDRMLicenseBackupRestoreStatus * This, |
| /* [out] */ WM_BACKUP_RESTORE_STATUS *pStatus); | | /* [out] */ WM_BACKUP_RESTORE_STATUS *pStatus); |
| | |
| skipping to change at line 2545 | | skipping to change at line 2565 |
| #else /* C style interface */ | | #else /* C style interface */ |
| | |
| typedef struct IWMDRMNonSilentLicenseAquisitionVtbl | | typedef struct IWMDRMNonSilentLicenseAquisitionVtbl |
| { | | { |
| BEGIN_INTERFACE | | BEGIN_INTERFACE |
| | |
| HRESULT ( STDMETHODCALLTYPE *QueryInterface )( | | HRESULT ( STDMETHODCALLTYPE *QueryInterface )( |
| IWMDRMNonSilentLicenseAquisition * This, | | IWMDRMNonSilentLicenseAquisition * This, |
| /* [in] */ REFIID riid, | | /* [in] */ REFIID riid, |
| /* [annotation][iid_is][out] */ | | /* [annotation][iid_is][out] */ |
|
| __RPC__deref_out void **ppvObject); | | _COM_Outptr_ void **ppvObject); |
| | |
| ULONG ( STDMETHODCALLTYPE *AddRef )( | | ULONG ( STDMETHODCALLTYPE *AddRef )( |
| IWMDRMNonSilentLicenseAquisition * This); | | IWMDRMNonSilentLicenseAquisition * This); |
| | |
| ULONG ( STDMETHODCALLTYPE *Release )( | | ULONG ( STDMETHODCALLTYPE *Release )( |
| IWMDRMNonSilentLicenseAquisition * This); | | IWMDRMNonSilentLicenseAquisition * This); |
| | |
| HRESULT ( STDMETHODCALLTYPE *GetURL )( | | HRESULT ( STDMETHODCALLTYPE *GetURL )( |
| IWMDRMNonSilentLicenseAquisition * This, | | IWMDRMNonSilentLicenseAquisition * This, |
| /* [out] */ BSTR *pbstrURL); | | /* [out] */ BSTR *pbstrURL); |
| | |
| skipping to change at line 2609 | | skipping to change at line 2629 |
| | |
| EXTERN_C const CLSID CLSID_WMDRMContentEnablerActivate; | | EXTERN_C const CLSID CLSID_WMDRMContentEnablerActivate; |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| | |
| class DECLSPEC_UUID("82435bdf-f7c1-4df9-8103-eeabebf3d6e1") | | class DECLSPEC_UUID("82435bdf-f7c1-4df9-8103-eeabebf3d6e1") |
| WMDRMContentEnablerActivate; | | WMDRMContentEnablerActivate; |
| #endif | | #endif |
| #endif /* __WMDRMContentEnablerLib_LIBRARY_DEFINED__ */ | | #endif /* __WMDRMContentEnablerLib_LIBRARY_DEFINED__ */ |
| | |
|
| | /* interface __MIDL_itf_wmdrmsdk_0000_0018 */ |
| | /* [local] */ |
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| | extern RPC_IF_HANDLE __MIDL_itf_wmdrmsdk_0000_0018_v0_0_c_ifspec; |
| | extern RPC_IF_HANDLE __MIDL_itf_wmdrmsdk_0000_0018_v0_0_s_ifspec; |
| | |
| /* Additional Prototypes for ALL interfaces */ | | /* Additional Prototypes for ALL interfaces */ |
| | |
| unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long
*, unsigned long , __RPC__in BSTR * ); | | unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long
*, unsigned long , __RPC__in BSTR * ); |
| unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC_
_inout_xcount(0) unsigned char *, __RPC__in BSTR * ); | | unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC_
_inout_xcount(0) unsigned char *, __RPC__in BSTR * ); |
| unsigned char * __RPC_USER BSTR_UserUnmarshal(__RPC__in unsigned long *, __RPC_
_in_xcount(0) unsigned char *, __RPC__out BSTR * ); | | unsigned char * __RPC_USER BSTR_UserUnmarshal(__RPC__in unsigned long *, __RPC_
_in_xcount(0) unsigned char *, __RPC__out BSTR * ); |
| void __RPC_USER BSTR_UserFree( __RPC__in unsigned long
*, __RPC__in BSTR * ); | | void __RPC_USER BSTR_UserFree( __RPC__in unsigned long
*, __RPC__in BSTR * ); |
| | |
| unsigned long __RPC_USER BSTR_UserSize64( __RPC__in unsigned lo
ng *, unsigned long , __RPC__in BSTR * ); | | unsigned long __RPC_USER BSTR_UserSize64( __RPC__in unsigned lo
ng *, unsigned long , __RPC__in BSTR * ); |
| unsigned char * __RPC_USER BSTR_UserMarshal64( __RPC__in unsigned long *, __RP
C__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); | | unsigned char * __RPC_USER BSTR_UserMarshal64( __RPC__in unsigned long *, __RP
C__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); |
| unsigned char * __RPC_USER BSTR_UserUnmarshal64(__RPC__in unsigned long *, __RP
C__in_xcount(0) unsigned char *, __RPC__out BSTR * ); | | unsigned char * __RPC_USER BSTR_UserUnmarshal64(__RPC__in unsigned long *, __RP
C__in_xcount(0) unsigned char *, __RPC__out BSTR * ); |
| | |
| End of changes. 33 change blocks. |
| 92 lines changed or deleted | | 105 lines changed or added |
|