Headers diff for msdrm.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.18332-Windows 7.0 versions



 msdrm.h (6.0.6002.18005-Windows 6.0)   msdrm.h (6.1.7601.18332-Windows 7.0) 
skipping to change at line 25 skipping to change at line 25
#include "msdrmdefs.h" #include "msdrmdefs.h"
// environment & handle control // environment & handle control
DRMEXPORT HRESULT UDAPICALL DRMSetGlobalOptions( DRMEXPORT HRESULT UDAPICALL DRMSetGlobalOptions(
IN DRMGLOBALOPTIONS eGlobalOptions, IN DRMGLOBALOPTIONS eGlobalOptions,
IN LPVOID pvdata, IN LPVOID pvdata,
IN DWORD dwlen); IN DWORD dwlen);
DRMEXPORT HRESULT UDAPICALL DRMGetClientVersion( DRMEXPORT HRESULT UDAPICALL DRMGetClientVersion(
IN DRM_CLIENT_VERSION_INFO *pDRMClientVersionInfo); OUT DRM_CLIENT_VERSION_INFO *pDRMClientVersionInfo);
DRMEXPORT HRESULT UDAPICALL DRMInitEnvironment ( DRMEXPORT HRESULT UDAPICALL DRMInitEnvironment (
IN DRMSECURITYPROVIDERTYPE eSecurityProviderType, IN DRMSECURITYPROVIDERTYPE eSecurityProviderType,
IN DRMSPECTYPE eSpecification, IN DRMSPECTYPE eSpecification,
__in_opt PWSTR wszSecurityProvider, __in_opt PWSTR wszSecurityProvider,
__in_opt PWSTR wszManifestCredentials, __in_opt PWSTR wszManifestCredentials,
__in PWSTR wszMachineCredentials, __in PWSTR wszMachineCredentials,
OUT DRMENVHANDLE* phEnv, OUT DRMENVHANDLE* phEnv,
OUT DRMHANDLE* phDefaultLibrary); OUT DRMHANDLE* phDefaultLibrary);
skipping to change at line 138 skipping to change at line 138
DRMEXPORT HRESULT UDAPICALL DRMGetTime ( DRMEXPORT HRESULT UDAPICALL DRMGetTime (
IN DRMENVHANDLE hEnv, IN DRMENVHANDLE hEnv,
IN DRMTIMETYPE eTimerIdType, IN DRMTIMETYPE eTimerIdType,
OUT SYSTEMTIME* poTimeObject); OUT SYSTEMTIME* poTimeObject);
DRMEXPORT HRESULT UDAPICALL DRMGetInfo( DRMEXPORT HRESULT UDAPICALL DRMGetInfo(
__in DRMHANDLE handle, __in DRMHANDLE handle,
__in PWSTR wszAttribute, __in PWSTR wszAttribute,
__in DRMENCODINGTYPE* peEncoding, __in DRMENCODINGTYPE* peEncoding,
__inout UINT* pcBuffer, __inout UINT* pcBuffer,
BYTE* pbBuffer); OUT BYTE* pbBuffer);
DRMEXPORT HRESULT UDAPICALL DRMGetEnvironmentInfo( DRMEXPORT HRESULT UDAPICALL DRMGetEnvironmentInfo(
IN DRMENVHANDLE handle, IN DRMENVHANDLE handle,
__in_opt PWSTR wszAttribute, __in_opt PWSTR wszAttribute,
OUT DRMENCODINGTYPE* peEncoding, OUT DRMENCODINGTYPE* peEncoding,
IN OUT UINT* pcBuffer, IN OUT UINT* pcBuffer,
OUT BYTE* pbBuffer); OUT BYTE* pbBuffer);
DRMEXPORT HRESULT UDAPICALL DRMGetProcAddress( DRMEXPORT HRESULT UDAPICALL DRMGetProcAddress(
IN DRMHANDLE hLibrary, IN DRMHANDLE hLibrary,
skipping to change at line 346 skipping to change at line 346
__in_opt PWSTR wszUserIdType, __in_opt PWSTR wszUserIdType,
OUT DRMPUBHANDLE* phUser); OUT DRMPUBHANDLE* phUser);
DRMEXPORT HRESULT UDAPICALL DRMCreateRight( DRMEXPORT HRESULT UDAPICALL DRMCreateRight(
__in PWSTR wszRightName, __in PWSTR wszRightName,
IN SYSTEMTIME* pstFrom, IN SYSTEMTIME* pstFrom,
IN SYSTEMTIME* pstUntil, IN SYSTEMTIME* pstUntil,
IN UINT cExtendedInfo, IN UINT cExtendedInfo,
__in_ecount_opt(cExtendedInfo) PWSTR* p wszExtendedInfoName, __in_ecount_opt(cExtendedInfo) PWSTR* p wszExtendedInfoName,
__in_ecount_opt(cExtendedInfo) PWSTR* p wszExtendedInfoValue, __in_ecount_opt(cExtendedInfo) PWSTR* p wszExtendedInfoValue,
IN DRMPUBHANDLE *phRight); OUT DRMPUBHANDLE *phRight);
DRMEXPORT HRESULT UDAPICALL DRMCreateIssuanceLicense( DRMEXPORT HRESULT UDAPICALL DRMCreateIssuanceLicense(
IN SYSTEMTIME* pstTimeFrom, IN SYSTEMTIME* pstTimeFrom,
IN SYSTEMTIME* pstTimeUntil, IN SYSTEMTIME* pstTimeUntil,
__in_opt PWSTR wszReferralInfoName, __in_opt PWSTR wszReferralInfoName,
__in_opt PWSTR wszReferralInfoURL, __in_opt PWSTR wszReferralInfoURL,
IN DRMPUBHANDLE hOwner,//Use created using D RMCreateUser. IN DRMPUBHANDLE hOwner,//Use created using D RMCreateUser.
__in_opt PWSTR wszIssuanceLicense,//I ssuance License Template or Signed Issuance License __in_opt PWSTR wszIssuanceLicense,//I ssuance License Template or Signed Issuance License
IN DRMHANDLE hBoundLicense, IN DRMHANDLE hBoundLicense,
skipping to change at line 439 skipping to change at line 439
IN BYTE* pbSymKey, IN BYTE* pbSymKey,
IN UINT cbSymKey, IN UINT cbSymKey,
__in_opt PWSTR wszSymKeyType, __in_opt PWSTR wszSymKeyType,
__in_opt PWSTR wszClientLicensorCert ificate,//Should be NULL for DRM_SIGN_ONLINE , not NULL otherwise __in_opt PWSTR wszClientLicensorCert ificate,//Should be NULL for DRM_SIGN_ONLINE , not NULL otherwise
IN DRMCALLBACK pfnCallback, IN DRMCALLBACK pfnCallback,
__in_opt PWSTR wszURL,//Mandatory if uFlags is DRM_SIGN_ONLINE __in_opt PWSTR wszURL,//Mandatory if uFlags is DRM_SIGN_ONLINE
IN VOID* pvContext);//Optional IN VOID* pvContext);//Optional
DRMEXPORT HRESULT UDAPICALL DRMGetSignedIssuanceLicenseEx(
DRMENVHANDLE hEnv,
DRMPUBHANDLE hIssuanceLicense,
UINT uFlags,
__in_bcount_opt(cbSymKey) BYTE* pbSymKey,
UINT cbSymKey,
__in_opt PWSTR wszSymKeyType,
__in_opt PVOID pvReserved,
__in DRMHANDLE hEnablingPrincipal,
__in DRMHANDLE hBoundLicenseCLC,
__in DRMCALLBACK pfnCallback,
__in PVOID pvContext);
DRMEXPORT HRESULT UDAPICALL DRMClosePubHandle( DRMEXPORT HRESULT UDAPICALL DRMClosePubHandle(
IN DRMPUBHANDLE hPub); IN DRMPUBHANDLE hPub);
DRMEXPORT HRESULT UDAPICALL DRMDuplicatePubHandle( DRMEXPORT HRESULT UDAPICALL DRMDuplicatePubHandle(
IN DRMPUBHANDLE hPubIn, IN DRMPUBHANDLE hPubIn,
OUT DRMPUBHANDLE* phPubOut); OUT DRMPUBHANDLE* phPubOut);
DRMEXPORT HRESULT UDAPICALL DRMGetUserInfo( DRMEXPORT HRESULT UDAPICALL DRMGetUserInfo(
IN DRMPUBHANDLE hUser, IN DRMPUBHANDLE hUser,
IN OUT UINT* puUserNameLength, IN OUT UINT* puUserNameLength,
skipping to change at line 564 skipping to change at line 577
IN OUT UINT* puDescriptionLength, IN OUT UINT* puDescriptionLength,
__out_ecount_opt(*puDescriptionLength) PWSTR wszDescription); __out_ecount_opt(*puDescriptionLength) PWSTR wszDescription);
DRMEXPORT HRESULT UDAPICALL DRMGetOwnerLicense( DRMEXPORT HRESULT UDAPICALL DRMGetOwnerLicense(
IN DRMPUBHANDLE hIssuanceLicense, IN DRMPUBHANDLE hIssuanceLicense,
IN OUT UINT* puOwnerLicenseLength, IN OUT UINT* puOwnerLicenseLength,
__out_ecount_opt(*puOwnerLicenseLength) PWST R wszOwnerLicense); __out_ecount_opt(*puOwnerLicenseLength) PWST R wszOwnerLicense);
DRMEXPORT HRESULT UDAPICALL DRMGetIntervalTime( DRMEXPORT HRESULT UDAPICALL DRMGetIntervalTime(
IN DRMPUBHANDLE hIssuanceLicense, IN DRMPUBHANDLE hIssuanceLicense,
IN UINT* pcDays); OUT UINT* pcDays);
DRMEXPORT HRESULT UDAPICALL DRMRepair(); DRMEXPORT HRESULT UDAPICALL DRMRepair();
DRMEXPORT HRESULT UDAPICALL DRMRegisterProtectedWindow(DRMENVHANDLE hEnv,HWND hw DRMEXPORT HRESULT UDAPICALL DRMRegisterProtectedWindow(
nd); IN D
RMENVHANDLE hEnv,
IN H
WND hwnd);
DRMEXPORT HRESULT UDAPICALL DRMIsWindowProtected(HWND hwnd,BOOL* pfProtected); DRMEXPORT HRESULT UDAPICALL DRMIsWindowProtected(
IN H
WND hwnd,
OUT B
OOL* pfProtected);
DRMEXPORT HRESULT UDAPICALL DRMAcquireIssuanceLicenseTemplate(
IN D
RMHSESSION hClient,
IN U
INT uFlags,
IN V
OID* pvReserved,
IN U
INT cTemplates,
__in_ecount_opt(c
Templates) PWSTR* pwszTemplateIds,
__in PWSTR wszUrl
,
IN V
OID* pvContext);
#endif // #ifndef __MSDRM_H_ #endif // #ifndef __MSDRM_H_
 End of changes. 7 change blocks. 
7 lines changed or deleted 43 lines changed or added

This html diff was produced by rfcdiff 1.41.