From b9145aa49e9b9462ea5bcd2140a9ede0a74b0921 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 4 Dec 2010 17:56:44 -0500 Subject: [PATCH] Windows: fix UNICODE build for talocale src/WINNT/talocale has not been built for UNICODE in a long time. Fix it. Reviewed-on: http://gerrit.openafs.org/3439 Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman (cherry picked from commit 24a9ba4b829a871defea75ddf17fb621035ca008) Change-Id: I2f77de3255b229bfa00437af59d11c0da5646458 Reviewed-on: http://gerrit.openafs.org/3787 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/WINNT/talocale/tal_alloc.cpp | 22 +++++++++++----------- src/WINNT/talocale/tal_main.cpp | 4 ++-- src/WINNT/talocale/tal_string.cpp | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/WINNT/talocale/tal_alloc.cpp b/src/WINNT/talocale/tal_alloc.cpp index dca6c35c1..a8d149399 100644 --- a/src/WINNT/talocale/tal_alloc.cpp +++ b/src/WINNT/talocale/tal_alloc.cpp @@ -70,8 +70,8 @@ typedef struct { PVOID pData; size_t cbData; - LPSTR pszExpr; - LPSTR pszFile; + LPTSTR pszExpr; + LPTSTR pszFile; DWORD dwLine; DWORD dwTick; DWORD dwEndSig; @@ -355,7 +355,7 @@ void SetDlgItemBytes (HWND hDlg, int idc, double lfValue) } -void MemMgr_ShowWarning (PMEMCHUNK pChunk, LPSTR pszFile, DWORD dwLine, LPTSTR pszDesc) +void MemMgr_ShowWarning (PMEMCHUNK pChunk, LPTSTR pszFile, DWORD dwLine, LPTSTR pszDesc) { TCHAR szMessage[ 1024 ]; wsprintf (szMessage, TEXT("%s\n\n Address: 0x%08p (%s)\n Allocated: %s line %ld\n Freed: %s line %ld\n\nClick OK for memory details."), pszDesc, pChunk->pData, pChunk->pszExpr, pChunk->pszFile, pChunk->dwLine, pszFile, dwLine); @@ -1142,7 +1142,7 @@ BOOL MemMgr_Initialize (void) } -void MemMgr_TrackAllocation (PVOID pData, size_t cb, LPSTR pszExpr, LPSTR pszFile, DWORD dwLine, BOOL fSig) +void MemMgr_TrackAllocation (PVOID pData, size_t cb, LPTSTR pszExpr, LPTSTR pszFile, DWORD dwLine, BOOL fSig) { if (!pData) return; @@ -1269,7 +1269,7 @@ void MemMgr_TrackAllocation (PVOID pData, size_t cb, LPSTR pszExpr, LPSTR pszFil } -BOOL MemMgr_TrackDestruction (PVOID pData, LPSTR pszFile, DWORD dwLine) +BOOL MemMgr_TrackDestruction (PVOID pData, LPTSTR pszFile, DWORD dwLine) { if (MemMgr_Initialize()) { @@ -1299,8 +1299,8 @@ BOOL MemMgr_TrackDestruction (PVOID pData, LPSTR pszFile, DWORD dwLine) MEMCHUNK Sim; memset (&Sim, 0x00, sizeof(MEMCHUNK)); Sim.pData = pData; - Sim.pszExpr = "(unknown)"; - Sim.pszFile = "(unknown)"; + Sim.pszExpr = TEXT("(unknown)"); + Sim.pszFile = TEXT("(unknown)"); MemMgr_ShowWarning (&Sim, pszFile, dwLine, TEXT("An invalid memory address was freed.")); } else if (pChunk->dwEndSig && (*(DWORD*)((PBYTE)pData + pChunk->cbData) != pChunk->dwEndSig)) @@ -1459,7 +1459,7 @@ BOOL MEMMGR_CALLCONV IsMemoryManagerMessage (MSG *pMsg) } -PVOID MEMMGR_CALLCONV MemMgr_AllocateMemory (size_t cb, LPSTR pszExpr, LPSTR pszFile, DWORD dwLine) +PVOID MEMMGR_CALLCONV MemMgr_AllocateMemory (size_t cb, LPTSTR pszExpr, LPTSTR pszFile, DWORD dwLine) { PVOID pData = GlobalAlloc (GMEM_FIXED, cb + sizeof(DWORD)); MemMgr_TrackAllocation (pData, cb, pszExpr, pszFile, dwLine, TRUE); @@ -1467,7 +1467,7 @@ PVOID MEMMGR_CALLCONV MemMgr_AllocateMemory (size_t cb, LPSTR pszExpr, LPSTR psz } -void MEMMGR_CALLCONV MemMgr_FreeMemory (PVOID pData, LPSTR pszFile, DWORD dwLine) +void MEMMGR_CALLCONV MemMgr_FreeMemory (PVOID pData, LPTSTR pszFile, DWORD dwLine) { if (MemMgr_TrackDestruction (pData, pszFile, dwLine)) { @@ -1476,14 +1476,14 @@ void MEMMGR_CALLCONV MemMgr_FreeMemory (PVOID pData, LPSTR pszFile, DWORD dwLine } -PVOID MEMMGR_CALLCONV MemMgr_TrackNew (PVOID pData, size_t cb, LPSTR pszExpr, LPSTR pszFile, DWORD dwLine) +PVOID MEMMGR_CALLCONV MemMgr_TrackNew (PVOID pData, size_t cb, LPTSTR pszExpr, LPTSTR pszFile, DWORD dwLine) { MemMgr_TrackAllocation (pData, cb, pszExpr, pszFile, dwLine, FALSE); return pData; } -void MEMMGR_CALLCONV MemMgr_TrackDelete (PVOID pData, LPSTR pszFile, DWORD dwLine) +void MEMMGR_CALLCONV MemMgr_TrackDelete (PVOID pData, LPTSTR pszFile, DWORD dwLine) { MemMgr_TrackDestruction (pData, pszFile, dwLine); } diff --git a/src/WINNT/talocale/tal_main.cpp b/src/WINNT/talocale/tal_main.cpp index 7792934ca..9fb289319 100644 --- a/src/WINNT/talocale/tal_main.cpp +++ b/src/WINNT/talocale/tal_main.cpp @@ -60,8 +60,8 @@ void TaLocale_Initialize (void) static BOOL fInitialized = FALSE; if (!fInitialized) { - char mutexName[256]; - sprintf(mutexName, "TaLocale_Initialize pid=%d", getpid()); + TCHAR mutexName[256]; + wsprintf(mutexName, TEXT("TaLocale_Initialize pid=%d"), getpid()); HANDLE hMutex = CreateMutex(NULL, TRUE, mutexName); if ( GetLastError() == ERROR_ALREADY_EXISTS ) { if ( WaitForSingleObject( hMutex, INFINITE ) != WAIT_OBJECT_0 ) { diff --git a/src/WINNT/talocale/tal_string.cpp b/src/WINNT/talocale/tal_string.cpp index fc542fe70..401fb38dd 100644 --- a/src/WINNT/talocale/tal_string.cpp +++ b/src/WINNT/talocale/tal_string.cpp @@ -823,8 +823,8 @@ BOOL FormatTime (LPTSTR pszTarget, LPTSTR pszFormatUser, SYSTEMTIME *pst, BOOL f } else { - GetTimeFormat (LOCALE_USER_DEFAULT, 0, <, "HH:mm:ss", szTime, cchRESOURCE); - GetDateFormat (LOCALE_USER_DEFAULT, 0, <, "yyyy-MM-dd", szDate, cchRESOURCE); + GetTimeFormat (LOCALE_USER_DEFAULT, 0, <, TEXT("HH:mm:ss"), szTime, cchRESOURCE); + GetDateFormat (LOCALE_USER_DEFAULT, 0, <, TEXT("yyyy-MM-dd"), szDate, cchRESOURCE); if (fShowTime && fShowDate) { @@ -1423,7 +1423,7 @@ void CopyUnicodeToAnsi (LPSTR pszTargetA, LPCWSTR pszOriginalW, size_t cchMax) UINT cpTarget = CP_ACP; BOOL fDefault = FALSE; - size_t cchOut = WideCharToMultiByte (cpTarget, 0, pszOriginalW, (INT)cchSource-1, pszTargetA, (INT)cchMax * 2, TEXT(" "), &fDefault); + size_t cchOut = WideCharToMultiByte (cpTarget, 0, pszOriginalW, (INT)cchSource-1, pszTargetA, (INT)cchMax * 2, " ", &fDefault); pszTargetA[ cchOut ] = 0; } @@ -1549,7 +1549,7 @@ LPTSTR UnicodeToString (LPCWSTR pszOriginalW) LPTSTR pszTarget; if ((pszTarget = AllocateString (1+lstrlenW(pszOriginalW))) != NULL) { #ifdef UNICODE - lstrcpyW ((LPWSTR)pszTargetW, (LPWSTR)pszOriginal); + lstrcpyW ((LPWSTR)pszTarget, (LPWSTR)pszOriginalW); #else CopyUnicodeToAnsi (pszTarget, pszOriginalW); #endif -- 2.39.5