ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building with precompiled headers 

add the unimplemented modules to the emucore project

fix a bug in the rXml wrapper that didn't consider the possiblity of functions returning null pointers
This commit is contained in:
Peter Tissen 2014-06-08 13:43:13 +02:00
parent c37905e465
commit 314307b840
5 changed files with 209 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Utilities/rPlatform.cpp
View File

@ -11,6 +11,10 @@
#include "Emu/Io/Null/NullPadHandler.h"
#include "Emu/Io/Windows/WindowsPadHandler.h"
#if defined(_WIN32)
#include "Emu/Io/XInput/XInputPadHandler.h"
#endif
rCanvas::rCanvas(void *parent)
{
@ -118,13 +122,16 @@ int rPlatform::getKeyboardHandlerCount()
KeyboardHandlerBase *rPlatform::getKeyboardHandler(int i)
{
if (i == 0)
switch (i)
{
return new NullKeyboardHandler();
}
else if (i == 1)
{
return new WindowsKeyboardHandler();
case 0:
return new NullKeyboardHandler();
break;
case 1:
return new WindowsKeyboardHandler();
break;
default:
return new NullKeyboardHandler();
}
}
@ -136,30 +143,45 @@ int rPlatform::getMouseHandlerCount()
MouseHandlerBase *rPlatform::getMouseHandler(int i)
{
if (i == 0)
switch (i)
{
case 0:
return new NullMouseHandler();
}
else if (i == 1)
{
break;
case 1:
return new WindowsMouseHandler();
break;
default:
return new NullMouseHandler();
}
}
int rPlatform::getPadHandlerCount()
{
#if defined(_WIN32)
return 3;
#else
return 2;
#endif
}
PadHandlerBase *rPlatform::getPadHandler(int i)
{
if (i == 0)
switch (i)
{
case 0:
return new NullPadHandler();
break;
case 1:
return new WindowsPadHandler();
break;
#if defined(_WIN32)
case 2:
return new XInputPadHandler();
break;
#endif
default:
return new NullPadHandler();
}
else if (i == 1)
{
return new WindowsPadHandler();
}
}

18
Utilities/rXml.cpp
View File

@ -44,13 +44,27 @@ rXmlNode::~rXmlNode()
std::shared_ptr<rXmlNode> rXmlNode::GetChildren()
{
wxXmlNode* result = reinterpret_cast<wxXmlNode*>(handle)->GetChildren();
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
if (result)
{
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
}
else
{
return std::shared_ptr<rXmlNode>(nullptr);
}
}
std::shared_ptr<rXmlNode> rXmlNode::GetNext()
{
wxXmlNode* result = reinterpret_cast<wxXmlNode*>(handle)->GetNext();
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
if (result)
{
return std::make_shared<rXmlNode>(reinterpret_cast<void*>(result));
}
else
{
return std::shared_ptr<rXmlNode>(nullptr);
}
}
std::string rXmlNode::GetName()

41
rpcs3/emucore.vcxproj
View File

@ -52,6 +52,7 @@
<ClCompile Include="Emu\Cell\MFC.cpp" />
<ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
<ClCompile Include="Emu\Cell\PPCThread.cpp" />
<ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
<ClCompile Include="Emu\Cell\PPUThread.cpp" />
<ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
<ClCompile Include="Emu\Cell\SPURecompilerCore.cpp" />
@ -120,39 +121,73 @@
<ClCompile Include="Emu\SysCalls\Modules\cellAdec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellAtrac.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellDmux.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellFont.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellFontFT.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGame.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellL10n.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellNetCtl.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPamf.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysutilAp.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysutil_SaveData.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sceNp.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sceNpTrophy.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp" />
<ClCompile Include="Emu\SysCalls\Static.cpp" />
<ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
<ClCompile Include="Emu\System.cpp" />
<ClCompile Include="L:\DEV\2014\rpcs3\rpcs3\Emu\Cell\PPUProgramCompiler.cpp" />
<ClCompile Include="Loader\ELF.cpp" />
<ClCompile Include="Loader\ELF32.cpp" />
<ClCompile Include="Loader\ELF64.cpp" />
@ -215,6 +250,7 @@
<ClInclude Include="Emu\Cell\PPUInstrTable.h" />
<ClInclude Include="Emu\Cell\PPUInterpreter.h" />
<ClInclude Include="Emu\Cell\PPUOpcodes.h" />
<ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
<ClInclude Include="Emu\Cell\PPUThread.h" />
<ClInclude Include="Emu\Cell\RawSPUThread.h" />
<ClInclude Include="Emu\Cell\SPUDecoder.h" />
@ -306,6 +342,8 @@
<ClInclude Include="Emu\SysCalls\Modules\cellVdec.h" />
<ClInclude Include="Emu\SysCalls\Modules\cellVpost.h" />
<ClInclude Include="Emu\SysCalls\Modules\libmixer.h" />
<ClInclude Include="Emu\SysCalls\Modules\libsnd3.h" />
<ClInclude Include="Emu\SysCalls\Modules\libsynth2.h" />
<ClInclude Include="Emu\SysCalls\Modules\sceNp.h" />
<ClInclude Include="Emu\SysCalls\Modules\sceNpTrophy.h" />
<ClInclude Include="Emu\SysCalls\Modules\sys_net.h" />
@ -313,7 +351,6 @@
<ClInclude Include="Emu\SysCalls\Static.h" />
<ClInclude Include="Emu\SysCalls\SysCalls.h" />
<ClInclude Include="Emu\System.h" />
<ClInclude Include="L:\DEV\2014\rpcs3\rpcs3\Emu\Cell\PPUProgramCompiler.h" />
<ClInclude Include="Loader\ELF.h" />
<ClInclude Include="Loader\ELF32.h" />
<ClInclude Include="Loader\ELF64.h" />

118
rpcs3/emucore.vcxproj.filters
View File

@ -75,6 +75,9 @@
<Filter Include="Utilities\SimpleIni">
<UniqueIdentifier>{84c34dd1-4c49-4ecf-8ee2-4165c14f24be}</UniqueIdentifier>
</Filter>
<Filter Include="Emu\Cell\currently_unused">
<UniqueIdentifier>{ead7494f-a872-4b4d-a864-1a61c3b6012f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Crypto\aes.cpp">
@ -461,9 +464,114 @@
<ClCompile Include="Emu\SysCalls\ModuleManager.cpp">
<Filter>Emu\SysCalls</Filter>
</ClCompile>
<ClCompile Include="L:\DEV\2014\rpcs3\rpcs3\Emu\Cell\PPUProgramCompiler.cpp">
<ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp">
<Filter>Emu\Cell</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellCamera.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellCelp8Enc.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellGem.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellJpgEnc.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellKey2char.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellLv2dbg.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellMic.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellMusicDecode.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellMusicExport.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellOvis.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoDecode.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoExport.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellPhotoImport.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellPngEnc.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellPrint.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellRudp.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSail.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSailRec.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellScreenshot.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSearch.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellUsbd.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\libsnd3.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
<ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp">
<Filter>Emu\Cell\currently_unused</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Crypto\aes.h">
@ -919,8 +1027,14 @@
<ClInclude Include="..\Utilities\rPlatform.h">
<Filter>Utilities</Filter>
</ClInclude>
<ClInclude Include="L:\DEV\2014\rpcs3\rpcs3\Emu\Cell\PPUProgramCompiler.h">
<ClInclude Include="Emu\Cell\PPUProgramCompiler.h">
<Filter>Emu\Cell</Filter>
</ClInclude>
<ClInclude Include="Emu\SysCalls\Modules\libsnd3.h">
<Filter>Emu\Cell\currently_unused</Filter>
</ClInclude>
<ClInclude Include="Emu\SysCalls\Modules\libsynth2.h">
<Filter>Emu\Cell\currently_unused</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
rpcs3/rpcs3.vcxproj
View File

@ -73,7 +73,7 @@
<LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<TargetName>$(ProjectName)-$(PlatformShortName)</TargetName>
</PropertyGroup>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>