X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelp-menu.c;h=e63829cb06c7a143b80bca16d5bfe0d76e8031a3;hb=91240a3a96a0ffed8b1bcc4866378b4d865e6f6e;hp=f203ea773eb3622641e88f7a352b1ec6518bf4e7;hpb=3fa740d165a0c2ef7c03b11633f65c421f07f0a2;p=pspp

diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index f203ea773e..e63829cb06 100644
--- a/src/ui/gui/help-menu.c
+++ b/src/ui/gui/help-menu.c
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013, 2015, 2016  Free Software Foundation
+   Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013, 2015, 2016,
+   2021 Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,11 +45,96 @@
 
 static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", NULL};
 
+/* Opening the htmluri in windows via cmd /start uri opens
+   the windows command shell for a moment. The alternative is
+   to start a script via wscript. This will not be visible*/
+#ifdef _WIN32
+static gboolean
+open_windows_help (const gchar *helpuri, GError **err)
+{
+  SHELLEXECUTEINFOA info;
+  memset (&info, 0, sizeof (info));
+
+  info.cbSize = sizeof (info);
+  info.fMask = SEE_MASK_FLAG_NO_UI;
+  info.lpVerb = "open";
+  info.lpFile = helpuri;
+  info.nShow = SW_SHOWNORMAL;
+
+  BOOL ret = ShellExecuteExA (&info);
+
+  if (ret)
+    return TRUE;
+
+  /* Contrary to what the microsoft documentation indicates, ShellExecuteExA does
+     not seem to setLastError.  So we have to deal with errors ourselves here.  */
+  const char *msg = 0;
+  switch (GPOINTER_TO_INT (info.hInstApp))
+    {
+    case SE_ERR_FNF:
+      msg = "File not found";
+      break;
+    case SE_ERR_PNF:
+      msg = "Path not found";
+      break;
+    case SE_ERR_ACCESSDENIED:
+      msg = "Access denied";
+      break;
+    case SE_ERR_OOM:
+      msg = "Out of memory";
+      break;
+    case SE_ERR_DLLNOTFOUND:
+      msg = "Dynamic-link library not found";
+      break;
+    case SE_ERR_SHARE:
+      msg = "Cannot share an open file";
+      break;
+    case SE_ERR_ASSOCINCOMPLETE:
+      msg = "File association information not complete";
+      break;
+    case SE_ERR_DDETIMEOUT:
+      msg = "DDE operation timed out";
+      break;
+    case SE_ERR_DDEFAIL:
+      msg = "DDE operation failed";
+      break;
+    case SE_ERR_DDEBUSY:
+      msg = "DDE operation is busy";
+      break;
+    case SE_ERR_NOASSOC:
+      msg = "File association not available";
+      break;
+    default:
+      msg = "Unknown error";
+      break;
+    }
+
+  *err = g_error_new_literal (g_quark_from_static_string ("pspp-help-error"),
+                       0,
+                       msg);
+
+  return FALSE;
+}
+
+static gboolean
+on_activate_link (GtkAboutDialog *label,
+               gchar          *uri,
+               gpointer        user_data)
+{
+  return  open_windows_help (uri, NULL);
+}
+#endif
+
 static void
 about_new (GtkMenuItem *mmm, GtkWindow *parent)
 {
   GtkWidget *about =  gtk_about_dialog_new ();
 
+#ifdef _WIN32
+  /* The default handler for Windows doesn't appear to work.  */
+  g_signal_connect (about, "activate-link", G_CALLBACK (on_activate_link), parent);
+#endif
+
   gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about), "pspp");
 
   gtk_window_set_icon_name (GTK_WINDOW (about), "pspp");
@@ -91,39 +177,6 @@ about_new (GtkMenuItem *mmm, GtkWindow *parent)
 }
 
 
-/* Opening the htmluri in windows via cmd /start uri opens
-   the windows command shell for a moment. The alternative is
-   to start a script via wscript. This will not be visible*/
-#ifdef _WIN32
-static gboolean open_windows_help (const gchar *helpuri,
-                                   GError **err)
-{
-  gchar *vbsfilename = NULL;
-  gchar *vbs = NULL;
-  gboolean result;
-  vbsfilename = g_build_filename (g_get_tmp_dir (),
-                                  "pspp-help-open.vbs",
-                                  NULL);
-  vbs = g_strdup_printf("CreateObject(\"WScript.Shell\").Run \"%s\"",
-                        helpuri);
-  result = g_file_set_contents (vbsfilename,
-                                vbs,
-                                strlen(vbs),
-                                err);
-  g_free (vbs);
-  if (!result)
-    goto error;
-
-  gchar *argv[] = {CONST_CAST (gchar *, "wscript"), vbsfilename, 0};
-
-  result = g_spawn_async (NULL, argv,
-                          NULL, G_SPAWN_SEARCH_PATH,
-                          NULL, NULL, NULL, err);
- error:
-  g_free (vbsfilename);
-  return result;
-}
-#endif
 
 /* Open the manual at PAGE with the following priorities
    First: local yelp help system
@@ -177,11 +230,6 @@ online_help (const char *page)
   g_free (htmlfullname);
   g_free (htmlfilename);
 
-  /* The following **SHOULD** work but it does not on 28.5.2016
-     g_app_info_launch_default_for_uri (htmluri, NULL, &err);
-     osx: wine is started to launch the uri...
-     windows: not so bad, but the first access does not work*/
-
 #ifdef _WIN32
   bool ok = open_windows_help (htmluri, &htmlerr);
 #else