From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/src/avatar.cpp | 24 ++++++++++++------------ protocols/Yahoo/src/file_transfer.cpp | 2 +- protocols/Yahoo/src/im.cpp | 4 ++-- protocols/Yahoo/src/options.cpp | 14 +++++++------- protocols/Yahoo/src/proto.cpp | 22 +++++++++++----------- protocols/Yahoo/src/services.cpp | 10 +++++----- protocols/Yahoo/src/user_info.cpp | 6 +++--- protocols/Yahoo/src/util.cpp | 8 ++++---- protocols/Yahoo/src/yahoo.cpp | 18 +++++++++--------- 9 files changed, 54 insertions(+), 54 deletions(-) (limited to 'protocols/Yahoo/src') diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp index d9d32221e7..856e04b282 100644 --- a/protocols/Yahoo/src/avatar.cpp +++ b/protocols/Yahoo/src/avatar.cpp @@ -291,7 +291,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p LOG(("[ext_yahoo_got_picture] Sending url: %s checksum: %d to '%s'!", dbv.pszVal, cksum, who)); //void yahoo_send_picture_info(int id, const char *me, const char *who, const char *pic_url, int cksum) yahoo_send_picture_info(m_id, who, 2, dbv.pszVal, cksum); - DBFreeVariant(&dbv); + db_free(&dbv); break; } else LOG(("No AvatarURL???")); @@ -301,7 +301,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p */ if (GetByte("AvatarUL", 0) != 1) { // NO avatar URL?? - if (!DBGetContactSettingTString(NULL, m_szModuleName, "AvatarFile", &dbv)) { + if (!db_get_ts(NULL, m_szModuleName, "AvatarFile", &dbv)) { struct _stat statbuf; if (_tstat( dbv.ptszVal, &statbuf ) != 0) { @@ -311,7 +311,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p SendAvatar(dbv.ptszVal); } - DBFreeVariant(&dbv); + db_free(&dbv); } else { LOG(("[ext_yahoo_got_picture] No Local Avatar File??? ")); } @@ -415,7 +415,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p LOG(("[ext_yahoo_got_picture] We just reuploaded! Stop screwing with Yahoo FT. ")); // don't leak stuff - DBFreeVariant(&dbv); + db_free(&dbv); break; }*/ @@ -423,10 +423,10 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p LOG(("[ext_yahoo_got_picture] Buddy: %s told us this is bad??Expired??. Re-uploading", who)); db_unset(NULL, m_szModuleName, "AvatarURL"); - if (!DBGetContactSettingTString(NULL, m_szModuleName, "AvatarFile", &dbv2)) { + if (!db_get_ts(NULL, m_szModuleName, "AvatarFile", &dbv2)) { db_set_s(NULL, m_szModuleName, "AvatarInv", who); SendAvatar(dbv2.ptszVal); - DBFreeVariant(&dbv2); + db_free(&dbv2); } else { LOG(("[ext_yahoo_got_picture] No Local Avatar File??? ")); } @@ -435,7 +435,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p yahoo_send_picture_info(m_id, who, 2, dbv.pszVal, mcksum); } // don't leak stuff - DBFreeVariant(&dbv); + db_free(&dbv); } else { LOG(("[ext_yahoo_got_picture] no AvatarURL?")); } @@ -562,7 +562,7 @@ void CYahooProto::ext_got_picture_upload(const char *me, const char *url,unsigne yahoo_send_picture_info(m_id, dbv.pszVal, 2, url, cksum); db_unset(NULL, m_szModuleName, "AvatarInv"); - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -667,7 +667,7 @@ INT_PTR __cdecl CYahooProto::GetAvatarInfo(WPARAM wParam,LPARAM lParam) if (!GetString(AI->hContact, YAHOO_LOGINID, &dbv)) { DebugLog("[YAHOO_GETAVATARINFO] For: %s", dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); }else { DebugLog("[YAHOO_GETAVATARINFO]"); } @@ -711,7 +711,7 @@ INT_PTR __cdecl CYahooProto::GetAvatarInfo(WPARAM wParam,LPARAM lParam) DebugLog("[YAHOO_GETAVATARINFO] Requesting avatar!"); request_avatar(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return GAIR_WAITFOR; } else { @@ -799,14 +799,14 @@ INT_PTR __cdecl CYahooProto::GetMyAvatar(WPARAM wParam, LPARAM lParam) int ret = -3; if (GetDword("AvatarHash", 0)) { - if (!DBGetContactSettingTString(NULL, m_szModuleName, "AvatarFile", &dbv)) { + if (!db_get_ts(NULL, m_szModuleName, "AvatarFile", &dbv)) { if (_taccess(dbv.ptszVal, 0) == 0) { lstrcpyn(buffer, dbv.ptszVal, size-1); buffer[size-1] = '\0'; ret = 0; } - DBFreeVariant(&dbv); + db_free(&dbv); } } diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp index 2b5aa75c21..46acda427b 100644 --- a/protocols/Yahoo/src/file_transfer.cpp +++ b/protocols/Yahoo/src/file_transfer.cpp @@ -753,7 +753,7 @@ HANDLE __cdecl CYahooProto::SendFile( HANDLE hContact, const PROTOCHAR* szDescri sf = new_ft(this, m_id, hContact, dbv.pszVal, ( char* )szDescription, NULL, NULL, 0, fs, 1 /* sending */); - DBFreeVariant(&dbv); + db_free(&dbv); if (sf == NULL) { DebugLog("SF IS NULL!!!"); diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp index 607221d2c9..4892832ed0 100644 --- a/protocols/Yahoo/src/im.cpp +++ b/protocols/Yahoo/src/im.cpp @@ -210,7 +210,7 @@ int __cdecl CYahooProto::SendMsg( HANDLE hContact, int flags, const char* pszSrc YForkThread( &CYahooProto::im_sendacksuccess, hContact ); - DBFreeVariant(&dbv); + db_free(&dbv); return 1; } @@ -252,7 +252,7 @@ INT_PTR __cdecl CYahooProto::SendNudge(WPARAM wParam, LPARAM lParam) DBVARIANT dbv; if (!GetString(hContact, YAHOO_LOGINID, &dbv)) { send_msg(dbv.pszVal, GetWord(hContact, "yprotoid", 0), "", 0); - DBFreeVariant(&dbv); + db_free(&dbv); YForkThread( &CYahooProto::im_sendacksuccess, hContact ); return 1; diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index 08b5cbcfda..cc3e96913e 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -38,19 +38,19 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if ( !ppro->GetString( YAHOO_LOGINID, &dbv )) { SetDlgItemTextA(hwndDlg,IDC_HANDLE,dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if ( !ppro->GetString("Nick", &dbv )) { SetDlgItemTextA(hwndDlg,IDC_NICK,dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if ( !ppro->GetString( YAHOO_PASSWORD, &dbv )) { //bit of a security hole here, since it's easy to extract a password from an edit box CallService( MS_DB_CRYPT_DECODESTRING, strlen( dbv.pszVal )+1, (LPARAM)dbv.pszVal ); SetDlgItemTextA( hwndDlg, IDC_PASSWORD, dbv.pszVal ); - DBFreeVariant( &dbv ); + db_free( &dbv ); } //SetButtonCheck( hwndDlg, IDC_DISABLE_UTF8, ppro->GetByte("DisableUTF8", 0)); @@ -105,7 +105,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, reconnectRequired = TRUE; if ( dbv.pszVal != NULL) - DBFreeVariant( &dbv ); + db_free( &dbv ); ppro->SetString( YAHOO_LOGINID, str ); @@ -115,7 +115,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if ( ppro->GetString( YAHOO_PASSWORD, &dbv ) || lstrcmpA( str, dbv.pszVal )) reconnectRequired = TRUE; if ( dbv.pszVal != NULL) - DBFreeVariant( &dbv ); + db_free( &dbv ); ppro->SetString( YAHOO_PASSWORD, str ); GetDlgItemTextA( hwndDlg, IDC_NICK, str, sizeof( str )); @@ -171,7 +171,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wPar if ( !ppro->GetString( YAHOO_LOGINSERVER, &dbv )) { SetDlgItemTextA( hwndDlg, IDC_LOGINSERVER, dbv.pszVal ); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else SetDlgItemTextA( hwndDlg, IDC_LOGINSERVER, ppro->GetByte("YahooJapan", 0) @@ -225,7 +225,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wPar reconnectRequired = TRUE; if ( dbv.pszVal != NULL) - DBFreeVariant( &dbv ); + db_free( &dbv ); ppro->SetString( YAHOO_LOGINSERVER, str ); diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 245a1fbd1f..e24666ef02 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -459,7 +459,7 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) lstrcpynA(m_yahoo_id, dbv.pszVal, 255); } else err++; - DBFreeVariant(&dbv); + db_free(&dbv); } else { ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID); err++; @@ -475,7 +475,7 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) } else err++; - DBFreeVariant(&dbv); + db_free(&dbv); } else { ProtoBroadcastAck(m_szModuleName, NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_WRONGPASSWORD); err++; @@ -502,7 +502,7 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) m_pw_token = strdup(dbv.pszVal); } - DBFreeVariant(&dbv); + db_free(&dbv); } //db_get_w(NULL, m_szModuleName, "StartupStatus", status); @@ -546,14 +546,14 @@ void __cdecl CYahooProto::get_status_thread(HANDLE hContact) if (!GetString(hContact, "YGMsg", &dbv)) { gm = strdup(dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } - if (! DBGetContactSettingString(hContact, "CList", "StatusMsg", &dbv )) { + if (! db_get_s(hContact, "CList", "StatusMsg", &dbv )) { if (lstrlenA(dbv.pszVal) >= 1) sm = strdup(dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { WORD status = GetWord(hContact, "YStatus", YAHOO_STATUS_OFFLINE); sm = yahoo_status_code( yahoo_status( status )); @@ -704,7 +704,7 @@ int __cdecl CYahooProto::UserIsTyping( HANDLE hContact, int type ) if (type == PROTOTYPE_SELFTYPING_OFF || type == PROTOTYPE_SELFTYPING_ON) { sendtyping(dbv.pszVal, GetWord(hContact, "yprotoid", 0), type == PROTOTYPE_SELFTYPING_ON?1:0); } - DBFreeVariant(&dbv); + db_free(&dbv); } return 0; } @@ -756,14 +756,14 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if ( !ppro->GetString(YAHOO_LOGINID, &dbv)) { SetDlgItemTextA(hwndDlg, IDC_HANDLE, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if ( !ppro->GetString(YAHOO_PASSWORD, &dbv)) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } SetButtonCheck( hwndDlg, IDC_YAHOO_JAPAN, ppro->GetByte("YahooJapan", 0)); @@ -808,7 +808,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM reconnectRequired = TRUE; if ( dbv.pszVal != NULL) - DBFreeVariant( &dbv ); + db_free( &dbv ); ppro->SetString(YAHOO_LOGINID, str); GetDlgItemTextA(hwndDlg, IDC_PASSWORD, str, sizeof(str)); @@ -817,7 +817,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if ( ppro->GetString( YAHOO_PASSWORD, &dbv ) || lstrcmpA( str, dbv.pszVal )) reconnectRequired = TRUE; if ( dbv.pszVal != NULL) - DBFreeVariant( &dbv ); + db_free( &dbv ); if (reconnectRequired ) { db_unset(NULL, ppro->m_szModuleName, YAHOO_PWTOKEN); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 6aed26d1a0..1ad0249b06 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -109,7 +109,7 @@ int __cdecl CYahooProto::OnContactDeleted( WPARAM wParam, LPARAM lParam ) DebugLog("[YahooContactDeleted] Removing %s", dbv.pszVal); remove_buddy(dbv.pszVal, GetWord(hContact, "yprotoid", 0)); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { DebugLog("[YahooContactDeleted] Can't retrieve contact Yahoo ID"); } @@ -133,11 +133,11 @@ static INT_PTR CALLBACK DlgProcSetCustStat(HWND hwndDlg, UINT msg, WPARAM wParam SendMessage( hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)ppro->LoadIconEx("yahoo", true )); SendMessage( hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)ppro->LoadIconEx("yahoo")); - if ( !DBGetContactSettingString( NULL, ppro->m_szModuleName, YAHOO_CUSTSTATDB, &dbv )) { + if ( !db_get_s( NULL, ppro->m_szModuleName, YAHOO_CUSTSTATDB, &dbv )) { SetDlgItemTextA( hwndDlg, IDC_CUSTSTAT, dbv. pszVal ); EnableWindow( GetDlgItem( hwndDlg, IDOK ), lstrlenA(dbv.pszVal) > 0); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { SetDlgItemTextA( hwndDlg, IDC_CUSTSTAT, ""); @@ -269,7 +269,7 @@ INT_PTR __cdecl CYahooProto::OnShowProfileCommand( WPARAM wParam, LPARAM lParam return 0; _snprintf( tUrl, sizeof( tUrl ), "http://profiles.yahoo.com/%s", dbv.pszVal ); - DBFreeVariant( &dbv ); + db_free( &dbv ); OpenURL(tUrl, 0); return 0; @@ -295,7 +295,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand( WPARAM wParam, LPARAM lPara char tUrl[ 4096 ]; _snprintf( tUrl, sizeof( tUrl ), "http://profiles.yahoo.com/%s", dbv.pszVal ); - DBFreeVariant( &dbv ); + db_free( &dbv ); OpenURL(tUrl, 0); return 0; diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp index 26c8e484c9..05def506b0 100644 --- a/protocols/Yahoo/src/user_info.cpp +++ b/protocols/Yahoo/src/user_info.cpp @@ -64,7 +64,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc( HWND hwndDlg, UINT msg, WPARAM wPa if (ppro->GetString( hContact, YAHOO_LOGINID, &dbv ) == 0) { strcpy(z, dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { strcpy(z, "???"); } @@ -73,7 +73,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc( HWND hwndDlg, UINT msg, WPARAM wPa if (ppro->GetString( hContact, "Transport", &dbv ) == 0) { strcpy(z, dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { strcpy(z, "Yahoo"); } @@ -82,7 +82,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc( HWND hwndDlg, UINT msg, WPARAM wPa if (ppro->GetString( hContact, "MirVer", &dbv ) == 0) { strcpy(z, dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else { strcpy(z, "???"); } diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index 864fedd128..0a02e6b498 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -166,15 +166,15 @@ int CYahooProto::SendBroadcast( HANDLE hContact, int type, int result, HANDLE hP } int CYahooProto::GetString(const char* name, DBVARIANT* result) -{ return DBGetContactSettingString(NULL, m_szModuleName, name, result); +{ return db_get_s(NULL, m_szModuleName, name, result); } int CYahooProto::GetString(HANDLE hContact, const char* name, DBVARIANT* result) -{ return DBGetContactSettingString(hContact, m_szModuleName, name, result); +{ return db_get_s(hContact, m_szModuleName, name, result); } int CYahooProto::GetStringUtf(HANDLE hContact, const char* name, DBVARIANT* result) -{ return DBGetContactSettingStringUtf(hContact, m_szModuleName, name, result); +{ return db_get_utf(hContact, m_szModuleName, name, result); } void CYahooProto::SetString(const char* name, const char* value) @@ -291,7 +291,7 @@ int __cdecl CYahooProto::OnSettingChanged(WPARAM wParam, LPARAM lParam) if (!GetString((HANDLE)wParam, YAHOO_LOGINID, &dbv)) { int iAdd = (ID_STATUS_OFFLINE == GetWord((HANDLE) wParam, "ApparentMode", 0)); stealth(dbv.pszVal, iAdd); - DBFreeVariant(&dbv); + db_free(&dbv); } } return 0; diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index ada93c72db..f7cce7d094 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -196,7 +196,7 @@ void CYahooProto::remove_buddy(const char *who, int protocol) } yahoo_remove_buddy(m_id, who, protocol, dbv.pszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } void CYahooProto::sendtyping(const char *who, int protocol, int stat) @@ -244,7 +244,7 @@ void CYahooProto::AddBuddy(HANDLE hContact, const char *group, const TCHAR *msg) if (!GetString(hContact, YAHOO_LOGINID, &dbv)) { who = strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else return; @@ -255,19 +255,19 @@ void CYahooProto::AddBuddy(HANDLE hContact, const char *group, const TCHAR *msg) if (!GetString(hContact, "MyIdentity", &dbv)) { ident = strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!GetStringUtf(NULL, "FirstName", &dbv)) { fname = strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } if (!GetStringUtf(NULL, "LastName", &dbv)) { lname = strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } SetStringUtf(hContact, "YGroup", group); @@ -298,7 +298,7 @@ HANDLE CYahooProto::getbuddyH(const char *yahoo_id) { int tCompareResult = lstrcmpiA( dbv.pszVal, yahoo_id ); - DBFreeVariant( &dbv ); + db_free( &dbv ); if ( tCompareResult ) continue; } @@ -359,7 +359,7 @@ const char* CYahooProto::find_buddy( const char *yahoo_id) return NULL; strncpy(nick, dbv.pszVal, 128); - DBFreeVariant( &dbv ); + db_free( &dbv ); return nick; } @@ -647,7 +647,7 @@ void CYahooProto::ext_got_stealth(char *stealthlist) db_unset(hContact, m_szModuleName, "ApparentMode"); } - DBFreeVariant( &dbv ); + db_free( &dbv ); } } } @@ -1563,7 +1563,7 @@ void CYahooProto::ext_login(enum yahoo_status login_mode) if (host[0] == '\0') { if (!GetString(YAHOO_LOGINSERVER, &dbv)) { mir_snprintf(host, sizeof(host), "%s", dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { snprintf(host, sizeof(host), "%s", -- cgit v1.2.3