Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-30 16:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert the remaining ANSI-only stuff to TCHAR

Browse source 
svn path=/trunk/; revision=33396
This commit is contained in:
Colin Finck 2008-05-09 13:33:12 +00:00
parent 46db68bb13
commit ad119a417d
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/base/applications/calc/calc.h
View file

@ -31,6 +31,12 @@
#define IDC_STATIC ((DWORD)-1) #define IDC_STATIC ((DWORD)-1)
#endif #endif
#ifdef UNICODE
#define CF_TCHAR CF_UNICODETEXT
#else
#define CF_TCHAR CF_TEXT
#endif
#define CALC_VERSION TEXT("1.06") #define CALC_VERSION TEXT("1.06")
/*#define USE_KEYBOARD_HOOK*/ /*#define USE_KEYBOARD_HOOK*/
@ -137,8 +143,8 @@ typedef struct {
DWORD degr; DWORD degr;
DWORD action; DWORD action;
HWND hStatWnd; HWND hStatWnd;
char *Clipboard; TCHAR *Clipboard;
char *ClipPtr; TCHAR *ClipPtr;
unsigned int last_operator; unsigned int last_operator;
unsigned int prev_operator; unsigned int prev_operator;
TCHAR sDecimal[8]; TCHAR sDecimal[8];

30
reactos/base/applications/calc/winmain.c
View file

@ -854,11 +854,8 @@ static void CopyMemToClipboard(void *ptr)
buffer = (TCHAR *)GlobalLock(clipbuffer); buffer = (TCHAR *)GlobalLock(clipbuffer);
_tcscpy(buffer, ptr); _tcscpy(buffer, ptr);
GlobalUnlock(clipbuffer); GlobalUnlock(clipbuffer);
#ifdef UNICODE
SetClipboardData(CF_UNICODETEXT,clipbuffer); SetClipboardData(CF_TCHAR, clipbuffer);
#else
SetClipboardData(CF_TEXT,clipbuffer);
#endif
CloseClipboard(); CloseClipboard();
} }
} }
@ -868,23 +865,23 @@ static void handle_copy_command(HWND hWnd)
TCHAR display[sizeof(calc.buffer)]; TCHAR display[sizeof(calc.buffer)];
SendDlgItemMessage(hWnd, IDC_TEXT_OUTPUT, WM_GETTEXT, (WPARAM)SIZEOF(display), (LPARAM)display); SendDlgItemMessage(hWnd, IDC_TEXT_OUTPUT, WM_GETTEXT, (WPARAM)SIZEOF(display), (LPARAM)display);
if (calc.base == IDC_RADIO_DEC && strchr(calc.buffer, '.') == NULL) if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, '.') == NULL)
display[_tcslen(display)-calc.sDecimal_len] = TEXT('\0'); display[_tcslen(display)-calc.sDecimal_len] = TEXT('\0');
CopyMemToClipboard(display); CopyMemToClipboard(display);
} }
static char *ReadClipboard(void) static TCHAR *ReadClipboard(void)
{ {
char *buffer = NULL; TCHAR *buffer = NULL;
if (OpenClipboard(NULL)) { if (OpenClipboard(NULL)) {
HANDLE hData = GetClipboardData(CF_TEXT); HANDLE hData = GetClipboardData(CF_TCHAR);
char *fromClipboard; TCHAR *fromClipboard;
if (hData != NULL) { if (hData != NULL) {
fromClipboard = (char *)GlobalLock(hData); fromClipboard = (TCHAR *)GlobalLock(hData);
if (strlen(fromClipboard)) if (_tcslen(fromClipboard))
buffer = _strupr(_strdup(fromClipboard)); buffer = _tcsupr(_tcsdup(fromClipboard));
GlobalUnlock( hData ); GlobalUnlock( hData );
} }
CloseClipboard(); CloseClipboard();
@ -894,8 +891,9 @@ static char *ReadClipboard(void)
static void handle_clipboard_input(HWND hwnd) static void handle_clipboard_input(HWND hwnd)
{ {
char *ptr = calc.ClipPtr; TCHAR *ptr = calc.ClipPtr;
int ch, x; TCHAR ch;
INT x;
ch = *ptr++; ch = *ptr++;
if (ch == '\\') if (ch == '\\')
@ -1522,7 +1520,7 @@ static LRESULT CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
EnableMenuItem(GetSubMenu(GetMenu(hWnd), 0), EnableMenuItem(GetSubMenu(GetMenu(hWnd), 0),
IDM_EDIT_PASTE, IDM_EDIT_PASTE,
MF_BYCOMMAND| MF_BYCOMMAND|
(IsClipboardFormatAvailable(CF_TEXT) ? (IsClipboardFormatAvailable(CF_TCHAR) ?
MF_ENABLED : MF_GRAYED)); MF_ENABLED : MF_GRAYED));
break; break;
case WM_EXITMENULOOP: case WM_EXITMENULOOP: