Browse Source
MSVC fixes
Signed-off-by: crueter <crueter@eden-emu.dev>
lizzie/unity-build
crueter
2 days ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
12 changed files with
31 additions and
0 deletions
-
src/core/core_timing.cpp
-
src/core/file_sys/vfs/vfs.cpp
-
src/core/file_sys/vfs/vfs_vector.h
-
src/core/hle/service/bcat/news/overwrite_event_holder.cpp
-
src/core/hle/service/caps/caps_manager.cpp
-
src/core/hle/service/fatal/fatal.cpp
-
src/core/hle/service/filesystem/filesystem.cpp
-
src/core/hle/service/psc/time/clocks/system_clock_core.h
-
src/core/hle/service/psc/time/system_clock.h
-
src/core/memory/cheat_engine.cpp
-
src/core/reporter.cpp
-
src/core/tools/freezer.cpp
|
|
|
@ -25,6 +25,7 @@ namespace Core::Timing { |
|
|
|
|
|
|
|
constexpr s64 MAX_SLICE_LENGTH = 10000; |
|
|
|
|
|
|
|
#undef CreateEvent
|
|
|
|
std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) { |
|
|
|
return std::make_shared<EventType>(std::move(callback), std::move(name)); |
|
|
|
} |
|
|
|
|
|
|
|
@ -10,6 +10,12 @@ |
|
|
|
#include "common/fs/path_util.h"
|
|
|
|
#include "core/file_sys/vfs/vfs.h"
|
|
|
|
|
|
|
|
#undef CreateFile
|
|
|
|
#undef DeleteFile
|
|
|
|
#undef CreateDirectory
|
|
|
|
#undef CopyFile
|
|
|
|
#undef MoveFile
|
|
|
|
|
|
|
|
namespace FileSys { |
|
|
|
|
|
|
|
VfsFilesystem::VfsFilesystem(VirtualDir root_) : root(std::move(root_)) {} |
|
|
|
|
|
|
|
@ -99,6 +99,10 @@ private: |
|
|
|
std::string name; |
|
|
|
}; |
|
|
|
|
|
|
|
#undef CreateFile |
|
|
|
#undef DeleteFile |
|
|
|
#undef CreateDirectory |
|
|
|
|
|
|
|
// An implementation of VfsDirectory that maintains two vectors for subdirectories and files. |
|
|
|
// Vector data is supplied upon construction. |
|
|
|
class VectorVfsDirectory : public VfsDirectory { |
|
|
|
|
|
|
|
@ -6,6 +6,8 @@ |
|
|
|
|
|
|
|
namespace Service::News { |
|
|
|
|
|
|
|
#undef CreateEvent
|
|
|
|
|
|
|
|
IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_) |
|
|
|
: ServiceFramework{system_, "IOverwriteEventHolder"}, service_context{system_, |
|
|
|
"IOverwriteEventHolder"} { |
|
|
|
|
|
|
|
@ -18,6 +18,8 @@ |
|
|
|
#include "core/hle/service/service.h"
|
|
|
|
#include "core/hle/service/sm/sm.h"
|
|
|
|
|
|
|
|
#undef GetCurrentTime
|
|
|
|
|
|
|
|
namespace Service::Capture { |
|
|
|
|
|
|
|
AlbumManager::AlbumManager(Core::System& system_) : system{system_} {} |
|
|
|
|
|
|
|
@ -19,6 +19,8 @@ |
|
|
|
#include "core/hle/service/server_manager.h"
|
|
|
|
#include "core/reporter.h"
|
|
|
|
|
|
|
|
#undef far
|
|
|
|
|
|
|
|
namespace Service::Fatal { |
|
|
|
|
|
|
|
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_, |
|
|
|
|
|
|
|
@ -32,6 +32,10 @@ |
|
|
|
#include "core/hle/service/server_manager.h"
|
|
|
|
#include "core/loader/loader.h"
|
|
|
|
|
|
|
|
#undef CreateFile
|
|
|
|
#undef DeleteFile
|
|
|
|
#undef CreateDirectory
|
|
|
|
|
|
|
|
namespace Service::FileSystem { |
|
|
|
|
|
|
|
static FileSys::VirtualDir GetDirectoryRelativeWrapped(FileSys::VirtualDir base, |
|
|
|
|
|
|
|
@ -10,6 +10,8 @@ |
|
|
|
namespace Service::PSC::Time { |
|
|
|
class ContextWriter; |
|
|
|
|
|
|
|
#undef GetCurrentTime |
|
|
|
|
|
|
|
class SystemClockCore { |
|
|
|
public: |
|
|
|
explicit SystemClockCore(SteadyClockCore& steady_clock) : m_steady_clock{steady_clock} {} |
|
|
|
|
|
|
|
@ -16,6 +16,8 @@ class System; |
|
|
|
|
|
|
|
namespace Service::PSC::Time { |
|
|
|
|
|
|
|
#undef GetCurrentTime |
|
|
|
|
|
|
|
class SystemClock final : public ServiceFramework<SystemClock> { |
|
|
|
public: |
|
|
|
explicit SystemClock(Core::System& system, SystemClockCore& system_clock_core, |
|
|
|
|
|
|
|
@ -21,6 +21,8 @@ |
|
|
|
#include "hid_core/resource_manager.h"
|
|
|
|
#include "hid_core/resources/npad/npad.h"
|
|
|
|
|
|
|
|
#undef CreateEvent
|
|
|
|
|
|
|
|
namespace Core::Memory { |
|
|
|
namespace { |
|
|
|
constexpr auto CHEAT_ENGINE_NS = std::chrono::nanoseconds{1000000000 / 12}; |
|
|
|
|
|
|
|
@ -27,6 +27,8 @@ |
|
|
|
#include "core/memory.h"
|
|
|
|
#include "core/reporter.h"
|
|
|
|
|
|
|
|
#undef far
|
|
|
|
|
|
|
|
namespace { |
|
|
|
|
|
|
|
std::filesystem::path GetPath(std::string_view type, u64 title_id, std::string_view timestamp) { |
|
|
|
|
|
|
|
@ -52,6 +52,8 @@ void MemoryWriteWidth(Core::Memory::Memory& memory, u32 width, VAddr addr, u64 v |
|
|
|
|
|
|
|
} // Anonymous namespace
|
|
|
|
|
|
|
|
#undef CreateEvent
|
|
|
|
|
|
|
|
Freezer::Freezer(Core::Timing::CoreTiming& core_timing_, Core::Memory::Memory& memory_) |
|
|
|
: core_timing{core_timing_}, memory{memory_} { |
|
|
|
event = Core::Timing::CreateEvent("MemoryFreezer::FrameCallback", |
|
|
|
|