ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Avoid using the long type.

This commit is contained in:
Michael Stefaniuc 2010-05-20 01:14:09 +02:00 committed by Alexandre Julliard
parent aa65a56afe
commit 63512e8e98
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/quartz/acmwrapper.c
View File

@ -105,7 +105,7 @@ static HRESULT ACMWrapper_ProcessSampleData(InputPin *pin, IMediaSample *pSample
tMed = tStart; tMed = tStart;
TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt);
if (FAILED(hr)) if (FAILED(hr))

2
dlls/quartz/avidec.c
View File

@ -101,7 +101,7 @@ static HRESULT AVIDec_ProcessSampleData(InputPin *pin, IMediaSample *pSample)
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt);
if (FAILED(hr)) { if (FAILED(hr)) {

2
dlls/quartz/avisplit.c
View File

@ -770,7 +770,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
{ {
const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk;
DWORD x; DWORD x;
long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; UINT rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY;
if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK))
{ {

12
dlls/quartz/dsoundrender.c
View File

@ -78,8 +78,8 @@ typedef struct DSoundRenderImpl
HANDLE state_change, blocked; HANDLE state_change, blocked;
long volume; LONG volume;
long pan; LONG pan;
} DSoundRenderImpl; } DSoundRenderImpl;
/* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */ /* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */
@ -238,7 +238,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
{ {
DSoundRenderImpl *This = iface; DSoundRenderImpl *This = iface;
LPBYTE pbSrcStream = NULL; LPBYTE pbSrcStream = NULL;
long cbSrcStream = 0; LONG cbSrcStream = 0;
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
HRESULT hr; HRESULT hr;
AM_MEDIA_TYPE *amt; AM_MEDIA_TYPE *amt;
@ -344,7 +344,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
} }
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
#if 0 /* For debugging purpose */ #if 0 /* For debugging purpose */
{ {
@ -877,11 +877,11 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin
{ {
hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume); hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume);
if (FAILED(hr)) if (FAILED(hr))
ERR("Can't set volume to %ld (%x)\n", DSImpl->volume, hr); ERR("Can't set volume to %d (%x)\n", DSImpl->volume, hr);
hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan); hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan);
if (FAILED(hr)) if (FAILED(hr))
ERR("Can't set pan to %ld (%x)\n", DSImpl->pan, hr); ERR("Can't set pan to %d (%x)\n", DSImpl->pan, hr);
DSImpl->write_pos = 0; DSImpl->write_pos = 0;
hr = S_OK; hr = S_OK;

16
dlls/quartz/filtergraph.c
View File

@ -45,14 +45,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct { typedef struct {
HWND hWnd; /* Target window */ HWND hWnd; /* Target window */
long msg; /* User window message */ UINT msg; /* User window message */
long instance; /* User data */ LONG_PTR instance; /* User data */
int disabled; /* Disabled messages posting */ int disabled; /* Disabled messages posting */
} WndNotify; } WndNotify;
typedef struct { typedef struct {
long lEventCode; /* Event code */ LONG lEventCode; /* Event code */
LONG_PTR lParam1; /* Param1 */ LONG_PTR lParam1; /* Param1 */
LONG_PTR lParam2; /* Param2 */ LONG_PTR lParam2; /* Param2 */
} Event; } Event;
@ -120,7 +120,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt)
return TRUE; return TRUE;
} }
static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, long msTimeOut) static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut)
{ {
if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0)
return FALSE; return FALSE;
@ -182,7 +182,7 @@ typedef struct _IFilterGraphImpl {
LPWSTR * pFilterNames; LPWSTR * pFilterNames;
int nFilters; int nFilters;
int filterCapacity; int filterCapacity;
long nameIndex; LONG nameIndex;
IReferenceClock *refClock; IReferenceClock *refClock;
EventsQueue evqueue; EventsQueue evqueue;
HANDLE hEventCompletion; HANDLE hEventCompletion;
@ -4970,7 +4970,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface,
This->notif.hWnd = (HWND)hwnd; This->notif.hWnd = (HWND)hwnd;
This->notif.msg = lMsg; This->notif.msg = lMsg;
This->notif.instance = (long) lInstanceData; This->notif.instance = lInstanceData;
return S_OK; return S_OK;
} }

2
dlls/quartz/memallocator.c
View File

@ -785,7 +785,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface)
StdMemAllocator *This = (StdMemAllocator *)iface; StdMemAllocator *This = (StdMemAllocator *)iface;
StdMediaSample2 * pSample = NULL; StdMediaSample2 * pSample = NULL;
SYSTEM_INFO si; SYSTEM_INFO si;
long i; LONG i;
assert(list_empty(&This->base.free_list)); assert(list_empty(&This->base.free_list));

2
dlls/quartz/pin.c
View File

@ -1834,7 +1834,7 @@ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinI
return E_FAIL; return E_FAIL;
} }
HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
{ {
OutputPin * pPinImpl; OutputPin * pPinImpl;

2
dlls/quartz/pin.h
View File

@ -143,7 +143,7 @@ typedef struct PullPin
/*** Constructors ***/ /*** Constructors ***/
HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin);
HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin);
HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin);
/**************************/ /**************************/

4
dlls/quartz/tests/referenceclock.c
View File

@ -54,7 +54,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock
HRESULT hr; HRESULT hr;
REFERENCE_TIME time1; REFERENCE_TIME time1;
REFERENCE_TIME time2; REFERENCE_TIME time2;
signed long diff; LONG diff;
/* Test response from invalid (NULL) argument */ /* Test response from invalid (NULL) argument */
hr = IReferenceClock_GetTime(pClock, NULL); hr = IReferenceClock_GetTime(pClock, NULL);
@ -86,7 +86,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock
/* FIXME: How much deviation should be allowed after a sleep? */ /* FIXME: How much deviation should be allowed after a sleep? */
/* 0.3% is common, and 0.4% is sometimes observed. */ /* 0.3% is common, and 0.4% is sometimes observed. */
diff = time2 - time1; diff = time2 - time1;
ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %u\n", clockdesc, diff);
} }

4
dlls/quartz/videorenderer.c
View File

@ -343,7 +343,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
{ {
VideoRendererImpl *This = iface; VideoRendererImpl *This = iface;
LPBYTE pbSrcStream = NULL; LPBYTE pbSrcStream = NULL;
long cbSrcStream = 0; LONG cbSrcStream = 0;
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
HRESULT hr; HRESULT hr;
@ -395,7 +395,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
TRACE("val %p %ld\n", pbSrcStream, cbSrcStream); TRACE("val %p %d\n", pbSrcStream, cbSrcStream);
#if 0 /* For debugging purpose */ #if 0 /* For debugging purpose */
{ {