[libbluray-devel] [Git][videolan/libbluray][master] Improve BDJ probing in Windows.

[Petri Hintukainen (@hpi)]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
83b2ac11 by hpi1 at 2021-08-11T13:55:11+03:00
Improve BDJ probing in Windows.

- - - - -


2 changed files:

- ChangeLog
- src/libbluray/bdj/bdj.c


Changes:

=====================================
ChangeLog
=====================================
@@ -1,3 +1,5 @@
+- Improve JVM probing in Windows.
+
 2021-04-05: Version 1.3.0
 - Add bd_event_name().
 - Add return value to bd_refcnt_inc().


=====================================
src/libbluray/bdj/bdj.c
=====================================
@@ -128,6 +128,10 @@ static void *_load_jvm_win32(const char **p_java_home)
         wcscpy(buf_loc, L"SOFTWARE\\JavaSoft\\JRE\\");
         r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
     }
+    if (r != ERROR_SUCCESS) {
+        wcscpy(buf_loc, L"SOFTWARE\\JavaSoft\\JDK\\");
+        r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
+    }
 # endif
     if (r != ERROR_SUCCESS) {
         BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening registry key SOFTWARE\\JavaSoft\\Java Runtime Environment\\\n");



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/83b2ac110e79cc4dcd95cdc4425e36d3e87a7963

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/83b2ac110e79cc4dcd95cdc4425e36d3e87a7963
You're receiving this email because of your account on code.videolan.org.