mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-17 11:34:18 +01:00
Common: reformat (#4720)
* common: format AlignedMalloc.cpp * common: format AppTrait.h * common: format Assertions.h * common: format CheckedStaticBox * common: format Console * common: format Dependencies.h * common: format EmbeddedImage * common: format EventSource * common: format Exceptions * common: format FastFormatString.cpp * common: format General.h * common: format InitInterface * common: format MathUtils.h * common: format MemsetFast/MemcpyFast * common: format Mutex.cpp * common: format PageFaultSource.h * common: format Path.h * common: format PathUtils.cpp * common: format Pcsx2Types.h * common: format Perf * common: format PersistentThread.h * common: format RwMutex * common: format SafeArray * common: format ScopedAlloc.h * common: format ScopedPtrMT.h * common: format Semaphore.cpp * common: format StringHelpers * common: format ThreadTools.cpp * common: format Threading.h * common: format ThreadingDialogs * common: format ThreadingInternal.h * common: format TraceLog.h * common: format VirtualMemory.cpp * common: format pxCheckBox * common: format pxEvents.h * common: format pxForwardDefs.h * common: format pxRadioPanel * common: format pxStaticText * common: format pxStreams * common: format pxTranslate.cpp * common: format pxWindowTextWriter.cpp * common: format wxAppWithHelpers * common: format wxBaseTools.h * common: format wxGuiTools * common: format wxHelpers.cpp * common: format Darwin directory * common: format Linux directory * common: format Windows directory * common: format LnxCpuDetect.cpp * common: format WinCpuDetect.cpp * common: format bmi.cpp * common: format cpudetect.cpp * common: format cpu_detect_internal.h * common: format fpu.cpp * common: format groups.cpp * common: format instructions.h * common: format internal.h * common: format jmp.cpp * common: format legacy.cpp * common: format legacy_instructions.h * common: format legacy_internal.h * common: format movs.cpp * common: format simd.cpp * common: format tools.h * common: format x86emitter.cpp * common: format x86types.h * common: format bmi.h * common: format dwshift.h * common: format group1.h group2.h group3.h * common: format incdec.h * common: format jmpcall.h * common: format movs.h * common: format simd_arithmetic.h * common: format simd_comparisons.h * common: format simd_helpers.h * common: format simd_moremovs.h * common: format simd_shufflepack.h * common: format simd_templated_helpers.h * common: format test.h
This commit is contained in:
1 parent
f9bf87f50d
commit
13dfceff48
102 files changed
+13189
-12692
No files matched your search
+130
-124
@@ -23,22 +23,22 @@
|
||||
// --------------------------------------------------------------------------------------
|
||||
// pxStreamBase (implementations)
|
||||
// --------------------------------------------------------------------------------------
|
||||
pxStreamBase::pxStreamBase(const wxString &filename)
|
||||
: m_filename(filename)
|
||||
pxStreamBase::pxStreamBase(const wxString& filename)
|
||||
: m_filename(filename)
|
||||
{
|
||||
}
|
||||
|
||||
bool pxStreamBase::IsOk() const
|
||||
{
|
||||
wxStreamBase *woot = GetWxStreamBase();
|
||||
return woot && woot->IsOk();
|
||||
wxStreamBase* woot = GetWxStreamBase();
|
||||
return woot && woot->IsOk();
|
||||
}
|
||||
|
||||
wxFileOffset pxStreamBase::Length() const
|
||||
{
|
||||
if (!GetWxStreamBase())
|
||||
return 0;
|
||||
return GetWxStreamBase()->GetLength();
|
||||
if (!GetWxStreamBase())
|
||||
return 0;
|
||||
return GetWxStreamBase()->GetLength();
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
@@ -47,115 +47,117 @@ wxFileOffset pxStreamBase::Length() const
|
||||
// Interface for reading data from a gzip stream.
|
||||
//
|
||||
|
||||
pxInputStream::pxInputStream(const wxString &filename, std::unique_ptr<wxInputStream> &input)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_in(std::move(input))
|
||||
pxInputStream::pxInputStream(const wxString& filename, std::unique_ptr<wxInputStream>& input)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_in(std::move(input))
|
||||
{
|
||||
}
|
||||
|
||||
pxInputStream::pxInputStream(const wxString &filename, wxInputStream *input)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_in(input)
|
||||
pxInputStream::pxInputStream(const wxString& filename, wxInputStream* input)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_in(input)
|
||||
{
|
||||
}
|
||||
|
||||
wxStreamBase *pxInputStream::GetWxStreamBase() const { return m_stream_in.get(); }
|
||||
wxStreamBase* pxInputStream::GetWxStreamBase() const { return m_stream_in.get(); }
|
||||
|
||||
wxFileOffset pxInputStream::Tell() const
|
||||
{
|
||||
return m_stream_in->TellI();
|
||||
return m_stream_in->TellI();
|
||||
}
|
||||
|
||||
wxFileOffset pxInputStream::Seek(wxFileOffset ofs, wxSeekMode mode)
|
||||
{
|
||||
return m_stream_in->SeekI(ofs, mode);
|
||||
return m_stream_in->SeekI(ofs, mode);
|
||||
}
|
||||
|
||||
void pxInputStream::SetStream(const wxString &filename, std::unique_ptr<wxInputStream> &stream)
|
||||
void pxInputStream::SetStream(const wxString& filename, std::unique_ptr<wxInputStream>& stream)
|
||||
{
|
||||
m_filename = filename;
|
||||
m_stream_in = std::move(stream);
|
||||
m_filename = filename;
|
||||
m_stream_in = std::move(stream);
|
||||
}
|
||||
|
||||
void pxInputStream::SetStream(const wxString &filename, wxInputStream *stream)
|
||||
void pxInputStream::SetStream(const wxString& filename, wxInputStream* stream)
|
||||
{
|
||||
m_filename = filename;
|
||||
m_stream_in = std::unique_ptr<wxInputStream>(stream);
|
||||
m_filename = filename;
|
||||
m_stream_in = std::unique_ptr<wxInputStream>(stream);
|
||||
}
|
||||
|
||||
void pxInputStream::Read(void *dest, size_t size)
|
||||
void pxInputStream::Read(void* dest, size_t size)
|
||||
{
|
||||
m_stream_in->Read(dest, size);
|
||||
if (m_stream_in->GetLastError() == wxSTREAM_READ_ERROR) {
|
||||
int err = errno;
|
||||
if (!err)
|
||||
throw Exception::BadStream(m_filename).SetDiagMsg(L"Cannot read from file (bad file handle?)");
|
||||
m_stream_in->Read(dest, size);
|
||||
if (m_stream_in->GetLastError() == wxSTREAM_READ_ERROR)
|
||||
{
|
||||
int err = errno;
|
||||
if (!err)
|
||||
throw Exception::BadStream(m_filename).SetDiagMsg(L"Cannot read from file (bad file handle?)");
|
||||
|
||||
ScopedExcept ex(Exception::FromErrno(m_filename, err));
|
||||
ex->SetDiagMsg(L"cannot read from file: " + ex->DiagMsg());
|
||||
ex->Rethrow();
|
||||
}
|
||||
ScopedExcept ex(Exception::FromErrno(m_filename, err));
|
||||
ex->SetDiagMsg(L"cannot read from file: " + ex->DiagMsg());
|
||||
ex->Rethrow();
|
||||
}
|
||||
|
||||
// IMPORTANT! The underlying file/source Eof() stuff is not really reliable, so we
|
||||
// must always use the explicit check against the number of bytes read to determine
|
||||
// end-of-stream conditions.
|
||||
// IMPORTANT! The underlying file/source Eof() stuff is not really reliable, so we
|
||||
// must always use the explicit check against the number of bytes read to determine
|
||||
// end-of-stream conditions.
|
||||
|
||||
if ((size_t)m_stream_in->LastRead() < size)
|
||||
throw Exception::EndOfStream(m_filename);
|
||||
if ((size_t)m_stream_in->LastRead() < size)
|
||||
throw Exception::EndOfStream(m_filename);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
// pxOutputStream
|
||||
// --------------------------------------------------------------------------------------
|
||||
pxOutputStream::pxOutputStream(const wxString &filename, std::unique_ptr<wxOutputStream> &output)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_out(std::move(output))
|
||||
pxOutputStream::pxOutputStream(const wxString& filename, std::unique_ptr<wxOutputStream>& output)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_out(std::move(output))
|
||||
{
|
||||
}
|
||||
|
||||
pxOutputStream::pxOutputStream(const wxString &filename, wxOutputStream *output)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_out(output)
|
||||
pxOutputStream::pxOutputStream(const wxString& filename, wxOutputStream* output)
|
||||
: pxStreamBase(filename)
|
||||
, m_stream_out(output)
|
||||
{
|
||||
}
|
||||
|
||||
wxStreamBase *pxOutputStream::GetWxStreamBase() const { return m_stream_out.get(); }
|
||||
wxStreamBase* pxOutputStream::GetWxStreamBase() const { return m_stream_out.get(); }
|
||||
|
||||
wxFileOffset pxOutputStream::Tell() const
|
||||
{
|
||||
return m_stream_out->TellO();
|
||||
return m_stream_out->TellO();
|
||||
}
|
||||
|
||||
wxFileOffset pxOutputStream::Seek(wxFileOffset ofs, wxSeekMode mode)
|
||||
{
|
||||
return m_stream_out->SeekO(ofs, mode);
|
||||
return m_stream_out->SeekO(ofs, mode);
|
||||
}
|
||||
|
||||
void pxOutputStream::SetStream(const wxString &filename, std::unique_ptr<wxOutputStream> &stream)
|
||||
void pxOutputStream::SetStream(const wxString& filename, std::unique_ptr<wxOutputStream>& stream)
|
||||
{
|
||||
m_filename = filename;
|
||||
m_stream_out = std::move(stream);
|
||||
m_filename = filename;
|
||||
m_stream_out = std::move(stream);
|
||||
}
|
||||
|
||||
void pxOutputStream::SetStream(const wxString &filename, wxOutputStream *stream)
|
||||
void pxOutputStream::SetStream(const wxString& filename, wxOutputStream* stream)
|
||||
{
|
||||
m_filename = filename;
|
||||
m_stream_out = std::unique_ptr<wxOutputStream>(stream);
|
||||
m_filename = filename;
|
||||
m_stream_out = std::unique_ptr<wxOutputStream>(stream);
|
||||
}
|
||||
|
||||
|
||||
void pxOutputStream::Write(const void *src, size_t size)
|
||||
void pxOutputStream::Write(const void* src, size_t size)
|
||||
{
|
||||
m_stream_out->Write(src, size);
|
||||
if (m_stream_out->GetLastError() == wxSTREAM_WRITE_ERROR) {
|
||||
int err = errno;
|
||||
if (!err)
|
||||
throw Exception::BadStream(m_filename).SetDiagMsg(L"Cannot write to file/stream.");
|
||||
m_stream_out->Write(src, size);
|
||||
if (m_stream_out->GetLastError() == wxSTREAM_WRITE_ERROR)
|
||||
{
|
||||
int err = errno;
|
||||
if (!err)
|
||||
throw Exception::BadStream(m_filename).SetDiagMsg(L"Cannot write to file/stream.");
|
||||
|
||||
ScopedExcept ex(Exception::FromErrno(m_filename, err));
|
||||
ex->SetDiagMsg(L"Cannot write to file: " + ex->DiagMsg());
|
||||
ex->Rethrow();
|
||||
}
|
||||
ScopedExcept ex(Exception::FromErrno(m_filename, err));
|
||||
ex->SetDiagMsg(L"Cannot write to file: " + ex->DiagMsg());
|
||||
ex->Rethrow();
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------------------
|
||||
@@ -163,89 +165,93 @@ void pxOutputStream::Write(const void *src, size_t size)
|
||||
// --------------------------------------------------------------------------------------
|
||||
|
||||
// Returns TRUE if the source is UTF8, or FALSE if it's just ASCII crap.
|
||||
bool pxReadLine(wxInputStream &input, std::string &dest)
|
||||
bool pxReadLine(wxInputStream& input, std::string& dest)
|
||||
{
|
||||
dest.clear();
|
||||
bool isUTF8 = false;
|
||||
while (true) {
|
||||
char c;
|
||||
input.Read(&c, sizeof(c));
|
||||
if (c == 0)
|
||||
break;
|
||||
if (input.Eof())
|
||||
break;
|
||||
if (c == '\n')
|
||||
break; // eat on UNIX
|
||||
if (c == '\r') {
|
||||
input.Read(&c, sizeof(c));
|
||||
if (c == 0)
|
||||
break;
|
||||
if (input.Eof())
|
||||
break;
|
||||
if (c == '\n')
|
||||
break;
|
||||
dest.clear();
|
||||
bool isUTF8 = false;
|
||||
while (true)
|
||||
{
|
||||
char c;
|
||||
input.Read(&c, sizeof(c));
|
||||
if (c == 0)
|
||||
break;
|
||||
if (input.Eof())
|
||||
break;
|
||||
if (c == '\n')
|
||||
break; // eat on UNIX
|
||||
if (c == '\r')
|
||||
{
|
||||
input.Read(&c, sizeof(c));
|
||||
if (c == 0)
|
||||
break;
|
||||
if (input.Eof())
|
||||
break;
|
||||
if (c == '\n')
|
||||
break;
|
||||
|
||||
input.Ungetch(c);
|
||||
break;
|
||||
}
|
||||
dest += c;
|
||||
if (c & 0x80)
|
||||
isUTF8 = true;
|
||||
}
|
||||
input.Ungetch(c);
|
||||
break;
|
||||
}
|
||||
dest += c;
|
||||
if (c & 0x80)
|
||||
isUTF8 = true;
|
||||
}
|
||||
|
||||
return isUTF8;
|
||||
return isUTF8;
|
||||
}
|
||||
|
||||
void pxReadLine(wxInputStream &input, wxString &dest, std::string &intermed)
|
||||
void pxReadLine(wxInputStream& input, wxString& dest, std::string& intermed)
|
||||
{
|
||||
dest.clear();
|
||||
if (pxReadLine(input, intermed))
|
||||
dest = fromUTF8(intermed.c_str());
|
||||
else {
|
||||
// Optimized ToAscii conversion.
|
||||
// wx3.0 : NOT COMPATIBLE!! (on linux anyway)
|
||||
const char *ascii = intermed.c_str();
|
||||
while (*ascii != 0)
|
||||
dest += (wchar_t)(unsigned char)*ascii++;
|
||||
}
|
||||
dest.clear();
|
||||
if (pxReadLine(input, intermed))
|
||||
dest = fromUTF8(intermed.c_str());
|
||||
else
|
||||
{
|
||||
// Optimized ToAscii conversion.
|
||||
// wx3.0 : NOT COMPATIBLE!! (on linux anyway)
|
||||
const char* ascii = intermed.c_str();
|
||||
while (*ascii != 0)
|
||||
dest += (wchar_t)(unsigned char)*ascii++;
|
||||
}
|
||||
}
|
||||
|
||||
void pxReadLine(wxInputStream &input, wxString &dest)
|
||||
void pxReadLine(wxInputStream& input, wxString& dest)
|
||||
{
|
||||
std::string line;
|
||||
pxReadLine(input, dest, line);
|
||||
std::string line;
|
||||
pxReadLine(input, dest, line);
|
||||
}
|
||||
|
||||
wxString pxReadLine(wxInputStream &input)
|
||||
wxString pxReadLine(wxInputStream& input)
|
||||
{
|
||||
wxString result;
|
||||
pxReadLine(input, result);
|
||||
return result;
|
||||
wxString result;
|
||||
pxReadLine(input, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
void pxWriteLine(wxOutputStream &output)
|
||||
void pxWriteLine(wxOutputStream& output)
|
||||
{
|
||||
output.Write("\n", 1);
|
||||
output.Write("\n", 1);
|
||||
}
|
||||
|
||||
void pxWriteLine(wxOutputStream &output, const wxString &text)
|
||||
void pxWriteLine(wxOutputStream& output, const wxString& text)
|
||||
{
|
||||
if (!text.IsEmpty()) {
|
||||
pxToUTF8 utf8(text);
|
||||
output.Write(utf8, utf8.Length());
|
||||
}
|
||||
pxWriteLine(output);
|
||||
if (!text.IsEmpty())
|
||||
{
|
||||
pxToUTF8 utf8(text);
|
||||
output.Write(utf8, utf8.Length());
|
||||
}
|
||||
pxWriteLine(output);
|
||||
}
|
||||
|
||||
void pxWriteMultiline(wxOutputStream &output, const wxString &src)
|
||||
void pxWriteMultiline(wxOutputStream& output, const wxString& src)
|
||||
{
|
||||
if (src.IsEmpty())
|
||||
return;
|
||||
if (src.IsEmpty())
|
||||
return;
|
||||
|
||||
wxString result(src);
|
||||
result.Replace(L"\r\n", L"\n");
|
||||
result.Replace(L"\r", L"\n");
|
||||
wxString result(src);
|
||||
result.Replace(L"\r\n", L"\n");
|
||||
result.Replace(L"\r", L"\n");
|
||||
|
||||
pxToUTF8 utf8(result);
|
||||
output.Write(utf8, utf8.Length());
|
||||
pxToUTF8 utf8(result);
|
||||
output.Write(utf8, utf8.Length());
|
||||
}
|
||||
Reference in new issue
Block a user