• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29195 (tree)
Time2021-05-04 04:18:21
Authorstefankueng

Log Message

LPTSTR --> LPWSTR

Change Summary

Incremental Difference

--- trunk/src/ResText/ResModule.cpp (revision 29194)
+++ trunk/src/ResText/ResModule.cpp (revision 29195)
@@ -2054,7 +2054,7 @@
20542054 return s;
20552055 }
20562056
2057-BOOL CALLBACK CResModule::EnumResNameCallback(HMODULE /*hModule*/, LPCWSTR lpszType, LPTSTR lpszName, LONG_PTR lParam)
2057+BOOL CALLBACK CResModule::EnumResNameCallback(HMODULE /*hModule*/, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam)
20582058 {
20592059 auto lpResModule = reinterpret_cast<CResModule*>(lParam);
20602060
@@ -2102,13 +2102,13 @@
21022102 return TRUE;
21032103 }
21042104
2105-BOOL CALLBACK CResModule::EnumResNameWriteCallback(HMODULE hModule, LPCWSTR lpszType, LPTSTR lpszName, LONG_PTR lParam)
2105+BOOL CALLBACK CResModule::EnumResNameWriteCallback(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam)
21062106 {
21072107 auto lpResModule = reinterpret_cast<CResModule*>(lParam);
21082108 return EnumResourceLanguages(hModule, lpszType, lpszName, reinterpret_cast<ENUMRESLANGPROCW>(&lpResModule->EnumResWriteLangCallback), lParam);
21092109 }
21102110
2111-BOOL CALLBACK CResModule::EnumResWriteLangCallback(HMODULE /*hModule*/, LPCWSTR lpszType, LPTSTR lpszName, WORD wLanguage, LONG_PTR lParam)
2111+BOOL CALLBACK CResModule::EnumResWriteLangCallback(HMODULE /*hModule*/, LPCWSTR lpszType, LPWSTR lpszName, WORD wLanguage, LONG_PTR lParam)
21122112 {
21132113 BOOL bRes = FALSE;
21142114 auto lpResModule = reinterpret_cast<CResModule*>(lParam);
--- trunk/src/ResText/ResModule.h (revision 29194)
+++ trunk/src/ResText/ResModule.h (revision 29195)
@@ -97,9 +97,9 @@
9797 void SetAdjustEOLs(bool bAdjustEOLs = true) { m_bAdjustEOLs = bAdjustEOLs; }
9898
9999 private:
100- static BOOL CALLBACK EnumResNameCallback(HMODULE hModule, LPCWSTR lpszType, LPTSTR lpszName, LONG_PTR lParam);
101- static BOOL CALLBACK EnumResNameWriteCallback(HMODULE hModule, LPCWSTR lpszType, LPTSTR lpszName, LONG_PTR lParam);
102- static BOOL CALLBACK EnumResWriteLangCallback(HMODULE hModule, LPCWSTR lpszType, LPTSTR lpszName, WORD wLanguage, LONG_PTR lParam);
100+ static BOOL CALLBACK EnumResNameCallback(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam);
101+ static BOOL CALLBACK EnumResNameWriteCallback(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam);
102+ static BOOL CALLBACK EnumResWriteLangCallback(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, WORD wLanguage, LONG_PTR lParam);
103103 BOOL ExtractString(LPCWSTR lpszType);
104104 BOOL ExtractDialog(LPCWSTR lpszType);
105105 BOOL ExtractMenu(LPCWSTR lpszType);
--- trunk/src/SVN/SVNStatus.cpp (revision 29194)
+++ trunk/src/SVN/SVNStatus.cpp (revision 29195)
@@ -588,7 +588,7 @@
588588 }
589589 }
590590
591-int SVNStatus::LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, WORD wLanguage)
591+int SVNStatus::LoadStringEx(HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int nBufferMax, WORD wLanguage)
592592 {
593593 const STRINGRESOURCEIMAGE* pImage = nullptr;
594594 const STRINGRESOURCEIMAGE* pImageEnd = nullptr;
--- trunk/src/SVN/SVNStatus.h (revision 29194)
+++ trunk/src/SVN/SVNStatus.h (revision 29195)
@@ -233,6 +233,6 @@
233233 };
234234 #pragma warning(pop) // C4200
235235
236- static int LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, WORD wLanguage);
236+ static int LoadStringEx(HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int nBufferMax, WORD wLanguage);
237237 static svn_error_t *cancel(void *baton);
238238 };
--- trunk/src/SVN/TSVNPath.cpp (revision 29194)
+++ trunk/src/SVN/TSVNPath.cpp (revision 29195)
@@ -520,7 +520,7 @@
520520 {
521521 EnsureBackslashPathSet();
522522 CString workingPath = m_sBackslashPath;
523- LPTSTR pPath = workingPath.GetBuffer(MAX_PATH); // MAX_PATH ok here.
523+ LPWSTR pPath = workingPath.GetBuffer(MAX_PATH); // MAX_PATH ok here.
524524 ATLVERIFY(::PathStripToRoot(pPath));
525525 workingPath.ReleaseBuffer();
526526 return workingPath;
--- trunk/src/SubWCRev/Register.cpp (revision 29194)
+++ trunk/src/SubWCRev/Register.cpp (revision 29195)
@@ -403,7 +403,7 @@
403403 return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
404404
405405 // get the extension pointer in case of fail
406- LPTSTR lpszExt = ::PathFindExtension(szModule);
406+ LPWSTR lpszExt = ::PathFindExtension(szModule);
407407
408408 if (lpszIndex != NULL)
409409 lstrcat(szModule, OLE2CT(lpszIndex));
--- trunk/src/SubWCRev/SubWCRev.cpp (revision 29194)
+++ trunk/src/SubWCRev/SubWCRev.cpp (revision 29195)
@@ -970,7 +970,7 @@
970970 svn_handle_error2(svnErr, stdout, FALSE, "SubWCRev : ");
971971 }
972972 wchar_t wcFullPathBuf[MAX_PATH] = {0};
973- LPTSTR dummy;
973+ LPWSTR dummy;
974974 GetFullPathName(wc, MAX_PATH, wcFullPathBuf, &dummy);
975975 apr_status_t e = 0;
976976 if (svnErr)
--- trunk/src/SubWCRev/SubWCRevCOM.cpp (revision 29194)
+++ trunk/src/SubWCRev/SubWCRevCOM.cpp (revision 29195)
@@ -49,7 +49,7 @@
4949
5050 int APIENTRY wWinMain(HINSTANCE /*hInstance*/,
5151 HINSTANCE /*hPrevInstance*/,
52- LPTSTR /*lpCmdLine*/,
52+ LPWSTR /*lpCmdLine*/,
5353 int /*nCmdShow*/)
5454 {
5555 ImplWinMain();
--- trunk/src/TortoiseIDiff/TortoiseIDiff.cpp (revision 29194)
+++ trunk/src/TortoiseIDiff/TortoiseIDiff.cpp (revision 29195)
@@ -37,10 +37,10 @@
3737 HCURSOR curHand;
3838 HCURSOR curHandDown;
3939
40-int APIENTRY _tWinMain(HINSTANCE hInstance,
41- HINSTANCE /*hPrevInstance*/,
42- LPTSTR lpCmdLine,
43- int /*nCmdShow*/)
40+int APIENTRY wWinMain(HINSTANCE hInstance,
41+ HINSTANCE /*hPrevInstance*/,
42+ LPWSTR lpCmdLine,
43+ int /*nCmdShow*/)
4444 {
4545 SetDllDirectory(L"");
4646 CCrashReportTSVN crasher(L"TortoiseIDiff " _T(APP_X64_STRING));
--- trunk/src/TortoiseMerge/BaseView.cpp (revision 29194)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 29195)
@@ -2182,7 +2182,7 @@
21822182 nTabCount++;
21832183 }
21842184
2185- LPTSTR pszBuf = line.GetBuffer(nLength + nTabCount * (nTabSize - 1) + 1);
2185+ LPWSTR pszBuf = line.GetBuffer(nLength + nTabCount * (nTabSize - 1) + 1);
21862186 int nCurPos = 0;
21872187 if (nTabCount > 0 || m_bViewWhitespace)
21882188 {
--- trunk/src/TortoiseProc/ProjectProperties.cpp (revision 29194)
+++ trunk/src/TortoiseProc/ProjectProperties.cpp (revision 29195)
@@ -193,7 +193,7 @@
193193 val = sPropVal;
194194 if (!val.IsEmpty())
195195 {
196- LPTSTR strEnd;
196+ LPWSTR strEnd;
197197 lProjectLanguage = wcstol(val, &strEnd, 0);
198198 }
199199 }
--- trunk/src/TortoiseProc/Properties/EditPropTSVNLang.cpp (revision 29194)
+++ trunk/src/TortoiseProc/Properties/EditPropTSVNLang.cpp (revision 29195)
@@ -124,7 +124,7 @@
124124 CStandAloneDialog::OnOK();
125125 }
126126
127-BOOL CEditPropTSVNLang::EnumLocalesProc(LPTSTR lpLocaleString)
127+BOOL CEditPropTSVNLang::EnumLocalesProc(LPWSTR lpLocaleString)
128128 {
129129 DWORD langID = wcstol(lpLocaleString, nullptr, 16);
130130
--- trunk/src/TortoiseProc/Properties/EditPropTSVNLang.h (revision 29194)
+++ trunk/src/TortoiseProc/Properties/EditPropTSVNLang.h (revision 29195)
@@ -46,7 +46,7 @@
4646
4747 INT_PTR DoModal() override { return CStandAloneDialog::DoModal(); }
4848
49- static BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString);
49+ static BOOL CALLBACK EnumLocalesProc(LPWSTR lpLocaleString);
5050
5151 private:
5252 BOOL m_bKeepEnglish;
--- trunk/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp (revision 29194)
+++ trunk/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp (revision 29195)
@@ -1437,7 +1437,7 @@
14371437 {
14381438 CRect viewRect = GetViewRect();
14391439
1440- LPTSTR cursorID = IDC_ARROW;
1440+ LPWSTR cursorID = IDC_ARROW;
14411441 HINSTANCE resourceHandle = nullptr;
14421442
14431443 if ((nHitTest == HTCLIENT) && (pWnd == this) && (viewRect.Width()) && (viewRect.Height()) && (message))
--- trunk/src/TortoiseUDiff/TortoiseUDiff.cpp (revision 29194)
+++ trunk/src/TortoiseUDiff/TortoiseUDiff.cpp (revision 29195)
@@ -37,7 +37,7 @@
3737
3838 int APIENTRY wWinMain(HINSTANCE hInstance,
3939 HINSTANCE /*hPrevInstance*/,
40- LPTSTR lpCmdLine,
40+ LPWSTR lpCmdLine,
4141 int /*nCmdShow*/)
4242 {
4343 SetDllDirectory(L"");
--- trunk/src/Utils/FormatMessageWrapper.h (revision 29194)
+++ trunk/src/Utils/FormatMessageWrapper.h (revision 29195)
@@ -26,7 +26,7 @@
2626 class CFormatMessageWrapper
2727 {
2828 private:
29- LPTSTR buffer;
29+ LPWSTR buffer;
3030 DWORD result;
3131 void release();
3232 void obtainMessage() { obtainMessage(::GetLastError()); }
--- trunk/src/Utils/LangDll.cpp (revision 29194)
+++ trunk/src/Utils/LangDll.cpp (revision 29195)
@@ -97,7 +97,7 @@
9797 };
9898
9999 DWORD dwReserved = 0;
100- DWORD dwBufferSize = GetFileVersionInfoSize(const_cast<LPTSTR>(langDll), &dwReserved);
100+ DWORD dwBufferSize = GetFileVersionInfoSize(const_cast<LPWSTR>(langDll), &dwReserved);
101101 if (dwBufferSize == 0)
102102 return false;
103103
@@ -112,7 +112,7 @@
112112 Transarray* lpTransArray = nullptr;
113113 TCHAR strLangProductVersion[MAX_PATH] = {0};
114114
115- if (!GetFileVersionInfo(const_cast<LPTSTR>(langDll), dwReserved, dwBufferSize, pBuffer.get()))
115+ if (!GetFileVersionInfo(const_cast<LPWSTR>(langDll), dwReserved, dwBufferSize, pBuffer.get()))
116116 return false;
117117
118118 VerQueryValue(pBuffer.get(), L"\\VarFileInfo\\Translation", &lpFixedPointer, &nFixedLength);
@@ -120,7 +120,7 @@
120120
121121 swprintf_s(strLangProductVersion, L"\\StringFileInfo\\%04x%04x\\ProductVersion", lpTransArray[0].wLanguageID, lpTransArray[0].wCharacterSet);
122122
123- VerQueryValue(pBuffer.get(), static_cast<LPTSTR>(strLangProductVersion), reinterpret_cast<LPVOID*>(&lpVersion), &nInfoSize);
123+ VerQueryValue(pBuffer.get(), static_cast<LPWSTR>(strLangProductVersion), reinterpret_cast<LPVOID*>(&lpVersion), &nInfoSize);
124124 if (lpVersion && nInfoSize)
125125 return (wcscmp(sVer, reinterpret_cast<LPCWSTR>(lpVersion)) == 0);
126126 return false;
--- trunk/src/Utils/MiscUI/BaseDialog.cpp (revision 29194)
+++ trunk/src/Utils/MiscUI/BaseDialog.cpp (revision 29195)
@@ -124,7 +124,7 @@
124124 ::SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(hIcon));
125125 }
126126
127-void CDialog::AddToolTip(UINT ctrlID, LPTSTR text) const
127+void CDialog::AddToolTip(UINT ctrlID, LPWSTR text) const
128128 {
129129 TOOLINFO tt;
130130 tt.cbSize = sizeof(TOOLINFO);
--- trunk/src/Utils/MiscUI/BaseDialog.h (revision 29194)
+++ trunk/src/Utils/MiscUI/BaseDialog.h (revision 29195)
@@ -44,7 +44,7 @@
4444 INT_PTR DoModal(HINSTANCE hInstance, int resID, HWND hWndParent, UINT idAccel);
4545 HWND Create(HINSTANCE hInstance, int resID, HWND hWndParent);
4646 BOOL EndDialog(HWND hDlg, INT_PTR nResult);
47- void AddToolTip(UINT ctrlID, LPTSTR text) const;
47+ void AddToolTip(UINT ctrlID, LPWSTR text) const;
4848
4949 virtual LRESULT CALLBACK DlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) = 0;
5050 virtual bool PreTranslateMessage(MSG* pMsg);
--- trunk/src/Utils/MiscUI/BrowseFolder.cpp (revision 29194)
+++ trunk/src/Utils/MiscUI/BrowseFolder.cpp (revision 29195)
@@ -65,7 +65,7 @@
6565 }
6666
6767 //show the dialog
68-CBrowseFolder::RetVal CBrowseFolder::Show(HWND parent, LPTSTR path, size_t pathlen, LPCWSTR szDefaultPath /* = NULL */)
68+CBrowseFolder::RetVal CBrowseFolder::Show(HWND parent, LPWSTR path, size_t pathlen, LPCWSTR szDefaultPath /* = NULL */)
6969 {
7070 CString temp = path;
7171 CString sDefault;
--- trunk/src/Utils/MiscUI/BrowseFolder.h (revision 29194)
+++ trunk/src/Utils/MiscUI/BrowseFolder.h (revision 29195)
@@ -57,7 +57,7 @@
5757 * \return one of CANCEL, NOPATH or OK
5858 */
5959 CBrowseFolder::RetVal Show(HWND parent, CString& path, const CString& sDefaultPath = CString());
60- CBrowseFolder::RetVal Show(HWND parent, LPTSTR path, size_t pathlen, LPCWSTR szDefaultPath = nullptr);
60+ CBrowseFolder::RetVal Show(HWND parent, LPWSTR path, size_t pathlen, LPCWSTR szDefaultPath = nullptr);
6161
6262 /**
6363 * If this is set to true, then the second checkbox gets disabled as soon as the first
--- trunk/src/Utils/MiscUI/HistoryCombo.cpp (revision 29194)
+++ trunk/src/Utils/MiscUI/HistoryCombo.cpp (revision 29195)
@@ -123,7 +123,7 @@
123123 CString combostring = str;
124124 combostring.Replace('\r', ' ');
125125 combostring.Replace('\n', ' ');
126- cbei.pszText = const_cast<LPTSTR>(combostring.GetString());
126+ cbei.pszText = const_cast<LPWSTR>(combostring.GetString());
127127
128128 #ifdef HISTORYCOMBO_WITH_SYSIMAGELIST
129129 if (m_bURLHistory)
--- trunk/src/Utils/PathUtils.cpp (revision 29194)
+++ trunk/src/Utils/PathUtils.cpp (revision 29195)
@@ -447,7 +447,7 @@
447447 0,
448448 };
449449
450-void CPathUtils::ConvertToBackslash(LPTSTR dest, LPCWSTR src, size_t len)
450+void CPathUtils::ConvertToBackslash(LPWSTR dest, LPCWSTR src, size_t len)
451451 {
452452 wcscpy_s(dest, len, src);
453453 auto* p = dest;
--- trunk/src/Utils/PathUtils.h (revision 29194)
+++ trunk/src/Utils/PathUtils.h (revision 29195)
@@ -31,7 +31,7 @@
3131 {
3232 public:
3333 static BOOL MakeSureDirectoryPathExists(LPCWSTR path);
34- static void ConvertToBackslash(LPTSTR dest, LPCWSTR src, size_t len);
34+ static void ConvertToBackslash(LPWSTR dest, LPCWSTR src, size_t len);
3535
3636 /**
3737 * Returns false if calling \ref Unescape is not necessary.
--- trunk/src/Utils/UnicodeUtils.cpp (revision 29194)
+++ trunk/src/Utils/UnicodeUtils.cpp (revision 29195)
@@ -165,7 +165,7 @@
165165 };
166166 #pragma warning(pop) // C4200
167167
168-int LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, WORD wLanguage)
168+int LoadStringEx(HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int nBufferMax, WORD wLanguage)
169169 {
170170 STRINGRESOURCEIMAGE* pImage;
171171 STRINGRESOURCEIMAGE* pImageEnd;
--- trunk/src/Utils/UnicodeUtils.h (revision 29194)
+++ trunk/src/Utils/UnicodeUtils.h (revision 29195)
@@ -47,4 +47,4 @@
4747
4848 // resource handling utility
4949
50-int LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, WORD wLanguage);
50+int LoadStringEx(HINSTANCE hInstance, UINT uID, LPWSTR lpBuffer, int nBufferMax, WORD wLanguage);
Show on old repository browser