From cf346634a80da3d2590136243fde34d7baa25285 Mon Sep 17 00:00:00 2001
From: rjkiv <76180273+rjkiv@users.noreply.github.com>
Date: Thu, 7 Aug 2025 12:29:23 -0700
Subject: [PATCH] use std::string over char*

---
 dll/kernel32.cpp | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/dll/kernel32.cpp b/dll/kernel32.cpp
index 7822407..d919150 100644
--- a/dll/kernel32.cpp
+++ b/dll/kernel32.cpp
@@ -1592,40 +1592,29 @@ namespace kernel32 {
 	// 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) {
 		DEBUG_LOG("FindResourceW %p\n", hModule);
-		char* name = nullptr;
-		char* type = nullptr;
+		std::string name, type;
 
 		if(!hModule) hModule = GetModuleHandleW(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 {
-			std::string str = wideStringToString((const unsigned short*)lpName);
-			name = (char*)str.c_str();
+			name = wideStringToString((const unsigned short*)lpName);
 		}
 
 		if((uintptr_t)lpType >> 16 == 0){
-			asprintf(&type, "%u",(unsigned int)(uintptr_t)lpType);
+			type = std::to_string((unsigned int)(uintptr_t)lpType);
 		}
 		else {
-			std::string str = 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;
+			type = wideStringToString((const unsigned short*)lpType);
 		}
 
+		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) {