A lot of compiler L4 warnings fixed (some warnings disabled)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1982 10f7b99b-c216-0410-bff0-8a66a9350fd8

4 files changed, 18 insertions, 13 deletions

diff --git a/src/filters/reader/CDDAReader/CDDAReader.cpp b/src/filters/reader/CDDAReader/CDDAReader.cpp
index 193451274..f0c5357df 100644
--- a/src/filters/reader/CDDAReader/CDDAReader.cpp
+++ b/src/filters/reader/CDDAReader/CDDAReader.cpp
@@ -138,8 +138,9 @@ STDMETHODIMP CCDDAReader::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE* pmt)
 STDMETHODIMP CCDDAReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)

 {

 	CheckPointer(ppszFileName, E_POINTER);

-	

-	if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))

+

+	*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR));

+	if(!(*ppszFileName))

 		return E_OUTOFMEMORY;

 

 	wcscpy(*ppszFileName, m_fn);

@@ -397,6 +398,7 @@ HRESULT CCDDAStream::Read(PBYTE pbBuffer, DWORD dwBytesToRead, BOOL bAlign, LPDW
 					&rawreadinfo, sizeof(rawreadinfo),

 					buff, RAW_SECTOR_SIZE,

 					&BytesReturned, 0);

+		UNUSED_ALWAYS(b);

 

 		size_t l = (size_t)min(min(len, RAW_SECTOR_SIZE - offset), m_llLength - pos);

 		memcpy(pbBuffer, &buff[offset], l);

diff --git a/src/filters/reader/CDXAReader/CDXAReader.cpp b/src/filters/reader/CDXAReader/CDXAReader.cpp
index 9d9e5e854..e50c06d79 100644
--- a/src/filters/reader/CDXAReader/CDXAReader.cpp
+++ b/src/filters/reader/CDXAReader/CDXAReader.cpp
@@ -200,8 +200,9 @@ STDMETHODIMP CCDXAReader::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt)
 STDMETHODIMP CCDXAReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)

 {

 	if(!ppszFileName) return E_POINTER;

-	

-	if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))

+

+	*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR));

+	if(!(*ppszFileName))

 		return E_OUTOFMEMORY;

 

 	wcscpy(*ppszFileName, m_fn);

@@ -294,7 +295,7 @@ HRESULT CCDXAStream::Read(PBYTE pbBuffer, DWORD dwBytesToRead, BOOL bAlign, LPDW
 		UINT sector = m_nFirstSector + int(pos/RAW_DATA_SIZE);

 		__int64 offset = pos%RAW_DATA_SIZE;

 

-		if(m_nBufferedSector != sector)

+		if(m_nBufferedSector != (int)sector)

 		{

 			LARGE_INTEGER FilePointer;

 			FilePointer.QuadPart = RIFFCDXA_HEADER_SIZE + sector*RAW_SECTOR_SIZE;

diff --git a/src/filters/reader/UDPReader/UDPReader.cpp b/src/filters/reader/UDPReader/UDPReader.cpp
index fbeb8426e..51a20d44d 100644
--- a/src/filters/reader/UDPReader/UDPReader.cpp
+++ b/src/filters/reader/UDPReader/UDPReader.cpp
@@ -115,7 +115,8 @@ STDMETHODIMP CUDPReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)
 {

 	if(!ppszFileName) return E_POINTER;

 	

-	if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))

+	*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR));

+	if(!(*ppszFileName))

 		return E_OUTOFMEMORY;

 

 	wcscpy(*ppszFileName, m_fn);

@@ -128,7 +129,7 @@ STDMETHODIMP CUDPReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)
 CUDPStream::CUDPStream()

 {

 	m_port = 0;

-	m_socket = -1;

+	m_socket = (SOCKET)-1;

 	m_subtype = MEDIASUBTYPE_NULL;

 }

 

@@ -139,7 +140,7 @@ CUDPStream::~CUDPStream()
 

 void CUDPStream::Clear()

 {

-	if(m_socket >= 0) {closesocket(m_socket); m_socket = -1;}

+	if(m_socket >= 0) {closesocket(m_socket); m_socket =  (SOCKET)-1;}

 	if(CAMThread::ThreadExists())

 	{

 		CAMThread::CallWorker(CMD_EXIT);

@@ -332,13 +333,13 @@ DWORD CUDPStream::ThreadProc()
 		if(setsockopt(m_socket, SOL_SOCKET, SO_REUSEADDR, (const char*)&dw, sizeof(dw)) < 0)

 		{

 			closesocket(m_socket);

-			m_socket = -1;

+			m_socket =  (SOCKET)-1;

 		}

 

 		if(bind(m_socket, (struct sockaddr*)&addr, sizeof(addr)) < 0)

 		{

 			closesocket(m_socket);

-			m_socket = -1;

+			m_socket =  (SOCKET)-1;

 		}

 

 		if(IN_MULTICAST(htonl(imr.imr_multiaddr.s_addr)))

@@ -364,7 +365,7 @@ DWORD CUDPStream::ThreadProc()
 		{

 		default:

 		case CMD_EXIT: 

-			if(m_socket >= 0) {closesocket(m_socket); m_socket = -1;}

+			if(m_socket >= 0) {closesocket(m_socket); m_socket =  (SOCKET)-1;}

 			WSACleanup();

 			if(dump) fclose(dump);

 			if(log) fclose(log);

@@ -434,7 +435,7 @@ DWORD CUDPStream::ThreadProc()
 	}

 

 	ASSERT(0);

-	return -1;

+	return (SOCKET)-1;

 }

 

 CUDPStream::packet_t::packet_t(BYTE* p, __int64 start, __int64 end) 

diff --git a/src/filters/reader/VTSReader/VTSReader.cpp b/src/filters/reader/VTSReader/VTSReader.cpp
index 371dd4fbb..61f4f55bb 100644
--- a/src/filters/reader/VTSReader/VTSReader.cpp
+++ b/src/filters/reader/VTSReader/VTSReader.cpp
@@ -127,7 +127,8 @@ STDMETHODIMP CVTSReader::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)
 {

 	if(!ppszFileName) return E_POINTER;

 	

-	if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))

+	*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR));

+	if(!(*ppszFileName))

 		return E_OUTOFMEMORY;

 

 	wcscpy(*ppszFileName, m_fn);