From: ShadowFlare <blakflare@hotmail.com>
Date: Mon, 24 Aug 2009 08:45:15 +0000 (-0600)
Subject: Add bzip2 compression and reorganize project files.
X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=commitdiff_plain;h=5ec6acabbdf7207331585eb3bbbb5b477dcc5564;p=SFmpqapi.git

Add bzip2 compression and reorganize project files.

- bzip2 and zlib are both compiled as part of the project.
- SComp files are now grouped separate from SFmpq files in the project.
---

diff --git a/.gitignore b/.gitignore
index 16a8cc1..9fd747f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *Debug/
 *Release/
 *.ncb
+*.opt
+*.plg
 *.suo
 *.user
diff --git a/SFmpqapi.cpp b/SFmpqapi.cpp
index a5b264f..3c7d4fa 100644
--- a/SFmpqapi.cpp
+++ b/SFmpqapi.cpp
@@ -106,8 +106,8 @@ MPQFILE * FirstLastFile[2] = {0,0};
 
 char StormBasePath[MAX_PATH+1];
 
-#define UNSUPPORTED_COMPRESSION   (0xFF ^ (0x40 | 0x80 | 0x01 | 0x02 | 0x08))
-#define UNSUPPORTED_DECOMPRESSION (0xFF ^ (0x40 | 0x80 | 0x01 | 0x02 | 0x08))
+#define UNSUPPORTED_COMPRESSION   (0xFF ^ (0x40 | 0x80 | 0x01 | 0x02 | 0x08 | 0x10))
+#define UNSUPPORTED_DECOMPRESSION (0xFF ^ (0x40 | 0x80 | 0x01 | 0x02 | 0x08 | 0x10))
 
 typedef BOOL (WINAPI* funcSCompCompress)(LPVOID lpvDestinationMem, LPDWORD lpdwCompressedSize, LPVOID lpvSourceMem, DWORD dwDecompressedSize, DWORD dwCompressionType, DWORD dwCompressionSubType, DWORD dwWAVQuality);
 typedef BOOL (WINAPI* funcSCompDecompress)(LPVOID lpvDestinationMem, LPDWORD lpdwDecompressedSize, LPVOID lpvSourceMem, DWORD dwCompressedSize);
diff --git a/SFmpqapi.def b/SFmpqapi.def
index 88051ec..cc448f8 100644
--- a/SFmpqapi.def
+++ b/SFmpqapi.def
@@ -109,3 +109,13 @@ EXPORTS
 	get_crc_table
 	compress2
 
+;bzip2 exports
+	BZ2_bzCompressInit
+	BZ2_bzCompress
+	BZ2_bzCompressEnd
+	BZ2_bzDecompressInit
+	BZ2_bzDecompress
+	BZ2_bzDecompressEnd
+	BZ2_bzBuffToBuffCompress
+	BZ2_bzBuffToBuffDecompress
+	BZ2_bzlibVersion
diff --git a/SFmpqapi.dsp b/SFmpqapi.dsp
index 495ad44..a2d82a7 100644
--- a/SFmpqapi.dsp
+++ b/SFmpqapi.dsp
@@ -44,7 +44,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /D "BZ_NO_STDIO" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,8 +72,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /D "BZ_NO_STDIO" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -99,7 +100,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /D "BETA" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SFMPQAPI_EXPORTS" /D "ZLIB_DLL" /D "BZ_NO_STDIO" /D "BETA" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -125,50 +127,181 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\SComp\explode.c
+SOURCE=.\SFmpqapi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\huffman.cpp
+SOURCE=.\SFmpqapi.def
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\implode.c
+SOURCE=.\SFmpqapi.odl
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\SComp.cpp
+SOURCE=.\SFmpqapi.rc
 # End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\SComp\SErr.cpp
+SOURCE=.\SFmpqapi.h
 # End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=.\SFmpqapi.cpp
+SOURCE=.\about
 # End Source File
+# End Group
+# Begin Group "SComp"
+
+# PROP Default_Filter ""
+# Begin Group "Base"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (Base)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\SFmpqapi.def
+SOURCE=..\SComp\explode.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=.\SFmpqapi.odl
+SOURCE=..\SComp\huffman.cpp
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=.\SFmpqapi.rc
+SOURCE=..\SComp\implode.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\SComp.cpp
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\SErr.cpp
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\SMem.cpp
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\wave.cpp
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp"
+
+!ENDIF 
+
 # End Source File
 # End Group
-# Begin Group "Header Files"
+# Begin Group "Header Files (Base)"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
@@ -181,48 +314,385 @@ SOURCE=..\SComp\pklib.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\SComp.h
+SOURCE=..\SComp\SComp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\SComp.h
+SOURCE=..\SComp\SErr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\SErr.h
+SOURCE=..\SComp\SMem.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\SFmpqapi.h
+SOURCE=..\SComp\wave.h
 # End Source File
+# End Group
+# End Group
+# Begin Group "bzip2"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (bzip2)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\SComp\SMem.h
+SOURCE=..\SComp\bzip2\blocksort.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\wave.h
+SOURCE=..\SComp\bzip2\bzlib.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\compress.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\zconf.h
+SOURCE=..\SComp\bzip2\crctable.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\zlib.h
+SOURCE=..\SComp\bzip2\decompress.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\huffman.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\randtable.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/bzip2"
+
+!ENDIF 
+
 # End Source File
 # End Group
-# Begin Group "Resource Files"
+# Begin Group "Header Files (bzip2)"
 
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\about
+SOURCE=..\SComp\bzip2\bzlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\bzlib_private.h
+# End Source File
+# End Group
+# End Group
+# Begin Group "zlib"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (zlib)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\SComp\zlib\adler32.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\compress.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\crc32.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\deflate.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inffast.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inflate.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inftrees.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\trees.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\uncompr.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\zutil.c
+
+!IF  "$(CFG)" == "SFmpqapi - Win32 Release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqapi - Win32 Beta release"
+
+# PROP Intermediate_Dir "Release/SComp/zlib"
+
+!ENDIF 
+
 # End Source File
 # End Group
+# Begin Group "Header Files (zlib)"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\SComp\ZLib_Static_min.lib
+SOURCE=..\SComp\zlib\zconf.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\zlib.h
+# End Source File
+# End Group
+# End Group
+# End Group
 # End Target
 # End Project
diff --git a/SFmpqapi.vcproj b/SFmpqapi.vcproj
index 04ec697..5014692 100644
--- a/SFmpqapi.vcproj
+++ b/SFmpqapi.vcproj
@@ -50,9 +50,9 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="0"
+				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL;BETA"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL;BZ_NO_STDIO;BETA"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="false"
@@ -145,9 +145,9 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="0"
+				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL;BZ_NO_STDIO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="false"
@@ -239,7 +239,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SFMPQAPI_EXPORTS;ZLIB_DLL;BZ_NO_STDIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -305,149 +305,806 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\SComp\explode.c"
+				RelativePath="SFmpqapi.h"
 				>
-				<FileConfiguration
-					Name="Beta release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath="..\SComp\huffman.cpp"
+				RelativePath="about"
 				>
-				<FileConfiguration
-					Name="Beta release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\SComp\implode.c"
+		</Filter>
+		<Filter
+			Name="SComp"
+			>
+			<Filter
+				Name="zlib"
 				>
-				<FileConfiguration
-					Name="Beta release|Win32"
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					<File
+						RelativePath="..\SComp\zlib\zconf.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zlib.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.cpp"
+					<File
+						RelativePath="..\SComp\zlib\adler32.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\compress.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\crc32.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\deflate.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inffast.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inflate.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inftrees.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\trees.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\uncompr.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zutil.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="bzip2"
 				>
-				<FileConfiguration
-					Name="Beta release|Win32"
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					<File
+						RelativePath="..\SComp\bzip2\blocksort.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\compress.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\crctable.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\decompress.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\huffman.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\randtable.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.cpp"
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib_private.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="Base"
 				>
-				<FileConfiguration
-					Name="Beta release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					<File
+						RelativePath="..\SComp\Huffman.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\pklib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
+					<File
+						RelativePath="..\SComp\explode.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\huffman.cpp"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\implode.c"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.cpp"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.cpp"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.cpp"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.cpp"
+						>
+						<FileConfiguration
+							Name="Beta release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Release/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\Debug/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
 				RelativePath="SFmpqapi.cpp"
 				>
@@ -542,117 +1199,7 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\SComp\SMem.cpp"
-				>
-				<FileConfiguration
-					Name="Beta release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.cpp"
-				>
-				<FileConfiguration
-					Name="Beta release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\SComp\Huffman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\pklib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.h"
-				>
-			</File>
-			<File
-				RelativePath="SFmpqapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SMem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\zlib.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="about"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\SComp\ZLib_Static_min.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/SFmpqlib.dsp b/SFmpqlib.dsp
index f2a9953..a642235 100644
--- a/SFmpqlib.dsp
+++ b/SFmpqlib.dsp
@@ -41,7 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "SFmpqlib___Win32_Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "SFMPQ_STATIC" /D "ZLIB_DLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "SFMPQ_STATIC" /D "ZLIB_DLL" /D "BZ_NO_STDIO" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +65,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "SFmpqlib___Win32_Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "SFMPQ_STATIC" /D "ZLIB_DLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "SFMPQ_STATIC" /D "ZLIB_DLL" /D "BZ_NO_STDIO" /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,42 +87,141 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\SFmpq_static.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SFmpqapi.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\SFmpq_static.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SFmpqapi.h
+# End Source File
+# End Group
+# Begin Group "SComp"
+
+# PROP Default_Filter ""
+# Begin Group "Base"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (Base)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
 SOURCE=..\SComp\explode.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\huffman.cpp
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\implode.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\SComp.cpp
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\SErr.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=.\SFmpq_static.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
 
-SOURCE=.\SFmpqapi.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\SMem.cpp
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\SComp\wave.cpp
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp"
+
+!ENDIF 
+
 # End Source File
 # End Group
-# Begin Group "Header Files"
+# Begin Group "Header Files (Base)"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
@@ -141,24 +242,309 @@ SOURCE=..\SComp\SErr.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\SFmpq_static.h
+SOURCE=..\SComp\SMem.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\SFmpqapi.h
+SOURCE=..\SComp\wave.h
 # End Source File
+# End Group
+# End Group
+# Begin Group "bzip2"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (bzip2)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\SComp\SMem.h
+SOURCE=..\SComp\bzip2\blocksort.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\SComp\wave.h
+SOURCE=..\SComp\bzip2\bzlib.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\compress.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\crctable.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\decompress.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\huffman.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\randtable.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/bzip2"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/bzip2"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files (bzip2)"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\bzlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\bzip2\bzlib_private.h
+# End Source File
+# End Group
+# End Group
+# Begin Group "zlib"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files (zlib)"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\SComp\zlib\adler32.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\compress.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\crc32.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\deflate.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inffast.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inflate.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\inftrees.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\trees.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\uncompr.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\SComp\zlib\zutil.c
+
+!IF  "$(CFG)" == "SFmpqlib - Win32 Release"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Release/SComp/zlib"
+
+!ELSEIF  "$(CFG)" == "SFmpqlib - Win32 Debug"
+
+# PROP Intermediate_Dir "SFmpqlib___Win32_Debug/SComp/zlib"
+
+!ENDIF 
+
 # End Source File
 # End Group
+# Begin Group "Header Files (zlib)"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\SComp\zlib\zconf.h
+# End Source File
 # Begin Source File
 
-SOURCE=..\SComp\ZLib_Static_min.lib
+SOURCE=..\SComp\zlib\zlib.h
 # End Source File
+# End Group
+# End Group
+# End Group
 # End Target
 # End Project
diff --git a/SFmpqlib.vcproj b/SFmpqlib.vcproj
index 7a575cd..b8dd17c 100644
--- a/SFmpqlib.vcproj
+++ b/SFmpqlib.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="SFmpqlib"
 	ProjectGUID="{2AB3EE05-94F1-433F-A9CF-F7E01220445D}"
+	RootNamespace="SFmpqlib"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL;BZ_NO_STDIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -117,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL;BZ_NO_STDIO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -170,106 +171,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="..\SComp\explode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\huffman.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\implode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="SFmpq_static.cpp"
 				>
@@ -310,67 +211,11 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\SComp\SMem.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\SComp\Huffman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\pklib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.h"
-				>
-			</File>
 			<File
 				RelativePath="SFmpq_static.h"
 				>
@@ -379,19 +224,587 @@
 				RelativePath="SFmpqapi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\SComp\SMem.h"
+		</Filter>
+		<Filter
+			Name="SComp"
+			>
+			<Filter
+				Name="Base"
 				>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.h"
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\Huffman.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\pklib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\explode.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\huffman.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\implode.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="bzip2"
 				>
-			</File>
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib_private.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\bzip2\blocksort.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\compress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\crctable.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\decompress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\huffman.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\randtable.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\zlib\zconf.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zlib.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\zlib\adler32.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\compress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\crc32.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\deflate.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inffast.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inflate.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inftrees.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\trees.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\uncompr.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zutil.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
-		<File
-			RelativePath="..\SComp\ZLib_Static_min.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>