From 20d26aea943d8de63a61cb92f506dd51b934fe36 Mon Sep 17 00:00:00 2001 From: TingPing Date: Wed, 8 Jan 2014 01:32:28 -0500 Subject: [PATCH] Rewrite dns command - Cross platform - Doesn't depend on external tools --- plugins/dns/dns.c | 332 -------------------------------- plugins/dns/dns.def | 3 - plugins/dns/dns.vcxproj | 111 ----------- plugins/dns/dns.vcxproj.filters | 35 ---- plugins/dns/thread.c | 34 ---- plugins/dns/thread.h | 11 -- src/common/cfgfiles.c | 3 - src/common/hexchat.h | 1 - src/common/inbound.c | 63 +++++- src/common/outbound.c | 18 +- src/common/plugin.c | 1 - win32/hexchat.sln | 13 +- win32/installer/hexchat.iss.tt | 2 - 13 files changed, 65 insertions(+), 562 deletions(-) delete mode 100644 plugins/dns/dns.c delete mode 100644 plugins/dns/dns.def delete mode 100644 plugins/dns/dns.vcxproj delete mode 100644 plugins/dns/dns.vcxproj.filters delete mode 100644 plugins/dns/thread.c delete mode 100644 plugins/dns/thread.h diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c deleted file mode 100644 index 3610e9d0..00000000 --- a/plugins/dns/dns.c +++ /dev/null @@ -1,332 +0,0 @@ -/* HexChat Win32 DNS Plugin - * Copyright (C) 2003-2004 Peter Zelezny. - * Copyright (C) 2012 Berke Viktor. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 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 -#include -#include -#include - -#define USE_IPV6 - -#ifdef WIN32 -#ifdef USE_IPV6 -#include -#include -#else -#include -#endif -#include -#else -#include -#include -#include -#endif - -#include "hexchat-plugin.h" -#include "thread.h" - -#define HELP "Usage: DNS \n" -#define HEAD "\0034[DNS]\017\t" - -#define PIPE_READ 0 -#define PIPE_WRITE 1 -#define MAX_HOSTNAME 128 - -static hexchat_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->hexchat_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 USE_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 USE_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) - hexchat_printf(ph, HEAD"\002Numerical\002: %s\n", buf + 1); - else - hexchat_printf(ph, HEAD"\002Canonical\002: %s \002Numerical\002: %s\n", buf2, buf + 1); - return 1; - - case '1': /* failed */ - hexchat_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]); - hexchat_hook_timer(ph, 3000, dns_close_pipe, (void *)th->pipe_fd[PIPE_WRITE]); - hexchat_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) -{ - hexchat_list *list; - char *at; - const char *host; - - list = hexchat_list_get (ph, "users"); - if (!list) - return NULL; - - while (hexchat_list_next (ph, list)) - { - if (stricmp (nick, hexchat_list_str (ph, list, "nick")) == 0) - { - host = hexchat_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]) - { - hexchat_print (ph, HELP); - return HEXCHAT_EAT_ALL; - } - - th = thread_new (); - if (th) - { - nickhost = find_nick_host (word[2]); - if (nickhost) - { - hexchat_printf (ph, HEAD"Looking up %s (%s)...\n", nickhost, word[2]); - th->userdata = strdup (nickhost); - } else - { - hexchat_printf (ph, HEAD"Looking up %s...\n", word[2]); - th->userdata = strdup (word[2]); - } - - if (thread_start (th, thread_function, th)) - { - hexchat_hook_fd(ph, th->pipe_fd[PIPE_READ], - HEXCHAT_FD_READ | HEXCHAT_FD_EXCEPTION | HEXCHAT_FD_NOTSOCKET, - (void *)dns_read_cb, th); - - } - } - - return HEXCHAT_EAT_ALL; -} - -int -hexchat_plugin_deinit (hexchat_plugin *plugin_handle) -{ - while (active_thread) /* children will set this var to NULL soon... */ - { - Sleep (1000); - } - hexchat_printf (ph, "DNS plugin unloaded\n"); - return 1; -} - -int -hexchat_plugin_init - (hexchat_plugin *plugin_handle, char **plugin_name, - char **plugin_desc, char **plugin_version, char *arg) -{ - /* we need to save this for use with any hexchat_* functions */ - ph = plugin_handle; - - *plugin_name = "DNS"; - *plugin_desc = "Threaded IPv4/6 DNS Command"; - *plugin_version = DNS_VERSION; - - hexchat_hook_command(ph, "DNS", HEXCHAT_PRI_LOW, dns_cmd_cb, HELP, 0); - hexchat_printf (ph, "DNS plugin loaded\n"); - - return 1; /* return 1 for success */ -} diff --git a/plugins/dns/dns.def b/plugins/dns/dns.def deleted file mode 100644 index e560f50f..00000000 --- a/plugins/dns/dns.def +++ /dev/null @@ -1,3 +0,0 @@ -EXPORTS -hexchat_plugin_init -hexchat_plugin_deinit diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj deleted file mode 100644 index 8709d2a5..00000000 --- a/plugins/dns/dns.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - v120 - - - - Release - Win32 - - - Release - x64 - - - - {3786FA8C-3E76-45E3-984E-FCCFF44729C9} - Win32Proj - dns - - - - DynamicLibrary - false - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - - - false - hcdns - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - false - hcdns - $(HexChatBin) - $(HexChatObj)$(ProjectName)\ - - - - - - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) - ..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - $(DepLibs);%(AdditionalDependencies) - dns.def - - - - - - - true - true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) - ..\..\src\common;%(AdditionalIncludeDirectories) - true - - - Windows - true - true - true - $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - $(DepLibs);%(AdditionalDependencies) - dns.def - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/dns/dns.vcxproj.filters b/plugins/dns/dns.vcxproj.filters deleted file mode 100644 index a49dc1e2..00000000 --- a/plugins/dns/dns.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Resource Files - - - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/plugins/dns/thread.c b/plugins/dns/thread.c deleted file mode 100644 index d0347130..00000000 --- a/plugins/dns/thread.c +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -#include "thread.h" - -thread * -thread_new (void) -{ - thread *th; - - th = calloc (1, sizeof (*th)); - if (!th) - { - return NULL; - } - - if (_pipe (th->pipe_fd, 4096, _O_BINARY) == -1) - { - free (th); - return NULL; - } - - return th; -} - -int -thread_start (thread *th, void *(*start_routine)(void *), void *arg) -{ - DWORD id; - - CloseHandle (CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)start_routine, arg, 0, (DWORD *)&id)); - th->threadid = id; - - return 1; -} diff --git a/plugins/dns/thread.h b/plugins/dns/thread.h deleted file mode 100644 index 1ec6932d..00000000 --- a/plugins/dns/thread.h +++ /dev/null @@ -1,11 +0,0 @@ -#include - -typedef struct -{ - DWORD threadid; - int pipe_fd[2]; - void *userdata; -} thread; - -thread *thread_new (void); -int thread_start (thread *th, void *(*start_routine)(void *), void *arg); diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 7d0e9c91..826c56d8 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -417,8 +417,6 @@ const struct prefs vars[] = {"dcc_stall_timeout", P_OFFINT (hex_dcc_stall_timeout), TYPE_INT}, {"dcc_timeout", P_OFFINT (hex_dcc_timeout), TYPE_INT}, - {"dnsprogram", P_OFFSET (hex_dnsprogram), TYPE_STR}, - {"flood_ctcp_num", P_OFFINT (hex_flood_ctcp_num), TYPE_INT}, {"flood_ctcp_time", P_OFFINT (hex_flood_ctcp_time), TYPE_INT}, {"flood_msg_num", P_OFFINT (hex_flood_msg_num), TYPE_INT}, @@ -875,7 +873,6 @@ load_default_config(void) strcpy (prefs.hex_dcc_dir, g_build_filename (g_get_home_dir (), "Downloads", NULL)); } #endif - strcpy (prefs.hex_dnsprogram, "host"); strcpy (prefs.hex_gui_ulist_doubleclick, "QUERY %s"); strcpy (prefs.hex_input_command_char, "/"); strcpy (prefs.hex_irc_logmask, g_build_filename ("%n", "%c.log", NULL)); diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 063a55b7..63d0fbed 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -318,7 +318,6 @@ struct hexchatprefs char hex_dcc_completed_dir[PATHLEN + 1]; char hex_dcc_dir[PATHLEN + 1]; char hex_dcc_ip[DOMAINLEN + 1]; - char hex_dnsprogram[72]; char hex_gui_ulist_doubleclick[256]; char hex_input_command_char[4]; char hex_irc_extra_hilight[300]; diff --git a/src/common/inbound.c b/src/common/inbound.c index 1ea0a412..780e4ae3 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -33,6 +33,8 @@ #define WANTDNS #include "inet.h" +#include + #include "hexchat.h" #include "util.h" #include "ignore.h" @@ -1270,20 +1272,71 @@ inbound_next_nick (session *sess, char *nick, int error, } } + +static void +dns_addr_callback (GResolver *resolver, GAsyncResult *result, session *sess) +{ + gchar *addr; + + g_return_if_fail (is_session(sess)); + + addr = g_resolver_lookup_by_address_finish (resolver, result, NULL); + if (addr) + PrintTextf (sess, _("Resolved to %s"), addr); + else + PrintText (sess, _("Not found")); +} + +static void +dns_name_callback (GResolver *resolver, GAsyncResult *result, session *sess) +{ + GList* addrs; + gchar* addr; + GList* list; + + g_return_if_fail (is_session (sess)); + + addrs = g_resolver_lookup_by_name_finish (resolver, result, NULL); + if (addrs) + { + PrintText (sess, _("Resolved to:")); + + for (list = g_list_first (addrs); list; list = g_list_next (list)) + { + addr = g_inet_address_to_string (list->data); + PrintTextf (sess, " %s", addr); + } + + g_resolver_free_addresses (addrs); + } + else + PrintText (sess, _("Not found")); +} + void do_dns (session *sess, char *nick, char *host, - const message_tags_data *tags_data) +const message_tags_data *tags_data) { + GResolver *res = g_resolver_get_default (); + GInetAddress *addr; char *po; char tbuf[1024]; po = strrchr (host, '@'); if (po) host = po + 1; - EMIT_SIGNAL_TIMESTAMP (XP_TE_RESOLVINGUSER, sess, nick, host, NULL, NULL, 0, - tags_data->timestamp); - snprintf (tbuf, sizeof (tbuf), "exec -d %s %s", prefs.hex_dnsprogram, host); - handle_command (sess, tbuf, FALSE); + + if (nick) + EMIT_SIGNAL_TIMESTAMP (XP_TE_RESOLVINGUSER, sess, nick, host, NULL, NULL, 0, + tags_data->timestamp); + + PrintTextf (sess, _("Looking up %s..."), host); + + addr = g_inet_address_new_from_string (host); + if (addr) + g_resolver_lookup_by_address_async (res, addr, NULL, dns_addr_callback, sess); + else + g_resolver_lookup_by_name_async (res, host, NULL, dns_name_callback, sess); } static void diff --git a/src/common/outbound.c b/src/common/outbound.c index 96425f8f..7d64e65f 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -1414,21 +1414,17 @@ cmd_discon (struct session *sess, char *tbuf, char *word[], char *word_eol[]) static int cmd_dns (struct session *sess, char *tbuf, char *word[], char *word_eol[]) { -#ifdef WIN32 - PrintText (sess, "DNS is not implemented in Windows.\n"); - return TRUE; -#else char *nick = word[2]; struct User *user; + message_tags_data no_tags = MESSAGE_TAGS_DATA_INIT; if (*nick) { - if (strchr (nick, '.') == NULL) + user = userlist_find (sess, nick); + if (user) { - user = userlist_find (sess, nick); - if (user && user->hostname) + if (user->hostname) { - message_tags_data no_tags = MESSAGE_TAGS_DATA_INIT; do_dns (sess, user->nick, user->hostname, &no_tags); } else { @@ -1437,13 +1433,11 @@ cmd_dns (struct session *sess, char *tbuf, char *word[], char *word_eol[]) } } else { - snprintf (tbuf, TBUFSIZE, "exec -d %s %s", prefs.hex_dnsprogram, nick); - handle_command (sess, tbuf, FALSE); + do_dns (sess, NULL, nick, &no_tags); } return TRUE; } return FALSE; -#endif } static int @@ -3904,7 +3898,7 @@ const struct commands xc_cmds[] = { {"DEVOICE", cmd_devoice, 1, 1, 1, N_("DEVOICE , removes voice status from the nick on the current channel (needs chanop)")}, {"DISCON", cmd_discon, 0, 0, 1, N_("DISCON, Disconnects from server")}, - {"DNS", cmd_dns, 0, 0, 1, N_("DNS , Finds a users IP number")}, + {"DNS", cmd_dns, 0, 0, 1, N_("DNS , Resolves an IP or hostname")}, {"ECHO", cmd_echo, 0, 0, 1, N_("ECHO , Prints text locally")}, #ifndef WIN32 {"EXEC", cmd_exec, 0, 0, 1, diff --git a/src/common/plugin.c b/src/common/plugin.c index ee3b26c8..286a68c7 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -491,7 +491,6 @@ plugin_auto_load (session *sess) /* a long list of bundled plugins that should be loaded automatically, * user plugins should go to , leave Program Files alone! */ for_files (HEXCHATLIBDIR, "hcchecksum.dll", plugin_auto_load_cb); - for_files (HEXCHATLIBDIR, "hcdns.dll", plugin_auto_load_cb); for_files (HEXCHATLIBDIR, "hcdoat.dll", plugin_auto_load_cb); for_files (HEXCHATLIBDIR, "hcexec.dll", plugin_auto_load_cb); for_files (HEXCHATLIBDIR, "hcfishlim.dll", plugin_auto_load_cb); diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 8e237e28..03b75c5d 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.20827.3 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}" ProjectSection(ProjectDependencies) = postProject @@ -39,11 +39,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checksum", "..\plugins\chec {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns", "..\plugins\dns\dns.vcxproj", "{3786FA8C-3E76-45E3-984E-FCCFF44729C9}" - ProjectSection(ProjectDependencies) = postProject - {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec", "..\plugins\exec\exec.vcxproj", "{17E4BE39-76F7-4A06-AD21-EFD0C5091F76}" ProjectSection(ProjectDependencies) = postProject {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} @@ -93,7 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} - {3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {3786FA8C-3E76-45E3-984E-FCCFF44729C9} {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} = {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} = {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} @@ -155,10 +149,6 @@ Global {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}.Release|Win32.Build.0 = Release|Win32 {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}.Release|x64.ActiveCfg = Release|x64 {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}.Release|x64.Build.0 = Release|x64 - {3786FA8C-3E76-45E3-984E-FCCFF44729C9}.Release|Win32.ActiveCfg = Release|Win32 - {3786FA8C-3E76-45E3-984E-FCCFF44729C9}.Release|Win32.Build.0 = Release|Win32 - {3786FA8C-3E76-45E3-984E-FCCFF44729C9}.Release|x64.ActiveCfg = Release|x64 - {3786FA8C-3E76-45E3-984E-FCCFF44729C9}.Release|x64.Build.0 = Release|x64 {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}.Release|Win32.ActiveCfg = Release|Win32 {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}.Release|Win32.Build.0 = Release|Win32 {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}.Release|x64.ActiveCfg = Release|x64 @@ -223,7 +213,6 @@ Global {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} - {3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 74156720..1e81308d 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -65,7 +65,6 @@ Name: "translations"; Description: "Translations"; Types: normal custom; Flags: Name: "spell"; Description: "Spelling Dictionaries"; Types: custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\checksum"; Description: "Checksum"; Types: custom; Flags: disablenouninstallwarning -Name: "plugins\dns"; Description: "DNS"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning @@ -148,7 +147,6 @@ Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Flag Source: "lib\gtk-2.0\i686-pc-vs10\engines\*"; DestDir: "{app}\lib\gtk-2.0\i686-pc-vs10\engines"; Flags: ignoreversion; Components: libs Source: "plugins\hcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum -Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\dns Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim