From d51d35a379cb3e01ade8410e87147bd71b2dbf9b Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Sun, 13 Nov 2005 13:43:20 +0000
Subject: Fixing various stuff, especially DVD reading.

---
 MSVC/CD-Tool/CD-Tool.vcproj                           | 12 +++---------
 MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj | 17 +++++++++++++++++
 MSVC/PSX-Bundle.sln                                   | 12 +++++++++++-
 cd-tool.cpp                                           |  4 +---
 lib/dvdabstract.cpp                                   |  5 ++++-
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/MSVC/CD-Tool/CD-Tool.vcproj b/MSVC/CD-Tool/CD-Tool.vcproj
index 957649f..746136f 100644
--- a/MSVC/CD-Tool/CD-Tool.vcproj
+++ b/MSVC/CD-Tool/CD-Tool.vcproj
@@ -178,16 +178,10 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+		<File
+			RelativePath="..\..\cd-tool.cpp"
 			>
-			<File
-				RelativePath="..\..\cd-tool.cpp"
-				>
-			</File>
-		</Filter>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
index 0da96a4..a4cf116 100644
--- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj	
+++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj	
@@ -4,6 +4,7 @@
 	Version="8,00"
 	Name="PSX-Bundle - library"
 	ProjectGUID="{0A2CD193-F270-4F2B-943C-F8BDF792D25C}"
+	RootNamespace="PSX-Bundle - library"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -324,6 +325,22 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Binaries classes"
+			>
+			<File
+				RelativePath="..\..\lib\binary-elf.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\lib\binary.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\includes\binary.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/MSVC/PSX-Bundle.sln b/MSVC/PSX-Bundle.sln
index 092dbc4..5d0a90d 100644
--- a/MSVC/PSX-Bundle.sln
+++ b/MSVC/PSX-Bundle.sln
@@ -13,8 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mogltk", "mogltk\mogltk.vcp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalos", "Dalos\Dalos.vcproj", "{22F8F8CD-B256-446D-9B42-09CE83F74885}"
 	ProjectSection(ProjectDependencies) = postProject
-		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A} = {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}
 		{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483} = {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}
+		{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A} = {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Baltisot - generic\Baltisot - generic.vcproj", "{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"
@@ -36,6 +36,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaPatch", "LuaPatch\LuaPat
 		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSx-Patcher", "PSx-Patcher\PSx-Patcher.vcproj", "{E9AA47EC-9370-467F-9B72-F166CB9C431D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
+		{0A2CD193-F270-4F2B-943C-F8BDF792D25C} = {0A2CD193-F270-4F2B-943C-F8BDF792D25C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -70,6 +76,10 @@ Global
 		{6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Debug|Win32.Build.0 = Debug|Win32
 		{6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Release|Win32.ActiveCfg = Release|Win32
 		{6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Release|Win32.Build.0 = Release|Win32
+		{E9AA47EC-9370-467F-9B72-F166CB9C431D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E9AA47EC-9370-467F-9B72-F166CB9C431D}.Debug|Win32.Build.0 = Debug|Win32
+		{E9AA47EC-9370-467F-9B72-F166CB9C431D}.Release|Win32.ActiveCfg = Release|Win32
+		{E9AA47EC-9370-467F-9B72-F166CB9C431D}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cd-tool.cpp b/cd-tool.cpp
index 4cd7c1d..fbebf8e 100644
--- a/cd-tool.cpp
+++ b/cd-tool.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: cd-tool.cpp,v 1.45 2005-11-02 21:34:01 pixel Exp $ */
+/* $Id: cd-tool.cpp,v 1.46 2005-11-13 13:43:21 pixel Exp $ */
 
 #define WIP
 
@@ -590,8 +590,6 @@ virtual int startup() throw (GeneralException) {
     
     if (!compile && builtin) {
 	Buffer built;
-	int i;
-
         built.write(cd_tool_lua, cd_tool_lua_size);
 	
 	try {
diff --git a/lib/dvdabstract.cpp b/lib/dvdabstract.cpp
index 55a961a..9e2370f 100644
--- a/lib/dvdabstract.cpp
+++ b/lib/dvdabstract.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: dvdabstract.cpp,v 1.2 2005-11-05 14:36:12 pixel Exp $ */
+/* $Id: dvdabstract.cpp,v 1.3 2005-11-13 13:43:22 pixel Exp $ */
 
 #include "dvdabstract.h"
 
@@ -54,6 +54,7 @@ ssize_t dvdabstract::read(void * _buf, size_t count) throw (GeneralException) {
     
     if ((start + count) < 2352) {
 	memcpy(buf, i_buf + start, count);
+        v += count;
 	return count;
     }
     
@@ -68,6 +69,7 @@ ssize_t dvdabstract::read(void * _buf, size_t count) throw (GeneralException) {
 	i_count -= 2352;
 	sector++;
 	buf += 2352;
+        v += 2352;
     }
     
     reminder = i_count;
@@ -75,6 +77,7 @@ ssize_t dvdabstract::read(void * _buf, size_t count) throw (GeneralException) {
     if (reminder >= 0) {
 	read_sector(i_buf, sector);
 	memcpy(buf, i_buf, reminder);
+        v += reminder;
     }
     
     return count;
-- 
cgit v1.2.3