From 2b9ea5cf657cb4a7fa28761a50293cadd790452b Mon Sep 17 00:00:00 2001 From: spark Date: Mon, 1 Apr 2002 04:48:18 +0000 Subject: ChangeLogTag: Sun Mar 31 22:44:00 2002 Si Mong Park --- apps/FaCE/FaCE.cpp | 15 +++++++-------- apps/FaCE/FaCE_OS.h | 5 ++--- apps/FaCE/Main.cpp | 5 ++--- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'apps') diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp index 87cadd9a207..202c73a98d3 100644 --- a/apps/FaCE/FaCE.cpp +++ b/apps/FaCE/FaCE.cpp @@ -1,5 +1,4 @@ // $Id$ -// FUZZ: disable check_for_tchar #include "FaCE.h" @@ -153,7 +152,7 @@ ACE_TCHAR g_SaveFileName[MAX_LOADSTRING]; // Name of the output file static SHACTIVATEINFO s_sai; // Forward declarations of functions included in this code module: -ATOM MyRegisterClass (HINSTANCE, LPTSTR); +ATOM MyRegisterClass (HINSTANCE, ACE_TCHAR*); BOOL InitInstance (HINSTANCE, int); LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK About (HWND, UINT, WPARAM, LPARAM); @@ -210,7 +209,7 @@ void LoadParameterHistory() // It is important to call this function so that the application // will get 'well formed' small icons associated with it. // -ATOM MyRegisterClass(HINSTANCE hInstance, LPTSTR szWindowClass) +ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass) { WNDCLASS wc; @@ -317,7 +316,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (wmId) { case IDM_HELP_ABOUT: - DialogBox(g_hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About); + DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About); break; case IDOK: @@ -352,12 +351,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_TOOLS_SAVETOFILE: // create a dialog box to get the file name - DialogBox(g_hInst, (LPCTSTR)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName); + DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName); break; case ID_SETTING_COMMANDLINE: // create a dialog box to get the command line - DialogBox(g_hInst, (LPCTSTR)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine); + DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine); break; default: @@ -557,7 +556,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa if (tempFile != NULL) // if file exists { fclose(tempFile); // close temp handler - int choice = DialogBox(g_hInst, (LPCTSTR)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist); + int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist); switch (choice) { case IDOVERWRITE: // overwrite existing file @@ -581,7 +580,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa if (tempFile == NULL) { - DialogBox(g_hInst, (LPCTSTR)IDD_ERRFILE, hDlg, (DLGPROC)FileError); + DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError); } else { diff --git a/apps/FaCE/FaCE_OS.h b/apps/FaCE/FaCE_OS.h index cbb317d7338..79e0cf313ed 100644 --- a/apps/FaCE/FaCE_OS.h +++ b/apps/FaCE/FaCE_OS.h @@ -1,5 +1,4 @@ // -*- C++ -*- -// FUZZ: disable check_for_tchar //============================================================================= /** @@ -19,12 +18,12 @@ ace_main_i (int, ACE_TCHAR**); \ extern BOOL InitInstance (HINSTANCE, int); \ extern void InitSetup(); \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ +int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \ { \ MSG msg; \ HACCEL hAccelTable; \ if (!InitInstance (hInstance, nCmdShow)) return FALSE; \ - hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FACE); \ + hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \ InitSetup(); \ while (GetMessage(&msg, NULL, 0, 0)) { \ if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \ diff --git a/apps/FaCE/Main.cpp b/apps/FaCE/Main.cpp index 440cefd7fa6..9c7df885341 100644 --- a/apps/FaCE/Main.cpp +++ b/apps/FaCE/Main.cpp @@ -1,5 +1,4 @@ // $Id$ -// FUZZ: disable check_for_tchar // ************************************************ // ** This file is NOT to be used for framework. ** @@ -14,12 +13,12 @@ extern BOOL InitInstance (HINSTANCE, int); extern void InitSetup(); -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) { MSG msg; HACCEL hAccelTable; if (!InitInstance (hInstance, nCmdShow)) return FALSE; - hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FACE); + hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); InitSetup(); while (GetMessage(&msg, NULL, 0, 0)) { if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { -- cgit v1.2.1