[AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 17 Nov 2016 21:43:18 +0000 (21:43 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 17 Nov 2016 21:43:18 +0000 (21:43 +0000)
svn path=/trunk/; revision=73249

reactos/dll/directx/wine/amstream/amstream.c
reactos/dll/directx/wine/amstream/mediastreamfilter.c
reactos/media/doc/README.WINE

index c715feb..13be22f 100644 (file)
@@ -58,7 +58,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
     object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl;
     object->ref = 1;
 
-    *ppObj = object;
+    *ppObj = &object->IAMMultiMediaStream_iface;
 
     return S_OK;
 }
index 7b86860..0ba9a70 100644 (file)
@@ -348,7 +348,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
     if (!pins)
         return E_OUTOFMEMORY;
     This->pins = pins;
-    info.pFilter = (IBaseFilter*)&This->filter;
+    info.pFilter = &This->filter.IBaseFilter_iface;
     info.dir = PINDIR_INPUT;
     hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL);
     if (FAILED(hr))
@@ -362,11 +362,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
         return hr;
 
     pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams];
-    pin->pin.pin.pinInfo.pFilter = (LPVOID)This;
+    pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface;
     This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream;
     This->nb_streams++;
 
-    IMediaStream_AddRef((IMediaStream*)pAMMediaStream);
+    IAMMediaStream_AddRef(pAMMediaStream);
 
     return S_OK;
 }
@@ -510,7 +510,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj)
 
     BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable);
 
-    *ppObj = object;
+    *ppObj = &object->filter.IBaseFilter_iface;
 
     return S_OK;
 }
index 73e676c..4da5077 100644 (file)
@@ -21,7 +21,7 @@ reactos/sdk/tools/wpp                   # Synced to WineStaging-1.9.11
 
 The following libraries are shared with Wine.
 
-reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.9.16
+reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4