summaryrefslogtreecommitdiff
path: root/libs/mTextControl/src/FormattedTextDraw.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-12-26 15:13:30 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-12-26 15:13:30 +0300
commitd7e53c4d5a748d5ef8c934e90dc59ff23c667420 (patch)
tree2b0c16de953e182321a0314b6ce3b909f428731f /libs/mTextControl/src/FormattedTextDraw.cpp
parent129687d805025b4e292174ffb3d224a55baf24d2 (diff)
WCHAR -> wchar_t
Diffstat (limited to 'libs/mTextControl/src/FormattedTextDraw.cpp')
-rw-r--r--libs/mTextControl/src/FormattedTextDraw.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/mTextControl/src/FormattedTextDraw.cpp b/libs/mTextControl/src/FormattedTextDraw.cpp
index eca1044a5c..04fa7f6042 100644
--- a/libs/mTextControl/src/FormattedTextDraw.cpp
+++ b/libs/mTextControl/src/FormattedTextDraw.cpp
@@ -35,12 +35,12 @@ DWORD CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb,
{
COOKIE *pCookie = (COOKIE*)dwCookie;
if (pCookie->isUnicode) {
- if ((pCookie->cbSize - pCookie->cbCount)*sizeof(WCHAR) < (size_t)cb)
- *pcb = LONG(pCookie->cbSize - pCookie->cbCount)*sizeof(WCHAR);
+ if ((pCookie->cbSize - pCookie->cbCount)*sizeof(wchar_t) < (size_t)cb)
+ *pcb = LONG(pCookie->cbSize - pCookie->cbCount)*sizeof(wchar_t);
else
*pcb = cb & ~1UL;
memcpy(pbBuff, pCookie->unicode + pCookie->cbCount, *pcb);
- pCookie->cbCount += *pcb / sizeof(WCHAR);
+ pCookie->cbCount += *pcb / sizeof(wchar_t);
}
else {
if (pCookie->cbSize - pCookie->cbCount < (DWORD)cb)
@@ -77,7 +77,7 @@ HRESULT CFormattedTextDraw::putRTFTextA(char *newVal)
return S_OK;
}
-HRESULT CFormattedTextDraw::putRTFTextW(WCHAR *newVal)
+HRESULT CFormattedTextDraw::putRTFTextW(wchar_t *newVal)
{
if (!m_spTextServices)
return S_FALSE;
@@ -126,7 +126,7 @@ HRESULT CFormattedTextDraw::putTextA(char *newVal)
return S_OK;
}
-HRESULT CFormattedTextDraw::putTextW(WCHAR *newVal)
+HRESULT CFormattedTextDraw::putTextW(wchar_t *newVal)
{
if (!m_spTextServices)
return S_FALSE;