From dc5bbd0c49b23ecb0de3ab711d5f28ca2c596a07 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Wed, 9 Oct 2019 00:02:36 +0200
Subject: [PATCH] Implement DefWindowProc directly in MainWndProc

---
 Source/init.cpp              | 4 +++-
 SourceS/miniwin/misc.h       | 2 --
 SourceS/miniwin/misc_macro.h | 2 --
 SourceX/miniwin/misc.cpp     | 9 ---------
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Source/init.cpp b/Source/init.cpp
index b9fa568b9..24fd83180 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -132,9 +132,11 @@ LRESULT __stdcall MainWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 #endif
 	case WM_QUERYNEWPALETTE:
 		return 1;
+	case WM_QUERYENDSESSION:
+		exit(0);
 	}
 
-	return DefWindowProc(hWnd, Msg, wParam, lParam);
+	return 0;
 }
 
 WNDPROC SetWindowProc(WNDPROC NewProc)
diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h
index 90bb22d9c..a7149912f 100644
--- a/SourceS/miniwin/misc.h
+++ b/SourceS/miniwin/misc.h
@@ -345,8 +345,6 @@ void lstrcpynA(LPSTR lpString1, LPCSTR lpString2, int iMaxLength);
 
 typedef LONG LSTATUS, HKEY, REGSAM, PHKEY;
 
-LRESULT DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-
 WINBOOL WINAPI WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten,
     LPOVERLAPPED lpOverlapped);
 DWORD WINAPI SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod);
diff --git a/SourceS/miniwin/misc_macro.h b/SourceS/miniwin/misc_macro.h
index 26987418f..926546477 100644
--- a/SourceS/miniwin/misc_macro.h
+++ b/SourceS/miniwin/misc_macro.h
@@ -97,8 +97,6 @@
 #define KEY_WRITE 0x20006
 #define REG_SZ 1
 
-#define DefWindowProc DefWindowProcA
-
 #define GetFileAttributes GetFileAttributesA
 #define SetFileAttributes SetFileAttributesA
 #define FindFirstFile FindFirstFileA
diff --git a/SourceX/miniwin/misc.cpp b/SourceX/miniwin/misc.cpp
index 95541eae0..724f97ad1 100644
--- a/SourceX/miniwin/misc.cpp
+++ b/SourceX/miniwin/misc.cpp
@@ -224,13 +224,4 @@ void lstrcpynA(LPSTR lpString1, LPCSTR lpString2, int iMaxLength)
 {
 	strncpy(lpString1, lpString2, iMaxLength);
 }
-
-LRESULT DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
-{
-	DUMMY_ONCE();
-	if (Msg == DVL_WM_QUERYENDSESSION)
-		exit(0);
-
-	return 0;
-}
 } // namespace dvl