SIMD95 warning + version update

JHRobotics · Sep 7, 2023 · 2b50983 · 2b50983
1 parent 5238a42
commit 2b50983
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ VBoxManage setextradata "My Windows 98" "VBoxInternal/Devices/vga/0/Config/VMSVG
 ### AMD Zen, 11th Generation Intel Core and newer
 Newer CPU have excellent performance but needs some extra tune:
 1) apply [patcher9x](https://github.com/JHRobotics/patcher9x) - this is required!
-2) Change TSC (Time Stamp Counter) behaviour
+2) Change TSC (Time Stamp Counter) behaviour (Warning: this options is not available when VirtualBox is using Hyper-V as execution, engine!)
 ```
 VBoxManage setextradata "My Windows 98" "VBoxInternal/TM/TSCTiedToExecution" 1
 ```

diff --git a/actions.c b/actions.c
@@ -318,6 +318,7 @@ BOOL proc_wait(HWND hwnd)
 extern version_t sysver;
 extern version_t WINVER98SE;
 extern version_t WINVER98;
+extern version_t WINVERME;
 
 void install_infobox(HWND hwnd, const char *name)
 {
@@ -537,8 +538,11 @@ BOOL setLineSvgaReg(char *buf, size_t bufs)
 
 	strcpy(buf, "AddReg=VMSvga.AddReg,VM.AddReg");
 
-	if(install_wine)
+	if(install_wine && version_compare(&sysver, &WINVERME) >= 0)
+	{
+		/* these entries is only relevant to system, that cannot replace ddraw.dll */
 		strcat(buf, ",DX.addReg");
+	}
 
 	if(install_res_qxga)
 		strcat(buf, ",VM.QXGA");

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+0.4.2023.19
+! fixed GPUs without CB (VBox <= 6.1)
+! fixed GMR allocation pool (introduced in 0.4.2023.13)
+! enabled direct rendering (introduced in 0.4.2023.18)
+! fixed direct rendering in window mode
+- optimized locks
+- driver configuration in registry
+- specific tune for VirtualBox/VMware
+
 0.4.2023.18
 ! fixed some stability issues in CRT (malloc, strndup, ...)
 ! More stability on non-SSE guests (introduced in 0.4.2023.13)

diff --git a/extra/vbox-optimize.reg b/extra/vbox-optimize.reg
@@ -0,0 +1,9 @@
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\Mesa3D\global]
+"SVGA_DMA_NEED_REREAD"="1"
+"SVGA_BLIT_SURF_TO_SCREEN"="1"
+
+[HKEY_LOCAL_MACHINE\Software\SVGA]
+"hwcursor"=dword:00000000
+"rgb565bug"=dword:00000001
diff --git a/extra/vmware-optimize.reg b/extra/vmware-optimize.reg
@@ -0,0 +1,9 @@
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\Mesa3D\global]
+"SVGA_DMA_NEED_REREAD"="0"
+"SVGA_BLIT_SURF_TO_SCREEN"="0"
+
+[HKEY_LOCAL_MACHINE\Software\SVGA]
+"hwcursor"=dword:00000001
+"rgb565bug"=dword:00000000
diff --git a/extra/wine-disable-shaders.reg b/extra/wine-disable-shaders.reg
@@ -0,0 +1,4 @@
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\Wine\global]
+"MaxShaderModelVS"=dword:00000000
diff --git a/extra/wine-system-dd-dx7.reg b/extra/wine-system-dd-dx7.reg
@@ -0,0 +1,4 @@
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\DDSwitcher]
+"global"="system"
diff --git a/softgpu.c b/softgpu.c
@@ -819,6 +819,15 @@ LRESULT CALLBACK softgpuWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 				case BTN_BROWSE:
 					softgpu_browse(hwnd);
 					break;
+				case CHBX_SIMD95:
+					if(IsDlgButtonChecked(hwnd, CHBX_SIMD95))
+					{
+						if(MessageBoxA(hwnd, "SIMD95 works well only in VirtualBox,\nin other cases, the system probably won't boot!\n\nAre you sure you want to this option set?", "WARNING!", MB_ICONWARNING|MB_YESNO) == IDNO)
+						{
+							CheckDlgButton(hwnd, CHBX_SIMD95, BST_UNCHECKED);
+						}
+					}
+					break;
 			} // switch(wParam)
 			break;
 		}
@@ -997,7 +1006,7 @@ int main(int argc, const char *argv[])
 			{
 				if(drvPCstatus & CHECK_DRV_NOPCI)
 				{
-					MessageBoxA(win, "No working PCI bus found! Without PCI bus installer and driver can't work!\n\nIf you're seeing this on QEMU, check REAME to solve this problem:\nhttps://github.com/JHRobotics/softgpu#qemu", "No PCI bus", MB_OK | MB_ICONHAND);
+					MessageBoxA(win, "No working PCI bus found! Without PCI bus installer and driver can't work!\n\nIf you're seeing this on QEMU, check README to solve this problem:\nhttps://github.com/JHRobotics/softgpu#qemu", "No PCI bus", MB_OK | MB_ICONHAND);
 				}
 				else if(drvPCstatus & CHECK_DRV_LEGACY_VGA)
 				{

diff --git a/softgpu.ini b/softgpu.ini
@@ -31,10 +31,10 @@ glu95=redist\opengl95\DLL\GLU32.DLL
 ;ie98.ver=Internet Explorer 6.0
 
 [version]
-vmdisp9x=1.2023.0.23
-mesa9x=23.1.6.32
-wine9x=1.7.55.15
-openglide9x=0.1.2023.10
+vmdisp9x=1.2023.0.24
+mesa9x=23.1.6.36
+wine9x=1.7.55.16
+openglide9x=0.1.2023.11
 simd95=1.0.0.0
 
 [fixes]
@@ -43,6 +43,10 @@ HKLM\Software\Mesa3D\quake2.exe\MESA_EXTENSION_MAX_YEAR;2000
 HKLM\Software\Mesa3D\quake3.exe\MESA_EXTENSION_MAX_YEAR;2004
 HKLM\Software\DDSwitcher\hl.exe;system
 HKLM\Software\DDSwitcher\diablo.exe;system
+HKLM\Software\DDSwitcher\mdk95.exe;system
+HKLM\Software\DDSwitcher\isle.exe;system
+HKLM\Software\DDSwitcher\legoisle.exe;system
+HKLM\Software\DDSwitcher\mib.exe;system
 HKLM\Software\OpenGlide\Hitman.exe\NumTMU;2
 HKLM\Software\OpenGlide\u9.icd\HideCursor;2
 HKLM\Software\OpenGlide\u9.exe\HideCursor;2