Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QEDIT]

Browse source 
sync to wine 1.2 RC2

svn path=/trunk/; revision=47400
This commit is contained in:
Christoph von Wittich 2010-05-29 09:05:43 +00:00
parent def4a5f1f5
commit cdabe0cf21
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/directx/qedit/mediadet.c
View file

@ -38,8 +38,8 @@ typedef struct MediaDetImpl {
IGraphBuilder *graph; IGraphBuilder *graph;
IBaseFilter *source; IBaseFilter *source;
IBaseFilter *splitter; IBaseFilter *splitter;
long num_streams; LONG num_streams;
long cur_stream; LONG cur_stream;
IPin *cur_pin; IPin *cur_pin;
} MediaDetImpl; } MediaDetImpl;
@ -168,7 +168,7 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal)
return S_OK; return S_OK;
} }
static HRESULT SetCurPin(MediaDetImpl *This, long strm) static HRESULT SetCurPin(MediaDetImpl *This, LONG strm)
{ {
IEnumPins *pins; IEnumPins *pins;
IPin *pin; IPin *pin;

2
reactos/dll/directx/qedit/regsvr.c
View file

@ -326,5 +326,5 @@ HRESULT WINAPI DllUnregisterServer(void)
TRACE("\n"); TRACE("\n");
hr = unregister_coclasses(coclass_list); hr = unregister_coclasses(coclass_list);
return S_OK; return hr;
} }

6
reactos/dll/directx/qedit/samplegrabber.c
View file

@ -489,7 +489,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
REFERENCE_TIME tStart, tEnd; REFERENCE_TIME tStart, tEnd;
if (This->bufferLen >= 0) { if (This->bufferLen >= 0) {
BYTE *data = 0; BYTE *data = 0;
long size = IMediaSample_GetActualDataLength(sample); LONG size = IMediaSample_GetActualDataLength(sample);
if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) { if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) {
if (!data) if (!data)
size = 0; size = 0;
@ -527,7 +527,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
case 1: case 1:
{ {
BYTE *data = 0; BYTE *data = 0;
long size = IMediaSample_GetActualDataLength(sample); LONG size = IMediaSample_GetActualDataLength(sample);
if (size && SUCCEEDED(IMediaSample_GetPointer(sample, &data)) && data) if (size && SUCCEEDED(IMediaSample_GetPointer(sample, &data)) && data)
ISampleGrabberCB_BufferCB(This->grabberIface, time, data, size); ISampleGrabberCB_BufferCB(This->grabberIface, time, data, size);
} }
@ -535,7 +535,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
case -1: case -1:
break; break;
default: default:
FIXME("unsupported method %ld\n", (long int)This->grabberMethod); FIXME("unsupported method %d\n", This->grabberMethod);
/* do not bother us again */ /* do not bother us again */
This->grabberMethod = -1; This->grabberMethod = -1;
} }