795 lines
24 KiB
Diff
795 lines
24 KiB
Diff
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c
|
|
--- xchat-wdk.orig/plugins/perl/perl.c 2010-03-23 01:06:59 +0100
|
|
+++ xchat-wdk/plugins/perl/perl.c 2010-05-21 21:42:51 +0200
|
|
@@ -16,13 +16,14 @@
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
+#define _INC_DIRENT
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
-#include <dirent.h>
|
|
+#include "../../src/common/dirent.h"
|
|
#ifdef ENABLE_NLS
|
|
#include <locale.h>
|
|
#endif
|
|
@@ -1340,12 +1341,12 @@
|
|
FreeLibrary (lib);
|
|
lib = NULL;
|
|
thread_mbox ("Cannot open " PERL_DLL "\n\n"
|
|
- "You must have ActivePerl 5.8 installed in order to\n"
|
|
+ "You must have ActivePerl 5.10 installed in order to\n"
|
|
"run perl scripts.\n\n"
|
|
- "I have found Perl 5.6, but that is too old.");
|
|
+ "I have found a Perl version, but that is too old.");
|
|
} else {
|
|
thread_mbox ("Cannot open " PERL_DLL "\n\n"
|
|
- "You must have ActivePerl 5.8 installed in order to\n"
|
|
+ "You must have ActivePerl 5.10 installed in order to\n"
|
|
"run perl scripts.\n\n"
|
|
"http://www.activestate.com/ActivePerl/\n\n"
|
|
"Make sure perl's bin directory is in your PATH.");
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c
|
|
--- xchat-wdk.orig/plugins/python/python.c 2010-05-16 06:31:54 +0200
|
|
+++ xchat-wdk/plugins/python/python.c 2010-05-21 21:42:51 +0200
|
|
@@ -51,12 +51,13 @@
|
|
*
|
|
*/
|
|
|
|
+#define _INC_DIRENT
|
|
#include <glib.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
-#include <dirent.h>
|
|
+#include "../../src/common/dirent.h"
|
|
+#include "../../config.h"
|
|
|
|
#include "xchat-plugin.h"
|
|
#include "Python.h"
|
|
@@ -68,7 +69,7 @@
|
|
|
|
#ifdef WIN32
|
|
#undef WITH_THREAD /* Thread support locks up xchat on Win32. */
|
|
-#define VERSION "0.8/2.4" /* Linked to python24.dll */
|
|
+#define VERSION "0.8/2.5" /* Linked to python24.dll */
|
|
#else
|
|
#define VERSION "0.8"
|
|
#endif
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c
|
|
--- xchat-wdk.orig/plugins/tcl/tclplugin.c 2010-03-21 01:49:42 +0100
|
|
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-05-21 21:42:51 +0200
|
|
@@ -32,8 +32,6 @@
|
|
#include <windows.h>
|
|
#define bzero(mem, sz) memset((mem), 0, (sz))
|
|
#define bcopy(src, dest, count) memmove((dest), (src), (count))
|
|
-#else
|
|
-#include <unistd.h>
|
|
#endif
|
|
|
|
#include "xchat-plugin.h"
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
|
|
--- xchat-wdk.orig/src/common/cfgfiles.c 2009-01-02 06:56:12 +0100
|
|
+++ xchat-wdk/src/common/cfgfiles.c 2010-05-26 05:43:48 +0200
|
|
@@ -17,7 +17,6 @@
|
|
*/
|
|
|
|
#include <fcntl.h>
|
|
-#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
@@ -32,7 +31,11 @@
|
|
#include "xchatc.h"
|
|
|
|
#ifdef WIN32
|
|
+#ifdef PORTABLE_BUILD
|
|
+#define XCHAT_DIR "config"
|
|
+#else
|
|
#define XCHAT_DIR "X-Chat 2"
|
|
+#endif
|
|
#else
|
|
#define XCHAT_DIR ".xchat2"
|
|
#endif
|
|
@@ -308,12 +311,16 @@
|
|
{
|
|
if (!xdir_fs)
|
|
{
|
|
+#ifdef PORTABLE_BUILD
|
|
+ xdir_fs = XCHAT_DIR;
|
|
+#else
|
|
char out[256];
|
|
|
|
if (!get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\"
|
|
"Explorer\\Shell Folders", "AppData", out, sizeof (out)))
|
|
return "./config";
|
|
xdir_fs = g_strdup_printf ("%s\\" XCHAT_DIR, out);
|
|
+#endif
|
|
}
|
|
return xdir_fs;
|
|
}
|
|
@@ -676,7 +683,10 @@
|
|
prefs.mainwindow_save = 1;
|
|
prefs.bantype = 2;
|
|
prefs.input_balloon_time = 20;
|
|
+ /* taskbar alerts crash xchat-wdk only on x86 */
|
|
+#ifdef _WIN64
|
|
prefs.input_flash_priv = prefs.input_flash_hilight = 1;
|
|
+#endif
|
|
prefs.input_tray_priv = prefs.input_tray_hilight = 1;
|
|
prefs.autodccsend = 2; /* browse mode */
|
|
#ifdef WIN32
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/common/chanopt.c
|
|
--- xchat-wdk.orig/src/common/chanopt.c 2008-06-15 06:40:29 +0200
|
|
+++ xchat-wdk/src/common/chanopt.c 2010-05-21 21:42:51 +0200
|
|
@@ -3,7 +3,6 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/common/ctcp.c
|
|
--- xchat-wdk.orig/src/common/ctcp.c 2010-05-16 03:30:17 +0200
|
|
+++ xchat-wdk/src/common/ctcp.c 2010-05-21 21:42:51 +0200
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "xchat.h"
|
|
@@ -134,7 +133,7 @@
|
|
|
|
if (!strcasecmp (msg, "VERSION") && !prefs.hidever)
|
|
{
|
|
- snprintf (outbuf, sizeof (outbuf), "VERSION xchat "PACKAGE_VERSION" %s",
|
|
+ snprintf (outbuf, sizeof (outbuf), "VERSION xchat-wdk "PACKAGE_VERSION" %s",
|
|
get_cpu_str ());
|
|
serv->p_nctcp (serv, nick, outbuf);
|
|
}
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/common/dcc.c
|
|
--- xchat-wdk.orig/src/common/dcc.c 2007-02-06 05:45:13 +0100
|
|
+++ xchat-wdk/src/common/dcc.c 2010-05-21 21:42:51 +0200
|
|
@@ -31,7 +31,6 @@
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#define WANTSOCKET
|
|
@@ -1984,7 +1983,7 @@
|
|
|
|
/* now handle case-insensitive Filesystems: HFS+, FAT */
|
|
#ifdef WIN32
|
|
-#warning no win32 implementation - behaviour may be unreliable
|
|
+/* warning no win32 implementation - behaviour may be unreliable */
|
|
#else
|
|
/* this fstat() shouldn't really fail */
|
|
if ((dcc->fp == -1 ? stat (dcc->destfile_fs, &st_a) : fstat (dcc->fp, &st_a)) == -1)
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/identd.c xchat-wdk/src/common/identd.c
|
|
--- xchat-wdk.orig/src/common/identd.c 2004-05-24 15:47:58 +0200
|
|
+++ xchat-wdk/src/common/identd.c 2010-05-21 21:42:51 +0200
|
|
@@ -1,6 +1,10 @@
|
|
/* simple identd server for xchat under win32 */
|
|
|
|
|
|
+#include "inet.h"
|
|
+#include "xchat.h"
|
|
+#include "xchatc.h"
|
|
+
|
|
static int identd_is_running = FALSE;
|
|
|
|
|
|
@@ -75,7 +79,7 @@
|
|
return 0;
|
|
}
|
|
|
|
-static void
|
|
+void
|
|
identd_start (char *username)
|
|
{
|
|
DWORD tid;
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/identd.h xchat-wdk/src/common/identd.h
|
|
--- xchat-wdk.orig/src/common/identd.h 1970-01-01 01:00:00 +0100
|
|
+++ xchat-wdk/src/common/identd.h 2010-05-21 21:42:51 +0200
|
|
@@ -0,0 +1 @@
|
|
+void identd_start (char *username);
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/common/ignore.c
|
|
--- xchat-wdk.orig/src/common/ignore.c 2006-04-15 09:00:39 +0200
|
|
+++ xchat-wdk/src/common/ignore.c 2010-05-21 21:42:51 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/common/inbound.c
|
|
--- xchat-wdk.orig/src/common/inbound.c 2008-03-19 05:28:57 +0100
|
|
+++ xchat-wdk/src/common/inbound.c 2010-05-21 21:42:51 +0200
|
|
@@ -21,7 +21,6 @@
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
-#include <unistd.h>
|
|
#include <time.h>
|
|
|
|
#define WANTARPA
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h
|
|
--- xchat-wdk.orig/src/common/inet.h 2005-09-03 12:57:48 +0200
|
|
+++ xchat-wdk/src/common/inet.h 2010-05-21 21:42:51 +0200
|
|
@@ -24,9 +24,8 @@
|
|
#ifdef USE_IPV6
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
-#include <tpipv6.h>
|
|
#else
|
|
-#include <winsock.h>
|
|
+#include <winsock2.h>
|
|
#endif
|
|
|
|
#define set_blocking(sok) { \
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/common/msproxy.c
|
|
--- xchat-wdk.orig/src/common/msproxy.c 2006-04-16 17:32:17 +0200
|
|
+++ xchat-wdk/src/common/msproxy.c 2010-05-21 21:42:51 +0200
|
|
@@ -26,7 +26,6 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#define WANTSOCKET
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/common/network.c
|
|
--- xchat-wdk.orig/src/common/network.c 2006-04-16 10:11:26 +0200
|
|
+++ xchat-wdk/src/common/network.c 2010-05-21 21:42:51 +0200
|
|
@@ -21,7 +21,6 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
-#include <unistd.h>
|
|
#include <glib.h>
|
|
|
|
#include "../../config.h" /* grab USE_IPV6 and LOOKUPD defines */
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/common/notify.c
|
|
--- xchat-wdk.orig/src/common/notify.c 2008-06-08 09:58:58 +0200
|
|
+++ xchat-wdk/src/common/notify.c 2010-05-21 21:42:51 +0200
|
|
@@ -22,7 +22,6 @@
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
-#include <unistd.h>
|
|
#include <time.h>
|
|
|
|
#include "xchat.h"
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src/common/outbound.c
|
|
--- xchat-wdk.orig/src/common/outbound.c 2010-05-16 03:32:41 +0200
|
|
+++ xchat-wdk/src/common/outbound.c 2010-05-21 21:42:51 +0200
|
|
@@ -32,7 +32,6 @@
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
-#include <unistd.h>
|
|
#include <time.h>
|
|
#include <signal.h>
|
|
#include <sys/stat.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c
|
|
--- xchat-wdk.orig/src/common/proto-irc.c 2010-05-16 09:43:49 +0200
|
|
+++ xchat-wdk/src/common/proto-irc.c 2010-05-21 21:42:51 +0200
|
|
@@ -18,7 +18,6 @@
|
|
|
|
/* IRC RFC1459(+commonly used extensions) protocol implementation */
|
|
|
|
-#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/common/server.c
|
|
--- xchat-wdk.orig/src/common/server.c 2008-02-17 09:54:55 +0100
|
|
+++ xchat-wdk/src/common/server.c 2010-05-21 21:42:51 +0200
|
|
@@ -26,7 +26,6 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
|
|
@@ -67,7 +66,7 @@
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
-#include "identd.c"
|
|
+#include "identd.h"
|
|
#endif
|
|
|
|
#ifdef USE_OPENSSL
|
|
@@ -838,6 +837,7 @@
|
|
fe_set_throttle (serv);
|
|
}
|
|
|
|
+/* this doesn't really work so just disable it and use the failsafe method
|
|
#ifdef WIN32
|
|
|
|
static int
|
|
@@ -859,11 +859,11 @@
|
|
}
|
|
}
|
|
|
|
-#else
|
|
+#else*/
|
|
|
|
#define waitline2(source,buf,size) waitline(serv->childread,buf,size,0)
|
|
|
|
-#endif
|
|
+/*#endif*/
|
|
|
|
/* connect() successed */
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src/common/servlist.c
|
|
--- xchat-wdk.orig/src/common/servlist.c 2010-05-16 09:43:49 +0200
|
|
+++ xchat-wdk/src/common/servlist.c 2010-05-21 21:42:51 +0200
|
|
@@ -21,7 +21,6 @@
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
|
|
#include "xchat.h"
|
|
#include <glib/ghash.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c
|
|
--- xchat-wdk.orig/src/common/ssl.c 2007-03-28 10:35:06 +0200
|
|
+++ xchat-wdk/src/common/ssl.c 2010-05-21 21:42:51 +0200
|
|
@@ -17,6 +17,10 @@
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
+/*#define _WS2DEF_
|
|
+#define _WINSOCK2API_
|
|
+#define _WS2TCPIP_H_*/
|
|
+#include <winsock2.h>
|
|
#include <openssl/ssl.h> /* SSL_() */
|
|
#include <openssl/err.h> /* ERR_() */
|
|
#include <time.h> /* asctime() */
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c
|
|
--- xchat-wdk.orig/src/common/text.c 2009-12-31 03:19:50 +0100
|
|
+++ xchat-wdk/src/common/text.c 2010-05-21 21:42:51 +0200
|
|
@@ -19,13 +19,11 @@
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <ctype.h>
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
#include <sys/stat.h>
|
|
-#include <sys/mman.h>
|
|
|
|
#include "xchat.h"
|
|
#include <glib/ghash.h>
|
|
@@ -274,6 +272,8 @@
|
|
char *map, *end_map;
|
|
struct stat statbuf;
|
|
const char *begin, *eol;
|
|
+
|
|
+ HANDLE hFile, hMapFile;
|
|
|
|
if (sess->text_scrollback == SET_DEFAULT)
|
|
{
|
|
@@ -296,9 +296,32 @@
|
|
if (fstat (fh, &statbuf) < 0)
|
|
return;
|
|
|
|
- map = mmap (NULL, statbuf.st_size, PROT_READ, MAP_PRIVATE, fh, 0);
|
|
- if (map == MAP_FAILED)
|
|
+ /* from http://osdir.com/ml/guile-devel-gnu/2009-04/msg00008.html */
|
|
+
|
|
+ hFile = (HANDLE)_get_osfhandle(fh);
|
|
+ if (hFile == INVALID_HANDLE_VALUE)
|
|
+ {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* Create mapping object */
|
|
+ hMapFile = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
|
|
+ if (hMapFile == INVALID_HANDLE_VALUE)
|
|
+ {
|
|
return;
|
|
+ }
|
|
+
|
|
+ /* Select which portions of the file we need (entire file) */
|
|
+ map = (char *)MapViewOfFile(hMapFile, FILE_MAP_READ, 0, 0, 0);
|
|
+
|
|
+ if (map == NULL)
|
|
+ {
|
|
+ CloseHandle(hMapFile);
|
|
+ return;
|
|
+ }
|
|
+ /*map = mmap (NULL, statbuf.st_size, PROT_READ, MAP_PRIVATE, fh, 0);
|
|
+ if (map == MAP_FAILED)
|
|
+ return;*/
|
|
|
|
end_map = map + statbuf.st_size;
|
|
|
|
@@ -349,7 +372,9 @@
|
|
/*EMIT_SIGNAL (XP_TE_GENMSG, sess, "*", buf, NULL, NULL, NULL, 0);*/
|
|
}
|
|
|
|
- munmap (map, statbuf.st_size);
|
|
+ /* munmap (map, statbuf.st_size); */
|
|
+ CloseHandle(hMapFile);
|
|
+ CloseHandle(hFile);
|
|
close (fh);
|
|
}
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c
|
|
--- xchat-wdk.orig/src/common/util.c 2008-02-07 02:50:37 +0100
|
|
+++ xchat-wdk/src/common/util.c 2010-05-21 21:42:51 +0200
|
|
@@ -17,10 +17,11 @@
|
|
*/
|
|
|
|
#define __APPLE_API_STRICT_CONFORMANCE
|
|
+#define _WINSOCK2API_
|
|
+#define _WS2TCPIP_H_
|
|
|
|
#define _FILE_OFFSET_BITS 64
|
|
#include <stdio.h>
|
|
-#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
@@ -35,7 +36,7 @@
|
|
#include <sys/utsname.h>
|
|
#endif
|
|
#include <fcntl.h>
|
|
-#include <dirent.h>
|
|
+#include "dirent.h"
|
|
#include <errno.h>
|
|
#include "xchat.h"
|
|
#include "xchatc.h"
|
|
@@ -54,9 +55,11 @@
|
|
#include <socks.h>
|
|
#endif
|
|
|
|
+#ifndef ENABLE_NLS
|
|
#ifndef HAVE_SNPRINTF
|
|
#define snprintf g_snprintf
|
|
#endif
|
|
+#endif
|
|
|
|
#ifdef USE_DEBUG
|
|
|
|
@@ -631,22 +634,32 @@
|
|
OSVERSIONINFO osvi;
|
|
SYSTEM_INFO si;
|
|
double mhz;
|
|
+ int cpu_arch;
|
|
|
|
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
|
|
GetVersionEx (&osvi);
|
|
GetSystemInfo (&si);
|
|
|
|
+ if (si.wProcessorArchitecture == 9)
|
|
+ {
|
|
+ cpu_arch = 64;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ cpu_arch = 86;
|
|
+ }
|
|
+
|
|
mhz = get_mhz ();
|
|
if (mhz)
|
|
{
|
|
double cpuspeed = ( mhz > 1000 ) ? mhz / 1000 : mhz;
|
|
const char *cpuspeedstr = ( mhz > 1000 ) ? "GHz" : "MHz";
|
|
- sprintf (verbuf, "Windows %ld.%ld [i%d86/%.2f%s]",
|
|
- osvi.dwMajorVersion, osvi.dwMinorVersion, si.wProcessorLevel,
|
|
+ sprintf (verbuf, "Windows %ld.%ld [x%d/%.2f%s]",
|
|
+ osvi.dwMajorVersion, osvi.dwMinorVersion, cpu_arch,
|
|
cpuspeed, cpuspeedstr);
|
|
} else
|
|
- sprintf (verbuf, "Windows %ld.%ld [i%d86]",
|
|
- osvi.dwMajorVersion, osvi.dwMinorVersion, si.wProcessorLevel);
|
|
+ sprintf (verbuf, "Windows %ld.%ld [x%d]",
|
|
+ osvi.dwMajorVersion, osvi.dwMinorVersion, cpu_arch);
|
|
|
|
return verbuf;
|
|
}
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c
|
|
--- xchat-wdk.orig/src/common/xchat.c 2008-06-08 09:58:58 +0200
|
|
+++ xchat-wdk/src/common/xchat.c 2010-05-21 21:42:51 +0200
|
|
@@ -22,7 +22,6 @@
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
|
|
#define WANTSOCKET
|
|
#include "inet.h"
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
|
|
--- xchat-wdk.orig/src/common/xchat.h 2008-08-29 12:59:11 +0200
|
|
+++ xchat-wdk/src/common/xchat.h 2010-05-21 21:42:51 +0200
|
|
@@ -12,12 +12,14 @@
|
|
|
|
#include "history.h"
|
|
|
|
+#ifndef ENABLE_NLS
|
|
#ifndef HAVE_SNPRINTF
|
|
#define snprintf g_snprintf
|
|
#endif
|
|
|
|
#ifndef HAVE_VSNPRINTF
|
|
-#define vsnprintf g_vsnprintf
|
|
+#define vsnprintf _vsnprintf
|
|
+#endif
|
|
#endif
|
|
|
|
#ifdef USE_DEBUG
|
|
@@ -58,7 +60,7 @@
|
|
|
|
#ifdef WIN32 /* for win32 */
|
|
#define OFLAGS O_BINARY
|
|
-#define sleep(t) _sleep(t*1000)
|
|
+#define sleep(t) Sleep(t*1000)
|
|
#include <direct.h>
|
|
#define F_OK 0
|
|
#define X_OK 1
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe-gtk/about.c
|
|
--- xchat-wdk.orig/src/fe-gtk/about.c 2010-05-16 09:43:49 +0200
|
|
+++ xchat-wdk/src/fe-gtk/about.c 2010-05-23 01:47:48 +0200
|
|
@@ -113,11 +113,15 @@
|
|
gtk_container_add (GTK_CONTAINER (vbox), label);
|
|
g_get_charset (&locale);
|
|
(snprintf) (buf, sizeof (buf),
|
|
+#ifdef PORTABLE_BUILD
|
|
+ "<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n<span size=\"x-large\"><b>Portable Version</b></span>\n\n"
|
|
+#else
|
|
"<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n\n"
|
|
+#endif
|
|
"%s\n\n"
|
|
#ifdef WIN32
|
|
/* leave this message to avoid time wasting bug reports! */
|
|
- "This version is unofficial and comes with no support.\n\n"
|
|
+ "This version is unofficial and\ncomes with no support.\n\n"
|
|
#endif
|
|
"%s\n"
|
|
"<b>Charset</b>: %s "
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/fe-gtk/banlist.c
|
|
--- xchat-wdk.orig/src/fe-gtk/banlist.c 2010-05-16 05:20:22 +0200
|
|
+++ xchat-wdk/src/fe-gtk/banlist.c 2010-05-21 21:42:51 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <time.h>
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src/fe-gtk/chanlist.c
|
|
--- xchat-wdk.orig/src/fe-gtk/chanlist.c 2008-02-24 04:46:02 +0100
|
|
+++ xchat-wdk/src/fe-gtk/chanlist.c 2010-05-21 21:42:51 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <time.h>
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src/fe-gtk/editlist.c
|
|
--- xchat-wdk.orig/src/fe-gtk/editlist.c 2006-03-13 09:33:45 +0100
|
|
+++ xchat-wdk/src/fe-gtk/editlist.c 2010-05-21 21:42:51 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/fe-gtk/fe-gtk.c
|
|
--- xchat-wdk.orig/src/fe-gtk/fe-gtk.c 2010-05-16 05:20:22 +0200
|
|
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-05-22 03:35:00 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <unistd.h>
|
|
|
|
#include "fe-gtk.h"
|
|
|
|
@@ -32,6 +31,8 @@
|
|
#include <gtk/gtkmessagedialog.h>
|
|
#include <gtk/gtkversion.h>
|
|
|
|
+#include <gdk/gdkwin32.h>
|
|
+
|
|
#include "../common/xchat.h"
|
|
#include "../common/fe.h"
|
|
#include "../common/util.h"
|
|
@@ -39,6 +40,7 @@
|
|
#include "../common/cfgfiles.h"
|
|
#include "../common/xchatc.h"
|
|
#include "../common/plugin.h"
|
|
+#include "../common/server.h"
|
|
#include "gtkutil.h"
|
|
#include "maingui.h"
|
|
#include "pixmaps.h"
|
|
@@ -844,11 +846,11 @@
|
|
switch (info_type)
|
|
{
|
|
case 0: /* native window pointer (for plugins) */
|
|
-#ifdef WIN32
|
|
+/*#ifdef WIN32
|
|
return GDK_WINDOW_HWND (sess->gui->window->window);
|
|
-#else
|
|
+#else*/
|
|
return sess->gui->window;
|
|
-#endif
|
|
+/*#endif*/
|
|
}
|
|
return NULL;
|
|
}
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/fe-gtk/fe-gtk.h
|
|
--- xchat-wdk.orig/src/fe-gtk/fe-gtk.h 2008-06-08 09:58:58 +0200
|
|
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-05-21 21:42:51 +0200
|
|
@@ -4,7 +4,7 @@
|
|
/* If you're compiling this for Windows, your release is un-official
|
|
* and not condoned. Please don't use the XChat name. Call it YChat
|
|
* or make up your own name! */
|
|
-#define DISPLAY_NAME "YChat"
|
|
+#define DISPLAY_NAME "XChat-WDK"
|
|
#else
|
|
#define DISPLAY_NAME "XChat"
|
|
#endif
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe-gtk/fkeys.c
|
|
--- xchat-wdk.orig/src/fe-gtk/fkeys.c 2008-02-24 06:09:34 +0100
|
|
+++ xchat-wdk/src/fe-gtk/fkeys.c 2010-05-21 21:42:51 +0200
|
|
@@ -20,7 +20,6 @@
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
#include <ctype.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/fe-gtk/gtkutil.c
|
|
--- xchat-wdk.orig/src/fe-gtk/gtkutil.c 2009-07-18 14:38:10 +0200
|
|
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-05-21 21:42:51 +0200
|
|
@@ -22,7 +22,6 @@
|
|
#include <stdarg.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include "fe-gtk.h"
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe-gtk/joind.c
|
|
--- xchat-wdk.orig/src/fe-gtk/joind.c 2006-12-26 05:56:55 +0100
|
|
+++ xchat-wdk/src/fe-gtk/joind.c 2010-05-21 21:42:51 +0200
|
|
@@ -9,7 +9,6 @@
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-gtk/menu.c
|
|
--- xchat-wdk.orig/src/fe-gtk/menu.c 2010-05-16 06:24:24 +0200
|
|
+++ xchat-wdk/src/fe-gtk/menu.c 2010-05-21 21:42:51 +0200
|
|
@@ -20,7 +20,6 @@
|
|
#include <stdlib.h>
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
|
|
#ifdef WIN32
|
|
#include <windows.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/fe-gtk/palette.c
|
|
--- xchat-wdk.orig/src/fe-gtk/palette.c 2010-05-16 05:20:22 +0200
|
|
+++ xchat-wdk/src/fe-gtk/palette.c 2010-05-21 21:42:52 +0200
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
-#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c
|
|
--- xchat-wdk.orig/src/fe-gtk/plugin-tray.c 2010-05-16 03:40:42 +0200
|
|
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-05-21 21:42:52 +0200
|
|
@@ -1,7 +1,6 @@
|
|
/* Copyright (C) 2006-2007 Peter Zelezny. */
|
|
|
|
#include <string.h>
|
|
-#include <unistd.h>
|
|
#include "../common/xchat-plugin.h"
|
|
#include "../common/xchat.h"
|
|
#include "../common/xchatc.h"
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c
|
|
--- xchat-wdk.orig/src/fe-gtk/rawlog.c 2010-05-16 05:20:22 +0200
|
|
+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-05-21 21:42:52 +0200
|
|
@@ -19,7 +19,6 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
-#include <unistd.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "fe-gtk.h"
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c
|
|
--- xchat-wdk.orig/src/fe-gtk/setup.c 2008-02-08 10:04:45 +0100
|
|
+++ xchat-wdk/src/fe-gtk/setup.c 2010-05-26 04:00:03 +0200
|
|
@@ -109,8 +109,8 @@
|
|
N_("Give each person on IRC a different color"),0,0},
|
|
{ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(indent_nicks),
|
|
N_("Make nick names right-justified"),0,0},
|
|
- {ST_TOGGLE, N_("Transparent background"), P_OFFINTNL(transparent),0,0,0},
|
|
- {ST_TOGGLR, N_("Show marker line"), P_OFFINTNL(show_marker),
|
|
+ /* {ST_TOGGLE, N_("Transparent background"), P_OFFINTNL(transparent),0,0,0}, */
|
|
+ {ST_TOGGLE, N_("Show marker line"), P_OFFINTNL(show_marker),
|
|
N_("Insert a red line after the last read text."),0,0},
|
|
{ST_HEADER, N_("Transparency Settings"), 0,0,0},
|
|
{ST_HSCALE, N_("Red:"), P_OFFINTNL(tint_red),0,0,0},
|
|
@@ -333,7 +333,11 @@
|
|
{ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0},
|
|
#endif
|
|
{ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0},
|
|
+
|
|
+ /* taskbar alerts crash xchat-wdk only on x86 */
|
|
+#ifdef _WIN64
|
|
{ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0},
|
|
+#endif
|
|
{ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0},
|
|
|
|
{ST_TOGGLE, N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0},
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
|
|
--- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c 2006-07-17 07:51:02 +0200
|
|
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-05-21 21:42:52 +0200
|
|
@@ -31,6 +31,20 @@
|
|
/*#include "gtkspell-iso-codes.h"
|
|
#include "sexy-marshal.h"*/
|
|
|
|
+/* workaround for ssize_t in VS
|
|
+ from krb/include/win-mac.h */
|
|
+#ifndef SSIZE_T_DEFINED
|
|
+#ifdef ssize_t
|
|
+#undef ssize_t
|
|
+#endif
|
|
+#ifdef _WIN64
|
|
+typedef __int64 ssize_t;
|
|
+#else
|
|
+typedef _W64 int ssize_t;
|
|
+#endif
|
|
+#define SSIZE_T_DEFINED
|
|
+#endif
|
|
+
|
|
/*
|
|
* Bunch of poop to make enchant into a runtime dependency rather than a
|
|
* compile-time dependency. This makes it so I don't have to hear the
|
|
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c
|
|
--- xchat-wdk.orig/src/fe-gtk/xtext.c 2008-08-29 13:24:17 +0200
|
|
+++ xchat-wdk/src/fe-gtk/xtext.c 2010-05-21 21:42:52 +0200
|
|
@@ -42,7 +42,6 @@
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
-#include <unistd.h>
|
|
#include <gtk/gtkmain.h>
|
|
#include <gtk/gtksignal.h>
|
|
#include <gtk/gtkselection.h>
|