Merge pull request #100 from HIllya51/master

skywind3000 · web-flow · commit 5e9214a7a0f6 · 2025-03-30T10:25:13.000+08:00
fix loadlibrary error
diff --git a/PyStand.cpp b/PyStand.cpp
@@ -194,8 +194,9 @@ bool PyStand::LoadPython()
 	SetCurrentDirectoryW(runtime.c_str());
 	SetDllDirectoryW(runtime.c_str());
 
+	auto pydll = runtime + L"\\python3.dll";
 	// LoadLibrary
-	_hDLL = (HINSTANCE)LoadLibraryA("python3.dll");
+	_hDLL = (HINSTANCE)LoadLibraryW(pydll.c_str());
 	if (_hDLL) {
 		_Py_Main = (t_Py_Main)GetProcAddress(_hDLL, "Py_Main");
 	}
@@ -210,7 +211,7 @@ bool PyStand::LoadPython()
 	}
 	else if (_Py_Main == NULL) {
 		std::wstring msg = L"Cannot find Py_Main() in:\r\n";
-		msg += runtime + L"\\python3.dll";
+		msg += pydll;
 		MessageBoxW(NULL, msg.c_str(), L"ERROR", MB_OK);
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,9 @@ bool PyStand::LoadPython()`
`194`	`194`	`SetCurrentDirectoryW(runtime.c_str());`
`195`	`195`	`SetDllDirectoryW(runtime.c_str());`
`196`	`196`
	`197`	`+ auto pydll = runtime + L"\\python3.dll";`
`197`	`198`	`// LoadLibrary`
`198`		`- _hDLL = (HINSTANCE)LoadLibraryA("python3.dll");`
	`199`	`+ _hDLL = (HINSTANCE)LoadLibraryW(pydll.c_str());`
`199`	`200`	`if (_hDLL) {`
`200`	`201`	`_Py_Main = (t_Py_Main)GetProcAddress(_hDLL, "Py_Main");`
`201`	`202`	`}`
`@@ -210,7 +211,7 @@ bool PyStand::LoadPython()`
`210`	`211`	`}`
`211`	`212`	`else if (_Py_Main == NULL) {`
`212`	`213`	`std::wstring msg = L"Cannot find Py_Main() in:\r\n";`
`213`		`- msg += runtime + L"\\python3.dll";`
	`214`	`+ msg += pydll;`
`214`	`215`	`MessageBoxW(NULL, msg.c_str(), L"ERROR", MB_OK);`
`215`	`216`	`return false;`
`216`	`217`	`}`