Changeset 76968 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 24, 2019 8:50:37 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128352

Message:

BIOS: Skip HLT instruction in protected-mode APM idle call. Avoids Windows 3.1 Standard mode (including Windows 3.1 installer) crashing when power.drv is used (see bugref:6549).

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• apm_pm.asm (modified) (1 diff)
• notes.txt (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS/apm_pm.asm

@@ -72 +72 @@
 
 apmf_idle:                              ; function 05h
+                ;
+                ; Windows 3.1 POWER.DRV in Standard mode calls into APM
+                ; with CPL=3. If that happens, the HLT instruction will fault
+                ; and Windows will crash. To prevent that, we check the CPL
+                ; and do nothing (better than crashing).
+                ;
+                push    cs
+                pop     ax
+                test    ax, 3           ; CPL > 0?
+                jnz     apmw_success
                 sti
                 hlt

trunk/src/VBox/Devices/PC/BIOS/notes.txt

@@ -71 +71 @@
 - PC DOS 6.x/7.x QCONFIG is a rare user of INT 16h fn 0Ah (read keyboard ID).
 
-- DOS POWER.EXE uses the real mode APM interface, OS/2 APM.SYS uses the 16-bit
-  protected mode APM interface, and Windows 9x uses the 32-bit protected mode
-  APM interface.
+- DOS POWER.EXE uses the real mode APM interface, Windows 3.1 POWER.DRV and
+  OS/2 APM.SYS use the 16-bit protected mode APM interface, and Windows 9x
+  uses the 32-bit protected mode APM interface.
 
 - Windows 98 is one of the few APM 1.2 users; Windows 95 uses APM 1.1, while
   newer systems prefer ACPI.
+
+- Windows 3.1 Standard mode violates the APM specifications and calls into
+  APM with CPL=3, causing the HLT instruction to fault if used. 386 Enhanced
+  mode Windows 3.1 calls into APM with CPL=3.
 
 - QNX4 calls 16-bit protected-mode PCI BIOS in an environment where ESP is