Changes to be committed: modified: include/winprocs.h modified: src/options.c modified: sys/share/pcmain.c new file: sys/share/safeproc.c modified: sys/winnt/Makefile.msc modified: sys/winnt/stubs.c new file: sys/winnt/windmain.c modified: sys/winnt/winnt.c modified: win/win32/vs2017/NetHack.vcxproj modified: win/win32/vs2017/NetHackW.vcxproj modified: win/win32/winhack.c Because multiple window ports are supported on Windows now, even in the same executable and selectable via config file in some cases, some adjustments became necessary. There will likely be some further refining of this over the next day or two. List of changes: Move Windows startup from sys/share/pcmain.c and into its own sys/winnt/windmain.c so that it can be modified to fix some current breakage, and allow altering the order of some things. There is startup processing code that is common to all of the Windows WindowPorts, but that startup processing code needs to have no dependency on any one of those WindowPorts. Yet, during startup processing, some of the initialization routines can end up calling NetHack functions that expect an active Window port underneath, and if there isn't one, routines like pline, impossible, panic can end up invoking null function pointers. Place a new file sys/share/safeproc.c, in which a complete window port is available for early startup processing purposes. It's WindowPort name field is set to "safe-startup" just for reference. The prototypes in include/winprocs.h require that SAFEPROCS be Usage: windowprocs = get_safe_procs(0); initializes a set of winprocs function pointers that ensure none of the function pointers are left null, but that's all it does. windowprocs = get_safe_procs(1); initializes a set of winprocs functions pointers that ensure none of the function pointers are left null, but also provides some basic output and input functionality using nothing other than C stdio routines (no platform or OS specific code). The conditional code related to WIN32 has been removed from sys/share/pcmain.c The code common to all of the Windows WindowPorts calls get_safe_procs() almost immediately to ensure that there is a set of WindowPort winprocs available.
551 lines
10 KiB
C
551 lines
10 KiB
C
/* NetHack 3.6 safeproc.c */
|
|
/* Copyright (c) Michael Allison, 2018 */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#include "hack.h"
|
|
#include <stdio.h>
|
|
|
|
/*
|
|
* ***********************************************************
|
|
* This is a complete WindowPort implementation that can be
|
|
* assigned to the windowproc function pointers very early
|
|
* in the startup initialization, perhaps immediately even.
|
|
* It requires only the following call:
|
|
* windowprocs = get_safe_procs(0);
|
|
*
|
|
* The game startup can trigger functions in other modules
|
|
* that make assumptions on a WindowPort being available
|
|
* and bad things can happen if any function pointers are
|
|
* null at that time.
|
|
*
|
|
* Some ports prior to 3.6.2 made attempts to early init
|
|
* various pieces of one of their WindowPorts, but that
|
|
* caused conflicts if that particular WindowPort wasn't
|
|
* the one that the user ended up selecting in their
|
|
* config file later. The WindowPort interfaced was designed
|
|
* to allow multiple WindowPorts to be linked into the same
|
|
* game binary.
|
|
*
|
|
* The base functions established by a call to get_safe_procs()
|
|
* accomplish the goal of preventing crashes, but not much
|
|
* else.
|
|
*
|
|
* There are also a few additional functions provided in here
|
|
* that can be selected optionally to provide some startup
|
|
* functionality for getting messages out to the user about
|
|
* issues that are being experienced during startup in
|
|
* general or during options parsing. The ones in here are
|
|
* deliberately free from any platforms or OS specific code.
|
|
* Please leave them using stdio C routines as much as
|
|
* possible. That isn't to say you can't do fancier functions
|
|
* prior to initialization of the primary WindowPort, but you
|
|
* can provide those platform-specific functions elsewhere,
|
|
* and assign them the same way that these more generic versions
|
|
* are assigned.
|
|
*
|
|
* The additional platform-independent, but more functional
|
|
* routines provided in here should be assigned after the
|
|
* windowprocs = get_safe_procs()
|
|
* call. Here's a list of them:
|
|
*
|
|
*
|
|
*
|
|
*
|
|
* ***********************************************************
|
|
*/
|
|
|
|
struct window_procs safe_procs = {
|
|
"safe-startup", 0L, 0L,
|
|
safe_init_nhwindows, safe_player_selection, safe_askname, safe_get_nh_event,
|
|
safe_exit_nhwindows, safe_suspend_nhwindows, safe_resume_nhwindows,
|
|
safe_create_nhwindow, safe_clear_nhwindow, safe_display_nhwindow,
|
|
safe_destroy_nhwindow, safe_curs, safe_putstr, genl_putmixed,
|
|
safe_display_file, safe_start_menu, safe_add_menu, safe_end_menu,
|
|
safe_select_menu, safe_message_menu, safe_update_inventory, safe_mark_synch,
|
|
safe_wait_synch,
|
|
#ifdef CLIPPING
|
|
safe_cliparound,
|
|
#endif
|
|
#ifdef POSITIONBAR
|
|
safe_update_positionbar,
|
|
#endif
|
|
safe_print_glyph, safe_raw_print, safe_raw_print_bold, safe_nhgetch,
|
|
safe_nh_poskey, safe_nhbell, safe_doprev_message, safe_yn_function,
|
|
safe_getlin, safe_get_ext_cmd, safe_number_pad, safe_delay_output,
|
|
#ifdef CHANGE_COLOR /* the Mac uses a palette device */
|
|
safe_change_color,
|
|
#ifdef MAC
|
|
safe_change_background, set_safe_font_name,
|
|
#endif
|
|
safe_get_color_string,
|
|
#endif
|
|
safe_start_screen, safe_end_screen, genl_outrip,
|
|
safe_preference_update,
|
|
safe_getmsghistory, safe_putmsghistory,
|
|
safe_status_init,
|
|
safe_status_finish, safe_status_enablefield,
|
|
#ifdef STATUS_HILITES
|
|
safe_status_update,
|
|
#else
|
|
safe_status_update,
|
|
#endif
|
|
safe_can_suspend,
|
|
};
|
|
|
|
struct window_procs *
|
|
get_safe_procs(optn)
|
|
int optn;
|
|
{
|
|
if (optn) {
|
|
/* include the slightly more functional stdc versions */
|
|
safe_procs.win_raw_print = stdio_raw_print;
|
|
safe_procs.win_raw_print_bold = stdio_raw_print_bold;
|
|
safe_procs.win_nhgetch = stdio_nhgetch;
|
|
safe_procs.win_wait_synch = stdio_wait_synch;
|
|
}
|
|
return &safe_procs;
|
|
}
|
|
|
|
/*ARGSUSED*/
|
|
void
|
|
safe_init_nhwindows(argcp, argv)
|
|
int *argcp UNUSED;
|
|
char **argv UNUSED;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_player_selection()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_askname()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_get_nh_event()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_suspend_nhwindows(str)
|
|
const char *str;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_resume_nhwindows()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_exit_nhwindows(str)
|
|
const char *str;
|
|
{
|
|
return;
|
|
}
|
|
|
|
winid
|
|
safe_create_nhwindow(type)
|
|
int type;
|
|
{
|
|
return WIN_ERR;
|
|
}
|
|
|
|
void
|
|
safe_clear_nhwindow(window)
|
|
winid window;
|
|
{
|
|
return;
|
|
}
|
|
|
|
/*ARGSUSED*/
|
|
void
|
|
safe_display_nhwindow(window, blocking)
|
|
winid window;
|
|
boolean blocking;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_dismiss_nhwindow(window)
|
|
winid window;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_destroy_nhwindow(window)
|
|
winid window;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_curs(window, x, y)
|
|
winid window;
|
|
int x, y;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_putstr(window, attr, str)
|
|
winid window;
|
|
int attr;
|
|
const char *str;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_display_file(fname, complain)
|
|
const char *fname;
|
|
boolean complain;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_start_menu(window)
|
|
winid window;
|
|
{
|
|
return;
|
|
}
|
|
|
|
/*ARGSUSED*/
|
|
/*
|
|
* Add a menu item to the beginning of the menu list. This list is reversed
|
|
* later.
|
|
*/
|
|
void
|
|
safe_add_menu(window, glyph, identifier, ch, gch, attr, str, preselected)
|
|
winid window; /* window to use, must be of type NHW_MENU */
|
|
int glyph UNUSED; /* glyph to display with item (not used) */
|
|
const anything *identifier; /* what to return if selected */
|
|
char ch; /* keyboard accelerator (0 = pick our own) */
|
|
char gch; /* group accelerator (0 = no group) */
|
|
int attr; /* attribute for string (like safe_putstr()) */
|
|
const char *str; /* menu string */
|
|
boolean preselected; /* item is marked as selected */
|
|
{
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* End a menu in this window, window must a type NHW_MENU.
|
|
*/
|
|
void
|
|
safe_end_menu(window, prompt)
|
|
winid window; /* menu to use */
|
|
const char *prompt; /* prompt to for menu */
|
|
{
|
|
return;
|
|
}
|
|
|
|
int
|
|
safe_select_menu(window, how, menu_list)
|
|
winid window;
|
|
int how;
|
|
menu_item **menu_list;
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/* special hack for treating top line --More-- as a one item menu */
|
|
char
|
|
safe_message_menu(let, how, mesg)
|
|
char let;
|
|
int how;
|
|
const char *mesg;
|
|
{
|
|
return '\033';
|
|
}
|
|
|
|
void
|
|
safe_update_inventory()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_mark_synch()
|
|
{
|
|
}
|
|
|
|
void
|
|
safe_wait_synch()
|
|
{
|
|
}
|
|
|
|
#ifdef CLIPPING
|
|
void
|
|
safe_cliparound(x, y)
|
|
int x, y;
|
|
{
|
|
}
|
|
#endif /* CLIPPING */
|
|
|
|
/*
|
|
* safe_print_glyph
|
|
*
|
|
* Print the glyph to the output device. Don't flush the output device.
|
|
*/
|
|
void
|
|
safe_print_glyph(window, x, y, glyph, bkglyph)
|
|
winid window;
|
|
xchar x, y;
|
|
int glyph;
|
|
int bkglyph UNUSED;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_raw_print(str)
|
|
const char *str;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_raw_print_bold(str)
|
|
const char *str;
|
|
{
|
|
return;
|
|
}
|
|
|
|
int
|
|
safe_nhgetch()
|
|
{
|
|
return '\033';
|
|
}
|
|
|
|
/*
|
|
* return a key, or 0, in which case a mouse button was pressed
|
|
* mouse events should be returned as character postitions in the map window.
|
|
* Since normal tty's don't have mice, just return a key.
|
|
*/
|
|
/*ARGSUSED*/
|
|
int
|
|
safe_nh_poskey(x, y, mod)
|
|
int *x, *y, *mod;
|
|
{
|
|
return '\033';
|
|
}
|
|
|
|
void
|
|
win_safe_init(dir)
|
|
int dir;
|
|
{
|
|
return;
|
|
}
|
|
|
|
#ifdef POSITIONBAR
|
|
void
|
|
safe_update_positionbar(posbar)
|
|
char *posbar;
|
|
{
|
|
return;
|
|
}
|
|
#endif /* POSITIONBAR */
|
|
|
|
/*
|
|
* safe_status_init()
|
|
* -- initialize the port-specific data structures.
|
|
*/
|
|
void
|
|
safe_status_init()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_can_suspend()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_nhbell()
|
|
{
|
|
return;
|
|
}
|
|
|
|
int
|
|
safe_doprev_message()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
char
|
|
safe_yn_function(query, resp, def)
|
|
const char *query;
|
|
const char *resp;
|
|
char def;
|
|
{
|
|
return '\033';
|
|
}
|
|
|
|
/*ARGSUSED*/
|
|
static void
|
|
safe_getlin(prompt, outbuf)
|
|
const char *prompt UNUSED;
|
|
char *outbuf;
|
|
{
|
|
Strcpy(outbuf, "\033");
|
|
}
|
|
|
|
int
|
|
safe_get_ext_cmd()
|
|
{
|
|
return '\033';
|
|
}
|
|
|
|
void
|
|
safe_number_pad(mode)
|
|
int mode;
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_delay_output()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_start_screen()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_end_screen()
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
safe_outrip(tmpwin, how, when)
|
|
winid tmpwin;
|
|
int how;
|
|
time_t when;
|
|
{
|
|
return;
|
|
}
|
|
|
|
/*ARGSUSED*/
|
|
void
|
|
safe_preference_update(pref)
|
|
const char *pref UNUSED;
|
|
{
|
|
return;
|
|
}
|
|
|
|
char *
|
|
safe_getmsghistory(init)
|
|
boolean init UNUSED;
|
|
{
|
|
return (char *) 0;
|
|
}
|
|
|
|
void
|
|
safe_putmsghistory(msg, is_restoring)
|
|
const char *msg;
|
|
boolean is_restoring;
|
|
{
|
|
}
|
|
|
|
void
|
|
safe_status_finish()
|
|
{
|
|
}
|
|
|
|
void
|
|
safe_status_enablefield(fieldidx, nm, fmt, enable)
|
|
int fieldidx;
|
|
const char *nm;
|
|
const char *fmt;
|
|
boolean enable;
|
|
{
|
|
}
|
|
|
|
#ifdef STATUS_HILITES
|
|
/* call once for each field, then call with BL_FLUSH to output the result */
|
|
void
|
|
safe_status_update(idx, ptr, chg, percent, color, colormasks)
|
|
int idx;
|
|
genericptr_t ptr;
|
|
int chg UNUSED, percent UNUSED, color UNUSED;
|
|
unsigned long *colormasks UNUSED;
|
|
{
|
|
}
|
|
#endif /* STATUS_HILITES */
|
|
|
|
/**************************************************************
|
|
* These are some optionally selectable routines that add
|
|
* some base functionality over the safe_* versions above.
|
|
* The safe_* versions are primarily designed to ensure that
|
|
* there are no null function pointers remaining at early
|
|
* game startup/initialization time.
|
|
*
|
|
* The slightly more functional versions in here should be kept
|
|
* free of platform-specific code or OS-specific code. If you
|
|
* want to use versions that involve platform-specific or
|
|
* OS-specific code, go right ahead but use your own replacement
|
|
* version of the functions in a platform-specific or
|
|
* OS-specific source file, not in here.
|
|
***************************************************************/
|
|
|
|
/* Add to your code: windowprocs.win_raw_print = stdio_wait_synch; */
|
|
void
|
|
stdio_wait_synch()
|
|
{
|
|
char valid[] = {' ', '\n', '\r', '\033', '\0'};
|
|
|
|
fprintf(stdout, "--More--");
|
|
(void) fflush(stdout);
|
|
while (!index(valid, stdio_nhgetch()))
|
|
;
|
|
}
|
|
|
|
/* Add to your code: windowprocs.win_raw_print = stdio_raw_print; */
|
|
void
|
|
stdio_raw_print(str)
|
|
const char *str;
|
|
{
|
|
if (str)
|
|
fprintf(stdout, "%s\n", str);
|
|
return;
|
|
}
|
|
|
|
/* Add to your code: windowprocs.win_raw_print_bold = stdio_raw_print_bold; */
|
|
void
|
|
stdio_raw_print_bold(str)
|
|
const char *str;
|
|
{
|
|
stdio_raw_print(str);
|
|
return;
|
|
}
|
|
|
|
/* Add to your code: windowprocs.win_nhgetch = stdio_nhgetch; */
|
|
int
|
|
stdio_nhgetch()
|
|
{
|
|
return getchar();
|
|
}
|
|
|
|
|
|
/* safeprocs.c */
|