[PATCH 1/6] include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx().
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 716abe056db..945a8faaca4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1082,7 +1082,7 @@ interface IWMReaderAllocatorEx : IUnknown [in] void *pvContext); HRESULT AllocateForOutputEx( - [in] WORD wOutputNum, + [in] DWORD output, [in] DWORD cbBuffer, [out] INSSBuffer **ppBuffer, [in] DWORD dwFlags, -- 2.33.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/Makefile.in | 1 + include/wmsecure.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 include/wmsecure.idl diff --git a/include/Makefile.in b/include/Makefile.in index 94010695214..a9a478e5433 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -832,6 +832,7 @@ SOURCES = \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ + wmsecure.idl \ wnaspi32.h \ wownt16.h \ wownt32.h \ diff --git a/include/wmsecure.idl b/include/wmsecure.idl new file mode 100644 index 00000000000..f8d731a05ba --- /dev/null +++ b/include/wmsecure.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + local, + uuid(d9b67d36-a9ad-4eb4-baef-db284ef5504c), +] +interface IWMAuthorizer : IUnknown +{ + HRESULT GetCertCount(DWORD *count); + HRESULT GetCert(DWORD index, BYTE **data); + HRESULT GetSharedData(DWORD index, const BYTE *data, BYTE *cert, BYTE **ret_data); +} + +[ + object, + local, + uuid(2720598a-d0f2-4189-bd10-91c46ef0936f), +] +interface IWMSecureChannel : IWMAuthorizer +{ + HRESULT WMSC_AddCertificate(IWMAuthorizer *cert); + HRESULT WMSC_AddSignature(BYTE *signature, DWORD size); + HRESULT WMSC_Connect(IWMSecureChannel *peer); + HRESULT WMSC_IsConnected(BOOL *connected); + HRESULT WMSC_Disconnect(); + HRESULT WMSC_GetValidCertificate(BYTE **cert, DWORD *signature); + HRESULT WMSC_Encrypt(BYTE *data, DWORD size); + HRESULT WMSC_Decrypt(BYTE *data, DWORD size); + HRESULT WMSC_Lock(); + HRESULT WMSC_Unlock(); + HRESULT WMSC_SetSharedData(DWORD index, BYTE *data); +} + +[ + object, + local, + uuid(94bc0598-c3d2-11d3-bedf-00c04f612986), +] +interface IWMGetSecureChannel : IUnknown +{ + HRESULT GetPeerSecureChannelInterface(IWMSecureChannel **channel); +} -- 2.33.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsdkidl.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 945a8faaca4..78505ce3e5a 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1888,6 +1888,16 @@ interface IWMLicenseRestore : IUnknown HRESULT CancelLicenseRestore(); } +[ + object, + local, + uuid(6816dad3-2b4b-4c8e-8149-874c3483a753), +] +interface IWMIStreamProps : IUnknown +{ + HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") -- 2.33.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsdkidl.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 78505ce3e5a..0adde5e2dd9 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -260,6 +260,21 @@ interface IWMReaderCallback : IWMStatusCallback [in] void *pvContext); } +[ + object, + local, + uuid(96406beb-2b2b-11d3-b36b-00c04f6108ff), +] +interface IWMReaderCallbackAdvanced : IUnknown +{ + HRESULT OnStreamSample(WORD stream_number, QWORD pts, QWORD duration, DWORD flags, INSSBuffer *sample, void *context); + HRESULT OnTime(QWORD time, void *context); + HRESULT OnStreamSelection(WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections, void *context); + HRESULT OnOutputPropsChanged(DWORD output_number, WM_MEDIA_TYPE *mt, void *context); + HRESULT AllocateForStream(WORD stream_number, DWORD size, INSSBuffer **sample, void *context); + HRESULT AllocateForOutput(DWORD output_number, DWORD size, INSSBuffer **sample, void *context); +} + [ object, uuid(96406Bdd-2b2b-11d3-b36b-00c04f6108ff), -- 2.33.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsdkidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0adde5e2dd9..f276d642a03 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1913,6 +1913,17 @@ interface IWMIStreamProps : IUnknown HRESULT GetProperty(const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, DWORD *size); } +[ + object, + local, + uuid(342e0eb7-e651-450c-975b-2ace2c90c48e), +] +interface IWMCredentialCallback : IUnknown +{ + HRESULT AcquireCredentials(WCHAR *realm, WCHAR *site, WCHAR *username, DWORD username_size, + WCHAR *password, DWORD password_size, HRESULT hr, DWORD *flags); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") -- 2.33.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsbuffer.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index 6ec9dfc7c3b..a9d76898982 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -41,3 +41,25 @@ interface INSSBuffer : IUnknown [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); } + +[ + object, + local, + uuid(4f528693-1035-43fe-b428-757561ad3a68), +] +interface INSSBuffer2 : INSSBuffer +{ + HRESULT GetSampleProperties(DWORD size, BYTE *props); + HRESULT SetSampleProperties(DWORD size, BYTE *props); +} + +[ + object, + local, + uuid(c87ceaaf-75be-4bc4-84eb-ac2798507672), +] +interface INSSBuffer3 : INSSBuffer2 +{ + HRESULT SetProperty(GUID id, void *value, DWORD size); + HRESULT GetProperty(GUID id, void *value, DWORD *size); +} -- 2.33.0
participants (1)
-
Zebediah Figura