DXGL r793 - Code Review

Repository:	DXGL
Revision:	< r792‎ \| r793 \| r794 >
Date:	01:21, 13 March 2018
Author:	admin
Status:	new
Tags:
Comment:	Add hack to remove TV-compatible refresh rates. Make both versions of EnumDisplayModes function the same. Update installer to remove separate DXGL Test. Temporarily remove color key threshold and post-process shader options from DXGL Config.
Modified paths:	/Installer/dxgl.nsi (modified) (history) /cfgmgr/ReadMe.txt (modified) (history) /cfgmgr/cfgmgr.c (modified) (history) /cfgmgr/cfgmgr.h (modified) (history) /ddraw/glDirectDraw.cpp (modified) (history) /dxgl-example.ini (modified) (history) /dxglcfg/dxglcfg.cpp (modified) (history) /dxglcfg/dxglcfg.rc (modified) (history) /dxglcfg/resource.h (modified) (history)

Diff [purge]

Index: Installer/dxgl.nsi
—	—	@@ -143,9 +143,9 @@
144	144	SectionIn RO
145	145	SetOutPath "$INSTDIR"
146	146	SetOverwrite ifnewer
147		~~- File "..\${SRCDIR}\dxgltest.exe"~~
	147	+ Delete "$INSTDIR\dxgltest.exe"
148	148	CreateDirectory "$SMPROGRAMS\DXGL"
149		~~- CreateShortCut "$SMPROGRAMS\DXGL\DXGL Test.lnk" "$INSTDIR\dxgltest.exe"~~
	149	+ Delete "$SMPROGRAMS\DXGL\DXGL Test.lnk"
150	150	File "..\${SRCDIR}\dxglcfg.exe"
151	151	CreateShortCut "$SMPROGRAMS\DXGL\Configure DXGL.lnk" "$INSTDIR\dxglcfg.exe"
152	152	File "..\${SRCDIR}\ddraw.dll"
—	—	@@ -193,7 +193,7 @@
194	194
195	195	Section -PostInstall
196	196	ExecWait '"$INSTDIR\dxglcfg.exe" upgrade'
197		~~- ExecWait '"$INSTDIR\dxgltest.exe" install'~~
	197	+ ExecWait '"$INSTDIR\dxglcfg.exe" profile_install'
198	198	SectionEnd
199	199
200	200	Section "Fix DDraw COM registration" SEC_COMFIX
Index: cfgmgr/ReadMe.txt
—	—	@@ -529,6 +529,24 @@
530	530	that DXGL will use, unless the actual major version is less than
531	531	DebugMaxGLVersionMajor.
532	532
	533	+Member HackCrop640480to640400
	534	+INI Entry HackCrop640480to640400
	535	+INI Group hacks
	536	+REG_DWORD HKCU\DXGL\Profiles\<app>\HackCrop640480to640400
	537	+Crops 640x480 display mode to 640x400.
	538	+
	539	+Member HackAutoScale512448to640480
	540	+INI Entry HackAutoScale512448to640480
	541	+INI Group hacks
	542	+REG_DWORD HKCU\DXGL\Profiles\<app>\HackAutoScale512448to640480
	543	+Expands a 512x448 image to 640x480 if the bordering pixels are black.
	544	+
	545	+Member HackNoTVRefresh
	546	+INI Entry HackNoTVRefresh
	547	+INI Group hacks
	548	+REG_DWORD HKCU\DXGL\Profiles\<app>\HackNoTVRefresh
	549	+Rounds out TV-compatible refresh rates and discards duplicates.
	550	+
533	551	Member Windows8Detected
534	552	Not in INI file
535	553	REG_DWORD HKCU\DXGL\Global\Windows8Detected
Index: cfgmgr/cfgmgr.c
—	—	@@ -613,7 +613,8 @@
614	614	1, _T("FirstScaleY"));
615	615	cfg->scalingfilter = ReadDWORD(hKey,cfg->scalingfilter,&cfgmask->scalingfilter,_T("ScalingFilter"));
616	616	cfg->BltScale = ReadDWORD(hKey, cfg->BltScale, &cfgmask->BltScale, _T("BltScale"));
617		~~- cfg->BltThreshold = ReadDWORD(hKey, cfg->BltThreshold, &cfgmask->BltThreshold, _T("BltThreshold"));~~
	617	+ // Removed for DXGL 0.5.13 release
	618	+ // cfg->BltThreshold = ReadDWORD(hKey, cfg->BltThreshold, &cfgmask->BltThreshold, _T("BltThreshold"));
618	619	cfg->texfilter = ReadDWORD(hKey,cfg->texfilter,&cfgmask->texfilter,_T("TextureFilter"));
619	620	cfg->anisotropic = ReadDWORD(hKey,cfg->anisotropic,&cfgmask->anisotropic,_T("AnisotropicFiltering"));
620	621	cfg->msaa = ReadDWORD(hKey,cfg->msaa,&cfgmask->msaa,_T("Antialiasing"));
—	—	@@ -663,6 +664,7 @@
664	665	cfg->DebugMaxGLVersionMinor = ReadDWORD(hKey, cfg->DebugMaxGLVersionMinor, &cfgmask->DebugMaxGLVersionMinor, _T("DebugMaxGLVersionMinor"));
665	666	cfg->HackCrop640480to640400 = ReadBool(hKey, cfg->HackCrop640480to640400, &cfgmask->HackCrop640480to640400, _T("HackCrop640480to640400"));
666	667	cfg->HackAutoScale512448to640480 = ReadBool(hKey, cfg->HackAutoScale512448to640480, &cfgmask->HackAutoScale512448to640480, _T("HackAutoScale512448to640480"));
	668	+ cfg->HackNoTVRefresh = ReadBool(hKey, cfg->HackNoTVRefresh, &cfgmask->HackNoTVRefresh, _T("HackNoTVRefresh"));
667	669	if(!global && dll)
668	670	{
669	671	sizeout = 0;
—	—	@@ -762,7 +764,8 @@
763	765	1, _T("FirstScaleY"));
764	766	WriteDWORD(hKey,cfg->scalingfilter,cfgmask->scalingfilter,_T("ScalingFilter"));
765	767	WriteDWORD(hKey, cfg->BltScale, cfgmask->BltScale, _T("BltScale"));
766		~~- WriteDWORD(hKey, cfg->BltThreshold, cfgmask->BltThreshold, _T("BltThreshold"));~~
	768	+ // Removed for DXGL 0.5.13 release
	769	+ // WriteDWORD(hKey, cfg->BltThreshold, cfgmask->BltThreshold, _T("BltThreshold"));
767	770	WriteDWORD(hKey,cfg->texfilter,cfgmask->texfilter,_T("TextureFilter"));
768	771	WriteDWORD(hKey,cfg->anisotropic,cfgmask->anisotropic,_T("AnisotropicFiltering"));
769	772	WriteDWORD(hKey,cfg->msaa,cfgmask->msaa,_T("Antialiasing"));
—	—	@@ -811,6 +814,7 @@
812	815	WriteDWORD(hKey, cfg->DebugMaxGLVersionMinor, cfgmask->DebugMaxGLVersionMinor, _T("DebugMaxGLVersionMinor"));
813	816	WriteBool(hKey, cfg->HackCrop640480to640400, cfgmask->HackCrop640480to640400, _T("HackCrop640480to640400"));
814	817	WriteBool(hKey, cfg->HackAutoScale512448to640480, cfgmask->HackAutoScale512448to640480, _T("HackAutoScale512448to640480"));
	818	+ WriteBool(hKey, cfg->HackNoTVRefresh, cfgmask->HackNoTVRefresh, _T("HackNoTVRefresh"));
815	819	}
816	820
817	821	TCHAR newregname[MAX_PATH+65];
—	—	@@ -910,7 +914,8 @@
911	915	cfg->DisplayMultiplierY = 1.0f;
912	916	cfg->primaryscalex = 1.0f;
913	917	cfg->primaryscaley = 1.0f;
914		~~- cfg->BltThreshold = 127;~~
	918	+ // Removed for DXGL 0.5.13 release
	919	+ // cfg->BltThreshold = 127;
915	920	cfg->WindowPosition = 1;
916	921	cfg->RememberWindowSize = TRUE;
917	922	cfg->RememberWindowPosition = TRUE;
—	—	@@ -1017,7 +1022,8 @@
1018	1023	{
1019	1024	if (!stricmp(name, "ScalingFilter")) cfg->scalingfilter = INIIntValue(value);
1020	1025	if (!stricmp(name, "BltScale")) cfg->BltScale = INIIntValue(value);
1021		~~- if (!stricmp(name, "BltThreshold")) cfg->BltThreshold = INIIntValue(value);~~
	1026	+ // Removed for DXGL 0.5.13 release
	1027	+ // if (!stricmp(name, "BltThreshold")) cfg->BltThreshold = INIIntValue(value);
1022	1028	if (!stricmp(name, "AdjustPrimaryResolution")) cfg->primaryscale = INIIntValue(value);
1023	1029	if (!stricmp(name, "PrimaryScaleX")) cfg->primaryscalex = INIFloatValue(value);
1024	1030	if (!stricmp(name, "PrimaryScaleY")) cfg->primaryscaley = INIFloatValue(value);
—	—	@@ -1060,7 +1066,7 @@
1061	1067	if (!stricmp(name, "WindowY")) cfg->WindowY = INIIntValue(value);
1062	1068	if (!stricmp(name, "WindowWidth")) cfg->WindowWidth = INIIntValue(value);
1063	1069	if (!stricmp(name, "WindowHeight")) cfg->WindowHeight = INIIntValue(value);
1064		~~- if (!stricmp(name, "WindowMaximized")) cfg->WindowMaximized = INIIntValue(value);~~
	1070	+ if (!stricmp(name, "WindowMaximized")) cfg->WindowMaximized = INIBoolValue(value);
1065	1071	}
1066	1072	if (!stricmp(section, "debug"))
1067	1073	{
—	—	@@ -1080,6 +1086,7 @@
1081	1087	{
1082	1088	if (!stricmp(section, "HackCrop640480to640400")) cfg->HackCrop640480to640400 = INIBoolValue(value);
1083	1089	if (!stricmp(section, "HackAutoScale512448to640480")) cfg->HackAutoScale512448to640480 = INIBoolValue(value);
	1090	+ if (!stricmp(section, "HackNoTVRefresh")) cfg->HackNoTVRefresh = INIBoolValue(value);
1084	1091	}
1085	1092	return 1;
1086	1093	}
Index: cfgmgr/cfgmgr.h
—	—	@@ -43,7 +43,8 @@
44	44	// [scaling]
45	45	DWORD scalingfilter;
46	46	DWORD BltScale;
47		~~- DWORD BltThreshold;~~
	47	+ // Removed for DXGL 0.5.13 release
	48	+ // DWORD BltThreshold;
48	49	DWORD primaryscale;
49	50	float primaryscalex;
50	51	float primaryscaley;
—	—	@@ -91,6 +92,7 @@
92	93	// [hacks]
93	94	BOOL HackCrop640480to640400;
94	95	BOOL HackAutoScale512448to640480;
	96	+ BOOL HackNoTVRefresh;
95	97	// internal
96	98	BOOL Windows8Detected;
97	99	BOOL ParsedAddColorDepths;
Index: ddraw/glDirectDraw.cpp
—	—	@@ -437,6 +437,26 @@
438	438	*count += newcount;
439	439	}
440	440
	441	+void RemoveTVAspectModes(DEVMODE **array, DWORD count)
	442	+{
	443	+ for (DWORD i = 0; i < count; i++)
	444	+ {
	445	+ if ((*array)[i].dmDisplayFrequency == 23)
	446	+ (*array)[i].dmDisplayFrequency = 24;
	447	+ else if ((*array)[i].dmDisplayFrequency == 29)
	448	+ (*array)[i].dmDisplayFrequency = 30;
	449	+ else if ((*array)[i].dmDisplayFrequency == 47)
	450	+ (*array)[i].dmDisplayFrequency = 48;
	451	+ else if ((*array)[i].dmDisplayFrequency == 59)
	452	+ (*array)[i].dmDisplayFrequency = 60;
	453	+ else if ((*array)[i].dmDisplayFrequency == 71)
	454	+ (*array)[i].dmDisplayFrequency = 72;
	455	+ else if ((*array)[i].dmDisplayFrequency == 119)
	456	+ (*array)[i].dmDisplayFrequency = 120;
	457	+ }
	458	+}
	459	+
	460	+
441	461	void AddExtraColorModes(DEVMODE *array, DWORD count)
442	462	{
443	463	DEVMODE array2 = (DEVMODE )malloc(sizeof(DEVMODE)(7(*count)));
—	—	@@ -600,8 +620,7 @@
601	621	}
602	622	}
603	623	DiscardDuplicateModes(&modes,&modenum);
604		~~- if(dxglcfg.AddColorDepths) AddExtraColorModes(&modes,&modenum); // FIXME: Add color depths by bitmask~~
605		~~- DiscardDuplicateModes(&modes,&modenum);~~
	624	+ if(dxglcfg.AddColorDepths) AddExtraColorModes(&modes,&modenum);
606	625	if (dxglcfg.scaler != 0)
607	626	{
608	627	if (dxglcfg.AddModes & 1) //Common low resolutions and doubled modes
—	—	@@ -622,12 +641,10 @@
623	642	if (dxglcfg.AddModes && (_isnan(dxglcfg.postsizex) \|\| _isnan(dxglcfg.postsizey) \|\|
624	643	(dxglcfg.postsizex < 0.25f) \|\| (dxglcfg.postsizey < 0.25f)))
625	644	{
626		~~- if (dxglcfg.AddModes & 1)~~
627		~~- {~~
628		~~- AddDoubledResolutions(&modes, &modenum);~~
629		~~- DiscardDuplicateModes(&modes, &modenum);~~
630		~~- }~~
	645	+ if (dxglcfg.AddModes & 1) AddDoubledResolutions(&modes, &modenum);
631	646	}
	647	+ if (dxglcfg.HackNoTVRefresh) RemoveTVAspectModes(&modes, modenum);
	648	+ DiscardDuplicateModes(&modes, &modenum);
632	649	modenum--;
633	650	switch(dxglcfg.SortModes)
634	651	{
—	—	@@ -707,7 +724,8 @@
708	725	}
709	726	HRESULT EnumDisplayModes2(DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
710	727	{
711		~~- bool match;~~
	728	+ BOOL match;
	729	+ BOOL scalemodes;
712	730	DWORD modenum = 0;
713	731	DWORD modemax = 128;
714	732	DEVMODE mode;
—	—	@@ -720,8 +738,20 @@
721	739	ZeroMemory(&ddmode,sizeof(DDSURFACEDESC2));
722	740	ddmode.dwSize = sizeof(DDSURFACEDESC2);
723	741	ddmode.dwFlags = DDSD_HEIGHT \| DDSD_WIDTH \| DDSD_PITCH \| DDSD_PIXELFORMAT \| DDSD_REFRESHRATE;
	742	+ if (!_isnan(dxglcfg.postsizex) && !_isnan(dxglcfg.postsizey) &&
	743	+ (dxglcfg.postsizex > 0.25f) && (dxglcfg.postsizey > 0.25f) &&
	744	+ (dxglcfg.postsizex != 1.0f) && (dxglcfg.postsizey != 1.0f) &&
	745	+ ((dxglcfg.scaler == 0) \|\| ((dxglcfg.scaler >= 4) && (dxglcfg.scaler <= 6))) &&
	746	+ (!dxglcfg.primaryscale))
	747	+ scalemodes = TRUE;
	748	+ else scalemodes = FALSE;
724	749	while(EnumDisplaySettings(NULL,modenum++,&mode))
725	750	{
	751	+ if (scalemodes)
	752	+ {
	753	+ mode.dmPelsWidth /= dxglcfg.postsizex;
	754	+ mode.dmPelsHeight /= dxglcfg.postsizey;
	755	+ }
726	756	modes[modenum-1] = mode;
727	757	if(modenum >= modemax)
728	758	{
—	—	@@ -736,7 +766,7 @@
737	767	}
738	768	}
739	769	DiscardDuplicateModes(&modes,&modenum);
740		~~- if(dxglcfg.AddColorDepths) AddExtraColorModes(&modes,&modenum); // FIXME: Add color depths by bitmask~~
	770	+ if(dxglcfg.AddColorDepths) AddExtraColorModes(&modes,&modenum);
741	771	if (dxglcfg.scaler != 0)
742	772	{
743	773	if (dxglcfg.AddModes & 1) //Common low resolutions and doubled modes
—	—	@@ -757,12 +787,10 @@
758	788	if (dxglcfg.AddModes && (_isnan(dxglcfg.postsizex) \|\| _isnan(dxglcfg.postsizey) \|\|
759	789	(dxglcfg.postsizex < 0.25f) \|\| (dxglcfg.postsizey < 0.25f)))
760	790	{
761		~~- if (dxglcfg.AddModes & 1)~~
762		~~- {~~
763		~~- AddDoubledResolutions(&modes, &modenum);~~
764		~~- DiscardDuplicateModes(&modes, &modenum);~~
765		~~- }~~
	791	+ if (dxglcfg.AddModes & 1) AddDoubledResolutions(&modes, &modenum);
766	792	}
	793	+ if (dxglcfg.HackNoTVRefresh) RemoveTVAspectModes(&modes, modenum);
	794	+ DiscardDuplicateModes(&modes, &modenum);
767	795	modenum--;
768	796	switch(dxglcfg.SortModes)
769	797	{
Index: dxgl-example.ini
—	—	@@ -596,3 +596,11 @@
597	597	; black bars in 640x480 mode.
598	598	; Default is false
599	599	HackAutoScale512448to640480 = false
	600	+
	601	+; HackNoTVRefresh - Boolean
	602	+; Removes TV-compatible refresh rates that may be added by Windows 7 and
	603	+; above. If a rounded refresh rate is not available it will be added.
	604	+; This may fix some games that may run at a reduced framerate due to these
	605	+; compatible refresh rates operating above the integer refresh rate.
	606	+; Default is false
	607	+HackNoTVRefresh = false
Index: dxglcfg/dxglcfg.cpp
—	—	@@ -1831,7 +1831,8 @@
1832	1832	SetFloat3place(hWnd, IDC_CUSTOMSCALEY, cfg->primaryscaley, cfgmask->primaryscaley);
1833	1833	}
1834	1834	break;
1835		~~- case IDC_BLTTHRESHOLD:~~
	1835	+ // Removed for DXGL 0.5.13 release
	1836	+ /*case IDC_BLTTHRESHOLD:
1836	1837	if (HIWORD(wParam) == EN_CHANGE)
1837	1838	{
1838	1839	if (!EditInterlock)
—	—	@@ -1847,7 +1848,7 @@
1848	1849	{
1849	1850	SetInteger(hWnd, IDC_BLTTHRESHOLD, cfg->BltThreshold, cfgmask->BltThreshold);
1850	1851	}
1851		~~- break;~~
	1852	+ break;*/
1852	1853	case IDC_SHADER:
1853	1854	if (HIWORD(wParam) == EN_CHANGE)
1854	1855	{
—	—	@@ -1864,7 +1865,8 @@
1865	1866	default:
1866	1867	break;
1867	1868	}
1868		~~- case WM_HSCROLL:~~
	1869	+ // Removed for DXGL 0.5.13 release
	1870	+ /* case WM_HSCROLL:
1869	1871	switch (LOWORD(wParam))
1870	1872	{
1871	1873	case TB_ENDTRACK:
—	—	@@ -1885,7 +1887,7 @@
1886	1888	default:
1887	1889	break;
1888	1890	}
1889		~~- break;~~
	1891	+ break;*/
1890	1892	default:
1891	1893	return FALSE;
1892	1894	}
—	—	@@ -2282,6 +2284,10 @@
2283	2285	*value = cfg->HackAutoScale512448to640480;
2284	2286	*mask = cfgmask->HackAutoScale512448to640480;
2285	2287	break;
	2288	+ case 2:
	2289	+ *value = cfg->HackNoTVRefresh;
	2290	+ *mask = cfgmask->HackNoTVRefresh;
	2291	+ break;
2286	2292	default:
2287	2293	*value = FALSE;
2288	2294	*mask = FALSE;
—	—	@@ -2301,6 +2307,9 @@
2302	2308	cfg->HackAutoScale512448to640480 = value;
2303	2309	cfgmask->HackAutoScale512448to640480 = mask;
2304	2310	break;
	2311	+ case 2:
	2312	+ cfg->HackNoTVRefresh = value;
	2313	+ cfgmask->HackNoTVRefresh = mask;
2305	2314	default:
2306	2315	break;
2307	2316	}
—	—	@@ -2778,11 +2787,12 @@
2779	2788	_tcscpy(buffer, _T("Bilinear, soft colorkey"));
2780	2789	SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_ADDSTRING, 4, (LPARAM)buffer);
2781	2790	SendDlgItemMessage(hTabs[1], IDC_BLTFILTER, CB_SETCURSEL, cfg->BltScale, 0);
	2791	+ // Removed for DXGL 0.5.13 release
2782	2792	// Blt scaling threshold
2783		~~- SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETRANGE, 0, 0xFE0000);~~
2784		~~- SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETPOS, TRUE, cfg->BltThreshold);~~
2785		~~- SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLD, EM_SETLIMITTEXT, 3, 0);~~
2786		~~- SetInteger(hTabs[1], IDC_BLTTHRESHOLD, cfg->BltThreshold, cfgmask->BltThreshold);~~
	2793	+ // SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETRANGE, 0, 0xFE0000);
	2794	+ // SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETPOS, TRUE, cfg->BltThreshold);
	2795	+ // SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLD, EM_SETLIMITTEXT, 3, 0);
	2796	+ // SetInteger(hTabs[1], IDC_BLTTHRESHOLD, cfg->BltThreshold, cfgmask->BltThreshold);
2787	2797	// aspect
2788	2798	_tcscpy(buffer,_T("Default"));
2789	2799	SendDlgItemMessage(hTabs[0], IDC_ASPECT, CB_ADDSTRING, 0, (LPARAM)buffer);
—	—	@@ -3068,6 +3078,8 @@
3069	3079	SendDlgItemMessage(hTabs[5], IDC_HACKSLIST, LB_ADDSTRING, 0, (LPARAM)buffer);
3070	3080	_tcscpy(buffer, _T("Expand 512x448 to 640x480 when border is blank"));
3071	3081	SendDlgItemMessage(hTabs[5], IDC_HACKSLIST, LB_ADDSTRING, 0, (LPARAM)buffer);
	3082	+ _tcscpy(buffer, _T("Remove TV-compatible refresh rates"));
	3083	+ SendDlgItemMessage(hTabs[5], IDC_HACKSLIST, LB_ADDSTRING, 0, (LPARAM)buffer);
3072	3084	// About text
3073	3085	_tcscpy(abouttext, _T("DXGL\r\nVersion "));
3074	3086	_tcscat(abouttext, _T(DXGLVERSTRING));
—	—	@@ -3531,12 +3543,13 @@
3532	3544	SetFloat3place(hTabs[1], IDC_CUSTOMSCALEY, cfg->primaryscaley, cfgmask->primaryscaley);
3533	3545	SetText(hTabs[1], IDC_SHADER, cfg->shaderfile, cfgmask->shaderfile, tristate);
3534	3546	SetCombo(hTabs[1], IDC_BLTFILTER, cfg->BltScale, cfgmask->BltScale, tristate);
3535		~~- SetInteger(hTabs[1], IDC_BLTTHRESHOLD, cfg->BltThreshold, cfgmask->BltThreshold);~~
	3547	+ // Removed for DXGL 0.5.13 release
	3548	+ /* SetInteger(hTabs[1], IDC_BLTTHRESHOLD, cfg->BltThreshold, cfgmask->BltThreshold);
3536	3549	if (cfgmask->BltThreshold)
3537	3550	{
3538	3551	SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETPOS, TRUE, cfg->BltThreshold);
3539	3552	}
3540		~~- else SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETPOS, TRUE, 127);~~
	3553	+ else SendDlgItemMessage(hTabs[1], IDC_BLTTHRESHOLDSLIDER, TBM_SETPOS, TRUE, 127);*/
3541	3554	// 3D tab
3542	3555	SetCombo(hTabs[2], IDC_TEXFILTER, cfg->texfilter, cfgmask->texfilter, tristate);
3543	3556	SetCombo(hTabs[2], IDC_ANISO, cfg->anisotropic, cfgmask->anisotropic, tristate);
—	—	@@ -4027,7 +4040,7 @@
4028	4041	// FIXME: Remove DXGL Config profile
4029	4042	LPDIRECTDRAW lpdd;
4030	4043	DirectDrawCreate(NULL, &lpdd, NULL);
4031		~~- lpdd->Release();~~
	4044	+ IDirectDraw_Release(lpdd);
4032	4045	return 0;
4033	4046	}
4034	4047	icc.dwSize = sizeof(icc);
Index: dxglcfg/dxglcfg.rc
—	—	@@ -97,9 +97,9 @@
98	98	COMBOBOX IDC_MSAA, 7, 43, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
99	99	LTEXT "Renderer aspect ratio", IDC_STATIC, 114, 32, 71, 8, SS_LEFT, WS_EX_LEFT
100	100	COMBOBOX IDC_ASPECT3D, 114, 43, 102, 14, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
101		~~- LTEXT "Low color rendering", 0, 7, 58, 63, 9, SS_LEFT, WS_EX_LEFT~~
	101	+ LTEXT "Low color rendering", IDC_STATIC, 7, 58, 63, 9, SS_LEFT, WS_EX_LEFT
102	102	COMBOBOX IDC_LOWCOLORRENDER, 7, 68, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
103		~~- LTEXT "Enable dithering", 0, 114, 58, 52, 9, SS_LEFT, WS_EX_LEFT~~
	103	+ LTEXT "Enable dithering", IDC_STATIC, 114, 58, 52, 9, SS_LEFT, WS_EX_LEFT
104	104	COMBOBOX IDC_DITHERING, 114, 68, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
105	105	}
106	106
—	—	@@ -142,10 +142,10 @@
143	143	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
144	144	FONT 8, "Ms Shell Dlg"
145	145	{
146		~~- LTEXT "Changing these options may affect the functionality of DXGL and should only be done if necessary.", 0, 7, 5, 320, 9, SS_LEFT, WS_EX_LEFT~~
	146	+ LTEXT "Changing these options may affect the functionality of DXGL and should only be done if necessary.", IDC_STATIC, 7, 5, 320, 9, SS_LEFT, WS_EX_LEFT
147	147	LISTBOX IDC_DEBUGLIST, 7, 16, 269, 130, WS_TABSTOP \| WS_VSCROLL \| LBS_NOINTEGRALHEIGHT \|
148	148	LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_NOTIFY, WS_EX_LEFT
149		~~- LTEXT "Maximum OpenGL Version", 0, 8, 153, 86, 9, SS_LEFT, WS_EX_LEFT~~
	149	+ LTEXT "Maximum OpenGL Version", IDC_STATIC, 8, 153, 86, 9, SS_LEFT, WS_EX_LEFT
150	150	COMBOBOX IDC_GLVERSION, 96, 151, 101, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
151	151	}
152	152
—	—	@@ -156,7 +156,7 @@
157	157	STYLE DS_3DLOOK \| DS_CENTER \| DS_SHELLFONT \| WS_VISIBLE \| WS_CHILDWINDOW
158	158	FONT 8, "Ms Shell Dlg"
159	159	{
160		~~- LTEXT "These options should be set only for specific programs; use with other programs may cause malfuncion.", 0, 7, 5, 332, 9, SS_LEFT, WS_EX_LEFT~~
	160	+ LTEXT "These options should be set only for specific programs; use with other programs may cause malfuncion.", IDC_STATIC, 7, 5, 332, 9, SS_LEFT, WS_EX_LEFT
161	161	LISTBOX IDC_HACKSLIST, 7, 16, 269, 148, WS_TABSTOP \| WS_VSCROLL \| LBS_NOINTEGRALHEIGHT \|
162	162	LBS_OWNERDRAWFIXED \| LBS_HASSTRINGS \| LBS_NOTIFY, WS_EX_LEFT
163	163	}
—	—	@@ -220,21 +220,23 @@
221	221	COMBOBOX IDC_POSTSCALE, 7, 17, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
222	222	LTEXT "Postprocess input multiplier", IDC_STATIC, 114, 7, 90, 9, SS_LEFT, WS_EX_LEFT
223	223	COMBOBOX IDC_POSTSCALESIZE, 114, 17, 102, 30, CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT
224		~~- AUTOCHECKBOX "Use post-processing shader", IDC_USESHADER, 7, 33, 103, 8, WS_DISABLED, WS_EX_LEFT~~
225		~~- COMBOBOX IDC_SHADER, 7, 43, 247, 92, WS_DISABLED \| CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT~~
226		~~- PUSHBUTTON "...", IDC_BROWSESHADER, 256, 42, 20, 14, WS_DISABLED, WS_EX_LEFT~~
227		~~- LTEXT "Primary buffer scaling", IDC_STATIC, 7, 58, 70, 8, SS_LEFT, WS_EX_LEFT~~
228		~~- COMBOBOX IDC_PRIMARYSCALE, 7, 68, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
229		~~- LTEXT "Blt Scaling Filter", IDC_STATIC, 114, 58, 52, 8, SS_LEFT, WS_EX_LEFT~~
230		~~- COMBOBOX IDC_BLTFILTER, 114, 68, 102, 92, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT~~
231		~~- LTEXT "Blt Color Key Threshold", 0, 114, 83, 76, 9, SS_LEFT, WS_EX_LEFT~~
232		~~- LTEXT "Custom scale", IDC_CUSTOMSCALELABEL, 7, 83, 44, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT~~
233		~~- LTEXT "X", IDC_CUSTOMSCALELABELX, 7, 97, 8, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT~~
234		~~- EDITTEXT IDC_CUSTOMSCALEX, 15, 94, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT~~
235		~~- LTEXT "Y", IDC_CUSTOMSCALELABELY, 57, 97, 8, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT~~
236		~~- EDITTEXT IDC_CUSTOMSCALEY, 65, 94, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT~~
237		~~- CONTROL "", IDC_BLTTHRESHOLDSLIDER, TRACKBAR_CLASS, WS_TABSTOP \| TBS_BOTH \| TBS_NOTICKS, 114, 93, 79, 15, WS_EX_LEFT~~
238		~~- EDITTEXT IDC_BLTTHRESHOLD, 195, 94, 21, 14, ES_AUTOHSCROLL \| ES_NUMBER, WS_EX_LEFT~~
	224	+ // AUTOCHECKBOX "Use post-processing shader", IDC_USESHADER, 7, 33, 103, 8, WS_DISABLED, WS_EX_LEFT
	225	+ // COMBOBOX IDC_SHADER, 7, 43, 247, 92, WS_DISABLED \| CBS_DROPDOWN \| CBS_HASSTRINGS, WS_EX_LEFT
	226	+ // PUSHBUTTON "...", IDC_BROWSESHADER, 256, 42, 20, 14, WS_DISABLED, WS_EX_LEFT
	227	+ // Move the following controls down by 25 after re-adding the Post-Process shader
	228	+ LTEXT "Primary buffer scaling", IDC_STATIC, 7, 33, 70, 8, SS_LEFT, WS_EX_LEFT
	229	+ COMBOBOX IDC_PRIMARYSCALE, 7, 43, 102, 30, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	230	+ LTEXT "Blt Scaling Filter", IDC_STATIC, 114, 33, 52, 8, SS_LEFT, WS_EX_LEFT
	231	+ COMBOBOX IDC_BLTFILTER, 114, 43, 102, 92, CBS_DROPDOWNLIST \| CBS_HASSTRINGS, WS_EX_LEFT
	232	+ LTEXT "Custom scale", IDC_CUSTOMSCALELABEL, 7, 58, 44, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
	233	+ LTEXT "X", IDC_CUSTOMSCALELABELX, 7, 72, 8, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
	234	+ EDITTEXT IDC_CUSTOMSCALEX, 15, 69, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT
	235	+ LTEXT "Y", IDC_CUSTOMSCALELABELY, 57, 72, 8, 8, WS_DISABLED \| SS_LEFT, WS_EX_LEFT
	236	+ EDITTEXT IDC_CUSTOMSCALEY, 65, 69, 40, 14, WS_DISABLED \| ES_AUTOHSCROLL, WS_EX_LEFT
	237	+ // Removed for DXGL 0.5.13 release
	238	+ // LTEXT "Blt Color Key Threshold", 0, 114, 83, 76, 9, SS_LEFT, WS_EX_LEFT
	239	+ // CONTROL "", IDC_BLTTHRESHOLDSLIDER, TRACKBAR_CLASS, WS_TABSTOP \| TBS_BOTH \| TBS_NOTICKS, 114, 93, 79, 15, WS_EX_LEFT
	240	+ // EDITTEXT IDC_BLTTHRESHOLD, 195, 94, 21, 14, ES_AUTOHSCROLL \| ES_NUMBER, WS_EX_LEFT
239	241	}
240	242
241	243
Index: dxglcfg/resource.h
—	—	@@ -90,8 +90,9 @@
91	91	#define IDC_CUSTOMSCALEX 2110
92	92	#define IDC_CUSTOMSCALELABELY 2111
93	93	#define IDC_CUSTOMSCALEY 2112
94		~~-#define IDC_BLTTHRESHOLDSLIDER 2113~~
95		~~-#define IDC_BLTTHRESHOLD 2114~~
	94	+// Removed for DXGL 0.5.13 release
	95	+// #define IDC_BLTTHRESHOLDSLIDER 2113
	96	+// #define IDC_BLTTHRESHOLD 2114
96	97
97	98	// Controls - 3D Graphics Tab
98	99	#define IDC_TEXFILTER 2201

DXGL r793 - Code Review

Diff [purge]

Navigation menu

Search