mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-20 15:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tabs

Browse Source
This commit is contained in:
Nekotekina 2017-06-24 14:06:40 +03:00
parent fcefbf26c6
commit d86858da64
11 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Crypto/unedat.cpp
View File

@ -802,7 +802,7 @@ bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& inpu
}
}
*contentID = std::string(reinterpret_cast<const char*>(NPD.content_id));
*contentID = std::string(reinterpret_cast<const char*>(NPD.content_id));
return true;
}

2
rpcs3/Emu/Cell/Modules/cellGem.cpp
View File

@ -165,7 +165,7 @@ s32 cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<CellGemSt
{
cellGem.todo("cellGemGetState(gem_num=%d, flag=0x%x, time=0x%llx, gem_state=*0x%x)", gem_num, flag, time_parameter, gem_state);
const auto gem = fxm::get<gem_t>();
if (!gem)
return CELL_GEM_ERROR_UNINITIALIZED;

12
rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp
View File

@ -126,8 +126,8 @@ s32 cellHttpUtilBuildRequestLine(vm::cptr<CellHttpRequestLine> req, vm::ptr<char
// TODO
const std::string& result = fmt::format("%s %s %s/%d.%d\r\n", req->method, req->path, req->protocol, req->majorVersion, req->minorVersion);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
const std::string& result = fmt::format("%s %s %s/%d.%d\r\n", req->method, req->path, req->protocol, req->majorVersion, req->minorVersion);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
return CELL_OK;
}
@ -142,8 +142,8 @@ s32 cellHttpUtilBuildHeader(vm::cptr<CellHttpHeader> header, vm::ptr<char> buf,
// TODO
const std::string& result = fmt::format("%s: %s\r\n", header->name, header->value);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
const std::string& result = fmt::format("%s: %s\r\n", header->name, header->value);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
return CELL_OK;
}
@ -154,8 +154,8 @@ s32 cellHttpUtilBuildUri(vm::cptr<CellHttpUri> uri, vm::ptr<char> buf, u32 len,
// TODO
const std::string& result = fmt::format("%s://%s:%s@%s:%d/%s", uri->scheme, uri->username, uri->password, uri->hostname, uri->port, uri->path);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
const std::string& result = fmt::format("%s://%s:%s@%s:%d/%s", uri->scheme, uri->username, uri->password, uri->hostname, uri->port, uri->path);
std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
return CELL_OK;
}

3
rpcs3/Emu/Cell/Modules/cellOskDialog.h
View File

@ -157,6 +157,5 @@ struct CellOskDialogImeDictionaryInfo
};
using cellOskDialogConfirmWordFilterCallback = int(vm::ptr<u16> pConfirmString, s32 wordLength);
using cellOskDialogHardwareKeyboardEventHookCallback = class b8(
vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo);
using cellOskDialogHardwareKeyboardEventHookCallback = class b8(vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo);
using cellOskDialogForceFinishCallback = class b8();

30
rpcs3/Emu/Cell/Modules/cellSail.h
View File

@ -428,16 +428,16 @@ enum
// Framerates
enum
{
CELL_SAIL_VIDEO_FRAME_RATE_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_FRAME_RATE_24000_1001HZ = 0,
CELL_SAIL_VIDEO_FRAME_RATE_24HZ = 1,
CELL_SAIL_VIDEO_FRAME_RATE_25HZ = 2,
CELL_SAIL_VIDEO_FRAME_RATE_30000_1001HZ = 3,
CELL_SAIL_VIDEO_FRAME_RATE_30HZ = 4,
CELL_SAIL_VIDEO_FRAME_RATE_50HZ = 5,
CELL_SAIL_VIDEO_FRAME_RATE_60000_1001HZ = 6,
CELL_SAIL_VIDEO_FRAME_RATE_60HZ = 7,
_CELL_SAIL_VIDEO_FRAME_RATE_TYPE_NUM_OF_ELEMENTS = 8,
CELL_SAIL_VIDEO_FRAME_RATE_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_FRAME_RATE_24000_1001HZ = 0,
CELL_SAIL_VIDEO_FRAME_RATE_24HZ = 1,
CELL_SAIL_VIDEO_FRAME_RATE_25HZ = 2,
CELL_SAIL_VIDEO_FRAME_RATE_30000_1001HZ = 3,
CELL_SAIL_VIDEO_FRAME_RATE_30HZ = 4,
CELL_SAIL_VIDEO_FRAME_RATE_50HZ = 5,
CELL_SAIL_VIDEO_FRAME_RATE_60000_1001HZ = 6,
CELL_SAIL_VIDEO_FRAME_RATE_60HZ = 7,
_CELL_SAIL_VIDEO_FRAME_RATE_TYPE_NUM_OF_ELEMENTS = 8,
};
// Aspect Ratios
@ -454,11 +454,11 @@ enum
enum
{
CELL_SAIL_VIDEO_WIDTH_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_HEIGHT_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_PITCH_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_BITS_PER_COLOR_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_ALPHA_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_WIDTH_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_HEIGHT_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_PITCH_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_BITS_PER_COLOR_UNSPECIFIED = -1,
CELL_SAIL_VIDEO_ALPHA_UNSPECIFIED = -1,
};
// Color Ranges

2
rpcs3/Emu/Cell/Modules/cellSpurs.cpp
View File

@ -3591,7 +3591,7 @@ s32 _cellSpursSendSignal(ppu_thread& ppu, vm::ptr<CellSpursTaskset> taskset, u32
return CELL_SPURS_TASK_ERROR_INVAL;
}
be_t<v128> _0(v128::from32(0));
be_t<v128> _0(v128::from32(0));
bool disabled = taskset->enabled.value()._bit[taskId];
auto invalid = (taskset->ready & taskset->pending_ready) != _0 || (taskset->running & taskset->waiting) != _0 || disabled ||
((taskset->running | taskset->ready | taskset->pending_ready | taskset->waiting | taskset->signalled) & ~taskset->enabled) != _0;

2
rpcs3/Emu/Cell/PPUModule.cpp
View File

@ -769,7 +769,7 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
case 44: //R_PPC64_REL64
{
const u64 value = vm::_ref<u64>(raddr) = rdata - raddr;
LOG_TRACE(LOADER, "**** RELOCATION(44): 0x%x <- 0x%016llx (0x%llx)", raddr, value, rdata);
LOG_TRACE(LOADER, "**** RELOCATION(44): 0x%x <- 0x%016llx (0x%llx)", raddr, value, rdata);
break;
}

4
rpcs3/Emu/RSX/rsx_methods.cpp
View File

@ -434,8 +434,8 @@ namespace rsx
u16 clip_w = std::min(method_registers.blit_engine_clip_width(), out_w);
u16 clip_h = std::min(method_registers.blit_engine_clip_height(), out_h);
u16 clip_x = method_registers.blit_engine_clip_x();
u16 clip_y = method_registers.blit_engine_clip_y();
u16 clip_x = method_registers.blit_engine_clip_x();
u16 clip_y = method_registers.blit_engine_clip_y();
if (clip_w == 0)
{

2
rpcs3/ds4_pad_handler.cpp
View File

@ -478,7 +478,7 @@ std::array<std::array<u8, 64>, MAX_GAMEPADS> ds4_thread::GetControllerData()
int i = 0;
semaphore_lock lock(mutex);
for (const auto & data : padData)
rtnData[i++] = data;

5
rpcs3/rpcs3qt/gs_frame.cpp
View File

@ -112,11 +112,10 @@ void gs_frame::show()
void* gs_frame::handle() const
{
#ifdef _WIN32
return (HWND) this->winId();
return (HWND) this->winId();
#else
return (void *)this->winId();
return (void *)this->winId();
#endif
}
void* gs_frame::make_context()

2
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -145,7 +145,7 @@ pad_settings_dialog::pad_settings_dialog(QWidget *parent) : QDialog(parent)
b_shift_r2->setFixedWidth(PadButtonWidth);
b_shift_r3->setFixedWidth(PadButtonWidth);
// Action buttons
// Action buttons
QGroupBox *roundpad_buttons = new QGroupBox(tr("Buttons"));
QGroupBox *roundPadSquare = new QGroupBox(tr("Square"));
QGroupBox *roundPadCross = new QGroupBox(tr("Cross"));