summaryrefslogtreecommitdiff
path: root/plugins/Scriver/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Scriver/src')
-rw-r--r--plugins/Scriver/src/chat_options.cpp8
-rw-r--r--plugins/Scriver/src/globals.h10
-rw-r--r--plugins/Scriver/src/msgdialog.cpp2
-rw-r--r--plugins/Scriver/src/msglog.cpp6
-rw-r--r--plugins/Scriver/src/msgoptions.cpp8
-rw-r--r--plugins/Scriver/src/msgs.h8
-rw-r--r--plugins/Scriver/src/msgutils.cpp6
-rw-r--r--plugins/Scriver/src/stdafx.h2
-rw-r--r--plugins/Scriver/src/tabs.cpp8
9 files changed, 29 insertions, 29 deletions
diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index a195e40644..adc391c014 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -71,7 +71,7 @@ static HTREEITEM InsertBranch(HWND hwndTree, wchar_t *pszDescr, BOOL bExpanded)
return TreeView_InsertItem(hwndTree, &tvis);
}
-static void FillBranch(HWND hwndTree, HTREEITEM hParent, struct branch_t *branch, int nValues, DWORD defaultval)
+static void FillBranch(HWND hwndTree, HTREEITEM hParent, struct branch_t *branch, int nValues, uint32_t defaultval)
{
int iState;
@@ -106,7 +106,7 @@ static void SaveBranch(HWND hwndTree, struct branch_t *branch, int nValues)
iState |= branch[i].iMode;
if (iState&GC_EVENT_ADDSTATUS)
iState |= GC_EVENT_REMOVESTATUS;
- db_set_dw(0, CHAT_MODULE, branch[i].szDBName, (DWORD)iState);
+ db_set_dw(0, CHAT_MODULE, branch[i].szDBName, (uint32_t)iState);
}
else db_set_b(0, CHAT_MODULE, branch[i].szDBName, bChecked);
}
@@ -614,9 +614,9 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar
db_set_w(0, CHAT_MODULE, "PopupTimeout", (uint16_t)iLen);
g_Settings.crPUBkgColour = SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0);
- db_set_dw(0, CHAT_MODULE, "PopupColorBG", (DWORD)SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0));
+ db_set_dw(0, CHAT_MODULE, "PopupColorBG", (uint32_t)SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0));
g_Settings.crPUTextColour = SendDlgItemMessage(hwndDlg, IDC_CHAT_TEXT, CPM_GETCOLOUR, 0, 0);
- db_set_dw(0, CHAT_MODULE, "PopupColorText", (DWORD)SendDlgItemMessage(hwndDlg, IDC_CHAT_TEXT, CPM_GETCOLOUR, 0, 0));
+ db_set_dw(0, CHAT_MODULE, "PopupColorText", (uint32_t)SendDlgItemMessage(hwndDlg, IDC_CHAT_TEXT, CPM_GETCOLOUR, 0, 0));
}
return TRUE;
}
diff --git a/plugins/Scriver/src/globals.h b/plugins/Scriver/src/globals.h
index 19b61bdcb9..af10248c72 100644
--- a/plugins/Scriver/src/globals.h
+++ b/plugins/Scriver/src/globals.h
@@ -90,17 +90,17 @@ struct TabFlags
struct GlobalMessageData
{
union {
- DWORD dwFlags;
+ uint32_t dwFlags;
WindowFlags flags;
};
union {
- DWORD dwFlags2;
+ uint32_t dwFlags2;
TabFlags flags2;
};
- DWORD openFlags;
- DWORD limitNamesLength;
+ uint32_t openFlags;
+ uint32_t limitNamesLength;
int activeAlpha;
int inactiveAlpha;
SendMode sendMode;
@@ -116,7 +116,7 @@ struct GlobalMessageData
HBRUSH hInfobarBrush;
int toolbarPosition;
HWND hFocusWnd;
- DWORD logLineColour;
+ uint32_t logLineColour;
int logPixelSX;
int logPixelSY;
HICON hMsgIcon;
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 640060ee22..cb898c9107 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -283,7 +283,7 @@ bool CMsgDialog::OnInitDialog()
else
db_event_get(m_hDbEventFirst, &dbei);
- DWORD firstTime = dbei.timestamp - 60 * g_plugin.iLoadTime;
+ uint32_t firstTime = dbei.timestamp - 60 * g_plugin.iLoadTime;
for (;;) {
hPrevEvent = pCursor.FetchNext();
if (hPrevEvent == 0)
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 76b1a7bde8..7149c1d410 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -110,7 +110,7 @@ EventData* CMsgDialog::GetEventFromDB(MCONTACT hContact, MEVENT hDbEvent)
evt->szNick.w = mir_wstrdup(Clist_GetContactDisplayName(hContact));
if (evt->eventType == EVENTTYPE_FILE) {
- char *filename = ((char*)dbei.pBlob) + sizeof(DWORD);
+ char *filename = ((char*)dbei.pBlob) + sizeof(uint32_t);
char *descr = filename + mir_strlen(filename) + 1;
evt->szText.w = DbEvent_GetString(&dbei, filename);
if (*descr != 0)
@@ -124,7 +124,7 @@ EventData* CMsgDialog::GetEventFromDB(MCONTACT hContact, MEVENT hDbEvent)
return evt;
}
-static EventData* GetTestEvent(DWORD flags)
+static EventData* GetTestEvent(uint32_t flags)
{
EventData *evt = (EventData *)mir_calloc(sizeof(EventData));
evt->eventType = EVENTTYPE_MESSAGE;
@@ -706,7 +706,7 @@ void CLogWindow::Attach()
{
CSuper::Attach();
- DWORD dwExStyle = GetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE);
+ uint32_t dwExStyle = GetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE);
SetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE, (m_pDlg.m_bUseRtl) ? dwExStyle | WS_EX_LEFTSCROLLBAR : dwExStyle & ~WS_EX_LEFTSCROLLBAR);
// Workaround to make Richedit display RTL messages correctly
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 04aff9202f..9b0f0c8d57 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -193,7 +193,7 @@ public:
struct CheckBoxValues_t
{
- DWORD style;
+ uint32_t style;
const wchar_t *szDescr;
};
@@ -211,7 +211,7 @@ static const struct CheckBoxValues_t statusValues[] =
class CMainOptionsDlg : public CBaseOptionDlg
{
- void FillCheckBoxTree(const struct CheckBoxValues_t *values, int nValues, DWORD style)
+ void FillCheckBoxTree(const struct CheckBoxValues_t *values, int nValues, uint32_t style)
{
TVINSERTSTRUCT tvis;
tvis.hParent = nullptr;
@@ -226,9 +226,9 @@ class CMainOptionsDlg : public CBaseOptionDlg
}
}
- DWORD MakeCheckBoxTreeFlags()
+ uint32_t MakeCheckBoxTreeFlags()
{
- DWORD flags = 0;
+ uint32_t flags = 0;
TVITEMEX tvi;
tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE;
tvi.hItem = m_tree.GetRoot();
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 06dbefe672..aa33a9031d 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -55,7 +55,7 @@ struct EventData
{
int cbSize;
int iType;
- DWORD dwFlags;
+ uint32_t dwFlags;
const char *fontName;
int fontSize;
int fontStyle;
@@ -63,8 +63,8 @@ struct EventData
MAllStrings szNick; // Nick, usage depends on type of event
MAllStrings szText; // Text, usage depends on type of event
MAllStrings szText2; // Text, usage depends on type of event
- DWORD time;
- DWORD eventType;
+ uint32_t time;
+ uint32_t eventType;
BOOL custom;
EventData *next;
};
@@ -115,7 +115,7 @@ class CMsgDialog : public CSrmmBaseDialog
int m_minLogBoxHeight, m_minEditBoxHeight;
int m_iShowUnread;
uint16_t m_wStatus;
- DWORD m_lastMessage;
+ uint32_t m_lastMessage;
int m_iMessagesInProgress;
int m_iSendAllConfirm;
HICON m_hStatusIcon, m_hStatusIconBig, m_hStatusIconOverlay;
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index 6764ff9598..934823bc9a 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -92,7 +92,7 @@ bool CMsgDialog::IsTypingNotificationSupported()
if (!m_hContact || !m_szProto)
return false;
- DWORD typeCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_4, 0);
+ uint32_t typeCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_4, 0);
if (!(typeCaps & PF4_SUPPORTTYPING))
return false;
return true;
@@ -103,11 +103,11 @@ bool CMsgDialog::IsTypingNotificationEnabled()
if (!g_plugin.getByte(m_hContact, SRMSGSET_TYPING, g_plugin.bTypingNew))
return FALSE;
- DWORD protoStatus = Proto_GetStatus(m_szProto);
+ uint32_t protoStatus = Proto_GetStatus(m_szProto);
if (protoStatus < ID_STATUS_ONLINE)
return FALSE;
- DWORD protoCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0);
+ uint32_t protoCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0);
if (protoCaps & PF1_VISLIST && db_get_w(m_hContact, m_szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)
return FALSE;
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 5868e94aa4..1f72d10d64 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -80,7 +80,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
CMOption<uint8_t> bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist, bShowTypingSwitch;
CMOption<uint8_t> iFlashCount, iHistoryMode;
CMOption<uint16_t> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;
- CMOption<DWORD> iPopFlags, iMsgTimeout, iActiveAlpha, iInactiveAlpha;
+ CMOption<uint32_t> iPopFlags, iMsgTimeout, iActiveAlpha, iInactiveAlpha;
CMPlugin();
diff --git a/plugins/Scriver/src/tabs.cpp b/plugins/Scriver/src/tabs.cpp
index 2a138e80ee..7ac7de89c7 100644
--- a/plugins/Scriver/src/tabs.cpp
+++ b/plugins/Scriver/src/tabs.cpp
@@ -332,7 +332,7 @@ void ParentWindowData::SetContainerWindowStyle()
{
ShowWindow(m_hwndStatus, (flags2.bShowStatusBar) ? SW_SHOW : SW_HIDE);
- DWORD ws = GetWindowLongPtr(m_hwnd, GWL_STYLE) & ~(WS_CAPTION);
+ uint32_t ws = GetWindowLongPtr(m_hwnd, GWL_STYLE) & ~(WS_CAPTION);
if (flags2.bShowTitleBar)
ws |= WS_CAPTION;
@@ -393,7 +393,7 @@ void ParentWindowData::ToggleTitleBar()
{
flags2.bShowTitleBar = !flags2.bShowTitleBar;
- DWORD ws = GetWindowLongPtr(m_hwnd, GWL_STYLE) & ~(WS_CAPTION);
+ uint32_t ws = GetWindowLongPtr(m_hwnd, GWL_STYLE) & ~(WS_CAPTION);
if (flags2.bShowTitleBar)
ws |= WS_CAPTION;
SetWindowLongPtr(m_hwnd, GWL_STYLE, ws);
@@ -1030,7 +1030,7 @@ static INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wPara
case WM_ACTIVATE:
if (LOWORD(wParam) == WA_INACTIVE) {
- DWORD ws = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_LAYERED;
+ uint32_t ws = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_LAYERED;
ws |= dat->flags2.bUseTransparency ? WS_EX_LAYERED : 0;
SetWindowLongPtr(hwndDlg, GWL_EXSTYLE, ws);
if (dat->flags2.bUseTransparency)
@@ -1048,7 +1048,7 @@ static INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wPara
}
{
- DWORD ws = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_LAYERED;
+ uint32_t ws = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_LAYERED;
ws |= dat->flags2.bUseTransparency ? WS_EX_LAYERED : 0;
SetWindowLongPtr(hwndDlg, GWL_EXSTYLE, ws);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:59:50 +0000