fix JIT debugger info + installer

Author: SkyLined

fOutputCurrentJITDebuggerSettings.py

@@ -1,60 +1,85 @@
 
+import mRegistry, mWindowsAPI;
 from mNotProvided import fbIsProvided;
 
 from foConsoleLoader import foConsoleLoader;
 from fsCreateBugIdCommandLine import fsCreateBugIdCommandLine;
 from fxGetCurrentJITDebuggerCommandLine import fxGetCurrentJITDebuggerCommandLine;
 from mColorsAndChars import *;
+import mJITDebuggerRegistry;
 oConsole = foConsoleLoader();
 
 def fOutputCurrentJITDebuggerSettings():
+  sOSISA = mWindowsAPI.oSystemInfo.sOSISA;
+  dsCommandLineKeyPath_by_sTargetBinaryISA = mJITDebuggerRegistry.ddsCommandLineKeyPath_by_sTargetBinaryISA_by_sOSISA[sOSISA];
   oConsole.fLock();
   try:
-    oConsole.fOutput("┌───[", COLOR_INFO, " Current JIT Debugger ", COLOR_NORMAL, "]", sPadding = "─");
-    xCurrentJITDebuggerCommandLine = fxGetCurrentJITDebuggerCommandLine();
-    if not fbIsProvided(xCurrentJITDebuggerCommandLine):
-      oConsole.fOutput(
-        "│ ",
-        COLOR_INFO, CHAR_INFO,
-        COLOR_NORMAL, "JIT debugger: ",
-        COLOR_INFO, "None",
-        COLOR_NORMAL, ".",
+    oConsole.fOutput(
+      "┌───[ ",
+      COLOR_INFO, "Current JIT Debugger", "s" if len(dsCommandLineKeyPath_by_sTargetBinaryISA) > 1 else "",
+      COLOR_NORMAL, " ]",
+      sPadding = "─"
+    );
+    dsCommandLineKeyPath_by_sTargetBinaryISA = mJITDebuggerRegistry.ddsCommandLineKeyPath_by_sTargetBinaryISA_by_sOSISA[sOSISA];
+    for (sTargetBinaryISA, sCommandLineKeyPath) in dsCommandLineKeyPath_by_sTargetBinaryISA.items():
+      # Get the current JIT debugger command line for the target binary ISA if one is installed.
+      oRegistryHiveKey = mRegistry.cRegistryHiveKey(
+        sHiveName = mJITDebuggerRegistry.sCommandLineHiveName,
+        sKeyPath = sCommandLineKeyPath,
       );
-    elif xCurrentJITDebuggerCommandLine is None:
-      oConsole.fOutput(
-        "│ ",
-        COLOR_ERROR, CHAR_ERROR,
-        COLOR_NORMAL, " JIT debugger: ",
-        COLOR_INFO, "Unknown",
-        COLOR_NORMAL, " (unable to read registry).",
-      );
-    else:
-      sBugIdJITDebuggerCommandLineStartsWith = fsCreateBugIdCommandLine();
-      if xCurrentJITDebuggerCommandLine.startswith(sBugIdJITDebuggerCommandLineStartsWith):
+      o0RegistryValue = oRegistryHiveKey.fo0GetValueForName(sValueName = "Debugger");
+      if o0RegistryValue is None:
         oConsole.fOutput(
           "│ ",
-          COLOR_OK, CHAR_OK,
+          COLOR_WARNING, CHAR_WARNING,
+          COLOR_NORMAL, " ",
+          COLOR_INFO, sTargetBinaryISA,
           COLOR_NORMAL, " JIT debugger: ",
-          COLOR_INFO, "BugId",
+          COLOR_INFO, "None",
           COLOR_NORMAL, ".",
         );
-        sArguments = xCurrentJITDebuggerCommandLine[len(sBugIdJITDebuggerCommandLineStartsWith) + 1:];
-        oConsole.fOutput(
-          "│   Arguments: ",
-          COLOR_INFO, sArguments,
-        );
-      else:
+      elif o0RegistryValue.sTypeName != "REG_SZ":
         oConsole.fOutput(
           "│ ",
-          COLOR_WARNING, CHAR_WARNING,
+          COLOR_ERROR, CHAR_ERROR,
+          COLOR_NORMAL, " ",
+          COLOR_INFO, sTargetBinaryISA,
           COLOR_NORMAL, " JIT debugger: ",
-          COLOR_INFO, "Other",
-          COLOR_NORMAL, ".",
-        );
-        oConsole.fOutput(
-          "│   Command line: ",
-          COLOR_INFO, xCurrentJITDebuggerCommandLine,
+          COLOR_INFO, "Unknown",
+          COLOR_NORMAL, " (registry value not a string).",
         );
+      else:
+        sCurrentJITDebuggerCommandLine = o0RegistryValue.xValue;
+        sBugIdJITDebuggerCommandLineStartsWith = fsCreateBugIdCommandLine();
+        if sCurrentJITDebuggerCommandLine.startswith(sBugIdJITDebuggerCommandLineStartsWith):
+          oConsole.fOutput(
+            "│ ",
+            COLOR_OK, CHAR_OK,
+            COLOR_NORMAL, " ",
+            COLOR_INFO, sTargetBinaryISA,
+            COLOR_NORMAL, " JIT debugger: ",
+            COLOR_INFO, "BugId",
+            COLOR_NORMAL, ".",
+          );
+          sArguments = sCurrentJITDebuggerCommandLine[len(sBugIdJITDebuggerCommandLineStartsWith) + 1:];
+          oConsole.fOutput(
+            "│   Arguments: ",
+            COLOR_INFO, sArguments,
+          );
+        else:
+          oConsole.fOutput(
+            "│ ",
+            COLOR_INFO, CHAR_INFO,
+            COLOR_NORMAL, " ",
+            COLOR_INFO, sTargetBinaryISA,
+            COLOR_NORMAL, " JIT debugger: ",
+            COLOR_INFO, "Other",
+            COLOR_NORMAL, ".",
+          );
+          oConsole.fOutput(
+            "│   Command line: ",
+            COLOR_INFO, sCurrentJITDebuggerCommandLine,
+          );
     oConsole.fOutput("└", sPadding = "─");
   finally:
     oConsole.fUnlock();

fbInstallAsJITDebugger.py

@@ -39,7 +39,7 @@ def fbInstallAsJITDebugger(asAdditionalArguments):
     asFilteredAdditionalArguments.append(sArgument);
 
   sOSISA = mWindowsAPI.oSystemInfo.sOSISA;
-  dsCommandLineKeyPath_by_sTargetBinaryISA = mJITDebuggerRegistry.ddsCommandLineKeyPath_by_sTargetBinaryISA_by_sOSISA[sOSIA];
+  dsCommandLineKeyPath_by_sTargetBinaryISA = mJITDebuggerRegistry.ddsCommandLineKeyPath_by_sTargetBinaryISA_by_sOSISA[sOSISA];
   for (sTargetBinaryISA, sCommandLineKeyPath) in dsCommandLineKeyPath_by_sTargetBinaryISA.items():
     sBugIdCommandLine = fsCreateBugIdCommandLine(
       (
@@ -77,11 +77,11 @@ def fbInstallAsJITDebugger(asAdditionalArguments):
       "Debugger": sBugIdCommandLine
     }.items():
       # Check if the value is already set correctly:
-      o0RegistryValue = oRegistryHiveKey.fo0GetValueForName(sValueName = "Debugger");
+      o0RegistryValue = oRegistryHiveKey.fo0GetValueForName(sValueName = sName);
 
       if o0RegistryValue and o0RegistryValue.sTypeName == "REG_SZ" and o0RegistryValue.xValue == sValue:
         continue; # Yes; no need to modify it.
-      
+      oConsole.fOutput("Modifying ", sName, "=REGSZ:", repr(sValue), " (was ", o0RegistryValue.sTypeName, ":", repr(o0RegistryValue.xValue));
       try:
         oRegistryHiveKey.foSetValueForName(sValueName = sName, sTypeName = "SZ", xValue = sValue);
       except WindowsError as oException:
@@ -96,6 +96,6 @@ def fbInstallAsJITDebugger(asAdditionalArguments):
       bSettingsForTargetBinaryISAChanged = True;
     oConsole.fOutput(
       COLOR_OK, CHAR_OK,
-      COLOR_NORMAL, " BugId is ", "already" if bSettingsForTargetBinaryISAChanged else "now", " installed as the default JIT debugger for 64-bit binaries.");
+      COLOR_NORMAL, " BugId ", "is now" if bSettingsForTargetBinaryISAChanged else "was already", " installed as the default JIT debugger for 64-bit binaries.");
     oConsole.fOutput("  Command line: ", COLOR_INFO, sBugIdCommandLine);
   return True;

fxGetCurrentJITDebuggerCommandLine.py

@@ -6,13 +6,14 @@
 import mJITDebuggerRegistry;
 oConsole = foConsoleLoader();
 
-def fxGetCurrentJITDebuggerCommandLine():
+def fxGetCurrentJITDebuggerCommandLine(sOSISA, sTargetBinaryISA):
+  dsCommandLineKeyPath = mJITDebuggerRegistry.ddsCommandLineKeyPath_by_sTargetBinaryISA_by_sOSISA[osISA][sTargetBinaryISA];
   # Returns a string with the current JIT debugger command line
   # or zNotProvided if no JIT debugger is installed.
   # or None if the registry could not be read or the value makes no sense.
   oRegistryHiveKey = cRegistryHiveKey(
-    sHiveName = mJITDebuggerRegistry.sCommandLineHiveName,
-    sKeyPath = mJITDebuggerRegistry.sCommandLineKeyPath,
+    sHiveName = dsCommandLineKeyPath.sCommandLineHiveName,
+    sKeyPath = dsCommandLineKeyPath.sCommandLineKeyPath,
   );
   o0RegistryValue = oRegistryHiveKey.fo0GetValueForName(sValueName = "Debugger");
   if o0RegistryValue is None: