DWORD -> uint32_t

6 files changed, 17 insertions, 17 deletions

diff --git a/libs/mTextControl/src/FormattedTextDraw.cpp b/libs/mTextControl/src/FormattedTextDraw.cpp
index 04fa7f6042..58023f93fb 100644
--- a/libs/mTextControl/src/FormattedTextDraw.cpp
+++ b/libs/mTextControl/src/FormattedTextDraw.cpp
@@ -31,7 +31,7 @@ const IID IID_ITextDocument = {
 /////////////////////////////////////////////////////////////////////////////
 // CallBack functions
 
-DWORD CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
+uint32_t CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
 {
 	COOKIE *pCookie = (COOKIE*)dwCookie;
 	if (pCookie->isUnicode) {
@@ -43,7 +43,7 @@ DWORD CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb,
 		pCookie->cbCount += *pcb / sizeof(wchar_t);
 	}
 	else {
-		if (pCookie->cbSize - pCookie->cbCount < (DWORD)cb)
+		if (pCookie->cbSize - pCookie->cbCount < (uint32_t)cb)
 			*pcb = LONG(pCookie->cbSize - pCookie->cbCount);
 		else
 			*pcb = cb;
diff --git a/libs/mTextControl/src/FormattedTextDraw.h b/libs/mTextControl/src/FormattedTextDraw.h
index 27ac6c8810..49468753b6 100644
--- a/libs/mTextControl/src/FormattedTextDraw.h
+++ b/libs/mTextControl/src/FormattedTextDraw.h
@@ -143,7 +143,7 @@ public:
 	HRESULT	TxDeactivate(LONG lNewState);
 	HRESULT	TxGetClientRect(LPRECT prc);
 	HRESULT	TxGetViewInset(LPRECT prc);
-	HRESULT TxGetCharFormat(const CHARFORMATW **ppCF);
+	HRESULT  TxGetCharFormat(const CHARFORMATW **ppCF);
 	HRESULT	TxGetParaFormat(const PARAFORMAT **ppPF);
 	COLORREF TxGetSysColor(int nIndex);
 	HRESULT	TxGetBackStyle(TXTBACKSTYLE *pstyle);
@@ -152,7 +152,7 @@ public:
 	HRESULT	TxGetPasswordChar(wchar_t *pch);
 	HRESULT	TxGetAcceleratorPos(LONG *pcp);
 	HRESULT	TxGetExtent(LPSIZEL lpExtent);
-	HRESULT OnTxCharFormatChange(const CHARFORMATW * pcf);
+	HRESULT  OnTxCharFormatChange(const CHARFORMATW * pcf);
 	HRESULT	OnTxParaFormatChange(const PARAFORMAT * ppf);
 	HRESULT	TxGetPropertyBits(DWORD dwMask, DWORD *pdwBits);
 	HRESULT	TxNotify(DWORD iNotify, void *pv);
@@ -177,9 +177,9 @@ public:
 
 	CHARFORMAT2W	*m_pCF;
 	PARAFORMAT2		m_PF;
-	DWORD			m_dwScrollbar;		// Scroll bar style
-	DWORD			m_dwPropertyBits;	// Property bits
-	DWORD			m_dwMaxLength;
+	uint32_t			m_dwScrollbar;		// Scroll bar style
+	uint32_t			m_dwPropertyBits;	// Property bits
+	uint32_t			m_dwMaxLength;
 	COOKIE			m_editCookie;
 
 	ITextServices	*m_spTextServices;
diff --git a/libs/mTextControl/src/dataobject.cpp b/libs/mTextControl/src/dataobject.cpp
index 1d14d28afb..cc05369021 100644
--- a/libs/mTextControl/src/dataobject.cpp
+++ b/libs/mTextControl/src/dataobject.cpp
@@ -34,9 +34,9 @@ public:
 	HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc);
 	HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut);
 	HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease);
-	HRESULT __stdcall EnumFormatEtc(DWORD      dwDirection, IEnumFORMATETC **ppEnumFormatEtc);
+	HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc);
 	HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection);
-	HRESULT __stdcall DUnadvise(DWORD      dwConnection);
+	HRESULT __stdcall DUnadvise(DWORD dwConnection);
 	HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise);
 
 	//
diff --git a/libs/mTextControl/src/fancy_rtf.cpp b/libs/mTextControl/src/fancy_rtf.cpp
index ef1b4164f7..29c62c0ba5 100644
--- a/libs/mTextControl/src/fancy_rtf.cpp
+++ b/libs/mTextControl/src/fancy_rtf.cpp
@@ -6,8 +6,8 @@ struct BBCodeInfo
 {
 	wchar_t *start;
 	wchar_t *end;
-	bool(*func)(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, DWORD cookie);
-	DWORD cookie;
+	bool(*func)(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, uint32_t cookie);
+	uint32_t cookie;
 };
 
 enum {
@@ -16,7 +16,7 @@ enum {
 	BBS_IMG1, BBS_IMG2
 };
 
-static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *pwszText, DWORD cookie)
+static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *pwszText, uint32_t cookie)
 {
 	wchar_t *pwszStr = L"";
 	CHARFORMAT cf = { 0 };
@@ -75,7 +75,7 @@ static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *
 	return true;
 }
 
-static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, DWORD)
+static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, uint32_t)
 {
 	ITextServices *ts = ftd->getTextService();
 	ITextDocument *td = ftd->getTextDocument();
diff --git a/libs/mTextControl/src/services.cpp b/libs/mTextControl/src/services.cpp
index b27b667180..ae6524b758 100644
--- a/libs/mTextControl/src/services.cpp
+++ b/libs/mTextControl/src/services.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 struct TextObject
 {
-	DWORD options;
+	uint32_t options;
 	const char *szProto;
 	IFormattedTextDraw *ftd;
 	TextObject() : options(0), ftd(nullptr) {}
@@ -32,7 +32,7 @@ struct TextObject
 /////////////////////////////////////////////////////////////////////////////////////////
 // elper functions
 
-void MText_InitFormatting0(IFormattedTextDraw *ftd, DWORD)
+void MText_InitFormatting0(IFormattedTextDraw *ftd, uint32_t)
 {
 	LRESULT lResult;
 
@@ -81,7 +81,7 @@ MTEXTCONTROL_DLL(HANDLE) MTextCreateW(HANDLE userHandle, const char *szProto, co
 /////////////////////////////////////////////////////////////////////////////////////////
 // allocate text object (advanced)
 
-MTEXTCONTROL_DLL(HANDLE) MTextCreateEx(HANDLE userHandle, void *text, DWORD flags)
+MTEXTCONTROL_DLL(HANDLE) MTextCreateEx(HANDLE userHandle, void *text, uint32_t flags)
 {
 	TextObject *result = new TextObject;
 	result->options = TextUserGetOptions(userHandle);
diff --git a/libs/mTextControl/src/textusers.cpp b/libs/mTextControl/src/textusers.cpp
index 6463d96b9d..2ea5569b8a 100644
--- a/libs/mTextControl/src/textusers.cpp
+++ b/libs/mTextControl/src/textusers.cpp
@@ -49,7 +49,7 @@ DWORD TextUserGetOptions(HANDLE userHandle)
 	return ((TextUser *)userHandle)->options;
 }
 
-void TextUserSetOptions(HANDLE userHandle, DWORD options)
+void TextUserSetOptions(HANDLE userHandle, uint32_t options)
 {
 	if (!userHandle) return;
 	((TextUser *)userHandle)->options = options;