summaryrefslogtreecommitdiff
path: root/plugins/IEView/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/IEView/src')
-rw-r--r--plugins/IEView/src/HTMLBuilder.cpp12
-rw-r--r--plugins/IEView/src/HTMLBuilder.h6
-rw-r--r--plugins/IEView/src/HistoryHTMLBuilder.cpp2
-rw-r--r--plugins/IEView/src/IEView.cpp6
-rw-r--r--plugins/IEView/src/IEView.h18
-rw-r--r--plugins/IEView/src/Options.cpp12
-rw-r--r--plugins/IEView/src/ScriverHTMLBuilder.cpp4
-rw-r--r--plugins/IEView/src/ScriverHTMLBuilder.h2
-rw-r--r--plugins/IEView/src/TabSRMMHTMLBuilder.cpp18
-rw-r--r--plugins/IEView/src/TabSRMMHTMLBuilder.h4
-rw-r--r--plugins/IEView/src/TemplateHTMLBuilder.cpp6
-rw-r--r--plugins/IEView/src/TemplateHTMLBuilder.h2
-rw-r--r--plugins/IEView/src/TextToken.h2
13 files changed, 47 insertions, 47 deletions
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp
index fcbd404f80..bc46529b1d 100644
--- a/plugins/IEView/src/HTMLBuilder.cpp
+++ b/plugins/IEView/src/HTMLBuilder.cpp
@@ -129,12 +129,12 @@ void HTMLBuilder::setLastEventType(int t)
iLastEventType = t;
}
-DWORD HTMLBuilder::getLastEventTime()
+uint32_t HTMLBuilder::getLastEventTime()
{
return lastEventTime;
}
-void HTMLBuilder::setLastEventTime(DWORD t)
+void HTMLBuilder::setLastEventTime(uint32_t t)
{
lastEventTime = t;
}
@@ -239,8 +239,8 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event)
eventData->iType = IEED_EVENT_STATUSCHANGE;
}
else if (dbei.eventType == EVENTTYPE_FILE) {
- // blob is: sequenceid(DWORD),filename(ASCIIZ),description(ASCIIZ)
- char* filename = ((char *)dbei.pBlob) + sizeof(DWORD);
+ // blob is: sequenceid(uint32_t),filename(ASCIIZ),description(ASCIIZ)
+ char* filename = ((char *)dbei.pBlob) + sizeof(uint32_t);
char* descr = filename + mir_strlen(filename) + 1;
eventData->szText.w = DbEvent_GetString(&dbei, filename);
if (*descr != '\0')
@@ -248,13 +248,13 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event)
eventData->iType = IEED_EVENT_FILE;
}
else if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {
- // blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
+ // blob is: uin(uint32_t), hContact(uint32_t), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
eventData->szText.w = mir_wstrdup(TranslateT(" requested authorization"));
eventData->szNick.w = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8);
eventData->iType = IEED_EVENT_SYSTEM;
}
else if (dbei.eventType == EVENTTYPE_ADDED) {
- //blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
+ //blob is: uin(uint32_t), hContact(uint32_t), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
eventData->szText.w = mir_wstrdup(TranslateT(" was added."));
eventData->szNick.w = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8);
eventData->iType = IEED_EVENT_SYSTEM;
diff --git a/plugins/IEView/src/HTMLBuilder.h b/plugins/IEView/src/HTMLBuilder.h
index 02793c3cdc..e1ebaa66d4 100644
--- a/plugins/IEView/src/HTMLBuilder.h
+++ b/plugins/IEView/src/HTMLBuilder.h
@@ -38,7 +38,7 @@ private:
MIM_UNICODE = 2
};
protected:
- DWORD lastEventTime;
+ uint32_t lastEventTime;
int iLastEventType;
enum ENCODEFLAGS {
ENF_NONE = 0,
@@ -62,8 +62,8 @@ protected:
virtual char* getEncodedContactName(MCONTACT hContact, const char *szProto);
virtual void getUINs(MCONTACT hContact, char *&uinIn, char *&uinOut);
- virtual DWORD getLastEventTime();
- virtual void setLastEventTime(DWORD);
+ virtual uint32_t getLastEventTime();
+ virtual void setLastEventTime(uint32_t);
virtual int getLastEventType();
virtual void setLastEventType(int);
diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index 4bbb51d85a..f4d4ffba07 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -221,7 +221,7 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event)
void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
{
- DWORD dwFlags = db_get_b(0, HPPMOD, SRMSGSET_SHOWICONS, 0) ? SMF_LOG_SHOWICONS : 0;
+ uint32_t dwFlags = db_get_b(0, HPPMOD, SRMSGSET_SHOWICONS, 0) ? SMF_LOG_SHOWICONS : 0;
IEVIEWEVENTDATA* eventData = event->eventData;
for (int eventIdx = 0; eventData != nullptr && (eventIdx < event->count || event->count == -1); eventData = eventData->next, eventIdx++) {
CMStringA str;
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp
index 02478c5738..20b012c8ad 100644
--- a/plugins/IEView/src/IEView.cpp
+++ b/plugins/IEView/src/IEView.cpp
@@ -677,7 +677,7 @@ STDMETHODIMP IEView::GetSecurityId(LPCWSTR, uint8_t *, DWORD *, DWORD_PTR)
STDMETHODIMP IEView::ProcessUrlAction(LPCWSTR pwszUrl, DWORD dwAction, uint8_t *pPolicy, DWORD cbPolicy, uint8_t *, DWORD, DWORD, DWORD)
{
- DWORD dwPolicy = URLPOLICY_ALLOW;
+ uint32_t dwPolicy = URLPOLICY_ALLOW;
if (pwszUrl != nullptr && !mir_wstrcmp(pwszUrl, L"about:blank")) {
if (dwAction <= URLACTION_ACTIVEX_MAX && dwAction >= URLACTION_ACTIVEX_MIN) {
//dwPolicy = URLPOLICY_DISALLOW;
@@ -697,8 +697,8 @@ STDMETHODIMP IEView::ProcessUrlAction(LPCWSTR pwszUrl, DWORD dwAction, uint8_t *
}
else return INET_E_DEFAULT_ACTION;
- if (cbPolicy >= sizeof(DWORD)) {
- *(DWORD*)pPolicy = dwPolicy;
+ if (cbPolicy >= sizeof(uint32_t)) {
+ *(uint32_t*)pPolicy = dwPolicy;
return S_OK;
}
diff --git a/plugins/IEView/src/IEView.h b/plugins/IEView/src/IEView.h
index d3e4677ed2..bb57ccd1a2 100644
--- a/plugins/IEView/src/IEView.h
+++ b/plugins/IEView/src/IEView.h
@@ -42,8 +42,8 @@ static const CLSID CLSID_MozillaBrowser =
typedef struct _DOCHOSTUIINFO
{
ULONG cbSize;
- DWORD dwFlags;
- DWORD dwDoubleClick;
+ uint32_t dwFlags;
+ uint32_t dwDoubleClick;
OLECHAR *pchHostCss;
OLECHAR *pchHostNS;
} DOCHOSTUIINFO;
@@ -358,12 +358,12 @@ extern "C" {
STDMETHOD(SetSecuritySite)(THIS_ IInternetSecurityMgrSite*) PURE;
STDMETHOD(GetSecuritySite)(THIS_ IInternetSecurityMgrSite**) PURE;
- STDMETHOD(MapUrlToZone)(THIS_ LPCWSTR,DWORD*,DWORD) PURE;
- STDMETHOD(GetSecurityId)(THIS_ LPCWSTR,uint8_t*,DWORD*,DWORD_PTR) PURE;
- STDMETHOD(ProcessUrlAction)(THIS_ LPCWSTR,DWORD,uint8_t*,DWORD,uint8_t*,DWORD,DWORD,DWORD) PURE;
- STDMETHOD(QueryCustomPolicy)(THIS_ LPCWSTR,REFGUID,uint8_t**,DWORD*,uint8_t*,DWORD,DWORD) PURE;
- STDMETHOD(SetZoneMapping)(THIS_ DWORD,LPCWSTR,DWORD) PURE;
- STDMETHOD(GetZoneMappings)(THIS_ DWORD,IEnumString**,DWORD) PURE;
+ STDMETHOD(MapUrlToZone)(THIS_ LPCWSTR,uint32_t*,uint32_t) PURE;
+ STDMETHOD(GetSecurityId)(THIS_ LPCWSTR,uint8_t*,uint32_t*,DWORD_PTR) PURE;
+ STDMETHOD(ProcessUrlAction)(THIS_ LPCWSTR,uint32_t,uint8_t*,uint32_t,uint8_t*,uint32_t,uint32_t,uint32_t) PURE;
+ STDMETHOD(QueryCustomPolicy)(THIS_ LPCWSTR,REFGUID,uint8_t**,uint32_t*,uint8_t*,uint32_t,uint32_t) PURE;
+ STDMETHOD(SetZoneMapping)(THIS_ uint32_t,LPCWSTR,uint32_t) PURE;
+ STDMETHOD(GetZoneMappings)(THIS_ uint32_t,IEnumString**,uint32_t) PURE;
};
#undef INTERFACE
@@ -453,7 +453,7 @@ class IEView :public IDispatch, public IOleClientSite, public IOleInPlaceSite, p
STDMETHOD(GetTypeInfoCount)(UINT*);
STDMETHOD(GetTypeInfo)(UINT, LCID, LPTYPEINFO*);
STDMETHOD(GetIDsOfNames)(REFIID, LPOLESTR*, UINT, LCID, DISPID*);
- STDMETHOD(Invoke)(DISPID, REFIID, LCID, uint16_t, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
+ STDMETHOD(Invoke)(DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
// IOleWindow
STDMETHOD(GetWindow)(HWND *phwnd);
STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode);
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index 26f2d1a7d0..09e4226c82 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -159,7 +159,7 @@ static void UpdateControlsState(HWND hwndDlg)
EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_BACKGROUND_IMAGE), bChecked);
}
-static void SetIcon(HWND hwnd, DWORD id, int index, bool condition)
+static void SetIcon(HWND hwnd, uint32_t id, int index, bool condition)
{
HICON hIcon;
if (condition)
@@ -463,7 +463,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
case WM_NOTIFY:
switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
- DWORD i = 0;
+ uint32_t i = 0;
if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_BBCODES))
i |= Options::GENERAL_ENABLE_BBCODES;
@@ -597,7 +597,7 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
case NM_CLICK:
{
TVHITTESTINFO ht = { 0 };
- DWORD dwpos = GetMessagePos();
+ uint32_t dwpos = GetMessagePos();
POINTSTOPOINT(ht.pt, MAKEPOINTS(dwpos));
MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);
TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);
@@ -735,7 +735,7 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
case NM_CLICK:
{
TVHITTESTINFO ht = {};
- DWORD dwpos = GetMessagePos();
+ uint32_t dwpos = GetMessagePos();
POINTSTOPOINT(ht.pt, MAKEPOINTS(dwpos));
MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);
TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);
@@ -873,7 +873,7 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
case NM_CLICK:
{
TVHITTESTINFO ht = {};
- DWORD dwpos = GetMessagePos();
+ uint32_t dwpos = GetMessagePos();
POINTSTOPOINT(ht.pt, MAKEPOINTS(dwpos));
MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);
TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);
@@ -1131,7 +1131,7 @@ void Options::uninit()
void Options::setEmbedSize(int size)
{
- g_plugin.setDword("Embedsize", (DWORD)size);
+ g_plugin.setDword("Embedsize", (uint32_t)size);
}
int Options::getEmbedSize()
diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp
index 23f12d20f2..f0abd2c097 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.cpp
+++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp
@@ -118,7 +118,7 @@ void ScriverHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour)
}
}
-char* ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mode)
+char* ScriverHTMLBuilder::timestampToString(uint32_t dwFlags, time_t check, int mode)
{
static char szResult[512]; szResult[0] = '\0';
char str[80];
@@ -260,7 +260,7 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event)
void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
{
bool showColon;
- DWORD dwFlags = db_get_b(0, SRMMMOD, SRMSGSET_SHOWTIME, 0) ? SMF_LOG_SHOWTIME : 0;
+ uint32_t dwFlags = db_get_b(0, SRMMMOD, SRMSGSET_SHOWTIME, 0) ? SMF_LOG_SHOWTIME : 0;
dwFlags |= !db_get_b(0, SRMMMOD, SRMSGSET_HIDENAMES, 0) ? SMF_LOG_SHOWNICK : 0;
dwFlags |= db_get_b(0, SRMMMOD, SRMSGSET_SHOWDATE, 0) ? SMF_LOG_SHOWDATE : 0;
dwFlags |= db_get_b(0, SRMMMOD, SRMSGSET_SHOWLOGICONS, 0) ? SMF_LOG_SHOWICONS : 0;
diff --git a/plugins/IEView/src/ScriverHTMLBuilder.h b/plugins/IEView/src/ScriverHTMLBuilder.h
index 289cda6cf4..5b9d7170d0 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.h
+++ b/plugins/IEView/src/ScriverHTMLBuilder.h
@@ -29,7 +29,7 @@ class ScriverHTMLBuilder :public TemplateHTMLBuilder
{
protected:
void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);
- char *timestampToString(DWORD dwFlags, time_t check, int groupStart);
+ char *timestampToString(uint32_t dwFlags, time_t check, int groupStart);
bool isDbEventShown(DBEVENTINFO * dbei);
void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);
public:
diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
index 2eeb4baca9..85e6b8859e 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
@@ -82,7 +82,7 @@ TabSRMMHTMLBuilder::TabSRMMHTMLBuilder()
startedTime = time(0);
}
-bool TabSRMMHTMLBuilder::isDbEventShown(DWORD dwFlags, DBEVENTINFO *dbei)
+bool TabSRMMHTMLBuilder::isDbEventShown(uint32_t dwFlags, DBEVENTINFO *dbei)
{
switch (dbei->eventType) {
case EVENTTYPE_MESSAGE:
@@ -103,7 +103,7 @@ bool TabSRMMHTMLBuilder::isDbEventShown(DWORD dwFlags, DBEVENTINFO *dbei)
bool TabSRMMHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)
{
- DWORD dwFlags2 = db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;
+ uint32_t dwFlags2 = db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;
dwFlags2 |= db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;
return isDbEventShown(dwFlags2, dbei);
}
@@ -148,7 +148,7 @@ void TabSRMMHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour)
}
}
-char* TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isGroupBreak)
+char* TabSRMMHTMLBuilder::timestampToString(uint32_t dwFlags, time_t check, int isGroupBreak)
{
static char szResult[512];
char str[80];
@@ -218,7 +218,7 @@ void TabSRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event)
HDC hdc = GetDC(nullptr);
int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);
ReleaseDC(nullptr, hdc);
- DWORD dwFlags = db_get_dw(0, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);
+ uint32_t dwFlags = db_get_dw(0, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);
str.Append("<html><head><style type=\"text/css\">\n");
COLORREF inColor, outColor;
COLORREF bkgColor = db_get_dw(0, TABSRMM_FONTMODULE, "BkgColour", 0xFFFFFF);
@@ -288,10 +288,10 @@ time_t TabSRMMHTMLBuilder::getStartedTime()
void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
{
- DWORD today = (DWORD)time(0);
+ uint32_t today = (uint32_t)time(0);
today = today - today % 86400;
- DWORD dwFlags = db_get_dw(0, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);
- DWORD dwFlags2 = db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;
+ uint32_t dwFlags = db_get_dw(0, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);
+ uint32_t dwFlags2 = db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;
dwFlags2 |= db_get_b(0, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;
dwFlags2 |= db_get_b(0, SRMSGMOD_T, "in_out_icons", 0) ? MWF_SHOW_INOUTICONS : 0;
dwFlags2 |= db_get_b(0, SRMSGMOD_T, "emptylinefix", 1) ? MWF_SHOW_EMPTYLINEFIX : 0;
@@ -304,11 +304,11 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
bool isGroupBreak = true;
bool isSent = (eventData->dwFlags & IEEDF_SENT) != 0;
bool isRTL = (eventData->dwFlags & IEEDF_RTL) != 0;
- int isHistory = (eventData->time < (DWORD)getStartedTime() && (eventData->dwFlags & IEEDF_READ || eventData->dwFlags & IEEDF_SENT));
+ int isHistory = (eventData->time < (uint32_t)getStartedTime() && (eventData->dwFlags & IEEDF_READ || eventData->dwFlags & IEEDF_SENT));
if (dwFlags & MWF_LOG_GROUPMODE && eventData->dwFlags == LOWORD(getLastEventType()) &&
eventData->iType == IEED_EVENT_MESSAGE && HIWORD(getLastEventType()) == IEED_EVENT_MESSAGE &&
((eventData->time < today) == (getLastEventTime() < today)) &&
- (((eventData->time < (DWORD)startedTime) == (getLastEventTime() < (DWORD)startedTime)) || !(eventData->dwFlags & IEEDF_READ)))
+ (((eventData->time < (uint32_t)startedTime) == (getLastEventTime() < (uint32_t)startedTime)) || !(eventData->dwFlags & IEEDF_READ)))
{
isGroupBreak = FALSE;
}
diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.h b/plugins/IEView/src/TabSRMMHTMLBuilder.h
index fcca7d1053..bfc7deb6ac 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.h
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.h
@@ -29,9 +29,9 @@ class TabSRMMHTMLBuilder :public TemplateHTMLBuilder
{
protected:
virtual void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);
- char *timestampToString(DWORD dwFlags, time_t check, int isGroupBreak);
+ char *timestampToString(uint32_t dwFlags, time_t check, int isGroupBreak);
time_t getStartedTime();
- virtual bool isDbEventShown(DWORD dwFlags, DBEVENTINFO * dbei);
+ virtual bool isDbEventShown(uint32_t dwFlags, DBEVENTINFO * dbei);
bool isDbEventShown(DBEVENTINFO * dbei);
void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);
public:
diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 632344d72c..a93f761fda 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -76,7 +76,7 @@ int TemplateHTMLBuilder::getFlags(ProtocolSettings * protoSettings)
return protoSettings->getSRMMFlags();
}
-char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mode)
+char *TemplateHTMLBuilder::timestampToString(uint32_t dwFlags, time_t check, int mode)
{
static char szResult[512]; szResult[0] = '\0';
wchar_t str[300];
@@ -363,12 +363,12 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
CMStringA str;
bool isSent = (eventData->dwFlags & IEEDF_SENT) != 0;
bool isRTL = (eventData->dwFlags & IEEDF_RTL) && tmpm->isRTL();
- bool isHistory = (eventData->time < (DWORD)getStartedTime() && (eventData->dwFlags &IEEDF_READ || eventData->dwFlags & IEEDF_SENT));
+ bool isHistory = (eventData->time < (uint32_t)getStartedTime() && (eventData->dwFlags &IEEDF_READ || eventData->dwFlags & IEEDF_SENT));
bool isGroupBreak = true;
if ((getFlags(protoSettings) & Options::LOG_GROUP_MESSAGES) && eventData->dwFlags == LOWORD(getLastEventType())
&& eventData->iType == IEED_EVENT_MESSAGE && HIWORD(getLastEventType()) == IEED_EVENT_MESSAGE
&& (isSameDate(eventData->time, getLastEventTime()))
- && (((eventData->time < (DWORD)startedTime) == (getLastEventTime() < (DWORD)startedTime)) || !(eventData->dwFlags & IEEDF_READ)))
+ && (((eventData->time < (uint32_t)startedTime) == (getLastEventTime() < (uint32_t)startedTime)) || !(eventData->dwFlags & IEEDF_READ)))
isGroupBreak = false;
if (isSent) {
diff --git a/plugins/IEView/src/TemplateHTMLBuilder.h b/plugins/IEView/src/TemplateHTMLBuilder.h
index 1264a302cf..96b850ef68 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.h
+++ b/plugins/IEView/src/TemplateHTMLBuilder.h
@@ -29,7 +29,7 @@ class TemplateHTMLBuilder;
class TemplateHTMLBuilder :public HTMLBuilder
{
protected:
- char *timestampToString(DWORD dwFlags, time_t check, int mode);
+ char *timestampToString(uint32_t dwFlags, time_t check, int mode);
time_t startedTime;
time_t getStartedTime();
const char *groupTemplate;
diff --git a/plugins/IEView/src/TextToken.h b/plugins/IEView/src/TextToken.h
index 4d1fa10e38..b893cd8368 100644
--- a/plugins/IEView/src/TextToken.h
+++ b/plugins/IEView/src/TextToken.h
@@ -27,7 +27,7 @@ private:
int type;
bool end = false;
int tag = 0;
- DWORD value = 0;
+ uint32_t value = 0;
wchar_t *wtext;
char *text;
wchar_t *wlink = nullptr;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 23:33:47 +0000