Use UINT_MAX/DWORD_MAX/DWORD_ERROR when it makes sense to do so.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/filters/parser/BaseSplitter/AsyncReader.cpp b/src/filters/parser/BaseSplitter/AsyncReader.cpp
index e98f77e65..128072c8a 100644
--- a/src/filters/parser/BaseSplitter/AsyncReader.cpp
+++ b/src/filters/parser/BaseSplitter/AsyncReader.cpp
@@ -189,7 +189,7 @@ DWORD CAsyncUrlReader::ThreadProc()
     DWORD cmd = GetRequest();

     if (cmd != CMD_INIT) {

         Reply((DWORD)E_FAIL);

-        return (DWORD) - 1;

+        return DWORD_ERROR;

     }

 

     try {

diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
index 70023f223..11e53f41d 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
@@ -660,7 +660,7 @@ void CBaseSplitterOutputPin::MakeISCRHappy()
 

         if (GetCLSID(pBF) == GUIDFromCString(_T("{48025243-2D39-11CE-875D-00608CB78066}"))) { // ISCR

             CAutoPtr<Packet> p(DEBUG_NEW Packet());

-            p->TrackNumber = (DWORD) - 1;

+            p->TrackNumber = DWORD_ERROR;

             p->rtStart = -1;

             p->rtStop = 0;

             p->bSyncPoint = FALSE;

@@ -852,7 +852,7 @@ DWORD CBaseSplitterFilter::GetOutputTrackNum(CBaseSplitterOutputPin* pPin)
         }

     }

 

-    return (DWORD) - 1;

+    return DWORD_ERROR;

 }

 

 HRESULT CBaseSplitterFilter::RenameOutputPin(DWORD TrackNumSrc, DWORD TrackNumDst, const AM_MEDIA_TYPE* pmt)

@@ -972,7 +972,7 @@ DWORD CBaseSplitterFilter::ThreadProc()
     m_eEndFlush.Set();

     m_fFlushing = false;

 

-    for (DWORD cmd = (DWORD) - 1; ; cmd = GetRequest()) {

+    for (DWORD cmd = DWORD_ERROR; ; cmd = GetRequest()) {

         if (cmd == CMD_EXIT) {

             m_hThread = nullptr;

             Reply(S_OK);

@@ -986,7 +986,7 @@ DWORD CBaseSplitterFilter::ThreadProc()
 

         DemuxSeek(m_rtStart);

 

-        if (cmd != (DWORD) - 1) {

+        if (cmd != DWORD_ERROR) {

             Reply(S_OK);

         }

 

diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
index ec7f83fde..f71378840 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
@@ -48,7 +48,7 @@ CBaseSplitterFileEx::~CBaseSplitterFileEx()
 bool CBaseSplitterFileEx::NextMpegStartCode(BYTE& code, __int64 len)

 {

     BitByteAlign();

-    DWORD dw = (DWORD) - 1;

+    DWORD dw = DWORD_MAX;

     do {

         if (len-- == 0 || !GetRemaining()) {

             return false;