From 22551a0a8ad01024a01ba70089e6ff4c7a2131e9 Mon Sep 17 00:00:00 2001
From: nitsuja- <nitsuja-@hotmail.com>
Date: Mon, 12 Apr 2010 02:00:15 +0000
Subject: [PATCH] a few minor code fixes. also added a user file that should
 simplify running from VS for newcomers

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5338 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DSPCore/Src/DSPIntCCUtil.cpp      |  2 +-
 Source/Core/DebuggerWX/Src/MemoryWindow.cpp   |  2 +-
 Source/Core/DolphinWX/DolphinWX.vcproj.user   | 50 +++++++++++++++++++
 .../Core/VideoCommon/Src/TextureDecoder.cpp   |  2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 Source/Core/DolphinWX/DolphinWX.vcproj.user

diff --git a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp
index 91581b4b29..75c72920c8 100644
--- a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp
+++ b/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp
@@ -137,7 +137,7 @@ inline bool isOverS32() {
 }
 
 inline bool isLess() {
-	return ((bool)(g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) != (bool)(g_dsp.r[DSP_REG_SR] & SR_SIGN));
+	return (!(g_dsp.r[DSP_REG_SR] & SR_OVERFLOW) != !(g_dsp.r[DSP_REG_SR] & SR_SIGN));
 }
 
 inline bool isZero() {
diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
index 38fdbba659..61e0468fe0 100644
--- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
@@ -388,7 +388,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event) {
 			sscanf(txt.mb_str(), "%08x", &addr);
 		}
 		i=addr+4;
-		for(;szRAM;i++){
+		for(;i<szRAM;i++){
 			for(k=0;k<size;k++){
 				if(i+k>szRAM) break;
 				if(k>size) break;
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj.user b/Source/Core/DolphinWX/DolphinWX.vcproj.user
new file mode 100644
index 0000000000..06d346fb6e
--- /dev/null
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj.user
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="9.00"
+	>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugFast|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\Win32"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugFast|x64"
+			>
+			<DebugSettings
+				WorkingDirectory="$(ProjectDir)..\..\..\Binary\x64"
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
index fa1998d148..bebe8776a8 100644
--- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
@@ -177,7 +177,7 @@ u64 TexDecoder_GetHash64(const u8 *src, int len, u32 samples)
 		data+=Step;
 	}
 
-	if(len & 7 > 3)
+	if((len & 7) > 3)
 	{
 		u32 k1 = *(end - 1);
 		k1 *= m;