Skip to content

Commit e28b59b

Browse files
craftwarcraftwar
committed
unicode3
1 parent db4de19 commit e28b59b

File tree

9 files changed

+152
-151
lines changed

9 files changed

+152
-151
lines changed

‎Lite/AutoUpdate.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int CAutoUpdater::CompareVersions(CString ver1, CString ver2)
325325
}
326326

327327
// Get version 1 to DWORDs
328-
TCHAR *pToken = strtok(pVer1, _T("."));
328+
TCHAR *pToken = _tcstok(pVer1, _T("."));
329329
if (pToken == NULL)
330330
{
331331
return -21;
@@ -339,13 +339,13 @@ int CAutoUpdater::CompareVersions(CString ver1, CString ver2)
339339
return -21; // Error in structure, too many parameters
340340
}
341341
wVer1[i] = _tstoi(pToken);
342-
pToken = strtok(NULL, _T("."));
342+
pToken = _tcstok(NULL, _T("."));
343343
i--;
344344
}
345345
ver1.ReleaseBuffer();
346346

347347
// Get version 2 to DWORDs
348-
pToken = strtok(pVer2, _T("."));
348+
pToken = _tcstok(pVer2, _T("."));
349349
if (pToken == NULL)
350350
{
351351
return -22;
@@ -359,7 +359,7 @@ int CAutoUpdater::CompareVersions(CString ver1, CString ver2)
359359
return -22; // Error in structure, too many parameters
360360
}
361361
wVer2[i] = _tstoi(pToken);
362-
pToken = strtok(NULL, _T("."));
362+
pToken = _tcstok(NULL, _T("."));
363363
i--;
364364
}
365365
ver2.ReleaseBuffer();

‎Lite/BBSHyperLink.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const char* CBBSHyperLink::FindHyperLink(const char *src, int &len) const
136136
if (pemail && pemail < plink)
137137
return pemail;
138138

139-
//檢查是否為已知連結
139+
//檢查是否為已知連結
140140
for (int i = 0;i < links.GetSize();i++)
141141
{
142142
int scheme_len = links[i].scheme.GetLength();
@@ -158,16 +158,16 @@ const char* CBBSHyperLink::FindHyperLink(const char *src, int &len) const
158158

159159
void CBBSHyperLink::OpenURL(LPCTSTR url)
160160
{
161-
//查詢是否有設定超連結開啟程式，如果沒有，用預設程式開啟
161+
//查詢是否有設定超連結開啟程式，如果沒有，用預設程式開啟
162162
int t = GetURLType(url);
163163
CString mailto;
164164
LPCTSTR path = url;
165165
LPCTSTR param = NULL;
166166

167-
//檢查是不是e-mail
167+
//檢查是不是e-mail
168168
if (t >= 0)
169169
{
170-
if (t == email) //如果是E-mail
170+
if (t == email) //如果是E-mail
171171
{
172172
mailto = "mailto:";
173173
mailto += url;
@@ -184,11 +184,11 @@ void CBBSHyperLink::OpenURL(LPCTSTR url)
184184
else
185185
{
186186
#ifdef _COMBO_
187-
if (path == url) //如果是預設程式開啟，而且不是E-mail
187+
if (path == url) //如果是預設程式開啟，而且不是E-mail
188188
((CMainFrame*)AfxGetApp()->m_pMainWnd)->view.ConnectWeb(CAddress(url), AppConfig.link_autoswitch);
189189
else
190190
#endif
191-
::ShellExecute(AfxGetMainWnd()->m_hWnd, "open", path, param, NULL,
191+
::ShellExecute(AfxGetMainWnd()->m_hWnd, TEXT("open"), path, param, NULL,
192192
AppConfig.link_autoswitch ? SW_SHOWMAXIMIZED : SW_SHOWMINIMIZED);
193193
}
194194
}
@@ -215,7 +215,7 @@ void CBBSHyperLink::Default()
215215
d.color = 0x00ff00;
216216
links.Add(d);
217217

218-
// E-mail為內建型態，要進階處理
218+
// E-mail為內建型態，要進階處理
219219
d.scheme = "@";
220220
d.color = 0xff0080;
221221
email = links.Add(d);
@@ -226,16 +226,16 @@ void CBBSHyperLink::Default()
226226
int CBBSHyperLink::GetURLType(const char *url)
227227
{
228228
CBBSHyperLinkData* plinks = links.GetData();
229-
//檢查是不是e-mail
229+
//檢查是不是e-mail
230230
const char* psymbol = strstr(url, "://");
231-
if (!psymbol && strchr(url, '@')) //如果是E-mail
231+
if (!psymbol && strchr(url, '@')) //如果是E-mail
232232
return email;
233233

234234
int len = int(psymbol) - int(url);
235235
int i;
236236
for (i = 0;i < links.GetSize(); ++i)
237237
{
238-
if (strnicmp(plinks[i].scheme, url, len) == 0) //如果有偵測到
238+
if (strnicmp(plinks[i].scheme, url, len) == 0) //如果有偵測到
239239
break;
240240
}
241241

‎Lite/Clipboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class CClipboard
2222

2323
inline BOOL CClipboard::SetText(HWND owner, LPCTSTR str)
2424
{
25-
return SetText(owner, str, strlen(str));
25+
return SetText(owner, str, _tcslen(str));
2626
}
2727

2828
inline BOOL CClipboard::SetTextW(HWND owner, const wchar_t* str)

‎Lite/ConfigFile.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ bool CConfigFile::DoSave(ConfigTable table)
194194
CString str, esc_str;
195195
for (; table->name; table++)
196196
{
197-
str.Format("[%s]\r\n", table->name);
197+
str.Format(TEXT("[%s]\r\n"), table->name);
198198
file.Write(LPCTSTR(str), str.GetLength());
199199

200200
if (table->type == VT_CUSTOM_SECT)
@@ -209,7 +209,8 @@ bool CConfigFile::DoSave(ConfigTable table)
209209
else
210210
cur_sect = (ConfigEntry*)table->data;
211211

212-
char strval[64]; const char* pstrval;
212+
char strval[64];
213+
const char* pstrval;
213214
for (; cur_sect->name; cur_sect++)
214215
{
215216
pstrval = strval;
@@ -256,7 +257,7 @@ bool CConfigFile::DoSave(ConfigTable table)
256257
}
257258
break;
258259
}
259-
str.Format("%s=%s\r\n", cur_sect->name, pstrval);
260+
str.Format(TEXT("%s=%s\r\n"), cur_sect->name, pstrval);
260261
file.Write(LPCTSTR(str), str.GetLength());
261262
}
262263
file.Write("\r\n", 2);

‎Lite/ConnectPage.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void CConnectPage::InitWithAddress(const CString& addr)
3939
int pos = address.ReverseFind(':');
4040
if (pos != -1)
4141
{
42-
port = (unsigned short)atoi(address.Mid(pos + 1));
42+
port = (unsigned short)_tstoi(address.Mid(pos + 1));
4343
address = address.Left(pos);
4444
}
4545
}
@@ -53,7 +53,7 @@ CString CConnectPage::GetFormattedAddress() const
5353
if (port == 23 || port <= 0)
5454
return address;
5555
CString buf;
56-
buf.Format("%s:%d", LPCTSTR(address), port);
56+
buf.Format(TEXT("%s:%d"), LPCTSTR(address), port);
5757
return buf;
5858
}
5959

@@ -117,7 +117,7 @@ void CConnectPage::OnAddressChanged()
117117
if (addr.IsValid())
118118
{
119119
CString port_text;
120-
port_text.Format("%d", addr.Port());
120+
port_text.Format(TEXT("%d"), addr.Port());
121121
port_field->SetWindowText(port_text);
122122
}
123-
}
123+
}

‎Lite/CtrlEdit.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ LRESULT CCtrlEdit::OnPaste(WPARAM w, LPARAM l)
4040
if (hmem != NULL)
4141
{
4242
LPSTR data = (LPSTR)GlobalLock(hmem);
43-
if (strstr(data, "\x1b[")) //如果含有色彩控制碼
43+
if (strstr(data, "\x1b[")) //如果含有色彩控制碼
4444
{
4545
CString tmp = data;
46-
tmp.Replace("\x1b[", "^[[");
46+
tmp.Replace(TEXT("\x1b["), TEXT("^[["));
4747
ReplaceSel(tmp, FALSE);
4848
CStringDlg* pdlg = (CStringDlg*)GetParent();
4949
if (pdlg)
5050
{
51-
pdlg->ansi.SetCheck(1); //勾選控制碼選項
51+
pdlg->ansi.SetCheck(1); //勾選控制碼選項
5252
}
5353
}
5454
else

‎Lite/CustomizeDlg.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ char* CCustomizeDlg::UIRead(CTreeCtrl& tree, char* buf, HTREEITEM parent)
4545
BYTE type = *buf;
4646
// *buf=TYPE;
4747
buf++;
48-
WORD count = *(WORD*)buf; //取得sub item count
49-
buf += 6 + *(WORD*)(buf + 4); //到第一個sub item
48+
WORD count = *(WORD*)buf; //取得sub item count
49+
buf += 6 + *(WORD*)(buf + 4); //到第一個sub item
5050

5151
while (count)
5252
{
5353
LPSTR text;
5454
WORD len;
5555
// type=*buf; id=*(WORD*)(buf+1);
56-
if (!*buf) //如果是separator
56+
if (!*buf) //如果是separator
5757
{
5858
tree.InsertItem(separator, parent);
5959
buf++;
@@ -72,7 +72,7 @@ char* CCustomizeDlg::UIRead(CTreeCtrl& tree, char* buf, HTREEITEM parent)
7272
data->key = data->fVirt = 0;
7373
data->hitem = hitem;
7474

75-
//將HotkeyData中的id對照accels table,順便建立每個使用同樣id的其他熱鍵
75+
//將HotkeyData中的id對照accels table,順便建立每個使用同樣id的其他熱鍵
7676
if (!(data->type & CT_HAS_SUB))
7777
{
7878
WORD id = data->id;
@@ -128,10 +128,10 @@ BOOL CCustomizeDlg::OnInitDialog()
128128
DWORD l = ui->GetLength();
129129
char* ui_buf = new char[l];
130130
ui->Read(ui_buf, l);
131-
// 讀取Accelerator
131+
// 讀取Accelerator
132132
accel_count = *(WORD*)ui_buf;
133133
accels = (ACCEL*)(ui_buf + sizeof(WORD));
134-
// 讀取Accelerator結束,開始讀取 UI,建立HotkeyData的list
134+
// 讀取Accelerator結束,開始讀取 UI,建立HotkeyData的list
135135
char* menu = ((char*)accels) + accel_count * sizeof(ACCEL);
136136
menuitem_count = *(WORD*)(menu + 1);
137137
UIRead(tree, menu, TVI_ROOT);
@@ -179,24 +179,24 @@ void CCustomizeDlg::OnApply()
179179
if (!data)
180180
return;
181181

182-
if (!hkedit.key) //沒設定熱鍵或是有子選單的項目都只更新文字顯示
182+
if (!hkedit.key) //沒設定熱鍵或是有子選單的項目都只更新文字顯示
183183
{
184184
UpdateItemDisplay(hitem);
185185
return;
186186
}
187187

188188
HotkeyData* old = HotkeyDataFromKeys(hkedit.fVirt, hkedit.key);
189189

190-
if (old) //如果現在正要設定熱鍵原本已經被使用
190+
if (old) //如果現在正要設定熱鍵原本已經被使用
191191
{
192-
if (old->id != data->id) //如果本來是被別的功能使用
192+
if (old->id != data->id) //如果本來是被別的功能使用
193193
{
194194
if (MessageBox(LoadString(IDS_REPLACE_OLD_HOTKEY_CONFIRM) , NULL, MB_OKCANCEL | MB_ICONQUESTION) != IDOK)
195195
return;
196196
}
197-
else //如果是正在設定的功能本來就有的熱鍵,先刪除再新增到第一個
197+
else //如果是正在設定的功能本來就有的熱鍵,先刪除再新增到第一個
198198
{
199-
//找出list中對應的項目並刪除
199+
//找出list中對應的項目並刪除
200200
int c = list.GetCount();
201201
for (int i = 0;i < c;i++)
202202
if (list.GetItemData(i) == DWORD(old))
@@ -208,16 +208,16 @@ void CCustomizeDlg::OnApply()
208208
DeleteHotkeyForID(old);
209209
}
210210

211-
//新增熱鍵
211+
//新增熱鍵
212212
HotkeyData* hkitem = (HotkeyData*)tree.GetItemData(hitem);
213213
WORD id = hkitem->id;
214-
//加到hkitem前一個，並且更新畫面
214+
//加到hkitem前一個，並且更新畫面
215215
hkitem = HotkeyDataFromID(pfirst, id);
216216

217217
while (hkitem)
218218
{
219219
HotkeyData* newkitem;
220-
if (hkitem->key) //如果原本有熱鍵,建立新的,插入到他前面
220+
if (hkitem->key) //如果原本有熱鍵,建立新的,插入到他前面
221221
{
222222
newkitem = new HotkeyData;
223223
newkitem->type = hkitem->type;
@@ -226,32 +226,32 @@ void CCustomizeDlg::OnApply()
226226
newkitem->fVirt = hkedit.fVirt;
227227
newkitem->key = hkedit.key;
228228
newkitem->hitem = hkitem->hitem;
229-
//插入串列
229+
//插入串列
230230
newkitem->pnext = hkitem;
231231
newkitem->pprev = hkitem->pprev;
232232
hkitem->pprev = newkitem;
233233
if (!newkitem->pprev)
234234
pfirst = newkitem;
235235
else
236236
newkitem->pprev->pnext = newkitem;
237-
//插入串列完成
237+
//插入串列完成
238238
}
239-
else //如果本來沒熱鍵,不用配置記憶體
239+
else //如果本來沒熱鍵,不用配置記憶體
240240
{
241241
newkitem = hkitem;
242242
hkitem->fVirt = hkedit.fVirt;
243243
hkitem->key = hkedit.key;
244244
}
245245

246-
if (newkitem->hitem == hitem) //如果是現在正選取的項目
246+
if (newkitem->hitem == hitem) //如果是現在正選取的項目
247247
{
248248
list.InsertString(0, HotkeyToStr(newkitem->fVirt, newkitem->key));
249249
list.SetItemData(0, DWORD(newkitem));
250250
}
251251
tree.SetItemData(newkitem->hitem, DWORD(newkitem));
252252
UpdateItemDisplay(newkitem->hitem);
253253

254-
while (hkitem && hkitem->id == id) //略過相同id的其他熱鍵
254+
while (hkitem && hkitem->id == id) //略過相同id的其他熱鍵
255255
hkitem = hkitem->pnext;
256256

257257
hkitem = HotkeyDataFromID(hkitem, id);
@@ -281,7 +281,7 @@ void CCustomizeDlg::OnDel()
281281
void CCustomizeDlg::OnSelChanged(NMHDR* pNMHDR, LRESULT* pResult)
282282
{
283283
*pResult = 0;
284-
list.ResetContent(); //清除list顯示
284+
list.ResetContent(); //清除list顯示
285285
HTREEITEM item = tree.GetSelectedItem();
286286
if (!item)
287287
return;
@@ -349,7 +349,7 @@ void CCustomizeDlg::OnSelChanged(NMHDR* pNMHDR, LRESULT* pResult)
349349

350350
LRESULT CALLBACK CCustomizeDlg::HotkeyEdit2Proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
351351
{
352-
char a[] = {0, 0};
352+
TCHAR a[] = {0, 0};
353353
if (msg == WM_CHAR)
354354
{
355355
if (isalnum(wparam))
@@ -447,9 +447,9 @@ void CCustomizeDlg::UIWriteAccels()
447447
HotkeyData* hkitem = pfirst;
448448
while (hkitem)
449449
{
450-
hkitem->fVirt |= (FNOINVERT | FVIRTKEY); //加入fVirt的其他flags
450+
hkitem->fVirt |= (FNOINVERT | FVIRTKEY); //加入fVirt的其他flags
451451
BOOL can_add = TRUE;
452-
for (int i = 0;i < accel_count;i++) //檢查是否已經有此熱鍵
452+
for (int i = 0;i < accel_count;i++) //檢查是否已經有此熱鍵
453453
{
454454
if (accels[i].fVirt == hkitem->fVirt && accels[i].key == hkitem->key)
455455
{
@@ -544,7 +544,7 @@ CCustomizeDlg::HotkeyData* CCustomizeDlg::HotkeyDataFromKeys(BYTE fVirt, WORD ke
544544
return NULL;
545545
}
546546

547-
// 從所有具有相同 ID (hkdel->id) 的選單項目中，移除和 hkdel 相同的熱鍵 (hkdel->fVirt + hkdel->key)
547+
// 從所有具有相同 ID (hkdel->id) 的選單項目中，移除和 hkdel 相同的熱鍵 (hkdel->fVirt + hkdel->key)
548548
void CCustomizeDlg::DeleteHotkeyForID(CCustomizeDlg::HotkeyData* hkdel)
549549
{
550550
WORD id = hkdel->id;
@@ -558,19 +558,19 @@ void CCustomizeDlg::DeleteHotkeyForID(CCustomizeDlg::HotkeyData* hkdel)
558558
if (hkdel->fVirt == fVirt && hkdel->key == key)
559559
{
560560
HTREEITEM hitem = hkdel->hitem;
561-
if (hkdel->pprev && hkdel->pprev->id == id) //如果同id前一個還有熱鍵
561+
if (hkdel->pprev && hkdel->pprev->id == id) //如果同id前一個還有熱鍵
562562
DeleteHotkeyData(hkdel);
563-
else if (hkdel->pnext && hkdel->pnext->id == id) //如果同id前一個沒有但是後一個還有熱鍵
563+
else if (hkdel->pnext && hkdel->pnext->id == id) //如果同id前一個沒有但是後一個還有熱鍵
564564
{
565565
tree.SetItemData(hitem, DWORD(hkdel->pnext));
566566
DeleteHotkeyData(hkdel);
567567
}
568-
else //已經沒有熱鍵了,不能釋放記憶體
568+
else //已經沒有熱鍵了,不能釋放記憶體
569569
{
570570
hkdel->fVirt = 0;
571571
hkdel->key = 0;
572572
}
573-
UpdateItemDisplay(hitem); //更新文字顯示
573+
UpdateItemDisplay(hitem); //更新文字顯示
574574
}
575575
hkdel = knext;
576576
}

0 commit comments

Comments
 (0)