From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ShellExt/src/shlcom.cpp | 9 +++++---- plugins/ShellExt/src/shlcom.h | 4 ++-- plugins/ShellExt/src/shlext.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/ShellExt/src') diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index 5457f5e307..6de7acdb6c 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -62,7 +62,8 @@ struct TAddArgList int cch; // it's length (with space for NULL char) int count; // number we have so far LPSTR *files; - HANDLE hContact, hEvent; + HCONTACT hContact; + HANDLE hEvent; }; BOOL AddToList(TAddArgList& args) @@ -178,7 +179,7 @@ void __cdecl IssueTransferThread(void *param) struct TSlotInfo { - HANDLE hContact; + HCONTACT hContact; int hProto; int dwStatus; // will be aligned anyway }; @@ -257,7 +258,7 @@ bool ipcGetSortedContacts(THeaderIPC *ipch, int *pSlot, bool bGroupMode) TSlotInfo *pContacts = (TSlotInfo*)mir_alloc((dwContacts + 2) * sizeof(TSlotInfo)); int i = 0; int dwOnline = 0; - for (HANDLE hContact = db_find_first(); hContact != 0; hContact = db_find_next(hContact)) { + for (HCONTACT hContact = db_find_first(); hContact != 0; hContact = db_find_next(hContact)) { if (i >= dwContacts) break; @@ -353,7 +354,7 @@ bool ipcGetSortedContacts(THeaderIPC *ipch, int *pSlot, bool bGroupMode) // worker thread to clear MRU, called by the IPC bridge void __cdecl ClearMRUThread(void*) { - for (HANDLE hContact = db_find_first(); hContact != 0; hContact = db_find_next(hContact)) + for (HCONTACT hContact = db_find_first(); hContact != 0; hContact = db_find_next(hContact)) if ( db_get_b(hContact, SHLExt_Name, SHLExt_MRU, 0) > 0) db_set_b(hContact, SHLExt_Name, SHLExt_MRU, 0); } diff --git a/plugins/ShellExt/src/shlcom.h b/plugins/ShellExt/src/shlcom.h index c7d88349d0..4e78587f61 100644 --- a/plugins/ShellExt/src/shlcom.h +++ b/plugins/ShellExt/src/shlcom.h @@ -86,7 +86,7 @@ struct TSlotIPC BYTE cbSize; int fType; // a REQUEST_* type TSlotIPC *Next; - HANDLE hContact; + HCONTACT hContact; UINT hProto; // hash of the protocol the user is on UINT hGroup; // hash of the entire path (not defined for REQUEST_GROUPS slots) WORD Status; @@ -207,7 +207,7 @@ struct TMenuDrawInfo int cch; int wID; // should be the same as the menu item's ID TSlotDrawTypes fTypes; - HANDLE hContact; + HCONTACT hContact; HICON hStatusIcon; // HICON from Self->ProtoIcons[index].hIcons[status]; Do not DestroyIcon() HBITMAP hStatusBitmap; // HBITMAP, don't free. int pid; diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp index 64f46e1855..7672226989 100644 --- a/plugins/ShellExt/src/shlext.cpp +++ b/plugins/ShellExt/src/shlext.cpp @@ -702,7 +702,7 @@ HRESULT TShellExt::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT _idCmdFirs ///////////////////////////////////////////////////////////////////////////////////////// -HRESULT ipcGetFiles(THeaderIPC *pipch, IDataObject* pDataObject, HANDLE hContact) +HRESULT ipcGetFiles(THeaderIPC *pipch, IDataObject* pDataObject, HCONTACT hContact) { FORMATETC fet; fet.cfFormat = CF_HDROP; -- cgit v1.2.3