Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QUARTZ] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71764
This commit is contained in:
Amine Khaldi 2016-07-02 15:56:39 +00:00
parent f88ab4534f
commit b9d9c7829d
9 changed files with 37 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/quartz/acmwrapper.c
View file

@ -36,7 +36,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl;
static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface )
{ {
return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); return CONTAINING_RECORD(iface, ACMWrapperImpl, tf);
} }
static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample)

2
reactos/dll/directx/wine/quartz/avidec.c
View file

@ -34,7 +34,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl;
static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface )
{ {
return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); return CONTAINING_RECORD(iface, AVIDecImpl, tf);
} }
static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter)

2
reactos/dll/directx/wine/quartz/dsoundrender.c
View file

@ -387,7 +387,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam
else if (jitter < 0) else if (jitter < 0)
jitter = 0; jitter = 0;
q.Type = (jitter > 0 ? Famine : Flood); q.Type = (jitter > 0 ? Famine : Flood);
q.Proportion = 1.; q.Proportion = 1000;
q.Late = jitter; q.Late = jitter;
q.TimeStamp = tStart; q.TimeStamp = tStart;
IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q); IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q);

11
reactos/dll/directx/wine/quartz/filesource.c
View file

@ -598,6 +598,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt); TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt);
if (!pszFileName)
return E_POINTER;
/* open file */ /* open file */
/* FIXME: check the sharing values that native uses */ /* FIXME: check the sharing values that native uses */
hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
@ -637,8 +640,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL);
if (FAILED(hr)) if (FAILED(hr))
{ {
memcpy(&This->pmt->majortype, &MEDIATYPE_Stream, sizeof(GUID)); This->pmt->majortype = MEDIATYPE_Stream;
memcpy(&This->pmt->subtype, &MEDIASUBTYPE_NULL, sizeof(GUID)); This->pmt->subtype = MEDIASUBTYPE_NULL;
hr = S_OK; hr = S_OK;
} }
} }
@ -751,7 +754,7 @@ static inline FileAsyncReader *impl_from_BaseOutputPin(BaseOutputPin *iface)
return CONTAINING_RECORD(iface, FileAsyncReader, pin); return CONTAINING_RECORD(iface, FileAsyncReader, pin);
} }
static inline BaseOutputPin *impl_BaseOututPin_from_BasePin(BasePin *iface) static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin(BasePin *iface)
{ {
return CONTAINING_RECORD(iface, BaseOutputPin, pin); return CONTAINING_RECORD(iface, BaseOutputPin, pin);
} }
@ -867,7 +870,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl =
* doesn't need the IMemInputPin interface on the receiving pin */ * doesn't need the IMemInputPin interface on the receiving pin */
static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BasePin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BasePin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
{ {
BaseOutputPin *This = impl_BaseOututPin_from_BasePin(iface); BaseOutputPin *This = impl_BaseOutputPin_from_BasePin(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p, %p)\n", pReceivePin, pmt); TRACE("(%p, %p)\n", pReceivePin, pmt);

3
reactos/dll/directx/wine/quartz/filtermapper.c
View file

@ -1141,7 +1141,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n", TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n",
iface,This, This,
iface,
ppEnum, ppEnum,
dwMerit, dwMerit,
bInputNeeded ? "true" : "false", bInputNeeded ? "true" : "false",

2
reactos/dll/directx/wine/quartz/pin.c
View file

@ -20,8 +20,6 @@
#include "quartz_private.h" #include "quartz_private.h"
static const IPinVtbl PullPin_Vtbl;
#define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) #define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary))
#define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary))) #define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary)))

20
reactos/dll/directx/wine/quartz/videorenderer.c
View file

@ -164,7 +164,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This)
AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex);
TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); TRACE("WindowPos: %s\n", wine_dbgstr_rect(&This->WindowPos));
SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL,
This->WindowPos.left, This->WindowPos.left,
This->WindowPos.top, This->WindowPos.top,
@ -222,8 +222,8 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
return E_FAIL; return E_FAIL;
} }
TRACE("Src Rect: %d %d %d %d\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.bottom); TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect));
TRACE("Dst Rect: %d %d %d %d\n", This->DestRect.left, This->DestRect.top, This->DestRect.right, This->DestRect.bottom); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect));
StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left,
This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top,
@ -410,9 +410,7 @@ static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface)
VideoRendererImpl *This = impl_from_BaseWindow(iface); VideoRendererImpl *This = impl_from_BaseWindow(iface);
static RECT defRect; static RECT defRect;
defRect.left = defRect.top = 0; SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight);
defRect.right = This->VideoWidth;
defRect.bottom = This->VideoHeight;
return defRect; return defRect;
} }
@ -576,10 +574,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface
{ {
VideoRendererImpl *This = impl_from_BaseControlVideo(iface); VideoRendererImpl *This = impl_from_BaseControlVideo(iface);
This->SourceRect.left = 0; SetRect(&This->SourceRect, 0, 0, This->VideoWidth, This->VideoHeight);
This->SourceRect.top = 0;
This->SourceRect.right = This->VideoWidth;
This->SourceRect.bottom = This->VideoHeight;
return S_OK; return S_OK;
} }
@ -592,10 +587,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface
if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect))
return E_FAIL; return E_FAIL;
This->DestRect.left = 0; SetRect(&This->DestRect, 0, 0, rect.right, rect.bottom);
This->DestRect.top = 0;
This->DestRect.right = rect.right;
This->DestRect.bottom = rect.bottom;
return S_OK; return S_OK;
} }

52
reactos/dll/directx/wine/quartz/vmr9.c
View file

@ -227,8 +227,8 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *
width = bmiHeader->biWidth; width = bmiHeader->biWidth;
height = bmiHeader->biHeight; height = bmiHeader->biHeight;
TRACE("Src Rect: %d %d %d %d\n", This->source_rect.left, This->source_rect.top, This->source_rect.right, This->source_rect.bottom); TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->source_rect));
TRACE("Dst Rect: %d %d %d %d\n", This->target_rect.left, This->target_rect.top, This->target_rect.right, This->target_rect.bottom); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->target_rect));
hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD);
if (FAILED(hr)) if (FAILED(hr))
@ -335,9 +335,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY
This->bmiheader = format->bmiHeader; This->bmiheader = format->bmiHeader;
TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight);
This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; This->VideoWidth = format->bmiHeader.biWidth;
This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; This->VideoHeight = format->bmiHeader.biHeight;
This->source_rect.top = This->source_rect.left = 0; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
} }
else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2))
{ {
@ -346,9 +346,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY
This->bmiheader = format->bmiHeader; This->bmiheader = format->bmiHeader;
TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight);
This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; This->VideoWidth = format->bmiHeader.biWidth;
This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; This->VideoHeight = format->bmiHeader.biHeight;
This->source_rect.top = This->source_rect.left = 0; SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight);
} }
else else
{ {
@ -408,9 +408,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force)
hr = IVMRSurfaceAllocatorEx9_InitializeDevice(This->allocator, This->cookie, &info, &buffers); hr = IVMRSurfaceAllocatorEx9_InitializeDevice(This->allocator, This->cookie, &info, &buffers);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
This->source_rect.left = This->source_rect.top = 0; SetRect(&This->source_rect, 0, 0, This->bmiheader.biWidth, This->bmiheader.biHeight);
This->source_rect.right = This->bmiheader.biWidth;
This->source_rect.bottom = This->bmiheader.biHeight;
This->num_surfaces = buffers; This->num_surfaces = buffers;
} }
@ -526,9 +524,7 @@ static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This)
struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This);
static RECT defRect; static RECT defRect;
defRect.left = defRect.top = 0; SetRect(&defRect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight);
defRect.right = pVMR9->VideoWidth;
defRect.bottom = pVMR9->VideoHeight;
return defRect; return defRect;
} }
@ -670,10 +666,7 @@ static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This)
{ {
struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This);
pVMR9->source_rect.left = 0; SetRect(&pVMR9->source_rect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight);
pVMR9->source_rect.top = 0;
pVMR9->source_rect.right = pVMR9->VideoWidth;
pVMR9->source_rect.bottom = pVMR9->VideoHeight;
return S_OK; return S_OK;
} }
@ -686,10 +679,7 @@ static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This)
if (!GetClientRect(pVMR9->baseControlWindow.baseWindow.hWnd, &rect)) if (!GetClientRect(pVMR9->baseControlWindow.baseWindow.hWnd, &rect))
return E_FAIL; return E_FAIL;
pVMR9->target_rect.left = 0; SetRect(&pVMR9->target_rect, 0, 0, rect.right, rect.bottom);
pVMR9->target_rect.top = 0;
pVMR9->target_rect.right = rect.right;
pVMR9->target_rect.bottom = rect.bottom;
return S_OK; return S_OK;
} }
@ -1761,8 +1751,7 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr
This->target_rect = *dest; This->target_rect = *dest;
if (This->baseControlWindow.baseWindow.hWnd) if (This->baseControlWindow.baseWindow.hWnd)
{ {
FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest));
dest->left, dest->top, dest->right, dest->bottom);
SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL,
dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top,
SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW);
@ -1966,7 +1955,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr
This->target_rect = *dest; This->target_rect = *dest;
if (This->baseControlWindow.baseWindow.hWnd) if (This->baseControlWindow.baseWindow.hWnd)
{ {
FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", dest->left, dest->top, dest->right, dest->bottom); FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest));
SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left,
dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW);
} }
@ -2584,14 +2573,9 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorP
return hr; return hr;
} }
target_rect = This->pVMR9->target_rect; /* Move rect to origin and flip it */
target_rect.right -= target_rect.left; SetRect(&target_rect, 0, This->pVMR9->target_rect.bottom - This->pVMR9->target_rect.top,
target_rect.bottom -= target_rect.top; This->pVMR9->target_rect.right - This->pVMR9->target_rect.left, 0);
target_rect.left = target_rect.top = 0;
/* Flip */
target_rect.top = target_rect.bottom;
target_rect.bottom = 0;
hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, &This->pVMR9->source_rect, target, &target_rect, D3DTEXF_LINEAR); hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, &This->pVMR9->source_rect, target, &target_rect, D3DTEXF_LINEAR);
if (FAILED(hr)) if (FAILED(hr))
@ -2610,7 +2594,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9);
GetWindowRect(This->pVMR9->baseControlWindow.baseWindow.hWnd, &output); GetWindowRect(This->pVMR9->baseControlWindow.baseWindow.hWnd, &output);
TRACE("Output rectangle: starting at %dx%d, up to point %dx%d\n", output.left, output.top, output.right, output.bottom); TRACE("Output rectangle: %s\n", wine_dbgstr_rect(&output));
/* This might happen if we don't have active focus (eg on a different virtual desktop) */ /* This might happen if we don't have active focus (eg on a different virtual desktop) */
if (!This->d3d9_dev) if (!This->d3d9_dev)

2
reactos/media/doc/README.WINE
View file

@ -39,7 +39,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.9.4