alanfalloon · Koios · Mar 27, 2013 · Mar 29, 2013 · Mar 29, 2013
diff --git a/commandline.cpp b/commandline.cpp
@@ -20,6 +20,9 @@
 #include "par2cmdline.h"
 
 #ifdef _MSC_VER
+// quick fix for POSIX names
+#define stricmp _stricmp
+
 #ifdef _DEBUG
 #undef THIS_FILE
 static char THIS_FILE[]=__FILE__;

diff --git a/diskfile.cpp b/diskfile.cpp
@@ -20,6 +20,9 @@
 #include "par2cmdline.h"
 
 #ifdef _MSC_VER
+// quick fix for posix names
+#define unlink _unlink
+
 #ifdef _DEBUG
 #undef THIS_FILE
 static char THIS_FILE[]=__FILE__;
@@ -345,6 +348,13 @@ list<string>* DiskFile::FindFiles(string path, string wildcard)
   return matches;
 }
 
+bool DiskFile::FileExists(string filename)
+{
+  struct stat st;
+  return ((0 == stat(filename.c_str(), &st)) &&
+	  (st.st_mode & S_IFREG) );
+}
+
 u64 DiskFile::GetFileSize(string filename)
 {
   struct _stati64 st;
@@ -707,6 +717,39 @@ list<string>* DiskFile::FindFiles(string path, string wildcard)
 
   return matches;
 }
+
+bool DiskFile::FileExists(string filename)
+{
+  struct stat st;
+  return ((0 == stat(filename.c_str(), &st)) &&
+         (st.st_mode & (S_IFREG|S_IFBLK)) );
+}
+
+u64 DiskFile::GetFileSize(string filename)
+{
+  struct stat st;
+  if (0 == stat(filename.c_str(), &st))
+  {
+    if (st.st_mode & S_IFREG)
+    {
+      return st.st_size;
+    }
+    else if (st.st_mode & S_IFBLK)
+    {
+      FILE *fp;
+      u64 size = 0;
+      if ( NULL != (fp = fopen(filename.c_str(), "rb")) )
+      {
+	ioctl(fileno(fp), BLKGETSIZE64, &size);
+	fclose(fp);
+      }
+      return size;
+    }
+  }
+
+  return 0;
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
@@ -814,38 +857,6 @@ void DiskFile::SplitFilename(string filename, string &path, string &name)
   }
 }
 
-bool DiskFile::FileExists(string filename)
-{
-  struct stat st;
-  return ((0 == stat(filename.c_str(), &st)) &&
-	  (st.st_mode & (S_IFREG|S_IFBLK)) );
-}
-
-u64 DiskFile::GetFileSize(string filename)
-{
-  struct stat st;
-  if (0 == stat(filename.c_str(), &st))
-  {
-    if (st.st_mode & S_IFREG)
-    {
-      return st.st_size;
-    }
-    else if (st.st_mode & S_IFBLK)
-    {
-      FILE *fp;
-      u64 size = 0;
-      if ( NULL != (fp = fopen(filename.c_str(), "rb")) )
-      {
-	ioctl(fileno(fp), BLKGETSIZE64, &size);
-	fclose(fp);
-      }
-      return size;
-    }
-  }
-
-  return 0;
-}
-
 
 
 // Take a filename from a PAR2 file and replace any characters

diff --git a/par2cmdline.sln b/par2cmdline.sln
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "par2cmdline", "par2cmdline.vcproj", "{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "par2cmdline", "par2cmdline.vcxproj", "{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}"
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Debug.ActiveCfg = Debug|Win32
-		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Debug.Build.0 = Debug|Win32
-		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Release.ActiveCfg = Release|Win32
-		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Debug|Win32.Build.0 = Debug|Win32
+		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Release|Win32.ActiveCfg = Release|Win32
+		{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/par2cmdline.vcxproj b/par2cmdline.vcxproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D0A94F83-495E-4FB2-AC33-9A3EC2CC263B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="pthreads.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="pthreads.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">par2</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">par2</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PACKAGE="par2cmdline";VERSION="0.4";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>par2cmdline.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)par2.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)par2cmdline.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PACKAGE="par2cmdline";VERSION="0.4";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>par2cmdline.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)par2.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="commandline.cpp" />
+    <ClCompile Include="crc.cpp" />
+    <ClCompile Include="creatorpacket.cpp" />
+    <ClCompile Include="criticalpacket.cpp" />
+    <ClCompile Include="datablock.cpp" />
+    <ClCompile Include="descriptionpacket.cpp" />
+    <ClCompile Include="diskfile.cpp" />
+    <ClCompile Include="filechecksummer.cpp" />
+    <ClCompile Include="galois.cpp" />
+    <ClCompile Include="mainpacket.cpp" />
+    <ClCompile Include="md5.cpp" />
+    <ClCompile Include="par1fileformat.cpp" />
+    <ClCompile Include="par1repairer.cpp" />
+    <ClCompile Include="par1repairersourcefile.cpp" />
+    <ClCompile Include="par2cmdline.cpp" />
+    <ClCompile Include="par2creator.cpp" />
+    <ClCompile Include="par2creatorsourcefile.cpp" />
+    <ClCompile Include="par2fileformat.cpp" />
+    <ClCompile Include="par2repairer.cpp" />
+    <ClCompile Include="par2repairersourcefile.cpp" />
+    <ClCompile Include="recoverypacket.cpp" />
+    <ClCompile Include="reedsolomon.cpp" />
+    <ClCompile Include="verificationhashtable.cpp" />
+    <ClCompile Include="verificationpacket.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="commandline.h" />
+    <ClInclude Include="crc.h" />
+    <ClInclude Include="creatorpacket.h" />
+    <ClInclude Include="criticalpacket.h" />
+    <ClInclude Include="datablock.h" />
+    <ClInclude Include="descriptionpacket.h" />
+    <ClInclude Include="diskfile.h" />
+    <ClInclude Include="filechecksummer.h" />
+    <ClInclude Include="galois.h" />
+    <ClInclude Include="letype.h" />
+    <ClInclude Include="mainpacket.h" />
+    <ClInclude Include="md5.h" />
+    <ClInclude Include="par1fileformat.h" />
+    <ClInclude Include="par1repairer.h" />
+    <ClInclude Include="par1repairersourcefile.h" />
+    <ClInclude Include="par2cmdline.h" />
+    <ClInclude Include="par2creator.h" />
+    <ClInclude Include="par2creatorsourcefile.h" />
+    <ClInclude Include="par2fileformat.h" />
+    <ClInclude Include="par2repairer.h" />
+    <ClInclude Include="par2repairersourcefile.h" />
+    <ClInclude Include="recoverypacket.h" />
+    <ClInclude Include="reedsolomon.h" />
+    <ClInclude Include="verificationhashtable.h" />
+    <ClInclude Include="verificationpacket.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="aclocal.m4" />
+    <None Include="AUTHORS" />
+    <None Include="ChangeLog" />
+    <None Include="config.guess" />
+    <None Include="config.h.in" />
+    <None Include="config.sub" />
+    <None Include="configure" />
+    <None Include="configure.ac" />
+    <None Include="COPYING" />
+    <None Include="depcomp" />
+    <None Include="INSTALL" />
+    <None Include="install-sh" />
+    <None Include="Makefile" />
+    <None Include="Makefile.am" />
+    <None Include="Makefile.in" />
+    <None Include="missing" />
+    <None Include="mkinstalldirs" />
+    <None Include="NEWS" />
+    <None Include="PORTING" />
+    <None Include="posttest" />
+    <None Include="pretest" />
+    <None Include="README" />
+    <None Include="ROADMAP" />
+    <None Include="stamp-h.in" />
+    <None Include="test1" />
+    <None Include="test2" />
+    <None Include="test3" />
+    <None Include="test4" />
+    <None Include="test5" />
+    <None Include="test6" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/par2creator.cpp b/par2creator.cpp
@@ -19,8 +19,10 @@
 
 #include "par2cmdline.h"
 #include <sys/types.h>
+#ifndef WIN32
 #include <sys/sysctl.h>
 #include <unistd.h>
+#endif
 
 #ifdef _MSC_VER
 #ifdef _DEBUG
@@ -76,6 +78,9 @@ Par2Creator::Par2Creator(void)
 	// Some stuff for the multi-thread optimization
 	pthread_mutex_init (&progressMutex, NULL);
 	// Go and find number of CPU's in this machine
+#ifdef WIN32
+	numCPUs = pthread_num_processors_np();
+#else // !WIN32
 #ifdef CTL_HW
 	int lName [2] = { CTL_HW, HW_NCPU };
 	size_t lLen = sizeof (numCPUs);
@@ -88,7 +93,8 @@ Par2Creator::Par2Creator(void)
   numCPUs = sysconf( _SC_NPROCESSORS_ONLN );
 #else
   numCPUs = 1;
-#endif
+#endif // CTL_HW
+#endif // !WIN32
 }
 
 Par2Creator::~Par2Creator(void)