diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdfile/src/fileexistsdlg.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/button.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clcmsgs.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/contacts.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/descbutton.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/netlib_log.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/path.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/core/stdfile/src/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp index da3037190f..b18cac040f 100644 --- a/src/core/stdfile/src/fileexistsdlg.cpp +++ b/src/core/stdfile/src/fileexistsdlg.cpp @@ -52,7 +52,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const wchar_t *szFilename, int cmd IShellFolder *pDesktopFolder;
if (SHGetDesktopFolder(&pDesktopFolder) == NOERROR) {
ITEMIDLIST *pCurrentIdl;
- WCHAR *wszFilename = (LPWSTR)szFilename;
+ wchar_t *wszFilename = (LPWSTR)szFilename;
if (pDesktopFolder->ParseDisplayName(nullptr, nullptr, wszFilename, nullptr, &pCurrentIdl, nullptr) == NOERROR) {
if (pCurrentIdl->mkid.cb) {
diff --git a/src/mir_app/src/button.cpp b/src/mir_app/src/button.cpp index 0e75bf862f..cbae11116c 100644 --- a/src/mir_app/src/button.cpp +++ b/src/mir_app/src/button.cpp @@ -464,7 +464,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR ti.uFlags = TTF_IDISHWND|TTF_SUBCLASS;
ti.uId = (UINT_PTR)bct->hwnd;
if (lParam & BATF_UNICODE)
- ti.lpszText = mir_wstrdup(TranslateW((WCHAR*)wParam));
+ ti.lpszText = mir_wstrdup(TranslateW((wchar_t*)wParam));
else
ti.lpszText = Langpack_PcharToTchar((char*)wParam);
SendMessage(bct->hwndToolTips, TTM_ADDTOOL, 0, (LPARAM)&ti);
diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp index 44ffd89bad..2c75d2e81e 100644 --- a/src/mir_app/src/clcmsgs.cpp +++ b/src/mir_app/src/clcmsgs.cpp @@ -67,7 +67,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar ClcContact *cc;
if (msg == CLM_ADDINFOITEMA) {
- WCHAR* wszText = mir_a2u((char*)cii->pszText);
+ wchar_t* wszText = mir_a2u((char*)cii->pszText);
cc = g_clistApi.pfnAddInfoItemToGroup(group, cii->flags, wszText);
mir_free(wszText);
}
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 1a33be2375..0bf652d1aa 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -230,7 +230,7 @@ MIR_APP_DLL(wchar_t*) Contact_GetInfo(int type, MCONTACT hContact, const char *s DBVARIANT dbv2;
if (!db_get_ws(hContact, szProto, nameOrder[i] == 6 ? "LastName" : "FirstName", &dbv2)) {
size_t len = mir_wstrlen(dbv.pwszVal) + mir_wstrlen(dbv2.pwszVal) + 2;
- wchar_t *buf = (WCHAR*)mir_alloc(sizeof(WCHAR)*len);
+ wchar_t *buf = (wchar_t*)mir_alloc(sizeof(wchar_t)*len);
if (buf != nullptr)
mir_wstrcat(mir_wstrcat(mir_wstrcpy(buf, dbv.pwszVal), L" "), dbv2.pwszVal);
diff --git a/src/mir_app/src/descbutton.cpp b/src/mir_app/src/descbutton.cpp index 623648db80..f2d21fc03f 100644 --- a/src/mir_app/src/descbutton.cpp +++ b/src/mir_app/src/descbutton.cpp @@ -278,7 +278,7 @@ static LRESULT CALLBACK MDescButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wPara if (dat->lpzTitle)
mir_free(dat->lpzTitle);
if (wParam & MDBCF_UNICODE)
- dat->lpzTitle = mir_wstrdup((WCHAR *)lParam);
+ dat->lpzTitle = mir_wstrdup((wchar_t *)lParam);
else
dat->lpzTitle = mir_a2u((char *)lParam);
RedrawWindow(hwndDlg, nullptr, nullptr, RDW_INVALIDATE);
@@ -288,7 +288,7 @@ static LRESULT CALLBACK MDescButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wPara if (dat->lpzDescription)
mir_free(dat->lpzDescription);
if (wParam & MDBCF_UNICODE)
- dat->lpzDescription = mir_wstrdup((WCHAR *)lParam);
+ dat->lpzDescription = mir_wstrdup((wchar_t *)lParam);
else
dat->lpzDescription = mir_a2u((char *)lParam);
RedrawWindow(hwndDlg, nullptr, nullptr, RDW_INVALIDATE);
diff --git a/src/mir_app/src/netlib_log.cpp b/src/mir_app/src/netlib_log.cpp index 9a3955eeae..b407e1499f 100644 --- a/src/mir_app/src/netlib_log.cpp +++ b/src/mir_app/src/netlib_log.cpp @@ -406,7 +406,7 @@ void PROTO_INTERFACE::debugLogA(const char *szFormat, ...) void PROTO_INTERFACE::debugLogW(const wchar_t *wszFormat, ...) { - WCHAR buf[4096]; + wchar_t buf[4096]; va_list args; va_start(args, wszFormat); int res = _vsnwprintf(buf, _countof(buf), wszFormat, args); diff --git a/src/mir_app/src/path.cpp b/src/mir_app/src/path.cpp index 443b2501e6..c78c4505c7 100644 --- a/src/mir_app/src/path.cpp +++ b/src/mir_app/src/path.cpp @@ -366,7 +366,7 @@ MIR_APP_DLL(char*) Utils_ReplaceVars(const char *szData, MCONTACT hContact, REPL MIR_APP_DLL(wchar_t*) Utils_ReplaceVarsW(const wchar_t *wszData, MCONTACT hContact, REPLACEVARSARRAY *vars)
{
- return ReplaceVariables<WCHAR>(wszData, hContact, vars);
+ return ReplaceVariables<wchar_t>(wszData, hContact, vars);
}
/////////////////////////////////////////////////////////////////////////////////////////
|