diff options
Diffstat (limited to 'protocols/SkypeWeb/src')
| -rw-r--r-- | protocols/SkypeWeb/src/requests/login.h | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_avatars.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_db.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_files.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_profile.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/protocols/SkypeWeb/src/requests/login.h b/protocols/SkypeWeb/src/requests/login.h index f77f15c570..7ed847ec7a 100644 --- a/protocols/SkypeWeb/src/requests/login.h +++ b/protocols/SkypeWeb/src/requests/login.h @@ -30,8 +30,8 @@ struct LoginOAuthRequest : public AsyncHttpRequest CMStringA hashStr(::FORMAT, "%s\nskyper\n%s", pszLogin, password);
- BYTE digest[16];
- mir_md5_hash((const BYTE*)hashStr.GetString(), hashStr.GetLength(), digest);
+ uint8_t digest[16];
+ mir_md5_hash((const uint8_t*)hashStr.GetString(), hashStr.GetLength(), digest);
this << CHAR_PARAM("scopes", "client")
<< CHAR_PARAM("clientVersion", mir_urlEncode("0/7.4.85.102/259/").c_str())
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp index ff2a273ea3..0cb850f393 100644 --- a/protocols/SkypeWeb/src/skype_avatars.cpp +++ b/protocols/SkypeWeb/src/skype_avatars.cpp @@ -169,9 +169,9 @@ INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM, LPARAM lParam) if (length != -1) {
rewind(hFile);
- mir_ptr<BYTE> data((uint8_t*)mir_alloc(length));
+ mir_ptr<uint8_t> data((uint8_t*)mir_alloc(length));
- if (data != NULL && fread(data, sizeof(BYTE), length, hFile) == length) {
+ if (data != NULL && fread(data, sizeof(uint8_t), length, hFile) == length) {
const char *szMime = FreeImage_GetFIFMimeType(FreeImage_GetFIFFromFilenameU(path));
PushRequest(new SetAvatarRequest(data, length, szMime, this));
diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp index 886f3b6ddc..9d30f6f8a6 100644 --- a/protocols/SkypeWeb/src/skype_db.cpp +++ b/protocols/SkypeWeb/src/skype_db.cpp @@ -49,7 +49,7 @@ MEVENT CSkypeProto::AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DW dbei.timestamp = timestamp; dbei.eventType = type; dbei.cbBlob = (DWORD)mir_strlen(szMsg) + 1; - dbei.pBlob = (BYTE *)szMsg; + dbei.pBlob = (uint8_t *)szMsg; dbei.flags = flags; dbei.szId = msgId; return db_event_add(hContact, &dbei); diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp index 4bf25eee6a..a28cc9f860 100644 --- a/protocols/SkypeWeb/src/skype_files.cpp +++ b/protocols/SkypeWeb/src/skype_files.cpp @@ -62,8 +62,8 @@ LBL_Error: fseek(pFile, 0, SEEK_SET);
- mir_ptr<BYTE> pData((BYTE*)mir_alloc(lFileLen));
- long lBytes = (long)fread(pData, sizeof(BYTE), lFileLen, pFile);
+ mir_ptr<uint8_t> pData((uint8_t*)mir_alloc(lFileLen));
+ long lBytes = (long)fread(pData, sizeof(uint8_t), lFileLen, pFile);
if (lBytes != lFileLen) {
fclose(pFile);
goto LBL_Error;
diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp index 8999663680..ce025cbfa3 100644 --- a/protocols/SkypeWeb/src/skype_profile.cpp +++ b/protocols/SkypeWeb/src/skype_profile.cpp @@ -253,7 +253,7 @@ void CSkypeProto::UpdateProfileGender(const JSONNode &root, MCONTACT hContact) {
CMStringW gender = root["gender"].as_mstring();
if (!gender.IsEmpty() && gender != "null")
- setByte(hContact, "Gender", (BYTE)(_wtoi(gender) == 1 ? 'M' : 'F'));
+ setByte(hContact, "Gender", (uint8_t)(_wtoi(gender) == 1 ? 'M' : 'F'));
else
delSetting(hContact, "Gender");
}
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index c618956198..fc4682bc1b 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -319,8 +319,8 @@ int CSkypeProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre) for (int i = 0; i < nCount; i++) cbBlob += int(/*mir_wstrlen(isrList[i]->nick.w)*/0 + 2 + mir_wstrlen(isrList[i]->id.w) + mir_strlen(szMessageId)); - BYTE *pBlob = (uint8_t*)mir_calloc(cbBlob); - BYTE *pCurBlob = pBlob; + uint8_t *pBlob = (uint8_t*)mir_calloc(cbBlob); + uint8_t *pCurBlob = pBlob; for (int i = 0; i < nCount; i++) { //mir_strcpy((char*)pCurBlob, _T2A(isrList[i]->nick.w)); |