--- mstools/samples/sdktools/ddespy/ddespy.c 2018/08/09 18:24:28 1.1 +++ mstools/samples/sdktools/ddespy/ddespy.c 2018/08/09 18:27:26 1.1.1.2 @@ -4,6 +4,7 @@ ****************************************************************************/ +#define UNICODE #include /* required for all Windows applications */ #include #include @@ -20,23 +21,23 @@ /* GLOBAL Variables used for DDESPY */ UINT idInst = 0; -HANDLE hInst; +HINSTANCE hInst; HICON hIcon; HWND hWndString = NULL; HWND hwndSpy = NULL; INT fhOutput = 0; OFSTRUCT ofsOpen; -CHAR OpenName[MAX_FNAME + 1]; -CHAR TBuf[BUFFER_SIZE]; -CHAR TBuf2[BUFFER_SIZE]; -CHAR szNULL[] = ""; -PSTR apszResources[IDS_LAST + 1]; +TCHAR OpenName[MAX_FNAME + 1]; +TCHAR TBuf[BUFFER_SIZE]; +TCHAR TBuf2[BUFFER_SIZE]; +TCHAR szNULL[] = TEXT(""); +LPTSTR apszResources[IDS_LAST + 1]; PFNCALLBACK pfnDdeCallback = NULL; HWND hwndTrack[IT_COUNT] = { 0 }; -PSTR TrackTitle[IT_COUNT]; +LPTSTR TrackTitle[IT_COUNT]; BOOL fBlockMsg[WM_DDE_LAST - WM_DDE_FIRST + 1] = { 0 }; BOOL fBlockCb[15] = { 0 }; -PSTR TrackHeading[IT_COUNT]; +LPTSTR TrackHeading[IT_COUNT]; struct { /* profile data */ BOOL fOutput[IO_COUNT]; BOOL fFilter[IF_COUNT]; @@ -49,10 +50,10 @@ struct { /* pr BOOL LoadResourceStrings() { int i, cbLeft, cbRes; - PSTR psz; + LPTSTR psz; cbLeft = 0x1000; - psz = LocalAlloc(LPTR, cbLeft); + psz = LocalAlloc(LPTR, sizeof(TCHAR) * cbLeft); for (i = 0; i <= IDS_LAST; i++) { apszResources[i] = psz; cbRes = LoadString(hInst, i, psz, cbLeft) + 1; @@ -63,7 +64,7 @@ BOOL LoadResourceStrings() TrackTitle[i] = RefString(IDS_TRACKTITLE_1 + i); TrackHeading[i] = RefString(IDS_TRACKHEADING_1 + i); } - strcpy(TBuf, RefString(IDS_DEFAULT_OUTPUT_FNAME)); + lstrcpy(TBuf, RefString(IDS_DEFAULT_OUTPUT_FNAME)); GetFullPathName(TBuf, sizeof(OpenName), OpenName, (LPTSTR *)TBuf2); return(TRUE); } @@ -184,7 +185,7 @@ BOOL InitInstance(HINSTANCE hInstance, i hwndSpy, NULL, hInst, - (LPSTR)MAKELONG(CCHARS, CLINES)); + (LPTSTR)MAKELONG(CCHARS, CLINES)); for (i = 0; i < IT_COUNT; i++) { if (pro.fTrack[i]) { @@ -409,8 +410,8 @@ HDDEDATA CALLBACK DdeCallback( { LPVOID pData; UINT cb; - CHAR *psz1, *psz2, *psz3; - CHAR *szAction; + TCHAR *psz1, *psz2, *psz3; + TCHAR *szAction; INT i; BOOL fInt = FALSE; wFmt; @@ -425,15 +426,17 @@ HDDEDATA CALLBACK DdeCallback( if (pro.fTrack[IT_HSZS]) { switch (((MONHSZSTRUCT FAR *)pData)->fsAction) { case MH_DELETE: - wsprintf(TBuf, fInt ? "0x%lx\t*\t%s(int)" : "0x%lx\t*\t%s", + wsprintf(TBuf, fInt ? TEXT("0x%lx\t*\t%s(int)") + : TEXT("0x%lx\t*\t%s"), ((MONHSZSTRUCT FAR *)pData)->hsz, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); i = GetMCLBColValue(TBuf, hwndTrack[IT_HSZS], 2); if (i > 1) { - wsprintf(TBuf2, fInt ? "0x%lx\t%d\t%s(int)" : "0x%lx\t%d\t%s", + wsprintf(TBuf2, fInt ? TEXT("0x%lx\t%d\t%s(int)") + : TEXT("0x%lx\t%d\t%s"), ((MONHSZSTRUCT FAR *)pData)->hsz, i - 1, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); AddMCLBText(TBuf, TBuf2, hwndTrack[IT_HSZS]); } else if (i == 1) { DeleteMCLBText(TBuf, hwndTrack[IT_HSZS]); @@ -442,14 +445,16 @@ HDDEDATA CALLBACK DdeCallback( case MH_KEEP: case MH_CREATE: - wsprintf(TBuf, fInt ? "0x%lx\t*\t%s(int)" : "0x%lx\t*\t%s", + wsprintf(TBuf, fInt ? TEXT("0x%lx\t*\t%s(int)") + : TEXT("0x%lx\t*\t%s"), ((MONHSZSTRUCT FAR *)pData)->hsz, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); i = GetMCLBColValue(TBuf, hwndTrack[IT_HSZS], 2) + 1; - wsprintf(TBuf2, fInt ? "0x%lx\t%d\t%s(int)" : "0x%lx\t%d\t%s", + wsprintf(TBuf2, fInt ? TEXT("0x%lx\t%d\t%s(int)") + : TEXT("0x%lx\t%d\t%s"), ((MONHSZSTRUCT FAR *)pData)->hsz, i, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); AddMCLBText(TBuf, TBuf2, hwndTrack[IT_HSZS]); } } @@ -480,19 +485,20 @@ HDDEDATA CALLBACK DdeCallback( return(0); } if (pro.fTerse) { - wsprintf(TBuf, "[%x:%ld] HSZ %s: %lx(%s)", + wsprintf(TBuf, TEXT("[%x:%ld] HSZ %s: %lx(%s)"), ((MONHSZSTRUCT FAR *)pData)->hTask, ((MONHSZSTRUCT FAR *)pData)->dwTime, - (LPSTR)szAction, + (LPTSTR)szAction, ((MONHSZSTRUCT FAR *)pData)->hsz, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); } else { - wsprintf(TBuf, "Task:0x%x, Time:%ld, String Handle %s: %lx(%s)", + wsprintf(TBuf, + TEXT("Task:0x%x, Time:%ld, String Handle %s: %lx(%s)"), ((MONHSZSTRUCT FAR *)pData)->hTask, ((MONHSZSTRUCT FAR *)pData)->dwTime, - (LPSTR)szAction, + (LPTSTR)szAction, ((MONHSZSTRUCT FAR *)pData)->hsz, - (LPSTR)((MONHSZSTRUCT FAR *)pData)->str); + (LPTSTR)((MONHSZSTRUCT FAR *)pData)->str); } break; @@ -509,21 +515,21 @@ HDDEDATA CALLBACK DdeCallback( ((MONMSGSTRUCT FAR *)pData)->wParam, ((MONMSGSTRUCT FAR *)pData)->hwndTo, (dwData2 == MF_SENDMSGS) ? RefString(IDS_SENT) : RefString(IDS_POSTED), - (LPSTR)DdeMsg2String(((MONMSGSTRUCT FAR *)pData)->wMsg)); + (LPTSTR)DdeMsg2String(((MONMSGSTRUCT FAR *)pData)->wMsg)); } else { wsprintf(TBuf, RefString(IDS_FMT_MSG1), ((MONMSGSTRUCT FAR *)pData)->hTask, ((MONMSGSTRUCT FAR *)pData)->dwTime, ((MONMSGSTRUCT FAR *)pData)->hwndTo, (dwData2 == MF_SENDMSGS) ? RefString(IDS_SENT) : RefString(IDS_POSTED), - (LPSTR)DdeMsg2String(((MONMSGSTRUCT FAR *)pData)->wMsg)); + (LPTSTR)DdeMsg2String(((MONMSGSTRUCT FAR *)pData)->wMsg)); } OutputString(TBuf); wsprintf(TBuf, pro.fTerse ? RefString(IDS_FMT_TRS_MSG2) : RefString(IDS_FMT_MSG2), ((MONMSGSTRUCT FAR *)pData)->wParam); DisectMsgLP(((MONMSGSTRUCT FAR *)pData)->wMsg, ((MONMSGSTRUCT FAR *)pData), - &TBuf[strlen(TBuf)]); + &TBuf[lstrlen(TBuf)]); break; @@ -535,14 +541,14 @@ HDDEDATA CALLBACK DdeCallback( pro.fTerse ? RefString(IDS_FMT_TRS_CB1) : RefString(IDS_FMT_CB1), ((MONCBSTRUCT FAR *)pData)->hTask, ((MONCBSTRUCT FAR *)pData)->dwTime, - (LPSTR)Type2String(((MONCBSTRUCT FAR *)pData)->wType)); - wsprintf(DumpFormat(((MONCBSTRUCT FAR *)pData)->wFmt, &TBuf[strlen(TBuf)]), + (LPTSTR)Type2String(((MONCBSTRUCT FAR *)pData)->wType)); + wsprintf(DumpFormat(((MONCBSTRUCT FAR *)pData)->wFmt, &TBuf[lstrlen(TBuf)]), pro.fTerse ? RefString(IDS_FMT_TRS_CB2) : RefString(IDS_FMT_CB2), (UINT)((MONCBSTRUCT FAR *)pData)->hConv, ((MONCBSTRUCT FAR *)pData)->hsz1, - (LPSTR)(psz1 = GetHszName(((MONCBSTRUCT FAR *)pData)->hsz1)), + (LPTSTR)(psz1 = GetHszName(((MONCBSTRUCT FAR *)pData)->hsz1)), ((MONCBSTRUCT FAR *)pData)->hsz2, - (LPSTR)(psz2 = GetHszName(((MONCBSTRUCT FAR *)pData)->hsz2)), + (LPTSTR)(psz2 = GetHszName(((MONCBSTRUCT FAR *)pData)->hsz2)), ((MONCBSTRUCT FAR *)pData)->hData, ((MONCBSTRUCT FAR *)pData)->dwData1, ((MONCBSTRUCT FAR *)pData)->dwData2, @@ -601,7 +607,7 @@ HDDEDATA CALLBACK DdeCallback( ((MONERRSTRUCT FAR *)pData)->hTask, ((MONERRSTRUCT FAR *)pData)->dwTime, ((MONERRSTRUCT FAR *)pData)->wLastError, - (LPSTR)Error2String(((MONERRSTRUCT FAR *)pData)->wLastError)); + (LPTSTR)Error2String(((MONERRSTRUCT FAR *)pData)->wLastError)); break; @@ -610,14 +616,14 @@ HDDEDATA CALLBACK DdeCallback( psz2 = GetHszName(((MONLINKSTRUCT FAR *)pData)->hszTopic); psz3 = GetHszName(((MONLINKSTRUCT FAR *)pData)->hszItem); if (!GetClipboardFormatName(((MONLINKSTRUCT FAR *)pData)->wFmt, TBuf2, BUFFER_SIZE)) - strcpy(TBuf2, pdf(((MONLINKSTRUCT FAR *)pData)->wFmt)); - if (!strcmp(RefString(IDS_HUH), TBuf2)) { - wsprintf(TBuf2, "%d", ((MONLINKSTRUCT FAR *)pData)->wFmt); + lstrcpy(TBuf2, pdf(((MONLINKSTRUCT FAR *)pData)->wFmt)); + if (!lstrcmp(RefString(IDS_HUH), TBuf2)) { + wsprintf(TBuf2, TEXT("%d"), ((MONLINKSTRUCT FAR *)pData)->wFmt); } - wsprintf(TBuf, "%s\t%s\t%s\t%s\t%s\t%lx\t%lx", - (LPSTR)psz1, (LPSTR)psz2, (LPSTR)psz3, - (LPSTR)TBuf2, + wsprintf(TBuf, TEXT("%s\t%s\t%s\t%s\t%s\t%lx\t%lx"), + (LPTSTR)psz1, (LPTSTR)psz2, (LPTSTR)psz3, + (LPTSTR)TBuf2, ((MONLINKSTRUCT FAR *)pData)->fNoData ? RefString(IDS_WARM) : RefString(IDS_HOT), ((MONLINKSTRUCT FAR *)pData)->hConvClient, @@ -640,8 +646,8 @@ HDDEDATA CALLBACK DdeCallback( psz1 = GetHszName(((MONCONVSTRUCT FAR *)pData)->hszSvc); psz2 = GetHszName(((MONCONVSTRUCT FAR *)pData)->hszTopic); - wsprintf(TBuf, "%s\t%s\t%lx\t%lx", - (LPSTR)psz1, (LPSTR)psz2, + wsprintf(TBuf, TEXT("%s\t%s\t%lx\t%lx"), + (LPTSTR)psz1, (LPTSTR)psz2, ((MONCONVSTRUCT FAR *)pData)->hConvClient, ((MONCONVSTRUCT FAR *)pData)->hConvServer); @@ -658,7 +664,7 @@ HDDEDATA CALLBACK DdeCallback( default: - strcpy(TBuf, RefString(IDS_UNKNOWN_CALLBACK)); + lstrcpy(TBuf, RefString(IDS_UNKNOWN_CALLBACK)); } DdeUnaccessData(hData); OutputString(TBuf); @@ -672,7 +678,7 @@ HDDEDATA CALLBACK DdeCallback( } psz1 = GetHszName(hsz1); psz2 = GetHszName(hsz2); - wsprintf(TBuf, "%s\t%s", (LPSTR)psz1, (LPSTR)psz2); + wsprintf(TBuf, TEXT("%s\t%s"), (LPTSTR)psz1, (LPTSTR)psz2); if (wType == XTYP_REGISTER) { AddMCLBText(NULL, TBuf, hwndTrack[IT_SVRS]); } else { @@ -686,7 +692,7 @@ HDDEDATA CALLBACK DdeCallback( } -PSTR DisectMsgLP(UINT msg, MONMSGSTRUCT *pmms, PSTR pszBuf) +LPTSTR DisectMsgLP(UINT msg, MONMSGSTRUCT *pmms, LPTSTR pszBuf) { static LONG m2t[] = { @@ -724,13 +730,13 @@ PSTR DisectMsgLP(UINT msg, MONMSGSTRUCT * Returns a pointer to the local memory or NULL if failure. * The string must be freed via MyFree(). */ -PSTR GetHszName(HSZ hsz) +LPTSTR GetHszName(HSZ hsz) { - PSTR psz; + LPTSTR psz; UINT cb; cb = (UINT)DdeQueryString(idInst, hsz, NULL, 0, 0) + 1; - psz = MyAlloc(cb); + psz = LocalAlloc (LPTR, sizeof(TCHAR) * cb); DdeQueryString(idInst, hsz, psz, cb, 0); return(psz); } @@ -738,38 +744,38 @@ PSTR GetHszName(HSZ hsz) -PSTR DisectWord( UINT type, +LPTSTR DisectWord( UINT type, UINT data, DDEML_MSG_HOOK_DATA *pdmhd, - PSTR pstr) + LPTSTR pstr) { UINT wT; - CHAR szData[32]; // for truncating strings w/o disturbing the hDdeData + TCHAR szData[32]; // for truncating strings w/o disturbing the hDdeData *pstr = '\0'; // in case we do nothing. if (type & T_ATOM) { - wT = GlobalGetAtomName((ATOM)data, (LPSTR)pstr, 25); + wT = GlobalGetAtomName((ATOM)data, (LPTSTR)pstr, 25); if (wT || data == 0) { if (type & T_APP) { - strcpy(pstr, RefString(IDS_APPIS)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_APPIS)); + pstr += lstrlen(pstr); } if (type & T_TOPIC) { - strcpy(pstr, RefString(IDS_TOPICIS)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_TOPICIS)); + pstr += lstrlen(pstr); } if (type & T_ITEM) { - strcpy(pstr, RefString(IDS_ITEMIS)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_ITEMIS)); + pstr += lstrlen(pstr); } } if (wT) { - wsprintf(pstr, "0x%x(\"", data); - pstr += strlen(pstr); - GlobalGetAtomName((ATOM)data, (LPSTR)pstr, 25); + wsprintf(pstr, TEXT("0x%x(\""), data); + pstr += lstrlen(pstr); + GlobalGetAtomName((ATOM)data, (LPTSTR)pstr, 25); pstr += wT; if (wT == 25) { *pstr++ = '.'; @@ -786,28 +792,28 @@ PSTR DisectWord( UINT type, } else if (type & T_OR) { type &= ~T_OR; // not an atom, must be somthin else. } else { - wsprintf(pstr, "Bad Atom (0x%x)", data); - pstr += strlen(pstr); + wsprintf(pstr, TEXT("Bad Atom (0x%x)"), data); + pstr += lstrlen(pstr); } } if (type & T_OR) { - strcpy(pstr, RefString(IDS_OR)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_OR)); + pstr += lstrlen(pstr); } if (type & T_OPTIONHANDLE) { if (pdmhd->cbData >= 4) { wsprintf(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_STATUSIS) : RefString(IDS_FMT_STATUSIS), LOWORD(pdmhd->Data[0])); - pstr += strlen(pstr); + pstr += lstrlen(pstr); if (LOWORD(pdmhd->Data[0]) & DDE_FACKREQ) { - strcpy(pstr, RefString(IDS_FACKREQ)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_FACKREQ)); + pstr += lstrlen(pstr); } if (LOWORD(pdmhd->Data[0]) & DDE_FDEFERUPD) { - strcpy(pstr, RefString(IDS_DEFERUPD)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_DEFERUPD)); + pstr += lstrlen(pstr); } *pstr++ = ')'; *pstr++ = ' '; @@ -821,14 +827,14 @@ PSTR DisectWord( UINT type, if (type & T_STATUS) { wsprintf(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_STATUSIS) : RefString(IDS_FMT_STATUSIS), LOWORD(data)); - pstr += strlen(pstr); + pstr += lstrlen(pstr); if (data & DDE_FACK) { - strcpy(pstr, RefString(IDS_FACK)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_FACK)); + pstr += lstrlen(pstr); } if (data & DDE_FBUSY) { - strcpy(pstr, RefString(IDS_FBUSY)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_FBUSY)); + pstr += lstrlen(pstr); } *pstr++ = ')'; *pstr = '\0'; @@ -839,7 +845,7 @@ PSTR DisectWord( UINT type, szData[31] = '\0'; wsprintf(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_EXEC1) : RefString(IDS_FMT_EXEC1), szData); - pstr += strlen(pstr); + pstr += lstrlen(pstr); *pstr = '\0'; } @@ -847,20 +853,20 @@ PSTR DisectWord( UINT type, wsprintf(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_STATUSIS) : RefString(IDS_FMT_STATUSIS), LOWORD(pdmhd->Data[0])); - pstr += strlen(pstr); + pstr += lstrlen(pstr); if (LOWORD(pdmhd->Data[0]) & DDE_FRELEASE) { - strcpy(pstr, RefString(IDS_FRELEASE)); - pstr += strlen(pstr); + lstrcpy(pstr, RefString(IDS_FRELEASE)); + pstr += lstrlen(pstr); } if (LOWORD(pdmhd->Data[0]) & DDE_FREQUESTED) { lstrcpy(pstr, RefString(IDS_FREQUESTED)); - pstr += strlen(pstr); + pstr += lstrlen(pstr); } *pstr++ = ')'; *pstr++ = ' '; pstr = DumpFormat(HIWORD(pdmhd->Data[0]), pstr); - strcpy(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_DATAIS1) : RefString(IDS_FMT_DATAIS1)); - pstr += strlen(pstr); + lstrcpy(pstr, pro.fTerse ? RefString(IDS_FMT_TRS_DATAIS1) : RefString(IDS_FMT_DATAIS1)); + pstr += lstrlen(pstr); pstr = DumpData((LPBYTE)&pdmhd->Data[1], min(28, pdmhd->cbData - 4), pstr, HIWORD(pdmhd->Data[0])); } @@ -868,23 +874,23 @@ PSTR DisectWord( UINT type, } -PSTR pdf(UINT fmt) +LPTSTR pdf(UINT fmt) { INT i; static struct { UINT fmt; - PSTR psz; + LPTSTR psz; } fmts[] = { - { CF_TEXT , "CF_TEXT" } , - { CF_BITMAP , "CF_BITMAP" } , - { CF_METAFILEPICT , "CF_METAFILEPICT" } , - { CF_ENHMETAFILE , "CF_ENHMETAFILE" } , - { CF_SYLK , "CF_SYLK" } , - { CF_DIF , "CF_DIF" } , - { CF_TIFF , "CF_TIFF" } , - { CF_OEMTEXT , "CF_OEMTEXT" } , - { CF_DIB , "CF_DIB" } , - { CF_PALETTE , "CF_PALETTE" } , + { CF_TEXT , TEXT("CF_TEXT") } , + { CF_BITMAP , TEXT("CF_BITMAP") } , + { CF_METAFILEPICT , TEXT("CF_METAFILEPICT") } , + { CF_ENHMETAFILE , TEXT("CF_ENHMETAFILE") } , + { CF_SYLK , TEXT("CF_SYLK") } , + { CF_DIF , TEXT("CF_DIF") } , + { CF_TIFF , TEXT("CF_TIFF") } , + { CF_OEMTEXT , TEXT("CF_OEMTEXT") } , + { CF_DIB , TEXT("CF_DIB") } , + { CF_PALETTE , TEXT("CF_PALETTE") } , }; for (i = 0; i < 10; i++) if (fmts[i].fmt == fmt) @@ -894,46 +900,46 @@ PSTR pdf(UINT fmt) -PSTR DumpFormat(UINT fmt, PSTR pstr) +LPTSTR DumpFormat(UINT fmt, LPTSTR pstr) { UINT cb; - wsprintf(pstr, "fmt=0x%x(\"", (WORD)fmt); - pstr += strlen(pstr); + wsprintf(pstr, TEXT("fmt=0x%x(\""), (WORD)fmt); + pstr += lstrlen(pstr); if (cb = GetClipboardFormatName(fmt, pstr, 25)) { pstr += cb; *pstr++ = '\"'; *pstr++ = ')'; } else { - wsprintf(pstr, "%s\")", (LPSTR)pdf(fmt)); - pstr += strlen(pstr); + wsprintf(pstr, TEXT("%s\")"), (LPTSTR)pdf(fmt)); + pstr += lstrlen(pstr); } return(pstr); } -PSTR DumpData(LPBYTE pData, UINT cb, CHAR *szBuf, UINT fmt) +LPTSTR DumpData(LPBYTE pData, UINT cb, TCHAR *szBuf, UINT fmt) { register INT i; - PSTR psz = szBuf; + LPTSTR psz = szBuf; while (cb) { if (fmt == CF_TEXT) { *szBuf++ = '\t'; *szBuf++ = '\"'; - _fmemcpy(szBuf, pData, cb); + memcpy(szBuf, pData, cb); szBuf[cb - 2] = '\0'; - _fstrcat(szBuf, "\""); + lstrcat(szBuf, TEXT("\"")); cb = 0; } else { memset(szBuf, ' ', 80); szBuf[0] = '\t'; i = 0; while (cb && (i < 16)) { - wsprintf(&szBuf[i * 3 + 1], "%02x ", pData[0]); - wsprintf(&szBuf[17 * 3 + i + 1], "%c", MPRT(pData[0])); + wsprintf(&szBuf[i * 3 + 1], TEXT("%02x "), pData[0]); + wsprintf(&szBuf[17 * 3 + i + 1], TEXT("%c"), MPRT(pData[0])); pData++; cb--; i++; @@ -942,35 +948,37 @@ PSTR DumpData(LPBYTE pData, UINT cb, CHA szBuf[17 * 3 + i + 1] = ' '; szBuf[68] = '\0'; } - szBuf += _fstrlen(szBuf); + szBuf += lstrlen(szBuf); } return(szBuf); } -PSTR Error2String(UINT error) +LPTSTR Error2String(UINT error) { - static CHAR szErr[23]; + static TCHAR szErr[23]; if (error == 0) { - strcpy(szErr, RefString(IDS_ZERO)); + lstrcpy(szErr, RefString(IDS_ZERO)); } else if (error > DMLERR_LAST || error < DMLERR_FIRST) { - strcpy(szErr, RefString(IDS_HUH)); + lstrcpy(szErr, RefString(IDS_HUH)); } else { - strcpy(szErr, apszResources[IDS_ERRST0 + error - DMLERR_FIRST]); + lstrcpy(szErr, apszResources[IDS_ERRST0 + error - DMLERR_FIRST]); } return(szErr); } -PSTR DdeMsg2String(UINT msg) +LPTSTR DdeMsg2String(UINT msg) { - static CHAR szBadMsg[10]; + static TCHAR szBadMsg[10]; if (msg < WM_DDE_FIRST || msg > WM_DDE_LAST) { - return((PSTR)itoa(msg, szBadMsg, 10)); + wsprintf (szBadMsg, TEXT("%ld"), szBadMsg); + return (szBadMsg); +// return((LPTSTR)itoa(msg, szBadMsg, 10)); } else { return(apszResources[IDS_MSG0 + msg - WM_DDE_FIRST]); } @@ -978,15 +986,15 @@ PSTR DdeMsg2String(UINT msg) -VOID OutputString(PSTR pstr) +VOID OutputString(LPTSTR pstr) { if (pro.fOutput[IO_FILE] & fhOutput) { - _lwrite(fhOutput, pstr, strlen(pstr)); - _lwrite(fhOutput, RefString(IDS_CRLF), 2); + _lwrite(fhOutput, (LPCSTR) pstr, lstrlen(pstr)); + _lwrite(fhOutput, (LPCSTR) RefString(IDS_CRLF), 2); flushall(); } if (pro.fOutput[IO_DEBUG]) { - OutputDebugString((LPSTR)pstr); + OutputDebugString((LPTSTR)pstr); OutputDebugString(RefString(IDS_CRLF)); } if (pro.fOutput[IO_SCREEN]) { @@ -1035,7 +1043,7 @@ BOOL CALLBACK OpenDlg(HWND hDlg, UINT me switch (message) { case WM_INITDIALOG: - SetDlgItemText(hDlg, IDC_EDIT, (LPSTR)OpenName); + SetDlgItemText(hDlg, IDC_EDIT, (LPTSTR)OpenName); SendDlgItemMessage(hDlg, IDC_EDIT, EM_SETSEL, GET_EM_SETSEL_MPS(0, 0x7fff)); SetFocus(GetDlgItem(hDlg, IDC_EDIT)); @@ -1047,7 +1055,7 @@ BOOL CALLBACK OpenDlg(HWND hDlg, UINT me case IDOK: GetDlgItemText(hDlg, IDC_EDIT, TBuf, MAX_FNAME); GetFullPathName(TBuf, sizeof(OpenName), OpenName, (LPTSTR *)TBuf2); - fh = _lcreat(OpenName, 0); + fh = _lcreat((LPCSTR) OpenName, 0); if (fh == -1) { MessageBox(hDlg, RefString(IDS_INVALID_FNAME), NULL, MB_OK | MB_ICONHAND); @@ -1152,17 +1160,17 @@ VOID SaveProfile() -BOOL GetProfileBoolean(LPSTR pszKey, BOOL fDefault) +BOOL GetProfileBoolean(LPTSTR pszKey, BOOL fDefault) { GetPrivateProfileString(RefString(IDS_TITLE), pszKey, fDefault ? RefString(IDS_YES) : RefString(IDS_NO), TBuf, sizeof(TBuf), RefString(IDS_INIFNAME)); - return(stricmp(RefString(IDS_NO), TBuf)); + return(lstrcmpi(RefString(IDS_NO), TBuf)); } -VOID SetProfileBoolean(LPSTR pszKey, BOOL fSet) +VOID SetProfileBoolean(LPTSTR pszKey, BOOL fSet) { WritePrivateProfileString(RefString(IDS_TITLE), pszKey, fSet ? RefString(IDS_YES) : RefString(IDS_NO), @@ -1174,7 +1182,7 @@ VOID SetProfileBoolean(LPSTR pszKey, BOO * passing. */ INT FAR DoDialog( - LPSTR lpTemplateName, + LPTSTR lpTemplateName, DLGPROC lpDlgProc, UINT param, BOOL fRememberFocus, @@ -1187,7 +1195,7 @@ INT FAR DoDialog( if (fRememberFocus) hwndFocus = GetFocus(); lpDlgProc = (DLGPROC)MakeProcInstance(lpDlgProc, hInst); - wRet = DialogBoxParam(hInst, (LPCSTR)lpTemplateName, hwndParent, + wRet = DialogBoxParam(hInst, (LPCTSTR)lpTemplateName, hwndParent, lpDlgProc, param); FreeProcInstance((FARPROC)lpDlgProc); if (fRememberFocus) @@ -1202,7 +1210,7 @@ BOOL CALLBACK MarkDlgProc( WPARAM wParam, LPARAM lParam) { - CHAR szT[MAX_MARK + 1]; + TCHAR szT[MAX_MARK + 1]; lParam; switch (msg){ @@ -1231,5 +1239,3 @@ BOOL CALLBACK MarkDlgProc( } return(FALSE); } - -