several small fixes

uptracked winboard.ini

Cleanup: moved "Some definitions required..." from winboard.c to config.h,
and combined some definitions from borland w/ MS.

Changed internal HtmlHelp return type and 4th argument to facilitate various
compilers.  These changes, while not strictly adhering to HtmlHelp() conventions,
won't impact anything since the function modified is internal only.

Modified HtmlHelp return values to integer to silence warnings.

Added help.c to the project in makefile.gcc & makefile.ms.

Fixed duplicate resource in winboard.rc.

diff --git a/winboard/config.h b/winboard/config.h
index a219a96..b1a8f72 100644 (file)
--- a/winboard/config.h
+++ b/winboard/config.h
@@ -126,6 +126,17 @@
 #define _strdup(x) strdup(x)\r
 #define STRICT\r
 #define _winmajor 3  /* windows 95 */\r
-#define SCF_DEFAULT 0x0000\r
-#define SCF_ALL 0x0004\r
+#endif\r
+\r
+/* Some definitions required by MSVC 4.1 */ \r
+#ifndef WM_MOUSEWHEEL \r
+#define WM_MOUSEWHEEL 0x020A \r
+#endif \r
+#ifndef SCF_DEFAULT \r
+#define SCF_DEFAULT 0x0000 \r
+#define SCF_ALL 0x0004 \r
+#endif \r
+\r
+#ifdef _MSC_VER\r
+#define snprintf _snprintf\r
 #endif\r

diff --git a/winboard/help.c b/winboard/help.c
index a8cebd6..febd0e6 100644 (file)
--- a/winboard/help.c
+++ b/winboard/help.c
@@ -27,8 +27,8 @@
 \r
 FILE *debugFP;\r
 \r
-HWND WINAPI\r
-HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )\r
+int\r
+HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data )\r
 {\r
        PROCESS_INFORMATION helpProcInfo;\r
        STARTUPINFO siStartInfo;\r
@@ -36,13 +36,13 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )
        static int status = 0;\r
        FILE *f;\r
 \r
-       if(status < 0) return NULL;\r
+       if(status < 0) return 0;\r
 \r
        if(!status) {\r
                f = fopen(helpFile, "r");\r
                if(f == NULL) {\r
                        status = -1;\r
-                       return NULL;\r
+                       return 0;\r
                }\r
                status = 1;\r
                fclose(f);\r
@@ -76,18 +76,18 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )
 \r
 //HWND WINAPI\r
 int\r
-MyHelp(HWND hwnd, LPSTR helpFile, UINT action, DWORD_PTR data)\r
+MyHelp(HWND hwnd, LPSTR helpFile, UINT action, DWORD data)\r
 {\r
        static int status = 0;\r
        FILE *f;\r
 \r
-       if(status < 0) return NULL;\r
+       if(status < 0) return 0;\r
 \r
        if(!status) {\r
                f = fopen(helpFile, "r");\r
                if(f == NULL) {\r
                        status = -1;\r
-                       return NULL;\r
+                       return 0;\r
                }\r
                status = 1;\r
                fclose(f);\r

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 5bd49dd..94d67b9 100644 (file)
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -7,7 +7,7 @@ PROJ=winboard
 OBJS=backend.o book.o gamelist.o lists.o moves.o pgntags.o uci.o zippy.o\\r
  parser.o wbres.o wclipbrd.o wedittags.o wengineo.o wevalgraph.o\\r
  wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\\r
- wsockerr.o\r
+ wsockerr.o help.o\r
 \r
 \r
 # make compiling less spammy\r

diff --git a/winboard/makefile.ms b/winboard/makefile.ms
index d406aef..1e2a2d3 100644 (file)
--- a/winboard/makefile.ms
+++ b/winboard/makefile.ms
@@ -9,7 +9,7 @@ PROJ = winboard
 \r
 OBJS=backend.obj book.obj gamelist.obj lists.obj moves.obj pgntags.obj uci.obj zippy.obj\\r
  parser.obj wclipbrd.obj wedittags.obj wengineo.obj wevalgraph.obj wgamelist.obj\\r
- whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj wsockerr.obj\r
+ whistory.obj winboard.obj wlayout.obj woptions.obj wsnap.obj wsockerr.obj help.obj\r
 \r
 \r
 # Debugging?\r

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e2d0c81..15ac962 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -106,7 +106,7 @@ int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 void AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames);\r
 void DisplayMove P((int moveNumber));\r
 Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));\r
-HWND WINAPI HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data );\r
+int HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data );\r
 \r
 typedef struct {\r
   ChessSquare piece;  \r
@@ -6196,7 +6196,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 \r
     case IDM_HELPCONTENTS:\r
       if (!MyHelp (hwnd, "winboard.hlp", HELP_KEY,(DWORD)(LPSTR)"CONTENTS") &&\r
-         !HtmlHelp(hwnd, "winboard.chm", 0, NULL)      ) {\r
+         !HtmlHelp(hwnd, "winboard.chm", 0, 0)) {\r
          MessageBox (GetFocus(),\r
                    "Unable to activate help",\r
                    szAppName, MB_SYSTEMMODAL|MB_OK|MB_ICONHAND);\r
@@ -6205,7 +6205,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 \r
     case IDM_HELPSEARCH:\r
         if (!MyHelp (hwnd, "winboard.hlp", HELP_PARTIALKEY, (DWORD)(LPSTR)"") &&\r
-           !HtmlHelp(hwnd, "winboard.chm", 0, NULL)    ) {\r
+           !HtmlHelp(hwnd, "winboard.chm", 0, 0)       ) {\r
        MessageBox (GetFocus(),\r
                    "Unable to activate help",\r
                    szAppName, MB_SYSTEMMODAL|MB_OK|MB_ICONHAND);\r

diff --git a/winboard/winboard.h b/winboard/winboard.h
index a16496c..b5cd602 100644 (file)
--- a/winboard/winboard.h
+++ b/winboard/winboard.h
@@ -166,15 +166,6 @@ extern MyFont *font[NUM_SIZES][NUM_FONTS];
 #define OUTLINE_PIECE         1\r
 #define WHITE_PIECE           2\r
 \r
-/* Some definitions required by MSVC 4.1 */ \r
-#ifndef WM_MOUSEWHEEL \r
-#define WM_MOUSEWHEEL 0x020A \r
-#endif \r
-#ifndef SCF_DEFAULT \r
-#define SCF_DEFAULT 0x0000 \r
-#define SCF_ALL 0x0004 \r
-#endif \r
-\r
 #define COPY_TMP "wbcopy.tmp"\r
 #define PASTE_TMP "wbpaste.tmp"\r
 \r

diff --git a/winboard/winboard.ini b/winboard/winboard.ini
deleted file mode 100644 (file)
index 5b69f1c..0000000
--- a/winboard/winboard.ini
+++ /dev/null
@@ -1,330 +0,0 @@
-;\r
-; WinBoard 4.3.15k Save Settings file\r
-;\r
-; You can edit the values of options that are already set in this file,\r
-; but if you add other options, the next Save Settings will not save them.\r
-; Use a shortcut, an @indirection file, or a .bat file instead.\r
-;\r
-/whitePieceColor=#ffffcc\r
-/blackPieceColor=#202020\r
-/lightSquareColor=#c8c365\r
-/darkSquareColor=#77a26d\r
-/highlightSquareColor=#ffff00\r
-/premoveHighlightColor=#ff0000\r
-/movesPerSession=40\r
-/timeDelay=1\r
-/timeControl="5"\r
-/timeIncrement=-1\r
-/saveGameFile=""\r
-/autoSaveGames=false\r
-/monoMode=false\r
-/showCoords=false\r
-/showThinking=false\r
-/ponderNextMove=true\r
-/periodicUpdates=true\r
-/popupExitMessage=true\r
-/popupMoveErrors=false\r
-/size=tiny /clockFont="Arial:9 b"\r
-/size=teeny /clockFont="Arial:9 b"\r
-/size=dinky /clockFont="Arial:10 b"\r
-/size=petite /clockFont="Arial:10 b"\r
-/size=slim /clockFont="Arial:12 b"\r
-/size=small /clockFont="Arial:14 b"\r
-/size=mediocre /clockFont="Arial:14 b"\r
-/size=middling /clockFont="Arial:14 b"\r
-/size=average /clockFont="Arial:15 b"\r
-/size=moderate /clockFont="Arial:16 b"\r
-/size=medium /clockFont="Arial:16 b"\r
-/size=bulky /clockFont="Arial:17 b"\r
-/size=large /clockFont="Arial:19 b"\r
-/size=big /clockFont="Arial:20 b"\r
-/size=huge /clockFont="Arial:21 b"\r
-/size=giant /clockFont="Arial:22 b"\r
-/size=colossal /clockFont="Arial:23 b"\r
-/size=titanic /clockFont="Arial:24 b"\r
-/size=tiny /messageFont="Small Fonts:6"\r
-/size=teeny /messageFont="Small Fonts:6"\r
-/size=dinky /messageFont="Small Fonts:7"\r
-/size=petite /messageFont="Small Fonts:7"\r
-/size=slim /messageFont="Arial:8 b"\r
-/size=small /messageFont="Arial:9 b"\r
-/size=mediocre /messageFont="Arial:9 b"\r
-/size=middling /messageFont="Arial:9 b"\r
-/size=average /messageFont="Arial:10 b"\r
-/size=moderate /messageFont="Arial:10 b"\r
-/size=medium /messageFont="Arial:10 b"\r
-/size=bulky /messageFont="Arial:10 b"\r
-/size=large /messageFont="Arial:10 b"\r
-/size=big /messageFont="Arial:11 b"\r
-/size=huge /messageFont="Arial:11 b"\r
-/size=giant /messageFont="Arial:11 b"\r
-/size=colossal /messageFont="Arial:12 b"\r
-/size=titanic /messageFont="Arial:12 b"\r
-/size=tiny /coordFont="Small Fonts:4"\r
-/size=teeny /coordFont="Small Fonts:4"\r
-/size=dinky /coordFont="Small Fonts:5"\r
-/size=petite /coordFont="Small Fonts:5"\r
-/size=slim /coordFont="Small Fonts:6"\r
-/size=small /coordFont="Small Fonts:7"\r
-/size=mediocre /coordFont="Small Fonts:7"\r
-/size=middling /coordFont="Small Fonts:7"\r
-/size=average /coordFont="Arial:7 b"\r
-/size=moderate /coordFont="Arial:7 b"\r
-/size=medium /coordFont="Arial:7 b"\r
-/size=bulky /coordFont="Arial:7 b"\r
-/size=large /coordFont="Arial:7 b"\r
-/size=big /coordFont="Arial:8 b"\r
-/size=huge /coordFont="Arial:8 b"\r
-/size=giant /coordFont="Arial:8 b"\r
-/size=colossal /coordFont="Arial:9 b"\r
-/size=titanic /coordFont="Arial:9 b"\r
-/size=tiny /tagsFont="Courier New:8"\r
-/size=teeny /tagsFont="Courier New:8"\r
-/size=dinky /tagsFont="Courier New:8"\r
-/size=petite /tagsFont="Courier New:8"\r
-/size=slim /tagsFont="Courier New:8"\r
-/size=small /tagsFont="Courier New:8"\r
-/size=mediocre /tagsFont="Courier New:8"\r
-/size=middling /tagsFont="Courier New:8"\r
-/size=average /tagsFont="Courier New:8"\r
-/size=moderate /tagsFont="Courier New:8"\r
-/size=medium /tagsFont="Courier New:8"\r
-/size=bulky /tagsFont="Courier New:8"\r
-/size=large /tagsFont="Courier New:8"\r
-/size=big /tagsFont="Courier New:8"\r
-/size=huge /tagsFont="Courier New:8"\r
-/size=giant /tagsFont="Courier New:8"\r
-/size=colossal /tagsFont="Courier New:8"\r
-/size=titanic /tagsFont="Courier New:8"\r
-/size=tiny /commentFont="Arial:9"\r
-/size=teeny /commentFont="Arial:9"\r
-/size=dinky /commentFont="Arial:9"\r
-/size=petite /commentFont="Arial:9"\r
-/size=slim /commentFont="Arial:9"\r
-/size=small /commentFont="Arial:9"\r
-/size=mediocre /commentFont="Arial:9"\r
-/size=middling /commentFont="Arial:9"\r
-/size=average /commentFont="Arial:9"\r
-/size=moderate /commentFont="Arial:9"\r
-/size=medium /commentFont="Arial:9"\r
-/size=bulky /commentFont="Arial:9"\r
-/size=large /commentFont="Arial:9"\r
-/size=big /commentFont="Arial:9"\r
-/size=huge /commentFont="Arial:9"\r
-/size=giant /commentFont="Arial:9"\r
-/size=colossal /commentFont="Arial:9"\r
-/size=titanic /commentFont="Arial:9"\r
-/size=tiny /icsFont="Courier New:8"\r
-/size=teeny /icsFont="Courier New:8"\r
-/size=dinky /icsFont="Courier New:8"\r
-/size=petite /icsFont="Courier New:8"\r
-/size=slim /icsFont="Courier New:8"\r
-/size=small /icsFont="Courier New:8"\r
-/size=mediocre /icsFont="Courier New:8"\r
-/size=middling /icsFont="Courier New:8"\r
-/size=average /icsFont="Courier New:8"\r
-/size=moderate /icsFont="Courier New:8"\r
-/size=medium /icsFont="Courier New:8"\r
-/size=bulky /icsFont="Courier New:8"\r
-/size=large /icsFont="Courier New:8"\r
-/size=big /icsFont="Courier New:8"\r
-/size=huge /icsFont="Courier New:8"\r
-/size=giant /icsFont="Courier New:8"\r
-/size=colossal /icsFont="Courier New:8"\r
-/size=titanic /icsFont="Courier New:8"\r
-/size=tiny /moveHistoryFont="MS Sans Serif:8"\r
-/size=teeny /moveHistoryFont="MS Sans Serif:8"\r
-/size=dinky /moveHistoryFont="MS Sans Serif:8"\r
-/size=petite /moveHistoryFont="MS Sans Serif:8"\r
-/size=slim /moveHistoryFont="MS Sans Serif:8"\r
-/size=small /moveHistoryFont="MS Sans Serif:8"\r
-/size=mediocre /moveHistoryFont="MS Sans Serif:8"\r
-/size=middling /moveHistoryFont="MS Sans Serif:8"\r
-/size=average /moveHistoryFont="MS Sans Serif:8"\r
-/size=moderate /moveHistoryFont="MS Sans Serif:8"\r
-/size=medium /moveHistoryFont="MS Sans Serif:8"\r
-/size=bulky /moveHistoryFont="MS Sans Serif:8"\r
-/size=large /moveHistoryFont="MS Sans Serif:8"\r
-/size=big /moveHistoryFont="MS Sans Serif:8"\r
-/size=huge /moveHistoryFont="MS Sans Serif:8"\r
-/size=giant /moveHistoryFont="MS Sans Serif:8"\r
-/size=colossal /moveHistoryFont="MS Sans Serif:8"\r
-/size=titanic /moveHistoryFont="MS Sans Serif:8"\r
-/boardSize=bulky\r
-/alwaysOnTop=false\r
-/autoCallFlag=false\r
-/autoComment=false\r
-/autoObserve=false\r
-/autoFlipView=true\r
-/autoRaiseBoard=true\r
-/alwaysPromoteToQueen=false\r
-/oldSaveStyle=false\r
-/quietPlay=false\r
-/getMoveList=true\r
-/testLegality=true\r
-/premove=true\r
-/premoveWhite=false\r
-/premoveWhiteText=""\r
-/premoveBlack=false\r
-/premoveBlackText=""\r
-/icsAlarm=true\r
-/icsAlarmTime=5000\r
-/animateMoving=true\r
-/animateSpeed=10\r
-/animateDragging=true\r
-/blindfold=false\r
-/highlightLastMove=true\r
-/highlightDragging=false\r
-/colorizeMessages=true\r
-/colorShout="#209000"\r
-/colorSShout="b #289808"\r
-/colorChannel1="#2020e0"\r
-/colorChannel="b #4040ff"\r
-/colorKibitz="b #ff00ff"\r
-/colorTell="b #ff0000"\r
-/colorChallenge="bi #ff0000"\r
-/colorRequest="bi #ff0000"\r
-/colorSeek="#980808"\r
-/colorNormal="#000000"\r
-/colorBackground=#ffffff\r
-/soundShout=""\r
-/soundSShout=""\r
-/soundChannel1=""\r
-/soundChannel=""\r
-/soundKibitz=""\r
-/soundTell=""\r
-/soundChallenge=""\r
-/soundRequest=""\r
-/soundSeek=""\r
-/soundMove=""\r
-/soundBell="$"\r
-/soundIcsWin=""\r
-/soundIcsLoss=""\r
-/soundIcsDraw=""\r
-/soundIcsUnfinished=""\r
-/soundIcsAlarm=""\r
-/comPortSettings=9600,7,Space,1,None\r
-/x=10\r
-/y=30\r
-/icsX=-2147483648\r
-/icsY=-2147483648\r
-/icsW=-2147483648\r
-/icsH=-2147483648\r
-/analysisX=-2147483648\r
-/analysisY=-2147483648\r
-/analysisW=-2147483648\r
-/analysisH=-2147483648\r
-/commentX=-2147483648\r
-/commentY=-2147483648\r
-/commentW=-2147483648\r
-/commentH=-2147483648\r
-/tagsX=-2147483648\r
-/tagsY=-2147483648\r
-/tagsW=-2147483648\r
-/tagsH=-2147483648\r
-/gameListX=-2147483648\r
-/gameListY=-2147483648\r
-/gameListW=-2147483648\r
-/gameListH=-2147483648\r
-/saveSettingsOnExit=true\r
-/icsMenu={-\r
-&Who,who,0,1\r
-Playe&rs,players,0,1\r
-&Games,games,0,1\r
-&Sought,sought,0,1\r
-|&Tell (name),tell,1,0\r
-M&essage (name),message,1,0\r
--\r
-&Finger (name),finger,1,1\r
-&Vars (name),vars,1,1\r
-&Observe (name),observe,1,1\r
-&Match (name),match,1,1\r
-Pl&ay (name),play,1,1\r
-}\r
-/icsNames={chessclub.com /icsport=5000 /icshelper=timestamp\r
-freechess.org /icsport=5000 /icshelper=timeseal\r
-global.chessparlor.com /icsport=6000 /icshelper=timeseal\r
-chessanytime.com /icsport=5000\r
-chess.net /icsport=5000\r
-zics.org /icsport=5000\r
-jogo.cex.org.br /icsport=5000\r
-ajedrez.cec.uchile.cl /icsport=5000\r
-fly.cc.fer.hr /icsport=7890\r
-freechess.nl /icsport=5000 /icshelper=timeseal\r
-jeu.echecs.com /icsport=5000\r
-chess.unix-ag.uni-kl.de /icsport=5000 /icshelper=timeseal\r
-chess.mds.mdh.se /icsport=5000\r
-}\r
-/firstChessProgramNames={GNUChess\r
-"GNUChes5 xboard"\r
-}\r
-/secondChessProgramNames={GNUChess\r
-"GNUChes5 xboard"\r
-}\r
-/showButtonBar=true\r
-/pgnExtendedInfo=false\r
-/hideThinkingFromHuman=false\r
-/liteBackTextureFile=""\r
-/darkBackTextureFile=""\r
-/liteBackTextureMode=1\r
-/darkBackTextureMode=1\r
-/renderPiecesWithFont=""\r
-/fontPieceToCharTable=""\r
-/fontPieceBackColorWhite=#000000\r
-/fontPieceForeColorWhite=#000000\r
-/fontPieceBackColorBlack=#000000\r
-/fontPieceForeColorBlack=#000000\r
-/fontPieceSize=80\r
-/overrideLineGap=1\r
-/adjudicateLossThreshold=0\r
-/delayBeforeQuit=0\r
-/delayAfterQuit=0\r
-/pgnEventHeader="Computer Chess Game"\r
-/defaultFrcPosition=-1\r
-/gameListTags="eprd"\r
-/saveOutOfBookInfo=true\r
-/showEvalInMoveHistory=true\r
-/evalHistColorWhite=#ffffb0\r
-/evalHistColorBlack=#ad5d3d\r
-/highlightMoveWithArrow=false\r
-/highlightArrowColor=#ffff80\r
-/stickyWindows=true\r
-/adjudicateDrawMoves=0\r
-/autoDisplayComment=true\r
-/autoDisplayTags=true\r
-/polyglotDir=""\r
-/usePolyglotBook=false\r
-/polyglotBook=""\r
-/defaultHashSize=64\r
-/defaultCacheSizeEGTB=4\r
-/defaultPathEGTB="c:\egtb"\r
-/moveHistoryUp=false\r
-/moveHistoryX=136\r
-/moveHistoryY=224\r
-/moveHistoryW=346\r
-/moveHistoryH=237\r
-/evalGraphUp=false\r
-/evalGraphX=136\r
-/evalGraphY=224\r
-/evalGraphW=332\r
-/evalGraphH=148\r
-/engineOutputUp=false\r
-/engineOutputX=136\r
-/engineOutputY=224\r
-/engineOutputW=407\r
-/engineOutputH=297\r
-/boardWidth=-1\r
-/boardHeight=-1\r
-/holdingsSize=-1\r
-/matchPause=10000\r
-/flipBlack=false\r
-/allWhite=false\r
-/testClaims=false\r
-/checkMates=false\r
-/materialDraws=false\r
-/trivialDraws=false\r
-/ruleMoves=51\r
-/repeatsToDraw=6\r
-/smpCores=1\r
-/egtFormats=""\r
-/timeOddsMode=0\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 1d61fd2..5050deb 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -645,7 +645,7 @@ BEGIN
                     50,10\r
     CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,24,50,\r
                     10\r
-    CONTROL         "&Twilight",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,34,50,\r
+    CONTROL         "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,70,34,50,\r
                     10\r
     CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,70,\r
                     44,50,10\r