Revert "Change Windows startup"

This reverts commit acb85b18cf. Some optlist issues arose on some platforms, but not all. I need to investigate the cause of those.
2026-04-05 12:07:57 -04:00
parent acb85b18cf
commit db1f230772
23 changed files with 959 additions and 450 deletions
--- a/sys/windows/GNUmakefile
+++ b/sys/windows/GNUmakefile
@@ -1239,14 +1239,14 @@ COREOBJS = $(addsuffix .o, allmain alloc apply artifact attrib ball bones botl \
 	   nhlobj nhlsel nhlua windsound o_init objects objnam options \
 	   pager pickup pline polyself potion pray priest quest questpgr \
 	   random read rect region report restore rip rnd role rumors \
-	   save sfbase sfstruct shk shknam sit selvar sounds sp_lev \
+	   safeproc save sfbase sfstruct shk shknam sit selvar sounds sp_lev \
 	   spell stairs steal steed strutil \
 	   symbols sys teleport timeout topten track trap u_init uhitm utf8map \
 	   vault version vision weapon were wield windmain windows windsys wizard \
 	   wizcmds worm worn write zap $(SOUNDLIBOBJS))

-CFLAGSW = $(CFLAGS) $(CFLAGSXTRA) $(SOUNDLIBINCL) $(COMMONDEF) $(DLBFLG) -DTILES -D_WINDOWS -DMSWIN_GRAPHICS -DNOTTYGRAPHICS $(SOUNDLIBDEFS)
-CPPFLAGSW = $(CFLAGS) $(CPPFLAGSXTRA) $(COMMONDEF) $(DLBFLG) -DTILES -D_WINDOWS -DMSWIN_GRAPHICS -DNOTTYGRAPHICS $(SOUNDLIBDEFS)
+CFLAGSW = $(CFLAGS) $(CFLAGSXTRA) $(SOUNDLIBINCL) $(COMMONDEF) $(DLBFLG) -DTILES -D_WINDOWS -DMSWIN_GRAPHICS -DSAFEPROCS -DNOTTYGRAPHICS $(SOUNDLIBDEFS)
+CPPFLAGSW = $(CFLAGS) $(CPPFLAGSXTRA) $(COMMONDEF) $(DLBFLG) -DTILES -D_WINDOWS -DMSWIN_GRAPHICS -DSAFEPROCS -DNOTTYGRAPHICS $(SOUNDLIBDEFS)

 ONHW = $(O)nethackw
 NHWONLY = $(addsuffix .o, mhaskyn mhdlg mhfont mhinput mhmain mhmap mhmenu \
@@ -1348,8 +1348,8 @@ CLEAN_FILE += $(NHWTARGETS) $(NHWOBJS) $(NHWRES) $(BMPS) $(WAV)
 #==========================================
 # nethack
 #==========================================
-CFLAGSNH = $(CFLAGSU) $(CFLAGSXTRA) $(SOUNDLIBINCL) -DNO_TILE_C -D_LIB -DWIN32CON $(SOUNDLIBDEFS)
-CPPFLAGSNH = $(CFLAGSU) $(CPPFLAGSXTRA) -DNO_TILE_C -D_LIB -DWIN32CON $(SOUNDLIBDEFS)
+CFLAGSNH = $(CFLAGSU) $(CFLAGSXTRA) $(SOUNDLIBINCL) -DNO_TILE_C -DSAFEPROCS -D_LIB -DWIN32CON $(SOUNDLIBDEFS)
+CPPFLAGSNH = $(CFLAGSU) $(CPPFLAGSXTRA) -DNO_TILE_C -DSAFEPROCS -D_LIB -DWIN32CON $(SOUNDLIBDEFS)

 ONH = $(O)nethack

--- a/sys/windows/Makefile.nmake
+++ b/sys/windows/Makefile.nmake
@@ -847,7 +847,8 @@ REGEXTTY  = $(OTTY)cppregex.o
 LUAOBJTTY = $(OTTY)nhlua.o    $(OTTY)nhlsel.o    $(OTTY)nhlobj.o
 VVOBJTTY  = $(OTTY)version.o

-SOBJTTY   = $(OTTY)windmain.o $(OTTY)windsys.o $(OTTY)win10.o
+SOBJTTY   = $(OTTY)windmain.o $(OTTY)windsys.o $(OTTY)win10.o \
+		$(OTTY)safeproc.o

 TTYOBJTTY = $(OTTY)topl.o $(OTTY)getline.o  $(OTTY)wintty.o

@@ -907,7 +908,8 @@ REGEXGUI  = $(OGUI)cppregex.o
 LUAOBJGUI = $(OGUI)nhlua.o    $(OGUI)nhlsel.o   $(OGUI)nhlobj.o
 VVOBJGUI  = $(OGUI)version.o

-SOBJGUI   = $(OGUI)windmain.o $(OGUI)windsys.o $(OGUI)win10.o
+SOBJGUI   = $(OGUI)windmain.o $(OGUI)windsys.o $(OGUI)win10.o \
+		$(OGUI)safeproc.o

 GUIOBJ	= $(OGUI)mhaskyn.o $(OGUI)mhdlg.o \
 	$(OGUI)mhfont.o $(OGUI)mhinput.o $(OGUI)mhmain.o $(OGUI)mhmap.o \
@@ -1362,8 +1364,8 @@ INCLUSIONS= /I$(R_INCL) /I$(R_MSWSYS) $(R_LUAINCL) $(R_SOUNDLIBINCL)
 # Util and console builds
 #==========================================

-CFLAGS   = $(ctmpflags) $(INCLUSIONS) $(DLBDEF) $(SOUNDLIBDEFS)
-CPPFLAGS = $(cpptmpflags) $(INCLUSIONS) $(DLBDEF) $(SOUNDLIBDEFS)
+CFLAGS   = $(ctmpflags) $(INCLUSIONS) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS)
+CPPFLAGS = $(cpptmpflags) $(INCLUSIONS) $(DLBDEF) -DSAFEPROCS $(SOUNDLIBDEFS)
 LFLAGS   = $(lflags) $(conlibs) $(MACHINE)

 #==========================================
@@ -2388,12 +2390,14 @@ $(OTTY)windsys.o:  $(MSWSYS)windsys.c $(WINDHDR) $(HACK_H)
 $(OTTY)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H)
 #$(OTTY)sample.o: $(SOUNDDIR)sample.c $(HACK_H)
 $(OTTY)windmain.o: $(MSWSYS)windmain.c $(WINDHDR) $(HACK_H)
+$(OTTY)safeproc.o: $(WSHR)safeproc.c $(WINDHDR) $(HACK_H)

 $(OGUI)consoletty.o:   $(MSWSYS)consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H)
 $(OGUI)win10.o:  $(MSWSYS)win10.c $(WINDHDR) $(HACK_H)
 $(OGUI)windsys.o:  $(MSWSYS)windsys.c $(WINDHDR) $(HACK_H)
 $(OGUI)windsound.o: $(WINDSOUNDDIR)windsound.c $(HACK_H)
 $(OGUI)windmain.o: $(MSWSYS)windmain.c $(WINDHDR) $(HACK_H)
+$(OGUI)safeproc.o: $(WSHR)safeproc.c $(WINDHDR) $(HACK_H)

 #===================================================================
 # win/win32 dependencies
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -156,6 +156,7 @@ static boolean check_font_widths(void);
 #endif
 static void set_known_good_console_font(void);
 static void restore_original_console_font(void);
+extern void safe_routines(void);
 void tty_ibmgraphics_fixup(void);
 #ifdef VIRTUAL_TERMINAL_SEQUENCES
 extern void (*ibmgraphics_mode_callback)(void);  /* symbols.c */
@@ -1188,6 +1189,8 @@ consoletty_open(int mode UNUSED)
 void
 consoletty_exit(void)
 {
+    /* go back to using the safe routines */
+    safe_routines();
    free_custom_colors();
    free((genericptr_t) console.front_buffer);
    free((genericptr_t) console.back_buffer);
@@ -2543,13 +2546,9 @@ void early_raw_print(const char *s)

 void nethack_enter_consoletty(void)
 {
-    int width;
 #ifdef VIRTUAL_TERMINAL_SEQUENCES
    char buf[BUFSZ], *bp, *localestr;
    BOOL apisuccess;
-//    DWORD unused;
-//    int i = 0;
-
 #endif /* VIRTUAL_TERMINAL_SEQUENCES */
 #if 0
    /* set up state needed by early_raw_print() */
@@ -2563,38 +2562,13 @@ void nethack_enter_consoletty(void)
                  GetWindowLong(console.hWnd, GWL_STYLE)
                     & ~WS_MAXIMIZEBOX & ~WS_SIZEBOX);
 #endif
-
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
-    if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) {
-        /* srWindow identifies the visible area; dwSize identifies the buffer
-         */
-        width = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-        fprintf(stdout, "width = %d\n", width);
-    }
-
    console.hConOut = GetStdHandle(STD_OUTPUT_HANDLE);
    nhassert(console.hConOut != NULL); // NOTE: this assert will not print
    GetConsoleScreenBufferInfo(console.hConOut, &console.orig_csbi);
-    //COORD screencheck = GetLargestConsoleWindowSize(console.hConOut);
-
-    GetConsoleMode(console.hConOut, &console.orig_out_cmode);
-    console.out_cmode = console.orig_out_cmode;
-    console.out_cmode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-    SetConsoleMode(console.hConOut, console.out_cmode);
-#if 0
-    /* tests */
-    WriteConsoleA(console.hConOut, "\033[8;;133t",9, &unused, NULL);
-    for (i = 0; i < 13; ++i) {
-        WriteConsoleA(console.hConOut, "0123456789", 10, &unused, NULL);
-    }
-    WriteConsoleA(console.hConOut, "\033[3;133ftest", 12, &unused, NULL);
-    GetConsoleScreenBufferInfo(console.hConOut, &console.orig_csbi);
    /* Testing of widths != COLNO has not turned up any problems.  Need
     * to do a bit more testing and then we are likely to enable having
     * console width match window width.
     */
-#endif
-
 #if 0
    console.width = console.orig_csbi.srWindow.Right -
                     console.orig_csbi.srWindow.Left + 1;
--- a/sys/windows/vs/NetHack/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -74,7 +74,7 @@
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;SND_SOUNDEFFECTS_AUTOMAP;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;SND_SOUNDEFFECTS_AUTOMAP;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
    </ClCompile>
    <Link>
@@ -218,6 +218,7 @@
    <ClCompile Include="$(SysWindDir)windmain.c" />
    <ClCompile Include="$(SysWindDir)windsys.c" />
    <ClCompile Include="$(SndWindDir)windsound.c" />
+    <ClCompile Include="$(WinShareDir)safeproc.c" />
    <ClCompile Include="$(WinTtyDir)getline.c" />
    <ClCompile Include="$(WinTtyDir)topl.c" />
    <ClCompile Include="$(WinTtyDir)wintty.c" />
--- a/sys/windows/vs/NetHackW/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -87,7 +87,7 @@
      <Optimization>Disabled</Optimization>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;NOTTYGRAPHICS;SND_LIB_WINDSOUND;USER_SOUNDS;SND_SOUNDEFFECTS_AUTOMAP;HAS_STDINT_H;HAS_INTTYPES_H;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;SAFEPROCS;NOTTYGRAPHICS;SND_LIB_WINDSOUND;USER_SOUNDS;SND_SOUNDEFFECTS_AUTOMAP;HAS_STDINT_H;HAS_INTTYPES_H;PDC_WIDE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard_C Condition="'$(DefaultPlatformToolset)'!='v142' And '$(Configuration)|$(Platform)'=='Debug|Win32'">stdclatest</LanguageStandard_C>
      <LanguageStandard_C Condition="'$(DefaultPlatformToolset)'!='v142' And '$(Configuration)|$(Platform)'=='Release|Win32'">stdclatest</LanguageStandard_C>
      <LanguageStandard_C Condition="'$(DefaultPlatformToolset)'!='v142' And '$(Configuration)|$(Platform)'=='Debug|x64'">stdclatest</LanguageStandard_C>
@@ -263,6 +263,7 @@
    <ClCompile Include="$(SysWindDir)windsys.c" />
    <ClCompile Include="$(SysWindDir)win10.c" />
    <ClCompile Include="$(SndWindDir)windsound.c" />
+    <ClCompile Include="$(WinShareDir)safeproc.c" />
    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />
    <ClCompile Include="$(WinWin32Dir)mhfont.c" />
--- a/sys/windows/vs/sfctool/sfctool.vcxproj
+++ b/sys/windows/vs/sfctool/sfctool.vcxproj
@@ -150,7 +150,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <SDLCheck>true</SDLCheck>
@@ -166,7 +166,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -186,7 +186,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <SDLCheck>true</SDLCheck>
@@ -202,7 +202,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <SDLCheck>true</SDLCheck>
@@ -218,7 +218,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -238,7 +238,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_NDEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard_C>stdclatest</LanguageStandard_C>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -258,4 +258,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/sys/windows/vs/sftags/sftags.vcxproj
+++ b/sys/windows/vs/sftags/sftags.vcxproj
@@ -110,7 +110,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <ConformanceMode>true</ConformanceMode>
@@ -125,7 +125,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -144,7 +144,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <ConformanceMode>true</ConformanceMode>
@@ -159,7 +159,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <ConformanceMode>true</ConformanceMode>
@@ -174,7 +174,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -194,7 +194,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    <ClCompile>
      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);$(UtilDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32CON;NO_TILE_C;DLB;SAFEPROCS;SND_LIB_WINDSOUND;USER_SOUNDS;_LIB;HAS_STDINT_H;HAS_INTTYPES_H;SFCTOOL;NOPANICTRACE;NOCRASHREPORT;NO_CHRONICLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -223,4 +223,4 @@
  <Target Name="AfterRebuild">
    <MSBuild Projects="aftersftags.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
  </Target>
-</Project>
+</Project>
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -14,6 +14,10 @@
 #include <errno.h>
 #include <ShlObj.h>

+#if !defined(SAFEPROCS)
+#error You must #define SAFEPROCS to build windmain.c
+#endif
+
 static void nhusage(void);
 char *exename(void);
 boolean fakeconsole(void);
@@ -63,6 +67,7 @@ char windows_yn_function(const char *, const char *, char);

 #ifdef WIN32CON
 extern int windows_console_custom_nhgetch(void);
+void safe_routines(void);
 int tty_self_recover_prompt(void);
 #endif

@@ -101,13 +106,6 @@ void update_file(const char *, const char *,
                 const char *, const char *, BOOL);
 void windows_raw_print_bold(const char *);

-staticfn void set_emergency_io(void);
-staticfn void stdio_wait_synch(void);
-staticfn void stdio_raw_print(const char *str);
-staticfn void stdio_nonl_raw_print(const char *str);
-staticfn void stdio_raw_print_bold(const char *str);
-staticfn int stdio_nhgetch(void);
-
 #ifdef PORT_HELP
 void port_help(void);
 #endif
@@ -161,9 +159,18 @@ MAIN(int argc, char *argv[])
    char *dir = NULL;

 #ifdef _MSC_VER
-    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+    _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
 #endif

+#ifdef WIN32CON
+    /*
+     * Get a set of valid safe windowport function
+     * pointers during early startup initialization.
+     */
+//    safe_routines();
+#endif /* WIN32CON */
+
+
    /* setting iflags.colorcount has to be after early_init()
     * because it zeros out all of iflags */
    hwnd = GetDesktopWindow();
@@ -201,9 +208,8 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 #ifndef MSWIN_GRAPHICS
    early_init(argc, argv); /* already in WinMain for MSWIN_GRAPHICS */
 #endif
-    set_default_prefix_locations(
-        argv[0]); /* must be re-done after initoptions_init()
-                   * which clears out gp.fqn_prefix[] */
+    set_default_prefix_locations(argv[0]); /* must be re-done after initoptions_init()
+                                            * which clears out gp.fqn_prefix[] */
    copy_sysconf_content();
    copy_symbols_content();
    /* Now that sysconf has had a chance to set the TROUBLEPREFIX, don't
@@ -211,20 +217,13 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
    fqn_prefix_locked[TROUBLEPREFIX] = TRUE;
    copy_config_content();

-    //   if (iflags.windowtype_deferred && gc.chosen_windowtype[0])
-    //       windowtype = gc.chosen_windowtype;
-    //   windowtype = gc.chosen_windowtype;
+ //   if (iflags.windowtype_deferred && gc.chosen_windowtype[0])
+ //       windowtype = gc.chosen_windowtype;
+ //   windowtype = gc.chosen_windowtype;

 #if !defined(MSWIN_GRAPHICS)
-    nethack_enter_consoletty();
    consoletty_open(1);
-#endif
-    set_emergency_io();
-
-#ifdef EARLY_CONFIGFILE_PASS
-    rcfile_interface_options();
-    if (gc.chosen_windowtype && *gc.chosen_windowtype)
-        windowtype = gc.chosen_windowtype;
+    nethack_enter_consoletty();
 #endif

    if (!windowtype) {
@@ -234,10 +233,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
        windowtype = "tty";
 #endif
    }
-    choose_windows(
-        windowtype); /* sets all the window port function pointers */
-
-    init_nhwindows(&argc, argv);
+    choose_windows(windowtype);  /* sets all the window port function pointers */

 #if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
    /* Save current directory and make sure it gets restored when
@@ -247,9 +243,8 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
        error("NetHack: current directory path too long");
 #endif
    initoptions_init(); // This allows OPTIONS in syscf on Windows.
-    set_default_prefix_locations(
-        argv[0]); /* must be re-done after initoptions_init()
-                   * which clears out gp.fqn_prefix[] */
+    set_default_prefix_locations(argv[0]); /* must be re-done after initoptions_init()
+                                            * which clears out gp.fqn_prefix[] */
    iflags.windowtype_deferred = TRUE;

    program_state.early_options = 1;
@@ -291,6 +286,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
        && (strstri(argv[0], "nethackw.exe") || GUILaunched))
        iflags.windowtype_locked = TRUE;
 #endif
+    windowtype = default_window_sys;

 #ifdef DLB
    if (!dlb_init()) {
@@ -305,6 +301,18 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
    }
 #endif

+    if (!iflags.windowtype_locked) {
+#if defined(TTY_GRAPHICS)
+        Strcpy(default_window_sys, "tty");
+#else
+#if defined(CURSES_GRAPHICS) && !defined(MSWIN_GRAPHICS)
+        Strcpy(default_window_sys, "curses");
+#endif /* CURSES */
+#endif /* TTY */
+ //       if (iflags.windowtype_deferred && gc.chosen_windowtype[0])
+ //           windowtype = gc.chosen_windowtype;
+    }
+ //   choose_windows(windowtype);
 #if defined(SND_LIB_FMOD)
    assign_soundlib(soundlib_fmod);
 #elif defined(SND_LIB_WINDSOUND)
@@ -314,14 +322,19 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
    u.uhp = 1; /* prevent RIP on early quits */
    u.ux = 0;  /* prevent flush_screen() */

+    nethack_enter(argc, argv);
    iflags.use_background_glyph = FALSE;
    if (WINDOWPORT(mswin))
        iflags.use_background_glyph = TRUE;
+#ifdef WIN32CON
+    if (WINDOWPORT(tty))
+        consoletty_open(1);
+#endif
 #ifdef WINCHAIN
    commit_windowchain();
 #endif

-//    init_nhwindows(&argc, argv);
+    init_nhwindows(&argc, argv);

 #ifdef WIN32CON
    if (WINDOWPORT(tty))
@@ -824,6 +837,20 @@ copy_hack_content(void)
                gf.fqn_prefix[DATAPREFIX], OPTIONFILE, FALSE);
 }

+#ifdef WIN32CON
+void
+safe_routines(void)
+{
+    /*
+     * Get a set of valid safe windowport function
+     * pointers during early startup initialization.
+     */
+    if (!WINDOWPORT(safestartup))
+        windowprocs = *get_safe_procs(1);
+    if (!GUILaunched)
+        windowprocs.win_nhgetch = windows_console_custom_nhgetch;
+}
+#endif

 #ifdef PORT_HELP
 void
@@ -1178,7 +1205,9 @@ tty_self_recover_prompt(void)
    c = 'n';
    ct = 0;
    saved_procs = windowprocs;
-
+    if (!WINDOWPORT(safestartup))
+        windowprocs = *get_safe_procs(2); /* arg 2 uses no-newline variant */
+    windowprocs.win_nhgetch = windows_console_custom_nhgetch;
    raw_print("\n");
    raw_print("\n");
    raw_print("\n");
@@ -1311,60 +1340,4 @@ chdirx(const char *dir, boolean wr)
 }
 #endif /* CHDIR */

-void
-set_emergency_io(void)
-{
-    windowprocs.win_raw_print = stdio_raw_print;
-    windowprocs.win_raw_print_bold = stdio_raw_print_bold;
-    windowprocs.win_nhgetch = stdio_nhgetch;
-    windowprocs.win_wait_synch = stdio_wait_synch;
-}
-
-
-/* Add to your code: windowprocs.win_raw_print = stdio_wait_synch; */
-void
-stdio_wait_synch(void)
-{
-    char valid[] = { ' ', '\n', '\r', '\033', '\0' };
-
-    fprintf(stdout, "--More--");
-    (void) fflush(stdout);
-    while (!strchr(valid, nhgetch()))
-        ;
-}
-
-/* Add to your code: windowprocs.win_raw_print = stdio_raw_print; */
-void
-stdio_raw_print(const char *str)
-{
-    if (str)
-        fprintf(stdout, "%s\n", str);
-    return;
-}
-
-/* no newline variation, add to your code:
-    windowprocs.win_raw_print = stdio_nonl_raw_print;  */
-void
-stdio_nonl_raw_print(const char *str)
-{
-    if (str)
-        fprintf(stdout, "%s", str);
-    return;
-}
-
-/* Add to your code: windowprocs.win_raw_print_bold = stdio_raw_print_bold; */
-void
-stdio_raw_print_bold(const char *str)
-{
-    stdio_raw_print(str);
-    return;
-}
-
-/* Add to your code: windowprocs.win_nhgetch = stdio_nhgetch; */
-int
-stdio_nhgetch(void)
-{
-    return getchar();
-}
-
-    /*windmain.c*/
+/*windmain.c*/
--- a/sys/windows/windsys.c
+++ b/sys/windows/windsys.c
@@ -73,6 +73,7 @@ static HWND GetConsoleHwnd(void);
 extern void backsp(void);
 #endif
 int windows_console_custom_nhgetch(void);
+extern void safe_routines(void);
 int windows_early_options(const char *window_opt);
 unsigned long sys_random_seed(void);
 #if 0
@@ -292,6 +293,10 @@ win32_abort(void)
            exit_nhwindows((char *) 0);
        iflags.window_inited = FALSE;
    }
+#ifdef WIN32CON
+    if (!WINDOWPORT(mswin) && !WINDOWPORT(safestartup))
+        safe_routines();
+#endif
    if (wizard) {
        raw_print("Execute debug breakpoint wizard?");
        if ((c = nhgetch()) == 'y' || c == 'Y')
@@ -517,6 +522,15 @@ nethack_exit(int code)
     * GUILaunched is defined and set in consoletty.c.
     */

+
+#ifdef WIN32CON
+    if (!GUILaunched) {
+        windowprocs = *get_safe_procs(1);
+        /* use our custom version which works
+           a little cleaner than the stdio one */
+        windowprocs.win_nhgetch = windows_console_custom_nhgetch;
+    } else
+#endif
    if (getreturn_enabled) {
        raw_print("\n");
        if (iflags.window_inited)
@@ -566,6 +580,10 @@ getreturn(const char *str)
   initializing the window port */
 void nethack_enter_windows(void)
 {
+#ifdef WIN32CON
+    if (WINDOWPORT(tty))
+        nethack_enter_consoletty();
+#endif
 }

 /* CP437 to Unicode mapping according to the Unicode Consortium */