summaryrefslogtreecommitdiff
path: root/plugins/ContactsPlus/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ContactsPlus/src')
-rw-r--r--plugins/ContactsPlus/src/Version.h14
-rw-r--r--plugins/ContactsPlus/src/contacts.h20
-rw-r--r--plugins/ContactsPlus/src/main.cpp26
-rw-r--r--plugins/ContactsPlus/src/receive.cpp2
-rw-r--r--plugins/ContactsPlus/src/utils.cpp198
5 files changed, 75 insertions, 185 deletions
diff --git a/plugins/ContactsPlus/src/Version.h b/plugins/ContactsPlus/src/Version.h
new file mode 100644
index 0000000000..c7d9ab96d9
--- /dev/null
+++ b/plugins/ContactsPlus/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION 1
+#define __MINOR_VERSION 5
+#define __RELEASE_NUM 2
+#define __BUILD_NUM 0
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Send/receive contacts"
+#define __FILENAME "Contacts.dll"
+#define __DESCRIPTION "Allows you to send and receive contacts."
+#define __AUTHOR "Joe Kucera, Todor Totev"
+#define __AUTHOREMAIL "jokusoftware@miranda-im.org"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "(C) 2004-2008 Joe Kucera, Original Code (C) 2002 Dominus Procellarum"
diff --git a/plugins/ContactsPlus/src/contacts.h b/plugins/ContactsPlus/src/contacts.h
index 1feddfc923..4693a74d4a 100644
--- a/plugins/ContactsPlus/src/contacts.h
+++ b/plugins/ContactsPlus/src/contacts.h
@@ -26,24 +26,12 @@
#include <windows.h>
#include <commctrl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <crtdbg.h>
#include <malloc.h>
#include <time.h>
-//!!this is fake - this plugin maintains backward compatibility internally
-#define MIRANDA_VER 0x0A00
-
#include "newpluginapi.h"
-#include "m_system.h"
-#include "m_protocols.h"
#include "m_protosvc.h"
#include "m_database.h"
-#include "m_utils.h"
#include "m_langpack.h"
#include "m_skin.h"
#include "m_clist.h"
@@ -53,22 +41,16 @@
#include "m_history.h"
#include "m_userinfo.h"
#include "m_button.h"
-#include "m_contacts.h"
#include "m_message.h"
-#include "statusmodes.h"
#include "win2k.h"
#include "resource.h"
-
+#include "Version.h"
#include "utils.h"
#include "send.h"
#include "receive.h"
#define MODULENAME "SendReceiveContacts"
-
#define MS_CONTACTS_SEND "ContactsTransfer/SendContacts"
#define MS_CONTACTS_RECEIVE "ContactsTransfer/ReceiveContacts"
-
-// Global Variables
-extern int g_UnicodeCore;
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index c90ca712f0..a7e3855232 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -45,17 +45,15 @@ HANDLE hHookPreBuildContactMenu = NULL;
HANDLE hContactMenuItem = NULL;
-int g_UnicodeCore;
-
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- "Send/Receive Contacts+",
- PLUGIN_MAKE_VERSION(1,5,2,0),
- "Allows you to send and receive contacts.",
- "Joe Kucera, Todor Totev",
- "jokusoftware@miranda-im.org",
- "(C) 2004-2008 Joe Kucera, Original Code (C) 2002 Dominus Procellarum",
- "http://miranda-ng.org/",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
// {0324785E-74CE-4600-B781-851773B3EFC5}
{0x0324785E, 0x74CE, 0x4600, {0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5}}
@@ -94,8 +92,7 @@ static int HookDBEventAdded(WPARAM wParam, LPARAM lParam)
_snprintfT(caToolTip, 64, "%s %s", SRCTranslateT("Contacts received from", tmp), (TCHAR*)GetContactDisplayNameT(hContact));
cle.ptszTooltip = caToolTip;
- if (g_UnicodeCore)
- cle.flags |= CLEF_UNICODE;
+ cle.flags |= CLEF_UNICODE;
CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);
}
return 0; //continue processing by other hooks
@@ -171,8 +168,7 @@ static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
mi.ptszName = SRCTranslateT("Contacts", tmp);
mi.position = -2000009990; //position in menu
mi.flags = CMIF_KEEPUNTRANSLATED;
- if (g_UnicodeCore)
- mi.flags |= CMIF_UNICODE;
+ mi.flags |= CMIF_UNICODE;
mi.pszService = MS_CONTACTS_SEND;
mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));
hContactMenuItem = Menu_AddContactMenuItem(&mi);
@@ -251,9 +247,7 @@ extern "C" __declspec(dllexport) int Load(void)
InitCommonControls();
InitI18N();
- g_UnicodeCore = true;
-
- //init hooks
+ //init hooks
hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, HookModulesLoaded);
hHookDBEventAdded = HookEvent(ME_DB_EVENT_ADDED, HookDBEventAdded);
hHookContactDeleted = HookEvent(ME_DB_CONTACT_DELETED, HookContactDeleted);
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index d590a3b37b..bd963013ee 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -115,7 +115,7 @@ static void RebuildGroupCombo(HWND hwndDlg)
{
itoa(groupId, caGroupId, 10);
TCHAR* szGroup = DBGetContactSettingStringT(NULL, "CListGroups", caGroupId, NULL);
- int nPrefix = g_UnicodeCore ? sizeof(WCHAR) : sizeof(char);
+ int nPrefix = sizeof(WCHAR);
if (!szGroup) break;
int nIndex = SendMessageT(hGroupsCombo, CB_ADDSTRING, 0, (LPARAM)szGroup + nPrefix);
SendMessageT(hGroupsCombo, CB_SETITEMDATA, nIndex, groupId+1);
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index c51aa9e37f..2fc25c280e 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -63,7 +63,7 @@ void __fastcall SAFE_FREE(void** p)
TCHAR *GetContactDisplayNameT(HANDLE hContact)
{
- return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, g_UnicodeCore ? GCDNF_UNICODE : 0);
+ return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_UNICODE);
}
char *GetContactUID(HANDLE hContact, int bTchar)
@@ -112,7 +112,7 @@ char *GetContactUID(HANDLE hContact, int bTchar)
TCHAR* MirandaStatusToStringT(int mirandaStatus)
{
- return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, g_UnicodeCore ? GSMDF_UNICODE : 0);
+ return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, GSMDF_UNICODE);
}
int DBGetContactSettingT(HANDLE hContact, const char *szModule, const char* szSetting, DBVARIANT *dbv)
@@ -126,39 +126,21 @@ int DBGetContactSettingT(HANDLE hContact, const char *szModule, const char* szSe
TCHAR* DBGetContactSettingStringT(HANDLE hContact, const char *szModule, const char* szSetting, TCHAR* szDef)
{
- DBVARIANT dbv = {DBVT_DELETED};
- TCHAR* szRes;
+ DBVARIANT dbv = {DBVT_DELETED};
+ TCHAR* szRes;
- if (g_UnicodeCore)
- {
- if (DBGetContactSettingWString(hContact, szModule, szSetting, &dbv))
- return strdupT(szDef);
+ if (DBGetContactSettingWString(hContact, szModule, szSetting, &dbv))
+ return strdupT(szDef);
- szRes = strdupT(dbv.ptszVal);
- DBFreeVariant(&dbv);
- }
- else
- {
- if (DBGetContactSettingT(hContact, szModule, szSetting, &dbv))
- return strdupT(szDef);
+ szRes = strdupT(dbv.ptszVal);
+ DBFreeVariant(&dbv);
- if (dbv.type == DBVT_ASCIIZ)
- szRes = ansi_to_tchar(dbv.pszVal);
- else if (dbv.type == DBVT_UTF8)
- szRes = utf8_to_tchar((unsigned char*)dbv.pszVal);
- else
- szRes = strdupT(szDef);
- DBFreeVariant(&dbv);
- }
- return szRes;
+ return szRes;
}
int DBWriteContactSettingStringT(HANDLE hContact, const char *szModule, const char* szSetting, TCHAR* szValue)
{
- if (g_UnicodeCore)
- return DBWriteContactSettingWString(hContact, szModule, szSetting, (WCHAR*)szValue);
- else
- return DBWriteContactSettingString(hContact, szModule, szSetting, (char*)szValue);
+ return DBWriteContactSettingWString(hContact, szModule, szSetting, (WCHAR*)szValue);
}
@@ -270,42 +252,23 @@ void EnableDlgItem(HWND hwndDlg, UINT control, int state)
LRESULT SendMessageT(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
- if (g_UnicodeCore)
- return SendMessageW(hWnd, Msg, wParam, lParam);
- else
- return SendMessageA(hWnd, Msg, wParam, lParam);
+ return SendMessageW(hWnd, Msg, wParam, lParam);
}
TCHAR* GetWindowTextT(HWND hWnd)
{
- if (g_UnicodeCore)
- {
- int len = GetWindowTextLengthW(hWnd) + 1;
- WCHAR* txt = (WCHAR*)malloc(len * sizeof(WCHAR));
- if (txt) {
- txt[0] = 0;
- GetWindowTextW(hWnd, txt, len);
- }
- return (TCHAR*)txt;
- }
- else
- {
- int len = GetWindowTextLengthA(hWnd) + 1;
- char* txt = (char*)malloc(len * sizeof(char));
- if (txt) {
- txt[0] = 0;
- GetWindowTextA(hWnd, txt, len);
- }
- return (TCHAR*)txt;
- }
+ int len = GetWindowTextLengthW(hWnd) + 1;
+ WCHAR* txt = (WCHAR*)malloc(len * sizeof(WCHAR));
+ if (txt) {
+ txt[0] = 0;
+ GetWindowTextW(hWnd, txt, len);
+ }
+ return (TCHAR*)txt;
}
BOOL SetWindowTextT(HWND hWnd, TCHAR* lpString)
{
- if (g_UnicodeCore)
- return SetWindowTextW(hWnd, (WCHAR*)lpString);
- else
- return SetWindowTextA(hWnd, lpString);
+ return SetWindowTextW(hWnd, (WCHAR*)lpString);
}
TCHAR* GetDlgItemTextT(HWND hDlg, int nIDDlgItem)
@@ -320,15 +283,12 @@ BOOL SetDlgItemTextT(HWND hDlg, int nIDDlgItem, TCHAR* lpString)
HWND CreateDialogParamT(HINSTANCE hInstance, const char* szTemplate, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam)
{
- if (g_UnicodeCore)
- return CreateDialogParamW(hInstance, (LPCWSTR)szTemplate, hWndParent, lpDialogFunc, dwInitParam);
- else
- return CreateDialogParamA(hInstance, szTemplate, hWndParent, lpDialogFunc, dwInitParam);
+ return CreateDialogParamW(hInstance, (LPCWSTR)szTemplate, hWndParent, lpDialogFunc, dwInitParam);
}
int ListView_InsertColumnT(HWND hwnd, int iCol, const LPLVCOLUMN pcol)
{
- return SendMessageT(hwnd, g_UnicodeCore ? LVM_INSERTCOLUMNW : LVM_INSERTCOLUMNA, (WPARAM)iCol, (LPARAM)pcol);
+ return SendMessageT(hwnd, LVM_INSERTCOLUMNW, (WPARAM)iCol, (LPARAM)pcol);
}
void ListView_SetItemTextT(HWND hwnd, int i, int iSubItem, TCHAR* pszText)
@@ -337,102 +297,67 @@ void ListView_SetItemTextT(HWND hwnd, int i, int iSubItem, TCHAR* pszText)
lvi.iSubItem = iSubItem;
lvi.pszText = pszText;
- SendMessageT(hwnd, g_UnicodeCore ? LVM_SETITEMTEXTW : LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM)&lvi);
+ SendMessageT(hwnd, LVM_SETITEMTEXTW, (WPARAM)i, (LPARAM)&lvi);
}
size_t __fastcall strlenT(const TCHAR *string)
{
- if (string)
- {
- if (g_UnicodeCore)
- return wcslen((WCHAR*)string);
- else
- return strlen((char*)string);
- }
- return 0;
+ if (string)
+ return wcslen((WCHAR*)string);
+ return 0;
}
TCHAR* __fastcall strdupT(const TCHAR *string)
{
- if (string)
- {
- if (g_UnicodeCore)
- return (TCHAR*)wcsdup((WCHAR*)string);
- else
- return (TCHAR*)strdup((char*)string);
- }
- return NULL;
+ if (string)
+ return (TCHAR*)wcsdup((WCHAR*)string);
+ return NULL;
}
int __fastcall strcmpT(const TCHAR *string1, const TCHAR *string2)
{
- if (!string1 || !string2) return 1;
+ if (!string1 || !string2) return 1;
- if (g_UnicodeCore)
- return wcscmp((WCHAR*)string1, (WCHAR*)string2);
- else
- return strcmp((char*)string1, (char*)string2);
+ return wcscmp((WCHAR*)string1, (WCHAR*)string2);
}
TCHAR* __fastcall strcpyT(TCHAR* dest, const TCHAR* src)
{
- if (src)
- {
- if (g_UnicodeCore)
- return (TCHAR*)wcscpy((WCHAR*)dest, (WCHAR*)src);
- else
- return (TCHAR*)strcpy((char*)dest, (char*)src);
- }
- return dest;
+ if (src)
+ return (TCHAR*)wcscpy((WCHAR*)dest, (WCHAR*)src);
+ return dest;
}
TCHAR* __fastcall strncpyT(TCHAR* dest, const TCHAR* src, size_t len)
{
- if (src)
- {
- if (g_UnicodeCore)
- return (TCHAR*)wcsncpy((WCHAR*)dest, (WCHAR*)src, len);
- else
- return (TCHAR*)strncpy((char*)dest, (char*)src, len);
- }
- return dest;
+ if (src)
+ return (TCHAR*)wcsncpy((WCHAR*)dest, (WCHAR*)src, len);
+ return dest;
}
TCHAR* __fastcall strcatT(TCHAR* dest, const TCHAR* src)
{
- if (src)
- {
- if (g_UnicodeCore)
- return (TCHAR*)wcscat((WCHAR*)dest, (WCHAR*)src);
- else
- return (TCHAR*)strcat((char*)dest, (char*)src);
- }
- return dest;
+ if (src)
+ return (TCHAR*)wcscat((WCHAR*)dest, (WCHAR*)src);
+ return dest;
}
int _snprintfT(TCHAR *buffer, size_t count, const char* fmt, ...)
{
- va_list va;
- int len;
+ va_list va;
+ int len;
- va_start(va, fmt);
- if (g_UnicodeCore)
- {
- TCHAR* wfmt = ansi_to_tchar(fmt);
+ va_start(va, fmt);
+ TCHAR* wfmt = ansi_to_tchar(fmt);
- len = _vsnwprintf((WCHAR*)buffer, count-1, (WCHAR*)wfmt, va);
- ((WCHAR*)buffer)[count-1] = 0;
- SAFE_FREE((void**)&wfmt);
- }
- else
- {
- len = _vsnprintf((char*)buffer, count-1, fmt, va);
- ((char*)buffer)[count-1] = 0;
- }
- va_end(va);
- return len;
+ len = _vsnwprintf((WCHAR*)buffer, count-1, (WCHAR*)wfmt, va);
+ ((WCHAR*)buffer)[count-1] = 0;
+ SAFE_FREE((void**)&wfmt);
+
+ va_end(va);
+ return len;
}
TCHAR* __fastcall SRCTranslateT(const char* src, const WCHAR* unibuf)
@@ -444,8 +369,6 @@ TCHAR* __fastcall SRCTranslateT(const char* src, const WCHAR* unibuf)
return "";
}
- if (g_UnicodeCore)
- { // we give WCHAR
WCHAR *unicode;
int wchars, err;
@@ -465,9 +388,6 @@ TCHAR* __fastcall SRCTranslateT(const char* src, const WCHAR* unibuf)
if (err != wchars) return NULL; // Failure
return (TCHAR*)TranslateW(unicode);
- }
- else
- return (TCHAR*)Translate(src);
}
static BOOL bHasCP_UTF8 = FALSE;
@@ -746,8 +666,6 @@ static int utf8_decode(const unsigned char *from, char **to)
TCHAR* ansi_to_tchar(const char* src, int codepage)
{
- if (g_UnicodeCore)
- {
WCHAR *unicode;
int wchars, err;
@@ -766,15 +684,10 @@ TCHAR* ansi_to_tchar(const char* src, int codepage)
}
return (TCHAR*)unicode;
- }
- else
- return strdupT((TCHAR*)src);
}
char* tchar_to_ansi(const TCHAR* src)
{
- if (g_UnicodeCore)
- {
char *ansi;
int chars;
int err;
@@ -793,22 +706,9 @@ char* tchar_to_ansi(const TCHAR* src)
return NULL;
}
return ansi;
- }
- else
- return (char*)strdupT(src);
}
TCHAR* utf8_to_tchar(const unsigned char* utf)
{
- if (g_UnicodeCore)
return (TCHAR*)make_unicode_string(utf);
- else
- {
- char* szAnsi = NULL;
-
- if (utf8_decode(utf, &szAnsi))
- return (TCHAR*)szAnsi;
- else
- return NULL; // Failure
- }
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 07:02:59 +0000