Mercurial > mxe-octave

annotate src/gnuplot-2-win64.patch @ 3528:8af668b331da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot-2-win64.patch: update for mingw-w64 compiler
author John W. Eaton <jwe@octave.org>
date Sun, 16 Feb 2014 21:44:44 -0500
parents 598f4d2af02e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3514
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -urN gnuplot-4.6.4.orig/src/internal.c gnuplot-4.6.4/src/internal.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- gnuplot-4.6.4.orig/src/internal.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ gnuplot-4.6.4/src/internal.c 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -58,12 +58,13 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 static enum DATA_TYPES sprintf_specifier __PROTO((const char *format));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 -
3528
8af668b331da gnuplot-2-win64.patch: update for mingw-w64 compiler
John W. Eaton <jwe@octave.org>
parents: 3514
diff changeset
9 +#ifndef WIN32
3514
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 int
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 GP_MATHERR( STRUCT_EXCEPTION_P_X )
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 return (undefined = TRUE); /* don't print error message */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 #define BAD_DEFAULT default: int_error(NO_CARET, "internal error : type neither INT or CMPLX"); return;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 diff -urN gnuplot-4.6.4.orig/src/win/wgnuplot.exe.manifest64 gnuplot-4.6.4/src/win/wgnuplot.exe.manifest64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 --- gnuplot-4.6.4.orig/src/win/wgnuplot.exe.manifest64 1969-12-31 19:00:00.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 +++ gnuplot-4.6.4/src/win/wgnuplot.exe.manifest64 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 @@ -0,0 +1,22 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 +<assemblyIdentity
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 + version="4.5.0.0"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 + processorArchitecture="amd64"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 + name="gnuplot development team.gnuplot.wgnuplot"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 + type="win32"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 +/>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 +<description>Famous scientific plotting package.</description>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 +<dependency>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 + <dependentAssembly>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 + <assemblyIdentity
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 + type="win32"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 + name="Microsoft.Windows.Common-Controls"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 + version="6.0.0.0"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 + processorArchitecture="amd64"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 + publicKeyToken="6595b64144ccf1df"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 + language="*"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 + />
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 + </dependentAssembly>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 +</dependency>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 +</assembly>
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 diff -urN gnuplot-4.6.4.orig/src/win/wgnuplot.rc gnuplot-4.6.4/src/win/wgnuplot.rc
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 --- gnuplot-4.6.4.orig/src/win/wgnuplot.rc 2014-02-07 20:11:36.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 +++ gnuplot-4.6.4/src/win/wgnuplot.rc 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 @@ -3,8 +3,12 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 #include "wgnuplib.rc"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 #ifndef NO_MANIFEST
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wgnuplot.exe.manifest64"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wgnuplot.exe.manifest"
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 #endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 #ifdef MSRC
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 /* using Microsoft RC.EXE */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 diff -urN gnuplot-4.6.4.orig/src/win/wgraph.c gnuplot-4.6.4/src/win/wgraph.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 --- gnuplot-4.6.4.orig/src/win/wgraph.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 +++ gnuplot-4.6.4/src/win/wgraph.c 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 @@ -433,8 +433,13 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 NULL, NULL, lpgw->hInstance, lpgw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 if (lpgw->hWndGraph)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69 + SetClassLongPtr(lpgw->hWndGraph, GCLP_HICON,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 + (LONG_PTR) LoadIcon(lpgw->hInstance, "GRPICON"));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 SetClassLong(lpgw->hWndGraph, GCL_HICON,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 (LONG) LoadIcon(lpgw->hInstance, "GRPICON"));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76 lpgw->hStatusbar = CreateWindowEx(0, STATUSCLASSNAME, (LPSTR)NULL,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 WS_CHILD | SBARS_SIZEGRIP,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 @@ -571,7 +576,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79 /* modify the system menu to have the new items we want */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
80 sysmenu = GetSystemMenu(lpgw->hWndGraph,0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
81 AppendMenu(sysmenu, MF_SEPARATOR, 0, NULL);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
82 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
83 + AppendMenu(sysmenu, MF_POPUP, (UINT_PTR)lpgw->hPopMenu, "&Options");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
84 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
85 AppendMenu(sysmenu, MF_POPUP, (UINT)lpgw->hPopMenu, "&Options");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
86 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
87 AppendMenu(sysmenu, MF_STRING, M_ABOUT, "&About");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
88
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
89 #ifndef WGP_CONSOLE
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
90 @@ -2622,13 +2631,17 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
91 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
92
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
93 pr.hdcPrn = printer;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
94 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
95 + SetWindowLongPtr(hwnd, 4, (LONG_PTR)((GP_LPPRINT)&pr));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
96 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
97 SetWindowLong(hwnd, 4, (LONG)((GP_LPPRINT)&pr));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
98 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
99 PrintRegister((GP_LPPRINT)&pr);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
100
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
101 EnableWindow(hwnd, FALSE);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
102 pr.bUserAbort = FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
103 pr.hDlgPrint = CreateDialogParam(hdllInstance, "CancelDlgBox",
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
104 - hwnd, PrintDlgProc, (LPARAM)lpgw->Title);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
105 + hwnd, PrintDlgProc, (LPARAM)lpgw->Title);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
106 SetAbortProc(printer, PrintAbortProc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
107
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
108 memset(&docInfo, 0, sizeof(DOCINFO));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
109 @@ -2879,7 +2892,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
110
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
111 #define LS_DEFLINE 2
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
112 typedef struct tagLS {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
113 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
114 + LONG_PTR widtype;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
115 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
116 int widtype;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
117 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
118 int wid;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
119 HWND hwnd;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
120 int pen; /* current pen number */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
121 @@ -2941,7 +2958,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
122 int i;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
123 UINT pen;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
124 LPLOGPEN plpm, plpc;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
125 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
126 + lpls = (LPLS)GetWindowLongPtr(GetParent(hdlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
127 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
128 lpls = (LPLS)GetWindowLong(GetParent(hdlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
129 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
130
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
131 switch (wmsg) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
132 case WM_INITDIALOG:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
133 @@ -3121,7 +3142,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
134 BOOL status = FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
135 LS ls;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
136
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
137 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
138 + SetWindowLongPtr(lpgw->hWndGraph, 4, (LONG_PTR)((LPLS)&ls));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
139 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
140 SetWindowLong(lpgw->hWndGraph, 4, (LONG)((LPLS)&ls));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
141 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
142 _fmemcpy(&ls.colorpen, &lpgw->colorpen, (WGNUMPENS + 2) * sizeof(LOGPEN));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
143 _fmemcpy(&ls.monopen, &lpgw->monopen, (WGNUMPENS + 2) * sizeof(LOGPEN));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
144
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
145 @@ -3202,7 +3227,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
146 static unsigned int last_modifier_mask = -99;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
147 #endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
148
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
149 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
150 + lpgw = (LPGW)GetWindowLongPtr(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
151 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
152 lpgw = (LPGW)GetWindowLong(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
153 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
154
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
155 #ifdef USE_MOUSE
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
156 /* mouse events first */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
157 @@ -3716,7 +3745,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
158 return FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
159 case WM_CREATE:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
160 lpgw = ((CREATESTRUCT *)lParam)->lpCreateParams;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
161 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
162 + SetWindowLongPtr(hwnd, 0, (LONG_PTR)lpgw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
163 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
164 SetWindowLong(hwnd, 0, (LONG)lpgw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
165 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
166 lpgw->hWndGraph = hwnd;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
167 hdc = GetDC(hwnd);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
168 MakePens(lpgw, hdc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
169 diff -urN gnuplot-4.6.4.orig/src/win/winmain.c gnuplot-4.6.4/src/win/winmain.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
170 --- gnuplot-4.6.4.orig/src/win/winmain.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
171 +++ gnuplot-4.6.4/src/win/winmain.c 2014-02-07 20:16:45.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
172 @@ -553,7 +553,12 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
173 if (TextInit(&textwin))
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
174 exit(1);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
175 textwin.hIcon = LoadIcon(hInstance, "TEXTICON");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
176 +
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
177 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
178 + SetClassLongPtr(textwin.hWndParent, GCLP_HICON, (LONG_PTR)textwin.hIcon);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
179 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
180 SetClassLong(textwin.hWndParent, GCL_HICON, (DWORD)textwin.hIcon);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
181 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
182 /* Note: we want to know whether this is an interactive session so that we can
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
183 * decide whether or not to write status information to stderr. The old test
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
184 * for this was to see if (argc > 1) but the addition of optional command line
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
185 diff -urN gnuplot-4.6.4.orig/src/win/wmenu.c gnuplot-4.6.4/src/win/wmenu.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
186 --- gnuplot-4.6.4.orig/src/win/wmenu.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
187 +++ gnuplot-4.6.4/src/win/wmenu.c 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
188 @@ -827,8 +827,13 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
189 goto errorcleanup;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
190 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
191 hMenu[nMenuLevel] = CreateMenu();
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
192 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
193 + AppendMenu(hMenu[nMenuLevel > 0 ? nMenuLevel-1 : 0],
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
194 + MF_STRING | MF_POPUP, (UINT_PTR)hMenu[nMenuLevel], (LPCSTR)buf);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
195 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
196 AppendMenu(hMenu[nMenuLevel > 0 ? nMenuLevel-1 : 0],
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
197 MF_STRING | MF_POPUP, (UINT)hMenu[nMenuLevel], (LPCSTR)buf);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
198 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
199 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
200 else if (!lstrcmpi(buf,"[EndMenu]")) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
201 if (nMenuLevel > 0)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
202 @@ -1047,7 +1052,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
203 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
204 LPTW lptw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
205 LPMW lpmw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
206 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
207 + lptw = (LPTW)GetWindowLongPtr(GetParent(hDlg), 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
208 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
209 lptw = (LPTW)GetWindowLong(GetParent(hDlg), 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
210 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
211 lpmw = lptw->lpmw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
212
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
213 switch( message) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
214 diff -urN gnuplot-4.6.4.orig/src/win/wpause.c gnuplot-4.6.4/src/win/wpause.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
215 --- gnuplot-4.6.4.orig/src/win/wpause.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
216 +++ gnuplot-4.6.4/src/win/wpause.c 2014-02-07 20:18:08.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
217 @@ -207,7 +207,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
218 LPPW lppw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
219 int cxChar, cyChar, middle;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
220
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
221 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
222 + lppw = (LPPW)GetWindowLongPtr(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
223 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
224 lppw = (LPPW)GetWindowLong(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
225 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
226
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
227 switch(message) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
228 case WM_KEYDOWN:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
229 @@ -251,7 +255,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
230 ws_opts |= WS_VISIBLE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
231 /* HBB 981202 HMENU sysmenu = GetSystemMenu(hwnd, FALSE); */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
232 lppw = ((CREATESTRUCT *)lParam)->lpCreateParams;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
233 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
234 + SetWindowLongPtr(hwnd, 0, (LONG_PTR)lppw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
235 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
236 SetWindowLong(hwnd, 0, (LONG)lppw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
237 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
238 lppw->hWndPause = hwnd;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
239 hdc = GetDC(hwnd);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
240 SelectObject(hdc, GetStockObject(SYSTEM_FONT));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
241 @@ -273,10 +281,17 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
242 8*cxChar, 7*cyChar/4,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
243 hwnd, (HMENU)IDCANCEL,
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
244 ((LPCREATESTRUCT) lParam)->hInstance, NULL);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
245 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
246 + lppw->lpfnOK = (WNDPROC) GetWindowLongPtr(lppw->hOK, GWLP_WNDPROC);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
247 + SetWindowLongPtr(lppw->hOK, GWLP_WNDPROC, (LONG_PTR)PauseButtonProc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
248 + lppw->lpfnCancel = (WNDPROC) GetWindowLongPtr(lppw->hCancel, GWLP_WNDPROC);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
249 + SetWindowLongPtr(lppw->hCancel, GWLP_WNDPROC, (LONG_PTR)PauseButtonProc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
250 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
251 lppw->lpfnOK = (WNDPROC) GetWindowLong(lppw->hOK, GWL_WNDPROC);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
252 SetWindowLong(lppw->hOK, GWL_WNDPROC, (LONG)PauseButtonProc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
253 lppw->lpfnCancel = (WNDPROC) GetWindowLong(lppw->hCancel, GWL_WNDPROC);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
254 SetWindowLong(lppw->hCancel, GWL_WNDPROC, (LONG)PauseButtonProc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
255 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
256 if (GetParent(hwnd))
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
257 EnableWindow(GetParent(hwnd),FALSE);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
258 #if 0 /* HBB 981203 */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
259 @@ -308,7 +323,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
260 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
261 LPPW lppw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
262 LONG n = GetWindowLong(hwnd, GWL_ID);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
263 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
264 + lppw = (LPPW)GetWindowLongPtr(GetParent(hwnd), 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
265 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
266 lppw = (LPPW)GetWindowLong(GetParent(hwnd), 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
267 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
268 switch(message) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
269 case WM_KEYDOWN:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
270 switch(wParam) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
271 diff -urN gnuplot-4.6.4.orig/src/win/wprinter.c gnuplot-4.6.4/src/win/wprinter.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
272 --- gnuplot-4.6.4.orig/src/win/wprinter.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
273 +++ gnuplot-4.6.4/src/win/wprinter.c 2014-02-07 20:22:04.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
274 @@ -63,15 +63,17 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
275
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
276 GP_LPPRINT prlist = NULL;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
277
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
278 -BOOL CALLBACK PrintSizeDlgProc(HWND hdlg, UINT wmsg, WPARAM wparam, LPARAM lparam);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
279 static GP_LPPRINT PrintFind(HDC hdc);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
280
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
281 -
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
282 BOOL CALLBACK
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
283 PrintSizeDlgProc(HWND hdlg, UINT wmsg, WPARAM wparam, LPARAM lparam)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
284 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
285 char buf[8];
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
286 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
287 + GP_LPPRINT lpr = (GP_LPPRINT)GetWindowLongPtr(GetParent(hdlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
288 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
289 GP_LPPRINT lpr = (GP_LPPRINT)GetWindowLong(GetParent(hdlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
290 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
291
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
292 switch (wmsg) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
293 case WM_INITDIALOG:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
294 @@ -146,7 +148,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
295 BOOL status = FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
296 GP_PRINT pr;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
297
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
298 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
299 + SetWindowLongPtr(hwnd, 4, (LONG_PTR)&pr);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
300 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
301 SetWindowLong(hwnd, 4, (LONG)&pr);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
302 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
303 pr.poff.x = 0;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
304 pr.poff.y = 0;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
305 pr.psize.x = GetDeviceCaps(printer, HORZSIZE);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
306 @@ -219,7 +225,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
307 PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
308 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
309 GP_LPPRINT lpr;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
310 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
311 + lpr = (GP_LPPRINT) GetWindowLongPtr(GetParent(hDlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
312 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
313 lpr = (GP_LPPRINT)GetWindowLong(GetParent(hDlg), 4);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
314 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
315 /* FIXME: cause of crash in bug #3544949. No idea yet as to why this could happen, though. */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
316 if (lpr == NULL)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
317 return FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
318 @@ -240,7 +250,6 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
319 return FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
320 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
321
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
322 -
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
323 BOOL CALLBACK
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
324 PrintAbortProc(HDC hdcPrn, int code)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
325 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
326 @@ -292,7 +301,12 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
327 printer = pd.hDC;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
328 if (printer != (HDC)NULL) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
329 pr.hdcPrn = printer;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
330 +
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
331 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
332 + SetWindowLongPtr(hwnd, 4, (LONG_PTR)((GP_LPPRINT)&pr));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
333 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
334 SetWindowLong(hwnd, 4, (LONG)((GP_LPPRINT)&pr));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
335 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
336 PrintRegister((GP_LPPRINT)&pr);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
337 if ( (buf = malloc(4096+2)) != (char *)NULL ) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
338 bufcount = (WORD *)buf;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
339 diff -urN gnuplot-4.6.4.orig/src/win/wtext.c gnuplot-4.6.4/src/win/wtext.c
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
340 --- gnuplot-4.6.4.orig/src/win/wtext.c 2014-02-07 20:11:05.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
341 +++ gnuplot-4.6.4/src/win/wtext.c 2014-02-07 20:11:47.000000000 -0500
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
342 @@ -287,7 +287,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
343
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
344 sysmenu = GetSystemMenu(lptw->hWndParent,0); /* get the sysmenu */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
345 AppendMenu(sysmenu, MF_SEPARATOR, 0, NULL);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
346 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
347 + AppendMenu(sysmenu, MF_POPUP, (UINT_PTR)lptw->hPopMenu, "&Options");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
348 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
349 AppendMenu(sysmenu, MF_POPUP, (UINT)lptw->hPopMenu, "&Options");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
350 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
351 AppendMenu(sysmenu, MF_STRING, M_ABOUT, "&About");
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
352
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
353 if (lptw->lpmw)
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
354 @@ -1020,7 +1024,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
355 HDC hdc;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
356 LPTW lptw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
357
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
358 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
359 + lptw = (LPTW)GetWindowLongPtr(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
360 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
361 lptw = (LPTW)GetWindowLong(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
362 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
363
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
364 switch(message) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
365 case WM_SYSCOMMAND:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
366 @@ -1098,7 +1106,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
367 TEXTMETRIC tm;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
368
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
369 lptw = ((CREATESTRUCT *)lParam)->lpCreateParams;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
370 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
371 + SetWindowLongPtr(hwnd, 0, (LONG_PTR)lptw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
372 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
373 SetWindowLong(hwnd, 0, (LONG)lptw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
374 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
375 lptw->hWndParent = hwnd;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
376 /* get character size */
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
377 TextMakeFont(lptw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
378 @@ -1195,7 +1207,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
379 int nYinc, nXinc;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
380 LPTW lptw;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
381
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
382 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
383 + lptw = (LPTW)GetWindowLongPtr(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
384 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
385 lptw = (LPTW)GetWindowLong(hwnd, 0);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
386 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
387
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
388 switch(message) {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
389 case WM_SETFOCUS:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
390 @@ -1864,7 +1880,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
391 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
392 case WM_CREATE:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
393 lptw = ((CREATESTRUCT *)lParam)->lpCreateParams;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
394 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
395 + SetWindowLongPtr(hwnd, 0, (LONG_PTR)lptw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
396 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
397 SetWindowLong(hwnd, 0, (LONG)lptw);
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
398 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
399 lptw->hWndText = hwnd;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
400 break;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
401 case WM_DESTROY:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
402 @@ -2149,7 +2169,11 @@
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
403 case WM_DRAWITEM:
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
404 {
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
405 LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
406 +#ifdef _WIN64
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
407 + DrawIcon(lpdis->hDC, 0, 0, (HICON)GetClassLongPtr(GetParent(hDlg), GCLP_HICON));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
408 +#else
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
409 DrawIcon(lpdis->hDC, 0, 0, (HICON)GetClassLong(GetParent(hDlg), GCL_HICON));
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
410 +#endif
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
411 return FALSE;
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
412 }
598f4d2af02e Add patch for win64 gnuplot
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
413 case WM_COMMAND: