From cddcd7483a7c472598af098e759e5d309024f606 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 20:31:39 +0300 Subject: DWORD -> uint32_t --- protocols/Sametime/src/conference.cpp | 6 +++--- protocols/Sametime/src/files.cpp | 2 +- protocols/Sametime/src/glib/giowin32.c | 2 +- protocols/Sametime/src/glib/gmain.c | 2 +- protocols/Sametime/src/glib/gutils.c | 2 +- protocols/Sametime/src/options.cpp | 2 +- protocols/Sametime/src/sametime_session.cpp | 4 ++-- protocols/Sametime/src/userlist.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 6ff9a1bf89..fe3fcd5957 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -188,7 +188,7 @@ void mwServiceConf_on_peer_joined(mwConference* conf, mwLoginInfo *user) gce.pszNick.w = tszUserName; gce.pszUID.w = tszUserId; gce.pszStatus.w = L"Normal"; - gce.time = (DWORD)time(0); + gce.time = (uint32_t)time(0); Chat_Event( &gce); @@ -214,7 +214,7 @@ void mwServiceConf_on_peer_parted(mwConference* conf, mwLoginInfo* user) gce.pszNick.w = tszUserName; gce.pszUID.w = tszUserId; gce.pszStatus.w = L"Normal"; - gce.time = (DWORD)time(0); + gce.time = (uint32_t)time(0); Chat_Event(&gce); } @@ -235,7 +235,7 @@ void mwServiceConf_on_text(mwConference* conf, mwLoginInfo* user, const char* wh gce.pszText.w = textT; gce.pszNick.w = tszUserName; gce.pszUID.w = tszUserId; - gce.time = (DWORD)time(0); + gce.time = (uint32_t)time(0); Chat_Event(&gce); } diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index e5dde87da3..daa8ccba13 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -286,7 +286,7 @@ HANDLE CSametimeProto::SendFilesToUser(MCONTACT hContact, wchar_t** files, const for (int i = 0; files[i]; i++) { HANDLE hFile = CreateFile(files[i], GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0, nullptr); if (hFile != INVALID_HANDLE_VALUE) { - DWORD filesize = GetFileSize(hFile, nullptr); + uint32_t filesize = GetFileSize(hFile, nullptr); wchar_t *fn = wcsrchr(files[i], '\\'); if (fn) diff --git a/protocols/Sametime/src/glib/giowin32.c b/protocols/Sametime/src/glib/giowin32.c index 3a0b92655e..80858b114c 100644 --- a/protocols/Sametime/src/glib/giowin32.c +++ b/protocols/Sametime/src/glib/giowin32.c @@ -847,7 +847,7 @@ g_io_win32_check (GSource *source) else if (watch->channel->is_readable) { INPUT_RECORD buffer; - DWORD n; + DWORD n; if (PeekConsoleInput ((HANDLE) watch->pollfd.fd, &buffer, 1, &n) && n == 1) { diff --git a/protocols/Sametime/src/glib/gmain.c b/protocols/Sametime/src/glib/gmain.c index 5bba96d60d..e62edfba54 100644 --- a/protocols/Sametime/src/glib/gmain.c +++ b/protocols/Sametime/src/glib/gmain.c @@ -3871,7 +3871,7 @@ g_child_watch_check (GSource *source) if (child_exited) { - DWORD child_status; + DWORD child_status; /* * Note: We do _not_ check for the special value of STILL_ACTIVE diff --git a/protocols/Sametime/src/glib/gutils.c b/protocols/Sametime/src/glib/gutils.c index 49bbadbee0..0518d31638 100644 --- a/protocols/Sametime/src/glib/gutils.c +++ b/protocols/Sametime/src/glib/gutils.c @@ -147,7 +147,7 @@ static HMODULE glib_dll = NULL; BOOL WINAPI DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, + uint32_t fdwReason, LPVOID lpvReserved) { if (fdwReason == DLL_PROCESS_ATTACH) diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index 185e7d947e..e96404360a 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -368,7 +368,7 @@ void CSametimeProto::LoadOptions() options.client_id = db_get_dw(0, m_szModuleName, "ClientID", DEFAULT_ID); options.client_versionMajor = db_get_dw(0, m_szModuleName, "ClientVersionMajor", DEFAULT_CV_MAJOR); - DWORD defaultCVMinor; + uint32_t defaultCVMinor; if (db_get_b(0, m_szModuleName, "UseOldClientVer", 0) == 1){ // if sb have checked old deprecated option 'Use old client version' respect it defaultCVMinor = 0x001d; diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 925681abdd..84d8ed15d2 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -245,7 +245,7 @@ int CSametimeProto::SetSessionStatus(int status) if (idle_timerid) KillTimer(nullptr, idle_timerid); - us.time = (DWORD)time(0); + us.time = (uint32_t)time(0); //us.time = 0; switch (status) { @@ -284,7 +284,7 @@ VOID CALLBACK IdleTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD) if (proto->idle_status) { struct mwUserStatus us; - us.time = (DWORD)time(0); + us.time = (uint32_t)time(0); us.status = mwStatus_IDLE; us.desc = nullptr; mwSession_setUserStatus(proto->session, &us); diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp index 9d3ee43a98..fe90f548c1 100644 --- a/protocols/Sametime/src/userlist.cpp +++ b/protocols/Sametime/src/userlist.cpp @@ -230,7 +230,7 @@ void CSametimeProto::ExportContactsToList(mwSametimeList* user_list) ptrW ptszGroup(mir_utf8decodeW(group_alias)); MGROUP hGroup = Clist_GroupExists(ptszGroup); if (hGroup) { - DWORD expanded; + uint32_t expanded; Clist_GroupGetName(hGroup, &expanded); group_open = (expanded != 0); } @@ -520,7 +520,7 @@ void mwAwareList_on_aware(mwAwareList* list, mwAwareSnapshot* aware) new_status = ID_STATUS_AWAY; db_set_w(hContact, proto->m_szModuleName, "Status", new_status); } - db_set_dw(hContact, proto->m_szModuleName, "IdleTS", (DWORD)time(0)); + db_set_dw(hContact, proto->m_szModuleName, "IdleTS", (uint32_t)time(0)); break; case mwStatus_BUSY: new_status = ID_STATUS_DND; -- cgit v1.2.3