Update win8_provider.cpp

.github/workflows/flatpak-build.yml

@@ -1,7 +1,7 @@
 name: Flatpak Build
 on: [push, pull_request]
 jobs:
-  flatpak_build:
+  build:
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-40

.github/workflows/msys-build.yml

@@ -2,7 +2,7 @@ name: MSYS2 Build
 on: [push, pull_request]
 
 jobs:
-  msys2_build:
+  build:
     runs-on: windows-latest
     defaults:
       run:
@@ -19,6 +19,7 @@ jobs:
             mingw-w64-x86_64-python3-cffi
             mingw-w64-x86_64-meson
             mingw-w64-x86_64-gtk2
+            mingw-w64-x86_64-enchant
             mingw-w64-x86_64-luajit
             mingw-w64-x86_64-desktop-file-utils
 

.github/workflows/ubuntu-build.yml

@@ -1,7 +1,7 @@
 name: Ubuntu Build
 on: [push, pull_request]
 jobs:
-  ubuntu_build:
+  build:
     runs-on: ubuntu-20.04
 
     steps:
@@ -10,7 +10,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libpci-dev libperl-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
+          sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
 
       - name: Configure
         run: meson build -Dtext=true -Dtheme-manager=true -Dauto_features=enabled

.github/workflows/windows-build.yml

@@ -2,7 +2,7 @@ name: Windows Build
 on: [push, pull_request]
 
 jobs:
-  windows_build:
+  build:
     runs-on: windows-2019
     strategy:
       matrix:
@@ -28,7 +28,7 @@ jobs:
           Invoke-WebRequest https://dl.hexchat.net/misc/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe
           & deps\idpsetup.exe /VERYSILENT
 
-          Invoke-WebRequest https://dl.hexchat.net/gtk/gtk-${{ matrix.platform }}-2018-08-29-openssl1.1.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
+          Invoke-WebRequest https://dl.hexchat.net/gtk/gtk-${{ matrix.platform }}-2018-08-29.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
           & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk
 
           Invoke-WebRequest https://dl.hexchat.net/gtk-win32/gendef-20111031.7z -OutFile deps\gendef.7z

data/icons/meson.build

@@ -1,11 +1,9 @@
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 install_data(
   'hexchat.png',
-  rename: 'io.github.Hexchat.png',
   install_dir: join_paths(icondir, '48x48/apps')
 )
 install_data(
   'hexchat.svg',
-  rename: 'io.github.Hexchat.svg',
   install_dir: join_paths(icondir, 'scalable/apps')
 )

data/misc/io.github.Hexchat.appdata.xml.in

@@ -26,35 +26,6 @@
     <id>hexchat.desktop</id>
   </provides>
   <releases>
-    <release date="2022-02-12" version="2.16.1">
-      <description>
-        <p>This is a minor release with mostly bug-fixes:</p>
-        <ul>
-          <li>Add `-NOOVERRIDE` flag to the `GUI COLOR` command</li>
-          <li>Add `-q` (quiet) flag to the `EXECWRITE` command</li>
-          <li>Rename installed icon to match app-id (Fixes notification icon)</li>
-          <li>Fix escaping already escaped URLs when opening them</li>
-          <li>Fix Python scripts not being opened as UTF-8</li>
-          <li>Fix `TIMER` command supporting decimals regardless of locale</li>
-        </ul>
-      </description>
-    </release>
-    <release date="2021-10-01" version="2.16.0">
-      <description>
-        <p>This is a feature release:</p>
-        <ul>
-          <li>Add support for IRCv3 SETNAME, invite-notify, account-tag, standard replies, and UTF8ONLY</li>
-          <li>Add support for strikethrough formatting</li>
-          <li>Fix text clipping issues by respecting font line height</li>
-          <li>Fix URLs not being escaped when opened</li>
-          <li>Fix possible hang when showing notifications</li>
-          <li>Print ChanServ notices in the front tab by default</li>
-          <li>Update network list</li>
-          <li>python: Rewrite plugin improving memory usage and compatibility</li>
-          <li>fishlim: Add support for CBC and other improvements</li>
-        </ul>
-      </description>
-    </release>
     <release date="2019-12-20" version="2.14.3">
       <description>
         <p>This is a bug-fix release:</p>

data/misc/io.github.Hexchat.desktop.in.in

@@ -4,7 +4,7 @@ GenericName=IRC Client
 Comment=Chat with other people online
 Keywords=IM;Chat;
 Exec=@exec_command@
-Icon=io.github.Hexchat
+Icon=hexchat
 Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;

flatpak/io.github.Hexchat.json

@@ -5,6 +5,7 @@
   "runtime-version": "40",
   "sdk": "org.gnome.Sdk",
   "command": "hexchat",
+  "rename-icon": "hexchat",
   "finish-args": [
     "--share=ipc",
     "--socket=x11",
@@ -30,7 +31,7 @@
   "modules": [
     "shared-modules/gtk2/gtk2.json",
     "shared-modules/gtk2/gtk2-common-themes.json",
-    "shared-modules/dbus-glib/dbus-glib.json",
+    "shared-modules/dbus-glib/dbus-glib-0.110.json",
     "shared-modules/lua5.3/lua-5.3.5.json",
     "shared-modules/libcanberra/libcanberra.json",
     "python3-cffi.json",

meson.build

@@ -1,5 +1,5 @@
 project('hexchat', 'c',
-  version: '2.16.1',
+  version: '2.14.3',
   meson_version: '>= 0.47.0',
   default_options: [
     'c_std=gnu89',
@@ -22,7 +22,7 @@ dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus'))
 
 global_deps = []
 if cc.get_id() == 'msvc'
-  libssl_dep = cc.find_library('libssl')
+  libssl_dep = cc.find_library('libeay32')
 else
   libssl_dep = dependency('openssl', version: '>= 0.9.8',
                           required: get_option('tls'))
@@ -34,7 +34,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'hexchat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
-config_h.set_quoted('G_LOG_DOMAIN', 'hexchat')
 config_h.set10('ENABLE_NLS', true)
 
 # Optional features
@@ -86,11 +85,18 @@ configure_file(output: 'config.h', configuration: config_h)
 config_h_include = include_directories('.')
 
 if host_machine.system() == 'windows'
+  add_languages('cpp')
+
   add_project_arguments(
     '-DWIN32',
-    '-DNTDDI_VERSION=NTDDI_WIN7',
-    '-D_WIN32_WINNT=_WIN32_WINNT_WIN7',
+    '-DNTDDI_VERSION=NTDDI_WIN8',
+    '-D_WIN32_WINNT=_WIN32_WINNT_WIN8',
      language: 'c')
+  add_project_arguments(
+    '-DWIN32',
+    '-DNTDDI_VERSION=NTDDI_WIN8',
+    '-D_WIN32_WINNT=_WIN32_WINNT_WIN8',
+     language: 'cpp')
 endif
 
 

plugins/checksum/meson.build

@@ -3,5 +3,4 @@ shared_module('checksum', 'checksum.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'checksum.def',
 )

plugins/exec/meson.build

@@ -1,6 +1,5 @@
 shared_module('exec', 'exec.c',
   dependencies: hexchat_plugin_dep,
   install: true,
-  install_dir: plugindir,
-  vs_module_defs: 'exec.def',
+  install_dir: plugindir
 )

plugins/fishlim/fish.c

@@ -87,54 +87,6 @@ static const signed char fish_unbase64[256] = {
     dest |= (uint8_t)*((source)++); \
 } while (0);
 
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-#include <openssl/provider.h>
-static OSSL_PROVIDER *legacy_provider;
-static OSSL_PROVIDER *default_provider;
-static OSSL_LIB_CTX* *ossl_ctx;
-#endif
-
-int fish_init(void)
-{
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    ossl_ctx = OSSL_LIB_CTX_new();
-    if (!ossl_ctx)
-        return 0;
-
-    legacy_provider = OSSL_PROVIDER_load(ossl_ctx, "legacy");
-    if (!legacy_provider) {
-        fish_deinit();
-        return 0;
-    }
-
-    default_provider = OSSL_PROVIDER_load(ossl_ctx, "default");
-    if (!default_provider) {
-        fish_deinit();
-        return 0;
-    }
-#endif
-    return 1;
-}
-
-void fish_deinit(void)
-{
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    if (legacy_provider) {
-        OSSL_PROVIDER_unload(legacy_provider);
-        legacy_provider = NULL;
-    }
-
-    if (default_provider) {
-        OSSL_PROVIDER_unload(default_provider);
-        default_provider = NULL;
-    }
-
-    if (ossl_ctx) {
-        OSSL_LIB_CTX_free(ossl_ctx);
-        ossl_ctx = NULL;
-    }
-#endif
-}
 
 /**
  * Encode ECB FiSH Base64
@@ -276,19 +228,9 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
             plaintext_len -= 8;
         }
 
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-CBC", NULL);
-#else
         cipher = (EVP_CIPHER *) EVP_bf_cbc();
-#endif
-
     } else if (mode == EVP_CIPH_ECB_MODE) {
-
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-ECB", NULL);
-#else
         cipher = (EVP_CIPHER *) EVP_bf_ecb();
-#endif
     }
 
     /* Zero Padding */

plugins/fishlim/fish.h

@@ -35,8 +35,6 @@ enum fish_mode {
   FISH_CBC_MODE = 0x2
 };
 
-int fish_init(void);
-void fish_deinit(void);
 char *fish_base64_encode(const char *message, size_t message_len);
 char *fish_base64_decode(const char *message, size_t *final_len);
 char *fish_encrypt(const char *key, size_t keylen, const char *message, size_t message_len, enum fish_mode mode);

plugins/fishlim/fishlim.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;HAVE_DH_SET0_PQG;HAVE_DH_GET0_KEY;HAVE_DH_SET0_KEY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -40,7 +40,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;HAVE_DH_SET0_PQG;HAVE_DH_GET0_KEY;HAVE_DH_SET0_KEY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/fishlim/meson.build

@@ -19,5 +19,4 @@ shared_module('fishlim', fishlim_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'fishlim.def',
 )

plugins/fishlim/plugin_hexchat.c

@@ -815,9 +815,6 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
     hexchat_hook_server_attrs(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
     hexchat_hook_server_attrs(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
 
-    if (!fish_init())
-        return 0;
-
     if (!dh1080_init())
         return 0;
 
@@ -831,7 +828,6 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
 int hexchat_plugin_deinit(void) {
     g_clear_pointer(&pending_exchanges, g_hash_table_destroy);
     dh1080_deinit();
-    fish_deinit();
 
     hexchat_printf(ph, "%s plugin unloaded\n", plugin_name);
     return 1;

plugins/fishlim/tests/meson.build

@@ -12,5 +12,4 @@ fishlim_tests = executable('fishlim_tests', fishlim_test_sources,
 
 test('Fishlim Tests', fishlim_tests,
   protocol: 'tap',
-  timeout: 600,
 )

plugins/fishlim/tests/tests.c

@@ -21,7 +21,6 @@
 
 */
 
-#include <string.h>
 #include <glib.h>
 
 #include "fish.h"
@@ -130,17 +129,17 @@ static void
 test_base64_len (void)
 {
     char *b64 = NULL;
+    int i, message_len = 0;
     char message[1000];
-    int message_end = sizeof (message) - 1;
 
-    random_string(message, message_end);
-
-    for (; message_end >= 0; --message_end) {
-        message[message_end] = '\0'; /* Truncate instead of generating new strings */
-        b64 = g_base64_encode((const unsigned char *) message, message_end);
-        g_assert_nonnull(b64);
-        g_assert_cmpuint(strlen(b64), == , base64_len(message_end));
-        g_free(b64);
+    for (i = 0; i < 10; ++i) {
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = g_base64_encode((const unsigned char *) message, message_len);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , base64_len(message_len));
+            g_free(b64);
+        }
     }
 }
 
@@ -151,15 +150,18 @@ static void
 test_base64_fish_len (void)
 {
     char *b64 = NULL;
-    int message_len = 0;
+    int i, message_len = 0;
     char message[1000];
 
-    for (message_len = 1; message_len < 1000; ++message_len) {
-        random_string(message, message_len);
-        b64 = fish_base64_encode(message, message_len);
-        g_assert_nonnull(b64);
-        g_assert_cmpuint(strlen(b64), == , base64_fish_len(message_len));
-        g_free(b64);
+    for (i = 0; i < 10; ++i) {
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = fish_base64_encode(message, message_len);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , base64_fish_len(message_len));
+            g_free(b64);
+        }
     }
 }
 
@@ -240,28 +242,30 @@ test_foreach_utf8_data_chunks(void)
 {
     GRand *rand = NULL;
     GString *chunks = NULL;
-    int  max_chunks_len, chunks_len;
+    int tests, max_chunks_len, chunks_len;
     char ascii_message[1001];
     char *data_chunk = NULL;
 
     rand = g_rand_new();
-    max_chunks_len = g_rand_int_range(rand, 2, 301);
-    random_string(ascii_message, 1000);
 
-    data_chunk = ascii_message;
+    for (tests = 0; tests < 1000; ++tests) {
 
-    chunks = g_string_new(NULL);
+        max_chunks_len = g_rand_int_range(rand, 2, 301);
+        random_string(ascii_message, 1000);
 
-    while (foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
-        g_string_append(chunks, g_strndup(data_chunk, chunks_len));
-        /* Next chunk */
-        data_chunk += chunks_len;
+        data_chunk = ascii_message;
+
+        chunks = g_string_new(NULL);
+
+        while (foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
+            g_string_append(chunks, g_strndup(data_chunk, chunks_len));
+            /* Next chunk */
+            data_chunk += chunks_len;
+        }
+        /* Check data loss */
+        g_assert_cmpstr(chunks->str, == , ascii_message);
+        g_string_free(chunks, TRUE);
     }
-    /* Check data loss */
-    g_assert_cmpstr(chunks->str, == , ascii_message);
-
-    g_string_free(chunks, TRUE);
-    g_rand_free (rand);
 }
 
 int
@@ -278,8 +282,5 @@ main(int argc, char *argv[]) {
     g_test_add_func("/fishlim/max_text_command_len", test_max_text_command_len);
     g_test_add_func("/fishlim/foreach_utf8_data_chunks", test_foreach_utf8_data_chunks);
 
-    fish_init();
-    int ret = g_test_run();
-    fish_deinit();
-    return ret;
+    return g_test_run();
 }

plugins/fishlim/utils.c

@@ -22,8 +22,6 @@
 
 */
 
-#include <string.h>
-
 #include "utils.h"
 #include "fish.h"
 

plugins/perl/meson.build

@@ -88,5 +88,4 @@ shared_module('perl',
   install_dir: plugindir,
   install_rpath: perl_rpath,
   name_prefix: '',
-  vs_module_defs: 'perl.def',
 )

plugins/python/meson.build

@@ -28,5 +28,4 @@ shared_module('python', python3_source,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'python.def'
 )

plugins/python/python.py

@@ -146,7 +146,7 @@ class Plugin:
     def loadfile(self, filename):
         try:
             self.filename = filename
-            with open(filename, encoding='utf-8') as f:
+            with open(filename) as f:
                 data = f.read()
             compiled = compile_file(data, filename)
             exec(compiled, self.globals)

plugins/sysinfo/meson.build

@@ -57,5 +57,4 @@ shared_module('sysinfo', sysinfo_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'sysinfo.def',
 )

plugins/upd/meson.build

@@ -5,5 +5,4 @@ shared_module('upd', 'upd.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'upd.def',
 )

plugins/winamp/meson.build

@@ -3,5 +3,4 @@ shared_module('winamp', 'winamp.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'winamp.def',
 )

src/common/fe.h

@@ -69,16 +69,7 @@ int fe_input_add (int sok, int flags, void *func, void *data);
 void fe_input_remove (int tag);
 void fe_idle_add (void *func, void *data);
 void fe_set_topic (struct session *sess, char *topic, char *stripped_topic);
-typedef enum
-{
-	FE_COLOR_NONE = 0,
-	FE_COLOR_NEW_DATA = 1,
-	FE_COLOR_NEW_MSG = 2,
-	FE_COLOR_NEW_HILIGHT = 3,
-	FE_COLOR_FLAG_NOOVERRIDE = 8,
-} tabcolor;
-#define FE_COLOR_ALLFLAGS (FE_COLOR_FLAG_NOOVERRIDE)
-void fe_set_tab_color (struct session *sess, tabcolor col);
+void fe_set_tab_color (struct session *sess, int col);
 void fe_flash_window (struct session *sess);
 void fe_update_mode_buttons (struct session *sess, char mode, char sign);
 void fe_update_channel_key (struct session *sess);

src/common/hexchat.h

@@ -503,7 +503,7 @@ typedef struct server
 	char servername[128];			/* what the server says is its name */
 	char password[86];
 	char nick[NICKLEN];
-	char linebuf[8704];				/* RFC says 512 chars including \r\n, IRCv3 message tags add 8191, plus the NUL byte */
+	char linebuf[2048];				/* RFC says 512 chars including \r\n */
 	char *last_away_reason;
 	int pos;								/* current position in linebuf */
 	int nickcount;

src/common/meson.build

@@ -47,6 +47,7 @@ if host_machine.system() == 'windows'
   ]
   common_sysinfo_deps += [
     cc.find_library('wbemuuid'), # sysinfo
+    cc.find_library('wbemcore'),
   ]
 
   common_sources += 'sysinfo/win32/backend.c'

src/common/modes.c

@@ -67,8 +67,8 @@ send_channel_modes (session *sess, char *tbuf, char *word[], int wpos,
 	int usable_modes, orig_len, len, wlen, i, max;
 	server *serv = sess->server;
 
-	/* sanity check. IRC RFC says three per line but some servers may support less. */
-	if (serv->modes_per_line < 1)
+	/* sanity check. IRC RFC says three per line. */
+	if (serv->modes_per_line < 3)
 		serv->modes_per_line = 3;
 	if (modes_per_line < 1)
 		modes_per_line = serv->modes_per_line;
@@ -880,7 +880,7 @@ inbound_005 (server * serv, char *word[], const message_tags_data *tags_data)
 				g_free (serv->nick_prefixes);
 				g_free (serv->nick_modes);
 				serv->nick_prefixes = g_strdup (pre + 1);
-				serv->nick_modes = g_strdup (tokvalue + 1);
+				serv->nick_modes = g_strdup (tokvalue);
 			} else
 			{
 				/* bad! some ircds don't give us the modes. */

src/common/outbound.c

@@ -1579,26 +1579,9 @@ cmd_execw (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		EMIT_SIGNAL (XP_TE_NOCHILD, sess, NULL, NULL, NULL, NULL, 0);
 		return FALSE;
 	}
-	if (strcmp (word[2], "--") == 0)
-	{
-		len = strlen(word_eol[3]);
-		temp = g_strconcat (word_eol[3], "\n", NULL);
-		PrintText(sess, temp);
-	}
-	else
-	{
-		if (strcmp (word[2], "-q") == 0)
-		{
-			len = strlen(word_eol[3]);
-			temp = g_strconcat (word_eol[3], "\n", NULL);
-		}
-		else
-		{
-			len = strlen(word_eol[2]);
-			temp = g_strconcat (word_eol[2], "\n", NULL);
-			PrintText(sess, temp);
-		}
-	}
+	len = strlen(word_eol[2]);
+	temp = g_strconcat (word_eol[2], "\n", NULL);
+	PrintText(sess, temp);
 	write(sess->running_exec->myfd, temp, len + 1);
 	g_free(temp);
 
@@ -2169,6 +2152,7 @@ cmd_gui (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	{
 	case 0x058b836e: fe_ctrl_gui (sess, 8, 0); break; /* APPLY */
 	case 0xac1eee45: fe_ctrl_gui (sess, 7, 2); break; /* ATTACH */
+	case 0x05a72f63: fe_ctrl_gui (sess, 4, atoi (word[3])); break; /* COLOR */
 	case 0xb06a1793: fe_ctrl_gui (sess, 7, 1); break; /* DETACH */
 	case 0x05cfeff0: fe_ctrl_gui (sess, 3, 0); break; /* FLASH */
 	case 0x05d154d8: fe_ctrl_gui (sess, 2, 0); break; /* FOCUS */
@@ -2182,12 +2166,6 @@ cmd_gui (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		else
 			return FALSE;
 		break;
-	case 0x05a72f63: /* COLOR */
-		if (!g_ascii_strcasecmp (word[4], "-NOOVERRIDE"))
-			fe_ctrl_gui (sess, 4, FE_COLOR_FLAG_NOOVERRIDE | atoi (word[3]));
-		else
-			fe_ctrl_gui (sess, 4, atoi (word[3]));
-		break;
 	default:
 		return FALSE;
 	}
@@ -3898,6 +3876,34 @@ cmd_wallchop (struct session *sess, char *tbuf, char *word[],
 	return TRUE;
 }
 
+static int
+cmd_wallchan (struct session *sess, char *tbuf, char *word[],
+				  char *word_eol[])
+{
+	GSList *list;
+
+	if (*word_eol[2])
+	{
+		list = sess_list;
+		while (list)
+		{
+			sess = list->data;
+			if (sess->type == SESS_CHANNEL)
+			{
+				message_tags_data no_tags = MESSAGE_TAGS_DATA_INIT;
+
+				inbound_chanmsg (sess->server, NULL, sess->channel,
+									  sess->server->nick, word_eol[2], TRUE, FALSE, 
+									  &no_tags);
+				sess->server->p_message (sess->server, sess->channel, word_eol[2]);
+			}
+			list = list->next;
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static int
 cmd_hop (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
@@ -3994,7 +4000,7 @@ const struct commands xc_cmds[] = {
 	 N_("EXECKILL [-9], kills a running exec in the current session. If -9 is given the process is SIGKILL'ed")},
 #ifndef __EMX__
 	{"EXECSTOP", cmd_execs, 0, 0, 1, N_("EXECSTOP, sends the process SIGSTOP")},
-	{"EXECWRITE", cmd_execw, 0, 0, 1, N_("EXECWRITE [-q|--], sends data to the processes stdin; use -q flag to quiet/suppress output at text box; use -- flag to stop interpreting arguments as flags, needed if -q itself would occur as data")},
+	{"EXECWRITE", cmd_execw, 0, 0, 1, N_("EXECWRITE, sends data to the processes stdin")},
 #endif
 #endif
 #if 0
@@ -4009,9 +4015,8 @@ const struct commands xc_cmds[] = {
 	{"GETINT", cmd_getint, 0, 0, 1, "GETINT <default> <command> <prompt>"},
 	{"GETSTR", cmd_getstr, 0, 0, 1, "GETSTR <default> <command> <prompt>"},
 	{"GHOST", cmd_ghost, 1, 0, 1, N_("GHOST <nick> [password], Kills a ghosted nickname")},
-	{"GUI", cmd_gui, 0, 0, 1, "GUI [APPLY|ATTACH|DETACH|SHOW|HIDE|FOCUS|FLASH|ICONIFY]\n"
-									  "       GUI [MSGBOX <text>|MENU TOGGLE]\n"
-									  "       GUI COLOR <n> [-NOOVERRIDE]"},
+	{"GUI", cmd_gui, 0, 0, 1, "GUI [APPLY|ATTACH|DETACH|SHOW|HIDE|FOCUS|FLASH|ICONIFY|COLOR <n>]\n"
+									  "       GUI [MSGBOX <text>|MENU TOGGLE]"},
 	{"HELP", cmd_help, 0, 0, 1, 0},
 	{"HOP", cmd_hop, 1, 1, 1,
 	 N_("HOP <nick>, gives chanhalf-op status to the nick (needs chanop)")},
@@ -4136,6 +4141,8 @@ const struct commands xc_cmds[] = {
 	{"USERLIST", cmd_userlist, 1, 1, 1, 0},
 	{"VOICE", cmd_voice, 1, 1, 1,
 	 N_("VOICE <nick>, gives voice status to someone (needs chanop)")},
+	{"WALLCHAN", cmd_wallchan, 1, 1, 1,
+	 N_("WALLCHAN <message>, writes the message to all channels")},
 	{"WALLCHOP", cmd_wallchop, 1, 1, 1,
 	 N_("WALLCHOP <message>, sends the message to all chanops on the current channel")},
 	{0, 0, 0, 0, 0, 0}

src/common/plugin-timer.c

@@ -198,7 +198,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 		offset += 2;
 	}
 
-	timeout = g_ascii_strtod (word[2 + offset], NULL);
+	timeout = atof (word[2 + offset]);
 	command = word_eol[3 + offset];
 
 	if (timeout < 0.1 || timeout * 1000 > INT_MAX || !command[0])

src/common/proto-irc.c

@@ -503,6 +503,22 @@ process_numeric (session * sess, int n,
 
 		goto def;
 
+	case 4:	/* check the ircd type */
+		serv->use_listargs = FALSE;
+		serv->modes_per_line = 3;		/* default to IRC RFC */
+		if (strncmp (word[5], "bahamut", 7) == 0)				/* DALNet */
+		{
+			serv->use_listargs = TRUE;		/* use the /list args */
+		} else if (strncmp (word[5], "u2.10.", 6) == 0)		/* Undernet */
+		{
+			serv->use_listargs = TRUE;		/* use the /list args */
+			serv->modes_per_line = 6;		/* allow 6 modes per line */
+		} else if (strncmp (word[5], "glx2", 4) == 0)
+		{
+			serv->use_listargs = TRUE;		/* use the /list args */
+		}
+		goto def;
+
 	case 5:
 		inbound_005 (serv, word, tags_data);
 		goto def;
@@ -627,7 +643,7 @@ process_numeric (session * sess, int n,
 	case 320:	/* :is an identified user */
 		if (!serv->skip_next_whois)
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS_ID, whois_sess, word[4],
-										  word_eol[5][0] == ':' ? word_eol[5] + 1 : word_eol[5], NULL, NULL, 0,
+										  word_eol[5] + 1, NULL, NULL, 0,
 										  tags_data->timestamp);
 		break;
 

src/common/server.c

@@ -362,7 +362,7 @@ server_read (GIOChannel *source, GIOCondition condition, server *serv)
 				serv->linebuf[serv->pos] = lbuf[i];
 				if (serv->pos >= (sizeof (serv->linebuf) - 1))
 					fprintf (stderr,
-								"*** HEXCHAT WARNING: Buffer overflow - non-compliant server!\n");
+								"*** HEXCHAT WARNING: Buffer overflow - shit server!\n");
 				else
 					serv->pos++;
 			}
@@ -772,7 +772,7 @@ server_connect_success (server *serv)
 
 		/* it'll be a memory leak, if connection isn't terminated by
 		   server_cleanup() */
-		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify)))
+		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))
 		{
 			EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
 							 NULL, NULL, 0);
@@ -1559,7 +1559,7 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 	if (!hostname[0])
 		return;
 
-	if (port < 1 || port > 65535)
+	if (port < 0)
 	{
 		/* use default port for this server type */
 		port = 6667;
@@ -1567,8 +1567,8 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 		if (serv->use_ssl)
 			port = 6697;
 #endif
-		g_debug ("Attempted to connect to invalid port, assuming default port %d", port);
 	}
+	port &= 0xffff;	/* wrap around */
 
 	if (serv->connected || serv->connecting || serv->recondelay_tag)
 		server_disconnect (sess, TRUE, -1);
@@ -1770,7 +1770,6 @@ server_set_defaults (server *serv)
 	serv->chanmodes = g_strdup ("beI,k,l");
 	serv->nick_prefixes = g_strdup ("@%+");
 	serv->nick_modes = g_strdup ("ohv");
-	serv->modes_per_line = 3; /* https://datatracker.ietf.org/doc/html/rfc1459#section-4.2.3.1 */
 	serv->sasl_mech = MECH_PLAIN;
 
 	if (!serv->encoding)
@@ -1779,7 +1778,6 @@ server_set_defaults (server *serv)
 	serv->nickcount = 1;
 	serv->end_of_motd = FALSE;
 	serv->sent_capend = FALSE;
-	serv->use_listargs = FALSE;
 	serv->is_away = FALSE;
 	serv->supports_watch = FALSE;
 	serv->supports_monitor = FALSE;

src/common/servlist.c

@@ -187,9 +187,6 @@ static const struct defaultserver def[] =
 	{"Interlinked", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.interlinked.me"},
 
-	{"Irc-Nerds", 0, 0, 0, LOGIN_SASL, 0, TRUE},
-	{0,			"irc.irc-nerds.net"},
-	
 	{"IRC4Fun", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,				"irc.irc4fun.net"},
 

src/common/ssl.c

@@ -321,22 +321,23 @@ _SSL_socket (SSL_CTX *ctx, int sd)
 
 
 char *
-_SSL_set_verify (SSL_CTX *ctx, void *verify_callback)
+_SSL_set_verify (SSL_CTX *ctx, void *verify_callback, char *cacert)
 {
-#ifdef DEFAULT_CERT_FILE
-	if (!SSL_CTX_load_verify_locations (ctx, DEFAULT_CERT_FILE, NULL))
-	{
-		__SSL_fill_err_buf ("SSL_CTX_load_verify_locations");
-		return (err_buf);
-	}
-#else
 	if (!SSL_CTX_set_default_verify_paths (ctx))
 	{
 		__SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths");
 		return (err_buf);
 	}
-#endif
-
+/*
+	if (cacert)
+	{
+		if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL))
+		{
+			__SSL_fill_err_buf ("SSL_CTX_load_verify_locations");
+			return (err_buf);
+		}
+	}
+*/
 	SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback);
 
 	return (NULL);

src/common/ssl.h

@@ -45,7 +45,7 @@ SSL_CTX *_SSL_context_init (void (*info_cb_func));
 #define _SSL_context_free(a)	SSL_CTX_free(a);
 
 SSL *_SSL_socket (SSL_CTX *ctx, int sd);
-char *_SSL_set_verify (SSL_CTX *ctx, void *(verify_callback));
+char *_SSL_set_verify (SSL_CTX *ctx, void *(verify_callback), char *cacert);
 /*
     int SSL_connect(SSL *);
     int SSL_accept(SSL *);

src/common/sysinfo/win32/backend.c

@@ -84,8 +84,7 @@ sysinfo_get_cpu_arch (void)
 
 	GetNativeSystemInfo (&si);
 
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
-		si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
 	{
 		return cpu_arch = 64;
 	}
@@ -107,8 +106,7 @@ sysinfo_get_build_arch (void)
 
 	GetSystemInfo (&si);
 
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
-		si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
 	{
 		return build_arch = 64;
 	}

src/fe-gtk/fe-gtk.c

@@ -664,13 +664,13 @@ fe_print_text (struct session *sess, char *text, time_t stamp,
 		return;
 
 	if (sess == current_tab)
-		fe_set_tab_color (sess, FE_COLOR_NONE);
+		fe_set_tab_color (sess, 0);
 	else if (sess->tab_state & TAB_STATE_NEW_HILIGHT)
-		fe_set_tab_color (sess, FE_COLOR_NEW_HILIGHT);
+		fe_set_tab_color (sess, 3);
 	else if (sess->tab_state & TAB_STATE_NEW_MSG)
-		fe_set_tab_color (sess, FE_COLOR_NEW_MSG);
+		fe_set_tab_color (sess, 2);
 	else
-		fe_set_tab_color (sess, FE_COLOR_NEW_DATA);
+		fe_set_tab_color (sess, 1);
 }
 
 void
@@ -1054,46 +1054,6 @@ osx_show_uri (const char *url)
 
 #endif
 
-static inline char *
-escape_uri (const char *uri)
-{
-	return g_uri_escape_string(uri, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, FALSE);
-}
-
-static inline gboolean
-uri_contains_forbidden_characters (const char *uri)
-{
-	while (*uri)
-	{
-		/* This is not an exhaustive list, the full URI has segments that allow characters like "[]:" for example. */
-		if (strchr ("`<> ${}\"+", *uri) != NULL || (*uri & 0x80) /* non-ascii */)
-			return TRUE;
-		uri++;
-	}
-
-	return FALSE;
-}
-
-static char *
-maybe_escape_uri (const char *uri)
-{
-	/* The only way to know if a string has already been escaped or not
-	 * is by fulling parsing each segement but we can try some more simple heuristics. */
-
-	/* If we find characters that should clearly be escaped. */
-	if (uri_contains_forbidden_characters (uri))
-		return escape_uri (uri);
-
-	/* If it fails to be unescaped then it was not escaped. */
-	char *unescaped = g_uri_unescape_string (uri, NULL);
-	if (!unescaped)
-		return escape_uri (uri);
-	g_free (unescaped);
-
-	/* At this point it is probably safe to pass through as-is. */
-	return g_strdup (uri);
-}
-
 static void
 fe_open_url_inner (const char *url)
 {
@@ -1111,8 +1071,8 @@ fe_open_url_inner (const char *url)
 #elif defined(__APPLE__)
     osx_show_uri (url);
 #else
-	char *escaped_url = maybe_escape_uri (url);
-	g_debug ("Opening URL \"%s\" (%s)", escaped_url, url);
+	char *escaped_url = g_uri_escape_string (url, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS,
+	                                         FALSE);
 	gtk_show_uri (NULL, escaped_url, GDK_CURRENT_TIME, NULL);
 	g_free (escaped_url);
 #endif

src/fe-gtk/maingui.c

@@ -175,26 +175,20 @@ fe_flash_window (session *sess)
 /* set a tab plain, red, light-red, or blue */
 
 void
-fe_set_tab_color (struct session *sess, tabcolor col)
+fe_set_tab_color (struct session *sess, int col)
 {
 	struct session *server_sess = sess->server->server_session;
-	int col_noflags = (col & ~FE_COLOR_ALLFLAGS);
-	int col_shouldoverride = !(col & FE_COLOR_FLAG_NOOVERRIDE);
-
 	if (sess->res->tab && sess->gui->is_tab && (col == 0 || sess != current_tab))
 	{
-		switch (col_noflags)
+		switch (col)
 		{
 		case 0:	/* no particular color (theme default) */
 			sess->tab_state = TAB_STATE_NONE;
 			chan_set_color (sess->res->tab, plain_list);
 			break;
 		case 1:	/* new data has been displayed (dark red) */
-			if (col_shouldoverride || !((sess->tab_state & TAB_STATE_NEW_MSG)
-										|| (sess->tab_state & TAB_STATE_NEW_HILIGHT))) {
-				sess->tab_state = TAB_STATE_NEW_DATA;
-				chan_set_color (sess->res->tab, newdata_list);
-			}
+			sess->tab_state = TAB_STATE_NEW_DATA;
+			chan_set_color (sess->res->tab, newdata_list);
 
 			if (chan_is_collapsed (sess->res->tab)
 				&& !((server_sess->tab_state & TAB_STATE_NEW_MSG)
@@ -207,10 +201,8 @@ fe_set_tab_color (struct session *sess, tabcolor col)
 
 			break;
 		case 2:	/* new message arrived in channel (light red) */
-			if (col_shouldoverride || !(sess->tab_state & TAB_STATE_NEW_HILIGHT)) {
-				sess->tab_state = TAB_STATE_NEW_MSG;
-				chan_set_color (sess->res->tab, newmsg_list);
-			}
+			sess->tab_state = TAB_STATE_NEW_MSG;
+			chan_set_color (sess->res->tab, newmsg_list);
 
 			if (chan_is_collapsed (sess->res->tab)
 				&& !(server_sess->tab_state & TAB_STATE_NEW_HILIGHT)
@@ -548,7 +540,7 @@ mg_focus (session *sess)
 	/* when called via mg_changui_new, is_tab might be true, but
 		sess->res->tab is still NULL. */
 	if (sess->res->tab)
-		fe_set_tab_color (sess, FE_COLOR_NONE);
+		fe_set_tab_color (sess, 0);
 }
 
 static int

src/fe-gtk/notifications/notification-freedesktop.c

@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <gio/gio.h>
 
 static GDBusProxy *fdo_notifications;
@@ -56,7 +55,7 @@ notification_backend_show (const char *title, const char *text)
     g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
     g_variant_builder_add (&params, "s", "hexchat"); /* App name */
     g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
-    g_variant_builder_add (&params, "s", "io.github.Hexchat"); /* App icon */
+    g_variant_builder_add (&params, "s", ""); /* App icon (set from hints instead) */
     g_variant_builder_add (&params, "s", title);
     g_variant_builder_add (&params, "s", text);
     g_variant_builder_add (&params, "as", NULL); /* Actions */

src/fe-text/fe-text.c

@@ -623,7 +623,7 @@ fe_cleanup (void)
 {
 }
 void
-fe_set_tab_color (struct session *sess, tabcolor col)
+fe_set_tab_color (struct session *sess, int col)
 {
 }
 void

src/libenchant_win8/meson.build

@@ -0,0 +1,7 @@
+shared_module('enchant_win8',
+  sources: 'win8_provider.cpp',
+  dependencies: [libgio_dep, dependency('enchant-2')],
+  include_directories: config_h_include,
+  install: true,
+  install_dir: get_option('libdir') / 'enchant-2',
+)

src/libenchant_win8/win8_provider.cpp

@@ -22,14 +22,15 @@
 
 #include "config.h"
 
-#include <Spellcheck.h>
+#ifdef _MSC_VER
+#include "typedef.h" // for ssize_t
+#endif
+
+#include <spellcheck.h>
 #include <glib.h>
 
-#include "typedef.h" // for ssize_t
 #include <enchant-provider.h>
 
-ENCHANT_PLUGIN_DECLARE ("win8")
-
 /* --------- Utils ----------*/
 
 static char *
@@ -232,12 +233,6 @@ win8_provider_list_dicts (EnchantProvider *provider, size_t *out_n_dicts)
 	return enumstring_to_chararray (dicts, out_n_dicts, TRUE);
 }
 
-static void
-win8_provider_free_string_list (EnchantProvider *provider, char **str_list)
-{
-	g_strfreev (str_list);
-}
-
 static void
 win8_provider_dispose (EnchantProvider *provider)
 {
@@ -283,7 +278,6 @@ init_enchant_provider (void)
 	provider->identify = win8_provider_identify;
 	provider->describe = win8_provider_describe;
 	provider->list_dicts = win8_provider_list_dicts;
-	provider->free_string_list = win8_provider_free_string_list;
 
 	provider->user_data = factory;
 

src/meson.build

@@ -2,6 +2,10 @@ subdir('common')
 
 if get_option('gtk-frontend')
   subdir('fe-gtk')
+
+  if host_machine.system() == 'windows'
+    subdir('libenchant_win8')
+  endif
 endif
 
 if get_option('text-frontend')

win32/copy/copy.vcxproj

@@ -40,8 +40,7 @@
     <None Include="$(DepsRoot)\bin\gthread-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />
     <None Include="$(DepsRoot)\bin\iconv.dll" />
-    <None Include="$(DepsRoot)\bin\libcrypto*.dll" />
-    <None Include="$(DepsRoot)\bin\libssl*.dll" />
+    <None Include="$(DepsRoot)\bin\libeay32.dll" />
     <None Include="$(DepsRoot)\bin\libenchant.dll" />
     <None Include="$(DepsRoot)\bin\ffi-7.dll" />
     <None Include="$(DepsRoot)\bin\intl.dll" />
@@ -51,6 +50,7 @@
     <None Include="$(DepsRoot)\bin\pangocairo-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\pangoft2-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\pangowin32-1.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\ssleay32.dll" />
     <None Include="$(DepsRoot)\bin\zlib1.dll" />
     <None Include="$(WinSparklePath)\WinSparkle.dll" />
     <None Include="$(HexChatBin)thememan.exe" />

win32/hexchat.props

@@ -15,7 +15,7 @@
 
 		<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->
 		<!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way -->
-		<OwnFlags>GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_X509_GET_SIGNATURE_NID;HAVE_SSL_CTX_GET_SSL_METHOD;DEFAULT_CERT_FILE="cert.pem";HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
+		<OwnFlags>GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
 		<!-- FIXME: Add ability to use debug builds -->
 		<DepsRoot>$(YourDepsPath)\$(PlatformName)\release</DepsRoot>
 		<GendefPath>$(YourGendefPath)</GendefPath>
@@ -33,7 +33,7 @@
 		<LuaLib>lua51</LuaLib>
 		<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
 		<Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-		<DepLibs>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;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libcrypto.lib;libssl.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
+		<DepLibs>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;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
 		<DataDir>$(SolutionDir)..\data\\</DataDir>
 		<HexChatBuild>$(SolutionDir)..\..\hexchat-build</HexChatBuild>
 		<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

win32/installer/hexchat.iss.tt

@@ -138,13 +138,7 @@ Source: "gspawn-win32-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversio
 Source: "gthread-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-#if APPARCH == "x64"
-Source: "libcrypto-1_1-x64.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "libssl-1_1-x64.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-#else
-Source: "libcrypto-1_1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "libssl-1_1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-#endif
+Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "ffi-7.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "intl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -154,6 +148,7 @@ Source: "pango-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: l
 Source: "pangocairo-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "pangoft2-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "pangowin32-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 
 Source: "plugins\hcnotifications-winrt.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: libs