fix for argument types

6 files changed, 41 insertions, 41 deletions

diff --git a/src/mir_core/src/CCtrlCombo.cpp b/src/mir_core/src/CCtrlCombo.cpp
index d07616d70b..d8877ac82b 100644
--- a/src/mir_core/src/CCtrlCombo.cpp
+++ b/src/mir_core/src/CCtrlCombo.cpp
@@ -133,7 +133,7 @@ wchar_t* CCtrlCombo::GetItemText(int index, wchar_t *buf, int size)
 	return buf;
 }
 
-int CCtrlCombo::InsertString(wchar_t *text, int pos, LPARAM data)
+int CCtrlCombo::InsertString(const wchar_t *text, int pos, LPARAM data)
 {
 	int iItem = SendMessage(m_hwnd, CB_INSERTSTRING, pos, (LPARAM)text);
 	SendMessage(m_hwnd, CB_SETITEMDATA, iItem, data);
@@ -144,7 +144,7 @@ void CCtrlCombo::ResetContent()
 {	SendMessage(m_hwnd, CB_RESETCONTENT, 0, 0);
 }
 
-int CCtrlCombo::SelectString(wchar_t *str)
+int CCtrlCombo::SelectString(const wchar_t *str)
 {	return SendMessage(m_hwnd, CB_SELECTSTRING, 0, (LPARAM)str);
 }
 
diff --git a/src/mir_core/src/CCtrlListBox.cpp b/src/mir_core/src/CCtrlListBox.cpp
index 2d1290d4ef..73356a810e 100644
--- a/src/mir_core/src/CCtrlListBox.cpp
+++ b/src/mir_core/src/CCtrlListBox.cpp
@@ -39,7 +39,7 @@ BOOL CCtrlListBox::OnCommand(HWND, WORD, WORD idCode)
 	return TRUE;
 }
 
-int CCtrlListBox::AddString(wchar_t *text, LPARAM data)
+int CCtrlListBox::AddString(const wchar_t *text, LPARAM data)
 {
 	int iItem = ListBox_AddString(m_hwnd, text);
 	ListBox_SetItemData(m_hwnd, iItem, data);
@@ -50,7 +50,7 @@ void CCtrlListBox::DeleteString(int index)
 {	ListBox_DeleteString(m_hwnd, index);
 }
 
-int CCtrlListBox::FindString(wchar_t *str, int index, bool exact)
+int CCtrlListBox::FindString(const wchar_t *str, int index, bool exact)
 {	return SendMessage(m_hwnd, exact?LB_FINDSTRINGEXACT:LB_FINDSTRING, index, (LPARAM)str);
 }
 
@@ -108,7 +108,7 @@ int* CCtrlListBox::GetSelItems()
 	return result;
 }
 
-int CCtrlListBox::InsertString(wchar_t *text, int pos, LPARAM data)
+int CCtrlListBox::InsertString(const wchar_t *text, int pos, LPARAM data)
 {
 	int iItem = ListBox_InsertString(m_hwnd, pos, text);
 	ListBox_SetItemData(m_hwnd, iItem, data);
@@ -119,7 +119,7 @@ void CCtrlListBox::ResetContent()
 {	ListBox_ResetContent(m_hwnd);
 }
 
-int CCtrlListBox::SelectString(wchar_t *str)
+int CCtrlListBox::SelectString(const wchar_t *str)
 {	return ListBox_SelectString(m_hwnd, 0, str);
 }
 
diff --git a/src/mir_core/src/CCtrlListView.cpp b/src/mir_core/src/CCtrlListView.cpp
index f627ee0b3a..0bad3056bb 100644
--- a/src/mir_core/src/CCtrlListView.cpp
+++ b/src/mir_core/src/CCtrlListView.cpp
@@ -72,34 +72,34 @@ HIMAGELIST CCtrlListView::CreateImageList(int iImageList)
 	return hIml;
 }
 
-void CCtrlListView::AddColumn(int iSubItem, wchar_t *name, int cx)
+void CCtrlListView::AddColumn(int iSubItem, const wchar_t *name, int cx)
 {
 	LVCOLUMN lvc;
 	lvc.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
 	lvc.iImage = 0;
-	lvc.pszText = name;
+	lvc.pszText = (LPWSTR)name;
 	lvc.cx = cx;
 	lvc.iSubItem = iSubItem;
 	InsertColumn(iSubItem, &lvc);
 }
 
-void CCtrlListView::AddGroup(int iGroupId, wchar_t *name)
+void CCtrlListView::AddGroup(int iGroupId, const wchar_t *name)
 {
 	LVGROUP lvg = { 0 };
 	lvg.cbSize = sizeof(lvg);
 	lvg.mask = LVGF_HEADER | LVGF_GROUPID;
-	lvg.pszHeader = name;
+	lvg.pszHeader = (LPWSTR)name;
 	lvg.cchHeader = (int)mir_wstrlen(lvg.pszHeader);
 	lvg.iGroupId = iGroupId;
 	InsertGroup(-1, &lvg);
 }
 
-int CCtrlListView::AddItem(wchar_t *text, int iIcon, LPARAM lParam, int iGroupId)
+int CCtrlListView::AddItem(const wchar_t *text, int iIcon, LPARAM lParam, int iGroupId)
 {
 	LVITEM lvi = { 0 };
 	lvi.mask = LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE;
 	lvi.iSubItem = 0;
-	lvi.pszText = text;
+	lvi.pszText = (LPWSTR)text;
 	lvi.iImage = iIcon;
 	lvi.lParam = lParam;
 	if (iGroupId >= 0) {
@@ -110,13 +110,13 @@ int CCtrlListView::AddItem(wchar_t *text, int iIcon, LPARAM lParam, int iGroupId
 	return InsertItem(&lvi);
 }
 
-void CCtrlListView::SetItem(int iItem, int iSubItem, wchar_t *text, int iIcon)
+void CCtrlListView::SetItem(int iItem, int iSubItem, const wchar_t *text, int iIcon)
 {
 	LVITEM lvi = { 0 };
 	lvi.mask = LVIF_TEXT;
 	lvi.iItem = iItem;
 	lvi.iSubItem = iSubItem;
-	lvi.pszText = text;
+	lvi.pszText = (LPWSTR)text;
 	if (iIcon >= 0) {
 		lvi.mask |= LVIF_IMAGE;
 		lvi.iImage = iIcon;
@@ -423,8 +423,8 @@ void CCtrlListView::SetItemPosition32(int iItem, int x, int y)
 void CCtrlListView::SetItemState(int i, UINT state, UINT mask)
 {	ListView_SetItemState(m_hwnd, i, state, mask);
 }
-void CCtrlListView::SetItemText(int i, int iSubItem, wchar_t *pszText)
-{	ListView_SetItemText(m_hwnd, i, iSubItem, pszText);
+void CCtrlListView::SetItemText(int i, int iSubItem, const wchar_t *pszText)
+{	ListView_SetItemText(m_hwnd, i, iSubItem, (LPWSTR)pszText);
 }
 COLORREF CCtrlListView::SetOutlineColor(COLORREF color)
 {	return ListView_SetOutlineColor(m_hwnd, color);
diff --git a/src/mir_core/src/CCtrlPages.cpp b/src/mir_core/src/CCtrlPages.cpp
index 0857e62552..d51b7af35a 100644
--- a/src/mir_core/src/CCtrlPages.cpp
+++ b/src/mir_core/src/CCtrlPages.cpp
@@ -120,7 +120,7 @@ LRESULT CCtrlPages::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	return CSuper::CustomWndProc(msg, wParam, lParam);
 }
 
-void CCtrlPages::AddPage(wchar_t *ptszName, HICON hIcon, CDlgBase *pDlg)
+void CCtrlPages::AddPage(const wchar_t *ptszName, HICON hIcon, CDlgBase *pDlg)
 {
 	TPageInfo *info = new TPageInfo;
 	info->m_pDlg = pDlg;
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 6049e89761..2936dbf410 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -534,16 +534,16 @@ mir_wstrcmpi                  @280
 ??_7CDbLink@@6B@ @693 NONAME

 ??_7CDlgBase@@6B@ @694 NONAME

 ?ActivatePage@CCtrlPages@@QAEXH@Z @696 NONAME

-?AddColumn@CCtrlListView@@QAEXHPA_WH@Z @698 NONAME

+?AddColumn@CCtrlListView@@QAEXHPB_WH@Z @698 NONAME

 ?AddContact@CCtrlClc@@QAEXI@Z @699 NONAME

 ?AddControl@CDlgBase@@IAEXPAVCCtrlBase@@@Z @700 NONAME

 ?AddGroup@CCtrlClc@@QAEXPAX@Z @701 NONAME

-?AddGroup@CCtrlListView@@QAEXHPA_W@Z @702 NONAME

+?AddGroup@CCtrlListView@@QAEXHPB_W@Z @702 NONAME

 ?AddInfoItem@CCtrlClc@@QAEPAXPAUCLCINFOITEM@@@Z @703 NONAME

-?AddItem@CCtrlListView@@QAEHPA_WHJH@Z @704 NONAME

-?AddPage@CCtrlPages@@QAEXPA_WPAUHICON__@@PAVCDlgBase@@@Z @705 NONAME

+?AddItem@CCtrlListView@@QAEHPB_WHJH@Z @704 NONAME

+?AddPage@CCtrlPages@@QAEXPB_WPAUHICON__@@PAVCDlgBase@@@Z @705 NONAME

 ?AddString@CCtrlCombo@@QAEHPB_WJ@Z @706 NONAME

-?AddString@CCtrlListBox@@QAEHPA_WJ@Z @707 NONAME

+?AddString@CCtrlListBox@@QAEHPB_WJ@Z @707 NONAME

 ?AddStringA@CCtrlCombo@@QAEHPBDJ@Z @708 NONAME

 ?ApproximateViewRect@CCtrlListView@@QAEKHHH@Z @709 NONAME

 ?Arrange@CCtrlListView@@QAEXI@Z @710 NONAME

@@ -591,7 +591,7 @@ mir_wstrcmpi                  @280
 ?FindItem@CCtrlListView@@QAEHHPBUtagLVFINDINFOW@@@Z @757 NONAME

 ?FindNamedItem@CCtrlTreeView@@QAEPAU_TREEITEM@@PAU2@PB_W@Z @758 NONAME

 ?FindString@CCtrlCombo@@QAEHPB_WH_N@Z @759 NONAME

-?FindString@CCtrlListBox@@QAEHPA_WH_N@Z @760 NONAME

+?FindString@CCtrlListBox@@QAEHPB_WH_N@Z @760 NONAME

 ?FindStringA@CCtrlCombo@@QAEHPBDH_N@Z @761 NONAME

 ?GetBkColor@CCtrlClc@@QAEKXZ @762 NONAME

 ?GetBkColor@CCtrlListView@@QAEKXZ @763 NONAME

@@ -727,8 +727,8 @@ mir_wstrcmpi                  @280
 ?InsertItem@CCtrlListView@@QAEHQAUtagLVITEMW@@@Z @894 NONAME

 ?InsertItem@CCtrlTreeView@@QAEPAU_TREEITEM@@PAUtagTVINSERTSTRUCTW@@@Z @895 NONAME

 ?InsertMarkHitTest@CCtrlListView@@QAEHPAUtagPOINT@@PAULVINSERTMARK@@@Z @896 NONAME

-?InsertString@CCtrlCombo@@QAEHPA_WHJ@Z @897 NONAME

-?InsertString@CCtrlListBox@@QAEHPA_WHJ@Z @898 NONAME

+?InsertString@CCtrlCombo@@QAEHPB_WHJ@Z @897 NONAME

+?InsertString@CCtrlListBox@@QAEHPB_WHJ@Z @898 NONAME

 ?IsChanged@CCtrlBase@@QBE_NXZ @899 NONAME

 ?IsGroupViewEnabled@CCtrlListView@@QAEHXZ @900 NONAME

 ?IsInitialized@CDlgBase@@QBE_NXZ @901 NONAME

@@ -794,8 +794,8 @@ mir_wstrcmpi                  @280
 ?SelectItem@CCtrlClc@@QAEXPAX@Z @966 NONAME

 ?SelectItem@CCtrlTreeView@@QAEXPAU_TREEITEM@@@Z @967 NONAME

 ?SelectSetFirstVisible@CCtrlTreeView@@QAEXPAU_TREEITEM@@@Z @968 NONAME

-?SelectString@CCtrlCombo@@QAEHPA_W@Z @969 NONAME

-?SelectString@CCtrlListBox@@QAEHPA_W@Z @970 NONAME

+?SelectString@CCtrlCombo@@QAEHPB_W@Z @969 NONAME

+?SelectString@CCtrlListBox@@QAEHPB_W@Z @970 NONAME

 ?SendMsg@CCtrlBase@@QBEJIIJ@Z @971 NONAME

 ?SetBkBitmap@CCtrlClc@@QAEXKPAUHBITMAP__@@@Z @972 NONAME

 ?SetBkColor@CCtrlClc@@QAEXK@Z @973 NONAME

@@ -838,7 +838,7 @@ mir_wstrcmpi                  @280
 ?SetInsertMarkColor@CCtrlTreeView@@QAEKK@Z @1010 NONAME

 ?SetInt@CCtrlBase@@QAEXH@Z @1011 NONAME

 ?SetItem@CCtrlListView@@QAEHQAUtagLVITEMW@@@Z @1012 NONAME

-?SetItem@CCtrlListView@@QAEXHHPA_WH@Z @1013 NONAME

+?SetItem@CCtrlListView@@QAEXHHPB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QAEXPAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QAEXH@Z @1015 NONAME

 ?SetItemCountEx@CCtrlListView@@QAEXHK@Z @1016 NONAME

@@ -850,7 +850,7 @@ mir_wstrcmpi                  @280
 ?SetItemState@CCtrlListView@@QAEXHII@Z @1022 NONAME

 ?SetItemState@CCtrlTreeView@@QAEXPAU_TREEITEM@@KK@Z @1023 NONAME

 ?SetItemText@CCtrlClc@@QAEXPAXPAD@Z @1024 NONAME

-?SetItemText@CCtrlListView@@QAEXHHPA_W@Z @1025 NONAME

+?SetItemText@CCtrlListView@@QAEXHHPB_W@Z @1025 NONAME

 ?SetLeftMargin@CCtrlClc@@QAEXH@Z @1026 NONAME

 ?SetLineColor@CCtrlTreeView@@QAEKK@Z @1027 NONAME

 ?SetOfflineModes@CCtrlClc@@QAEXK@Z @1028 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index a56134d62e..ed12967625 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -534,16 +534,16 @@ mir_wstrcmpi                  @280
 ??_7CDbLink@@6B@ @693 NONAME

 ??_7CDlgBase@@6B@ @694 NONAME

 ?ActivatePage@CCtrlPages@@QEAAXH@Z @696 NONAME

-?AddColumn@CCtrlListView@@QEAAXHPEA_WH@Z @698 NONAME

+?AddColumn@CCtrlListView@@QEAAXHPEB_WH@Z @698 NONAME

 ?AddContact@CCtrlClc@@QEAAXI@Z @699 NONAME

 ?AddControl@CDlgBase@@IEAAXPEAVCCtrlBase@@@Z @700 NONAME

 ?AddGroup@CCtrlClc@@QEAAXPEAX@Z @701 NONAME

-?AddGroup@CCtrlListView@@QEAAXHPEA_W@Z @702 NONAME

+?AddGroup@CCtrlListView@@QEAAXHPEB_W@Z @702 NONAME

 ?AddInfoItem@CCtrlClc@@QEAAPEAXPEAUCLCINFOITEM@@@Z @703 NONAME

-?AddItem@CCtrlListView@@QEAAHPEA_WH_JH@Z @704 NONAME

-?AddPage@CCtrlPages@@QEAAXPEA_WPEAUHICON__@@PEAVCDlgBase@@@Z @705 NONAME

+?AddItem@CCtrlListView@@QEAAHPEB_WH_JH@Z @704 NONAME

+?AddPage@CCtrlPages@@QEAAXPEB_WPEAUHICON__@@PEAVCDlgBase@@@Z @705 NONAME

 ?AddString@CCtrlCombo@@QEAAHPEB_W_J@Z @706 NONAME

-?AddString@CCtrlListBox@@QEAAHPEA_W_J@Z @707 NONAME

+?AddString@CCtrlListBox@@QEAAHPEB_W_J@Z @707 NONAME

 ?AddStringA@CCtrlCombo@@QEAAHPEBD_J@Z @708 NONAME

 ?ApproximateViewRect@CCtrlListView@@QEAAKHHH@Z @709 NONAME

 ?Arrange@CCtrlListView@@QEAAXI@Z @710 NONAME

@@ -591,7 +591,7 @@ mir_wstrcmpi                  @280
 ?FindItem@CCtrlListView@@QEAAHHPEBUtagLVFINDINFOW@@@Z @757 NONAME

 ?FindNamedItem@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAU2@PEB_W@Z @758 NONAME

 ?FindString@CCtrlCombo@@QEAAHPEB_WH_N@Z @759 NONAME

-?FindString@CCtrlListBox@@QEAAHPEA_WH_N@Z @760 NONAME

+?FindString@CCtrlListBox@@QEAAHPEB_WH_N@Z @760 NONAME

 ?FindStringA@CCtrlCombo@@QEAAHPEBDH_N@Z @761 NONAME

 ?GetBkColor@CCtrlClc@@QEAAKXZ @762 NONAME

 ?GetBkColor@CCtrlListView@@QEAAKXZ @763 NONAME

@@ -727,8 +727,8 @@ mir_wstrcmpi                  @280
 ?InsertItem@CCtrlListView@@QEAAHQEAUtagLVITEMW@@@Z @894 NONAME

 ?InsertItem@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAUtagTVINSERTSTRUCTW@@@Z @895 NONAME

 ?InsertMarkHitTest@CCtrlListView@@QEAAHPEAUtagPOINT@@PEAULVINSERTMARK@@@Z @896 NONAME

-?InsertString@CCtrlCombo@@QEAAHPEA_WH_J@Z @897 NONAME

-?InsertString@CCtrlListBox@@QEAAHPEA_WH_J@Z @898 NONAME

+?InsertString@CCtrlCombo@@QEAAHPEB_WH_J@Z @897 NONAME

+?InsertString@CCtrlListBox@@QEAAHPEB_WH_J@Z @898 NONAME

 ?IsChanged@CCtrlBase@@QEBA_NXZ @899 NONAME

 ?IsGroupViewEnabled@CCtrlListView@@QEAAHXZ @900 NONAME

 ?IsInitialized@CDlgBase@@QEBA_NXZ @901 NONAME

@@ -794,8 +794,8 @@ mir_wstrcmpi                  @280
 ?SelectItem@CCtrlClc@@QEAAXPEAX@Z @966 NONAME

 ?SelectItem@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@@Z @967 NONAME

 ?SelectSetFirstVisible@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@@Z @968 NONAME

-?SelectString@CCtrlCombo@@QEAAHPEA_W@Z @969 NONAME

-?SelectString@CCtrlListBox@@QEAAHPEA_W@Z @970 NONAME

+?SelectString@CCtrlCombo@@QEAAHPEB_W@Z @969 NONAME

+?SelectString@CCtrlListBox@@QEAAHPEB_W@Z @970 NONAME

 ?SendMsg@CCtrlBase@@QEBA_JI_K_J@Z @971 NONAME

 ?SetBkBitmap@CCtrlClc@@QEAAXKPEAUHBITMAP__@@@Z @972 NONAME

 ?SetBkColor@CCtrlClc@@QEAAXK@Z @973 NONAME

@@ -838,7 +838,7 @@ mir_wstrcmpi                  @280
 ?SetInsertMarkColor@CCtrlTreeView@@QEAAKK@Z @1010 NONAME

 ?SetInt@CCtrlBase@@QEAAXH@Z @1011 NONAME

 ?SetItem@CCtrlListView@@QEAAHQEAUtagLVITEMW@@@Z @1012 NONAME

-?SetItem@CCtrlListView@@QEAAXHHPEA_WH@Z @1013 NONAME

+?SetItem@CCtrlListView@@QEAAXHHPEB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QEAAXPEAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QEAAXH@Z @1015 NONAME

 ?SetItemCountEx@CCtrlListView@@QEAAXHK@Z @1016 NONAME

@@ -850,7 +850,7 @@ mir_wstrcmpi                  @280
 ?SetItemState@CCtrlListView@@QEAAXHII@Z @1022 NONAME

 ?SetItemState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@KK@Z @1023 NONAME

 ?SetItemText@CCtrlClc@@QEAAXPEAXPEAD@Z @1024 NONAME

-?SetItemText@CCtrlListView@@QEAAXHHPEA_W@Z @1025 NONAME

+?SetItemText@CCtrlListView@@QEAAXHHPEB_W@Z @1025 NONAME

 ?SetLeftMargin@CCtrlClc@@QEAAXH@Z @1026 NONAME

 ?SetLineColor@CCtrlTreeView@@QEAAKK@Z @1027 NONAME

 ?SetOfflineModes@CCtrlClc@@QEAAXK@Z @1028 NONAME