--- mstools/samples/sdktools/ddespy/ddespy.h 2018/08/09 18:24:28 1.1 +++ mstools/samples/sdktools/ddespy/ddespy.h 2018/08/09 18:27:26 1.1.1.2 @@ -261,7 +261,7 @@ extern HANDLE hInst; /* macro definitions */ -#define MyAlloc(cb) (PSTR)LocalAlloc(LPTR, (cb)) +#define MyAlloc(cb) (LPTSTR)LocalAlloc(LPTR, (cb)) #define MyFree(p) (LocalUnlock((HANDLE)(p)), LocalFree((HANDLE)(p))) #define RefString(id) apszResources[id] #define Type2String(type) apszResources[IDS_TYPE0 + ((type & XTYP_MASK) >> XTYP_SHIFT)] @@ -276,22 +276,22 @@ BOOL CALLBACK About(HWND, UINT, WPARAM, BOOL SetFilters(VOID); BOOL CALLBACK OpenDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); BOOL CALLBACK FilterDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -PSTR DisectMsgLP(UINT msg, MONMSGSTRUCT *pmms, PSTR pszBuf); -PSTR DisectWord(UINT type, UINT data, DDEML_MSG_HOOK_DATA *pdmhd, PSTR pstr); -PSTR pdf(UINT fmt); -PSTR DumpFormat(UINT fmt, PSTR pstr); -PSTR DdeMsg2String(UINT msg); -PSTR Error2String(UINT error); -PSTR DumpData(LPBYTE pData, UINT cb, CHAR *szBuf, UINT fmt); -PSTR GetHszName(HSZ hsz); -VOID OutputString(PSTR pstr); +LPTSTR DisectMsgLP(UINT msg, MONMSGSTRUCT *pmms, LPTSTR pszBuf); +LPTSTR DisectWord(UINT type, UINT data, DDEML_MSG_HOOK_DATA *pdmhd, LPTSTR pstr); +LPTSTR pdf(UINT fmt); +LPTSTR DumpFormat(UINT fmt, LPTSTR pstr); +LPTSTR DdeMsg2String(UINT msg); +LPTSTR Error2String(UINT error); +LPTSTR DumpData(LPBYTE pData, UINT cb, TCHAR *szBuf, UINT fmt); +LPTSTR GetHszName(HSZ hsz); +VOID OutputString(LPTSTR pstr); VOID GetProfile(VOID); VOID SaveProfile(VOID); -BOOL GetProfileBoolean(LPSTR pszKey, BOOL fDefault); -VOID SetProfileBoolean(LPSTR pszKey, BOOL fSet); +BOOL GetProfileBoolean(LPTSTR pszKey, BOOL fDefault); +VOID SetProfileBoolean(LPTSTR pszKey, BOOL fSet); HDDEDATA CALLBACK DdeCallback(UINT wType, UINT wFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, UINT lData1, UINT lData2); -INT FAR DoDialog(LPSTR lpTemplateName, DLGPROC lpDlgProc, UINT param, +INT FAR DoDialog(LPTSTR lpTemplateName, DLGPROC lpDlgProc, UINT param, BOOL fRememberFocus, HWND hwndParent, HANDLE hInst); BOOL CALLBACK MarkDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -313,7 +313,7 @@ typedef struct { BOOL InitTestSubs(VOID); VOID CloseTestSubs(HANDLE hInst); VOID NextLine(STRWND *psw); -VOID DrawString(HWND hwnd, CHAR *sz); +VOID DrawString(HWND hwnd, TCHAR *sz); VOID ClearScreen(STRWND *psw); LONG CALLBACK StrWndProc(HWND hwnd, UINT msg, WPARAM wParam, UINT lParam); VOID scroll(HWND hwnd, UINT msg, UINT sliderpos, UINT style);