decompals/wibo
1
0
Fork 0
mirror of https://github.com/decompals/wibo.git synced 2025-12-12 22:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few compiler regressions

Browse Source
This commit is contained in:
Luke Street
2025-11-03 23:22:29 -07:00
parent 67c62cf196
commit a59e002ed0
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dll/kernel32/memoryapi.cpp
View File

@@ -536,6 +536,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationTy
setLastError(err); setLastError(err);
return nullptr; return nullptr;
} }
DEBUG_LOG("-> success (base=%p, size=%zu)\n", base, size);
return base; return base;
} }

5
dll/kernel32/winnls.cpp
View File

@@ -3,11 +3,12 @@
#include "context.h" #include "context.h"
#include "errors.h" #include "errors.h"
#include "internal.h" #include "internal.h"
#include "kernel32.h"
#include "kernel32_trampolines.h"
#include "strutil.h" #include "strutil.h"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <cwctype>
#include <initializer_list> #include <initializer_list>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -236,7 +237,7 @@ BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA lpLocaleEnumProc, DWORD dwFlags)
} }
// Return to guest context before callback // Return to guest context before callback
char localeId[] = "00000409"; // en-US char localeId[] = "00000409"; // en-US
return lpLocaleEnumProc(localeId); return call_LOCALE_ENUMPROCA(lpLocaleEnumProc, localeId);
} }
LCID WINAPI GetUserDefaultLCID() { LCID WINAPI GetUserDefaultLCID() {

2
src/heap.cpp
View File

@@ -435,7 +435,7 @@ void initializeImpl() {
// Map and register guest arena (below 2GB, exclusive) // Map and register guest arena (below 2GB, exclusive)
ArenaRange guest; ArenaRange guest;
if (mapArena(kGuestArenaSize, kLowMemoryStart, kTopDownStart, false, "wibo guest arena", guest)) { if (mapArena(kGuestArenaSize, kLowMemoryStart, kTopDownStart, true, "wibo guest arena", guest)) {
bool ok = mi_manage_os_memory_ex(guest.start, guest.size, bool ok = mi_manage_os_memory_ex(guest.start, guest.size,
/*is_committed*/ false, /*is_committed*/ false,
/*is_pinned*/ false, /*is_pinned*/ false,

4
src/modules.cpp
View File

@@ -7,8 +7,6 @@
#include "files.h" #include "files.h"
#include "heap.h" #include "heap.h"
#include "kernel32/internal.h" #include "kernel32/internal.h"
#include "msvcrt.h"
#include "msvcrt_trampolines.h"
#include "strutil.h" #include "strutil.h"
#include "tls.h" #include "tls.h"
@@ -1278,6 +1276,7 @@ void *resolveFuncByName(ModuleInfo *info, const char *funcName) {
if (it != info->exportNameToOrdinal.end()) { if (it != info->exportNameToOrdinal.end()) {
return resolveFuncByOrdinal(info, it->second); return resolveFuncByOrdinal(info, it->second);
} }
return nullptr;
} }
return reinterpret_cast<void *>(resolveMissingFuncName(info->originalName.c_str(), funcName)); return reinterpret_cast<void *>(resolveMissingFuncName(info->originalName.c_str(), funcName));
} }
@@ -1303,6 +1302,7 @@ void *resolveFuncByOrdinal(ModuleInfo *info, uint16_t ordinal) {
} }
} }
} }
return nullptr;
} }
return reinterpret_cast<void *>(resolveMissingFuncOrdinal(info->originalName.c_str(), ordinal)); return reinterpret_cast<void *>(resolveMissingFuncOrdinal(info->originalName.c_str(), ordinal));
} }