diff options
Diffstat (limited to 'xchat-wdk.patch')
| -rw-r--r-- | xchat-wdk.patch | 1398 |
1 files changed, 1338 insertions, 60 deletions
diff --git a/xchat-wdk.patch b/xchat-wdk.patch index d638a362..1acb8f47 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -1,15 +1,22 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/build-x64.bat xchat-wdk/build/build-x64.bat --- xchat-wdk.orig/build/build-x64.bat 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/build/build-x64.bat 2010-03-30 12:22:22 +0200 -@@ -0,0 +1,24 @@ ++++ xchat-wdk/build/build-x64.bat 2010-03-31 12:01:10 +0200 +@@ -0,0 +1,33 @@ +@echo off -+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-1.0.0-wdk-x64\include -+set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-1.0.0-wdk-x64\lib ++set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\include ++set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\lib ++set OPATH=%PATH% +set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.10-x64\bin +cd ..\src +nmake -f makefile.mak clean +nmake -f makefile.mak -+cd ..\plugins\perl ++cd ..\plugins\dns ++nmake -f makefile.mak clean ++nmake -f makefile.mak ++cd ..\ewc ++nmake -f makefile.mak clean ++nmake -f makefile.mak ++cd ..\perl +nmake -f makefile.mak clean +nmake -f makefile.mak +::cd ..\python @@ -25,19 +32,28 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/build-x64.bat xchat-wdk/build +set PATH=%PATH%;c:\mozilla-build\build\xchat-dev32\bin +call compile-po-files.bat +cd ..\build ++set PATH=%OPATH% ++call release-x64.bat +pause diff -ruN --strip-trailing-cr xchat-wdk.orig/build/build-x86.bat xchat-wdk/build/build-x86.bat --- xchat-wdk.orig/build/build-x86.bat 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/build/build-x86.bat 2010-03-30 12:22:25 +0200 -@@ -0,0 +1,23 @@ ++++ xchat-wdk/build/build-x86.bat 2010-03-31 12:00:41 +0200 +@@ -0,0 +1,32 @@ +@echo off -+set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-1.0.0-wdk-x86\include -+set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-1.0.0-wdk-x86\lib ++set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\include ++set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\lib ++set OPATH=%PATH% +set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw\bin;c:\mozilla-build\perl-5.10-x86\bin +cd ..\src +nmake -f makefile.mak clean +nmake -f makefile.mak -+cd ..\plugins\perl ++cd ..\plugins\dns ++nmake -f makefile.mak clean ++nmake -f makefile.mak ++cd ..\ewc ++nmake -f makefile.mak clean ++nmake -f makefile.mak ++cd ..\perl +nmake -f makefile.mak clean +nmake -f makefile.mak +::cd ..\python @@ -52,6 +68,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/build-x86.bat xchat-wdk/build +cd ..\..\build +call compile-po-files.bat +cd ..\build ++set PATH=%OPATH% ++call release-x86.bat +pause diff -ruN --strip-trailing-cr xchat-wdk.orig/build/compile-po-files.bat xchat-wdk/build/compile-po-files.bat --- xchat-wdk.orig/build/compile-po-files.bat 1970-01-01 01:00:00 +0100 @@ -218,11 +236,11 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/etc/gtk-2.0/gtkrc xchat-wdk/b +widget_class "*ComboBox*GtkFrame*" style "msw-combobox-thickness" diff -ruN --strip-trailing-cr xchat-wdk.orig/build/release-x64.bat xchat-wdk/build/release-x64.bat --- xchat-wdk.orig/build/release-x64.bat 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/build/release-x64.bat 2010-03-30 12:13:32 +0200 -@@ -0,0 +1,38 @@ ++++ xchat-wdk/build/release-x64.bat 2010-03-31 12:10:05 +0200 +@@ -0,0 +1,39 @@ +@echo off +set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin -+set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8n-wdk-xchat-x64\bin ++set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\bin +set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64 +rmdir /Q /S %XCHAT_DEST% +mkdir %XCHAT_DEST% @@ -252,19 +270,20 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/release-x64.bat xchat-wdk/bui +xcopy ..\COPYING %XCHAT_DEST% +::xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% +::xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% ++xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ ++xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ +::xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ +::xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\po\locale %XCHAT_DEST%\locale -+pause diff -ruN --strip-trailing-cr xchat-wdk.orig/build/release-x86.bat xchat-wdk/build/release-x86.bat --- xchat-wdk.orig/build/release-x86.bat 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/build/release-x86.bat 2010-03-30 12:13:37 +0200 -@@ -0,0 +1,38 @@ ++++ xchat-wdk/build/release-x86.bat 2010-03-31 12:10:01 +0200 +@@ -0,0 +1,39 @@ +@echo off +set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin -+set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8n-wdk-xchat-x86\bin ++set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\bin +set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86 +rmdir /Q /S %XCHAT_DEST% +mkdir %XCHAT_DEST% @@ -294,12 +313,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/build/release-x86.bat xchat-wdk/bui +xcopy ..\COPYING %XCHAT_DEST% +::xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% +::xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% ++xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ ++xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ +::xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ +xcopy /S /I ..\po\locale %XCHAT_DEST%\locale -+pause diff -ruN --strip-trailing-cr xchat-wdk.orig/build/test-x64.bat xchat-wdk/build/test-x64.bat --- xchat-wdk.orig/build/test-x64.bat 1970-01-01 01:00:00 +0100 +++ xchat-wdk/build/test-x64.bat 2010-03-30 02:24:01 +0200 @@ -348,9 +368,1250 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/config.h.w32 xchat-wdk/config.h.w32 -#ifndef USE_IPV6 -#define socklen_t int -#endif +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/dns/makefile.mak xchat-wdk/plugins/dns/makefile.mak +--- xchat-wdk.orig/plugins/dns/makefile.mak 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/dns/makefile.mak 2010-03-31 10:41:23 +0200 +@@ -0,0 +1,19 @@ ++include "..\..\src\makeinc.mak" ++ ++xcdns.dll: plugin-dns.obj dns.def ++ link $(LDFLAGS) /dll /out:xcdns.dll /def:dns.def plugin-dns.obj ws2_32.lib ++ dir xcdns.dll ++ ++dns.def: ++ echo EXPORTS > dns.def ++ echo xchat_plugin_init >> dns.def ++ echo xchat_plugin_deinit >> dns.def ++ ++plugin-dns.obj: plugin-dns.c makefile.mak thread.c ++ cl $(CFLAGS) /I.. -Dsnprintf=_snprintf plugin-dns.c ++ ++clean: ++ del *.obj ++ del *.dll ++ del *.exp ++ del *.lib +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/dns/plugin-dns.c xchat-wdk/plugins/dns/plugin-dns.c +--- xchat-wdk.orig/plugins/dns/plugin-dns.c 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/dns/plugin-dns.c 2010-03-31 09:06:15 +0200 +@@ -0,0 +1,335 @@ ++/* XChat Win32 DNS Plugin ++ * Copyright (C) 2003-2004 Peter Zelezny. ++ * ++ * 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 ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ */ ++/* ++ * Requires MS Visual Studio and IPV6 headers to compile (run nmake). ++ * Compiling with gcc (mingw) will fail due to missing gai_strerror. ++ */ ++ ++#define DNS_VERSION "2.4" ++ ++#include <string.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <fcntl.h> ++ ++#define IPV6 ++ ++#ifdef _WIN32 ++#ifdef IPV6 ++#include <winsock2.h> ++#include <ws2tcpip.h> ++#else ++#include <winsock2.h> ++#endif ++#else ++#include <netdb.h> ++#include <sys/socket.h> ++#endif ++ ++#include "xchat-plugin.h" ++#include "thread.c" ++ ++#define HELP "Usage: DNS <nickname|hostname|numerical address>\n" ++#define HEAD "\0034[DNS]\017\t" ++ ++#define PIPE_READ 0 ++#define PIPE_WRITE 1 ++#define MAX_HOSTNAME 128 ++ ++static xchat_plugin *ph; ++static thread *active_thread = NULL; ++ ++ ++static int ++waitline (void *source, char *buf, int bufsize) ++{ ++ int i = 0; ++ int len; ++ ++ while(1) ++ { ++ len = 1; ++ /* we can't read() here, due to glib's giowin32 */ ++ if(ph->xchat_read_fd(ph, source, buf + i, &len) != 0) ++ return -1; ++ if(buf[i] == '\n' || bufsize == i + 1) ++ { ++ buf[i] = 0; ++ return i; ++ } ++ i++; ++ } ++} ++ ++static void * ++thread_function (void *ud) ++{ ++#ifdef IPV6 ++ struct addrinfo *ent; ++ struct addrinfo *cur; ++ struct addrinfo hints; ++#else ++ struct hostent *ent; ++#endif ++ thread *th = ud; ++ int fd = th->pipe_fd[PIPE_WRITE]; ++ int ret; ++ char ipstring[MAX_HOSTNAME]; ++ char reverse[MAX_HOSTNAME]; ++// int i; ++ ++ active_thread = th; ++ ++#ifdef IPV6 ++ memset (&hints, 0, sizeof (hints)); ++ hints.ai_family = PF_UNSPEC; /* support ipv6 and ipv4 */ ++ hints.ai_flags = AI_CANONNAME; ++// hints.ai_socktype = SOCK_STREAM; ++ ++ ret = getaddrinfo (th->userdata, NULL, &hints, &ent); ++ if (ret != 0) ++ { ++ sprintf (ipstring, "1%d\n", ret); /* failed */ ++ write (fd, ipstring, strlen (ipstring)); ++// Sleep (3000); ++ active_thread = NULL; ++ return 0; ++ } ++ ++// i = 0; ++ cur = ent; ++ while (cur) ++ { ++ /* find the numeric IP number */ ++ ipstring[0] = 0; ++ getnameinfo (cur->ai_addr, cur->ai_addrlen, ++ ipstring, sizeof (ipstring), NULL, 0, NI_NUMERICHOST); ++ ++ if (cur->ai_canonname) ++ { ++ /* force reverse lookup if canonname & ipstring are the same */ ++ if (/*i == 0 &&*/ strcmp (cur->ai_canonname, ipstring) == 0) ++ goto lamecode; ++ } ++ ++ if (cur->ai_canonname) ++ { ++ write (fd, "0", 1); ++ write (fd, ipstring, strlen (ipstring)); ++ write (fd, "\n", 1); ++ write (fd, cur->ai_canonname, strlen (cur->ai_canonname)); ++ } else ++ { ++lamecode: ++ // ret = 1; ++ // if (i == 0) ++ { ++ /* reverse lookup */ ++ reverse[0] = 0; ++ ret = getnameinfo (cur->ai_addr, cur->ai_addrlen, ++ reverse, sizeof (reverse), NULL, 0, NI_NAMEREQD); ++ } ++ ++ write (fd, "0", 1); ++ write (fd, ipstring, strlen (ipstring)); ++ ++ write (fd, "\n", 1); ++ if (ret == 0) ++ write (fd, reverse, strlen (reverse)); ++ } ++ write (fd, "\n", 1); ++ ++// i++; ++ cur = cur->ai_next; ++ } ++ ++ /* tell the parent we're done */ ++ write (fd, "2\n", 2); ++ freeaddrinfo (ent); ++ ++#else ++ ent = gethostbyname (th->userdata); ++ if (ent) ++ { ++ write (fd, "0", 1); ++ write (fd, ent->h_name, strlen (ent->h_name)); ++ write (fd, "\n", 1); ++ write (fd, ent->h_name, strlen (ent->h_name)); ++ write (fd, "\n", 1); ++ write (fd, "2\n", 2); ++ } else ++ { ++ write (fd, "10\n", 1); ++ } ++#endif ++ ++// Sleep (3000); ++ active_thread = NULL; /* race condition, better than nothing */ ++ ++ return 0; ++} ++ ++static int ++dns_close_pipe (int fd) ++{ ++ close (fd); ++ return 0; ++} ++ ++/* read messages comming from the child (through the pipe) */ ++ ++static int ++dns_read_cb (int fd, int flags, thread *th, void *source) ++{ ++ char buf[512]; ++ char buf2[512]; ++ ++ while (waitline (source, buf, sizeof (buf))) ++ { ++ switch (buf[0]) ++ { ++ case '0': /* got data to show */ ++ waitline (source, buf2, sizeof (buf2)); ++ if (buf2[0] == 0) ++ xchat_printf(ph, HEAD"\002Numerical\002: %s\n", buf + 1); ++ else ++ xchat_printf(ph, HEAD"\002Canonical\002: %s \002Numerical\002: %s\n", buf2, buf + 1); ++ return 1; ++ ++ case '1': /* failed */ ++ xchat_printf(ph, HEAD"Lookup failed. %s\n", gai_strerrorA (atoi (buf + 1))); ++ ++ case '2': /* done */ ++ // close (th->pipe_fd[PIPE_WRITE]); ++ // close (th->pipe_fd[PIPE_READ]); ++ xchat_hook_timer(ph, 3000, dns_close_pipe, (void *)th->pipe_fd[PIPE_WRITE]); ++ xchat_hook_timer(ph, 4000, dns_close_pipe, (void *)th->pipe_fd[PIPE_READ]); ++ free (th->userdata); /* hostname strdup'ed */ ++ free (th); ++ return 0; ++ } ++ } ++ ++ return 1; ++} ++ ++/* find hostname from nickname (search the userlist, current chan only) */ ++ ++static char * ++find_nick_host (char *nick) ++{ ++ xchat_list *list; ++ char *at; ++ const char *host; ++ ++ list = xchat_list_get (ph, "users"); ++ if (!list) ++ return NULL; ++ ++ while (xchat_list_next (ph, list)) ++ { ++ if (stricmp (nick, xchat_list_str (ph, list, "nick")) == 0) ++ { ++ host = xchat_list_str (ph, list, "host"); ++ if (host) ++ { ++ at = strrchr (host, '@'); ++ if (at) ++ return at + 1; ++ } ++ break; ++ } ++ } ++ ++ return NULL; ++} ++ ++static int ++dns_cmd_cb (char *word[], char *word_eol[], void *ud) ++{ ++ thread *th; ++ char *nickhost; ++ ++ if (!word[2][0]) ++ { ++ xchat_print (ph, HELP); ++ return XCHAT_EAT_ALL; ++ } ++ ++ th = thread_new (); ++ if (th) ++ { ++ nickhost = find_nick_host (word[2]); ++ if (nickhost) ++ { ++ xchat_printf (ph, HEAD"Looking up %s (%s)...\n", nickhost, word[2]); ++ th->userdata = strdup (nickhost); ++ } else ++ { ++ xchat_printf (ph, HEAD"Looking up %s...\n", word[2]); ++ th->userdata = strdup (word[2]); ++ } ++ ++ if (thread_start (th, thread_function, th)) ++ { ++ xchat_hook_fd(ph, th->pipe_fd[PIPE_READ], ++ XCHAT_FD_READ | XCHAT_FD_EXCEPTION | XCHAT_FD_NOTSOCKET, ++ (void *)dns_read_cb, th); ++ ++ } ++ } ++ ++ return XCHAT_EAT_ALL; ++} ++ ++int ++xchat_plugin_deinit (xchat_plugin *plugin_handle) ++{ ++ while (active_thread) /* children will set this var to NULL soon... */ ++ { ++ Sleep (1000); ++ } ++ return 1; ++} ++ ++int ++#ifdef STATIC ++exec_plugin_init ++#else ++xchat_plugin_init ++#endif ++ (xchat_plugin *plugin_handle, char **plugin_name, ++ char **plugin_desc, char **plugin_version, char *arg) ++{ ++ /* we need to save this for use with any xchat_* functions */ ++ ph = plugin_handle; ++ ++ /*if((void *)ph->xchat_read_fd == ph->dummy7) ++ { ++ xchat_print(ph, HEAD"This version of xchat is too old.\n"); ++ return 0; ++ }*/ ++ ++ *plugin_name = "DNS"; ++ *plugin_desc = "Threaded IPv4/6 DNS Command"; ++ *plugin_version = DNS_VERSION; ++ ++ xchat_hook_command(ph, "DNS", XCHAT_PRI_LOW, dns_cmd_cb, HELP, 0); ++ ++ return 1; /* return 1 for success */ ++} +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/dns/thread.c xchat-wdk/plugins/dns/thread.c +--- xchat-wdk.orig/plugins/dns/thread.c 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/dns/thread.c 2010-03-31 07:48:40 +0200 +@@ -0,0 +1,111 @@ ++#include <stdlib.h> ++ ++#define USE_PTHREAD ++ ++#ifdef WIN32 ++ ++#include <windows.h> ++#define pthread_t DWORD ++#define pipe(a) _pipe(a,4096,_O_BINARY) ++ ++#else ++#ifdef USE_PTHREAD ++ ++#include <pthread.h> ++ ++#else ++ ++#include <sys/types.h> ++#include <sys/wait.h> ++#include <signal.h> ++#define pthread_t int ++ ++#endif ++#endif ++ ++ ++typedef struct ++{ ++ pthread_t threadid; ++ int pipe_fd[2]; ++ void *userdata; ++} thread; ++ ++thread * ++thread_new (void) ++{ ++ thread *th; ++ ++ th = calloc (1, sizeof (*th)); ++ if (!th) ++ return NULL; ++ ++ if (pipe (th->pipe_fd) == -1) ++ { ++ free (th); ++ return NULL; ++ } ++ ++#ifdef __EMX__ /* os/2 */ ++ setmode (pipe_fd[0], O_BINARY); ++ setmode (pipe_fd[1], O_BINARY); ++#endif ++ ++ return th; ++} ++ ++int ++thread_start (thread *th, void *(*start_routine)(void *), void *arg) ++{ ++ pthread_t id; ++ ++#ifdef WIN32 ++ CloseHandle (CreateThread (NULL, 0, ++ (LPTHREAD_START_ROUTINE)start_routine, ++ arg, 0, (DWORD *)&id)); ++#else ++#ifdef USE_PTHREAD ++ if (pthread_create (&id, NULL, start_routine, arg) != 0) ++ return 0; ++#else ++ switch (id = fork ()) ++ { ++ case -1: ++ return 0; ++ case 0: ++ /* this is the child */ ++ setuid (getuid ()); ++ start_routine (arg); ++ _exit (0); ++ } ++#endif ++#endif ++ ++ th->threadid = id; ++ ++ return 1; ++} ++ ++/*void ++thread_kill (thread *th) ++{ ++#ifdef WIN32 ++ PostThreadMessage (th->threadid, WM_QUIT, 0, 0); ++#else ++#ifdef USE_PTHREAD ++ pthread_cancel (th->threadid); ++ pthread_join (th->threadid, (void *)&th); ++#else ++ kill (th->threadid, SIGKILL); ++ waitpid (th->threadid, NULL, 0); ++#endif ++#endif ++} ++ ++void ++thread_free (thread *th) ++{ ++ close (th->pipe_fd[0]); ++ close (th->pipe_fd[1]); ++ free (th); ++}*/ +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/ewc/COPYING xchat-wdk/plugins/ewc/COPYING +--- xchat-wdk.orig/plugins/ewc/COPYING 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/ewc/COPYING 2010-03-31 08:46:17 +0200 +@@ -0,0 +1,502 @@ ++ GNU LESSER GENERAL PUBLIC LICENSE ++ Version 2.1, February 1999 ++ ++ Copyright (C) 1991, 1999 Free Software Foundation, Inc. ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++[This is the first released version of the Lesser GPL. It also counts ++ as the successor of the GNU Library Public License, version 2, hence ++ the version number 2.1.] ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++Licenses are intended to guarantee your freedom to share and change ++free software--to make sure the software is free for all its users. ++ ++ This license, the Lesser General Public License, applies to some ++specially designated software packages--typically libraries--of the ++Free Software Foundation and other authors who decide to use it. You ++can use it too, but we suggest you first think carefully about whether ++this license or the ordinary General Public License is the better ++strategy to use in any particular case, based on the explanations below. ++ ++ When we speak of free software, we are referring to freedom of use, ++not price. Our General Public Licenses are designed to make sure that ++you have the freedom to distribute copies of free software (and charge ++for this service if you wish); that you receive source code or can get ++it if you want it; that you can change the software and use pieces of ++it in new free programs; and that you are informed that you can do ++these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++distributors to deny you these rights or to ask you to surrender these ++rights. These restrictions translate to certain responsibilities for ++you if you distribute copies of the library or if you modify it. ++ ++ For example, if you distribute copies of the library, whether gratis ++or for a fee, you must give the recipients all the rights that we gave ++you. You must make sure that they, too, receive or can get the source ++code. If you link other code with the library, you must provide ++complete object files to the recipients, so that they can relink them ++with the library after making changes to the library and recompiling ++it. And you must show them these terms so they know their rights. ++ ++ We protect your rights with a two-step method: (1) we copyright the ++library, and (2) we offer you this license, which gives you legal ++permission to copy, distribute and/or modify the library. ++ ++ To protect each distributor, we want to make it very clear that ++there is no warranty for the free library. Also, if the library is ++modified by someone else and passed on, the recipients should know ++that what they have is not the original version, so that the original ++author's reputation will not be affected by problems that might be ++introduced by others. ++ ++ Finally, software patents pose a constant threat to the existence of ++any free program. We wish to make sure that a company cannot ++effectively restrict the users of a free program by obtaining a ++restrictive license from a patent holder. Therefore, we insist that ++any patent license obtained for a version of the library must be ++consistent with the full freedom of use specified in this license. ++ ++ Most GNU software, including some libraries, is covered by the ++ordinary GNU General Public License. This license, the GNU Lesser ++General Public License, applies to certain designated libraries, and ++is quite different from the ordinary General Public License. We use ++this license for certain libraries in order to permit linking those ++libraries into non-free programs. ++ ++ When a program is linked with a library, whether statically or using ++a shared library, the combination of the two is legally speaking a ++combined work, a derivative of the original library. The ordinary ++General Public License therefore permits such linking only if the ++entire combination fits its criteria of freedom. The Lesser General ++Public License permits more lax criteria for linking other code with ++the library. ++ ++ We call this license the "Lesser" General Public License because it ++does Less to protect the user's freedom than the ordinary General ++Public License. It also provides other free software developers Less ++of an advantage over competing non-free programs. These disadvantages ++are the reason we use the ordinary General Public License for many ++libraries. However, the Lesser license provides advantages in certain ++special circumstances. ++ ++ For example, on rare occasions, there may be a special need to ++encourage the widest possible use of a certain library, so that it becomes ++a de-facto standard. To achieve this, non-free programs must be ++allowed to use the library. A more frequent case is that a free ++library does the same job as widely used non-free libraries. In this ++case, there is little to gain by limiting the free library to free ++software only, so we use the Lesser General Public License. ++ ++ In other cases, permission to use a particular library in non-free ++programs enables a greater number of people to use a large body of ++free software. For example, permission to use the GNU C Library in ++non-free programs enables many more people to use the whole GNU ++operating system, as well as its variant, the GNU/Linux operating ++system. ++ ++ Although the Lesser General Public License is Less protective of the ++users' freedom, it does ensure that the user of a program that is ++linked with the Library has the freedom and the wherewithal to run ++that program using a modified version of the Library. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. Pay close attention to the difference between a ++"work based on the library" and a "work that uses the library". The ++former contains code derived from the library, whereas the latter must ++be combined with the library in order to run. ++ ++ GNU LESSER GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License Agreement applies to any software library or other ++program which contains a notice placed by the copyright holder or ++other authorized party saying it may be distributed under the terms of ++this Lesser General Public License (also called "this License"). ++Each licensee is addressed as "you". ++ ++ A "library" means a collection of software functions and/or data ++prepared so as to be conveniently linked with application programs ++(which use some of those functions and data) to form executables. ++ ++ The "Library", below, refers to any such software library or work ++which has been distributed under these terms. A "work based on the ++Library" means either the Library or any derivative work under ++copyright law: that is to say, a work containing the Library or a ++portion of it, either verbatim or with modifications and/or translated ++straightforwardly into another language. (Hereinafter, translation is ++included without limitation in the term "modification".) ++ ++ "Source code" for a work means the preferred form of the work for ++making modifications to it. For a library, complete source code means ++all the source code for all modules it contains, plus any associated ++interface definition files, plus the scripts used to control compilation ++and installation of the library. ++ ++ Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running a program using the Library is not restricted, and output from ++such a program is covered only if its contents constitute a work based ++on the Library (independent of the use of the Library in a tool for ++writing it). Whether that is true depends on what the Library does ++and what the program that uses the Library does. ++ ++ 1. You may copy and distribute verbatim copies of the Library's ++complete source code as you receive it, in any medium, provided that ++you conspicuously and appropriately publish on each copy an ++appropriate copyright notice and disclaimer of warranty; keep intact ++all the notices that refer to this License and to the absence of any ++warranty; and distribute a copy of this License along with the ++Library. ++ ++ You may charge a fee for the physical act of transferring a copy, ++and you may at your option offer warranty protection in exchange for a ++fee. ++ ++ 2. You may modify your copy or copies of the Library or any portion ++of it, thus forming a work based on the Library, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) The modified work must itself be a software library. ++ ++ b) You must cause the files modified to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ c) You must cause the whole of the work to be licensed at no ++ charge to all third parties under the terms of this License. ++ ++ d) If a facility in the modified Library refers to a function or a ++ table of data to be supplied by an application program that uses ++ the facility, other than as an argument passed when the facility ++ is invoked, then you must make a good faith effort to ensure that, ++ in the event an application does not supply such function or ++ table, the facility still operates, and performs whatever part of ++ its purpose remains meaningful. ++ ++ (For example, a function in a library to compute square roots has ++ a purpose that is entirely well-defined independent of the ++ application. Therefore, Subsection 2d requires that any ++ application-supplied function or table used by this function must ++ be optional: if the application does not supply it, the square ++ root function must still compute square roots.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Library, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Library, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote ++it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Library. ++ ++In addition, mere aggregation of another work not based on the Library ++with the Library (or with a work based on the Library) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may opt to apply the terms of the ordinary GNU General Public ++License instead of this License to a given copy of the Library. To do ++this, you must alter all the notices that refer to this License, so ++that they refer to the ordinary GNU General Public License, version 2, ++instead of to this License. (If a newer version than version 2 of the ++ordinary GNU General Public License has appeared, then you can specify ++that version instead if you wish.) Do not make any other change in ++these notices. ++ ++ Once this change is made in a given copy, it is irreversible for ++that copy, so the ordinary GNU General Public License applies to all ++subsequent copies and derivative works made from that copy. ++ ++ This option is useful when you wish to copy part of the code of ++the Library into a program that is not a library. ++ ++ 4. You may copy and distribute the Library (or a portion or ++derivative of it, under Section 2) in object code or executable form ++under the terms of Sections 1 and 2 above provided that you accompany ++it with the complete corresponding machine-readable source code, which ++must be distributed under the terms of Sections 1 and 2 above on a ++medium customarily used for software interchange. ++ ++ If distribution of object code is made by offering access to copy ++from a designated place, then offering equivalent access to copy the ++source code from the same place satisfies the requirement to ++distribute the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 5. A program that contains no derivative of any portion of the ++Library, but is designed to work with the Library by being compiled or ++linked with it, is called a "work that uses the Library". Such a ++work, in isolation, is not a derivative work of the Library, and ++therefore falls outside the scope of this License. ++ ++ However, linking a "work that uses the Library" with the Library ++creates an executable that is a derivative of the Library (because it ++contains portions of the Library), rather than a "work that uses the ++library". The executable is therefore covered by this License. ++Section 6 states terms for distribution of such executables. ++ ++ When a "work that uses the Library" uses material from a header file ++that is part of the Library, the object code for the work may be a ++derivative work of the Library even though the source code is not. ++Whether this is true is especially significant if the work can be ++linked without the Library, or if the work is itself a library. The ++threshold for this to be true is not precisely defined by law. ++ ++ If such an object file uses only numerical parameters, data ++structure layouts and accessors, and small macros and small inline ++functions (ten lines or less in length), then the use of the object ++file is unrestricted, regardless of whether it is legally a derivative ++work. (Executables containing this object code plus portions of the ++Library will still fall under Section 6.) ++ ++ Otherwise, if the work is a derivative of the Library, you may ++distribute the object code for the work under the terms of Section 6. ++Any executables containing that work also fall under Section 6, ++whether or not they are linked directly with the Library itself. ++ ++ 6. As an exception to the Sections above, you may also combine or ++link a "work that uses the Library" with the Library to produce a ++work containing portions of the Library, and distribute that work ++under terms of your choice, provided that the terms permit ++modification of the work for the customer's own use and reverse ++engineering for debugging such modifications. ++ ++ You must give prominent notice with each copy of the work that the ++Library is used in it and that the Library and its use are covered by ++this License. You must supply a copy of this License. If the work ++during execution displays copyright notices, you must include the ++copyright notice for the Library among them, as well as a reference ++directing the user to the copy of this License. Also, you must do one ++of these things: ++ ++ a) Accompany the work with the complete corresponding ++ machine-readable source code for the Library including whatever ++ changes were used in the work (which must be distributed under ++ Sections 1 and 2 above); and, if the work is an executable linked ++ with the Library, with the complete machine-readable "work that ++ uses the Library", as object code and/or source code, so that the ++ user can modify the Library and then relink to produce a modified ++ executable containing the modified Library. (It is understood ++ that the user who changes the contents of definitions files in the ++ Library will not necessarily be able to recompile the application ++ to use the modified definitions.) ++ ++ b) Use a suitable shared library mechanism for linking with the ++ Library. A suitable mechanism is one that (1) uses at run time a ++ copy of the library already present on the user's computer system, ++ rather than copying library functions into the executable, and (2) ++ will operate properly with a modified version of the library, if ++ the user installs one, as long as the modified version is ++ interface-compatible with the version that the work was made with. ++ ++ c) Accompany the work with a written offer, valid for at ++ least three years, to give the same user the materials ++ specified in Subsection 6a, above, for a charge no more ++ than the cost of performing this distribution. ++ ++ d) If distribution of the work is made by offering access to copy ++ from a designated place, offer equivalent access to copy the above ++ specified materials from the same place. ++ ++ e) Verify that the user has already received a copy of these ++ materials or that you have already sent this user a copy. ++ ++ For an executable, the required form of the "work that uses the ++Library" must include any data and utility programs needed for ++reproducing the executable from it. However, as a special exception, ++the materials to be distributed need not include anything that is ++normally distributed (in either source or binary form) with the major ++components (compiler, kernel, and so on) of the operating system on ++which the executable runs, unless that component itself accompanies ++the executable. ++ ++ It may happen that this requirement contradicts the license ++restrictions of other proprietary libraries that do not normally ++accompany the operating system. Such a contradiction means you cannot ++use both them and the Library together in an executable that you ++distribute. ++ ++ 7. You may place library facilities that are a work based on the ++Library side-by-side in a single library together with other library ++facilities not covered by this License, and distribute such a combined ++library, provided that the separate distribution of the work based on ++the Library and of the other library facilities is otherwise ++permitted, and provided that you do these two things: ++ ++ a) Accompany the combined library with a copy of the same work ++ based on the Library, uncombined with any other library ++ facilities. This must be distributed under the terms of the ++ Sections above. ++ ++ b) Give prominent notice with the combined library of the fact ++ that part of it is a work based on the Library, and explaining ++ where to find the accompanying uncombined form of the same work. ++ ++ 8. You may not copy, modify, sublicense, link with, or distribute ++the Library except as expressly provided under this License. Any ++attempt otherwise to copy, modify, sublicense, link with, or ++distribute the Library is void, and will automatically terminate your ++rights under this License. However, parties who have received copies, ++or rights, from you under this License will not have their licenses ++terminated so long as such parties remain in full compliance. ++ ++ 9. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Library or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Library (or any work based on the ++Library), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Library or works based on it. ++ ++ 10. Each time you redistribute the Library (or any work based on the ++Library), the recipient automatically receives a license from the ++original licensor to copy, distribute, link with or modify the Library ++subject to these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties with ++this License. ++ ++ 11. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Library at all. For example, if a patent ++license would not permit royalty-free redistribution of the Library by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Library. ++ ++If any portion of this section is held invalid or unenforceable under any ++particular circumstance, the balance of the section is intended to apply, ++and the section as a whole is intended to apply in other circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 12. If the distribution and/or use of the Library is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Library under this License may add ++an explicit geographical distribution limitation excluding those countries, ++so that distribution is permitted only in or among countries not thus ++excluded. In such case, this License incorporates the limitation as if ++written in the body of this License. ++ ++ 13. The Free Software Foundation may publish revised and/or new ++versions of the Lesser General Public License from time to time. ++Such new versions will be similar in spirit to the present version, ++but may differ in detail to address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Library ++specifies a version number of this License which applies to it and ++"any later version", you have the option of following the terms and ++conditions either of that version or of any later version published by ++the Free Software Foundation. If the Library does not specify a ++license version number, you may choose any version ever published by ++the Free Software Foundation. ++ ++ 14. If you wish to incorporate parts of the Library into other free ++programs whose distribution conditions are incompatible with these, ++write to the author to ask for permission. For software which is ++copyrighted by the Free Software Foundation, write to the Free ++Software Foundation; we sometimes make exceptions for this. Our ++decision will be guided by the two goals of preserving the free status ++of all derivatives of our free software and of promoting the sharing ++and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO ++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. ++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR ++OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY ++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE ++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE ++LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME ++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ++ ++ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN ++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY ++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU ++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR ++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE ++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING ++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A ++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF ++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ++DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Libraries ++ ++ If you develop a new library, and you want it to be of the greatest ++possible use to the public, we recommend making it free software that ++everyone can redistribute and change. You can do so by permitting ++redistribution under these terms (or, alternatively, under the terms of the ++ordinary General Public License). ++ ++ To apply these terms, attach the following notices to the library. It is ++safest to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least the ++"copyright" line and a pointer to where the full notice is found. ++ ++ <one line to give the library's name and a brief idea of what it does.> ++ Copyright (C) <year> <name of author> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the library, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the ++ library `Frob' (a library for tweaking knobs) written by James Random Hacker. ++ ++ <signature of Ty Coon>, 1 April 1990 ++ Ty Coon, President of Vice ++ ++That's all there is to it! +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/ewc/ewc.c xchat-wdk/plugins/ewc/ewc.c +--- xchat-wdk.orig/plugins/ewc/ewc.c 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/ewc/ewc.c 2010-03-31 08:56:53 +0200 +@@ -0,0 +1,231 @@ ++/* ++EasyWinampControl - A Winamp "What's playing" plugin for Xchat ++Copyright (C) Yann HAMON & contributors ++ ++This library is free software; you can redistribute it and/or ++modify it under the terms of the GNU Lesser General Public ++License as published by the Free Software Foundation; either ++version 2.1 of the License, or (at your option) any later version. ++ ++This library is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++Lesser General Public License for more details. ++ ++You should have received a copy of the GNU Lesser General Public ++License along with this library; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++#include "xchat-plugin.h" ++#include <windows.h> ++ ++static xchat_plugin *ph; /* plugin handle */ ++static int enable = 1; ++ ++// For example, circularstrstr("winamp", "pwi", 3) would return 5 (the index of p) ++int circularstrstr(char* a, char* b, int nb) ++{ ++ int equal = 1; ++ int length; ++ int pos=-1; ++ int i, j; ++ ++ length = strlen(a); ++ ++ for (i=0; i<length && pos == -1; ++i) { ++ equal = 1; ++ for (j=0; j<nb;j++) { ++ if (a[(i+j)%length] != b[j]) ++ equal = 0; ++ } ++ if (equal == 1) ++ pos = i; ++ } ++ ++ return pos; ++} ++ ++void GetCurrentSongsName(HWND hwndWinamp, char* title, int titlesize) ++{ ++ int pos; ++ char *title2; ++ int i, j=0; ++ int length; ++ char *p; ++ ++ GetWindowText(hwndWinamp, title, titlesize); ++ length = strlen(title); ++ ++ if ((pos = circularstrstr(title, "- Winamp ***", 12)) != -1) { ++ // The option "scroll song title in taskbar" is on ++ title2 = (char*) malloc (titlesize*sizeof(char)); ++ ++ for (i=(pos+12)%length; i!=pos; i=(i+1)%length) ++ title2[j++] = title[i]; ++ ++ title2[j] = '\0'; ++ ++ p = title2; ++ while (p<title2+titlesize && *p != '.') ++ p++; ++ p+=2; // Delete the . and the following white space ++ ++ strcpy(title, p); ++ free(title2); ++ } ++ else { ++ p = title; ++ while (p<title+titlesize && *p != '.') ++ p++; ++ p+=2; // Delete the . and the following white space ++ if (p<title+titlesize) ++ strncpy(title, p, titlesize-(p-title)); ++ ++ // Delete the trailing "- winamp" ++ p = title + titlesize - 1; ++ while (p>title && *p != '-') p--; ++ *p = '\0'; ++ } ++} ++ ++ ++// Controlling winamp ++static int wcmd_cb(char *word[], char *word_eol[], void *userdata) ++{ ++ // Everything's here : http://winamp.com/nsdn/winamp2x/dev/sdk/api.php ++ // The previous url seems dead, see http://forums.winamp.com/showthread.php?threadid=180297 ++ HWND hwndWinamp = NULL; ++ ++ if ((hwndWinamp = FindWindow("Winamp v1.x",NULL)) == NULL) { ++ xchat_print(ph, "Winamp's window not found - Is winamp really running?\n"); ++ } ++ else { ++ if (strcmp(word[1], "") == 0) ++ xchat_print(ph, "Usage: wcmd [command]\n"); ++ else if (strcmp(word[2], "next") == 0) { ++ xchat_print(ph, "Loading next song...\n"); ++ SendMessage (hwndWinamp, WM_COMMAND, 40048, 0); ++ } ++ else if (strcmp(word[2], "prev") == 0) { ++ xchat_print(ph, "Loading previous song...\n"); ++ SendMessage (hwndWinamp, WM_COMMAND, 40044, 0); ++ } ++ else if (strcmp(word[2], "play") == 0) { ++ xchat_print(ph, "Playin'...\n"); ++ SendMessage (hwndWinamp, WM_COMMAND, 40045, 0); ++ } ++ else if (strcmp(word[2], "stop") == 0) { ++ xchat_print(ph, "Winamp stopped!...\n"); ++ SendMessage (hwndWinamp, WM_COMMAND, 40047, 0); ++ } ++ else if (strcmp(word[2], "pause") == 0) { ++ SendMessage (hwndWinamp, WM_COMMAND, 40046, 0); ++ } ++ } ++ ++ return XCHAT_EAT_ALL; ++} ++ ++ ++// Display current song ++static int wp_cb(char *word[], char *word_eol[], void *userdata) ++{ ++ HWND hwndWinamp = NULL; ++ int bitrate, length, elapsed, minutes, seconds, eminutes, eseconds, samplerate, nbchannels; ++ char elapsedtime[7]; ++ char totaltime[7]; ++ char this_title[1024]; ++ ++ if ((hwndWinamp = FindWindow("Winamp v1.x",NULL)) == NULL) ++ xchat_print(ph, "Winamp's window not found - Is winamp really running?\n"); ++ else { ++ //Winamp's running ++ // Seems buggy when winamp2's agent is running, and winamp not (or winamp3) -> crashes xchat. ++ SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)125); ++ ++ if ((samplerate = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)126)) == 0) { ++ xchat_print(ph, "Could not get current song's samplerate... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ if ((bitrate = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)126)) == 0) { ++ xchat_print(ph, "Could not get current song's bitrate... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ if ((nbchannels = SendMessage(hwndWinamp, WM_USER, (WPARAM)2, (LPARAM)126)) == 0) { ++ xchat_print(ph, "Could not get the number of channels... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ if ((length = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)105)) == 0) { ++ // Could be buggy when streaming audio or video, returned length is unexpected; ++ // How to detect is Winamp is streaming, and display ??:?? in that case? ++ xchat_print(ph, "Could not get current song's length... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ else { ++ minutes = length/60; ++ seconds = length%60; ++ ++ if (seconds>9) ++ wsprintf(totaltime, "%d:%d", minutes, seconds); ++ else ++ wsprintf(totaltime, "%d:0%d", minutes, seconds); ++ } ++ if ((elapsed = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)105)) == 0) { ++ xchat_print(ph, "Could not get current song's elapsed time... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ else { ++ eminutes = (elapsed/1000)/60; /* kinda stupid sounding, but e is for elapsed */ ++ eseconds = (elapsed/1000)%60; ++ ++ if (eseconds>9) ++ wsprintf(elapsedtime, "%d:%d", eminutes, eseconds); ++ else ++ wsprintf(elapsedtime, "%d:0%d", eminutes, eseconds); ++ } ++ ++ if ((bitrate = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)126)) == 0) { ++ xchat_print(ph, "Could not get current song's bitrate... !?\n"); ++ return XCHAT_EAT_ALL; ++ } ++ ++ GetCurrentSongsName(hwndWinamp, this_title, 1024); ++ ++ xchat_commandf(ph, "dispcurrsong %d %d %d %s %s %s", samplerate, bitrate, nbchannels, elapsedtime, totaltime, this_title); ++ } ++ ++ return XCHAT_EAT_ALL; /* eat this command so xchat and other plugins can't process it */ ++} ++ ++ ++ ++int xchat_plugin_init(xchat_plugin *plugin_handle, ++ char **plugin_name, ++ char **plugin_desc, ++ char **plugin_version, ++ char *arg) ++{ ++ /* we need to save this for use with any xchat_* functions */ ++ ph = plugin_handle; ++ ++ *plugin_name = "EasyWinampControl"; ++ *plugin_desc = "Some commands to remotely control winamp"; ++ *plugin_version = "1.2"; ++ ++ xchat_hook_command(ph, "wp", XCHAT_PRI_NORM, wp_cb, ++ "Usage: wp", 0); ++ ++ xchat_hook_command(ph, "wcmd", XCHAT_PRI_NORM, wcmd_cb, ++ "Usage: wcmd [play|pause|stop|prev|next]", 0); ++ ++ xchat_print(ph, "EasyWinampControl 1.2 plugin loaded successfully!\n"); ++ ++ return 1; /* return 1 for success */ ++} ++ ++int xchat_plugin_deinit(void) ++{ ++ xchat_print(ph, "EasyWinampControl 1.2 plugin unloaded successfully!\n"); ++ return 1; ++} +diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/ewc/makefile.mak xchat-wdk/plugins/ewc/makefile.mak +--- xchat-wdk.orig/plugins/ewc/makefile.mak 1970-01-01 01:00:00 +0100 ++++ xchat-wdk/plugins/ewc/makefile.mak 2010-03-31 10:41:16 +0200 +@@ -0,0 +1,19 @@ ++include "..\..\src\makeinc.mak" ++ ++xcewc.dll: ewc.obj ewc.def ++ link $(LDFLAGS) $(LIBS) /dll /out:xcewc.dll /def:ewc.def ewc.obj ++ dir xcewc.dll ++ ++ewc.def: ++ echo EXPORTS > ewc.def ++ echo xchat_plugin_init >> ewc.def ++ echo xchat_plugin_deinit >> ewc.def ++ ++ewc.obj: ewc.c makefile.mak ++ cl $(CFLAGS) /I.. ewc.c ++ ++clean: ++ del *.obj ++ del *.dll ++ del *.exp ++ del *.lib diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/makefile.mak xchat-wdk/plugins/perl/makefile.mak --- xchat-wdk.orig/plugins/perl/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/plugins/perl/makefile.mak 2010-03-30 07:45:47 +0200 ++++ xchat-wdk/plugins/perl/makefile.mak 2010-03-31 07:55:16 +0200 @@ -0,0 +1,29 @@ +include "..\..\src\makeinc.mak" + @@ -365,7 +1626,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/makefile.mak xchat-wdk + echo xchat_plugin_get_info >> perl.def + +perl.obj: perl.c -+ $(CC) $(CFLAGS) -c perl.c $(GLIB) -I.. -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" ++ $(CC) $(CFLAGS) perl.c $(GLIB) -I.. -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" + +perl.c: xchat.pm.h + @@ -402,7 +1663,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi #endif diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/makefile.mak xchat-wdk/plugins/python/makefile.mak --- xchat-wdk.orig/plugins/python/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/plugins/python/makefile.mak 2010-03-30 07:46:04 +0200 ++++ xchat-wdk/plugins/python/makefile.mak 2010-03-31 07:56:12 +0200 @@ -0,0 +1,24 @@ +include "..\..\src\makeinc.mak" + @@ -417,10 +1678,10 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/makefile.mak xchat-w + echo xchat_plugin_get_info >> python.def + +python.obj: python.c -+ $(CC) $(CFLAGS) -Dusleep=_sleep -DPATH_MAX=255 -c python.c $(GLIB) -I.. -I$(PYTHONPATH)\INCLUDE -DPYTHON_DLL=\"$(PYTHONLIB).dll\" ++ $(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I.. /I$(PYTHONPATH)\INCLUDE /DPYTHON_DLL=\"$(PYTHONLIB).dll\" + +$(TARGET): python.obj python.def -+ $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) python.obj $(PYTHONLIB).lib /LIBPATH:$(PYTHONPATH)\LIBS $(PYTHONLIB).lib user32.lib shell32.lib advapi32.lib $(LIBS) /def:python.def ++ $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) python.obj $(PYTHONLIB).lib /LIBPATH:$(PYTHONPATH)\LIBS $(PYTHONLIB).lib $(LIBS) /def:python.def + +clean: + del $(TARGET) @@ -458,7 +1719,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p #endif diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/makefile.mak xchat-wdk/plugins/tcl/makefile.mak --- xchat-wdk.orig/plugins/tcl/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/plugins/tcl/makefile.mak 2010-03-30 07:46:20 +0200 ++++ xchat-wdk/plugins/tcl/makefile.mak 2010-03-31 07:56:43 +0200 @@ -0,0 +1,22 @@ +include "..\..\src\makeinc.mak" + @@ -473,7 +1734,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/makefile.mak xchat-wdk/ + echo xchat_plugin_get_info >> tcl.def + +tclplugin.obj: tclplugin.c -+ $(CC) $(CFLAGS) -c tclplugin.c -I$(TCLPATH)\INCLUDE -I../../include -I.. -DTCL_DLL=\"$(TCLLIB).dll\" ++ $(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\INCLUDE /I../../include /I.. /DTCL_DLL=\"$(TCLLIB).dll\" + +$(TARGET): tclplugin.obj tcl.def + $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) tclplugin.obj /LIBPATH:$(TCLPATH)\LIB $(TCLLIB).lib /DELAYLOAD:$(TCLLIB).dll DELAYIMP.LIB /def:tcl.def @@ -1271,7 +2532,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xtray/callbacks.h xchat-wdk \ No newline at end of file diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xtray/makefile.mak xchat-wdk/plugins/xtray/makefile.mak --- xchat-wdk.orig/plugins/xtray/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/plugins/xtray/makefile.mak 2010-03-30 12:32:58 +0200 ++++ xchat-wdk/plugins/xtray/makefile.mak 2010-03-31 07:59:07 +0200 @@ -0,0 +1,37 @@ +include "..\..\src\makeinc.mak" + @@ -1285,7 +2546,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xtray/makefile.mak xchat-wd +xchat.obj \ +xtray.obj + -+CPPFLAGS = $(CPPFLAGS) /c /MD /nologo /DWIN32 /D_STL70_ /D_STATIC_CPPLIB /EHsc ++CPPFLAGS = $(CPPFLAGS) /D_STL70_ /D_STATIC_CPPLIB /EHsc + +all: $(TRAY_OBJECTS) $(TARGET) + @@ -4065,7 +5326,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/com #define set_blocking(sok) { \ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/makefile.mak xchat-wdk/src/common/makefile.mak --- xchat-wdk.orig/src/common/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/src/common/makefile.mak 2010-03-29 13:02:00 +0200 ++++ xchat-wdk/src/common/makefile.mak 2010-03-31 08:00:55 +0200 @@ -0,0 +1,13 @@ +include "..\makeinc.mak" + @@ -4075,7 +5336,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/makefile.mak xchat-wdk/s + lib -out:xchatcommon.lib $(COMMON_OBJECTS) + +.c.obj: -+ $(CC) $(CFLAGS) $(GLIB) /c $< ++ $(CC) $(CFLAGS) $(GLIB) $< + +clean: + del *.obj @@ -4190,14 +5451,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src #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-03-30 00:55:39 +0200 -@@ -17,6 +17,9 @@ ++++ xchat-wdk/src/common/ssl.c 2010-03-31 10:48:05 +0200 +@@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -+#define _WS2DEF_ ++/*#define _WS2DEF_ +#define _WINSOCK2API_ -+#define _WS2TCPIP_H_ ++#define _WS2TCPIP_H_*/ ++#include <winsock2.h> #include <openssl/ssl.h> /* SSL_() */ #include <openssl/err.h> /* ERR_() */ #include <time.h> /* asctime() */ @@ -4529,11 +5791,11 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/ gtk_widget_show (button); diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/makefile.mak xchat-wdk/src/fe-gtk/makefile.mak --- xchat-wdk.orig/src/fe-gtk/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/src/fe-gtk/makefile.mak 2010-03-30 07:45:37 +0200 ++++ xchat-wdk/src/fe-gtk/makefile.mak 2010-03-31 08:11:21 +0200 @@ -0,0 +1,37 @@ +include "..\makeinc.mak" + -+!ifdef x64 ++!ifdef X64 +MACHINE_FLAG = /MACHINE:X64 +!else +MACHINE_FLAG = /MACHINE:X86 @@ -4548,7 +5810,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/makefile.mak xchat-wdk/s + gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S + +.c.obj: -+ $(CC) $(CFLAGS) $(GLIB) $(GTK) /c $< ++ $(CC) $(CFLAGS) $(GLIB) $(GTK) $< + +$(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj + $(LINK) /out:$(PROG) /ENTRY:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj @@ -4592,7 +5854,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/ #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 2008-08-29 12:59:11 +0200 -+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-03-29 13:00:32 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-03-31 12:25:02 +0200 @@ -1,7 +1,6 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -4612,6 +5874,23 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f #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-03-31 12:26:58 +0200 +@@ -332,11 +332,11 @@ + #ifndef WIN32 + {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}, ++ /* {ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0}, */ + {ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0}, + {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}, ++ /* {ST_TOGGLE, N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0}, */ + + {ST_HEADER, N_("Highlighted Messages"),0,0,0}, + {ST_LABEL, N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1}, 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-03-29 14:42:33 +0200 @@ -4649,16 +5928,16 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe #include <gtk/gtkselection.h> diff -ruN --strip-trailing-cr xchat-wdk.orig/src/makefile.mak xchat-wdk/src/makefile.mak --- xchat-wdk.orig/src/makefile.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/src/makefile.mak 2010-03-29 22:22:00 +0200 ++++ xchat-wdk/src/makefile.mak 2010-03-31 07:54:25 +0200 @@ -0,0 +1,18 @@ +all: + copy ..\plugins\xchat-plugin.h common + @cd pixmaps -+ @-$(MAKE) /NOLOGO -f makefile.mak $@ ++ @-$(MAKE) -f makefile.mak $@ + @cd ..\common -+ @-$(MAKE) /NOLOGO -f makefile.mak $@ ++ @-$(MAKE) -f makefile.mak $@ + @cd ..\fe-gtk -+ @-$(MAKE) /NOLOGO -f makefile.mak $@ ++ @-$(MAKE) -f makefile.mak $@ + +clean: + del common\*.obj @@ -4671,22 +5950,29 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/makefile.mak xchat-wdk/src/make + del pixmaps\*.h diff -ruN --strip-trailing-cr xchat-wdk.orig/src/makeinc.mak xchat-wdk/src/makeinc.mak --- xchat-wdk.orig/src/makeinc.mak 1970-01-01 01:00:00 +0100 -+++ xchat-wdk/src/makeinc.mak 2010-03-30 12:40:15 +0200 -@@ -0,0 +1,126 @@ ++++ xchat-wdk/src/makeinc.mak 2010-03-31 12:03:41 +0200 +@@ -0,0 +1,125 @@ +#uncomment this to have an x64 build -+#x64 = YES ++#X64 = YES ++#OPENSSL = YES ++IPV6 = YES + -+CFLAGS = -+CPPFLAGS = -+!ifdef x64 ++CC = cl ++LINK = link ++CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 ++CPPFLAGS = /c /MD /nologo /DWIN32 ++LDFLAGS = /subsystem:windows /nologo ++LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ++!ifdef X64 +############################################################# +#x64 config +GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include +GTK = -Ic:/mozilla-build/build/xchat-dev64/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/cairo -Ic:/mozilla-build/build/xchat-dev64/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/freetype2 -Ic:/mozilla-build/build/xchat-dev64/include -Ic:/mozilla-build/build/xchat-dev64/include/libpng14 -+LIBS = /libpath:c:/mozilla-build/build/xchat-dev64/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib ++LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev64/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib + -+LDFLAGS = /SUBSYSTEM:WINDOWS /NOLOGO msvcrt_win2003.obj -+CPPFLAGS = $(CPPFLAGS) /D_WIN64 ++CFLAGS = $(CFLAGS) /favor:AMD64 ++CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 ++LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj + +PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE +PYTHONPATH = c:\mozilla-build\python-2.6-x64 @@ -4696,9 +5982,9 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/makeinc.mak xchat-wdk/src/makei +#x86 config +GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include +GTK = -Ic:/mozilla-build/build/xchat-dev32/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/cairo -Ic:/mozilla-build/build/xchat-dev32/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/freetype2 -Ic:/mozilla-build/build/xchat-dev32/include -Ic:/mozilla-build/build/xchat-dev32/include/libpng14 -+LIBS = /libpath:c:/mozilla-build/build/xchat-dev32/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib ++LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev32/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib + -+LDFLAGS = /SUBSYSTEM:WINDOWS /NOLOGO msvcrt_winxp.obj ++LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj + +PERLPATH = c:\mozilla-build\perl-5.10-x86\lib\CORE +PYTHONPATH = c:\mozilla-build\python-2.6-x86 @@ -4717,14 +6003,6 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/makeinc.mak xchat-wdk/src/makei +TCLLIB = tcl86 +TCLOUTPUT = xctcl.dll + -+#OPENSSL = YES -+IPV6 = YES -+ -+CC = cl -+LINK = link -+CFLAGS = $(CFLAGS) /Ox -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp -Dstrtoull=_strtoui64 /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS -+LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib -+ +!ifdef IPV6 +CFLAGS = $(CFLAGS) -DUSE_IPV6 +LIBS = $(LIBS) ws2_32.lib |