From d86858da64c4526ba2f95567e432466acaaaa743 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 24 Jun 2017 14:06:40 +0300 Subject: [PATCH] Fix tabs --- rpcs3/Crypto/unedat.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGem.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp | 12 +++++----- rpcs3/Emu/Cell/Modules/cellOskDialog.h | 3 +-- rpcs3/Emu/Cell/Modules/cellSail.h | 30 ++++++++++++------------- rpcs3/Emu/Cell/Modules/cellSpurs.cpp | 2 +- rpcs3/Emu/Cell/PPUModule.cpp | 2 +- rpcs3/Emu/RSX/rsx_methods.cpp | 4 ++-- rpcs3/ds4_pad_handler.cpp | 2 +- rpcs3/rpcs3qt/gs_frame.cpp | 5 ++--- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 2 +- 11 files changed, 32 insertions(+), 34 deletions(-) diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index 08e2773dc7..18d58cc76a 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -802,7 +802,7 @@ bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& inpu } } - *contentID = std::string(reinterpret_cast(NPD.content_id)); + *contentID = std::string(reinterpret_cast(NPD.content_id)); return true; } diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index e7d4c0cb22..7e78357b6d 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -165,7 +165,7 @@ s32 cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr(); - + if (!gem) return CELL_GEM_ERROR_UNINITIALIZED; diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp index fcedb2bee1..c9a0e3d24f 100644 --- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp @@ -126,8 +126,8 @@ s32 cellHttpUtilBuildRequestLine(vm::cptr req, vm::ptrmethod, 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 header, vm::ptr 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 uri, vm::ptr 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; } diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/Emu/Cell/Modules/cellOskDialog.h index 3081675bcb..eb065d3e7e 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.h +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.h @@ -157,6 +157,5 @@ struct CellOskDialogImeDictionaryInfo }; using cellOskDialogConfirmWordFilterCallback = int(vm::ptr pConfirmString, s32 wordLength); -using cellOskDialogHardwareKeyboardEventHookCallback = class b8( - vm::ptr keyMessage, vm::ptr action, vm::ptr pActionInfo); +using cellOskDialogHardwareKeyboardEventHookCallback = class b8(vm::ptr keyMessage, vm::ptr action, vm::ptr pActionInfo); using cellOskDialogForceFinishCallback = class b8(); diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/Emu/Cell/Modules/cellSail.h index 2ba84d26ae..097659b5a9 100644 --- a/rpcs3/Emu/Cell/Modules/cellSail.h +++ b/rpcs3/Emu/Cell/Modules/cellSail.h @@ -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 diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index 1df9fb8beb..6cb515683d 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -3591,7 +3591,7 @@ s32 _cellSpursSendSignal(ppu_thread& ppu, vm::ptr taskset, u32 return CELL_SPURS_TASK_ERROR_INVAL; } - be_t _0(v128::from32(0)); + be_t _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; diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index f6e9802d8d..854e5bd8b1 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -769,7 +769,7 @@ std::shared_ptr ppu_load_prx(const ppu_prx_object& elf, const std::stri case 44: //R_PPC64_REL64 { const u64 value = vm::_ref(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; } diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index 6a3bc8343f..c93d682d87 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -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) { diff --git a/rpcs3/ds4_pad_handler.cpp b/rpcs3/ds4_pad_handler.cpp index ae628bbede..32c1876def 100644 --- a/rpcs3/ds4_pad_handler.cpp +++ b/rpcs3/ds4_pad_handler.cpp @@ -478,7 +478,7 @@ std::array, MAX_GAMEPADS> ds4_thread::GetControllerData() int i = 0; semaphore_lock lock(mutex); - + for (const auto & data : padData) rtnData[i++] = data; diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 8a02e66330..7d46e736eb 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -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() diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 96cc057a4b..5da4c630bf 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -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"));