Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[hbirr] 14908: Made the loading of resource strings more unicode compatibly.

by hbirr＠svn.reactos.com

Made the loading of resource strings more unicode compatibly. Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/locale.c Modified: trunk/reactos/subsys/system/cmd/makefile Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -237,7 +237,7 @@ /* specified routines */ VOID ExpandAlias (LPTSTR cmd, INT maxlen) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; unsigned n = 0, m, i, @@ -281,8 +281,8 @@ m = _tcslen (ptr->lpSubst); if ((int)(_tcslen (cmd) - len + m - n) > maxlen) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); /* the parser won't cause any problems with an empty line */ cmd[0] = _T('\0'); } @@ -306,12 +306,12 @@ INT CommandAlias (LPTSTR cmd, LPTSTR param) { LPTSTR ptr; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -197,7 +197,7 @@ BOOL bDirectories = FALSE; DWORD dwAttrib = 0; DWORD dwMask = 0; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; /* initialize strings */ szPath[0] = _T('\0'); @@ -206,8 +206,8 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -219,7 +219,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) { HANDLE hFile; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | @@ -232,8 +232,8 @@ if (hFile == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); return FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -32,12 +32,12 @@ INT cmd_beep (LPTSTR cmd, LPTSTR param) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/call.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -45,15 +45,15 @@ INT cmd_call (LPTSTR cmd, LPTSTR param) { LPBATCH_CONTEXT n = NULL; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts ((LPTSTR)szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -22,13 +22,13 @@ INT args; UINT uOldCodePage; UINT uNewCodePage; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); return 0; } @@ -38,8 +38,8 @@ if (args == 0) { /* display active code page number */ - LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ()); + LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, GetConsoleCP ()); return 0; } @@ -47,8 +47,8 @@ if (args >= 2) { /* too many parameters */ - LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, param); + LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, param); return 1; } @@ -61,16 +61,16 @@ if (uNewCodePage == 0) { - LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, arg[0]); + LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, arg[0]); freep (arg); return 1; } if (!SetConsoleCP (uNewCodePage)) { - LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); } else { _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -121,17 +121,16 @@ INT GCret; TCHAR Ch; DWORD amount,clk; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, (LPTSTR) Options,sizeof(lpOptions)); - lpOptions = _T(Options); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, Options,sizeof(lpOptions)/sizeof(TCHAR)); + lpOptions = Options; if (_tcsncmp (param, _T("/?"), 2) == 0) { - LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); - - return 0; + LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); + return 0; } /* retrieve text */ @@ -171,8 +170,8 @@ if (_tcslen (lpOptions) == 0) { - LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPuts (szMsg); freep (arg); return 1; } @@ -202,8 +201,8 @@ if (*s != _T(',')) { - LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPuts (szMsg); freep (arg); return 1; } @@ -214,8 +213,8 @@ } else if (arg[i][0] == _T('/')) { - LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, arg[i]); + LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, arg[i]); freep (arg); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -36,12 +36,12 @@ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -552,7 +552,7 @@ { TCHAR cmdline[CMDLINE_LENGTH]; LPTSTR s; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef FEATURE_REDIRECTION TCHAR in[CMDLINE_LENGTH] = _T(""); TCHAR out[CMDLINE_LENGTH] = _T(""); @@ -634,15 +634,15 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, in); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, in); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, in); return; } #ifdef _DEBUG @@ -667,8 +667,8 @@ if (hFile[1] == INVALID_HANDLE_VALUE){ - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); return; } @@ -720,16 +720,16 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, out); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, out); return; } if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, out); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, out); return; } @@ -782,16 +782,16 @@ NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, err); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, err); return; } } if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, err); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, err); return; } @@ -1076,36 +1076,36 @@ static VOID ShowCommands (VOID) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; /* print command list */ - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg); PrintCommandList (); /* print feature list */ - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #ifdef FEATURE_ALIASES - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #endif #ifdef FEATURE_HISTORY - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #endif #ifdef FEATURE_UNIX_FILENAME_COMPLETION - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #endif #ifdef FEATURE_DIRECTORY_STACK - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #endif #ifdef FEATURE_REDIRECTION - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); #endif ConOutChar (_T('\n')); } @@ -1124,7 +1124,7 @@ TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; INT i; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; //INT len; //TCHAR *ptr, *cmdLine; @@ -1154,8 +1154,8 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); ExitProcess (0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); @@ -1259,8 +1259,8 @@ if (IsExistingFile (_T("commandline"))) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, commandline); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, commandline); ParseCommandLine (commandline); } } @@ -1291,20 +1291,20 @@ static VOID Cleanup (int argc, TCHAR *argv[]) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; /* run cmdexit.bat */ if (IsExistingFile (_T("cmdexit.bat"))) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); ParseCommandLine (_T("cmdexit.bat")); } else if (IsExistingFile (_T("\\cmdexit.bat"))) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); ParseCommandLine (_T("\\cmdexit.bat")); } #ifndef __REACTOS__ @@ -1320,8 +1320,8 @@ if (IsExistingFile (_T("commandline"))) { - LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, commandline); + LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, commandline); ParseCommandLine (commandline); } } _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/color.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -29,9 +29,9 @@ static VOID ColorHelp (VOID) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); } @@ -41,29 +41,29 @@ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts ((LPTSTR)szMsg); - } - else - { + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPuts (szMsg); + } + else + { if (bFill == TRUE) - { - GetConsoleScreenBufferInfo (hConsole, &csbi); + { + GetConsoleScreenBufferInfo (hConsole, &csbi); - coPos.X = 0; - coPos.Y = 0; - FillConsoleOutputAttribute (hConsole, + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute (hConsole, (WORD)(wColor & 0x00FF), (csbi.dwSize.X)*(csbi.dwSize.Y), coPos, &dwWritten); - } - SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF)); - } + } + SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF)); + } } @@ -74,7 +74,7 @@ */ INT CommandColor (LPTSTR first, LPTSTR rest) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (rest, _T("/?"), 2) == 0) { @@ -92,18 +92,18 @@ if (StringToColor (&wColor, &rest) == FALSE) { - LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPuts (szMsg); return 1; } - LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, wColor); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, wColor); if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, wColor); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, wColor); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/console.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -214,7 +214,7 @@ DWORD ret; LPTSTR text; va_list arg_ptr; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; va_start (arg_ptr, MessageId); ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, @@ -233,8 +233,8 @@ } else { - LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); } } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -301,13 +301,13 @@ LPTSTR lpOptions; TCHAR Options[3]; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); - lpOptions = _T(Options); + LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, Options,sizeof(Options)/sizeof(TCHAR)); + lpOptions = Options; - LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg); ConInString (inp, 10); ConOutPuts (_T("")); @@ -339,7 +339,7 @@ DWORD dwWritten; DWORD i; BOOL bEof = FALSE; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); @@ -351,8 +351,8 @@ NULL, OPEN_EXISTING, 0, NULL); if (hFileSrc == INVALID_HANDLE_VALUE) { - LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, source); + LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, source); return 0; } @@ -379,8 +379,8 @@ { if (!_tcscmp (dest, source)) { - LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, source); + LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, source); CloseHandle (hFileSrc); return 0; @@ -456,8 +456,8 @@ if (dwWritten != dwRead) { - LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); free (buffer); CloseHandle (hFileDest); @@ -638,7 +638,7 @@ TCHAR dir_d[_MAX_DIR]; TCHAR file_d[_MAX_FNAME]; TCHAR ext_d[_MAX_EXT]; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; int argc; int append; @@ -655,8 +655,8 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); return 1; } @@ -728,8 +728,8 @@ } else if (bDestFound && bWildcards) { - LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); DeleteFileList (sources); freep (p); _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/date.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -47,24 +47,24 @@ static VOID PrintDateString (VOID) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; switch (nDateFormat) { case 0: /* mmddyy */ default: - LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); + LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg, cDateSeparator, cDateSeparator); break; case 1: /* ddmmyy */ - LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); + LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg, cDateSeparator, cDateSeparator); break; case 2: /* yymmdd */ - LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); + LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg, cDateSeparator, cDateSeparator); break; } } @@ -189,12 +189,12 @@ INT i; BOOL bPrompt = TRUE; INT nDateString = -1; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -247,8 +247,8 @@ freep (arg); return 0; } - LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPuts (szMsg); } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/del.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -111,22 +111,22 @@ LPTSTR lpOptions; TCHAR Options[11]; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; LONG ch; - LoadString( GetModuleHandle(NULL), STRING_DEL_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); - lpOptions = _T(Options); + LoadString( GetModuleHandle(NULL), STRING_DEL_OPTION, Options,sizeof(Options)/sizeof(TCHAR)); + lpOptions = Options; if (!_tcsncmp (param, _T("/?"), 2)) { - LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPrintf ((LPTSTR)szMsg, - lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], - lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], - lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], - lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10] + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPrintf (szMsg, + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10] ); return 0; } @@ -212,9 +212,9 @@ if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) { - LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); - res = FilePromptYN (_T( (LPTSTR) szMsg)); + res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) break; @@ -231,8 +231,8 @@ { /* wildcards in filespec */ #ifdef _DEBUG - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf ((LPTSTR)szMsg); #endif GetFullPathName (arg[i], @@ -241,11 +241,11 @@ &pFilePart); #ifdef _DEBUG - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, szFullPath); - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, pFilePart); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (pFilePart); #endif @@ -268,18 +268,18 @@ _tcscpy (pFilePart, f.cFileName); #ifdef _DEBUG - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); #endif /* ask for deleting */ if (dwFlags & DEL_PROMPT) { - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szFullPath); - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -288,10 +288,10 @@ } if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - { - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); - } + { + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, szFullPath); + } /* delete the file */ if (!(dwFlags & DEL_NOTHING)) @@ -334,8 +334,8 @@ { /* no wildcards in filespec */ #ifdef _DEBUG - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg); #endif GetFullPathName (arg[i], MAX_PATH, @@ -345,11 +345,11 @@ /*ask for deleting */ if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg { - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, szFullPath); - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); - res = FilePromptYN ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + res = FilePromptYN (szMsg); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -358,14 +358,14 @@ } #ifdef _DEBUG - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, szFullPath); #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - { - LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); - ConErrPrintf ((LPTSTR)szMsg, szFullPath); - } + { + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConErrPrintf (szMsg, szFullPath); + } if (!(dwFlags & DEL_NOTHING)) { @@ -416,15 +416,15 @@ if (!(dwFlags & DEL_QUIET)) { if (dwFiles < 2) - { - LoadString( GetModuleHandle(NULL), STRING_DEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); - } + { + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + } else - { - LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); - } + { + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + } - ConOutPrintf ((LPTSTR)szMsg, dwFiles); + ConOutPrintf (szMsg, dwFiles); } return 0; _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -19,14 +19,14 @@ { DWORD val; DWORD mul=1000; - WCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); - return 0; + return 0; } if (*param==0) _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-01 09:53:19 UTC (rev 14907) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-01 10:28:58 UTC (rev 14908) @@ -210,9 +210,9 @@ static VOID DirHelp (VOID) { - WCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); - ConOutPuts ((LPTSTR)szMsg); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR)); + ConOutPuts (szMsg); } @@ -228,13 +228,13 @@ LPDIRSWITCHFLAGS lpFlags /* [IN/OUT] The flags after calculating switches */ ) { -TCHAR cCurSwitch; /* The current switch */ -TCHAR cCurChar; /* Current examing character */ -TCHAR cCurUChar; /* Current upper examing character */ -BOOL bNegative; /* Negative switch */ -BOOL bPNegative; /* Negative switch parameter */ -BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ -LPTSTR ptrLast; /* A pointer to the last character of param */ + TCHAR cCurSwitch; /* The current switch */ + TCHAR cCurChar; /* Current examing character */ + TCHAR cCurUChar; /* Current upper examing character */ [truncated at 1000 lines; 1959 more skipped]

19 years, 7 months

[hbirr] 14907: Return the correct data length for FSCTL_PIPE_GET_STATE.

by hbirr＠svn.reactos.com

Return the correct data length for FSCTL_PIPE_GET_STATE. Modified: trunk/reactos/drivers/fs/np/fsctrl.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-05-01 09:51:06 UTC (rev 14906) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-05-01 09:53:19 UTC (rev 14907) @@ -351,6 +351,8 @@ Reply->OutBufferSize = Pipe->OutboundQuota; Reply->Timeout = Pipe->TimeOut; + Irp->IoStatus.Information = sizeof(NPFS_GET_STATE); + DPRINT("Status (0x%X).\n", STATUS_SUCCESS); return STATUS_SUCCESS; @@ -463,6 +465,8 @@ DPRINT("Pipe: %p\n", Pipe); DPRINT("PipeName: %wZ\n", &Pipe->PipeName); + Irp->IoStatus.Information = 0; + switch (IoStack->Parameters.FileSystemControl.FsControlCode) { case FSCTL_PIPE_ASSIGN_EVENT: @@ -553,7 +557,6 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); }

19 years, 7 months

[hbirr] 14906: Fixed the calculation of timeout values.

by hbirr＠svn.reactos.com

Fixed the calculation of timeout values. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-01 09:49:45 UTC (rev 14905) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-01 09:51:06 UTC (rev 14906) @@ -180,7 +180,7 @@ nMaxInstances = ULONG_MAX; } - DefaultTimeOut.QuadPart = nDefaultTimeOut * -10000; + DefaultTimeOut.QuadPart = nDefaultTimeOut * -10000LL; Status = NtCreateNamedPipeFile(&PipeHandle, DesiredAccess, @@ -273,7 +273,7 @@ return(FALSE); } - WaitPipe.Timeout.QuadPart = nTimeOut * -10000; + WaitPipe.Timeout.QuadPart = nTimeOut * -10000LL; Status = NtFsControlFile(FileHandle, NULL, @@ -428,7 +428,7 @@ if (lpCollectDataTimeout != NULL) { - SetState.Timeout.QuadPart = (*lpCollectDataTimeout) * -10000; + SetState.Timeout.QuadPart = (*lpCollectDataTimeout) * -10000LL; } else {

19 years, 7 months

[hbirr] 14905: Print symbol names if DBG is defined.

by hbirr＠svn.reactos.com

Print symbol names if DBG is defined. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-05-01 09:45:35 UTC (rev 14904) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-05-01 09:49:45 UTC (rev 14905) @@ -79,13 +79,17 @@ # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) #endif +#if defined(KDBG) || defined(DBG) +# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) +#else +# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) +#endif + #ifdef KDBG -# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) # define KdbInit() KdbpCliInit() # define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) # define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) #else -# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) # define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException # define KdbInit() do { } while (0) # define KdbEnter() do { } while (0)

19 years, 7 months

[navaraf] 14904: Potapnik <jirka@studioprojekt.cz>

by navaraf＠svn.reactos.com

Potapnik <jirka(a)studioprojekt.cz> Czech translation of Task Manager statusbar messages. Modified: trunk/reactos/subsys/system/taskmgr/Cz.rc _____ Modified: trunk/reactos/subsys/system/taskmgr/Cz.rc --- trunk/reactos/subsys/system/taskmgr/Cz.rc 2005-05-01 09:29:20 UTC (rev 14903) +++ trunk/reactos/subsys/system/taskmgr/Cz.rc 2005-05-01 09:45:35 UTC (rev 14904) @@ -661,7 +661,9 @@ IDS_MSG_UNABLECHANGEPRIORITY "NenÝ mo×nÚ zmýnit prioritu" IDS_MSG_WARNINGCHANGEPRIORITY "UpozornýnÝ: Zmýna priority procesu m¨×e\nzp¨sobit nestabilitu systÚmu a jinÚ nep°edvÝdatelnÚ problÚmy. Jste si jisti\nse zmýnou priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "Vyu×itÝ CPU: %d%%" - + IDS_STATUS_MEMUSAGE "Vyu×itÝ pamýti: %dK / %dK" + IDS_STATUS_CPUUSAGE "Vyu×itÝ CPU: %3d%%" + IDS_STATUS_PROCESSES "Procesy: %d" END

19 years, 7 months

[navaraf] 14903: Forgot to change the sprintf statements in revision 14902.

by navaraf＠svn.reactos.com

Forgot to change the sprintf statements in revision 14902. Modified: trunk/reactos/subsys/system/taskmgr/procpage.c _____ Modified: trunk/reactos/subsys/system/taskmgr/procpage.c --- trunk/reactos/subsys/system/taskmgr/procpage.c 2005-05-01 09:23:12 UTC (rev 14902) +++ trunk/reactos/subsys/system/taskmgr/procpage.c 2005-05-01 09:29:20 UTC (rev 14903) @@ -527,12 +527,12 @@ if (OldProcessorUsage != PerfDataGetProcessorUsage()) { OldProcessorUsage = PerfDataGetProcessorUsage(); - wsprintf(text, _T("CPU Usage: %3d%%"), OldProcessorUsage); + wsprintf(text, szCpuUsage, OldProcessorUsage); SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); } if (OldProcessCount != PerfDataGetProcessCount()) { OldProcessCount = PerfDataGetProcessCount(); - wsprintf(text, _T("Processes: %d"), OldProcessCount); + wsprintf(text, szProcesses, OldProcessCount); SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); } }

19 years, 7 months

[navaraf] 14902: Move the statusbar strings to resources.

by navaraf＠svn.reactos.com

Move the statusbar strings to resources. Modified: trunk/reactos/subsys/system/taskmgr/En.rc Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c Modified: trunk/reactos/subsys/system/taskmgr/procpage.c Modified: trunk/reactos/subsys/system/taskmgr/resource.h _____ Modified: trunk/reactos/subsys/system/taskmgr/En.rc --- trunk/reactos/subsys/system/taskmgr/En.rc 2005-05-01 09:07:31 UTC (rev 14901) +++ trunk/reactos/subsys/system/taskmgr/En.rc 2005-05-01 09:23:12 UTC (rev 14902) @@ -661,7 +661,9 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - + IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_PROCESSES "Processes: %d" END _____ Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c --- trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-05-01 09:07:31 UTC (rev 14901) +++ trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-05-01 09:23:12 UTC (rev 14902) @@ -318,6 +318,7 @@ ULONG TotalProcesses; TCHAR Text[260]; + TCHAR szMemUsage[256]; /* Create the event */ hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -326,6 +327,8 @@ if (!hPerformancePageEvent) return 0; + LoadString(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); + while (1) { DWORD dwWaitVal; @@ -358,7 +361,7 @@ SetWindowText(hPerformancePageCommitChargeLimitEdit, Text); _ultoa(CommitChargePeak, Text, 10); SetWindowText(hPerformancePageCommitChargePeakEdit, Text); - wsprintf(Text, _T("Mem Usage: %dK / %dK"), CommitChargeTotal, CommitChargeLimit); + wsprintf(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit); SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); /* _____ Modified: trunk/reactos/subsys/system/taskmgr/procpage.c --- trunk/reactos/subsys/system/taskmgr/procpage.c 2005-05-01 09:07:31 UTC (rev 14901) +++ trunk/reactos/subsys/system/taskmgr/procpage.c 2005-05-01 09:23:12 UTC (rev 14902) @@ -490,6 +490,7 @@ { ULONG OldProcessorUsage = 0; ULONG OldProcessCount = 0; + TCHAR szCpuUsage[256], szProcesses[256]; /* Create the event */ hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -498,6 +499,9 @@ if (!hProcessPageEvent) return 0; + LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); + LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); + while (1) { DWORD dwWaitVal; _____ Modified: trunk/reactos/subsys/system/taskmgr/resource.h --- trunk/reactos/subsys/system/taskmgr/resource.h 2005-05-01 09:07:31 UTC (rev 14901) +++ trunk/reactos/subsys/system/taskmgr/resource.h 2005-05-01 09:23:12 UTC (rev 14902) @@ -237,6 +237,9 @@ #define IDS_MSG_UNABLECHANGEPRIORITY 360 #define IDS_MSG_WARNINGCHANGEPRIORITY 361 #define IDS_MSG_TRAYICONCPUUSAGE 362 +#define IDS_STATUS_MEMUSAGE 363 +#define IDS_STATUS_CPUUSAGE 364 +#define IDS_STATUS_PROCESSES 365 // Next default values for new objects

19 years, 7 months

[ekohl] 14901: Use default locale until ReactOS fully suports all required locale functions!

by ekohl＠svn.reactos.com

Use default locale until ReactOS fully suports all required locale functions! Modified: trunk/reactos/subsys/system/cmd/config.h _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-05-01 08:25:33 UTC (rev 14900) +++ trunk/reactos/subsys/system/cmd/config.h 2005-05-01 09:07:31 UTC (rev 14901) @@ -52,9 +52,13 @@ /* Define one of these to select the used locale. */ /* (date and time formats etc.) used in DATE, TIME, */ /* DIR, PROMPT etc. */ +#ifdef __REACTOS__ +#define LOCALE_DEFAULT +#else #define LOCALE_WINDOWS /* System locale */ /* #define LOCALE_GERMAN */ /* German locale */ /* #define LOCALE_DEFAULT */ /* United States locale */ +#endif #ifndef __REACTOS__ #define INCLUDE_CMD_ACTIVATE

19 years, 7 months

[navaraf] 14900: Fix coordinate mapping of unmodRect in DefWndDoSizeMove.

by navaraf＠svn.reactos.com

Fix coordinate mapping of unmodRect in DefWndDoSizeMove. Modified: trunk/reactos/lib/user32/windows/defwnd.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-05-01 08:03:41 UTC (rev 14899) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-05-01 08:25:33 UTC (rev 14900) @@ -479,19 +479,15 @@ } } - if (Style & WS_CHILD) - { - hWndParent = GetParent(hwnd); - } - /* Get min/max info */ WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack); GetWindowRect(hwnd, &sizingRect); - unmodRect = sizingRect; if (Style & WS_CHILD) { + hWndParent = GetParent(hwnd); MapWindowPoints( 0, hWndParent, (LPPOINT)&sizingRect, 2 ); + unmodRect = sizingRect; GetClientRect(hWndParent, &mouseRect ); clipRect = mouseRect; MapWindowPoints(hWndParent, HWND_DESKTOP, (LPPOINT)&clipRect, 2); @@ -508,6 +504,7 @@ SetRect(&mouseRect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); clipRect = mouseRect; } + unmodRect = sizingRect; } ClipCursor(&clipRect);

19 years, 7 months

[navaraf] 14899: Set the message point/time for keyboard and hotkey messages.

by navaraf＠svn.reactos.com

Set the message point/time for keyboard and hotkey messages. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-05-01 07:10:47 UTC (rev 14898) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-05-01 08:03:41 UTC (rev 14899) @@ -632,6 +632,10 @@ IntLockQueueState; + /* All messages have to contain the cursor point. */ + IntGetCursorLocation(PsGetWin32Thread()->Desktop->WindowStation, + &NewMsg.pt); + UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, QueueKeyStateTable, wp, 2, 0, keyLayout ); @@ -659,6 +663,7 @@ DPRINT("FINAL CHAR: %c\n", wp[0]); } + if (dead_char) { NewMsg.hwnd = lpMsg->hwnd; _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-01 07:10:47 UTC (rev 14898) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-05-01 08:03:41 UTC (rev 14899) @@ -617,6 +617,7 @@ { PUSER_MESSAGE_QUEUE FocusMessageQueue; MSG Msg; + LARGE_INTEGER LargeTickCount; DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", uMsg, wParam, lParam); @@ -625,10 +626,15 @@ Msg.message = uMsg; Msg.wParam = wParam; Msg.lParam = lParam; - /* FIXME: Initialize time and point. */ + + KeQueryTickCount(&LargeTickCount); + Msg.time = LargeTickCount.u.LowPart; + /* We can't get the Msg.pt point here since we don't know thread + (and thus the window station) the message will end up in yet. */ FocusMessageQueue = IntGetFocusMessageQueue(); if( !IntGetScreenDC() ) { + /* FIXME: What to do about Msg.pt here? */ if( W32kGetPrimitiveMessageQueue() ) { MsqPostMessage(W32kGetPrimitiveMessageQueue(), &Msg, FALSE, QS_KEY); } @@ -643,6 +649,8 @@ { Msg.hwnd = FocusMessageQueue->FocusWindow; DPRINT("Msg.hwnd = %x\n", Msg.hwnd); + IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, + &Msg.pt); MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); } else @@ -659,6 +667,7 @@ PW32THREAD Win32Thread; PWINSTATION_OBJECT WinSta; MSG Mesg; + LARGE_INTEGER LargeTickCount; NTSTATUS Status; Status = ObReferenceObjectByPointer (Thread, @@ -688,10 +697,9 @@ Mesg.message = WM_HOTKEY; Mesg.wParam = wParam; Mesg.lParam = lParam; -// Mesg.pt.x = PsGetWin32Process()->WindowStation->SystemCursor.x; -// Mesg.pt.y = PsGetWin32Process()->WindowStation->SystemCursor.y; -// KeQueryTickCount(&LargeTickCount); -// Mesg.time = LargeTickCount.u.LowPart; + KeQueryTickCount(&LargeTickCount); + Mesg.time = LargeTickCount.u.LowPart; + IntGetCursorLocation(WinSta, &Mesg.pt); MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); ObmDereferenceObject(Window); ObDereferenceObject (Thread);

19 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005