decompals/wibo
1
0
Fork 0
mirror of https://github.com/decompals/wibo.git synced 2025-10-16 15:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement onexit and get_wpgmptr

Browse Source
This commit is contained in:
rjkiv 2025-09-03 11:06:48 -07:00
parent 9a98c29a59
commit 98f1548370
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dll/msvcrt.cpp
View File

@ -19,6 +19,7 @@ namespace msvcrt {
int _commode; int _commode;
int _fmode; int _fmode;
uint16_t** __winitenv; uint16_t** __winitenv;
uint16_t* _wpgmptr;
// Stub because we're only ever a console application // Stub because we're only ever a console application
void WIN_ENTRY __set_app_type(int at) { void WIN_ENTRY __set_app_type(int at) {
@ -59,7 +60,9 @@ namespace msvcrt {
} }
_PIFV WIN_ENTRY _onexit(_PIFV func) { _PIFV WIN_ENTRY _onexit(_PIFV func) {
DEBUG_LOG("STUB: _onexit(%p)\n", func); DEBUG_LOG("_onexit(%p)\n", func);
if(!func) return nullptr;
if (atexit((void(*)(void))func) != 0) return nullptr;
return func; return func;
} }
@ -85,10 +88,10 @@ namespace msvcrt {
char** argv = *regular_argv; char** argv = *regular_argv;
char** env = regular_env; char** env = regular_env;
DEBUG_LOG("Wildcard: %d\n", doWildcard); // DEBUG_LOG("Wildcard: %d\n", doWildcard);
if(startInfo){ // if(startInfo){
DEBUG_LOG("Start info: %d\n", *startInfo); // DEBUG_LOG("Start info: %d\n", *startInfo);
} // }
if(wargc) *wargc = argc; if(wargc) *wargc = argc;
@ -113,11 +116,11 @@ namespace msvcrt {
if(wenv){ if(wenv){
int count = 0; int count = 0;
for(; env[count] != nullptr; count++); for(; env[count] != nullptr; count++);
DEBUG_LOG("Found env count %d\n", count); // DEBUG_LOG("Found env count %d\n", count);
*wenv = new uint16_t*[count + 1]; // allocate array of our future wstrings *wenv = new uint16_t*[count + 1]; // allocate array of our future wstrings
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
const char* cur_env = env[i]; const char* cur_env = env[i];
DEBUG_LOG("Adding env %s\n", cur_env); // DEBUG_LOG("Adding env %s\n", cur_env);
std::vector<uint16_t> wStr = stringToWideString(cur_env); std::vector<uint16_t> wStr = stringToWideString(cur_env);
@ -215,16 +218,31 @@ namespace msvcrt {
} }
int WIN_ENTRY _get_wpgmptr(uint16_t** pValue){ int WIN_ENTRY _get_wpgmptr(uint16_t** pValue){
DEBUG_LOG("STUB: _get_wpgmptr(%p)\n", pValue); DEBUG_LOG("_get_wpgmptr(%p)\n", pValue);
if(!pValue) return 22;
char exe_path[PATH_MAX];
ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
if(len == -1){
return 2;
}
exe_path[len] = 0;
std::vector<uint16_t> wStr = stringToWideString(exe_path);
_wpgmptr = new uint16_t[wStr.size() + 1];
std::copy(wStr.begin(), wStr.end(), _wpgmptr);
_wpgmptr[wStr.size()] = 0;
*pValue = _wpgmptr;
return 0; return 0;
} }
int WIN_ENTRY _wsplitpath_s(const uint16_t * path, uint16_t * drive, size_t driveNumberOfElements, uint16_t *dir, size_t dirNumberOfElements, int WIN_ENTRY _wsplitpath_s(const uint16_t * path, uint16_t * drive, size_t driveNumberOfElements, uint16_t *dir, size_t dirNumberOfElements,
uint16_t * fname, size_t nameNumberOfElements, uint16_t * ext, size_t extNumberOfElements){ uint16_t * fname, size_t nameNumberOfElements, uint16_t * ext, size_t extNumberOfElements){
DEBUG_LOG("_wsplitpath_s - ");
if(!path){ if(!path){
DEBUG_LOG("no path\n"); DEBUG_LOG("no path\n");
return -1; return 22;
} }
else { else {
std::string path_str = wideStringToString(path); std::string path_str = wideStringToString(path);
@ -243,27 +261,27 @@ namespace msvcrt {
if (dir && dirNumberOfElements && slash) { if (dir && dirNumberOfElements && slash) {
size_t dir_len = slash - path + 1; size_t dir_len = slash - path + 1;
if (dir_len >= dirNumberOfElements) return -1; if (dir_len >= dirNumberOfElements) return 34;
wstrncpy(dir, path, dir_len); wstrncpy(dir, path, dir_len);
dir[dir_len] = L'\0'; dir[dir_len] = L'\0';
} }
if (fname && nameNumberOfElements) { if (fname && nameNumberOfElements) {
size_t fname_len = dot ? (size_t)(dot - filename_start) : wstrlen(filename_start); size_t fname_len = dot ? (size_t)(dot - filename_start) : wstrlen(filename_start);
if (fname_len >= nameNumberOfElements) return -1; if (fname_len >= nameNumberOfElements) return 34;
wstrncpy(fname, filename_start, fname_len); wstrncpy(fname, filename_start, fname_len);
fname[fname_len] = L'\0'; fname[fname_len] = L'\0';
} }
if (ext && extNumberOfElements && dot) { if (ext && extNumberOfElements && dot) {
size_t ext_len = wstrlen(dot); size_t ext_len = wstrlen(dot);
if (ext_len >= extNumberOfElements) return -1; if (ext_len >= extNumberOfElements) return 34;
wstrncpy(ext, dot, ext_len); wstrncpy(ext, dot, ext_len);
ext[ext_len] = L'\0'; ext[ext_len] = L'\0';
} }
if (drive && driveNumberOfElements && path[1] == L':' && path[2] == L'/') { if (drive && driveNumberOfElements && path[1] == L':' && path[2] == L'/') {
if (driveNumberOfElements < 3) return -1; if (driveNumberOfElements < 3) return 34;
drive[0] = path[0]; drive[0] = path[0];
drive[1] = L':'; drive[1] = L':';
drive[2] = L'\0'; drive[2] = L'\0';
@ -522,6 +540,11 @@ namespace msvcrt {
if(realpathResult){ if(realpathResult){
finalPath = resolved; finalPath = resolved;
} }
else if (!relPathStr.empty() && relPathStr[0] == '\\') {
// this is an absolute path - normalize it before assigning finalPath
for (char& c : relPathStr) if (c == '\\') c = '/';
finalPath = relPathStr;
}
else { else {
DEBUG_LOG("\tcould not find realpath, trying cwd...\n"); DEBUG_LOG("\tcould not find realpath, trying cwd...\n");
char cwd[PATH_MAX]; char cwd[PATH_MAX];