fixed a few warnings in connection with the help patch (now warning free)

diff --git a/winboard/help.c b/winboard/help.c
index febd0e6..94d0fd9 100644 (file)
--- a/winboard/help.c
+++ b/winboard/help.c
@@ -27,8 +27,8 @@
 \r
 FILE *debugFP;\r
 \r
-int\r
-HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data )\r
+HWND WINAPI\r
+HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )\r
 {\r
        PROCESS_INFORMATION helpProcInfo;\r
        STARTUPINFO siStartInfo;\r
@@ -36,13 +36,13 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data )
        static int status = 0;\r
        FILE *f;\r
 \r
-       if(status < 0) return 0;\r
+       if(status < 0) return NULL;\r
 \r
        if(!status) {\r
                f = fopen(helpFile, "r");\r
                if(f == NULL) {\r
                        status = -1;\r
-                       return 0;\r
+                       return NULL;\r
                }\r
                status = 1;\r
                fclose(f);\r
@@ -62,7 +62,7 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data )
        sprintf(buf, "Hh.exe %s", helpFile);\r
 \r
        // ignore the other parameters; just start the viewer with the help file\r
-       return CreateProcess(NULL,\r
+       if(  CreateProcess(NULL,\r
                           buf,            /* command line */\r
                           NULL,           /* process security attributes */\r
                           NULL,           /* primary thread security attrs */\r
@@ -71,12 +71,13 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data )
                           NULL,           /* use parent's environment */\r
                           NULL,\r
                           &siStartInfo,   /* STARTUPINFO pointer */\r
-                          &helpProcInfo); /* receives PROCESS_INFORMATION */\r
+                          &helpProcInfo)  /* receives PROCESS_INFORMATION */\r
+               ) return hwnd; else return NULL;\r
 }\r
 \r
 //HWND WINAPI\r
 int\r
-MyHelp(HWND hwnd, LPSTR helpFile, UINT action, DWORD data)\r
+MyHelp(HWND hwnd, LPSTR helpFile, UINT action, DWORD_PTR data)\r
 {\r
        static int status = 0;\r
        FILE *f;\r

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 15ac962..9cc844c 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -106,7 +106,11 @@ 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
-int HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD data );\r
+#ifdef VISTA\r
+#include "htmlhelp.h"\r
+#else\r
+HWND WINAPI HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data );\r
+#endif\r
 \r
 typedef struct {\r
   ChessSquare piece;  \r
@@ -6196,7 +6200,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, 0)) {\r
+         !HtmlHelp(hwnd, "winboard.chm", 0, 0) ) {\r
          MessageBox (GetFocus(),\r
                    "Unable to activate help",\r
                    szAppName, MB_SYSTEMMODAL|MB_OK|MB_ICONHAND);\r