Remove unused code that caused crashes during installation.

Bump release version.
dxgldotorg · Jan 17, 2024 · b040d67 · b040d67
1 parent 4f776e2
commit b040d67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/buildtool/buildtool.c b/buildtool/buildtool.c
@@ -335,7 +335,7 @@ int ProcessHeaders(char *path)
 	version.build = 0;
 	version.major = 0;
 	version.minor = 5;
-	version.point = 21;
+	version.point = 22;
 	if (!GetGitVersion(path, &version)) ParseVersion(&version, TRUE);
 	else ParseVersion(&version, TRUE);
 	if (SIGNMODE < 1) nosign = TRUE;

diff --git a/common/releasever.h b/common/releasever.h
@@ -5,7 +5,7 @@
 /* Removed due to transition to Git - Git tags will set the version number
 #define DXGLMAJORVER 0
 #define DXGLMINORVER 5
-#define DXGLPOINTVER 21
+#define DXGLPOINTVER 22
 #define DXGLBETA 0
 
 

diff --git a/ddraw/dllmain.cpp b/ddraw/dllmain.cpp
@@ -1,5 +1,5 @@
 // DXGL
-// Copyright (C) 2011-2018 William Feely
+// Copyright (C) 2011-2024 William Feely
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 			GlobalMemoryStatus(&memstatus);
 			dxglcfg.SystemRAM = memstatus.dwTotalPhys;
 		}
-		GetSystemDirectory(path, MAX_PATH);
+		/*GetSystemDirectory(path, MAX_PATH);
 		_tcscat(path, _T("\\ddraw.dll"));
 		hSystemDDraw = LoadLibrary(path);
 		if (!hSystemDDraw)
@@ -92,7 +92,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 		dd2->GetAvailableVidMem(&caps, (DWORD*)&dxglcfg.VideoRAM, NULL);
 		dd2->Release();
 		dd->Release();
-		FreeLibrary(hSystemDDraw);
+		FreeLibrary(hSystemDDraw);*/
 		break;
 	case DLL_THREAD_ATTACH:
 	case DLL_THREAD_DETACH: