From 3587d8aee913a9501777305358d59b1806fe4377 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 2 Nov 2019 01:03:02 -0400
Subject: [PATCH] bump Windows supported version in mingw-w64
 sys/winnt/Makefile.gcc

mingw-w64 sys/winnt/Makefile.gcc required a Windows version bump from
0x0501 to 0x0601 (XP level to Windows 7 level) during compile in
order for the mingw system header files to include some of the
needed support for recent Windows port changes.
---
 sys/winnt/Install.nt   |  2 +-
 sys/winnt/Makefile.gcc |  2 +-
 sys/winnt/windmain.c   | 17 +----------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt
index 8842ad861..48c2dddd4 100644
--- a/sys/winnt/Install.nt
+++ b/sys/winnt/Install.nt
@@ -3,7 +3,7 @@
          ==============================================================
                   Instructions for compiling and installing
                        NetHack 3.6 on a Windows system
-         (Windows 7/8.x/10 or later only. XP may work but is untested)
+                       (Windows 7/8.x/10 or later only)
          ==============================================================
           Last revision: $NHDT-Date: 1554784481 2019/04/09 04:34:41 $
 
diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index e8123334f..0dce1f176 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -188,7 +188,7 @@ RANDOM  = $(OBJ)/random.o
 #RANDOM =
 BCRYPT=-lbcrypt
 
-WINPFLAG   = -DTILES -DMSWIN_GRAPHICS -DWIN32CON -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0501
+WINPFLAG   = -DTILES -DMSWIN_GRAPHICS -DWIN32CON -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0601 -DWINVER=0x0601
 ifeq "$(WANT_WIN_QT4)" "Y"
     WINPFLAG += -DQT_GRAPHICS -DPIXMAPDIR='"."'
 endif
diff --git a/sys/winnt/windmain.c b/sys/winnt/windmain.c
index f88fbaa37..44a1902f5 100644
--- a/sys/winnt/windmain.c
+++ b/sys/winnt/windmain.c
@@ -11,28 +11,13 @@
 #include <stdlib.h>
 #include <sys\stat.h>
 #include <errno.h>
-#ifndef __MINGW32__
-#include <appmodel.h>
-#endif
 #include <ShlObj.h>
 
 #ifdef __MINGW32__
 extern LONG GetCurrentPackageFullName(UINT32 *packageFullNameLength,
                       PWSTR  packageFullName);
-extern HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
-                      DWORD dwFlags, HANDLE hToken, PWSTR  *ppszPath);
-#ifdef INITGUID
-#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID DECLSPEC_SELECTANY name = { l, w1, w2,{ b1, b2, b3, b4, b5, b6, b7, b8 } }
 #else
-#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID name
-#endif
-DEFINE_KNOWN_FOLDER (FOLDERID_ProgramData, 0x62ab5d82, 0xfdc1, 0x4dc3, 0xa9, 0xdd, 0x07, 0x0d, 0x1d, 0x49, 0x5d, 0x97);
-DEFINE_KNOWN_FOLDER (FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91);
-DEFINE_KNOWN_FOLDER (FOLDERID_Profile, 0x5e6c858f, 0x0e22, 0x4760, 0x9a, 0xfe, 0xea, 0x33, 0x17, 0xb6, 0x71, 0x73);
-#endif
-
-#if 0
-#include "wintty.h"
+# include <appmodel.h>
 #endif
 
 #if !defined(SAFEPROCS)