Fix 64-bit compile issues.

4 files changed, 6 insertions, 8 deletions

diff --git a/OutputPin.cpp b/OutputPin.cpp
index 1534b9f..fe0251e 100644
--- a/OutputPin.cpp
+++ b/OutputPin.cpp
@@ -268,7 +268,7 @@ STDMETHODIMP CRFSOutputPin::Request (IMediaSample* pSample, DWORD_PTR dwUser)
 	if (FAILED (hr))
 		return hr;
 
-	if(!(IsAligned (llPosition) && IsAligned (lLength) && IsAligned ((INT_PTR) pBuffer)))
+	if(!(IsAligned ((INT_PTR) llPosition) && IsAligned ((INT_PTR) lLength) && IsAligned ((INT_PTR) pBuffer)))
 	{
 		DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %lu, pos = %lld, len = %lu, buf = %p",
 			m_align, llPosition, lLength, pBuffer));
@@ -526,7 +526,7 @@ STDMETHODIMP CRFSOutputPin::SyncReadAligned (IMediaSample* pSample)
 	if (FAILED (hr))
 		return hr;
 
-	if(!(IsAligned (llPosition) && IsAligned (lLength) && IsAligned ((INT_PTR) pBuffer)))
+	if(!(IsAligned ((INT_PTR) llPosition) && IsAligned ((INT_PTR) lLength) && IsAligned ((INT_PTR) pBuffer)))
 	{
 		DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %lu, pos = %lld, len = %lu, buf = %p",
 			m_align, llPosition, lLength, pBuffer));
diff --git a/OutputPin.h b/OutputPin.h
index a31b6cd..d52718d 100644
--- a/OutputPin.h
+++ b/OutputPin.h
@@ -99,9 +99,7 @@ private:
 	HRESULT ConvertSample (IMediaSample *sample, LONGLONG *pos, DWORD *length, BYTE **buffer);
 	HRESULT DoFlush (IMediaSample **ppSample, DWORD_PTR *pdwUser);
 
-	BOOL IsAligned (DWORD l) { return !(l & (m_align - 1)); }
-	BOOL IsAligned (LONGLONG l) { return IsAligned ((DWORD) l); }
-	BOOL IsAligned (INT_PTR l) { return IsAligned ((DWORD) l); }
+	BOOL IsAligned (INT_PTR l) { return !(l & (m_align - 1)); }
 };
 
 #endif // OUTPUT_PIN_H
diff --git a/RFS.cpp b/RFS.cpp
index 4d70f28..0083f28 100644
--- a/RFS.cpp
+++ b/RFS.cpp
@@ -654,7 +654,7 @@ int CRARFileSource::ScanArchive (wchar_t *archive_name, List<File> *file_list, i
 }
 
 /* static */
-int CALLBACK CRARFileSource::DlgFileList (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK CRARFileSource::DlgFileList (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	int index;
 
@@ -672,7 +672,7 @@ int CALLBACK CRARFileSource::DlgFileList (HWND hwndDlg, UINT uMsg, WPARAM wParam
 			if (file->unsupported)
 				continue;
 
-			len = strlen (file->filename) + 1;
+			len = (int) strlen (file->filename) + 1;
 			tempString = new wchar_t [len];
 			MultiByteToWideChar (CP_ACP, 0, file->filename, -1, tempString, len);
 			index = ListBox_AddString (GetDlgItem (hwndDlg, IDC_FILELIST), tempString);
diff --git a/RFS.h b/RFS.h
index 125c0e0..771610a 100644
--- a/RFS.h
+++ b/RFS.h
@@ -50,7 +50,7 @@ private:
 	~CRARFileSource ();
 
 	int ScanArchive (wchar_t *archive_name, List<File> *file_list, int *known_files_found);
-	static int CALLBACK DlgFileList (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+	static INT_PTR CALLBACK DlgFileList (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 	CRFSOutputPin m_pin;
 	CCritSec m_lock;