decompals
/
wibo
mirror of https://github.com/decompals/wibo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various fixes for mwcc/mwld (#32) 

* Override GetFileAttributesA for MWCC license.dat

* Add WIN_FUNC to FileTimeToLocalFileTime

* Use callee_pop_aggregate_return(0)

* Lexically normalize paths
This commit is contained in:
Luke Street 2023-01-23 15:22:50 -05:00 committed by GitHub
parent 6b6a462ea1
commit 7d08a2bdca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.h
View File

@ -8,7 +8,7 @@
// On Windows, the incoming stack is aligned to a 4 byte boundary. // On Windows, the incoming stack is aligned to a 4 byte boundary.
// force_align_arg_pointer will realign the stack to match GCC's 16 byte alignment. // force_align_arg_pointer will realign the stack to match GCC's 16 byte alignment.
#define WIN_ENTRY __attribute__((force_align_arg_pointer)) #define WIN_ENTRY __attribute__((force_align_arg_pointer, callee_pop_aggregate_return(0)))
#define WIN_FUNC WIN_ENTRY __attribute__((stdcall)) #define WIN_FUNC WIN_ENTRY __attribute__((stdcall))
#define DEBUG_LOG(...) wibo::debug_log(__VA_ARGS__) #define DEBUG_LOG(...) wibo::debug_log(__VA_ARGS__)

9
dll/kernel32.cpp
View File

@ -565,6 +565,13 @@ namespace kernel32 {
unsigned int WIN_FUNC GetFileAttributesA(const char *lpFileName) { unsigned int WIN_FUNC GetFileAttributesA(const char *lpFileName) {
auto path = files::pathFromWindows(lpFileName); auto path = files::pathFromWindows(lpFileName);
DEBUG_LOG("GetFileAttributesA(%s)... (%s)\n", lpFileName, path.c_str()); DEBUG_LOG("GetFileAttributesA(%s)... (%s)\n", lpFileName, path.c_str());
// See ole32::CoCreateInstance
if (endsWith(path, "/license.dat")) {
DEBUG_LOG("MWCC license override\n");
return 0x80; // FILE_ATTRIBUTE_NORMAL
}
auto status = std::filesystem::status(path); auto status = std::filesystem::status(path);
wibo::lastError = 0; wibo::lastError = 0;
@ -868,7 +875,7 @@ namespace kernel32 {
return 1; return 1;
} }
int FileTimeToLocalFileTime(const FILETIME *lpFileTime, FILETIME *lpLocalFileTime) { int WIN_FUNC FileTimeToLocalFileTime(const FILETIME *lpFileTime, FILETIME *lpLocalFileTime) {
DEBUG_LOG("FileTimeToLocalFileTime\n"); DEBUG_LOG("FileTimeToLocalFileTime\n");
// we live on Iceland // we live on Iceland
*lpLocalFileTime = *lpFileTime; *lpLocalFileTime = *lpFileTime;

4
files.cpp
View File

@ -22,7 +22,7 @@ namespace files {
// Return as-is if it exists, else traverse the filesystem looking for // Return as-is if it exists, else traverse the filesystem looking for
// a path that matches case insensitively // a path that matches case insensitively
std::filesystem::path path = std::filesystem::path(str); std::filesystem::path path = std::filesystem::path(str).lexically_normal();
if (std::filesystem::exists(path)) { if (std::filesystem::exists(path)) {
return path; return path;
} }
@ -58,7 +58,7 @@ namespace files {
} }
std::string pathToWindows(const std::filesystem::path &path) { std::string pathToWindows(const std::filesystem::path &path) {
std::string str = path; std::string str = path.lexically_normal();
if (path.is_absolute()) { if (path.is_absolute()) {
str.insert(0, "Z:"); str.insert(0, "Z:");

5
files.h
View File

@ -1,4 +1,5 @@
#include <filesystem> #include <filesystem>
#include <string>
namespace files { namespace files {
std::filesystem::path pathFromWindows(const char *inStr); std::filesystem::path pathFromWindows(const char *inStr);
@ -9,3 +10,7 @@ namespace files {
unsigned int setStdHandle(uint32_t nStdHandle, void *hHandle); unsigned int setStdHandle(uint32_t nStdHandle, void *hHandle);
void init(); void init();
} }
static bool endsWith(const std::string &str, const std::string &suffix) {
return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
}