Emulation/Cxbx-Reloaded
1
0
Fork 0
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git synced 2024-05-31 19:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos, remove whitespace

Browse source 
Convert tabs to spaces.
Make links https where applicable.
This commit is contained in:
Margen67 2020-12-19 10:33:14 -08:00
parent 357948a457
commit 456fd3e30a
10 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CONTRIBUTORS
View file

@ -7,7 +7,7 @@ Cxbx was initiated by Caustik. Dxbx was initiated by shadowtj.
The following contributors are grouped per project and listed in alphabetical order, The following contributors are grouped per project and listed in alphabetical order,
based on sources like https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/graphs/contributors , based on sources like https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/graphs/contributors ,
http://www.caustik.com/cxbx/about.htm , http://emulation.gametechwiki.com/index.php/Cxbx , http://www.caustik.com/cxbx/about.htm , https://emulation.gametechwiki.com/index.php/Cxbx ,
and https://github.com/PatrickvL/Dxbx/graphs/contributors . and https://github.com/PatrickvL/Dxbx/graphs/contributors .
@ -34,7 +34,7 @@ Ernegien (Mike Davis)
ergo720 ergo720
faha223 (Fred Hallock) faha223 (Fred Hallock)
Fisherman166 Fisherman166
gandalfthewhite19890404 gandalfthewhite19890404
gellis713 gellis713
ggKismet ggKismet
GXTX (wutno) GXTX (wutno)
@ -46,7 +46,7 @@ JayFoxRox (Jannik Vogel)
literalmente-game literalmente-game
Luca1991 (Luca D'Amico) [Luca91] Luca1991 (Luca D'Amico) [Luca91]
LukeUsher (Luke Usher) [SoullessSentinel] LukeUsher (Luke Usher) [SoullessSentinel]
Margen67 Margen67
NZJenkins NZJenkins
PatrickvL (Patrick van Logchem) PatrickvL (Patrick van Logchem)
phire (Scott Mansell) phire (Scott Mansell)
@ -54,7 +54,7 @@ RadWolfie
revel8n revel8n
Silent (CookiePLMonster) Silent (CookiePLMonster)
StrikerX3 (Ivan Roberto de Oliveira) StrikerX3 (Ivan Roberto de Oliveira)
TotalCaesar659 TotalCaesar659
Voxel9 (Voxel) Voxel9 (Voxel)
x1nixmzeng x1nixmzeng
@ -62,7 +62,7 @@ x1nixmzeng
Cxbx-Reloaded Supporters: Cxbx-Reloaded Supporters:
Cedric Wilson Cedric Wilson
Cisco Martinez Cisco Martinez
Cody Dale Barton Cody Dale Barton
Elijah Chondropoulos Elijah Chondropoulos
Jacob Kelly Jacob Kelly
@ -73,7 +73,7 @@ Kenneth Edmonds
Kyle Lenhardt Kyle Lenhardt
Manny Calavera Manny Calavera
Mark Knasiak Mark Knasiak
Marko V. Marko V.
Matt Coady Matt Coady
Roman Guivan Roman Guivan
Taylor Stock Taylor Stock

4
src/common/AddressRanges.cpp
View file

@ -45,8 +45,8 @@ const _XboxAddressRanges XboxAddressRanges[] = {
#else #else
#define RANGE_ENTRY(START, END, SIZE, PROT, FLAGS, COMMENT) { START, SIZE, PROT, FLAGS } #define RANGE_ENTRY(START, END, SIZE, PROT, FLAGS, COMMENT) { START, SIZE, PROT, FLAGS }
#endif #endif
// See http://xboxdevwiki.net/Memory // See https://xboxdevwiki.net/Memory
// and http://xboxdevwiki.net/Boot_Process#Paging // and https://xboxdevwiki.net/Boot_Process#Paging
// Entry : Start , End , Size , Protect , RangeFlags , Comment // Entry : Start , End , Size , Protect , RangeFlags , Comment
RANGE_ENTRY(USER_ADDRESS1_BASE, USER_ADDRESS1_END, USER_ADDRESS1_SIZE, PROT_XRW, SYSTEM_ALL | MAY_FAIL, "MemLowVirtual (General Xbox type) lower 64 MiB Optional (already reserved via virtual_memory_placeholder)"), RANGE_ENTRY(USER_ADDRESS1_BASE, USER_ADDRESS1_END, USER_ADDRESS1_SIZE, PROT_XRW, SYSTEM_ALL | MAY_FAIL, "MemLowVirtual (General Xbox type) lower 64 MiB Optional (already reserved via virtual_memory_placeholder)"),
RANGE_ENTRY(USER_ADDRESS2_BASE, USER_ADDRESS2_END, USER_ADDRESS2_SIZE, PROT_XRW, SYSTEM_128MB | MAY_FAIL, "MemLowVirtual (Chihiro / DevKit) ^ + upper 64 MiB"), RANGE_ENTRY(USER_ADDRESS2_BASE, USER_ADDRESS2_END, USER_ADDRESS2_SIZE, PROT_XRW, SYSTEM_128MB | MAY_FAIL, "MemLowVirtual (Chihiro / DevKit) ^ + upper 64 MiB"),

2
src/common/input/InputWindow.cpp
View file

@ -349,7 +349,7 @@ bool InputWindow::SaveProfile(const std::string& name)
return false; return false;
} }
if (m_host_dev == std::string()) { if (m_host_dev == std::string()) {
PopupError(m_hwnd_window, "Cannot save. No input devices detected", "Cxbx-Reloaded"); PopupError(m_hwnd_window, "Cannot save. No input devices detected.", "Cxbx-Reloaded");
return false; return false;
} }
OverwriteProfile(name); OverwriteProfile(name);

2
src/core/hle/D3D8/Direct3D9/CxbxVertexShaderTemplate.hlsl
View file

@ -81,7 +81,7 @@ float x_floor(float src)
return floor(src + BIAS); return floor(src + BIAS);
} }
// http://xboxdevwiki.net/NV2A/Vertex_Shader // https://xboxdevwiki.net/NV2A/Vertex_Shader
// https://www.khronos.org/registry/OpenGL/extensions/NV/NV_vertex_program.txt // https://www.khronos.org/registry/OpenGL/extensions/NV/NV_vertex_program.txt
// https://www.khronos.org/registry/OpenGL/extensions/NV/NV_vertex_program1_1.txt // https://www.khronos.org/registry/OpenGL/extensions/NV/NV_vertex_program1_1.txt

2
src/core/kernel/exports/EmuKrnlHal.cpp
View file

@ -630,7 +630,7 @@ XBSYSAPI EXPORTNUM(49) xbox::void_xt DECLSPEC_NORETURN NTAPI xbox::HalReturnToFi
retryAttempt++; retryAttempt++;
// Terminate after 5 seconds of failure. // Terminate after 5 seconds of failure.
if (retryAttempt >= (5 * (1000 / 100))) { if (retryAttempt >= (5 * (1000 / 100))) {
PopupError(nullptr, "Could not reboot, new emulation process did not take over."); PopupError(nullptr, "Could not reboot; New emulation process did not take over.");
break; break;
} }
} }

2
src/core/kernel/init/CxbxKrnl.cpp
View file

@ -1616,7 +1616,7 @@ bool CxbxLockFilePath()
} }
if (GetLastError() == ERROR_ALREADY_EXISTS) { if (GetLastError() == ERROR_ALREADY_EXISTS) {
PopupError(nullptr, "Data path directory is currently in used.\nUse different data path directory or stop emulation from another process."); PopupError(nullptr, "Data path directory is currently in use.\nUse a different data path directory or stop emulation from another process.");
CloseHandle(hMapDataHash); CloseHandle(hMapDataHash);
return false; return false;
} }

2
src/devices/x86/EmuX86.cpp
View file

@ -918,7 +918,7 @@ void EmuX86_Opcode_CPUID(LPEXCEPTION_POINTERS e, _DInst& info)
// This CPUID emulation is based on : // This CPUID emulation is based on :
// https://github.com/docbrown/vxb/wiki/Xbox-CPUID-Information // https://github.com/docbrown/vxb/wiki/Xbox-CPUID-Information
// https://github.com/docbrown/vxb/wiki/Xbox-Hardware-Information and // https://github.com/docbrown/vxb/wiki/Xbox-Hardware-Information and
// http://www.sandpile.org/x86/cpuid.htm // https://www.sandpile.org/x86/cpuid.htm
switch (e->ContextRecord->Eax) { // simpler than EmuX86_GetRegisterValue32(e, R_EAX) switch (e->ContextRecord->Eax) { // simpler than EmuX86_GetRegisterValue32(e, R_EAX)
case 0: { // CPUID Function 0, return the maximum supported standard level and vendor ID string case 0: { // CPUID Function 0, return the maximum supported standard level and vendor ID string
// Maximum supported standard level // Maximum supported standard level

2
src/emulator/cxbxr-emu.cpp
View file

@ -130,7 +130,7 @@ DWORD WINAPI Emulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
/*! Verify our host executable, cxbxr-ldr.exe, is loaded to base address 0x00010000 */ /*! Verify our host executable, cxbxr-ldr.exe, is loaded to base address 0x00010000 */
if (!VerifyBaseAddr()) { if (!VerifyBaseAddr()) {
PopupError(nullptr, "cxbx-ldr.exe was not loaded to base address 0x00010000 (which is a requirement for Xbox emulation)"); PopupError(nullptr, "cxbx-ldr.exe was not loaded to base address 0x00010000, which is a requirement for Xbox emulation.");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

4
src/gui/WinMain.cpp
View file

@ -54,14 +54,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
// First detect if we are running on WoW64, if not, prevent Cxbx-Reloaded from starting // First detect if we are running on WoW64, if not, prevent Cxbx-Reloaded from starting
// Cxbx-Reloaded needs access to high memory, only exposed to WoW64. // Cxbx-Reloaded needs access to high memory, only exposed to WoW64.
if (!VerifyWow64()) { if (!VerifyWow64()) {
PopupError(nullptr, "Cxbx-Reloaded can only run under WoW64\nThis means either a 64-bit version of Windows or Wine with a 64-bit prefix"); PopupError(nullptr, "Cxbx-Reloaded can only run under WoW64;\nThis means either a 64-bit version of Windows, or Wine with a 64-bit prefix.");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#ifndef CXBXR_EMU #ifndef CXBXR_EMU
/*! verify Cxbx.exe is loaded to base address 0x00010000 */ /*! verify Cxbx.exe is loaded to base address 0x00010000 */
if (!VerifyBaseAddr()) { if (!VerifyBaseAddr()) {
PopupError(nullptr, "Cxbx.exe is not loaded to base address 0x00010000 (which is a requirement for Xbox emulation)"); PopupError(nullptr, "Cxbx.exe is not loaded to base address 0x00010000, which is a requirement for Xbox emulation.");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#endif #endif

2
src/gui/WndMain.cpp
View file

@ -985,7 +985,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
if (m_bIsStarted) { if (m_bIsStarted) {
// We don't allow changing the contents of the eeprom while a game is running, mostly because we lack a "pause emulation" // We don't allow changing the contents of the eeprom while a game is running, mostly because we lack a "pause emulation"
// function necessary to modify the contents safely (the game itself can modify the eeprom) // function necessary to modify the contents safely (the game itself can modify the eeprom)
PopupError(hwnd, "Cannot modify eeprom file while a title is running"); PopupError(hwnd, "Cannot modify eeprom file while a title is running.");
break; break;
} }
ShowEepromConfig(hwnd); ShowEepromConfig(hwnd);