From 0f95cbb4a9f1c9a613dccb9d53f5ddb50a8cadd7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 3 Jul 2012 19:23:06 +0000 Subject: AutoShutdown: code cleaning x64 compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@742 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ExternalAPI/m_flags.inc | 74 ------------ plugins/ExternalAPI/m_hotkey.h | 67 ----------- plugins/ExternalAPI/m_hotkeysplus.h | 22 ---- plugins/ExternalAPI/m_hotkeysservice.h | 213 --------------------------------- plugins/ExternalAPI/m_langman.inc | 48 -------- 5 files changed, 424 deletions(-) delete mode 100644 plugins/ExternalAPI/m_flags.inc delete mode 100644 plugins/ExternalAPI/m_hotkey.h delete mode 100644 plugins/ExternalAPI/m_hotkeysplus.h delete mode 100644 plugins/ExternalAPI/m_hotkeysservice.h delete mode 100644 plugins/ExternalAPI/m_langman.inc (limited to 'plugins/ExternalAPI') diff --git a/plugins/ExternalAPI/m_flags.inc b/plugins/ExternalAPI/m_flags.inc deleted file mode 100644 index f3dc0e8367..0000000000 --- a/plugins/ExternalAPI/m_flags.inc +++ /dev/null @@ -1,74 +0,0 @@ -{ -Miranda IM Country Flags Plugin -Copyright (C) 2006-2007 H. Herkenrath - -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 (Flags-License.txt); if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -{$ifndef M_FLAGS_H} -{$define M_FLAGS_H} - -const - -{ - Country Flags Plugin v0.1.0.3 -} - -{ interface id } -MIID_FLAGS: TGUID = '{88A3B66E-C438-4381-BC17-71D99D225F9C}'; - -{ Load a country flag icon from the skin library. v0.1.0.0+ -The retrieved icon should be released using MS_SKIN2_RELEASEICON after use. -The country numbers can be retrieved using MS_UTILS_GETCOUNTRYLIST. -Another way to get the country numbers are the CTRY_* constants in winnls.h of WinAPI. -To retrieve the country number from a locale, call GetLocaleInfo(). -with LOCALE_ICOUNTRY. - wParam : countryNumber - lParam : (BOOL)fReturnHandle (nonzero to to retrieve the icolib handle instead of the icon) -Returns a icon handle (HICON) on success, NULL on error. -} -MS_FLAGS_LOADCOUNTRYFLAGICON = 'Flags/LoadCountryFlagIcon'; - -{ Create a merged country flag icon. v0.1.0.0+ -The retrieved icon should be released using DestroyIcon() after use. - wParam : countryNumberUpper - lParam : countryNumberLower -Returns a icon handle (HICON) on success, NULL on error. -} -MS_FLAGS_CREATEMERGEDFLAGICON = 'Flags/CreateMergedFlagIcon'; - -{ Get a corresponding country given an (external) IP address. v0.1.0.0+ -The retrieved number can be converted to a normal country name -using MS_UTILS_GETCOUNTRYBYNUMBER. - wParam : dwExternalIP (same format as used Netlib) - lParam : 0 -Returns a country number on success, -or 0xFFFF on failure (MS_UTILS_GETCOUNTRYBYNUMBER returns "Unknown" for this). -} -MS_FLAGS_IPTOCOUNTRY = 'Flags/IpToCountry'; - -{ Detect the origin country of a contact. v0.1.0.0+ -This uses the contacts's IP first, and falls back on using -CNF_COUNTRY and CNF_COCOUNTRY of contact details. -To get the contact's IP it relies on the db setting -"RealIP" in the proto module. - wParam : (WPARAM)(HANDLE)hContact - lParam : 0 -Returns a country number on success, -or 0xFFFF on failure (MS_UTILS_GETCOUNTRYBYNUMBER returns "Unknown" for this). -} -MS_FLAGS_DETECTCONTACTORIGINCOUNTRY = 'Flags/DetectContactOriginCountry'; - -{$endif} // M_FLAGS_H diff --git a/plugins/ExternalAPI/m_hotkey.h b/plugins/ExternalAPI/m_hotkey.h deleted file mode 100644 index 1af34b4342..0000000000 --- a/plugins/ExternalAPI/m_hotkey.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef H_HOTKEY_H -#define H_HOTKEY_H - -//hotkey struct - typedef struct{ - BOOL isShift; //determines if hotkey uses shift - BOOL isCtrl; //determines if hotkey uses control - BOOL isAlt; //determines if hotkey uses alt - UINT vkCode; - - }KEYHASH,*PKEYHASH; - - //struct passed to HKS_GET_NAME_BYHASH the result of calling it will be stored in char* name - typedef struct{ - char* name; //pointer to buffer where the result will be stored - size_t bufferlen; //size of the buffer - }GETNAMEWPARAM; - - /*this below are registred miranda services and should be called by CallService */ - - /* this funtion registers new hot key function, function must be registred as miranda service - lParam = (KEYHASH*) hotKeyDefinition - wParam = (const char*)ServiceName - returns true on success and false if fails */ - #define HKS_REGISTERFUNCTION "mhotkeyregister" - /* unregisters function as hot key function - lParam = (KEYHASH*) hotKeyDefinition /search function by it's hotkey combination - wParam = NULL - and if - lParam = NULL - wParam = (const char*) functionName //search function by it's name - returns if function was propertly deleted returns true else returns false */ - #define HKS_UNREGISTERFUNCTION "mhotkeyunregister" - - /* - Updates hotkey to the specific function (if another function use this hot key it'll be assigned to this - and that function will be unregistred as hotkey function) - wParam = (const char*) FunctoinName // name of the function you want to update - lParam = (KEYHASH*)newHotKey - - returns: true on success and false on failure - */ - #define HKS_UPDATEHOTKEY "mhotkeyupdate" - - /* gets function hash by function name, the result is stored in lParam(KEYHASH*) - wParam = (const char*)functionName - lParam = (KEYHASH*) - here the result is stored - */ - #define HKS_GET_HASH_BYNAME "mhgethashbyname" - /* gets functoin name by it's hash the GETNAMEPARAM struct must be filled before calling this - it has to be passed as wParam, and there will be result stored. - wParam=(GETNAMEPARAM*)Result - lParam=(KEYHASH*)keyHash - */ - #define HKS_GET_NAME_BYHASH "mhgetnamebyhash" - /* converts keyHash to windows hotkey - wParam=(DWORD*)result - lParam=(KEYHASH*)hotKey - */ - #define HKS_HASH_TO_HOTKEY "mhhashtohotkey" - /*converts windows hotkey to keyHash - wParam=(DWORD*)hotkey - lParam=(KEYHASH*)result - */ - #define MKS_HOTKEY_TO_HASH "mhhotkeytohash" - -#endif \ No newline at end of file diff --git a/plugins/ExternalAPI/m_hotkeysplus.h b/plugins/ExternalAPI/m_hotkeysplus.h deleted file mode 100644 index 3da357f109..0000000000 --- a/plugins/ExternalAPI/m_hotkeysplus.h +++ /dev/null @@ -1,22 +0,0 @@ -#define MS_HOTKEYSPLUS_ADDKEY "HotkeysPlus/Add" - -/* -This service registers hotkey for -WPARAM - service to perform -LPARAM - decription of the service -Returned values: - 0 - success, - 1 - hotkey for this function is already existing, - 2 - the service, that you try to register the hotkey for, not exists -*/ - -#define MS_HOTKEYSPLUS_EXISTKEY "HotkeysPlus/Exist" -/* -This service checks whether hotkey for service (WPARAM) exists -LPARAM - not used -Returned values: - 0 - failed, - 1 - the hotkey for this function exists, - 2 - the service not exists -*/ - diff --git a/plugins/ExternalAPI/m_hotkeysservice.h b/plugins/ExternalAPI/m_hotkeysservice.h deleted file mode 100644 index 6e777b1876..0000000000 --- a/plugins/ExternalAPI/m_hotkeysservice.h +++ /dev/null @@ -1,213 +0,0 @@ -#ifndef __M_HOTKEYSSERVICE__ -# define __M_HOTKEYSSERVICE__ - - -#define HKS_SERVICE_NAME "HotkeysService" - -// Modifiers for hotkeys -//#define MOD_ALT 0x0001 -//#define MOD_CONTROL 0x0002 -//#define MOD_SHIFT 0x0004 -//#define MOD_WIN 0x0008 -#define MOD_GLOBAL 0x0010 - -// FLAGS -// inherit modifiers from group (specified modifiers ignored) -#define HKS_ACTION_SHAREMODIFIERS 1 -// register item, but disable -#define HKS_INITIALLY_DISABLED 2 - -#if defined(_MSC_VER) -#pragma warning(push) /* save warning settings */ -#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union */ -#endif - -// Structure of hotkey -typedef union -{ - struct - { - WORD key; - WORD modifiers; - }; - DWORD hotkey; - -} THKSHotkey, *PHKSHotkey; - -#if defined(_MSC_VER) -#pragma warning(pop) /* restore warning settings */ -#endif - -// ITEM TYPES -#define HKS_ITEM_MODULE 1 -#define HKS_ITEM_GROUP 2 -#define HKS_ITEM_ACTION 3 -#define HKS_ITEM_MACRO 4 - - -// Structure passed to RegisterItem service. -// Used only for registration pursposes, so free it after call. -// name, owner and itemType field is mandatory. -// owner is item ID or must be 0 for 1st level items (module, single action or macro) -// itemType can be one of ITEM TYPES constants. -// flags can be combined from FLAGS constants. -// Group can contain other groups and items and optionally -// set group modifiers. Only item can be tree leaf. -// If creating group, hotkey.modifiers will be used -// as group modifiers (if nonzero) -// If creating action, hotkey is optional. If hotkey.key is filled, then -// hotkey will be assigned to item (if unused). -// If creating macro, hotkey is mandatory. - -typedef struct -{ - int owner; - char *name; - int itemType; - THKSHotkey hotkey; - int flags; - -} THKSItem, *PHKSItem; - - -// Register item -// wParam: item data in PKHSItem format -// lParam: 0 -// Returns HANDLE called "ID" in loWord. -// For actions and macros, hiWord returns state: 0 if ok, other if passed hotkey -// can't be registered (for example already used) -// In other cases hiWord is useless -#define MS_HKS_REGISTER_ITEM HKS_SERVICE_NAME "/RegisterItem" - -// Unregister item -// If item is Group, then all subItems will be unregistered. -// wParam: item ID -// lParam: 0 -// Returns: 0 on success, other on fail -#define MS_HKS_UNREGISTER_ITEM HKS_SERVICE_NAME "/UnregisterItem" - -// Assign hotkey to item. If item is group, then only -// modifiers are taken as group modifiers. Do not call on modules. -// Hotkey consists of modifiers in hiWord and key in loWord. -// wParam: item ID -// lParam: hotkey as PHKS_Hotkey to register -// Returns: -// on success: hotkey -// on error: 0 -#define MS_HKS_ASSIGN_HOTKEY HKS_SERVICE_NAME "/AssignHotkey" - -// Get hotkey assigned to item. Don't apply to modules. -// wParam: item ID -// lParam: 0 -// Returns: hotkey assigned, 0 otherwise. -#define MS_HKS_GET_HOTKEY HKS_SERVICE_NAME "/GetAssignedHotkey" - -// Unassign hotkey from item. Only valid on action and macro items. -// wParam: item ID -// lParam: 0 -// Returns: 0 on success, other on fail -#define MS_HKS_UNASSIGN_HOTKEY HKS_SERVICE_NAME "/UnassignHotkey" - -// Enable/Disable item. -// If item is group or module, then all subItems will be affected. -// wParam: item ID -// lParam: 1 to enable, anything else to disable -// Returns: 0 on success, other on fail -#define MS_HKS_ENABLE_ITEM HKS_SERVICE_NAME "/EnableItem" - -// Hotkey to text -// wParam: hotkey to textify -// lParam: address to place string, space must be allocated -// Returns: 0 -#define MS_HKS_TO_TEXT HKS_SERVICE_NAME "/HotkeyToText" - -// Get hotkey from text -// wParam: text to convert to hotkey -// lParam: 0 -// Returns: hotkey -#define MS_HKS_FROM_TEXT HKS_SERVICE_NAME "/HotkeyFromText" - - -typedef struct -{ - int itemId; - int moduleId; - char *name; - int itemType; - THKSHotkey hotkey; - -} THKSEvent, *PHKSEvent; - -// Event when hotkey is pressed -// wParam: PHKSEvent -// lParam: 0 -#define ME_HKS_KEY_PRESSED HKS_SERVICE_NAME "/HotkeyPressed" - - - - -// Util functions //////////////////////////////////////////////////////////////////////// - - -__inline static int HKS_RegisterModule(char *name) -{ - THKSItem item = {0}; - - if (!ServiceExists(MS_HKS_REGISTER_ITEM)) - return -1; - - item.name = name; - item.itemType = HKS_ITEM_MODULE; - - return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0)); -} - - -__inline static int HKS_RegisterAction(int owner, char *name, int modifiers, char key, int flags) -{ - THKSItem item = {0}; - - if (!ServiceExists(MS_HKS_REGISTER_ITEM)) - return -1; - - item.owner = owner; - item.name = name; - item.itemType = HKS_ITEM_ACTION; - item.flags = flags; - - if(key != 0) - { - item.hotkey.key = (WORD) key; - item.hotkey.modifiers = (WORD)modifiers; - } - - return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0)); -} - - -__inline static int HKS_RegisterGroup(int owner, char *name, int modifiers, int flags) -{ - THKSItem item = {0}; - - if (!ServiceExists(MS_HKS_REGISTER_ITEM)) - return -1; - - item.owner = owner; - item.name = name; - item.itemType = HKS_ITEM_GROUP; - item.flags = flags; - item.hotkey.modifiers = (WORD)modifiers; - - return LOWORD(CallService(MS_HKS_REGISTER_ITEM, (WPARAM) &item, 0)); -} - -__inline static int HKS_Unregister(int id) -{ - if (!ServiceExists(MS_HKS_UNREGISTER_ITEM)) - return -1; - - return CallService(MS_HKS_UNREGISTER_ITEM, (WPARAM) id, 0); -} - - -#endif diff --git a/plugins/ExternalAPI/m_langman.inc b/plugins/ExternalAPI/m_langman.inc deleted file mode 100644 index dce69e38e6..0000000000 --- a/plugins/ExternalAPI/m_langman.inc +++ /dev/null @@ -1,48 +0,0 @@ -{ - -'Language Pack Manager'-Plugin for -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2005-2007 H. Herkenrath - -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 (LangMan-License.txt); if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -{$ifndef M_LANGMAN_H} -{$define M_LANGMAN_H} - -const - -{ - Language Pack Manager v1.0.2.2 - If you have any question or extension whishes please let me know: - hrathh at users.sourceforge.net -} - -{ interface id } -MIID_LANGMAN: TGUID = '{D80370D5-4B1E-46a8-ACA4-1FAAD79B7D1E}'; - -{ Show the download language dialog. v1.0.2.0+ - wParam : 0 - lParam : 0 -The dialog can't have a parent due to it's asynchronous nature. -If the language window is already opened it will be -brought to front instead (returns success). -Returns 0 on success, nonzero otherwise. -} -MS_LANGMAN_SHOWLANGDIALOG = 'LangMan/ShowLangDialog'; - - -{$endif} // M_LANGMAN_H -- cgit v1.2.3