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

use std::string over char*

Browse Source
This commit is contained in:
rjkiv 2025-08-07 12:29:23 -07:00
parent 92f8944cf1
commit cf346634a8
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dll/kernel32.cpp
View File

@ -1592,40 +1592,29 @@ namespace kernel32 {
// https://github.com/wine-mirror/wine/blob/master/dlls/kernelbase/loader.c#L1097 // https://github.com/wine-mirror/wine/blob/master/dlls/kernelbase/loader.c#L1097
void* WIN_FUNC FindResourceW(void* hModule, const wchar_t* lpName, const wchar_t* lpType) { void* WIN_FUNC FindResourceW(void* hModule, const wchar_t* lpName, const wchar_t* lpType) {
DEBUG_LOG("FindResourceW %p\n", hModule); DEBUG_LOG("FindResourceW %p\n", hModule);
char* name = nullptr; std::string name, type;
char* type = nullptr;
if(!hModule) hModule = GetModuleHandleW(0); if(!hModule) hModule = GetModuleHandleW(0);
if((uintptr_t)lpName >> 16 == 0){ if((uintptr_t)lpName >> 16 == 0){
asprintf(&name, "%u",(unsigned int)(uintptr_t)lpName); name = std::to_string((unsigned int)(uintptr_t)lpName);
} }
else { else {
std::string str = wideStringToString((const unsigned short*)lpName); name = wideStringToString((const unsigned short*)lpName);
name = (char*)str.c_str();
} }
if((uintptr_t)lpType >> 16 == 0){ if((uintptr_t)lpType >> 16 == 0){
asprintf(&type, "%u",(unsigned int)(uintptr_t)lpType); type = std::to_string((unsigned int)(uintptr_t)lpType);
} }
else { else {
std::string str = wideStringToString((const unsigned short*)lpType); type = wideStringToString((const unsigned short*)lpType);
type = (char*)str.c_str();
}
if(name && type){
char path[512];
snprintf(path, sizeof(path), "resources/%s/%s.res", type, name);
DEBUG_LOG("Created path %s\n", path);
return fopen(path, "rb");
}
else {
free(name);
free(type);
DEBUG_LOG("Could not create path, falling back to 0x100002\n");
return (void*)0x100002;
} }
char path[512];
snprintf(path, sizeof(path), "resources/%s/%s.res", type.c_str(), name.c_str());
DEBUG_LOG("Created path %s\n", path);
return fopen(path, "rb");
// return (void*)0x100002;
} }
void* WIN_FUNC LoadResource(void* hModule, void* res) { void* WIN_FUNC LoadResource(void* hModule, void* res) {