Fix layout tournament Load Engine dialog WB

[xboard.git] / winboard / help.c

diff --git a/winboard/help.c b/winboard/help.c
index a8cebd6..71e0aae 100644 (file)
--- a/winboard/help.c
+++ b/winboard/help.c
@@ -1,7 +1,7 @@
 /*\r
  * help.h\r
  *\r
 /*\r
  * help.h\r
  *\r

- * Copyright 2009 Free Software Foundation, Inc.\r
+ * Copyright 2009, 2010, 2011 Free Software Foundation, Inc.\r

  * ------------------------------------------------------------------------\r
  *\r
  * GNU XBoard is free software: you can redistribute it and/or modify\r
  * ------------------------------------------------------------------------\r
  *\r
  * GNU XBoard is free software: you can redistribute it and/or modify\r


@@ -24,6 +24,8 @@
 \r
 #include <windows.h>\r
 #include <stdio.h>\r
 \r
 #include <windows.h>\r
 #include <stdio.h>\r

+#include "config.h"
+#include "help.h"

 \r
 FILE *debugFP;\r
 \r
 \r
 FILE *debugFP;\r
 \r


@@ -59,10 +61,10 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )
        siStartInfo.hStdOutput = NULL;\r
        siStartInfo.hStdError = debugFP;\r
 \r
        siStartInfo.hStdOutput = NULL;\r
        siStartInfo.hStdError = debugFP;\r
 \r

-       sprintf(buf, "Hh.exe %s", helpFile);\r
+       snprintf(buf, sizeof(buf)/sizeof(buf[0]),"Hh.exe %s", helpFile);\r

 \r
        // ignore the other parameters; just start the viewer with the help file\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
                           buf,            /* command line */\r
                           NULL,           /* process security attributes */\r
                           NULL,           /* primary thread security attrs */\r


@@ -71,7 +73,8 @@ HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data )
                           NULL,           /* use parent's environment */\r
                           NULL,\r
                           &siStartInfo,   /* STARTUPINFO pointer */\r
                           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
 }\r
 \r
 //HWND WINAPI\r


@@ -81,13 +84,13 @@ MyHelp(HWND hwnd, LPSTR helpFile, UINT action, DWORD_PTR data)
        static int status = 0;\r
        FILE *f;\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
 \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
                }\r
                status = 1;\r
                fclose(f);\r