Skip to content

Commit 0c7e820

Browse files
committed
hotfix release, changelog
1 parent b41c541 commit 0c7e820

7 files changed

Lines changed: 30 additions & 10 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ SoftGPU with HW acceleration was tested only with lasted version of VMware Works
283283
- Select *I will install the operating system later.*
284284
- As *Guest operating system* choice **Microsoft Windows** and as *Version* select **Windows 98** (this is optional, driver itself reporting system version)
285285

286-
![](resource/docs/vmw-setup-2b.png)
286+
![](resource/docs/vmw-setup-2c.png)
287287

288288
- Type VM name and number of processors keep on *1*
289289
- Set the memory to 512 MB (but without additional patches not more!)

changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.6.2024.37
2+
! native DDHAL now operable (introduced in 0.6.2024.36)
3+
! reduced wasteful surface align
4+
15
0.6.2024.36
26
! fixed missing non English chars
37
! VMWare vGPU10 support

resource/docs/vmw-setup-2b.png

-20.1 KB
Binary file not shown.

resource/docs/vmw-setup-2c.png

11.7 KB
Loading

settings.c

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,17 @@ void settingsSetStr(DWORD menu, const char *str, BOOL copy)
617617
}
618618
}
619619

620+
static DWORD getSettingsLevel()
621+
{
622+
DWORD settings_level = atoi(iniValueDef("[[softgpu]]", "settings_level", "0"));
623+
if(settings_level == 0)
624+
{
625+
settings_level = SOFTGPU_BUILD;
626+
}
627+
628+
return settings_level;
629+
}
630+
620631
#define MAX_CONF_DW 4
621632

622633
#define KEYNAME_FMT "HKCU\\SOFTWARE\\SoftGPU\\setup-%d\\%s"
@@ -626,6 +637,8 @@ void writeSettings()
626637
char keyname[MAX_PATH];
627638
DWORD confdw[MAX_CONF_DW];
628639

640+
DWORD settings_level = getSettingsLevel();
641+
629642
memset(&confdw[0], 0, sizeof(confdw));
630643

631644
settings_item_t *item;
@@ -644,11 +657,11 @@ void writeSettings()
644657
break;
645658
case T_INPUT_NUM:
646659
case T_DROPDOWN:
647-
sprintf(keyname, KEYNAME_FMT, SOFTGPU_BUILD, item->name);
660+
sprintf(keyname, KEYNAME_FMT, settings_level, item->name);
648661
registryWriteDWORD(keyname, item->dvalue);
649662
break;
650663
case T_INPUT_STR:
651-
sprintf(keyname, KEYNAME_FMT, SOFTGPU_BUILD, item->name);
664+
sprintf(keyname, KEYNAME_FMT, (item->menu == INP_PATH) ? SOFTGPU_BUILD : settings_level, item->name);
652665
registryWrite(keyname, item->svalue, WINREG_STR);
653666
break;
654667
}
@@ -657,7 +670,7 @@ void writeSettings()
657670
int j;
658671
for(j = 0; j < MAX_CONF_DW; j++)
659672
{
660-
sprintf(keyname, KEYNAME_FMT "%02d", SOFTGPU_BUILD, "cfg", j);
673+
sprintf(keyname, KEYNAME_FMT "%02d", settings_level, "cfg", j);
661674
registryWriteDWORD(keyname, confdw[j]);
662675
}
663676
}
@@ -668,10 +681,12 @@ BOOL readSettings()
668681
char value[MAX_PATH];
669682
DWORD confdw[MAX_CONF_DW];
670683

684+
DWORD settings_level = getSettingsLevel();
685+
671686
int j;
672687
for(j = 0; j < MAX_CONF_DW; j++)
673688
{
674-
sprintf(keyname, KEYNAME_FMT "%02d", SOFTGPU_BUILD, "cfg", j);
689+
sprintf(keyname, KEYNAME_FMT "%02d", settings_level, "cfg", j);
675690
if(!registryReadDWORD(keyname, &confdw[j]))
676691
{
677692
return FALSE;
@@ -691,11 +706,11 @@ BOOL readSettings()
691706
break;
692707
case T_INPUT_NUM:
693708
case T_DROPDOWN:
694-
sprintf(keyname, KEYNAME_FMT, SOFTGPU_BUILD, item->name);
709+
sprintf(keyname, KEYNAME_FMT, settings_level, item->name);
695710
registryReadDWORD(keyname, &item->dvalue);
696711
break;
697712
case T_INPUT_STR:
698-
sprintf(keyname, KEYNAME_FMT, SOFTGPU_BUILD, item->name);
713+
sprintf(keyname, KEYNAME_FMT, (item->menu == INP_PATH) ? SOFTGPU_BUILD : settings_level, item->name);
699714
if(registryRead(keyname, value, MAX_PATH))
700715
{
701716
if(item->svalue_freeptr != NULL)

softgpu.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ ws2path=redist\ws2setup.exe
3434
;ie98=redist\ie6setup\ie6setup.exe
3535
;ie98.ver=Internet Explorer 6.0
3636
default_profile=6
37-
default_path=C:\drivers\SG24.36
37+
default_path=C:\drivers\SG24.37
3838
mesa_alt=mesa23
39+
settings_level=36
3940

4041
[defaults]
4142
dxflags=0
@@ -150,7 +151,7 @@ error=1
150151
desc=ISA VGA or PCI VGA without PCI bus detected, this can't work! Please check Device manager before continue!
151152
152153
[version]
153-
vmdisp9x=1.2024.0.72
154+
vmdisp9x=1.2024.0.73
154155
mesa9x_main=24.1.4.107
155156
mesa9x_alt=23.1.9.107
156157
wine9x=1.7.55.38

softgpuver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#endif
1414

1515
#ifndef SOFTGPU_BUILD
16-
#define SOFTGPU_BUILD 0
16+
#define SOFTGPU_BUILD 37
1717
#endif
1818

1919
#define SOFTGPU_TAG "ALPHA3"

0 commit comments

Comments
 (0)