WIP use EnumDisplayDevicesW to list devices and monitors, maybe

api/logic/minecraft/launch/PrintInstanceInfo.cpp

@@ -89,6 +89,56 @@ void runGlxinfo(QStringList & log)
 }
 #endif
 
+#ifdef Q_OS_WIN32
+#include <windows.h>
+
+namespace {
+void printDisplayFlags(QStringList & log, const DWORD flags, const char * spacing)
+{
+    QStringList flagStrings;
+    if(flags & DISPLAY_DEVICE_ACTIVE)
+    {
+        flags << "Active";
+    }
+    if(flags & DISPLAY_DEVICE_PRIMARY_DEVICE)
+    {
+        flags << "Primary";
+    }
+    if(flags & DISPLAY_DEVICE_MIRRORING_DRIVER)
+    {
+        flags << "Mirroring";
+    }
+    if(flagStrings.size())
+    {
+        log << QString("%1%2").arg(spacing, flagStrings.join(','));
+    }
+}
+
+void probeWinAPIForDevices(QStringList & log)
+{
+    DISPLAY_DEVICEW dd;
+    memset(&dd, 0, sizeof(DISPLAY_DEVICEW));
+    int i = 0;
+
+    // enumerate devices
+    while(EnumDisplayDevicesW(NULL, i, &dd, 0))
+    {
+        log << "Display devices:";
+        log << QString("Device Name: %1 | Device String: %2").arg(QString::fromWCharArray(dd.DeviceName), QString::fromWCharArray(dd.DeviceString));
+        printDisplayFlags(log, dd.StateFlags, "    ");
+
+        // enumerate monitors
+        if(EnumDisplayDevicesW(dd.DeviceName, 0, &dd, 0))
+        {
+            log << QString("    Monitor Name: %1 | Monitor String: %2").arg(QString::fromWCharArray(dd.DeviceName), QString::fromWCharArray(dd.DeviceString));
+            printDisplayFlags(log, dd.StateFlags, "        ");
+        }
+        i++;
+    }
+}
+}
+#endif
+
 void PrintInstanceInfo::executeTask()
 {
     auto instance = m_parent->instance();
@@ -100,6 +150,10 @@ void PrintInstanceInfo::executeTask()
     ::runGlxinfo(log);
 #endif
 
+#ifdef Q_OS_WIN32
+    ::probeWinAPIForDevices(log);
+#endif
+
     logLines(log, MessageLevel::MultiMC);
     logLines(instance->verboseDescription(m_session), MessageLevel::MultiMC);
     emitSucceeded();

application/setupwizard/JavaWizardPage.cpp

@@ -45,13 +45,7 @@ void JavaWizardPage::refresh()
 
 void JavaWizardPage::initializePage()
 {
-    auto s = MMC->settings();
-    m_java_widget->initialize(
-        s->get("JavaPath").toString(),
-        s->get("MinMemAlloc").toInt(),
-        s->get("MaxMemAlloc").toInt(),
-        s->get("PermGen").toInt()
-    );
+    m_java_widget->initialize();
 }
 
 bool JavaWizardPage::wantsRefreshButton()

application/widgets/JavaSettingsWidget.cpp

@@ -113,15 +113,15 @@ void JavaSettingsWidget::setupUi()
     retranslate();
 }
 
-void JavaSettingsWidget::initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen)
+void JavaSettingsWidget::initialize()
 {
     m_versionWidget->initialize(MMC->javalist().get());
     m_versionWidget->setResizeOn(2);
+    auto s = MMC->settings();
     // Memory
-    observedMinMemory = minHeap;
-    observedMaxMemory = maxHeap;
-    observedPermGenMemory = permGen;
-    m_javaPathTextBox->setText(currentJavaPath);
+    observedMinMemory = s->get("MinMemAlloc").toInt();
+    observedMaxMemory = s->get("MaxMemAlloc").toInt();
+    observedPermGenMemory = s->get("PermGen").toInt();
     m_minMemSpinBox->setValue(observedMinMemory);
     m_maxMemSpinBox->setValue(observedMaxMemory);
     m_permGenSpinBox->setValue(observedPermGenMemory);

application/widgets/JavaSettingsWidget.h

@@ -46,7 +46,7 @@ public:
     };
 
     void refresh();
-    void initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen);
+    void initialize();
     ValidationStatus validate();
     void retranslate();