From 982586cdc68e6d7cbf62ace4f3f5785037ea0be9 Mon Sep 17 00:00:00 2001 From: "fires.gc" Date: Tue, 15 Jul 2008 11:53:41 +0000 Subject: [PATCH] just some code cleanings git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@8 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Boot/Boot.cpp | 4 +-- Source/Core/Core/Src/CoreParameter.cpp | 2 ++ Source/Core/DebuggerWX/DebuggerWX.vcproj | 20 ++++++------ Source/Core/DolphinWX/DolphinWX.vcproj | 4 +-- .../Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj | 26 ++++++++------- .../Plugin_DSP_LLE/Src/RegSettings.cpp | 20 ++++++------ .../Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj | 20 +++++++----- .../Plugin_PadSimple/Plugin_PadSimple.vcproj | 30 ++++++++--------- .../Plugin_VideoDX9/Plugin_VideoDX9.vcproj | 32 +++++++++---------- .../Plugin_VideoOGL/Plugin_VideoOGL.vcproj | 32 +++++++++---------- 10 files changed, 100 insertions(+), 90 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 390f84d4af..b20460dfd5 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -288,7 +288,7 @@ bool CBoot::EmulatedBIOS_Wii(bool _bDebug) for (int i=0x3000; i<=0x3038; i+=4) { Memory::Write_U32(0x00000000, i); - } + } // app VolumeHandler::ReadToPtr(Memory::GetPointer(0x3180), 0, 4); @@ -296,7 +296,7 @@ bool CBoot::EmulatedBIOS_Wii(bool _bDebug) } // apploader - if (VolumeHandler::IsValid()) + if (VolumeHandler::IsValid()) { UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); m_MSR.FP = 1; diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index f56b4f8172..b14e170740 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -141,4 +141,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) m_strMemoryCardA = BaseDataPath + "/MemoryCardA.raw"; m_strMemoryCardB = BaseDataPath + "/MemoryCardB.raw"; m_strSRAM = BaseDataPath + "/SRAM.raw"; + + return true; } \ No newline at end of file diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 4afcc93c21..4bf1ba00b5 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -1,7 +1,7 @@ @@ -84,7 +84,7 @@ @@ -338,7 +338,7 @@ diff --git a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj index da0f82f5da..ecc218f54f 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj +++ b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj @@ -68,13 +68,13 @@ 0) { @@ -141,11 +141,11 @@ bool CReBarSettings::Load(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey /* { CString s; s.Format(_T("%s%i_"), szPrefix, i); - reg.QueryValue(m_pBands[i].ID, s + S_BAR_ID_VAL); - reg.QueryValue(m_pBands[i].cx, s + S_BAR_CX_VAL); + reg.QueryDWORDValue(s + S_BAR_ID_VAL, m_pBands[i].ID); + reg.QueryDWORDValue(s + S_BAR_CX_VAL, m_pBands[i].cx); DWORD dw; - reg.QueryValue(dw, s + S_BAR_BREAKLINE_VAL); + reg.QueryDWORDValue(s + S_BAR_BREAKLINE_VAL, dw); m_pBands[i].BreakLine = dw != 0; } } @@ -161,17 +161,17 @@ bool CReBarSettings::Save(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey /* if (err == ERROR_SUCCESS) { - reg.SetValue(m_cbBandCount, CString(szPrefix) + S_BAR_BANDCOUNT); + reg.SetDWORDValue(CString(szPrefix) + S_BAR_BANDCOUNT, m_cbBandCount); for (DWORD i = 0; i < m_cbBandCount; i++) { CString s; s.Format(_T("%s%i_"), szPrefix, i); - reg.SetValue(m_pBands[i].ID, s + S_BAR_ID_VAL); - reg.SetValue(m_pBands[i].cx, s + S_BAR_CX_VAL); + reg.SetDWORDValue(s + S_BAR_ID_VAL, m_pBands[i].ID); + reg.SetDWORDValue(s + S_BAR_CX_VAL, m_pBands[i].cx); DWORD dw = m_pBands[i].BreakLine; - reg.SetValue(dw, s + S_BAR_BREAKLINE_VAL); + reg.SetDWORDValue(s + S_BAR_BREAKLINE_VAL, dw); } } @@ -249,7 +249,7 @@ bool CSplitterSettings::Load(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey if (err == ERROR_SUCCESS) { - reg.QueryValue(m_dwPos, CString(szPrefix) + S_SPLITTER_POS); + reg.QueryDWORDValue(CString(szPrefix) + S_SPLITTER_POS, m_dwPos); } return(err == ERROR_SUCCESS); @@ -263,7 +263,7 @@ bool CSplitterSettings::Save(LPCTSTR szRegKey, LPCTSTR szPrefix, HKEY hkRootKey if (err == ERROR_SUCCESS) { - reg.SetValue(m_dwPos, CString(szPrefix) + S_SPLITTER_POS); + reg.SetDWORDValue(CString(szPrefix) + S_SPLITTER_POS, m_dwPos); } return(err == ERROR_SUCCESS); diff --git a/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj b/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj index 5975945140..958c1ec445 100644 --- a/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj +++ b/Source/Plugins/Plugin_DSP_NULL/Plugin_DSP_NULL.vcproj @@ -72,9 +72,9 @@ LinkIncremental="2" GenerateManifest="false" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="2" - ImportLibrary="$(OutDir)/DSP_HLE.lib" + ImportLibrary="$(TargetDir)$(TargetName).lib" TargetMachine="1" /> @@ -304,8 +304,8 @@ AdditionalLibraryDirectories="Src\Windows\GL;Src\Windows\libjpeg;..\..\..\Externals\Cg" GenerateManifest="false" GenerateDebugInformation="true" - ProgramDatabaseFile=".\Debug/VideoOGL.pdb" - ImportLibrary=".\Debug/VideoOGL.lib" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + ImportLibrary="$(TargetDir)$(TargetName).lib" TargetMachine="1" />