Merge pull request #1174 from Thrameos/windows-locale

Windows locale
jpype-project · Apr 28, 2024 · 653ccff · 653ccff
2 parents cdb6be2 + 2c0420e
commit 653ccff
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/native/common/jp_platform.cpp b/native/common/jp_platform.cpp
@@ -64,7 +64,13 @@ class Win32PlatformAdapter : public JPPlatformAdapter
 	virtual void loadLibrary(const char* path) override
 	{
 		JP_TRACE_IN("Win32PlatformAdapter::loadLibrary");
-		jvmLibrary = LoadLibrary(path);
+		wchar_t *wpath = Py_DecodeLocale(path, NULL);
+		if (wpath == NULL)
+		{
+			JP_RAISE(PyExc_SystemError, "Unable to get JVM path with locale.");
+		}
+		jvmLibrary = LoadLibraryW(wpath);
+		PyMem_RawFree(wpath);
 		if (jvmLibrary == NULL)
 		{
 			JP_RAISE_OS_ERROR_WINDOWS( GetLastError(), path);