From cb891a9732d77dde425052b6d11dc8024492e80a Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 21 Oct 2012 06:40:28 +0200 Subject: [PATCH] Rename WinSys on the code level --- plugins/sysinfo/sysinfo-xp.vcxproj | 20 ++++++++++---------- plugins/sysinfo/sysinfo-xp.vcxproj.filters | 4 ++-- plugins/sysinfo/sysinfo.cpp | 10 +++++----- plugins/sysinfo/sysinfo.vcxproj | 18 +++++++++--------- plugins/sysinfo/sysinfo.vcxproj.filters | 4 ++-- src/common/plugin.c | 2 +- win32/hexchat-xp.props | 2 +- win32/hexchat-xp.sln | 2 +- win32/hexchat.props | 2 +- win32/hexchat.sln | 2 +- win32/installer/hexchat-x64.skel.iss | 6 +++--- win32/installer/hexchat-x86.skel.iss | 6 +++--- win32/installer/hexchat-xp-x64.skel.iss | 6 +++--- win32/installer/hexchat-xp-x86.skel.iss | 6 +++--- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/plugins/sysinfo/sysinfo-xp.vcxproj b/plugins/sysinfo/sysinfo-xp.vcxproj index 370a96cd..1a53e87f 100644 --- a/plugins/sysinfo/sysinfo-xp.vcxproj +++ b/plugins/sysinfo/sysinfo-xp.vcxproj @@ -13,8 +13,8 @@ {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} Win32Proj - winsys - winsys + sysinfo + sysinfo @@ -45,13 +45,13 @@ false - hcwinsys + hcsysinfo $(HexChatBin) $(HexChatObj)$(ProjectName)\ false - hcwinsys + hcsysinfo $(HexChatBin) $(HexChatObj)$(ProjectName)\ @@ -62,7 +62,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true false @@ -72,7 +72,7 @@ true true true - winsys.def + sysinfo.def wbemuuid.lib;vccomsup.lib;%(AdditionalDependencies) comsupp.lib @@ -84,7 +84,7 @@ MaxSpeed true true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions) + WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true false @@ -94,16 +94,16 @@ true true true - winsys.def + sysinfo.def wbemuuid.lib;vccomsup.lib;%(AdditionalDependencies) comsupp.lib - + - + diff --git a/plugins/sysinfo/sysinfo-xp.vcxproj.filters b/plugins/sysinfo/sysinfo-xp.vcxproj.filters index 6e5b445c..1ef90f5b 100644 --- a/plugins/sysinfo/sysinfo-xp.vcxproj.filters +++ b/plugins/sysinfo/sysinfo-xp.vcxproj.filters @@ -11,12 +11,12 @@ - + Resource Files - + Source Files diff --git a/plugins/sysinfo/sysinfo.cpp b/plugins/sysinfo/sysinfo.cpp index d15118fe..5cb4b766 100644 --- a/plugins/sysinfo/sysinfo.cpp +++ b/plugins/sysinfo/sysinfo.cpp @@ -28,7 +28,7 @@ #include "xchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ -static char name[] = "WinSys"; +static char name[] = "SysInfo"; static char desc[] = "Display info about your hardware and OS"; static char version[] = "1.1"; static int firstRun; @@ -352,7 +352,7 @@ getWmiInfo (int mode) static int printInfo (char *word[], char *word_eol[], void *user_data) { - /* query WMI info only at the first time WinSys is called, then cache it to save time */ + /* query WMI info only at the first time SysInfo is called, then cache it to save time */ if (firstRun) { xchat_printf (ph, "%s first execution, querying and caching WMI info...\n", name); @@ -364,7 +364,7 @@ printInfo (char *word[], char *word_eol[], void *user_data) if (xchat_list_int (ph, NULL, "type") >= 2) { /* uptime will work correctly for up to 50 days, should be enough */ - xchat_commandf (ph, "ME ** WinSys ** Client: HexChat %s (x%d) ** OS: %s ** CPU: %s (%s) ** RAM: %s ** VGA: %s ** Uptime: %.2f Hours **", + xchat_commandf (ph, "ME ** SysInfo ** Client: HexChat %s (x%d) ** OS: %s ** CPU: %s (%s) ** RAM: %s ** VGA: %s ** Uptime: %.2f Hours **", xchat_get_info (ph, "version"), getCpuArch (), wmiOs, @@ -397,8 +397,8 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi firstRun = 1; - xchat_hook_command (ph, "WINSYS", XCHAT_PRI_NORM, printInfo, NULL, NULL); - xchat_command (ph, "MENU -ietc\\system.png ADD \"Window/Display System Info\" \"WINSYS\""); + xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, printInfo, NULL, NULL); + xchat_command (ph, "MENU -ietc\\system.png ADD \"Window/Display System Info\" \"SYSINFO\""); xchat_printf (ph, "%s plugin loaded\n", name); diff --git a/plugins/sysinfo/sysinfo.vcxproj b/plugins/sysinfo/sysinfo.vcxproj index 76c3a94b..c5e4c419 100644 --- a/plugins/sysinfo/sysinfo.vcxproj +++ b/plugins/sysinfo/sysinfo.vcxproj @@ -13,7 +13,7 @@ {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} Win32Proj - winsys + sysinfo @@ -42,13 +42,13 @@ false - hcwinsys + hcsysinfo $(HexChatBin) $(HexChatObj)$(ProjectName)\ false - hcwinsys + hcsysinfo $(HexChatBin) $(HexChatObj)$(ProjectName)\ @@ -59,7 +59,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true false @@ -69,7 +69,7 @@ true true true - winsys.def + sysinfo.def wbemuuid.lib;comsupp.lib;%(AdditionalDependencies) comsupp.lib @@ -81,7 +81,7 @@ MaxSpeed true true - WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions) + WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true false @@ -91,16 +91,16 @@ true true true - winsys.def + sysinfo.def wbemuuid.lib;comsupp.lib;%(AdditionalDependencies) comsupp.lib - + - + diff --git a/plugins/sysinfo/sysinfo.vcxproj.filters b/plugins/sysinfo/sysinfo.vcxproj.filters index 6e5b445c..1ef90f5b 100644 --- a/plugins/sysinfo/sysinfo.vcxproj.filters +++ b/plugins/sysinfo/sysinfo.vcxproj.filters @@ -11,12 +11,12 @@ - + Resource Files - + Source Files diff --git a/src/common/plugin.c b/src/common/plugin.c index 2f9e3715..7111289c 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -483,7 +483,7 @@ plugin_auto_load (session *sess) for_files ("./plugins", "hctcl.dll", plugin_auto_load_cb); for_files ("./plugins", "hcupd.dll", plugin_auto_load_cb); for_files ("./plugins", "hcwinamp.dll", plugin_auto_load_cb); - for_files ("./plugins", "hcwinsys.dll", plugin_auto_load_cb); + for_files ("./plugins", "hcsysinfo.dll", plugin_auto_load_cb); for_files ("./plugins", "hcwmpa.dll", plugin_auto_load_cb); for_files ("./plugins", "hextray.dll", plugin_auto_load_cb); diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 7af896d7..f7eabce2 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -99,7 +99,7 @@ copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcwinsys.dll" "$(HexChatRel)\plugins" +copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins" copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)" xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale" diff --git a/win32/hexchat-xp.sln b/win32/hexchat-xp.sln index 28f6c046..0850bc9f 100644 --- a/win32/hexchat-xp.sln +++ b/win32/hexchat-xp.sln @@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upd", "..\plugins\upd\upd-x EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp\winamp-xp.vcxproj", "{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsys", "..\plugins\winsys\winsys-xp.vcxproj", "{6C0CA980-97C5-427A-BE61-5BCECAFABBDA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sysinfo", "..\plugins\sysinfo\sysinfo-xp.vcxproj", "{6C0CA980-97C5-427A-BE61-5BCECAFABBDA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sasl", "..\plugins\sasl\sasl-xp.vcxproj", "{18871EBA-AC85-4652-8919-EB8064B9A714}" EndProject diff --git a/win32/hexchat.props b/win32/hexchat.props index 36516d47..85930834 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -112,7 +112,7 @@ copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcwinsys.dll" "$(HexChatRel)\plugins" +copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins" copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)" xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale" diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 6dd2a18f..66bb0e41 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upd", "..\plugins\upd\upd.v EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp\winamp.vcxproj", "{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsys", "..\plugins\winsys\winsys.vcxproj", "{6C0CA980-97C5-427A-BE61-5BCECAFABBDA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sysinfo", "..\plugins\sysinfo\sysinfo.vcxproj", "{6C0CA980-97C5-427A-BE61-5BCECAFABBDA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sasl", "..\plugins\sasl\sasl.vcxproj", "{18871EBA-AC85-4652-8919-EB8064B9A714}" EndProject diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index a22d22c8..e4cca028 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -46,7 +46,7 @@ Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disableno Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning @@ -169,8 +169,8 @@ Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp -Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo +Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 7744c599..542d34cb 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -45,7 +45,7 @@ Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disableno Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning @@ -170,8 +170,8 @@ Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp -Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo +Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss index a22d22c8..e4cca028 100644 --- a/win32/installer/hexchat-xp-x64.skel.iss +++ b/win32/installer/hexchat-xp-x64.skel.iss @@ -46,7 +46,7 @@ Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disableno Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning @@ -169,8 +169,8 @@ Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp -Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo +Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss index 7744c599..542d34cb 100644 --- a/win32/installer/hexchat-xp-x86.skel.iss +++ b/win32/installer/hexchat-xp-x86.skel.iss @@ -45,7 +45,7 @@ Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disableno Name: "plugins\sasl"; Description: "SASL"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning -Name: "plugins\winsys"; Description: "WinSys"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\sysinfo"; Description: "SysInfo"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning @@ -170,8 +170,8 @@ Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp -Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys -Source: "plugins\hcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys +Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\sysinfo +Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo Source: "plugins\hcsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sasl Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa