From 786a4ad42c2b1dc31774f9a715e7881764520e0b Mon Sep 17 00:00:00 2001 From: cristian64 Date: Wed, 6 Mar 2024 22:15:00 +0000 Subject: [PATCH] TEST --- .vscode/settings.json | 61 ++++++++++++++++++- .../Windows/WindowsDolphinProcess.cpp | 29 ++++----- 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f380a6e9..a814b8ba 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,65 @@ "system_error": "cpp", "tuple": "cpp", "type_traits": "cpp", - "vector": "cpp" + "vector": "cpp", + "array": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "compare": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "list": "cpp", + "map": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "random": "cpp", + "source_location": "cpp", + "string_view": "cpp", + "utility": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "istream": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeinfo": "cpp", + "variant": "cpp", + "__config": "cpp", + "__debug": "cpp", + "__errc": "cpp", + "__hash_table": "cpp", + "__locale": "cpp", + "__mutex_base": "cpp", + "__split_buffer": "cpp", + "__threading_support": "cpp", + "__tree": "cpp", + "__verbose_abort": "cpp", + "ios": "cpp", + "queue": "cpp" } } \ No newline at end of file diff --git a/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp b/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp index 039e8c1f..4744e78b 100644 --- a/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp +++ b/Source/DolphinProcess/Windows/WindowsDolphinProcess.cpp @@ -5,22 +5,22 @@ #include "../../Common/MemoryCommon.h" #include -#ifdef UNICODE -#include -#endif +// #ifdef UNICODE +// #include +// #endif #include #include #include namespace { -#ifdef UNICODE -std::wstring utf8_to_wstring(const std::string& str) -{ - std::wstring_convert> myconv; - return myconv.from_bytes(str); -} -#endif +// #ifdef UNICODE +// std::wstring utf8_to_wstring(const std::string& str) +// { +// std::wstring_convert> myconv; +// return myconv.from_bytes(str); +// } +// #endif } // namespace namespace DolphinComm @@ -42,10 +42,11 @@ bool WindowsDolphinProcess::findPID() { #ifdef UNICODE const std::wstring exeFile{entry.szExeFile}; - const bool match{s_dolphinProcessName ? - exeFile == utf8_to_wstring(s_dolphinProcessName) : - (exeFile == L"Dolphin.exe" || exeFile == L"DolphinQt2.exe" || - exeFile == L"DolphinWx.exe")}; + // const bool match{s_dolphinProcessName ? + // exeFile == utf8_to_wstring(s_dolphinProcessName) : + // (exeFile == L"Dolphin.exe" || exeFile == L"DolphinQt2.exe" || + // exeFile == L"DolphinWx.exe")}; + const bool match{false}; #else const std::string exeFile{entry.szExeFile}; const bool match{s_dolphinProcessName ?