From b037f39bb8458acebeed7a199313df4b9f7e47ad Mon Sep 17 00:00:00 2001
From: "yuzhuohuang@qq.com" <yuzhuohuang@qq.com>
Date: Fri, 19 Oct 2012 18:05:46 +0800
Subject: [PATCH] Fix a lot of warning

---
 .../transform/vsfilter/DirectVobSubFilter.cpp      | 12 ++++----
 .../transform/vsfilter/DirectVobSubPropPage.cpp    |  4 +--
 src/filters/transform/vsfilter/Systray.cpp         |  2 +-
 src/filters/transform/vsfilter/plugins.cpp         |  2 +-
 .../vsfilter/vsfilter_2010/vsfilter_2010.vcxproj   | 35 ++++++++++------------
 src/subtitles/GFN.cpp                              |  2 +-
 src/subtitles/RTS.cpp                              |  9 ++++--
 src/subtitles/SSF.cpp                              |  3 +-
 src/subtitles/VobSubFile.cpp                       | 15 ++++++----
 9 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp
index 675d72a..84caa3e 100644
--- a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp
+++ b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp
@@ -144,7 +144,7 @@ CDirectVobSubFilter::~CDirectVobSubFilter()
 	if(m_hbm) {DeleteObject(m_hbm); m_hbm = 0;}
 	if(m_hdc) {DeleteObject(m_hdc); m_hdc = 0;}
 
-	for(int i = 0; i < m_pTextInput.GetCount(); i++)
+	for(size_t i = 0; i < m_pTextInput.GetCount(); i++)
 		delete m_pTextInput[i];
 
 	m_frd.EndThreadEvent.Set();
@@ -1729,7 +1729,7 @@ bool CDirectVobSubFilter::Open()
 	CAtlArray<SubFile> ret;
 	GetSubFileNames(m_FileName, paths, ret);
 
-	for(int i = 0; i < ret.GetCount(); i++)
+	for(size_t i = 0; i < ret.GetCount(); i++)
 	{
 		if(m_frd.files.Find(ret[i].fn))
 			continue;
@@ -1777,7 +1777,7 @@ bool CDirectVobSubFilter::Open()
 		}
 	}
 
-	for(int i = 0; i < m_pTextInput.GetCount(); i++)
+	for(size_t i = 0; i < m_pTextInput.GetCount(); i++)
 	{
 		if(m_pTextInput[i]->IsConnected())
         {
@@ -1961,7 +1961,7 @@ void CDirectVobSubFilter::AddSubStream(ISubStream* pSubStream)
     }
 
 	int len = m_pTextInput.GetCount();
-	for(int i = 0; i < m_pTextInput.GetCount(); i++)
+	for(size_t i = 0; i < m_pTextInput.GetCount(); i++)
 		if(m_pTextInput[i]->IsConnected()) len--;
 
 	if(len == 0)
@@ -2015,7 +2015,7 @@ void CDirectVobSubFilter::SetupFRD(CStringArray& paths, CAtlArray<HANDLE>& handl
 {
     CAutoLock cAutolock(&m_csSubLock);
 
-	for(int i = 2; i < handles.GetCount(); i++)
+	for(size_t i = 2; i < handles.GetCount(); i++)
 	{
 		FindCloseChangeNotification(handles[i]);
 	}
@@ -2142,7 +2142,7 @@ DWORD CDirectVobSubFilter::ThreadProc()
 		}
 	}
 
-	for(int i = 2; i < handles.GetCount(); i++)
+	for(size_t i = 2; i < handles.GetCount(); i++)
 	{
 		FindCloseChangeNotification(handles[i]);
 	}
diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
index e7031ac..b39e4f0 100644
--- a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
+++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
@@ -1245,7 +1245,7 @@ void CDVSColorPPage::UpdateControlData(bool fSave)
             for(int i = 0; i < m_outputColorSpaceCount; i++)
             {
                 m_outputColorSpace[i].color_space = static_cast<ColorSpaceId>(m_outputFmtList.GetItemData(i));
-                m_outputColorSpace[i].selected = static_cast<bool>(m_outputFmtList.GetCheck(i));                
+                m_outputColorSpace[i].selected = (m_outputFmtList.GetCheck(i)==TRUE);
             }
 		}
 		else ASSERT(0);
@@ -1254,7 +1254,7 @@ void CDVSColorPPage::UpdateControlData(bool fSave)
             for(int i = 0; i < m_inputColorSpaceCount; i++)
             {
                 m_inputColorSpace[i].color_space = static_cast<ColorSpaceId>(m_inputFmtList.GetItemData(i));
-                m_inputColorSpace[i].selected = static_cast<bool>(m_inputFmtList.GetCheck(i));                
+                m_inputColorSpace[i].selected = (m_inputFmtList.GetCheck(i)==TRUE);
             }
         }
         else ASSERT(0);
diff --git a/src/filters/transform/vsfilter/Systray.cpp b/src/filters/transform/vsfilter/Systray.cpp
index 542abc0..1c18584 100644
--- a/src/filters/transform/vsfilter/Systray.cpp
+++ b/src/filters/transform/vsfilter/Systray.cpp
@@ -259,7 +259,7 @@ LRESULT CSystrayWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
 			CMenu popup;
 			popup.CreatePopupMenu();
 
-			for(int j = 0; j < pStreams.GetCount(); j++)
+			for(size_t j = 0; j < pStreams.GetCount(); j++)
 			{
 				bool fMMSwitcher = !names[j].Compare(_T("Morgan Stream Switcher"));
 
diff --git a/src/filters/transform/vsfilter/plugins.cpp b/src/filters/transform/vsfilter/plugins.cpp
index 1160a86..2c99385 100644
--- a/src/filters/transform/vsfilter/plugins.cpp
+++ b/src/filters/transform/vsfilter/plugins.cpp
@@ -295,7 +295,7 @@ public:
 
 		m_hThread = 0;
 
-		for(int i = 1; i < handles.GetCount(); i++)
+		for(size_t i = 1; i < handles.GetCount(); i++)
 			FindCloseChangeNotification(handles[i]);
 
 		return 0;
diff --git a/src/filters/transform/vsfilter/vsfilter_2010/vsfilter_2010.vcxproj b/src/filters/transform/vsfilter/vsfilter_2010/vsfilter_2010.vcxproj
index 2c29727..d1a2785 100644
--- a/src/filters/transform/vsfilter/vsfilter_2010/vsfilter_2010.vcxproj
+++ b/src/filters/transform/vsfilter/vsfilter_2010/vsfilter_2010.vcxproj
@@ -4,7 +4,7 @@
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release log|Win32">
       <Configuration>Release log</Configuration>
       <Platform>Win32</Platform>
@@ -12,7 +12,7 @@
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -33,13 +33,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
-  </PropertyGroup>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -51,9 +51,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -65,7 +62,7 @@
     <IntDir>$(SolutionDir)..\..\..\..\bin\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
     <OutDir>$(SolutionDir)..\..\..\..\bin\lib\$(PlatformName)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
@@ -76,7 +73,7 @@
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -84,8 +81,8 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_AFXDLL;_DEBUG;AFX_RESOURCE_DLL;AFX_TARG_ENU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
@@ -103,7 +100,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>true</OptimizeReferences>
       <DelayLoadDLLs>oleacc.dll</DelayLoadDLLs>
       <Profile>false</Profile>
     </Link>
@@ -170,13 +167,13 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>true</OptimizeReferences>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <DelayLoadDLLs>oleacc.dll</DelayLoadDLLs>
       <Profile>false</Profile>
-    </Link>
-  </ItemDefinitionGroup>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\..\lib;$(SolutionDir)..\..\..\..\bin\lib\$(PlatformName)</AdditionalLibraryDirectories>
@@ -216,12 +213,12 @@
     <Link>
       <RegisterOutput>false</RegisterOutput>
     </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ResourceCompile Include="..\VSFilter.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+    <ClCompile Include="..\..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\..\thirdparty\mfc\afxglobals.cpp">
@@ -229,8 +226,8 @@
     </ClCompile>
     <ClCompile Include="..\..\..\..\thirdparty\mfc\winmdi.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Copy.cpp">
+    </ClCompile>
+    <ClCompile Include="..\Copy.cpp">
     </ClCompile>
     <ClCompile Include="..\csriapi.cpp" />
     <ClCompile Include="..\DirectVobSub.cpp" />
diff --git a/src/subtitles/GFN.cpp b/src/subtitles/GFN.cpp
index 5773212..bcf41d1 100644
--- a/src/subtitles/GFN.cpp
+++ b/src/subtitles/GFN.cpp
@@ -85,7 +85,7 @@ void GetSubFileNames(CString fn, CAtlArray<CString>& paths, CAtlArray<SubFile>&
 		WIN32_FIND_DATA wfd, wfd2;
 		HANDLE hFile, hFile2;
 
-		for(int k = 0; k < paths.GetCount(); k++)
+		for(size_t k = 0; k < paths.GetCount(); k++)
 		{
 			CString path = paths[k];
 			path.Replace('\\', '/');
diff --git a/src/subtitles/RTS.cpp b/src/subtitles/RTS.cpp
index aea6877..c34dc69 100644
--- a/src/subtitles/RTS.cpp
+++ b/src/subtitles/RTS.cpp
@@ -3010,12 +3010,14 @@ CSubtitle* CRenderedTextSubtitle::GetSubtitle(int entry)
         int i;
         if(str[0] == L'{' && (i = str.Find(L'}')) > 0)
         {
-            if(fParsed = ParseSSATag(sub, str.Mid(1, i-1), stss, orgstss))
+            fParsed = ParseSSATag(sub, str.Mid(1, i-1), stss, orgstss);
+            if(fParsed)
                 str = str.Mid(i+1);
         }
         else if(str[0] == L'<' && (i = str.Find(L'>')) > 0)
         {
-            if(fParsed = ParseHtmlTag(sub, str.Mid(1, i-1), stss, orgstss))
+            fParsed = ParseHtmlTag(sub, str.Mid(1, i-1), stss, orgstss);
+            if(fParsed)
                 str = str.Mid(i+1);
         }
         if(fParsed)
@@ -3638,7 +3640,8 @@ STDMETHODIMP CRenderedTextSubtitle::GetStreamInfo(int iStream, WCHAR** ppName, L
     if(iStream != 0) return E_INVALIDARG;
     if(ppName)
     {
-        if(!(*ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR))))
+        *ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR));
+        if(!(*ppName))
             return E_OUTOFMEMORY;
         wcscpy(*ppName, CStringW(m_name));
     }
diff --git a/src/subtitles/SSF.cpp b/src/subtitles/SSF.cpp
index 6926272..1e7d7e6 100644
--- a/src/subtitles/SSF.cpp
+++ b/src/subtitles/SSF.cpp
@@ -205,7 +205,8 @@ namespace ssf
 
 		if(ppName)
 		{
-			if(!(*ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR))))
+            *ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR));
+			if(!(*ppName))
 				return E_OUTOFMEMORY;
 
 			wcscpy(*ppName, CStringW(m_name));
diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp
index f238aa3..5663942 100644
--- a/src/subtitles/VobSubFile.cpp
+++ b/src/subtitles/VobSubFile.cpp
@@ -312,7 +312,7 @@ bool CVobSubFile::Open(CString fn)
 		{
 			CAtlArray<SubPos>& sp = m_langs[i].subpos;
 
-			for(int j = 0; j < sp.GetCount(); j++)
+			for(size_t j = 0; j < sp.GetCount(); j++)
 			{
 				sp[j].stop = sp[j].start;
 				sp[j].fForced = false;
@@ -1238,7 +1238,8 @@ STDMETHODIMP CVobSubFile::GetStreamInfo(int iStream, WCHAR** ppName, LCID* pLCID
 
 		if(ppName)
 		{
-			if(!(*ppName = (WCHAR*)CoTaskMemAlloc((sl.alt.GetLength()+1)*sizeof(WCHAR))))
+            *ppName = (WCHAR*)CoTaskMemAlloc((sl.alt.GetLength()+1)*sizeof(WCHAR));
+			if(!(*ppName))
 				return E_OUTOFMEMORY;
 
 			wcscpy(*ppName, CStringW(sl.alt));
@@ -1470,7 +1471,8 @@ void CVobSubSettings::GetDestrect(CRect& r, int w, int h)
 
 void CVobSubSettings::SetAlignment(bool fAlign, int x, int y, int hor, int ver)
 {
-	if(m_fAlign = fAlign)
+    m_fAlign = fAlign;
+	if(m_fAlign)
 	{
 		m_org.x = MulDiv(m_size.cx, x, 100);
 		m_org.y = MulDiv(m_size.cy, y, 100);
@@ -1547,7 +1549,7 @@ bool CVobSubFile::SaveWinSubMux(CString fn)
 		return(false);
 
 	CAtlArray<SubPos>& sp = m_langs[m_iLang].subpos;
-	for(int i = 0; i < sp.GetCount(); i++)
+	for(size_t i = 0; i < sp.GetCount(); i++)
 	{
 		if(!GetFrame(i)) continue;
 
@@ -1786,7 +1788,7 @@ bool CVobSubFile::SaveScenarist(CString fn)
 	int pc[4] = {1, 1, 1, 1}, pa[4] = {15, 15, 15, 0};
 
 	CAtlArray<SubPos>& sp = m_langs[m_iLang].subpos;
-	for(int i = 0, k = 0; i < sp.GetCount(); i++)
+	for(size_t i = 0, k = 0; i < sp.GetCount(); i++)
 	{
 		if(!GetFrame(i)) continue;
 
@@ -2348,7 +2350,8 @@ STDMETHODIMP CVobSubStream::GetStreamInfo(int i, WCHAR** ppName, LCID* pLCID)
 
 	if(ppName)
 	{
-		if(!(*ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR))))
+        *ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR));
+		if(!(*ppName))
 			return E_OUTOFMEMORY;
 		wcscpy(*ppName, CStringW(m_name));
 	}
-- 
2.11.4.GIT