From 16f307f7cad1fa6d5ac09261e4caf06bebfbf72a Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 2 Mar 2022 09:47:46 -0800 Subject: [PATCH] Check both LOCAL_MACHINE and CURRENT_USER for fonts --- BeefLibs/Beefy2D/src/gfx/Font.bf | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/BeefLibs/Beefy2D/src/gfx/Font.bf b/BeefLibs/Beefy2D/src/gfx/Font.bf index 79bc7390..fa97a2d0 100644 --- a/BeefLibs/Beefy2D/src/gfx/Font.bf +++ b/BeefLibs/Beefy2D/src/gfx/Font.bf @@ -152,10 +152,23 @@ namespace Beefy.gfx { sFontNameMap = new .(); - Windows.HKey hkey; - if (Windows.RegOpenKeyExA(Windows.HKEY_LOCAL_MACHINE, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts", 0, - Windows.KEY_QUERY_VALUE | Windows.KEY_WOW64_32KEY | Windows.KEY_ENUMERATE_SUB_KEYS, out hkey) == Windows.S_OK) + for (int pass < 2) { + Windows.HKey hkey; + + if (pass == 0) + { + if (Windows.RegOpenKeyExA(Windows.HKEY_LOCAL_MACHINE, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts", 0, + Windows.KEY_QUERY_VALUE | Windows.KEY_WOW64_32KEY | Windows.KEY_ENUMERATE_SUB_KEYS, out hkey) != Windows.S_OK) + continue; + } + else + { + if (Windows.RegOpenKeyExA(Windows.HKEY_CURRENT_USER, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts", 0, + Windows.KEY_QUERY_VALUE | Windows.KEY_WOW64_32KEY | Windows.KEY_ENUMERATE_SUB_KEYS, out hkey) != Windows.S_OK) + continue; + } + defer Windows.RegCloseKey(hkey); for (int32 i = 0; true; i++)