You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
1bf2e6fe90
[api-ms-win-crt-Stub_DLLs] Removed patch to forward urcrtbase *_base functions to msvcrt (fixed upstream). [kernel32-FreeUserPhysicalPages] Removed patch to add stub for kernel32.FreeUserPhysicalPages (accepted upstream). [ntdll-NtSetLdtEntries] Removed patch to add stub for NtSetLdtEntries/ZwSetLdtEntries (accepted upstream). [secur32-ANSI_NTLM_Credentials] Removed patch to fix handling of ANSI NTLM credentials (accepted upstream). [winsta-WinStationEnumerateW] Removed patch to add stub for winsta.WinStationEnumerateW (accepted upstream). [ws2_32-Sort_default_route] Removed patch to ensure default route IP addresses are returned in correct order (accepted upstream).
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 4bec6ad3640799a4b8bdb1d1987d8e65e15c0355 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
|
Date: Tue, 28 Jul 2015 18:21:20 +0200
|
|
Subject: amstream: Implement IAMMediaStream::GetMultiMediaStream.
|
|
|
|
---
|
|
dlls/amstream/mediastream.c | 30 ++++++++++++++++++++++++------
|
|
1 file changed, 24 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
|
|
index 51349ab..98fca62 100644
|
|
--- a/dlls/amstream/mediastream.c
|
|
+++ b/dlls/amstream/mediastream.c
|
|
@@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
|
|
{
|
|
DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);
|
|
|
|
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
|
|
+ TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
|
|
|
|
- return S_FALSE;
|
|
+ if (!multi_media_stream)
|
|
+ return E_POINTER;
|
|
+
|
|
+ IMultiMediaStream_AddRef(This->parent);
|
|
+ *multi_media_stream = This->parent;
|
|
+
|
|
+ return S_OK;
|
|
}
|
|
|
|
static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
|
|
@@ -517,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
|
|
{
|
|
AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
|
|
|
|
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
|
|
+ TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
|
|
|
|
- return S_FALSE;
|
|
+ if (!multi_media_stream)
|
|
+ return E_POINTER;
|
|
+
|
|
+ IMultiMediaStream_AddRef(This->parent);
|
|
+ *multi_media_stream = This->parent;
|
|
+
|
|
+ return S_OK;
|
|
}
|
|
|
|
static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
|
|
@@ -678,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
|
|
{
|
|
AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
|
|
|
|
- FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream);
|
|
+ TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream);
|
|
|
|
- return S_FALSE;
|
|
+ if (!multimedia_stream)
|
|
+ return E_POINTER;
|
|
+
|
|
+ IMultiMediaStream_AddRef(This->parent);
|
|
+ *multimedia_stream = This->parent;
|
|
+
|
|
+ return S_OK;
|
|
}
|
|
|
|
static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
|
|
--
|
|
2.9.0
|
|
|