fixup! Use glib WIN32 defines

.gitignore

@@ -1,5 +1,4 @@
 /build
-builddir/
 doxygen*.tmp
 html/
 *.patch

data/hexchat.gresource.xml

@@ -11,7 +11,6 @@
 		<file alias="ulist_founder.png" preprocess="to-pixdata">icons/ulist_founder.png</file>
 		<file alias="ulist_netop.png" preprocess="to-pixdata">icons/ulist_netop.png</file>
 
-		<file alias="tray_normal.png" preprocess="to-pixdata">icons/hexchat.png</file>
 		<file alias="tray_fileoffer.png" preprocess="to-pixdata">icons/tray_fileoffer.png</file>
 		<file alias="tray_highlight.png" preprocess="to-pixdata">icons/tray_highlight.png</file>
 		<file alias="tray_message.png" preprocess="to-pixdata">icons/tray_message.png</file>

data/misc/hexchat.appdata.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>io.github.Hexchat.desktop</id>
+  <id>hexchat.desktop</id>
   <name>HexChat</name>
   <developer_name>HexChat</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
@@ -22,38 +22,7 @@
       <caption>Main Chat Window</caption>
     </screenshot>
   </screenshots>
-  <provides>
-    <!-- Renamed from this -->
-    <id>hexchat.desktop</id>
-  </provides>
   <releases>
-    <release date="2018-03-10" version="2.14.0">
-      <description>
-        <p>This is largely a bug fix release though it has some large behind the scenes changes:</p>
-        <ul>
-          <li>Rename data files to use *io.github.Hexchat* name</li>
-          <li>Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect</li>
-          <li>Add ability to set custom tray icon separate of app icon</li>
-          <li>Fix Enchant 2.0+ support</li>
-          <li>Fix input box theming with Adwaita-dark</li>
-          <li>Fix custom sounds not respecting omit if away option</li>
-          <li>Fix detecting if a tray doesn't exist on x11</li>
-          <li>Fix cutting off ctcp text after ending \01</li>
-          <li>Fix /ignore not accepting full hosts</li>
-          <li>Fix characters getting cut off when their width changes</li>
-          <li>Fix various possible crashes</li>
-          <li>Change preference window to be scroll-able</li>
-          <li>Remove ctrl+w binding by default</li>
-          <li>doat: Fix channels with / in them</li>
-          <li>fishlim: Fix key exchange</li>
-          <li>fishlim: Fix building against LibreSSL</li>
-          <li>sysinfo: Fix pci.ids file not being found on some distros</li>
-          <li>sysinfo: Make libpci optional</li>
-          <li>lua: Avoid loading the same script multiple times</li>
-          <li>Update translations</li>
-        </ul>
-      </description>
-    </release>
     <release date="2016-12-10" version="2.12.4">
       <description>
         <p>This is another bug fix release:</p>

data/misc/hexchat.desktop.in.in

@@ -9,7 +9,6 @@ Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;
 StartupNotify=true
-StartupWMClass=Hexchat
 X-GNOME-UsesNotifications=true
 MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
 Actions=SafeMode;

data/misc/meson.build

@@ -3,17 +3,17 @@ desktop_utils = find_program('desktop-file-validate', required: false)
 
 if get_option('with-gtk')
   hexchat_appdata = i18n.merge_file(
-    input: 'io.github.Hexchat.appdata.xml.in',
-    output: 'io.github.Hexchat.appdata.xml',
+    input: 'hexchat.appdata.xml.in',
+    output: 'hexchat.appdata.xml',
     po_dir: '../../po',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
+    install_dir: join_paths(get_option('datadir'), 'appdata')
   )
 
   appstream_util = find_program('appstream-util', required: false)
   if appstream_util.found()
-    test('Validate io.github.Hexchat.appdata.xml', appstream_util,
-      args: ['validate-relax', hexchat_appdata]
+    test('Validate hexchat.appdata.xml', appstream_util,
+      args: ['validate', hexchat_appdata]
     )
   endif
 
@@ -25,14 +25,14 @@ if get_option('with-gtk')
   endif
 
   desktop_file = configure_file(
-    input: 'io.github.Hexchat.desktop.in.in',
-    output: 'io.github.Hexchat.desktop.in',
+    input: 'hexchat.desktop.in.in',
+    output: 'hexchat.desktop.in',
     configuration: desktop_conf
   )
 
   hexchat_desktop = i18n.merge_file(
     input: desktop_file,
-    output: 'io.github.Hexchat.desktop',
+    output: 'hexchat.desktop',
     po_dir: '../../po',
     type: 'desktop',
     install: true,
@@ -40,7 +40,7 @@ if get_option('with-gtk')
   )
 
   if desktop_utils.found()
-    test('Validate io.github.Hexchat.desktop', desktop_utils,
+    test('Validate hexchat.desktop', desktop_utils,
       args: [hexchat_desktop]
     )
   endif
@@ -48,8 +48,8 @@ endif
 
 if get_option('with-theme-manager')
   htm_desktop = i18n.merge_file(
-    input: 'io.github.Hexchat.ThemeManager.desktop.in',
-    output: 'io.github.Hexchat.ThemeManager.desktop',
+    input: 'htm.desktop.in',
+    output: 'htm.desktop',
     po_dir: '../../po',
     type: 'desktop',
     install: true,
@@ -57,12 +57,12 @@ if get_option('with-theme-manager')
   )
 
   if desktop_utils.found()
-    test('Validate io.github.Hexchat.ThemeManager.desktop', desktop_utils,
+    test('Validate htm.desktop', desktop_utils,
       args: [htm_desktop]
     )
   endif
 
-  install_data('io.github.Hexchat.ThemeManager.xml',
+  install_data('htm-mime.xml',
     install_dir: join_paths(get_option('datadir'), 'mime/packages')
   )
 endif

fedora-mingw64.ini

@@ -7,6 +7,9 @@ ar = '/usr/bin/x86_64-w64-mingw32-gcc-ar'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 
+[properties]
+c_args = ['-DNTDDI_VERSION=NTDDI_WIN7', '-D_WIN32_WINNT=_WIN32_WINNT_WIN7']
+
 [host_machine]
 system = 'windows'
 cpu_family = 'x86_64'

meson.build

@@ -1,6 +1,6 @@
 project('hexchat', 'c',
-  version: '2.14.0',
-  meson_version: '>= 0.38.0',
+  version: '2.12.4',
+  meson_version: '>= 0.37.0',
   default_options: [
     'c_std=gnu89',
     'buildtype=debugoptimized',
@@ -15,7 +15,6 @@ cc = meson.get_compiler('c')
 
 libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
 libgmodule_dep = dependency('gmodule-2.0')
-global_deps = []
 if cc.get_id() == 'msvc'
   libssl_dep = cc.find_library('libeay32')
 else
@@ -76,19 +75,9 @@ endif
 configure_file(output: 'config.h', configuration: config_h)
 config_h_include = include_directories('.')
 
-if host_machine.system() == 'windows'
-  add_project_arguments(
-    '-DWIN32',
-    '-DNTDDI_VERSION=NTDDI_WIN7',
-    '-D_WIN32_WINNT=_WIN32_WINNT_WIN7',
-     language: 'c')
-endif
-
-
 global_cflags = []
 test_cflags = [
   '-pipe',
-  '-fPIE',
   '-funsigned-char',
   '-Wno-conversion',
   '-Wno-pointer-sign',
@@ -118,10 +107,6 @@ if get_option('buildtype') != 'plain'
      }
      ''', args: '-fstack-protector-all')
     global_cflags += '-fstack-protector-strong'
-
-    if host_machine.system() == 'windows'
-      global_deps += cc.find_library('ssp')
-    endif
   endif
 endif
 add_project_arguments(global_cflags, language: 'c')
@@ -131,10 +116,6 @@ global_ldflags = []
 test_ldflags = [
   '-Wl,-z,relro',
   '-Wl,-z,now',
-  '-Wl,-pie',
-  # mingw
-  '-Wl,--dynamicbase',
-  '-Wl,--nxcompat',
 ]
 foreach ldflag : test_ldflags
   if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag)

meson_options.txt

@@ -25,9 +25,6 @@ option('with-libcanberra', type: 'boolean',
 option('with-theme-manager', type: 'boolean', value: false,
   description: 'Utility to help manage themes, requires mono/.net'
 )
-option('dbus-service-use-appid', type: 'boolean', value: false,
-  description: 'Rename dbus service to match app-id, required for Flatpak'
-)
 
 # Plugins
 option('with-checksum', type: 'boolean',

plugins/checksum/checksum.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_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;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/exec/exec.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -38,7 +38,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/fishlim/dh1080.c

@@ -189,12 +189,10 @@ dh1080_compute_key (const char *priv_key, const char *pub_key, char **secret_key
 	char *pub_key_data;
 	gsize pub_key_len;
 	BIGNUM *pk;
-	DH *dh;
-#ifdef HAVE_DH_SET0_KEY
 	BIGNUM *temp_pub_key = BN_new();
-#endif
+	DH *dh;
 
-	g_assert (secret_key != NULL);
+  	g_assert (secret_key != NULL);
 
 	/* Verify base64 strings */
 	if (strspn (priv_key, B64ABC) != strlen (priv_key)
@@ -215,7 +213,7 @@ dh1080_compute_key (const char *priv_key, const char *pub_key, char **secret_key
 		int shared_len;
 		BIGNUM *priv_key_num;
 
-		priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len);
+	  	priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len);
 		priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL);
 #ifndef HAVE_DH_SET0_KEY
 		dh->priv_key = priv_key_num;
@@ -228,7 +226,7 @@ dh1080_compute_key (const char *priv_key, const char *pub_key, char **secret_key
 		*secret_key = dh1080_encode_b64 (sha256, sizeof(sha256));
 
 		OPENSSL_cleanse (priv_key_data, priv_key_len);
-		g_free (priv_key_data);
+	  	g_free (priv_key_data);
 	}
 
 	BN_free (pk);

plugins/fishlim/fishlim.vcxproj

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

plugins/lua/lua.vcxproj

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

plugins/mpcinfo/functions.c

@@ -0,0 +1,156 @@
+/*
+ *  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
+ */
+
+#include <glib.h>
+
+char *split(char *text, char separator)
+{
+	int pos = -1;
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
+	{
+		if (text[i] == separator) {
+			pos = i;
+			i = strlen(text) + 1;
+		}
+	}
+
+	if (pos == -1)
+	{
+		return text;
+	}
+
+	text[pos] = 0;
+	return &(text[pos + 1]);
+}
+
+int endsWith(char *text, char *suffix){
+    char *tmp=strstr(text,suffix);
+    if (tmp==NULL) return 0;
+    if (strlen(tmp)==strlen(suffix)) return 1;
+    return 0;
+}
+
+int inStr(char *s1, size_t sl1, char *s2)
+{
+	size_t i;
+	for (i = 0; i < sl1 - strlen(s2); i++)
+	{
+		size_t j;
+		for (j = 0; j < strlen(s2); j++)
+		{
+			if (s1[i + j] != s2[j])
+			{
+				j = strlen(s2) + 2;
+			}
+		}
+
+		if (j == strlen(s2))
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+static char *subString(char *text, int first, int length, int spcKill){
+//if (DEBUG==1) putlog("creating substring");
+	char *ret = g_new (char, length + 1);
+	int i;
+	ret[length]=0;
+	for (i=0;i<length;i++){
+		ret[i]=text[i+first];
+		//if (ret[i]==0) ret[i]='0';
+	}
+	if (spcKill==1){
+	   for (i=length-1;i>=0;i--){
+           if (ret[i]==32) ret[i]=0;
+           else i=-1;
+       }
+    }
+    //if (DEBUG==1) putlog("substring created");
+	return ret;
+}
+
+static char *substring(char *text, int first, int length){return subString(text,first,length,0);}
+
+
+char *readLine(FILE *f){
+     //if (DEBUG==1) putlog("reading line from file");
+     char *buffer = g_new (char, 1024);
+     int pos=0;
+     int cc=0;
+     while((cc!=EOF)&&(pos<1024)&&(cc!=10)){
+          cc=fgetc(f);
+          if ((cc!=10)&&(cc!=13)){
+             if (cc==EOF) buffer[pos]=0;
+             else buffer[pos]=(char)cc;pos++;
+          }
+     }
+     if (buffer[pos]==EOF) hexchat_printf(ph,"EOF: %i\n",pos);
+     return buffer;
+}
+
+char *toUpper(char *text)
+{
+	char *ret = (char*) calloc(strlen(text) + 1, sizeof(char));
+
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
+	{
+		ret[i] = toupper(text[i]);
+	}
+
+	ret[strlen(text)] = 0;
+
+	return ret;
+}
+
+static char *str3cat(char *s1, char *s2, char *s3){
+       //if (DEBUG==1) putlog("cating 3 strings");
+       char *ret=(char*)calloc(strlen(s1)+strlen(s2)+strlen(s3)+1,sizeof(char));
+       strcpy(ret,s1);strcat(ret,s2);strcat(ret,s3);
+       ret[strlen(s1)+strlen(s2)+strlen(s3)]=0;
+       //if (DEBUG==1) putlog("strings cated");
+       return ret;
+}
+
+char *replace(char *text, char *from, char *to){
+     //if (DEBUG==1) putlog("replacing");
+     char *ret=(char*)calloc( strlen(text)+(strlen(to)-strlen(from)),sizeof(char));
+     char *left;
+     char *right;
+     int pos=inStr(text,strlen(text),from);
+     if (pos!=-1){
+           left=substring(text,0,pos);
+           right=substring(text,pos+strlen(from),strlen(text)-(pos+strlen(from)));          
+           ret=str3cat(left,to,right);
+           return replace(ret,from,to);
+     }
+     //if (DEBUG==1) putlog("replaced");
+     return text;
+}
+
+char *intReplaceF(char *text, char *from, int to, char *form){
+     //if (DEBUG==1) putlog("replaceF");
+     char *buffer=(char*) calloc(16,sizeof(char));
+     sprintf(buffer,form,to);
+     //if (DEBUG==1) putlog("replaceF done");
+     return replace(text,from,buffer);
+}
+
+char *intReplace(char *text, char *from, int to){return intReplaceF(text,from,to,"%i");}

plugins/mpcinfo/mp3Info.c

@@ -0,0 +1,334 @@
+/*
+ *  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
+ */
+
+//#include <stdio.h>
+#include <sys/stat.h>
+//#include "functions.c"
+
+struct tagInfo{
+	int mode;
+	int cbr;
+	int bitrate;
+	unsigned int freq;
+	char *artist;
+	char *title;
+	char *album;
+	char *comment;
+	char *genre;
+	//int genre;
+	//int track;
+};
+
+static int RATES[2][3][15]={
+				{//mpeg2
+                    {-1,8,16,24,32,64,80,56,64,128,160,112,128,256,320},//layer3 (V2)    
+					{-1,32,48,56,64,80,96,112,128,160,192,224,256,320,384},//layer2 (V2)
+					{-1,32,64,96,128,160,192,224,256,288,320,352,384,416,448},//layer1 (V2)
+                },
+                {//mpeg1
+					{-1,32,40,48,56,64,80,96,112,128,160,192,224,256,320},//layer3 (V1)
+					{-1,32,48,56,64,80,96,112,128,160,192,224,256,320,384},//layer2 (V1)
+                    {-1,32,64,96,128,160,192,224,256,288,320,352,384,416,448},//layer1 (V1)
+        }};
+static int FREQS[2][4]={{22050,24000,16000,-1},{44100,48000,32000,-1}};
+//static double FRATES[]={38.5,32.5,27.8,0.0};
+
+static char GENRES[][50]={"Blues","Classic Rock","Country","Dance","Disco","Funk","Grunge","Hip-Hop","Jazz","Metal",
+"New Age","Oldies","Other","Pop","R&B","Rap","Reggae","Rock","Techno","Industrial",
+"Alternative","Ska","Death Metal","Pranks","Soundtrack","Euro-Techno","Ambient","Trip-Hop","Vocal","Jazz+Funk",
+"Fusion","Trance","Classical","Instrumental","Acid","House","Game","Sound Clip","Gospel","Noise",
+"AlternRock","Bass","Soul","Punk","Space","Meditative","Instrumental Pop","Instrumental Rock","Ethnic","Gothic",
+"Darkwave","Techno-Industrial","Electronic","Pop-Folk","Eurodance","Dream","Southern Rock","Comedy","Cult","Gangsta",
+"Top 40","Christian Rap","Pop/Funk","Jungle","Native American","Cabaret","New Wave","Psychadelic","Rave","Showtunes",
+"Trailer","Lo-Fi","Tribal","Acid Punk","Acid Jazz","Polka","Retro","Musical","Rock & Roll","Hard Rock",
+
+//################## END OF OFFICIAL ID3 TAGS, WINAMP TAGS BELOW ########################################
+
+"Folk","Folk/Rock","National Folk","Swing","Fast Fusion","Bebob","Latin","Revival","Celtic","Bluegrass",
+"Avantgarde","Gothic Rock","Progressive Rock","Psychedelic Rock","Symphonic Rock","Slow Rock","Big Band","Chorus","Easy Listening","Acoustic",
+"Humour","Speech","Chanson","Opera","Chamber Music","Sonata","Symphony","Booty Bass","Primus","Porn Groove",
+"Satire","Slow Jam","Club","Tango","Samba","Folklore","Ballad","Poweer Ballad","Rhytmic Soul","Freestyle",
+"Duet","Punk Rock","Drum Solo","A Capela","Euro-House","Dance Hall",
+
+//################## FOUND AT http://en.wikipedia.org/wiki/ID3 ###########################################
+
+"Goa","Drum & Bass","Club-House","Hardcore",
+"Terror","Indie","BritPop","Negerpunk","Polsk Punk","Beat","Christian Gangsta Rap","Heavy Metal","Black Metal","Crossover",
+"Contemporary Christian","Christian Rock","Merengue","Salsa","Thrash Metal","Anime","JPop","Synthpop"
+
+};
+
+static char MODES [][13]={"Stereo","Joint-Stereo","Dual-Channel","Mono"};
+
+int iPow(int x, int y){return (int)(pow((double)x,(double) y));}
+
+int str2int(char *text)
+{
+	int ret = 0;
+
+	size_t i;
+	for (i = 1; i <= strlen(text); i++)
+	{
+		if ((text[strlen(text) - i] > 57) || (text[strlen(text) - i] < 48))
+		{
+			hexchat_printf(ph, "invalid char in string: %i", (int) text[strlen(text) - i]);
+			return 255;
+		}
+
+		ret += ((int) text[strlen(text) - i] - 48)*iPow(10, i - 1);
+	}
+
+	return ret;
+}
+
+static char *tagExtract(char *tag, int tagLen, char* info){
+//if (DEBUG==1) putlog("extracting tag");
+	int pos, len, i;
+	pos=inStr(tag,tagLen,info);
+//hexchat_printf(ph,"pos=%i",pos);
+	if (pos==-1) return "";//NULL;
+	//printf("position of %s = %i\n",info,pos);
+	len=0;
+	//for (i=pos;i<pos+10;i++)printf("tag[%i]=%i \n",i,tag[i]);
+	for (i=0;i<4;i++) {
+		len+=tag[pos+strlen(info)+i]*iPow(255,3-i);
+	}
+	//printf("Tag-Length: %i\n",len);
+	if (strcmp("COMM",info)!=0) return substring(tag,pos+7+strlen(info),len-1);//11
+	return substring(tag,pos+7+strlen(info),len-1);//11
+	//char *ct=substring(tag,pos+7+strlen(info),len-1);//11
+	//return substring(ct,strlen(ct)+1,len-1-strlen(ct)); //<-- do not understand, what i did here :(
+	
+}
+
+struct tagInfo readID3V1(char *file){
+//if (DEBUG==1) putlog("reading ID3V1");
+	FILE *f;
+	struct tagInfo ret;
+	int res, i, c, val;
+	char *tag;
+	char *id;
+	char *tmp;
+	ret.artist=NULL;
+	f=fopen(file,"rb");
+	if (f==NULL){
+       hexchat_print(ph,"file not found while trying to read id3v1");
+       //if (DEBUG==1) putlog("file not found while trying to read id3v1");
+       return ret;
+    }
+	//int offset=getSize(file)-128;
+	res=fseek(f,-128,SEEK_END);
+	if (res!=0) {printf("seek failed\n");fclose(f);return ret;}
+	tag = (char*) malloc(sizeof(char)*129);
+	//long int pos=ftell(f);
+	//printf("position= %li\n",pos);
+	for (i=0;i<128;i++) {
+		c=fgetc(f);
+		if (c==EOF) {hexchat_printf(ph,"read ID3V1 failed\n");fclose(f);free(tag);return ret;}
+		tag[i]=(char)c;
+	}
+	fclose(f);
+	//printf("tag readed: \n");
+	id=substring(tag,0,3);
+	//printf("header: %s\n",id);
+	res=strcmp(id,"TAG");
+	free(id);
+	if (res!=0){hexchat_printf(ph,"no id3 v1 found\n");free(tag);return ret;}
+	ret.title=subString(tag,3,30,1);
+	ret.artist=subString(tag,33,30,1);
+	ret.album=subString(tag,63,30,1);
+	ret.comment=subString(tag,97,30,1);
+	tmp=substring(tag,127,1);
+	//ret.genre=substring(tag,127,1);
+	
+	val=(int)tmp[0];
+	if (val<0)val+=256;
+	//hexchat_printf(ph, "tmp[0]=%i (%i)",val,tmp[0]);
+	if ((val<148)&&(val>=0)) 
+       ret.genre=GENRES[val];//#############changed
+	else {
+         ret.genre="unknown";
+         //hexchat_printf(ph, "tmp[0]=%i (%i)",val,tmp[0]);
+    }
+	//hexchat_printf(ph, "tmp: \"%s\" -> %i",tmp,tmp[0]);
+	//hexchat_printf(ph,"genre \"%s\"",ret.genre);
+	//if (DEBUG==1) putlog("id3v1 extracted");
+	free(tmp);
+	free(tag);
+	return ret;
+}
+
+char *extractID3Genre(char *tag)
+{
+	if (tag[strlen(tag) - 1] == ')')
+	{
+		tag[strlen(tag) - 1] = 0;
+		tag = &tag[1];
+		return GENRES[str2int(tag)];
+	}
+	else
+	{
+		size_t i;
+		for (i = 0; i < strlen(tag); i++)
+		{
+			if (tag[i] == ')')
+			{
+				tag = &tag[i] + 1;
+				return tag;
+			}
+		}
+	}
+
+	return "[152] failed";
+}
+
+struct tagInfo readID3V2(char *file){
+//if (DEBUG==1) putlog("reading id3v2");
+	FILE *f;
+	int i, c, len;
+	char header[10];
+	char *tag;
+	struct tagInfo ret;
+
+	f = fopen(file,"rb");
+	//hexchat_printf(ph,"file :%s",file);
+	if (f==NULL)
+	{
+       hexchat_print(ph,"file not found whilt trying to read ID3V2");
+       //if (DEBUG==1)putlog("file not found while trying to read ID3V2");
+       return ret;
+    }
+
+	ret.artist=NULL;
+	for (i=0;i<10;i++){
+        c=fgetc(f);
+        if (c==EOF){
+            fclose(f);
+           //putlog("found eof while reading id3v2");
+           return ret;
+        }
+        header[i]=(char)c;
+    }
+	if (strstr(header,"ID3")==header){
+		//hexchat_printf(ph,"found id3v2\n");
+		len=0;
+		for (i=6;i<10;i++) len+=(int)header[i]*iPow(256,9-i);
+		
+		//char *tag=(char*)malloc(sizeof(char)*len);
+		tag=(char*) calloc(len,sizeof(char)); //malloc(sizeof(char)*len);
+		for (i=0;i<len;i++){c=fgetc(f);tag[i]=(char)c;}
+//hexchat_printf(ph,"tag length: %i\n",len);
+//hexchat_printf(ph,"tag: %s\n",tag);
+		fclose(f);
+		ret.comment=tagExtract(tag,len,"COMM");
+//hexchat_printf(ph,"Comment: %s\n",ret.comment);
+		ret.genre=tagExtract(tag,len,"TCON");
+		//if (strcmp(ret.genre,"(127)")==0) ret.genre="unknown";
+//hexchat_printf(ph, "ret.genre = %s",ret.genre);
+		if ((ret.genre!=NULL)&&(ret.genre[0]=='(')) ret.genre=extractID3Genre(ret.genre);
+//hexchat_printf(ph,"genre: %s\n",ret.genre);
+		ret.title=tagExtract(tag,len,"TIT2");
+//hexchat_printf(ph,"Title: %s\n",ret.title);
+		ret.album=tagExtract(tag,len,"TALB");
+//hexchat_printf(ph,"Album: %s\n",ret.album);
+		ret.artist=tagExtract(tag,len,"TPE1");
+//hexchat_printf(ph,"Artist: %s\n",ret.artist);
+	}
+	else{fclose(f);printf("no id3v2 tag found\n"); return ret;}
+	//printf("id2v2 done\n");
+	//if (DEBUG==1) putlog("id3v2 readed");
+	return ret;
+}
+
+struct tagInfo readHeader(char *file){
+//if (DEBUG==1) putlog("reading header");
+	FILE *f;
+	//int buffer[5120];
+	int versionB, layerB, bitrateB, freqB, modeB;
+	int header[4];
+	int count=0;
+	int cc=0;
+	struct tagInfo info;
+	info.artist=NULL;
+
+	f = fopen(file,"rb");
+	if (f==NULL)
+	{
+       hexchat_print(ph,"file not found while trying to read mp3 header");
+       //if (DEBUG==1) putlog("file not found while trying to read mp3 header");
+       return info;
+    }
+	//struct tagInfo tagv2
+	
+	info=readID3V2(file);
+	//struct tagInfo tagv1;//=readID3V1(file);
+	//if 	(tagv2.artist!=NULL){info=tagv2;}
+	//else {
+	if (info.artist==NULL){
+		//printf("searching for id3v1\n");
+		//tagv1=readID3V1(file);
+		info=readID3V1(file); //#####################
+	}
+	/*
+	if (tagv1.artist!=NULL){
+		//printf("Artist: %s\nTitle: %s\nAlbum: %s\nComment: %s\nGenre: %s\n",tagv1.artist,tagv1.title,tagv1.album,tagv1.comment,tagv1.genre);
+		info=tagv1;
+	}
+	*/
+	while ((count<5120)&&(cc!=EOF)&&(cc!=255)) {cc=fgetc(f);count++;}
+	if ((cc==EOF)||(count==5119)) printf("no header found\n");
+	else {
+		//printf("located header at %i\n",count);
+		header[0]=255;
+		for (count=1;count<4;count++){
+			header[count]=fgetc(f);
+			//printf("header[%i]=%i\n",count,header[count]);
+		}
+		versionB=(header[1]&8)>>3;
+		layerB=(header[1]&6)>>1;
+		bitrateB=(header[2]&240)>>4; //4
+		freqB=(header[2]&12)>>2;//2
+		modeB=(header[3]&192)>>6;//6
+		//printf("Mpeg: %i\nLayer: %i\nBitrate: %i\nFreq: %i\nMode: %i\n",versionB, layerB, bitrateB, freqB, modeB);
+		//int Bitrate=RATES[versionB][layerB-1][bitrateB];
+		//int Freq=FREQS[versionB][freqB];
+		info.bitrate=RATES[versionB][layerB-1][bitrateB];
+		info.freq=FREQS[versionB][freqB];
+		info.mode=modeB;	
+	}
+	fclose(f);
+	//if (DEBUG==1) putlog("header readed");
+	return info;
+}
+/*
+static void printMp3Info(char *file){
+	//printf("\nScanning Mp3-File for Informations: %s\n",file);
+	//printf("size:\t%10d byte\n",getSize(file));
+	struct tagInfo info =readHeader(file);
+	printf("%s | %10d",file,getSize(file));
+	if  (info.bitrate>0){
+		//printf("Bitrate: %i\nFreq: %i\nMode: %s\n",info.bitrate,info.freq,MODES[info.mode]);
+		printf(" | %i kbps | %i kHz | %s",info.bitrate,info.freq,MODES[info.mode]);
+		//if (info.artist!=NULL) printf("\nArtist: %s\nTitle: %s\nAlbum: %s\nComment: %s\nGenre: %s\n",info.artist,info.title,info.album,info.comment,info.genre);
+		if (info.artist!=NULL) {
+			printf("| %s | %s | %s | %s | %s",info.artist,info.title,info.album,info.comment,info.genre);
+			//printf("| %s ",info.title);//,info.title,info.album,info.comment,info.genre
+		}
+	}
+	printf("\n");
+	
+}
+*/

plugins/mpcinfo/mpcInfo.c

@@ -0,0 +1,160 @@
+/*
+ *  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
+ */
+
+//static int DEBUG=0;
+static char *VERSION="0.0.6";
+
+#include <windows.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include "hexchat-plugin.h"
+static hexchat_plugin *ph;
+
+#include "functions.c"
+#include "mp3Info.c"
+#include "oggInfo.c"
+#include "theme.c"
+
+static int print_themes (char *word[], char *word_eol[], void *userdata){
+       printThemes();
+       return HEXCHAT_EAT_ALL;
+}
+
+static int mpc_themeReload(char *word[], char *word_eol[], void *userdata){
+   themeInit();
+   loadThemes();
+   return HEXCHAT_EAT_ALL;
+}
+
+static int mpc_tell(char *word[], char *word_eol[], void *userdata){
+       char *tTitle, *zero, *oggLine, *line;
+	   struct tagInfo info;
+	   HWND hwnd = FindWindow("MediaPlayerClassicW",NULL);
+       if (hwnd==0) {hexchat_print(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
+       
+       tTitle = g_new(char, 1024);
+       GetWindowText(hwnd, tTitle, 1024);
+       zero = strstr (tTitle, " - Media Player Classic");
+	   if (zero != NULL)
+	   {
+		   zero[0] = 0;
+	   }
+	   else
+	   {
+		   g_free(tTitle);
+		   hexchat_print(ph, "pattern not found");
+		   return HEXCHAT_EAT_ALL;
+	   }
+
+       if ((tTitle[1]==':')&&(tTitle[2]=='\\')){
+          //hexchat_print(ph,"seams to be full path");
+          if (endsWith(tTitle,".mp3")==1){
+             //hexchat_print(ph,"seams to be a mp3 file");
+             info = readHeader(tTitle);
+             
+             if ((info.artist!=NULL)&&(strcmp(info.artist,"")!=0)){
+                char *mode=MODES[info.mode];
+                //hexchat_printf(ph,"mode: %s\n",mode);
+                char *mp3Line=randomLine(mp3Theme);
+                mp3Line=replace(mp3Line,"%art",info.artist);
+                mp3Line=replace(mp3Line,"%tit",info.title);
+                mp3Line=replace(mp3Line,"%alb",info.album);
+                mp3Line=replace(mp3Line,"%com",info.comment);
+                mp3Line=replace(mp3Line,"%gen",info.genre);
+                //mp3Line=replace(mp3Line,"%time",pos);
+                //mp3Line=replace(mp3Line,"%length",len);
+                //mp3Line=replace(mp3Line,"%ver",waVers);
+                //mp3Line=intReplace(mp3Line,"%br",br);
+                //mp3Line=intReplace(mp3Line,"%frq",frq);
+                
+                mp3Line=intReplace(mp3Line,"%br",info.bitrate);
+                mp3Line=intReplace(mp3Line,"%frq",info.freq);
+                mp3Line=replace(mp3Line,"%mode",mode);
+                //mp3Line=replace(mp3Line,"%size",size);
+                //mp3Line=intReplace(mp3Line,"%perc",perc);
+                //mp3Line=replace(mp3Line,"%plTitle",title);
+                mp3Line=replace(mp3Line,"%file",tTitle);
+				g_free(tTitle);
+				hexchat_command(ph, mp3Line);
+                return HEXCHAT_EAT_ALL;
+             }
+          }
+          if (endsWith(tTitle,".ogg")==1){
+             hexchat_printf(ph,"Ogg detected\n");
+             info = getOggHeader(tTitle);
+             if (info.artist!=NULL){
+                char *cbr;
+                if (info.cbr==1) cbr="CBR"; else cbr="VBR";
+                oggLine=randomLine(oggTheme);
+                //if (cue==1) oggLine=cueLine;
+                //hexchat_printf(ph,"ogg-line: %s\n",oggLine);
+                oggLine=replace(oggLine,"%art",info.artist);
+                oggLine=replace(oggLine,"%tit",info.title);
+                oggLine=replace(oggLine,"%alb",info.album);
+                oggLine=replace(oggLine,"%com",info.comment);
+                oggLine=replace(oggLine,"%gen",info.genre);
+                //oggLine=replace(oggLine,"%time",pos);
+                //oggLine=replace(oggLine,"%length",len);
+                //oggLine=replace(oggLine,"%ver",waVers);
+                oggLine=intReplace(oggLine,"%chan",info.mode);
+                oggLine=replace(oggLine,"%cbr",cbr);
+                oggLine=intReplace(oggLine,"%br",info.bitrate/1000);//br);
+                oggLine=intReplace(oggLine,"%frq",info.freq);
+                //oggLine=replace(oggLine,"%size",size);
+                //oggLine=intReplace(oggLine,"%perc",perc);
+                //oggLine=replace(oggLine,"%plTitle",title);
+                oggLine=replace(oggLine,"%file",tTitle);
+				g_free(tTitle);
+				hexchat_command(ph, oggLine);
+                return HEXCHAT_EAT_ALL;
+             }
+          }
+       }
+       line=randomLine(titleTheme);
+       line=replace(line,"%title", tTitle);
+	   g_free(tTitle);
+	   hexchat_command(ph, line);
+       return HEXCHAT_EAT_ALL;
+}
+
+int hexchat_plugin_init(hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg){
+	ph = plugin_handle;
+	*plugin_name = "mpcInfo";
+	*plugin_desc = "Information-Script for Media Player Classic"; 
+	*plugin_version=VERSION;
+
+	hexchat_hook_command(ph, "mpc", HEXCHAT_PRI_NORM, mpc_tell,"no help text", 0);
+	hexchat_hook_command(ph, "mpc_themes", HEXCHAT_PRI_NORM, print_themes,"no help text", 0);
+	hexchat_hook_command(ph, "mpc_reloadthemes", HEXCHAT_PRI_NORM, mpc_themeReload,"no help text", 0);
+	hexchat_command (ph, "MENU -ishare\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\"");
+
+	themeInit();
+	loadThemes();
+	hexchat_printf(ph, "%s plugin loaded\n", *plugin_name);
+
+	return 1;
+}
+
+int
+hexchat_plugin_deinit (void)
+{
+	hexchat_command (ph, "MENU DEL \"Window/Display Current Song (MPC)\"");
+	hexchat_print (ph, "mpcInfo plugin unloaded\n");
+	return 1;
+}

plugins/mpcinfo/mpcinfo.def

@@ -0,0 +1,3 @@
+EXPORTS 
+hexchat_plugin_init 
+hexchat_plugin_deinit 

plugins/mpcinfo/mpcinfo.vcxproj

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v140</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mpcinfo</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="..\..\win32\hexchat.props" />
+  <PropertyGroup>
+    <TargetName>hcmpcinfo</TargetName>
+    <OutDir>$(HexChatRel)plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="mpcinfo.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="mpcInfo.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

plugins/mpcinfo/mpcinfo.vcxproj.filters

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="mpcinfo.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="mpcInfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

plugins/mpcinfo/oggInfo.c

@@ -0,0 +1,124 @@
+/*
+ *  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
+ */
+
+static int getOggInt(char *buff, int beg, int bytes){
+//if (DEBUG==1) putlog("getOggInt");
+	int ret=0;
+	int i;
+	for (i=0;i<bytes;i++){
+		if (buff[i+beg]>=0) ret+=buff[i+beg]*iPow(256,i);else ret+=(256+buff[i+beg])*iPow(256,i);
+		//printf("[%i]=%i\n",i,buff[i+beg]);
+	}
+	return ret;
+}
+
+static char *upperStr(char *text)
+{
+	char *ret = (char*) malloc(sizeof(char)*(strlen(text) + 1));
+
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
+	{
+		ret[i] = toupper(text[i]);
+	}
+
+	ret[strlen(text)] = 0;
+
+	return ret;
+}
+
+struct tagInfo getOggHeader(char *file){
+//if (DEBUG==1) putlog("reading ogg header");
+	char header[4096];
+	int i, c;
+	int h1pos, h3pos, maxBr, nomBr, minBr, pos, count, tagLen;
+	char *sub;
+	char *name;
+	char *val;
+	char HEADLOC1[]="_vorbis", HEADLOC3[]="_vorbis", HEADLOC5[]="_vorbis";
+	FILE *f;
+	struct tagInfo info;
+
+	info.artist=NULL;
+	f = fopen(file,"rb");
+	if (f==NULL){
+       hexchat_print(ph,"file not found while trying to read ogg header");
+       //if (DEBUG==1) putlog("file not found while trying to read ogg header");
+       return info;
+    }
+
+	for (i=0;i<4095;i++) {c=fgetc(f);header[i]=(char)c;}
+	fclose(f);
+	HEADLOC1[0]=1;
+	HEADLOC3[0]=3;
+	HEADLOC5[0]=5;
+	h1pos=inStr(header,4096,HEADLOC1);
+	h3pos=inStr(header,4096,HEADLOC3);
+	//int h5pos=inStr(header,4096,HEADLOC5); //not needed
+	
+	//printf("loc1: %i\n",h1pos);printf("loc3: %i\n",h3pos);printf("loc5: %i\n",h5pos);
+	maxBr=getOggInt(header,h1pos+7+9,4);
+	nomBr=getOggInt(header,h1pos+7+13,4);
+	minBr=getOggInt(header,h1pos+7+17,4);
+	info.freq=getOggInt(header,h1pos+7+5,4);
+	info.mode=header[h1pos+7+4];
+	info.bitrate=nomBr;
+	if (((maxBr==nomBr)&&(nomBr=minBr))||((minBr==0)&&(maxBr==0))||((minBr=-1)&&(maxBr=-1)) )info.cbr=1;else info.cbr=0;
+	printf("bitrates: %i|%i|%i\n",maxBr,nomBr,minBr);
+	printf("freq: %u\n",info.freq);
+	pos=h3pos+7;
+	pos+=getOggInt(header,pos,4)+4;
+	count=getOggInt(header,pos,4);
+	//printf("tags: %i\n",count);
+	pos+=4;
+
+	info.artist=NULL;info.title=NULL;info.album=NULL;info.comment=NULL;info.genre=NULL;
+	for (i=0;i<count;i++){
+		tagLen=getOggInt(header,pos,4);
+		//printf("taglength: %i\n",tagLen);
+		sub=substring(header,pos+4,tagLen);
+		name=upperStr(substring(sub,0,inStr(sub,tagLen,"=")));
+		val=substring(sub,inStr(sub,tagLen,"=")+1,tagLen-inStr(sub,tagLen,"=")-1);
+		//printf("Tag: %s\n",sub);
+		//printf("Name: %s\n",name);
+		//printf("value: %s\n",val);
+		if (strcmp(name,"ARTIST")==0) info.artist=val;
+		if (strcmp(name,"TITLE")==0) info.title=val;
+		if (strcmp(name,"ALBUM")==0) info.album=val;
+		if (strcmp(name,"GENRE")==0) info.genre=val;
+		if (strcmp(name,"COMMENT")==0) info.comment=val;
+		pos+=4+tagLen;
+		free(name);
+	}
+	if (info.artist==NULL) info.artist="";
+	if (info.album==NULL) info.album ="";
+	if (info.title==NULL) info.title="";
+	if (info.genre==NULL) info.genre="";
+	if (info.comment==NULL) info.comment="";
+	
+	printf("Artist: %s\nTitle: %s\nAlbum: %s\n",info.artist,info.title, info.album);
+	printf("Genre: %s\nComment: %s\nMode: %i\nCBR: %i\n",info.genre,info.comment,info.mode,info.cbr);
+	//if (DEBUG==1) putlog("ogg header readed");
+	return info;
+}
+
+/*
+void printOggInfo(char *file){
+	printf("Scanning Ogg-File for Informations: %s\n",file);
+	printf("size:\t%10d byte\n",getSize(file));
+	struct tagInfo info = getOggHeader(file);
+}
+*/

plugins/mpcinfo/theme.c

@@ -0,0 +1,148 @@
+/*
+ *  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
+ */
+
+#include <time.h>
+
+struct theme{
+       int size;
+       char **line;
+};
+
+static struct theme notRunTheme;
+static struct theme titleTheme;
+static struct theme mp3Theme;
+static struct theme oggTheme;
+
+
+void themeInit(){
+     //if (DEBUG==1) putlog("init theme");
+     /*mp3Theme.size=0;oggTheme.size=0;cueTheme.size=0;streamTheme.size=0;etcTheme.size=0;
+     stopTheme.size=0;pauseTheme.size=0;*/
+     
+     notRunTheme.size=0;titleTheme.size=0;
+     srand((unsigned int)time((time_t *)NULL));
+     //if (DEBUG==1) putlog("theme init done");
+}
+
+void printTheme(struct theme data){
+     int i;
+     for (i=0;i<data.size;i++) hexchat_printf(ph,"line[%i]=%s\n",i,data.line[i]);
+}
+
+void printThemes(){
+     hexchat_printf(ph,"\nNotRun-Theme:\n");printTheme(notRunTheme);
+     hexchat_printf(ph,"\nMP3-Theme:\n");printTheme(mp3Theme);
+     hexchat_printf(ph,"\nOGG-Theme:\n");printTheme(oggTheme);
+     hexchat_printf(ph,"\nTitle-Theme:\n");printTheme(titleTheme);
+}
+
+void cbFix(char *line)
+{
+	size_t i;
+	for (i = 0; i < strlen(line); i++)
+	{
+		size_t j;
+
+		if (line[i] == '%')
+		{
+			if ((line[i + 1] == 'C') || (line[i + 1] == 'B') || (line[i + 1] == 'U') || (line[i + 1] == 'O') || (line[i + 1] == 'R'))
+			{
+				if (line[i + 1] == 'C') line[i] = 3;
+				if (line[i + 1] == 'B') line[i] = 2;
+				if (line[i + 1] == 'U') line[i] = 37;
+				if (line[i + 1] == 'O') line[i] = 17;
+				if (line[i + 1] == 'R') line[i] = 26;
+
+				for (j = i + 1; j < strlen(line) - 1; j++)
+				{
+					line[j] = line[j + 1];
+				}
+
+				line[strlen(line) - 1] = 0;
+			}
+		}
+	}
+}
+
+struct theme themeAdd(struct theme data, char *info){
+       //if (DEBUG==1) putlog("adding theme");
+       struct theme ret;
+       char **newLine=(char **)calloc(data.size+1,sizeof(char*));
+       int i;
+       for (i=0;i<data.size;i++) newLine[i]=data.line[i];
+       cbFix(info);
+       newLine[data.size]=info;
+       ret.line=newLine;ret.size=data.size+1;
+       //if (DEBUG==1) putlog("theme added");
+       return ret;
+}
+
+void loadThemes(){
+    char *hDir, *hFile, *line, *lineCap, *val;
+	FILE *f;
+	hexchat_print(ph,"loading themes\n");
+    hDir=(char*)calloc(1024,sizeof(char));
+    strcpy(hDir,hexchat_get_info(ph,"configdir"));
+    hFile=str3cat(hDir,"\\","mpcInfo.theme.txt");
+    f = fopen(hFile,"r");
+    free(hDir);
+    free(hFile);
+    if(f==NULL)
+	{
+		hexchat_print(ph,"no theme in homedir, checking global theme");
+		f=fopen("mpcInfo.theme.txt","r");
+    }
+	//hexchat_printf(ph,"file_desc: %p\n",f);
+	if (f==NULL) hexchat_print(ph, "no theme found, using hardcoded\n");
+	else {
+		if (f > 0)
+		{
+			line=" ";
+		} else
+		{
+			line="\0";
+		}
+
+		while (line[0]!=0)
+		{
+			line=readLine(f);
+			val=split(line,'=');
+			printf("line: %s\n",line);
+			printf("val: %s\n",val);
+			lineCap=toUpper(line);
+			if (strcmp(lineCap,"OFF_LINE")==0) notRunTheme=themeAdd(notRunTheme,val);
+			if (strcmp(lineCap,"TITLE_LINE")==0) titleTheme=themeAdd(titleTheme,val);
+			if (strcmp(lineCap,"MP3_LINE")==0) mp3Theme=themeAdd(mp3Theme,val);
+			if (strcmp(lineCap,"OGG_LINE")==0) mp3Theme=themeAdd(oggTheme,val);
+			free(lineCap);
+		}
+		fclose(f);
+		hexchat_print(ph, "theme loaded successfull\n");
+	}
+	if (notRunTheme.size==0) notRunTheme=themeAdd(notRunTheme,"Media Player Classic not running");
+	if (titleTheme.size==0) titleTheme=themeAdd(titleTheme,"say Playing %title in Media Player Classic");
+	if (mp3Theme.size==0) mp3Theme=themeAdd(mp3Theme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%mode] in Media Player Classic ");
+	if (oggTheme.size==0) oggTheme=themeAdd(oggTheme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%chan channels] in Media Player Classic ");
+	//mp3Theme=themeAdd(mp3Theme,"me listens to %art with %tit from %alb [%time|%length|%perc%|%br kbps|%frq kHz|%mode] in Media Player Classic ");
+}
+
+int rnd(int max){
+    return rand()%max;
+}
+
+char *randomLine(struct theme data){
+     return data.line[rnd(data.size)];
+}

plugins/perl/perl.c

@@ -27,7 +27,7 @@
 #ifdef ENABLE_NLS
 #include <locale.h>
 #endif
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <stdbool.h>
 #else
@@ -44,7 +44,7 @@ static hexchat_plugin *ph;		  /* plugin handle */
 
 static int perl_load_file (char *script_name);
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 /* STRINGIFY is from perl's CORE/config.h */
 #ifndef PERL_REQUIRED_VERSION
 	#define PERL_REQUIRED_VERSION STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION)
@@ -75,7 +75,7 @@ thread_mbox (char *str)
 
 /* leave this before XSUB.h, to avoid readdir() being redefined */
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 static void
 perl_auto_load_from_path (const char *path)
 {
@@ -130,7 +130,7 @@ perl_auto_load (void *unused)
 {
 	const char *xdir;
 	char *sub_dir;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	int copied = 0;
 	char *slash = NULL;
 #endif
@@ -1019,7 +1019,7 @@ XS (XS_HexChat_hook_fd)
 		package = ST (4);
 		data = NULL;
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		if ((flags & HEXCHAT_FD_NOTSOCKET) == 0) {
 			/* this _get_osfhandle if from win32iop.h in the perl distribution,
 			 *  not the one provided by Windows
@@ -1434,7 +1434,7 @@ perl_init (void)
 static int
 perl_load_file (char *filename)
 {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	static HMODULE lib = NULL;
 
 	if (!lib) {

plugins/perl/perl.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -49,7 +49,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/python/python.c

@@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <direct.h>
 #else
 #include <unistd.h>
@@ -106,7 +106,7 @@
 #define PyUnicode_FromString PyString_FromString
 #define PyUnicode_AsUTF8 PyString_AsString
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #undef WITH_THREAD
 #endif
 #endif
@@ -790,7 +790,7 @@ static int
 Callback_ThreadTimer(void *userdata)
 {
 	RELEASE_XCHAT_LOCK();
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	usleep(1);
 #endif
 	ACQUIRE_XCHAT_LOCK();
@@ -1530,9 +1530,9 @@ Plugin_New(char *filename, PyObject *xcoobj)
 	PySys_SetObject("stderr", xcoobj);
 
 	if (filename) {
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		char *file;
-		if (!g_file_get_contents(filename, &file, NULL, NULL)) {
+		if (!g_file_get_contents_utf8(filename, &file, NULL, NULL)) {
 			hexchat_printf(ph, "Can't open file %s: %s\n",
 				     filename, strerror(errno));
 			goto error;

plugins/python/python2.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\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;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/python/python3.vcxproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\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;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

plugins/sysinfo/format.c

@@ -74,7 +74,7 @@ sysinfo_format_disk (guint64 total, guint64 free)
 	char *total_fmt, *free_fmt, *used_fmt, *ret;
 	GFormatSizeFlags format_flags = G_FORMAT_SIZE_DEFAULT;
 
-#ifdef WIN32 /* Windows uses IEC size (with SI format) */
+#ifdef G_OS_WIN32 /* Windows uses IEC size (with SI format) */
 	format_flags = G_FORMAT_SIZE_IEC_UNITS;
 #endif
 

plugins/sysinfo/meson.build

@@ -5,8 +5,7 @@ sysinfo_sources = [
 
 sysinfo_deps = [
   libgio_dep,
-  hexchat_plugin_dep,
-  common_sysinfo_deps,
+  hexchat_plugin_dep
 ]
 
 sysinfo_includes = []
@@ -20,32 +19,26 @@ if system == 'linux' or system == 'darwin'
   ]
 
   if system == 'linux'
-    libpci = dependency('libpci', required: false, method: 'pkg-config')
-    if libpci.found()
-      sysinfo_deps += libpci
-      sysinfo_cargs += '-DHAVE_LIBPCI'
-      sysinfo_sources += 'unix/pci.c'
-
-      picidsdir = libpci.get_pkgconfig_variable('idsdir')
-      pciids = join_paths(picidsdir, 'pci.ids')
-      sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
-    endif
+    libpci = dependency('libpci')
+    sysinfo_deps += libpci
     sysinfo_includes += 'unix'
     sysinfo_sources += [
       'unix/backend.c',
       'unix/match.c',
       'unix/parse.c',
+      'unix/pci.c',
     ]
+
+    picidsdir = libpci.get_pkgconfig_variable('idsdir')
+    pciids = join_paths(picidsdir, 'pci.ids')
+    sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
   elif system == 'darwin'
     add_languages('objc')
     sysinfo_sources += 'osx/backend.m'
   endif
 
 elif system == 'windows'
-  sysinfo_sources += [
-    'win32/backend.c',
-    '../../src/common/sysinfo/win32/backend.c'
-  ]
+  sysinfo_sources += 'win32/backend.c'
 else
   error('sysinfo: Unknown system?')
 endif

plugins/sysinfo/sysinfo.vcxproj

@@ -30,7 +30,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
@@ -43,7 +43,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>

plugins/sysinfo/unix/parse.c

@@ -23,16 +23,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef HAVE_LIBPCI
-	#include <pci/header.h>
-	#include "pci.h"
-#endif
+#include <pci/header.h>
 #include <glib.h>
 
 #ifdef __sparc__
 #include <dirent.h>
 #endif
 
+#include "pci.h"
 #include "match.h"
 #include "parse.h"
 #include "sysinfo.h"
@@ -134,24 +132,21 @@ gint64 xs_parse_uptime(void)
 
 	if(fgets(buffer, bsize, fp) != NULL)
 		uptime = g_ascii_strtoll(buffer, NULL, 0);
-
+	
 	fclose(fp);
-
+	
 	return uptime;
 }
 
 int xs_parse_sound(char *snd_card)
 {
-#ifndef HAVE_LIBPCI
-	return 1;
-#else
 	char buffer[bsize], cards[bsize] = "\0", vendor[7] = "\0", device[7] = "\0", *pos;
 	u16 class = PCI_CLASS_MULTIMEDIA_AUDIO;
 
 	FILE *fp = NULL;
 	if((fp = fopen("/proc/asound/cards", "r"))== NULL)
 	{
-		if (pci_find_by_class(&class, vendor, device) == 0)
+		if (pci_find_by_class(&class, vendor, device) == 0) 
 		{
 			pci_find_fullname(snd_card, vendor, device);
 			return 0;
@@ -159,8 +154,8 @@ int xs_parse_sound(char *snd_card)
 		else
 			return 1;
 	}
-
-
+	
+	
 	while(fgets(buffer, bsize, fp) != NULL)
 	{
 		if(isdigit(buffer[0]) || isdigit(buffer[1]))
@@ -180,17 +175,13 @@ int xs_parse_sound(char *snd_card)
 	}
 
 	strcpy(snd_card, cards);
-
+	
 	fclose(fp);
 	return 0;
-#endif
 }
 
 int xs_parse_video(char *vid_card)
 {
-#ifndef HAVE_LIBPCI
-	return 1;
-#else
 	char vendor[7] = "\0", device[7] = "\0";
 	u16 class = PCI_CLASS_DISPLAY_VGA;
 	if (pci_find_by_class(&class, vendor, device))
@@ -198,14 +189,10 @@ int xs_parse_video(char *vid_card)
 	else
 		pci_find_fullname(vid_card, vendor, device);
 	return 0;
-#endif
 }
 
 int xs_parse_ether(char *ethernet_card)
 {
-#ifndef HAVE_LIBPCI
-	return 1;
-#else
 	char vendor[7] = "\0", device[7] = "\0";
 	u16 class = PCI_CLASS_NETWORK_ETHERNET;
 	if (pci_find_by_class(&class, vendor, device))
@@ -213,14 +200,10 @@ int xs_parse_ether(char *ethernet_card)
 	else
 		pci_find_fullname(ethernet_card, vendor, device);
 	return 0;
-#endif
 }
 
 int xs_parse_agpbridge(char *agp_bridge)
 {
-#ifndef HAVE_LIBPCI
-	return 1;
-#else
 	char vendor[7] = "\0", device[7] = "\0";
 	u16 class = PCI_CLASS_BRIDGE_HOST;
 	if (pci_find_by_class(&class, vendor, device))
@@ -228,7 +211,6 @@ int xs_parse_agpbridge(char *agp_bridge)
 	else
 		pci_find_fullname(agp_bridge, vendor, device);
 	return 0;
-#endif
 }
 
 int xs_parse_meminfo(unsigned long long *mem_tot, unsigned long long *mem_free, int swap)
@@ -324,7 +306,7 @@ int xs_parse_distro(char *name)
 		g_snprintf(buffer, bsize, "Unknown Distro");
 	if(fp != NULL)
 		fclose(fp);
-
+	
 	pos=strchr(buffer, '\n');
 	if(pos != NULL)
 		*pos = '\0';

plugins/sysinfo/unix/pci.c

@@ -92,11 +92,6 @@ int pci_find_by_class(u16 *class, char *vendor, char *device)
 	struct pci_dev *p;
 	int nomatch = 1;
 
-	/* libpci has no way to report errors it calls exit()
-	 * so we need to manually avoid potential failures like this one */
-	if (!g_file_test ("/proc/bus/pci", G_FILE_TEST_EXISTS))
-		return 1;
-
 	pacc = pci_alloc();
 	pci_filter_init(pacc, &filter);
 	pci_init(pacc);
@@ -166,6 +161,6 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
 	if (cardfound == 1)
 		g_snprintf(fullname, bsize, "%s %s", vendorname, devicename);
 	else
-		g_snprintf(fullname, bsize, "%s:%s", vendor, device);
+		g_snprintf(fullname, bsize, "%s:%s", vendor, device);	
 	fclose(fp);
 }

plugins/sysinfo/win32/backend.c

@@ -30,7 +30,14 @@
 
 #include "../format.h"
 
-static char *get_memory_info (void);
+static int command_callback (char *word[], char *word_eol[], void *user_data);
+
+void print_info (void);
+
+guint64 hdd_capacity;
+guint64 hdd_free_space;
+char *read_hdd_info (IWbemClassObject *object);
+char *get_memory_info (void);
 
 char *
 sysinfo_backend_get_sound (void)
@@ -91,6 +98,11 @@ sysinfo_backend_get_os (void)
 	return sysinfo_get_os ();
 }
 
+static int get_cpu_arch (void)
+{
+	return sysinfo_get_cpu_arch ();
+}
+
 static char *get_memory_info (void)
 {
 	MEMORYSTATUSEX meminfo = { 0 };

plugins/upd/upd.vcxproj

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

plugins/winamp/winamp.vcxproj

@@ -29,12 +29,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>

po/POTFILES

@@ -1,6 +1,6 @@
-data/misc/io.github.Hexchat.appdata.xml.in
-data/misc/io.github.Hexchat.desktop.in.in
-data/misc/io.github.Hexchat.ThemeManager.desktop.in
+data/misc/hexchat.appdata.xml.in
+data/misc/hexchat.desktop.in
+data/misc/htm.desktop.in
 src/common/cfgfiles.c
 src/common/chanopt.c
 src/common/dcc.c

po/POTFILES.skip

@@ -1 +1 @@
-data/misc/io.github.Hexchat.desktop.in.in
+data/misc/hexchat.desktop.in.in

src/common/cfgfiles.c

@@ -31,7 +31,7 @@
 #include "hexchatc.h"
 #include "typedef.h"
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -290,7 +290,7 @@ cfg_get_int (char *cfg, char *var)
 
 char *xdir = NULL;	/* utf-8 encoding */
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ -300,7 +300,7 @@ get_xdir (void)
 {
 	if (!xdir)
 	{
-#ifndef WIN32
+#ifndef G_OS_WIN32
 		xdir = g_build_filename (g_get_user_config_dir (), HEXCHAT_DIR, NULL);
 #else
 		wchar_t* roaming_path_wide;
@@ -373,7 +373,7 @@ const struct prefs vars[] =
 	{"dcc_blocksize", P_OFFINT (hex_dcc_blocksize), TYPE_INT},
 	{"dcc_completed_dir", P_OFFSET (hex_dcc_completed_dir), TYPE_STR},
 	{"dcc_dir", P_OFFSET (hex_dcc_dir), TYPE_STR},
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	{"dcc_fast_send", P_OFFINT (hex_dcc_fast_send), TYPE_BOOL},
 #endif
 	{"dcc_global_max_get_cps", P_OFFINT (hex_dcc_global_max_get_cps), TYPE_INT},
@@ -496,7 +496,6 @@ const struct prefs vars[] =
 	{"input_tray_priv", P_OFFINT (hex_input_tray_priv), TYPE_BOOL},
 
 	{"irc_auto_rejoin", P_OFFINT (hex_irc_auto_rejoin), TYPE_BOOL},
-	{"irc_reconnect_rejoin", P_OFFINT (hex_irc_reconnect_rejoin), TYPE_BOOL},
 	{"irc_ban_type", P_OFFINT (hex_irc_ban_type), TYPE_INT},
 	{"irc_cap_server_time", P_OFFINT (hex_irc_cap_server_time), TYPE_BOOL},
 	{"irc_conf_mode", P_OFFINT (hex_irc_conf_mode), TYPE_BOOL},
@@ -528,7 +527,7 @@ const struct prefs vars[] =
 	{"irc_whois_front", P_OFFINT (hex_irc_whois_front), TYPE_BOOL},
 
 	{"net_auto_reconnect", P_OFFINT (hex_net_auto_reconnect), TYPE_BOOL},
-#ifndef WIN32	/* FIXME fix reconnect crashes and remove this ifdef! */
+#ifndef G_OS_WIN32	/* FIXME fix reconnect crashes and remove this ifdef! */
 	{"net_auto_reconnectonfail", P_OFFINT (hex_net_auto_reconnectonfail), TYPE_BOOL},
 #endif
 	{"net_bind_host", P_OFFSET (hex_net_bind_host), TYPE_STR},
@@ -591,7 +590,7 @@ convert_with_fallback (char *str, const char *fallback)
 {
 	char *utf;
 
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
 	utf = g_locale_to_utf8 (str, -1, NULL, NULL, 0);
 
@@ -715,7 +714,7 @@ load_default_config(void)
 	char *username, *realname, *langs;
 	const char *font;
 	char *sp;
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	wchar_t* roaming_path_wide;
 	gchar* roaming_path;
 #endif
@@ -741,7 +740,7 @@ load_default_config(void)
 	prefs.hex_away_show_once = 1;
 	prefs.hex_away_track = 1;
 	prefs.hex_dcc_auto_resume = 1;
-#ifndef WIN32
+#ifndef G_OS_WIN32
 	prefs.hex_dcc_fast_send = 1;
 #endif
 	prefs.hex_gui_autoopen_chat = 1;
@@ -778,7 +777,6 @@ load_default_config(void)
 	prefs.hex_input_flash_priv = 1;
 	prefs.hex_input_tray_hilight = 1;
 	prefs.hex_input_tray_priv = 1;
-	prefs.hex_irc_reconnect_rejoin = 1;
 	prefs.hex_irc_cap_server_time = 1;
 	prefs.hex_irc_logging = 1;
 	prefs.hex_irc_who_join = 1; /* Can kick with inordinate amount of channels, required for some of our features though, TODO: add cap like away check? */
@@ -842,7 +840,7 @@ load_default_config(void)
 	/* STRINGS */
 	strcpy (prefs.hex_away_reason, _("I'm busy"));
 	strcpy (prefs.hex_completion_suffix, ",");
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (portable_mode () || SHGetKnownFolderPath (&FOLDERID_Downloads, 0, NULL, &roaming_path_wide) != S_OK)
 	{
 		g_snprintf (prefs.hex_dcc_dir, sizeof (prefs.hex_dcc_dir), "%s\\downloads", get_xdir ());
@@ -1063,7 +1061,7 @@ save_config (void)
 		return 0;
 	}
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	g_unlink (config);	/* win32 can't rename to an existing file */
 #endif
 	if (g_rename (new_config, config) == -1)

src/common/chanopt.c

@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <io.h>
 #else
 #include <unistd.h>

src/common/common.vcxproj

@@ -95,13 +95,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -111,10 +111,11 @@
     <PreBuildEvent>
       <Command><![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
-"$(Python3Path)\python.exe" $(ProjectDir)make-te.py "$(ProjectDir)textevents.in" "$(HexChatLib)textevents.h" "$(HexChatLib)textenums.h"
+"$(HexChatLib)make-te.exe" < "$(ProjectDir)textevents.in" > "$(HexChatLib)textevents.h" 2> "$(HexChatLib)textenums.h"
 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(HexChatLib)config.h"
-"$(Python3Path)\python.exe" "$(DepsRoot)\bin\glib-genmarshal" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" --output "$(HexChatLib)marshal.h"
-"$(Python3Path)\python.exe" "$(DepsRoot)\bin\glib-genmarshal" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" --output "$(HexChatLib)marshal.c"
+"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.h"
+"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.c"
+
       ]]></Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>

src/common/ctcp.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifndef WIN32
+#ifndef G_OS_WIN32
 #include <unistd.h>
 #endif
 
@@ -138,7 +138,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 
 	if (!g_ascii_strcasecmp (msg, "VERSION") && !prefs.hex_irc_hide_version)
 	{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 		g_snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
 					 get_cpu_arch (), get_sys_str (1));
 #else
@@ -148,9 +148,6 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		serv->p_nctcp (serv, nick, outbuf);
 	}
 
-	if (word[4][1] == '\0')
-		return;
-
 	if (!ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 	{
 		if (!g_ascii_strncasecmp (msg, "SOUND", 5))
@@ -175,7 +172,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 			}
 
 			/* don't let IRCers specify path */
-#ifdef WIN32
+#ifdef G_OS_WIN32
 			if (strchr (word[5], '/') == NULL && strchr (word[5], '\\') == NULL)
 #else
 			if (strchr (word[5], '/') == NULL)

src/common/dbus/dbus-client.c

@@ -27,6 +27,7 @@
 #include "hexchat.h"
 #include "hexchatc.h"
 
+#define DBUS_SERVICE "org.hexchat.service"
 #define DBUS_REMOTE_PATH "/org/hexchat/Remote"
 #define DBUS_REMOTE_INTERFACE "org.hexchat.plugin"
 

src/common/dbus/dbus-plugin.c

@@ -32,6 +32,7 @@
 #define PDESC _("plugin for remote access using DBUS")
 #define PVERSION ""
 
+#define DBUS_SERVICE "org.hexchat.service"
 #define DBUS_OBJECT_PATH "/org/hexchat"
 
 static hexchat_plugin *ph;

src/common/dbus/meson.build

@@ -14,22 +14,11 @@ dbus_includes = [
 
 dbus_service_dir = join_paths(get_option('datadir'), 'dbus-1/services')
 
-if get_option('dbus-service-use-appid')
-  dbus_service_name = 'io.github.Hexchat'
-  dbus_output_file = 'io.github.Hexchat.service'
-  dbus_cargs = '-DDBUS_SERVICE="io.github.Hexchat"'
-else
-  dbus_service_name = 'org.hexchat.service'
-  dbus_output_file = 'org.hexchat.service.service'
-  dbus_cargs = '-DDBUS_SERVICE="org.hexchat.service"'
-endif
-
 dbus_conf = configuration_data()
 dbus_conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
-dbus_conf.set('service_name', dbus_service_name)
 configure_file(
   input: 'org.hexchat.service.service.in',
-  output: dbus_output_file,
+  output: 'org.hexchat.service.service',
   configuration: dbus_conf,
   install: true,
   install_dir: dbus_service_dir
@@ -45,7 +34,6 @@ dbus_remote_object = custom_target('remote-object-glue',
 
 hexchat_dbus = static_library('hexchatdbus',
   sources: [dbus_remote_object, marshal] + dbus_sources,
-  c_args: dbus_cargs,
   dependencies: common_deps + dbus_deps,
   include_directories: dbus_includes,
   pic: true

src/common/dbus/org.hexchat.service.service.in

@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=@service_name@
+Name=org.hexchat.service
 Exec=@bindir@/hexchat

src/common/dcc.c

@@ -23,6 +23,9 @@
  * Jim Seymour (jseymour@LinxNet.com)
  */
 
+#include "config.h"
+#include <glib.h>
+
 /* Required to make lseek use off64_t, but doesn't work on Windows */
 #define _FILE_OFFSET_BITS 64
 
@@ -39,7 +42,7 @@
 #define WANTDNS
 #include "inet.h"
 
-#ifdef WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <io.h>
 #else
@@ -59,8 +62,8 @@
 #include "hexchatc.h"
 
 /* Setting _FILE_OFFSET_BITS to 64 doesn't change lseek to use off64_t on Windows, so override lseek to the version that does */
-#if defined(WIN32) && (!defined(__MINGW32__) && !defined(__MINGW64__))
-	#define lseek _lseeki64
+#ifdef G_OS_WIN32
+#define lseek _lseeki64
 #endif
 
 /* interval timer to detect timeouts */
@@ -790,7 +793,7 @@ dcc_did_connect (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
 {
 	int er;
 	
-#ifdef WIN32
+#ifdef G_OS_WIN32
 	if (condition & G_IO_ERR)
 	{
 		int len;
@@ -2452,7 +2455,7 @@ dcc_add_file (session *sess, char *file, guint64 size, int port, char *nick, gui
 			strcat (dcc->destfile, G_DIR_SEPARATOR_S);
 		if (prefs.hex_dcc_save_nick)
 		{
-#ifdef WIN32
+#ifdef G_OS_WIN32
 			char *t = strlen (dcc->destfile) + dcc->destfile;
 			strcpy (t, nick);
 			while (*t)