Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[royce] 17961: remove extraneous \n's
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

remove extraneous \n's Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-09-21 01:44:18 UTC (rev 17960) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-09-21 02:04:07 UTC (rev 17961) @@ -636,9 +636,9 @@ STRING_SCREEN_ROW, "invalid value for row" STRING_TIMER_TIME "Timer %d is %s: " -STRING_INVALID_OPERAND, "Invalid operand.\n" -STRING_EXPECTED_CLOSE_PAREN, "Expected ')'.\n" -STRING_EXPECTED_NUMBER_OR_VARIABLE,"Expected number or variable name.\n" -STRING_SYNTAX_COMMAND_INCORRECT, "The syntax of the command is incorrect.\n" +STRING_INVALID_OPERAND, "Invalid operand." +STRING_EXPECTED_CLOSE_PAREN, "Expected ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Expected number or variable name." +STRING_SYNTAX_COMMAND_INCORRECT, "The syntax of the command is incorrect." } _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-21 01:44:18 UTC (rev 17960) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-21 02:04:07 UTC (rev 17961) @@ -481,7 +481,7 @@ } if ( !seta_stmt ( &p, &rval ) ) return FALSE; - ConOutPrintf ( _T("%i\n"), rval ); + ConOutPrintf ( _T("%i"), rval ); return TRUE; }

1 0

[royce] 17960: give set/a access to "special" variables like errorlevel
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

give set/a access to "special" variables like errorlevel Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-21 01:27:54 UTC (rev 17959) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-21 01:44:18 UTC (rev 17960) @@ -99,6 +99,7 @@ /* Prototypes for CMD.C */ VOID ParseCommandLine (LPTSTR); +LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-21 01:27:54 UTC (rev 17959) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-21 01:44:18 UTC (rev 17960) @@ -173,25 +173,14 @@ static BOOL seta_identval ( LPCTSTR ident, INT* result ) { - // get size of buffer for env var - LPTSTR buf; - DWORD dwBuffer = GetEnvironmentVariable ( ident, NULL, 0 ); - // if GetEnvironmentVariable() fails, it returns 0 - if ( !dwBuffer ) + LPCTSTR identVal = GetEnvVarOrSpecial ( ident ); + if ( !identVal ) { - // TODO FIXME - is it correct to report a value of 0 for non-existant variables? + /* TODO FIXME - what to do upon failure? */ *result = 0; return FALSE; } - buf = (LPTSTR)alloca ( dwBuffer * sizeof(TCHAR) ); - if ( !buf ) - { - // TODO FIXME - is it correct to report 0 when report resources low... should we error somehow? - *result = 0; - return FALSE; - } - GetEnvironmentVariable ( ident, buf, dwBuffer ); - *result = _ttoi ( buf ); + *result = _ttoi ( identVal ); return TRUE; }

1 0

[royce] 17959: msvc6 warning fix
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

msvc6 warning fix Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-09-21 01:27:22 UTC (rev 17958) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-09-21 01:27:54 UTC (rev 17959) @@ -240,7 +240,7 @@ 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 */ - INT t = 0; + UINT t = 0; /* Initialize variables; */

1 0

[royce] 17958: always strip '^' (unless it was preceded by an '^' itself), not just if it precedes the redirection symbols - fixes some of my test cases in seta_test.cmd
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

always strip '^' (unless it was preceded by an '^' itself), not just if it precedes the redirection symbols - fixes some of my test cases in seta_test.cmd Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-21 01:25:58 UTC (rev 17957) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-21 01:27:22 UTC (rev 17958) @@ -69,7 +69,7 @@ /* remove escapes */ if ( param[0] ) for ( i = 0; param[i+1]; i++ ) { - if ( param[i] == '^' && strchr("<|>&^",param[i+1]) ) + if ( param[i] == '^' ) { memmove ( &param[i], &param[i+1], _tcslen(&param[i]) * sizeof(TCHAR) ); }

1 0

[royce] 17957: fix debug output
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

fix debug output remove my '!' code - don't know how I thought this was valid restore part of code I removed previously that was breaking 'not' cases that need to execute and the right half of the == was longer than then left Modified: trunk/reactos/subsys/system/cmd/if.c _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-09-21 01:23:44 UTC (rev 17956) +++ trunk/reactos/subsys/system/cmd/if.c 2005-09-21 01:25:58 UTC (rev 17957) @@ -43,7 +43,7 @@ LPTSTR pp; #ifdef _DEBUG - DebugPrintf (_T("cmd_if: (\'%S\', \'%S\')\n"), cmd, param); + DebugPrintf (_T("cmd_if: (\'%s\', \'%s\')\n"), cmd, param); #endif if (!_tcsncmp (param, _T("/?"), 2)) @@ -52,16 +52,9 @@ return 0; } - /* First check if param string begins with '!' or 'not' */ - if ( param[0] == _T('!') ) + /* First check if param string begins with 'not' */ + if (!_tcsnicmp (param, _T("not"), 3) && _istspace (*(param + 3))) { - x_flag = X_EXEC; /* Remember '!' */ - ++param; /* Step over '!' */ - while (_istspace (*param)) /* And subsequent spaces */ - param++; - } - else if (!_tcsnicmp (param, _T("not"), 3) && _istspace (*(param + 3))) - { x_flag = X_EXEC; /* Remember 'NOT' */ param += 3; /* Step over 'NOT' */ while (_istspace (*param)) /* And subsequent spaces */ @@ -190,7 +183,11 @@ pp += p1len; if ( x_flag ) + { + while (*pp && !_istspace (*pp)) /* Find first space, */ + pp++; x_flag |= X_EMPTY; + } } if (x_flag & X_EMPTY)

1 0

[royce] 17956: a few more tests to clarify parsing oddities based on my playing around
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

a few more tests to clarify parsing oddities based on my playing around Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd _____ Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd --- trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-21 01:22:56 UTC (rev 17955) +++ trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-21 01:23:44 UTC (rev 17956) @@ -1,6 +1,8 @@ -@echo off -@rem the next line illustrates a bug in our cmd -set /a a=5%2 +@rem echo off + +@rem the next line reexecutes the script without params if it was called with params, else we'll get false failures +@if not "%1"=="" seta_test.cmd + @rem the next two lines illustrate bug in existing if code if not "=="=="==" goto failure if "=="=="==" goto next1 @@ -26,6 +28,10 @@ if not "%a%"=="200" goto failure set /a a=42%%9 if not "%a%"=="6" goto failure +set /a a=5%2 +if not "%a%"=="5" goto failure +set /a a=42^%13 +if not "%a%"=="423" goto failure set /a a=7+9 if not "%a%"=="16" goto failure set /a a=9-7 @@ -36,6 +42,8 @@ if not "%a%"=="9" goto failure set /a a=42^&9 if not "%a%"=="8" goto failure +set /a a=32^9 +if not "%a%"=="329" goto failure set /a a=32^^9 if not "%a%"=="41" goto failure set /a a=10^|22

1 0

[royce] 17955: %1 %2 etc still work with set/a ( just not %foo% )
by royce＠svn.reactos.com 21 Sep '05

21 Sep '05

%1 %2 etc still work with set/a ( just not %foo% ) Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-20 20:43:15 UTC (rev 17954) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-21 01:22:56 UTC (rev 17955) @@ -1077,93 +1077,25 @@ } LPCTSTR -GetParsedEnvVar ( LPCTSTR envName, UINT* envNameLen ) +GetEnvVarOrSpecial ( LPCTSTR varName ) { static LPTSTR ret = NULL; static UINT retlen = 0; - LPTSTR p, tmp; UINT size; - if ( envNameLen ) - *envNameLen = 0; - SetLastError(0); - if ( *envName++ != '%' ) - return NULL; - switch ( *envName ) - { - case _T('0'): - case _T('1'): - case _T('2'): - case _T('3'): - case _T('4'): - case _T('5'): - case _T('6'): - case _T('7'): - case _T('8'): - case _T('9'): - if ((tmp = FindArg (*envName - _T('0')))) - { - if ( !GrowIfNecessary ( _tcslen(tmp), &ret, &retlen ) ) - return NULL; - _tcscpy ( ret, tmp ); - if ( envNameLen ) - *envNameLen = 2; - return ret; - } - if ( !GrowIfNecessary ( 3, &ret, &retlen ) ) - return NULL; - ret[0] = _T('%'); - ret[1] = *envName; - ret[2] = 0; - if ( envNameLen ) - *envNameLen = 2; - return ret; - - case _T('%'): - if ( !GrowIfNecessary ( 2, &ret, &retlen ) ) - return NULL; - ret[0] = _T('%'); - ret[1] = 0; - if ( envNameLen ) - *envNameLen = 2; - return ret; - - case _T('?'): - /* TODO FIXME 10 is only max size for 32-bit */ - if ( !GrowIfNecessary ( 11, &ret, &retlen ) ) - return NULL; - _sntprintf ( ret, retlen, _T("%u"), nErrorLevel); - ret[retlen-1] = 0; - if ( envNameLen ) - *envNameLen = 2; - return ret; - } - p = _tcschr ( envName, _T('%') ); - if ( !p ) - { - SetLastError ( ERROR_INVALID_PARAMETER ); - return NULL; - } - size = p-envName; - if ( envNameLen ) - *envNameLen = size + 2; - p = alloca ( (size+1) * sizeof(TCHAR) ); - memmove ( p, envName, size * sizeof(TCHAR) ); - p[size] = 0; - envName = p; - size = GetEnvironmentVariable ( envName, ret, retlen ); + size = GetEnvironmentVariable ( varName, ret, retlen ); if ( size > retlen ) { if ( !GrowIfNecessary ( size, &ret, &retlen ) ) return NULL; - size = GetEnvironmentVariable ( envName, ret, retlen ); + size = GetEnvironmentVariable ( varName, ret, retlen ); } if ( size ) return ret; /* env var doesn't exist, look for a "special" one */ /* %CD% */ - if (_tcsicmp(envName,_T("cd")) ==0) + if (_tcsicmp(varName,_T("cd")) ==0) { size = GetCurrentDirectory ( retlen, ret ); if ( size > retlen ) @@ -1177,7 +1109,7 @@ return ret; } /* %TIME% */ - else if (_tcsicmp(envName,_T("time")) ==0) + else if (_tcsicmp(varName,_T("time")) ==0) { SYSTEMTIME t; if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) @@ -1189,8 +1121,10 @@ return ret; } /* %DATE% */ - else if (_tcsicmp(envName,_T("date")) ==0) + else if (_tcsicmp(varName,_T("date")) ==0) { + LPTSTR tmp; + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; size = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), ret, retlen ); @@ -1207,7 +1141,7 @@ } /* %RANDOM% */ - else if (_tcsicmp(envName,_T("random")) ==0) + else if (_tcsicmp(varName,_T("random")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1217,13 +1151,13 @@ } /* %CMDCMDLINE% */ - else if (_tcsicmp(envName,_T("cmdcmdline")) ==0) + else if (_tcsicmp(varName,_T("cmdcmdline")) ==0) { return GetCommandLine(); } /* %CMDEXTVERSION% */ - else if (_tcsicmp(envName,_T("cmdextversion")) ==0) + else if (_tcsicmp(varName,_T("cmdextversion")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1233,7 +1167,7 @@ } /* %ERRORLEVEL% */ - else if (_tcsicmp(envName,_T("errorlevel")) ==0) + else if (_tcsicmp(varName,_T("errorlevel")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1244,7 +1178,98 @@ return _T(""); /* not found - return empty string */ } +LPCTSTR +GetParsedEnvVar ( LPCTSTR varName, UINT* varNameLen, BOOL ModeSetA ) +{ + static LPTSTR ret = NULL; + static UINT retlen = 0; + LPTSTR p, tmp; + UINT size; + if ( varNameLen ) + *varNameLen = 0; + SetLastError(0); + if ( *varName++ != '%' ) + return NULL; + switch ( *varName ) + { + case _T('0'): + case _T('1'): + case _T('2'): + case _T('3'): + case _T('4'): + case _T('5'): + case _T('6'): + case _T('7'): + case _T('8'): + case _T('9'): + if ((tmp = FindArg (*varName - _T('0')))) + { + if ( varNameLen ) + *varNameLen = 2; + if ( !*tmp ) + return _T(""); + if ( !GrowIfNecessary ( _tcslen(tmp)+1, &ret, &retlen ) ) + return NULL; + _tcscpy ( ret, tmp ); + return ret; + } + if ( !GrowIfNecessary ( 3, &ret, &retlen ) ) + return NULL; + ret[0] = _T('%'); + ret[1] = *varName; + ret[2] = 0; + if ( varNameLen ) + *varNameLen = 2; + return ret; + + case _T('%'): + if ( !GrowIfNecessary ( 2, &ret, &retlen ) ) + return NULL; + ret[0] = _T('%'); + ret[1] = 0; + if ( varNameLen ) + *varNameLen = 2; + return ret; + + case _T('?'): + /* TODO FIXME 10 is only max size for 32-bit */ + if ( !GrowIfNecessary ( 11, &ret, &retlen ) ) + return NULL; + _sntprintf ( ret, retlen, _T("%u"), nErrorLevel); + ret[retlen-1] = 0; + if ( varNameLen ) + *varNameLen = 2; + return ret; + } + if ( ModeSetA ) + { + /* HACK for set/a */ + if ( !GrowIfNecessary ( 2, &ret, &retlen ) ) + return NULL; + ret[0] = _T('%'); + ret[1] = 0; + if ( varNameLen ) + *varNameLen = 1; + return ret; + } + p = _tcschr ( varName, _T('%') ); + if ( !p ) + { + SetLastError ( ERROR_INVALID_PARAMETER ); + return NULL; + } + size = p-varName; + if ( varNameLen ) + *varNameLen = size + 2; + p = alloca ( (size+1) * sizeof(TCHAR) ); + memmove ( p, varName, size * sizeof(TCHAR) ); + p[size] = 0; + varName = p; + return GetEnvVarOrSpecial ( varName ); +} + + /* * do the prompt/input/process loop * @@ -1259,7 +1284,7 @@ LPTSTR cp; LPCTSTR tmp; BOOL bEchoThisLine; - BOOL bSubstitute; + BOOL bModeSetA; do { @@ -1279,13 +1304,13 @@ ++ip; cp = commandline; - bSubstitute = TRUE; + bModeSetA = FALSE; while (*ip) { - if ( bSubstitute && *ip == _T('%') ) + if ( *ip == _T('%') ) { UINT envNameLen; - LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen ); + LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); if ( !envVal ) return 1; ip += envNameLen; @@ -1297,7 +1322,7 @@ *ip = _T(' '); *cp++ = *ip++; - /* HACK HACK HACK check whether bSubstitute needs to be toggled */ + /* HACK HACK HACK check whether bModeSetA needs to be toggled */ *cp = 0; tmp = commandline; tmp += _tcsspn(tmp,_T(" \t")); @@ -1329,7 +1354,7 @@ * check to see if we've parsed out a set/a. if so, we * need to disable substitution until we come across a * redirection */ - if ( bSubstitute ) + if ( !bModeSetA ) { /* look for set /a */ if ( !_tcsnicmp(tmp,_T("set"),3) ) @@ -1337,7 +1362,7 @@ tmp += 3; tmp += _tcsspn(tmp,_T(" \t")); if ( !_tcsnicmp(tmp,_T("/a"),2) ) - bSubstitute = FALSE; + bModeSetA = TRUE; } } /* if we're not currently substituting, it means we're @@ -1350,12 +1375,12 @@ { if ( *tmp == _T('^') ) { - if ( _tcschr(_T("<>|&"), *++tmp ) ) + if ( _tcschr(_T("<>|&"), *++tmp ) && *tmp ) ++tmp; } else { - bSubstitute = TRUE; + bModeSetA = FALSE; break; } }

1 0

[royce] 17954: fix misunderstandings of if syntax
by royce＠svn.reactos.com 20 Sep '05

20 Sep '05

fix misunderstandings of if syntax Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd _____ Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd --- trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-20 20:32:48 UTC (rev 17953) +++ trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-20 20:43:15 UTC (rev 17954) @@ -7,59 +7,61 @@ goto failure :next1 if "1"=="2" goto failure -if !"1"=="1" goto failure +if not "1"=="1" goto failure set /a a=1 -if !"%a%"=="1" goto failure +if not "%a%"=="1" goto failure set /a b=a -if !"%b%"=="1" goto failure +if not "%b%"=="1" goto failure set /a a=!5 -if !"%a%"=="0" goto failure +if not "%a%"=="0" goto failure +set /a a=!a +if not "%a%"=="1" goto failure set /a a=~5 -if !"%a%"=="-6" goto failure +if not "%a%"=="-6" goto failure set /a a=5,a=-a -if !"%a%"=="-5" goto failure +if not "%a%"=="-5" goto failure set /a a=5*7 -if !"%a%"=="35" goto failure +if not "%a%"=="35" goto failure set /a a=2000/10 -if !"%a%"=="200" goto failure -set /a a=42%9 -if !"%a%"=="6" goto failure +if not "%a%"=="200" goto failure +set /a a=42%%9 +if not "%a%"=="6" goto failure set /a a=7+9 -if !"%a%"=="16" goto failure +if not "%a%"=="16" goto failure set /a a=9-7 -if !"%a%"=="2" goto failure +if not "%a%"=="2" goto failure set /a a=9^<^<2 -if !"%a%"=="36" goto failure +if not "%a%"=="36" goto failure set /a a=36^>^>2 -if !"%a%"=="9" goto failure +if not "%a%"=="9" goto failure set /a a=42^&9 -if !"%a%"=="8" goto failure +if not "%a%"=="8" goto failure set /a a=32^^9 -if !"%a%"=="41" goto failure +if not "%a%"=="41" goto failure set /a a=10^|22 -if !"%a%"=="30" goto failure +if not "%a%"=="30" goto failure set /a a=2,a*=3 -if !"%a%"=="6" goto failure +if not "%a%"=="6" goto failure set /a a=11,a/=2 -if !"%a%"=="5" goto failure -set /a a=42,a%=9 -if !"%a%"=="6" goto failure +if not "%a%"=="5" goto failure +set /a a=42,a%%=9 +if not "%a%"=="6" goto failure set /a a=7,a+=9 -if !"%a%"=="16" goto failure +if not "%a%"=="16" goto failure set /a a=9,a-=7 -if !"%a%"=="2" goto failure +if not "%a%"=="2" goto failure set /a a=42,a^&=9 -if !"%a%"=="8" goto failure +if not "%a%"=="8" goto failure set /a a=32,a^^=9 -if !"%a%"=="41" goto failure +if not "%a%"=="41" goto failure set /a a=10,a^|=22 -if !"%a%"=="30" goto failure +if not "%a%"=="30" goto failure set /a a=9,a^<^<=2 -if !"%a%"=="36" goto failure +if not "%a%"=="36" goto failure set /a a=36,a^>^>=2 -if !"%a%"=="9" goto failure +if not "%a%"=="9" goto failure set /a a=1,2 -if !"%a%"=="2" goto failure +if not "%a%"=="1" goto failure set /a a=(a=1,a+2) if "%a%"=="3" goto success goto failure

1 0

[royce] 17953: fix escape removal
by royce＠svn.reactos.com 20 Sep '05

20 Sep '05

fix escape removal Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-20 20:13:16 UTC (rev 17952) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-20 20:32:48 UTC (rev 17953) @@ -72,7 +72,6 @@ if ( param[i] == '^' && strchr("<|>&^",param[i+1]) ) { memmove ( &param[i], &param[i+1], _tcslen(&param[i]) * sizeof(TCHAR) ); - ++i; } }

1 0

[royce] 17952: remove now-pointless if statement
by royce＠svn.reactos.com 20 Sep '05

20 Sep '05

remove now-pointless if statement add a little more debug output Modified: trunk/reactos/subsys/system/cmd/choice.c _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 19:51:27 UTC (rev 17951) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 20:13:16 UTC (rev 17952) @@ -239,29 +239,15 @@ while (TRUE) { ConInKey (&ir); - - if (bNoPrompt != FALSE) - { + val = IsKeyInString (lpOptions, #ifdef _UNICODE ir.Event.KeyEvent.uChar.UnicodeChar, #else ir.Event.KeyEvent.uChar.AsciiChar, -#endif +#endif bCaseSensitive); - } - else - { - val = IsKeyInString (lpOptions, -#ifdef _UNICODE - ir.Event.KeyEvent.uChar.UnicodeChar, -#else - ir.Event.KeyEvent.uChar.AsciiChar, -#endif - bCaseSensitive); - } - if (val >= 0) { ConOutPrintf (_T("%c\n"), lpOptions[val]); @@ -275,6 +261,9 @@ } freep (arg); +#ifdef _DEBUG + DebugPrintf (_T("ErrorLevel: %d\n"), nErrorLevel); +#endif /* _DEBUG */ return 0; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005