Skip to content

Commit 2b50983

Browse files
JHRoboticsJHRobotics
committed
SIMD95 warning + version update
1 parent 5238a42 commit 2b50983

File tree

9 files changed

+59
-7
lines changed

9 files changed

+59
-7
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ VBoxManage setextradata "My Windows 98" "VBoxInternal/Devices/vga/0/Config/VMSVG
124124
### AMD Zen, 11th Generation Intel Core and newer
125125
Newer CPU have excellent performance but needs some extra tune:
126126
1) apply [patcher9x](https://github.com/JHRobotics/patcher9x) - this is required!
127-
2) Change TSC (Time Stamp Counter) behaviour
127+
2) Change TSC (Time Stamp Counter) behaviour (Warning: this options is not available when VirtualBox is using Hyper-V as execution, engine!)
128128
```
129129
VBoxManage setextradata "My Windows 98" "VBoxInternal/TM/TSCTiedToExecution" 1
130130
```

‎actions.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ BOOL proc_wait(HWND hwnd)
318318
extern version_t sysver;
319319
extern version_t WINVER98SE;
320320
extern version_t WINVER98;
321+
extern version_t WINVERME;
321322

322323
void install_infobox(HWND hwnd, const char *name)
323324
{
@@ -537,8 +538,11 @@ BOOL setLineSvgaReg(char *buf, size_t bufs)
537538

538539
strcpy(buf, "AddReg=VMSvga.AddReg,VM.AddReg");
539540

540-
if(install_wine)
541+
if(install_wine && version_compare(&sysver, &WINVERME) >= 0)
542+
{
543+
/* these entries is only relevant to system, that cannot replace ddraw.dll */
541544
strcat(buf, ",DX.addReg");
545+
}
542546

543547
if(install_res_qxga)
544548
strcat(buf, ",VM.QXGA");

‎changelog.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
0.4.2023.19
2+
! fixed GPUs without CB (VBox <= 6.1)
3+
! fixed GMR allocation pool (introduced in 0.4.2023.13)
4+
! enabled direct rendering (introduced in 0.4.2023.18)
5+
! fixed direct rendering in window mode
6+
- optimized locks
7+
- driver configuration in registry
8+
- specific tune for VirtualBox/VMware
9+
110
0.4.2023.18
211
! fixed some stability issues in CRT (malloc, strndup, ...)
312
! More stability on non-SSE guests (introduced in 0.4.2023.13)

‎extra/vbox-optimize.reg‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
REGEDIT4
2+
3+
[HKEY_LOCAL_MACHINE\Software\Mesa3D\global]
4+
"SVGA_DMA_NEED_REREAD"="1"
5+
"SVGA_BLIT_SURF_TO_SCREEN"="1"
6+
7+
[HKEY_LOCAL_MACHINE\Software\SVGA]
8+
"hwcursor"=dword:00000000
9+
"rgb565bug"=dword:00000001

‎extra/vmware-optimize.reg‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
REGEDIT4
2+
3+
[HKEY_LOCAL_MACHINE\Software\Mesa3D\global]
4+
"SVGA_DMA_NEED_REREAD"="0"
5+
"SVGA_BLIT_SURF_TO_SCREEN"="0"
6+
7+
[HKEY_LOCAL_MACHINE\Software\SVGA]
8+
"hwcursor"=dword:00000001
9+
"rgb565bug"=dword:00000000

‎extra/wine-disable-shaders.reg‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
REGEDIT4
2+
3+
[HKEY_LOCAL_MACHINE\Software\Wine\global]
4+
"MaxShaderModelVS"=dword:00000000

‎extra/wine-system-dd-dx7.reg‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
REGEDIT4
2+
3+
[HKEY_LOCAL_MACHINE\Software\DDSwitcher]
4+
"global"="system"

‎softgpu.c‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,15 @@ LRESULT CALLBACK softgpuWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
819819
case BTN_BROWSE:
820820
softgpu_browse(hwnd);
821821
break;
822+
case CHBX_SIMD95:
823+
if(IsDlgButtonChecked(hwnd, CHBX_SIMD95))
824+
{
825+
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)
826+
{
827+
CheckDlgButton(hwnd, CHBX_SIMD95, BST_UNCHECKED);
828+
}
829+
}
830+
break;
822831
} // switch(wParam)
823832
break;
824833
}
@@ -997,7 +1006,7 @@ int main(int argc, const char *argv[])
9971006
{
9981007
if(drvPCstatus & CHECK_DRV_NOPCI)
9991008
{
1000-
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);
1009+
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);
10011010
}
10021011
else if(drvPCstatus & CHECK_DRV_LEGACY_VGA)
10031012
{

‎softgpu.ini‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ glu95=redist\opengl95\DLL\GLU32.DLL
3131
;ie98.ver=Internet Explorer 6.0
3232

3333
[version]
34-
vmdisp9x=1.2023.0.23
35-
mesa9x=23.1.6.32
36-
wine9x=1.7.55.15
37-
openglide9x=0.1.2023.10
34+
vmdisp9x=1.2023.0.24
35+
mesa9x=23.1.6.36
36+
wine9x=1.7.55.16
37+
openglide9x=0.1.2023.11
3838
simd95=1.0.0.0
3939

4040
[fixes]
@@ -43,6 +43,10 @@ HKLM\Software\Mesa3D\quake2.exe\MESA_EXTENSION_MAX_YEAR;2000
4343
HKLM\Software\Mesa3D\quake3.exe\MESA_EXTENSION_MAX_YEAR;2004
4444
HKLM\Software\DDSwitcher\hl.exe;system
4545
HKLM\Software\DDSwitcher\diablo.exe;system
46+
HKLM\Software\DDSwitcher\mdk95.exe;system
47+
HKLM\Software\DDSwitcher\isle.exe;system
48+
HKLM\Software\DDSwitcher\legoisle.exe;system
49+
HKLM\Software\DDSwitcher\mib.exe;system
4650
HKLM\Software\OpenGlide\Hitman.exe\NumTMU;2
4751
HKLM\Software\OpenGlide\u9.icd\HideCursor;2
4852
HKLM\Software\OpenGlide\u9.exe\HideCursor;2

0 commit comments

Comments
 (0)