File inkscape-0.91-win32.patch of Package mingw64-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.91-win32.patch of Package mingw64-inkscape (Revision 31e2c4e4b3404d5da142a49e8c5e7914)

Currently displaying revision 31e2c4e4b3404d5da142a49e8c5e7914 , Show latest

--- inkscape-0.91/src/inkview.cpp	2014-11-30 19:45:32.000000000 +0100
+++ inkscape-0.91/src/inkview.cpp	2015-03-17 08:45:33.914728915 +0100
@@ -72,6 +72,13 @@
 
 #include "ui/icon-names.h"
 
+#ifdef _WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
+#endif
+
 extern char *optarg;
 extern int  optind, opterr;
 
@@ -170,6 +177,30 @@
 int
 main (int argc, const char **argv)
 {
+#ifdef _WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+#endif
+
     if (argc == 1) {
 	usage();
     }
--- inkscape-0.91/src/main.cpp	2014-11-30 19:45:32.000000000 +0100
+++ inkscape-0.91/src/main.cpp	2015-03-17 08:46:40.669223196 +0100
@@ -97,6 +97,9 @@
 #include <extension/input.h>
 
 #ifdef WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0501
 #include <windows.h>
 #include "registrytool.h"
 #endif // WIN32
@@ -653,6 +656,31 @@
 int
 main(int argc, char **argv)
 {
+#ifdef _WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+#endif
+
+
 #ifdef HAVE_FPSETMASK
     /* This is inherited from Sodipodi code, where it was in #ifdef __FreeBSD__.  It's probably
        safe to remove: the default mask is already 0 in C99, and in current FreeBSD according to

Places

File inkscape-0.91-win32.patch of Package mingw64-inkscape (Revision 31e2c4e4b3404d5da142a49e8c5e7914)

Places