Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-18 11:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation after merge

Browse Source
This commit is contained in:
momo5502
2025-01-05 14:58:30 +01:00
parent f75f95cc61
commit f08a97eae6
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/platform/file_management.hpp
View File

@@ -67,6 +67,8 @@
#define SL_RETURN_SINGLE_ENTRY 0x02
#define SL_NO_CURSOR_UPDATE 0x10
#define SEC_IMAGE 0x01000000
typedef enum _FSINFOCLASS
{
FileFsVolumeInformation = 1, // q: FILE_FS_VOLUME_INFORMATION
@@ -330,8 +332,8 @@ typedef struct _FILE_BOTH_DIR_INFORMATION
ULONG FileAttributes;
ULONG FileNameLength;
ULONG EaSize;
CCHAR ShortNameLength;
WCHAR ShortName[12];
char ShortNameLength;
char16_t ShortName[12];
char16_t FileName[1];
} FILE_BOTH_DIR_INFORMATION, * PFILE_BOTH_DIR_INFORMATION;

2
src/common/platform/kernel_mapped.hpp
View File

@@ -841,7 +841,7 @@ struct THREAD_TLS_INFO
union
{
EmulatorTraits<Emu64>::PVOID* TlsVector;
PVOID TlsModulePointer;
EmulatorTraits<Emu64>::PVOID TlsModulePointer;
};
EMULATOR_CAST(std::uint64_t, ULONG_PTR) ThreadId;

4
src/windows-emulator/syscalls.cpp
View File

@@ -1775,8 +1775,8 @@ namespace
{
const auto tls_entry_ptr = tls_vector + tls_info.TlsIndex;
const auto old_entry = c.emu.read_memory<void*>(tls_entry_ptr);
c.emu.write_memory<void*>(tls_entry_ptr, entry.TlsModulePointer);
const auto old_entry = c.emu.read_memory<EmulatorTraits<Emu64>::PVOID>(tls_entry_ptr);
c.emu.write_memory<EmulatorTraits<Emu64>::PVOID>(tls_entry_ptr, entry.TlsModulePointer);
entry.TlsModulePointer = old_entry;
}