diff options
author | George Hazan <george.hazan@gmail.com> | 2012-07-06 14:44:59 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-07-06 14:44:59 +0000 |
commit | 1ed1296853c671fc557599c6daf5fba88d52a21f (patch) | |
tree | e67180dcb6c6b3362d0ec4a597c334353337a644 /plugins | |
parent | e255337491b93977d00bd364d31ef943e821d22a (diff) |
+ stdauth + stdfile;
NEWSTR_ALLOCA / NEWTSTR_ALLOCA / NEWWSTR_ALLOCA moved to m_system.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@792 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Clist_nicer/INCLUDE/clist.h | 9 | ||||
-rw-r--r-- | plugins/Db3x/commonheaders.h | 2 | ||||
-rw-r--r-- | plugins/Db3x_mmap/commonheaders.h | 2 | ||||
-rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/miranda.cpp | 6 | ||||
-rw-r--r-- | plugins/Dbx_mmap_SA/commonheaders.h | 2 | ||||
-rw-r--r-- | plugins/IEView/HistoryHTMLBuilder.cpp | 12 | ||||
-rw-r--r-- | plugins/Import/miranda.cpp | 2 | ||||
-rw-r--r-- | plugins/Variables/contact.cpp | 2 |
8 files changed, 10 insertions, 27 deletions
diff --git a/plugins/Clist_nicer/INCLUDE/clist.h b/plugins/Clist_nicer/INCLUDE/clist.h index f4cabd2419..1969039350 100644 --- a/plugins/Clist_nicer/INCLUDE/clist.h +++ b/plugins/Clist_nicer/INCLUDE/clist.h @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2003 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -25,8 +25,6 @@ int IconFromStatusMode(const char *szProto, int status, HANDLE hContact, HICON * HTREEITEM GetTreeItemByHContact(HANDLE hContact);
void SortContacts(void);
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)_alloca(strlen(A)+1),A)
-
#define CLUIINTM_REDRAW (WM_USER+100)
#define CLUIINTM_STATUSBARUPDATE (WM_USER+101)
#define CLUIINTM_REMOVEFROMTASKBAR (WM_USER+102)
@@ -48,6 +46,3 @@ void SortContacts(void); #define CLVM_USELASTMSG 16
#define CLVM_MODULE "CLVM_W"
-
-
-
diff --git a/plugins/Db3x/commonheaders.h b/plugins/Db3x/commonheaders.h index 0391366b60..84fc492046 100644 --- a/plugins/Db3x/commonheaders.h +++ b/plugins/Db3x/commonheaders.h @@ -62,8 +62,6 @@ extern char szDbPath[MAX_PATH]; #define mir_i64(x) (x##i64)
#endif
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
-
#ifndef MODULAR
void Encrypt(char*msg,BOOL up);
#endif
diff --git a/plugins/Db3x_mmap/commonheaders.h b/plugins/Db3x_mmap/commonheaders.h index 6e1d4bcc28..0d319af5a3 100644 --- a/plugins/Db3x_mmap/commonheaders.h +++ b/plugins/Db3x_mmap/commonheaders.h @@ -62,5 +62,3 @@ extern HANDLE hDbFile; #else
#define mir_i64(x) (x##i64)
#endif
-
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
diff --git a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp b/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp index 21ece87022..c0d56d1bf7 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp @@ -56,8 +56,6 @@ static HANDLE ImportContact(HANDLE hDbFile, struct DBContact Contact); static void ImportHistory(HANDLE hDbFile, struct DBContact Contact, PROTOCOLDESCRIPTOR **protocol, int protoCount);
static int ImportGroups(HANDLE hDbFile, struct DBHeader *pdbHeader);
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
-
// Comment: The Find* functions only return a file offset.
// The Get* functions actually reads the requested
// data from the file and gives you a pointer to a structure
@@ -529,7 +527,7 @@ int CheckFileFormat(HANDLE hDbFile) AddMessage(LPGEN("Secured MMAP: authorization successful"));
bEncrypted = TRUE;
}
- else
+ else
{
AddMessage(LPGEN("You are not authorized for access to Database"));
return DB_INVALID;
@@ -1046,7 +1044,7 @@ int ImportGroups(HANDLE hDbFile, struct DBHeader* pdbHeader) pSetting = GetNextSetting(pSetting);
}
free(pDbSettings);
-
+
/*if (bEncrypted)
EncodeMemory(pDbSettings->blob, pDbSettings->cbBlob);*/
}
diff --git a/plugins/Dbx_mmap_SA/commonheaders.h b/plugins/Dbx_mmap_SA/commonheaders.h index 2fb92e5399..b4c913a694 100644 --- a/plugins/Dbx_mmap_SA/commonheaders.h +++ b/plugins/Dbx_mmap_SA/commonheaders.h @@ -98,8 +98,6 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam); BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam);
void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon);
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
-
typedef struct{
void* (__stdcall *GenerateKey)(char* pwd);
void (__stdcall *FreeKey)(void* key);
diff --git a/plugins/IEView/HistoryHTMLBuilder.cpp b/plugins/IEView/HistoryHTMLBuilder.cpp index 3bce0d8749..bf0c68c8dd 100644 --- a/plugins/IEView/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/HistoryHTMLBuilder.cpp @@ -235,16 +235,16 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event || eventData->iType == IEED_EVENT_URL || eventData->iType == IEED_EVENT_FILE) {
char *szName = NULL;
char *szText = NULL;
- if (eventData->dwFlags & IEEDF_UNICODE_NICK) {
+ if (eventData->dwFlags & IEEDF_UNICODE_NICK)
szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);
- } else {
+ else
szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true);
- }
- if (eventData->dwFlags & IEEDF_UNICODE_TEXT) {
+
+ if (eventData->dwFlags & IEEDF_UNICODE_TEXT)
szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);
- } else {
+ else
szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);
- }
+
/* History++-specific formatting */
const char *className = NULL;
const char *iconFile = NULL;
diff --git a/plugins/Import/miranda.cpp b/plugins/Import/miranda.cpp index e83eaae869..4f616fb714 100644 --- a/plugins/Import/miranda.cpp +++ b/plugins/Import/miranda.cpp @@ -57,8 +57,6 @@ static HANDLE ImportContact(HANDLE hDbFile, struct DBContact Contact); static void ImportHistory(HANDLE hDbFile, struct DBContact Contact, PROTOCOLDESCRIPTOR **protocol, int protoCount);
static int ImportGroups(HANDLE hDbFile, struct DBHeader *pdbHeader);
-#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
-
// Comment: The Find* functions only return a file offset.
// The Get* functions actually reads the requested
// data from the file and gives you a pointer to a structure
diff --git a/plugins/Variables/contact.cpp b/plugins/Variables/contact.cpp index 029f9bf818..9e2f08c83e 100644 --- a/plugins/Variables/contact.cpp +++ b/plugins/Variables/contact.cpp @@ -73,8 +73,6 @@ static builtinCnfs[] = { CCNF_PROTOID, _T(STR_PROTOID) }
};
-#define NEWTSTR_ALLOCA(A) (A==NULL)?NULL:_tcscpy((TCHAR*)alloca(sizeof(TCHAR)*(_tcslen(A)+1)),A)
-
typedef struct {
TCHAR* tszContact;
HANDLE hContact;
|