thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-10-30 07:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update recompiler submodules.

Browse source
This commit is contained in:
Skyth 2024-12-13 18:33:51 +03:00
parent 6d1d5ff33a
commit 1ab25d5b41
10 changed files with 44 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UnleashedRecomp/apu/driver/miniaudio_driver.cpp
View file

@ -35,7 +35,7 @@ void XAudioInitializeSystem()
void XAudioRegisterClient(PPCFunc* callback, uint32_t param) void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
{ {
auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param))); auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
ByteSwap(param); ByteSwapInplace(param);
*pClientParam = param; *pClientParam = param;
g_clientCallbackParam = g_memory.MapVirtual(pClientParam); g_clientCallbackParam = g_memory.MapVirtual(pClientParam);
g_clientCallback = callback; g_clientCallback = callback;

2
UnleashedRecomp/apu/driver/xaudio_driver.cpp
View file

@ -96,7 +96,7 @@ void XAudioInitializeSystem()
void XAudioRegisterClient(PPCFunc* callback, uint32_t param) void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
{ {
auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param))); auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
ByteSwap(param); ByteSwapInplace(param);
*pClientParam = param; *pClientParam = param;
g_clientCallbackParam = g_memory.MapVirtual(pClientParam); g_clientCallbackParam = g_memory.MapVirtual(pClientParam);

6
UnleashedRecomp/framework.h
View file

@ -21,12 +21,6 @@
typedef returnType _##procName(__VA_ARGS__); \ typedef returnType _##procName(__VA_ARGS__); \
_##procName* procName = (_##procName*)PROC_ADDRESS(libraryName, #procName); _##procName* procName = (_##procName*)PROC_ADDRESS(libraryName, #procName);
template<typename T>
inline void ByteSwap(T& value)
{
value = std::byteswap(value);
}
template<typename T> template<typename T>
inline T RoundUp(const T& in_rValue, uint32_t in_round) inline T RoundUp(const T& in_rValue, uint32_t in_round)
{ {

22
UnleashedRecomp/kernel/io/file_system.cpp
View file

@ -134,11 +134,11 @@ uint32_t XFindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData)
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
return 0xFFFFFFFF; return 0xFFFFFFFF;
ByteSwap(data.dwFileAttributes); ByteSwapInplace(data.dwFileAttributes);
ByteSwap(*(uint64_t*)&data.ftCreationTime); ByteSwapInplace(*(uint64_t*)&data.ftCreationTime);
ByteSwap(*(uint64_t*)&data.ftLastAccessTime); ByteSwapInplace(*(uint64_t*)&data.ftLastAccessTime);
ByteSwap(*(uint64_t*)&data.ftLastWriteTime); ByteSwapInplace(*(uint64_t*)&data.ftLastWriteTime);
ByteSwap(*(uint64_t*)&data.nFileSizeHigh); ByteSwapInplace(*(uint64_t*)&data.nFileSizeHigh);
return GUEST_HANDLE(ObInsertObject(handle, FindHandleCloser)); return GUEST_HANDLE(ObInsertObject(handle, FindHandleCloser));
} }
@ -149,11 +149,11 @@ uint32_t XFindNextFileA(uint32_t Handle, LPWIN32_FIND_DATAA lpFindFileData)
auto& data = *lpFindFileData; auto& data = *lpFindFileData;
const auto result = FindNextFileA(handle, &data); const auto result = FindNextFileA(handle, &data);
ByteSwap(data.dwFileAttributes); ByteSwapInplace(data.dwFileAttributes);
ByteSwap(*(uint64_t*)&data.ftCreationTime); ByteSwapInplace(*(uint64_t*)&data.ftCreationTime);
ByteSwap(*(uint64_t*)&data.ftLastAccessTime); ByteSwapInplace(*(uint64_t*)&data.ftLastAccessTime);
ByteSwap(*(uint64_t*)&data.ftLastWriteTime); ByteSwapInplace(*(uint64_t*)&data.ftLastWriteTime);
ByteSwap(*(uint64_t*)&data.nFileSizeHigh); ByteSwapInplace(*(uint64_t*)&data.nFileSizeHigh);
return result; return result;
} }
@ -194,7 +194,7 @@ BOOL XWriteFile(uint32_t hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, L
BOOL result = WriteFile((HANDLE)hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, nullptr); BOOL result = WriteFile((HANDLE)hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, nullptr);
if (result && lpNumberOfBytesWritten != nullptr) if (result && lpNumberOfBytesWritten != nullptr)
ByteSwap(*lpNumberOfBytesWritten); ByteSwapInplace(*lpNumberOfBytesWritten);
return result; return result;
} }

44
UnleashedRecomp/kernel/xam.cpp
View file

@ -144,7 +144,7 @@ SWA_API uint32_t XamShowMessageBoxUI(DWORD dwUserIndex, XWORD* wszTitle, XWORD*
for (auto& text : texts) for (auto& text : texts)
{ {
for (size_t i = 0; i < text.size(); i++) for (size_t i = 0; i < text.size(); i++)
ByteSwap(text[i]); ByteSwapInplace(text[i]);
} }
for (size_t i = 0; i < cButtons; i++) for (size_t i = 0; i < cButtons; i++)
@ -305,14 +305,14 @@ SWA_API uint32_t XamInputGetCapabilities(uint32_t unk, uint32_t userIndex, uint3
if (result == ERROR_SUCCESS) if (result == ERROR_SUCCESS)
{ {
ByteSwap(caps->Flags); ByteSwapInplace(caps->Flags);
ByteSwap(caps->Gamepad.wButtons); ByteSwapInplace(caps->Gamepad.wButtons);
ByteSwap(caps->Gamepad.sThumbLX); ByteSwapInplace(caps->Gamepad.sThumbLX);
ByteSwap(caps->Gamepad.sThumbLY); ByteSwapInplace(caps->Gamepad.sThumbLY);
ByteSwap(caps->Gamepad.sThumbRX); ByteSwapInplace(caps->Gamepad.sThumbRX);
ByteSwap(caps->Gamepad.sThumbRY); ByteSwapInplace(caps->Gamepad.sThumbRY);
ByteSwap(caps->Vibration.wLeftMotorSpeed); ByteSwapInplace(caps->Vibration.wLeftMotorSpeed);
ByteSwap(caps->Vibration.wRightMotorSpeed); ByteSwapInplace(caps->Vibration.wRightMotorSpeed);
} }
return result; return result;
@ -324,12 +324,12 @@ SWA_API uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_S
if (result == ERROR_SUCCESS) if (result == ERROR_SUCCESS)
{ {
ByteSwap(state->dwPacketNumber); ByteSwapInplace(state->dwPacketNumber);
ByteSwap(state->Gamepad.wButtons); ByteSwapInplace(state->Gamepad.wButtons);
ByteSwap(state->Gamepad.sThumbLX); ByteSwapInplace(state->Gamepad.sThumbLX);
ByteSwap(state->Gamepad.sThumbLY); ByteSwapInplace(state->Gamepad.sThumbLY);
ByteSwap(state->Gamepad.sThumbRX); ByteSwapInplace(state->Gamepad.sThumbRX);
ByteSwap(state->Gamepad.sThumbRY); ByteSwapInplace(state->Gamepad.sThumbRY);
} }
else if (userIndex == 0) else if (userIndex == 0)
{ {
@ -377,11 +377,11 @@ SWA_API uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_S
if (GetAsyncKeyState(VK_BACK) & 0x8000) if (GetAsyncKeyState(VK_BACK) & 0x8000)
state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_BACK; state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_BACK;
ByteSwap(state->Gamepad.wButtons); ByteSwapInplace(state->Gamepad.wButtons);
ByteSwap(state->Gamepad.sThumbLX); ByteSwapInplace(state->Gamepad.sThumbLX);
ByteSwap(state->Gamepad.sThumbLY); ByteSwapInplace(state->Gamepad.sThumbLY);
ByteSwap(state->Gamepad.sThumbRX); ByteSwapInplace(state->Gamepad.sThumbRX);
ByteSwap(state->Gamepad.sThumbRY); ByteSwapInplace(state->Gamepad.sThumbRY);
result = ERROR_SUCCESS; result = ERROR_SUCCESS;
} }
@ -391,8 +391,8 @@ SWA_API uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_S
SWA_API uint32_t XamInputSetState(uint32_t userIndex, uint32_t flags, XAMINPUT_VIBRATION* vibration) SWA_API uint32_t XamInputSetState(uint32_t userIndex, uint32_t flags, XAMINPUT_VIBRATION* vibration)
{ {
ByteSwap(vibration->wLeftMotorSpeed); ByteSwapInplace(vibration->wLeftMotorSpeed);
ByteSwap(vibration->wRightMotorSpeed); ByteSwapInplace(vibration->wRightMotorSpeed);
return hid::SetState(userIndex, vibration); return hid::SetState(userIndex, vibration);
} }

6
UnleashedRecomp/main.cpp
View file

@ -94,20 +94,20 @@ void KiSystemStartup()
uint32_t LdrLoadModule(const char* path) uint32_t LdrLoadModule(const char* path)
{ {
auto loadResult = LoadFile(FileSystem::TransformPath(GAME_XEX_PATH)); auto loadResult = LoadFile(FileSystem::TransformPath(GAME_XEX_PATH));
if (!loadResult.has_value()) if (loadResult.empty())
{ {
assert("Failed to load module" && false); assert("Failed to load module" && false);
return 0; return 0;
} }
auto* xex = reinterpret_cast<XEX_HEADER*>(loadResult->data()); auto* xex = reinterpret_cast<XEX_HEADER*>(loadResult.data());
auto security = reinterpret_cast<XEX2_SECURITY_INFO*>((char*)xex + xex->AddressOfSecurityInfo); auto security = reinterpret_cast<XEX2_SECURITY_INFO*>((char*)xex + xex->AddressOfSecurityInfo);
g_memory.Alloc(security->ImageBase, security->SizeOfImage, MEM_COMMIT); g_memory.Alloc(security->ImageBase, security->SizeOfImage, MEM_COMMIT);
auto format = Xex2FindOptionalHeader<XEX_FILE_FORMAT_INFO>(xex, XEX_HEADER_FILE_FORMAT_INFO); auto format = Xex2FindOptionalHeader<XEX_FILE_FORMAT_INFO>(xex, XEX_HEADER_FILE_FORMAT_INFO);
auto entry = *Xex2FindOptionalHeader<uint32_t>(xex, XEX_HEADER_ENTRY_POINT); auto entry = *Xex2FindOptionalHeader<uint32_t>(xex, XEX_HEADER_ENTRY_POINT);
ByteSwap(entry); ByteSwapInplace(entry);
auto srcData = (char *)xex + xex->SizeOfHeader; auto srcData = (char *)xex + xex->SizeOfHeader;
auto destData = (char *)g_memory.Translate(security->ImageBase); auto destData = (char *)g_memory.Translate(security->ImageBase);

4
UnleashedRecomp/misc_impl.cpp
View file

@ -4,14 +4,14 @@
BOOL QueryPerformanceCounterImpl(LARGE_INTEGER* lpPerformanceCount) BOOL QueryPerformanceCounterImpl(LARGE_INTEGER* lpPerformanceCount)
{ {
BOOL result = QueryPerformanceCounter(lpPerformanceCount); BOOL result = QueryPerformanceCounter(lpPerformanceCount);
ByteSwap(lpPerformanceCount->QuadPart); ByteSwapInplace(lpPerformanceCount->QuadPart);
return result; return result;
} }
BOOL QueryPerformanceFrequencyImpl(LARGE_INTEGER* lpFrequency) BOOL QueryPerformanceFrequencyImpl(LARGE_INTEGER* lpFrequency)
{ {
BOOL result = QueryPerformanceFrequency(lpFrequency); BOOL result = QueryPerformanceFrequency(lpFrequency);
ByteSwap(lpFrequency->QuadPart); ByteSwapInplace(lpFrequency->QuadPart);
return result; return result;
} }

2
thirdparty/PowerRecomp vendored

@ -1 +1 @@
Subproject commit 02d23b3463ca2048a0d60f67e46df12fdba31369 Subproject commit 847842cd28a2427b9db520d2aaa7416e5dec3822

2
thirdparty/ShaderRecomp vendored

@ -1 +1 @@
Subproject commit f936ed2212d8291439003eb0c0d8edc0ecafd24d Subproject commit 12b38144b9ff5d131e0d30af22bd38607d07d9fd

3
vcpkg.json
View file

@ -24,6 +24,7 @@
"magic-enum", "magic-enum",
"nativefiledialog-extended", "nativefiledialog-extended",
"freetype", "freetype",
"libvorbis" "libvorbis",
"fmt"
] ]
} }