10 files changed, 13 insertions, 13 deletions
diff --git a/src/CmdUI/CmdUI.cpp b/src/CmdUI/CmdUI.cpp
index 7373976e1..13436d9db 100644
--- a/src/CmdUI/CmdUI.cpp
+++ b/src/CmdUI/CmdUI.cpp
@@ -117,12 +117,12 @@ void CCmdUIDialog::OnInitMenuPopup(CMenu* pPopupMenu, UINT /*nIndex*/, BOOL /*bS
 
         ASSERT(state.m_pOther == nullptr);
         ASSERT(state.m_pMenu != nullptr);
-        if (state.m_nID == (UINT) - 1) {
+        if (state.m_nID == UINT(-1)) {
             // Possibly a popup menu, route to first item of that popup.
             state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);
             if (state.m_pSubMenu == nullptr ||
                     (state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||
-                    state.m_nID == (UINT) - 1) {
+                    state.m_nID == UINT(-1)) {
                 continue;       // First item of popup can't be routed to.
             }
             state.DoUpdate(this, TRUE);     // Popups are never auto disabled.
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
index 11e53f41d..111daf53e 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
@@ -442,7 +442,7 @@ bool CBaseSplitterOutputPin::IsActive()
 
 DWORD CBaseSplitterOutputPin::ThreadProc()
 {
-    SetThreadName((DWORD) - 1, "CBaseSplitterOutputPin");
+    SetThreadName(DWORD(-1), "CBaseSplitterOutputPin");
     m_hrDeliver = S_OK;
     m_fFlushing = m_fFlushed = false;
     m_eEndFlush.Set();
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
index d4941f88f..8bf7f9363 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
@@ -212,7 +212,7 @@ HRESULT CDSMSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 
 bool CDSMSplitterFilter::DemuxInit()
 {
-    SetThreadName((DWORD) - 1, "CDSMSplitterFilter");
+    SetThreadName(DWORD(-1), "CDSMSplitterFilter");
     return true;
 }
 
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
index 8ee3c1743..b86a47207 100644
--- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
@@ -1548,7 +1548,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType)
 
 DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
 {
-    SetThreadName((DWORD) - 1, "CEVRPresenter::MixerThread");
+    SetThreadName(DWORD(-1), "CEVRPresenter::MixerThread");
     CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
     pThis->GetMixerThread();
     return 0;
@@ -1556,7 +1556,7 @@ DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
 
 DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam)
 {
-    SetThreadName((DWORD) - 1, "CEVRPresenter::PresentThread");
+    SetThreadName(DWORD(-1), "CEVRPresenter::PresentThread");
     CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
     pThis->RenderThread();
     return 0;
@@ -2514,7 +2514,7 @@ void CEVRAllocatorPresenter::VSyncThread()
 
 DWORD WINAPI CEVRAllocatorPresenter::VSyncThreadStatic(LPVOID lpParam)
 {
-    SetThreadName((DWORD) - 1, "CEVRAllocatorPresenter::VSyncThread");
+    SetThreadName(DWORD(-1), "CEVRAllocatorPresenter::VSyncThread");
     CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
     pThis->VSyncThread();
     return 0;
diff --git a/src/filters/renderer/VideoRenderers/FocusThread.cpp b/src/filters/renderer/VideoRenderers/FocusThread.cpp
index e7f107751..516d42f99 100644
--- a/src/filters/renderer/VideoRenderers/FocusThread.cpp
+++ b/src/filters/renderer/VideoRenderers/FocusThread.cpp
@@ -70,7 +70,7 @@ CFocusThread::~CFocusThread()
 
 BOOL CFocusThread::InitInstance()
 {
-    SetThreadName((DWORD) - 1, "FocusThread");
+    SetThreadName(DWORD(-1), "FocusThread");
     m_hWnd = CreateWindow(_T("D3DFocusClass"), _T("D3D Focus Window"), WS_OVERLAPPED, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr);
     SetEvent(m_hEvtInit);
     if (!m_hWnd) {
diff --git a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
index 2c6dcf417..2b6d231ae 100644
--- a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
@@ -199,7 +199,7 @@ STDMETHODIMP CVMR7AllocatorPresenter::FreeSurface(DWORD_PTR dwUserID)
 
 STDMETHODIMP CVMR7AllocatorPresenter::PrepareSurface(DWORD_PTR dwUserID, IDirectDrawSurface7* lpSurface, DWORD dwSurfaceFlags)
 {
-    SetThreadName((DWORD) - 1, "CVMR7AllocatorPresenter");
+    SetThreadName(DWORD(-1), "CVMR7AllocatorPresenter");
 
     if (!lpSurface) {
         return E_POINTER;
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
index 0dba763ce..694c8f28e 100644
--- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
@@ -337,7 +337,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::StopPresenting(DWORD_PTR dwUserID)
 
 STDMETHODIMP CVMR9AllocatorPresenter::PresentImage(DWORD_PTR dwUserID, VMR9PresentationInfo* lpPresInfo)
 {
-    SetThreadName((DWORD) - 1, "CVMR9AllocatorPresenter");
+    SetThreadName(DWORD(-1), "CVMR9AllocatorPresenter");
     CheckPointer(m_pIVMRSurfAllocNotify, E_UNEXPECTED);
 
     if (m_rtTimePerFrame == 0 || m_bNeedCheckSample) {
diff --git a/src/mpc-hc/GraphThread.cpp b/src/mpc-hc/GraphThread.cpp
index 4499a4598..3e446de8a 100644
--- a/src/mpc-hc/GraphThread.cpp
+++ b/src/mpc-hc/GraphThread.cpp
@@ -27,7 +27,7 @@ IMPLEMENT_DYNCREATE(CGraphThread, CWinThread)
 
 BOOL CGraphThread::InitInstance()
 {
-    SetThreadName((DWORD) - 1, "GraphThread");
+    SetThreadName(DWORD(-1), "GraphThread");
     AfxSocketInit();
     return SUCCEEDED(CoInitialize(0)) ? TRUE : FALSE;
 }
diff --git a/src/mpc-hc/Playlist.cpp b/src/mpc-hc/Playlist.cpp
index 558c757a8..aa5d95e9a 100644
--- a/src/mpc-hc/Playlist.cpp
+++ b/src/mpc-hc/Playlist.cpp
@@ -28,7 +28,7 @@
 // CPlaylistItem
 //
 
-UINT CPlaylistItem::m_globalid  = 0;
+UINT CPlaylistItem::m_globalid = 0;
 
 CPlaylistItem::CPlaylistItem()
     : m_type(file)
diff --git a/src/mpc-hc/SaveDlg.cpp b/src/mpc-hc/SaveDlg.cpp
index a5215aa88..fa6b81c9d 100644
--- a/src/mpc-hc/SaveDlg.cpp
+++ b/src/mpc-hc/SaveDlg.cpp
@@ -65,7 +65,7 @@ BOOL CSaveDlg::OnInitDialog()
 
     // We can't use m_anim.Open(IDR_AVI_FILECOPY) since we want to load the AVI from the main executable
     m_anim.SendMessage(ACM_OPEN, (WPARAM)AfxGetInstanceHandle(), (LPARAM)IDR_AVI_FILECOPY);
-    m_anim.Play(0, (UINT) - 1, (UINT) - 1);
+    m_anim.Play(0, UINT(-1), UINT(-1));
 
     CString str, in = m_in, out = m_out;
     if (in.GetLength() > 60) {