summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-08 05:48:16 +0200
committerGitHub <noreply@github.com>2020-04-08 05:48:16 +0200
commitb128beb3a93736cb14643372348c455e116ba247 (patch)
tree12b873bd6451326f3d0780570b099e5a45961a4b /src
parentMerge pull request #3621 from SilverBeamx/fullnamefix (diff)
parentcommon: Port some changes from dolphin (#5127) (diff)
downloadyuzu-b128beb3a93736cb14643372348c455e116ba247.tar
yuzu-b128beb3a93736cb14643372348c455e116ba247.tar.gz
yuzu-b128beb3a93736cb14643372348c455e116ba247.tar.bz2
yuzu-b128beb3a93736cb14643372348c455e116ba247.tar.lz
yuzu-b128beb3a93736cb14643372348c455e116ba247.tar.xz
yuzu-b128beb3a93736cb14643372348c455e116ba247.tar.zst
yuzu-b128beb3a93736cb14643372348c455e116ba247.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/file_util.cpp22
-rw-r--r--src/common/thread.cpp9
2 files changed, 16 insertions, 15 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 41167f57a..35eee0096 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <array>
+#include <limits>
#include <memory>
#include <sstream>
#include <unordered_map>
@@ -530,11 +531,11 @@ void CopyDir(const std::string& source_path, const std::string& dest_path) {
std::optional<std::string> GetCurrentDir() {
// Get the current working directory (getcwd uses malloc)
#ifdef _WIN32
- wchar_t* dir;
- if (!(dir = _wgetcwd(nullptr, 0))) {
+ wchar_t* dir = _wgetcwd(nullptr, 0);
+ if (!dir) {
#else
- char* dir;
- if (!(dir = getcwd(nullptr, 0))) {
+ char* dir = getcwd(nullptr, 0);
+ if (!dir) {
#endif
LOG_ERROR(Common_Filesystem, "GetCurrentDirectory failed: {}", GetLastErrorMsg());
return {};
@@ -918,19 +919,22 @@ void IOFile::Swap(IOFile& other) noexcept {
bool IOFile::Open(const std::string& filename, const char openmode[], int flags) {
Close();
+ bool m_good;
#ifdef _WIN32
if (flags != 0) {
m_file = _wfsopen(Common::UTF8ToUTF16W(filename).c_str(),
Common::UTF8ToUTF16W(openmode).c_str(), flags);
+ m_good = m_file != nullptr;
} else {
- _wfopen_s(&m_file, Common::UTF8ToUTF16W(filename).c_str(),
- Common::UTF8ToUTF16W(openmode).c_str());
+ m_good = _wfopen_s(&m_file, Common::UTF8ToUTF16W(filename).c_str(),
+ Common::UTF8ToUTF16W(openmode).c_str()) == 0;
}
#else
- m_file = fopen(filename.c_str(), openmode);
+ m_file = std::fopen(filename.c_str(), openmode);
+ m_good = m_file != nullptr;
#endif
- return IsOpen();
+ return m_good;
}
bool IOFile::Close() {
@@ -956,7 +960,7 @@ u64 IOFile::Tell() const {
if (IsOpen())
return ftello(m_file);
- return -1;
+ return std::numeric_limits<u64>::max();
}
bool IOFile::Flush() {
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index fe7a420cc..0cd2d10bf 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -28,11 +28,8 @@ namespace Common {
#ifdef _MSC_VER
// Sets the debugger-visible name of the current thread.
-// Uses undocumented (actually, it is now documented) trick.
-// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vsdebug/html/vxtsksettingthreadname.asp
-
-// This is implemented much nicer in upcoming msvc++, see:
-// http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx
+// Uses trick documented in:
+// https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code
void SetCurrentThreadName(const char* name) {
static const DWORD MS_VC_EXCEPTION = 0x406D1388;
@@ -47,7 +44,7 @@ void SetCurrentThreadName(const char* name) {
info.dwType = 0x1000;
info.szName = name;
- info.dwThreadID = -1; // dwThreadID;
+ info.dwThreadID = std::numeric_limits<DWORD>::max();
info.dwFlags = 0;
__try {