citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge branch 'master' into feature/savestates-2

This commit is contained in:
Hamish Milne 2020-04-16 19:03:49 +01:00
parent 3a651ac9fc 49a686faee
commit 9cd669db84
14 changed files with 130 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/citra_qt/game_list_p.h
View File

@ -89,18 +89,18 @@ static QString GetQStringLongTitleFromSMDH(const Loader::SMDH& smdh,
static QString GetRegionFromSMDH(const Loader::SMDH& smdh) { static QString GetRegionFromSMDH(const Loader::SMDH& smdh) {
using GameRegion = Loader::SMDH::GameRegion; using GameRegion = Loader::SMDH::GameRegion;
static const std::map<GameRegion, const char*> regions_map = { static const std::map<GameRegion, const char*> regions_map = {
{GameRegion::Japan, QT_TR_NOOP("Japan")}, {GameRegion::Japan, QT_TRANSLATE_NOOP("GameRegion", "Japan")},
{GameRegion::NorthAmerica, QT_TR_NOOP("North America")}, {GameRegion::NorthAmerica, QT_TRANSLATE_NOOP("GameRegion", "North America")},
{GameRegion::Europe, QT_TR_NOOP("Europe")}, {GameRegion::Europe, QT_TRANSLATE_NOOP("GameRegion", "Europe")},
{GameRegion::Australia, QT_TR_NOOP("Australia")}, {GameRegion::Australia, QT_TRANSLATE_NOOP("GameRegion", "Australia")},
{GameRegion::China, QT_TR_NOOP("China")}, {GameRegion::China, QT_TRANSLATE_NOOP("GameRegion", "China")},
{GameRegion::Korea, QT_TR_NOOP("Korea")}, {GameRegion::Korea, QT_TRANSLATE_NOOP("GameRegion", "Korea")},
{GameRegion::Taiwan, QT_TR_NOOP("Taiwan")}}; {GameRegion::Taiwan, QT_TRANSLATE_NOOP("GameRegion", "Taiwan")}};
std::vector<GameRegion> regions = smdh.GetRegions(); std::vector<GameRegion> regions = smdh.GetRegions();
if (regions.empty()) { if (regions.empty()) {
return QObject::tr("Invalid region"); return QCoreApplication::translate("GameRegion", "Invalid region");
} }
const bool region_free = const bool region_free =
@ -108,14 +108,14 @@ static QString GetRegionFromSMDH(const Loader::SMDH& smdh) {
return std::find(regions.begin(), regions.end(), it.first) != regions.end(); return std::find(regions.begin(), regions.end(), it.first) != regions.end();
}); });
if (region_free) { if (region_free) {
return QObject::tr("Region free"); return QCoreApplication::translate("GameRegion", "Region free");
} }
const QString separator = const QString separator =
UISettings::values.game_list_single_line_mode ? QStringLiteral(", ") : QStringLiteral("\n"); UISettings::values.game_list_single_line_mode ? QStringLiteral(", ") : QStringLiteral("\n");
QString result = QObject::tr(regions_map.at(regions.front())); QString result = QCoreApplication::translate("GameRegion", regions_map.at(regions.front()));
for (auto region = ++regions.begin(); region != regions.end(); ++region) { for (auto region = ++regions.begin(); region != regions.end(); ++region) {
result += separator + QObject::tr(regions_map.at(*region)); result += separator + QCoreApplication::translate("GameRegion", regions_map.at(*region));
} }
return result; return result;
} }

2
src/citra_qt/multiplayer/chat_room.cpp
View File

@ -226,7 +226,7 @@ void ChatRoom::SendModerationRequest(Network::RoomMessageTypes type, const std::
return member.nickname == nickname; return member.nickname == nickname;
}); });
if (it == members.end()) { if (it == members.end()) {
NetworkMessage::ShowError(NetworkMessage::NO_SUCH_USER); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::NO_SUCH_USER);
return; return;
} }
room->SendModerationRequest(type, nickname); room->SendModerationRequest(type, nickname);

7
src/citra_qt/multiplayer/direct_connect.cpp
View File

@ -56,7 +56,7 @@ void DirectConnectWindow::RetranslateUi() {
void DirectConnectWindow::Connect() { void DirectConnectWindow::Connect() {
if (!ui->nickname->hasAcceptableInput()) { if (!ui->nickname->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::USERNAME_NOT_VALID);
return; return;
} }
if (const auto member = Network::GetRoomMember().lock()) { if (const auto member = Network::GetRoomMember().lock()) {
@ -75,11 +75,12 @@ void DirectConnectWindow::Connect() {
break; break;
case ConnectionType::IP: case ConnectionType::IP:
if (!ui->ip->hasAcceptableInput()) { if (!ui->ip->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::IP_ADDRESS_NOT_VALID); NetworkMessage::ErrorManager::ShowError(
NetworkMessage::ErrorManager::IP_ADDRESS_NOT_VALID);
return; return;
} }
if (!ui->port->hasAcceptableInput()) { if (!ui->port->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::PORT_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::PORT_NOT_VALID);
return; return;
} }
break; break;

11
src/citra_qt/multiplayer/host_room.cpp
View File

@ -104,19 +104,19 @@ std::unique_ptr<Network::VerifyUser::Backend> HostRoomWindow::CreateVerifyBacken
void HostRoomWindow::Host() { void HostRoomWindow::Host() {
if (!ui->username->hasAcceptableInput()) { if (!ui->username->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::USERNAME_NOT_VALID);
return; return;
} }
if (!ui->room_name->hasAcceptableInput()) { if (!ui->room_name->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::ROOMNAME_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::ROOMNAME_NOT_VALID);
return; return;
} }
if (!ui->port->hasAcceptableInput()) { if (!ui->port->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::PORT_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::PORT_NOT_VALID);
return; return;
} }
if (ui->game_list->currentIndex() == -1) { if (ui->game_list->currentIndex() == -1) {
NetworkMessage::ShowError(NetworkMessage::GAME_NOT_SELECTED); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::GAME_NOT_SELECTED);
return; return;
} }
if (auto member = Network::GetRoomMember().lock()) { if (auto member = Network::GetRoomMember().lock()) {
@ -147,7 +147,8 @@ void HostRoomWindow::Host() {
Settings::values.citra_username, game_name.toStdString(), Settings::values.citra_username, game_name.toStdString(),
game_id, CreateVerifyBackend(is_public), ban_list); game_id, CreateVerifyBackend(is_public), ban_list);
if (!created) { if (!created) {
NetworkMessage::ShowError(NetworkMessage::COULD_NOT_CREATE_ROOM); NetworkMessage::ErrorManager::ShowError(
NetworkMessage::ErrorManager::COULD_NOT_CREATE_ROOM);
LOG_ERROR(Network, "Could not create room!"); LOG_ERROR(Network, "Could not create room!");
ui->host->setEnabled(true); ui->host->setEnabled(true);
return; return;

2
src/citra_qt/multiplayer/lobby.cpp
View File

@ -128,7 +128,7 @@ void Lobby::OnJoinRoom(const QModelIndex& source) {
index = source.parent(); index = source.parent();
} }
if (!ui->nickname->hasAcceptableInput()) { if (!ui->nickname->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::USERNAME_NOT_VALID);
return; return;
} }

48
src/citra_qt/multiplayer/message.cpp
View File

@ -8,46 +8,50 @@
#include "citra_qt/multiplayer/message.h" #include "citra_qt/multiplayer/message.h"
namespace NetworkMessage { namespace NetworkMessage {
const ConnectionError USERNAME_NOT_VALID( const ConnectionError ErrorManager::USERNAME_NOT_VALID(
QT_TR_NOOP("Username is not valid. Must be 4 to 20 alphanumeric characters.")); QT_TR_NOOP("Username is not valid. Must be 4 to 20 alphanumeric characters."));
const ConnectionError ROOMNAME_NOT_VALID( const ConnectionError ErrorManager::ROOMNAME_NOT_VALID(
QT_TR_NOOP("Room name is not valid. Must be 4 to 20 alphanumeric characters.")); QT_TR_NOOP("Room name is not valid. Must be 4 to 20 alphanumeric characters."));
const ConnectionError USERNAME_NOT_VALID_SERVER( const ConnectionError ErrorManager::USERNAME_NOT_VALID_SERVER(
QT_TR_NOOP("Username is already in use or not valid. Please choose another.")); QT_TR_NOOP("Username is already in use or not valid. Please choose another."));
const ConnectionError IP_ADDRESS_NOT_VALID(QT_TR_NOOP("IP is not a valid IPv4 address.")); const ConnectionError ErrorManager::IP_ADDRESS_NOT_VALID(
const ConnectionError PORT_NOT_VALID(QT_TR_NOOP("Port must be a number between 0 to 65535.")); QT_TR_NOOP("IP is not a valid IPv4 address."));
const ConnectionError GAME_NOT_SELECTED(QT_TR_NOOP( const ConnectionError ErrorManager::PORT_NOT_VALID(
QT_TR_NOOP("Port must be a number between 0 to 65535."));
const ConnectionError ErrorManager::GAME_NOT_SELECTED(QT_TR_NOOP(
"You must choose a Preferred Game to host a room. If you do not have any games in your game " "You must choose a Preferred Game to host a room. If you do not have any games in your game "
"list yet, add a game folder by clicking on the plus icon in the game list.")); "list yet, add a game folder by clicking on the plus icon in the game list."));
const ConnectionError NO_INTERNET( const ConnectionError ErrorManager::NO_INTERNET(
QT_TR_NOOP("Unable to find an internet connection. Check your internet settings.")); QT_TR_NOOP("Unable to find an internet connection. Check your internet settings."));
const ConnectionError UNABLE_TO_CONNECT( const ConnectionError ErrorManager::UNABLE_TO_CONNECT(
QT_TR_NOOP("Unable to connect to the host. Verify that the connection settings are correct. If " QT_TR_NOOP("Unable to connect to the host. Verify that the connection settings are correct. If "
"you still cannot connect, contact the room host and verify that the host is " "you still cannot connect, contact the room host and verify that the host is "
"properly configured with the external port forwarded.")); "properly configured with the external port forwarded."));
const ConnectionError ROOM_IS_FULL( const ConnectionError ErrorManager::ROOM_IS_FULL(
QT_TR_NOOP("Unable to connect to the room because it is already full.")); QT_TR_NOOP("Unable to connect to the room because it is already full."));
const ConnectionError COULD_NOT_CREATE_ROOM( const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM(
QT_TR_NOOP("Creating a room failed. Please retry. Restarting Citra might be necessary.")); QT_TR_NOOP("Creating a room failed. Please retry. Restarting Citra might be necessary."));
const ConnectionError HOST_BANNED( const ConnectionError ErrorManager::HOST_BANNED(
QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you " QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you "
"or try a different room.")); "or try a different room."));
const ConnectionError WRONG_VERSION( const ConnectionError ErrorManager::WRONG_VERSION(
QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem " QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem "
"persists, contact the room host and ask them to update the server.")); "persists, contact the room host and ask them to update the server."));
const ConnectionError WRONG_PASSWORD(QT_TR_NOOP("Incorrect password.")); const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password."));
const ConnectionError GENERIC_ERROR( const ConnectionError ErrorManager::GENERIC_ERROR(
QT_TR_NOOP("An unknown error occured. If this error continues to occur, please open an issue")); QT_TR_NOOP("An unknown error occured. If this error continues to occur, please open an issue"));
const ConnectionError LOST_CONNECTION(QT_TR_NOOP("Connection to room lost. Try to reconnect.")); const ConnectionError ErrorManager::LOST_CONNECTION(
const ConnectionError HOST_KICKED(QT_TR_NOOP("You have been kicked by the room host.")); QT_TR_NOOP("Connection to room lost. Try to reconnect."));
const ConnectionError MAC_COLLISION( const ConnectionError ErrorManager::HOST_KICKED(
QT_TR_NOOP("You have been kicked by the room host."));
const ConnectionError ErrorManager::MAC_COLLISION(
QT_TR_NOOP("MAC address is already in use. Please choose another.")); QT_TR_NOOP("MAC address is already in use. Please choose another."));
const ConnectionError CONSOLE_ID_COLLISION(QT_TR_NOOP( const ConnectionError ErrorManager::CONSOLE_ID_COLLISION(QT_TR_NOOP(
"Your Console ID conflicted with someone else's in the room.\n\nPlease go to Emulation " "Your Console ID conflicted with someone else's in the room.\n\nPlease go to Emulation "
"> Configure > System to regenerate your Console ID.")); "> Configure > System to regenerate your Console ID."));
const ConnectionError PERMISSION_DENIED( const ConnectionError ErrorManager::PERMISSION_DENIED(
QT_TR_NOOP("You do not have enough permission to perform this action.")); QT_TR_NOOP("You do not have enough permission to perform this action."));
const ConnectionError NO_SUCH_USER(QT_TR_NOOP( const ConnectionError ErrorManager::NO_SUCH_USER(QT_TR_NOOP(
"The user you are trying to kick/ban could not be found.\nThey may have left the room.")); "The user you are trying to kick/ban could not be found.\nThey may have left the room."));
static bool WarnMessage(const std::string& title, const std::string& text) { static bool WarnMessage(const std::string& title, const std::string& text) {
@ -56,8 +60,8 @@ static bool WarnMessage(const std::string& title, const std::string& text) {
QMessageBox::Ok | QMessageBox::Cancel); QMessageBox::Ok | QMessageBox::Cancel);
} }
void ShowError(const ConnectionError& e) { void ErrorManager::ShowError(const ConnectionError& e) {
QMessageBox::critical(nullptr, QObject::tr("Error"), QObject::tr(e.GetString().c_str())); QMessageBox::critical(nullptr, tr("Error"), tr(e.GetString().c_str()));
} }
bool WarnCloseRoom() { bool WarnCloseRoom() {

58
src/citra_qt/multiplayer/message.h
View File

@ -20,34 +20,36 @@ private:
std::string err; std::string err;
}; };
/// When the nickname is considered invalid by the client class ErrorManager : QObject {
extern const ConnectionError USERNAME_NOT_VALID; Q_OBJECT
extern const ConnectionError ROOMNAME_NOT_VALID; public:
/// When the nickname is considered invalid by the room server /// When the nickname is considered invalid by the client
extern const ConnectionError USERNAME_NOT_VALID_SERVER; static const ConnectionError USERNAME_NOT_VALID;
extern const ConnectionError IP_ADDRESS_NOT_VALID; static const ConnectionError ROOMNAME_NOT_VALID;
extern const ConnectionError PORT_NOT_VALID; /// When the nickname is considered invalid by the room server
extern const ConnectionError GAME_NOT_SELECTED; static const ConnectionError USERNAME_NOT_VALID_SERVER;
extern const ConnectionError NO_INTERNET; static const ConnectionError IP_ADDRESS_NOT_VALID;
extern const ConnectionError UNABLE_TO_CONNECT; static const ConnectionError PORT_NOT_VALID;
extern const ConnectionError ROOM_IS_FULL; static const ConnectionError GAME_NOT_SELECTED;
extern const ConnectionError COULD_NOT_CREATE_ROOM; static const ConnectionError NO_INTERNET;
extern const ConnectionError HOST_BANNED; static const ConnectionError UNABLE_TO_CONNECT;
extern const ConnectionError WRONG_VERSION; static const ConnectionError ROOM_IS_FULL;
extern const ConnectionError WRONG_PASSWORD; static const ConnectionError COULD_NOT_CREATE_ROOM;
extern const ConnectionError GENERIC_ERROR; static const ConnectionError HOST_BANNED;
extern const ConnectionError LOST_CONNECTION; static const ConnectionError WRONG_VERSION;
extern const ConnectionError HOST_KICKED; static const ConnectionError WRONG_PASSWORD;
extern const ConnectionError MAC_COLLISION; static const ConnectionError GENERIC_ERROR;
extern const ConnectionError CONSOLE_ID_COLLISION; static const ConnectionError LOST_CONNECTION;
extern const ConnectionError PERMISSION_DENIED; static const ConnectionError HOST_KICKED;
extern const ConnectionError NO_SUCH_USER; static const ConnectionError MAC_COLLISION;
static const ConnectionError CONSOLE_ID_COLLISION;
/** static const ConnectionError PERMISSION_DENIED;
* Shows a standard QMessageBox with a error message static const ConnectionError NO_SUCH_USER;
*/ /**
void ShowError(const ConnectionError& e); * Shows a standard QMessageBox with a error message
*/
static void ShowError(const ConnectionError& e);
};
/** /**
* Show a standard QMessageBox with a warning message about leaving the room * Show a standard QMessageBox with a warning message about leaving the room
* return true if the user wants to close the network connection * return true if the user wants to close the network connection

27
src/citra_qt/multiplayer/state.cpp
View File

@ -131,43 +131,44 @@ void MultiplayerState::OnNetworkError(const Network::RoomMember::Error& error) {
LOG_DEBUG(Frontend, "Network Error: {}", Network::GetErrorStr(error)); LOG_DEBUG(Frontend, "Network Error: {}", Network::GetErrorStr(error));
switch (error) { switch (error) {
case Network::RoomMember::Error::LostConnection: case Network::RoomMember::Error::LostConnection:
NetworkMessage::ShowError(NetworkMessage::LOST_CONNECTION); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::LOST_CONNECTION);
break; break;
case Network::RoomMember::Error::HostKicked: case Network::RoomMember::Error::HostKicked:
NetworkMessage::ShowError(NetworkMessage::HOST_KICKED); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::HOST_KICKED);
break; break;
case Network::RoomMember::Error::CouldNotConnect: case Network::RoomMember::Error::CouldNotConnect:
NetworkMessage::ShowError(NetworkMessage::UNABLE_TO_CONNECT); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::UNABLE_TO_CONNECT);
break; break;
case Network::RoomMember::Error::NameCollision: case Network::RoomMember::Error::NameCollision:
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID_SERVER); NetworkMessage::ErrorManager::ShowError(
NetworkMessage::ErrorManager::USERNAME_NOT_VALID_SERVER);
break; break;
case Network::RoomMember::Error::MacCollision: case Network::RoomMember::Error::MacCollision:
NetworkMessage::ShowError(NetworkMessage::MAC_COLLISION); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::MAC_COLLISION);
break; break;
case Network::RoomMember::Error::ConsoleIdCollision: case Network::RoomMember::Error::ConsoleIdCollision:
NetworkMessage::ShowError(NetworkMessage::CONSOLE_ID_COLLISION); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::CONSOLE_ID_COLLISION);
break; break;
case Network::RoomMember::Error::RoomIsFull: case Network::RoomMember::Error::RoomIsFull:
NetworkMessage::ShowError(NetworkMessage::ROOM_IS_FULL); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::ROOM_IS_FULL);
break; break;
case Network::RoomMember::Error::WrongPassword: case Network::RoomMember::Error::WrongPassword:
NetworkMessage::ShowError(NetworkMessage::WRONG_PASSWORD); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::WRONG_PASSWORD);
break; break;
case Network::RoomMember::Error::WrongVersion: case Network::RoomMember::Error::WrongVersion:
NetworkMessage::ShowError(NetworkMessage::WRONG_VERSION); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::WRONG_VERSION);
break; break;
case Network::RoomMember::Error::HostBanned: case Network::RoomMember::Error::HostBanned:
NetworkMessage::ShowError(NetworkMessage::HOST_BANNED); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::HOST_BANNED);
break; break;
case Network::RoomMember::Error::UnknownError: case Network::RoomMember::Error::UnknownError:
NetworkMessage::ShowError(NetworkMessage::UNABLE_TO_CONNECT); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::UNABLE_TO_CONNECT);
break; break;
case Network::RoomMember::Error::PermissionDenied: case Network::RoomMember::Error::PermissionDenied:
NetworkMessage::ShowError(NetworkMessage::PERMISSION_DENIED); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::PERMISSION_DENIED);
break; break;
case Network::RoomMember::Error::NoSuchUser: case Network::RoomMember::Error::NoSuchUser:
NetworkMessage::ShowError(NetworkMessage::NO_SUCH_USER); NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::NO_SUCH_USER);
break; break;
} }
} }

4
src/core/arm/arm_interface.h
View File

@ -15,6 +15,10 @@
#include "core/core_timing.h" #include "core/core_timing.h"
#include "core/memory.h" #include "core/memory.h"
namespace Memory {
struct PageTable;
};
/// Generic ARM11 CPU interface /// Generic ARM11 CPU interface
class ARM_Interface : NonCopyable { class ARM_Interface : NonCopyable {
public: public:

1
src/core/hle/kernel/kernel.cpp
View File

@ -74,6 +74,7 @@ void KernelSystem::SetCurrentProcessForCPU(std::shared_ptr<Process> process, u32
SetCurrentMemoryPageTable(process->vm_manager.page_table); SetCurrentMemoryPageTable(process->vm_manager.page_table);
} else { } else {
stored_processes[core_id] = process; stored_processes[core_id] = process;
thread_managers[core_id]->cpu->SetPageTable(process->vm_manager.page_table);
} }
} }

4
src/core/hle/kernel/thread.cpp
View File

@ -104,11 +104,13 @@ void Thread::Stop() {
void ThreadManager::SwitchContext(Thread* new_thread) { void ThreadManager::SwitchContext(Thread* new_thread) {
Thread* previous_thread = GetCurrentThread(); Thread* previous_thread = GetCurrentThread();
std::shared_ptr<Process> previous_process = nullptr;
Core::Timing& timing = kernel.timing; Core::Timing& timing = kernel.timing;
// Save context for previous thread // Save context for previous thread
if (previous_thread) { if (previous_thread) {
previous_process = previous_thread->owner_process;
previous_thread->last_running_ticks = timing.GetGlobalTicks(); previous_thread->last_running_ticks = timing.GetGlobalTicks();
cpu->SaveContext(previous_thread->context); cpu->SaveContext(previous_thread->context);
@ -128,8 +130,6 @@ void ThreadManager::SwitchContext(Thread* new_thread) {
// Cancel any outstanding wakeup events for this thread // Cancel any outstanding wakeup events for this thread
timing.UnscheduleEvent(ThreadWakeupEventType, new_thread->thread_id); timing.UnscheduleEvent(ThreadWakeupEventType, new_thread->thread_id);
auto previous_process = kernel.GetCurrentProcess();
current_thread = SharedFrom(new_thread); current_thread = SharedFrom(new_thread);
ready_queue.remove(new_thread->current_priority, new_thread); ready_queue.remove(new_thread->current_priority, new_thread);

6
src/core/hle/service/nfc/nfc.cpp
View File

@ -338,10 +338,12 @@ void Module::SyncTagState() {
// detected on Scanning->TagInRange? // detected on Scanning->TagInRange?
nfc_tag_state = TagState::TagInRange; nfc_tag_state = TagState::TagInRange;
tag_in_range_event->Signal(); tag_in_range_event->Signal();
} else if (!amiibo_in_range && nfc_tag_state == TagState::TagInRange) { } else if (!amiibo_in_range &&
nfc_tag_state = TagState::TagOutOfRange; (nfc_tag_state == TagState::TagInRange || nfc_tag_state == TagState::TagDataLoaded ||
nfc_tag_state == TagState::Unknown6)) {
// TODO (wwylele): If a tag is removed during TagDataLoaded/Unknown6, should this event // TODO (wwylele): If a tag is removed during TagDataLoaded/Unknown6, should this event
// signals early? // signals early?
nfc_tag_state = TagState::TagOutOfRange;
tag_out_of_range_event->Signal(); tag_out_of_range_event->Signal();
} }
} }

42
src/network/room.cpp
View File

@ -196,7 +196,7 @@ public:
* Sends a system message to all the connected clients. * Sends a system message to all the connected clients.
*/ */
void SendStatusMessage(StatusMessageTypes type, const std::string& nickname, void SendStatusMessage(StatusMessageTypes type, const std::string& nickname,
const std::string& username); const std::string& username, const std::string& ip);
/** /**
* Sends the information about the room, along with the list of members * Sends the information about the room, along with the list of members
@ -374,6 +374,7 @@ void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {
} }
member.user_data = verify_backend->LoadUserData(uid, token); member.user_data = verify_backend->LoadUserData(uid, token);
std::string ip;
{ {
std::lock_guard lock(ban_list_mutex); std::lock_guard lock(ban_list_mutex);
@ -389,7 +390,7 @@ void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {
// Check IP ban // Check IP ban
char ip_raw[256]; char ip_raw[256];
enet_address_get_host_ip(&event->peer->address, ip_raw, sizeof(ip_raw) - 1); enet_address_get_host_ip(&event->peer->address, ip_raw, sizeof(ip_raw) - 1);
std::string ip = ip_raw; ip = ip_raw;
if (std::find(ip_ban_list.begin(), ip_ban_list.end(), ip) != ip_ban_list.end()) { if (std::find(ip_ban_list.begin(), ip_ban_list.end(), ip) != ip_ban_list.end()) {
SendUserBanned(event->peer); SendUserBanned(event->peer);
@ -398,7 +399,7 @@ void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {
} }
// Notify everyone that the user has joined. // Notify everyone that the user has joined.
SendStatusMessage(IdMemberJoin, member.nickname, member.user_data.username); SendStatusMessage(IdMemberJoin, member.nickname, member.user_data.username, ip);
{ {
std::lock_guard lock(member_mutex); std::lock_guard lock(member_mutex);
@ -427,7 +428,7 @@ void Room::RoomImpl::HandleModKickPacket(const ENetEvent* event) {
std::string nickname; std::string nickname;
packet >> nickname; packet >> nickname;
std::string username; std::string username, ip;
{ {
std::lock_guard lock(member_mutex); std::lock_guard lock(member_mutex);
const auto target_member = const auto target_member =
@ -443,12 +444,16 @@ void Room::RoomImpl::HandleModKickPacket(const ENetEvent* event) {
username = target_member->user_data.username; username = target_member->user_data.username;
char ip_raw[256];
enet_address_get_host_ip(&target_member->peer->address, ip_raw, sizeof(ip_raw) - 1);
ip = ip_raw;
enet_peer_disconnect(target_member->peer, 0); enet_peer_disconnect(target_member->peer, 0);
members.erase(target_member); members.erase(target_member);
} }
// Announce the change to all clients. // Announce the change to all clients.
SendStatusMessage(IdMemberKicked, nickname, username); SendStatusMessage(IdMemberKicked, nickname, username, ip);
BroadcastRoomInformation(); BroadcastRoomInformation();
} }
@ -465,9 +470,7 @@ void Room::RoomImpl::HandleModBanPacket(const ENetEvent* event) {
std::string nickname; std::string nickname;
packet >> nickname; packet >> nickname;
std::string username; std::string username, ip;
std::string ip;
{ {
std::lock_guard lock(member_mutex); std::lock_guard lock(member_mutex);
const auto target_member = const auto target_member =
@ -511,7 +514,7 @@ void Room::RoomImpl::HandleModBanPacket(const ENetEvent* event) {
} }
// Announce the change to all clients. // Announce the change to all clients.
SendStatusMessage(IdMemberBanned, nickname, username); SendStatusMessage(IdMemberBanned, nickname, username, ip);
BroadcastRoomInformation(); BroadcastRoomInformation();
} }
@ -546,7 +549,7 @@ void Room::RoomImpl::HandleModUnbanPacket(const ENetEvent* event) {
} }
if (unbanned) { if (unbanned) {
SendStatusMessage(IdAddressUnbanned, address, ""); SendStatusMessage(IdAddressUnbanned, address, "", "");
} else { } else {
SendModNoSuchUser(event->peer); SendModNoSuchUser(event->peer);
} }
@ -763,7 +766,7 @@ void Room::RoomImpl::SendCloseMessage() {
} }
void Room::RoomImpl::SendStatusMessage(StatusMessageTypes type, const std::string& nickname, void Room::RoomImpl::SendStatusMessage(StatusMessageTypes type, const std::string& nickname,
const std::string& username) { const std::string& username, const std::string& ip) {
Packet packet; Packet packet;
packet << static_cast<u8>(IdStatusMessage); packet << static_cast<u8>(IdStatusMessage);
packet << static_cast<u8>(type); packet << static_cast<u8>(type);
@ -784,16 +787,16 @@ void Room::RoomImpl::SendStatusMessage(StatusMessageTypes type, const std::strin
switch (type) { switch (type) {
case IdMemberJoin: case IdMemberJoin:
LOG_INFO(Network, "{} has joined.", display_name); LOG_INFO(Network, "[{}] {} has joined.", ip, display_name);
break; break;
case IdMemberLeave: case IdMemberLeave:
LOG_INFO(Network, "{} has left.", display_name); LOG_INFO(Network, "[{}] {} has left.", ip, display_name);
break; break;
case IdMemberKicked: case IdMemberKicked:
LOG_INFO(Network, "{} has been kicked.", display_name); LOG_INFO(Network, "[{}] {} has been kicked.", ip, display_name);
break; break;
case IdMemberBanned: case IdMemberBanned:
LOG_INFO(Network, "{} has been banned.", display_name); LOG_INFO(Network, "[{}] {} has been banned.", ip, display_name);
break; break;
case IdAddressUnbanned: case IdAddressUnbanned:
LOG_INFO(Network, "{} has been unbanned.", display_name); LOG_INFO(Network, "{} has been unbanned.", display_name);
@ -976,7 +979,7 @@ void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) {
void Room::RoomImpl::HandleClientDisconnection(ENetPeer* client) { void Room::RoomImpl::HandleClientDisconnection(ENetPeer* client) {
// Remove the client from the members list. // Remove the client from the members list.
std::string nickname, username; std::string nickname, username, ip;
{ {
std::lock_guard lock(member_mutex); std::lock_guard lock(member_mutex);
auto member = std::find_if(members.begin(), members.end(), [client](const Member& member) { auto member = std::find_if(members.begin(), members.end(), [client](const Member& member) {
@ -985,6 +988,11 @@ void Room::RoomImpl::HandleClientDisconnection(ENetPeer* client) {
if (member != members.end()) { if (member != members.end()) {
nickname = member->nickname; nickname = member->nickname;
username = member->user_data.username; username = member->user_data.username;
char ip_raw[256];
enet_address_get_host_ip(&member->peer->address, ip_raw, sizeof(ip_raw) - 1);
ip = ip_raw;
members.erase(member); members.erase(member);
} }
} }
@ -992,7 +1000,7 @@ void Room::RoomImpl::HandleClientDisconnection(ENetPeer* client) {
// Announce the change to all clients. // Announce the change to all clients.
enet_peer_disconnect(client, 0); enet_peer_disconnect(client, 0);
if (!nickname.empty()) if (!nickname.empty())
SendStatusMessage(IdMemberLeave, nickname, username); SendStatusMessage(IdMemberLeave, nickname, username, ip);
BroadcastRoomInformation(); BroadcastRoomInformation();
} }

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -756,7 +756,7 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
state.texture_units[texture_index].texture_2d = default_texture; state.texture_units[texture_index].texture_2d = default_texture;
} }
} else { } else {
state.texture_units[texture_index].texture_2d = default_texture; state.texture_units[texture_index].texture_2d = 0;
} }
} }