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

more debug logs for wstr conversions

Browse Source
This commit is contained in:
rjkiv 2025-09-02 14:21:05 -07:00
parent 8af589882e
commit 4c9918ff2a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dll/msvcrt.cpp
View File

@ -138,10 +138,13 @@ namespace msvcrt {
size_t varnamelen = wstrlen(varname); size_t varnamelen = wstrlen(varname);
DEBUG_LOG("\tSearching env vars...\n");
for(uint16_t** env = __winitenv; env && *env; ++env){ for(uint16_t** env = __winitenv; env && *env; ++env){
uint16_t* cur = *env; uint16_t* cur = *env;
std::string cur_str = wideStringToString(cur); std::string cur_str = wideStringToString(cur);
DEBUG_LOG("\tCur env var: %s\n", cur_str.c_str());
if(wstrncmp(cur, varname, varnamelen) == 0 && cur[varnamelen] == L'='){ if(wstrncmp(cur, varname, varnamelen) == 0 && cur[varnamelen] == L'='){
DEBUG_LOG("Found the env var %s!\n", var_str.c_str());
uint16_t* value = cur + varnamelen + 1; uint16_t* value = cur + varnamelen + 1;
size_t value_len = wstrlen(value); size_t value_len = wstrlen(value);
@ -156,6 +159,7 @@ namespace msvcrt {
} }
} }
DEBUG_LOG("Could not find env var %s\n", var_str.c_str());
return 0; return 0;
} }

17
strutil.cpp
View File

@ -5,8 +5,11 @@
#include <string> #include <string>
#include <locale> #include <locale>
#include <codecvt> #include <codecvt>
#include <sstream>
size_t wstrlen(const uint16_t *str) { size_t wstrlen(const uint16_t *str) {
if(!str) return 0;
size_t len = 0; size_t len = 0;
while (str[len] != 0) while (str[len] != 0)
++len; ++len;
@ -126,13 +129,23 @@ std::string wideStringToString(const uint16_t *src, int len = -1) {
// the old implementation // the old implementation
std::string res(len, '\0'); std::string res(len, '\0');
std::string debug_wstr;
std::stringstream ss;
bool is_wide = false;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
ss << "0x" << std::hex << src[i] << " ";
// debug_wstr += std::format("0x%X ", src[i]);
if(src[i] > 255){ if(src[i] > 255){
// DEBUG_LOG("Encountered wide char with value 0x%X!\n", src[i]); // DEBUG_LOG("Encountered wide char with value 0x%X!\n", src[i]);
// assert(src[i] <= 255); // assert(src[i] <= 255);
is_wide = true;
} }
res[i] = src[i] & 0xFF; res[i] = src[i] & 0xFF;
} }
if(is_wide){
debug_wstr += ss.str();
DEBUG_LOG("wideString (%d): %s\n", wstrlen(src), debug_wstr.c_str());
}
return res; return res;
} }